设备列表 添加蓝牙名称和设备分类参数

src/views/device/list/detail.vue

@@ -7,6 +7,9 @@
       <el-form-item label="设备名称：" prop="name">
         <el-input v-model="form.name" placeholder="请输入设备名称" />
       </el-form-item>
+      <el-form-item label="蓝牙名称：" prop="bluetoothName">
+        <el-input v-model="form.bluetoothName" placeholder="请输入蓝牙名称" />
+      </el-form-item>
       <el-form-item label="版本号：" prop="firstVersion">
         <el-input v-model="form.firstVersion" placeholder="请输入初始版本号" />
       </el-form-item>
@@ -29,6 +32,11 @@
           <el-option v-for="item in categoryOptions" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
+      <el-form-item label="设备分类：" prop="deviceType">
+        <el-select v-model="form.deviceType" placeholder="请选择设备分类">
+          <el-option v-for="item in deviceTypeOptions" :key="item.value" :value="item.value" :label="item.label" />
+        </el-select>
+      </el-form-item>
       <el-form-item label="是否热门：" prop="isHot">
         <el-select v-model="form.isHot" placeholder="请选择是否热门">
           <el-option v-for="item in hotOptions" :key="item.value" :label="item.label" :value="Number(item.value)" />
@@ -45,7 +53,7 @@
           <el-form-item label="离线图片：" prop="offlineImg" style="float:right">
             <Upload listType="picture-card" :url="form.offlineImg" @upload="handleUploadImg($event, 'offline')"
               :disabled="disabled" />
-          </el-form-item>
+          </el-form-item> 
         </el-col>
       </el-row>
       <!-- 子表单 -->
@@ -93,15 +101,14 @@
           <el-input v-model="item.guideUrl" placeholder="请输入引导页网址" />
         </el-form-item>
         <el-form-item v-if="item.type === 1 || item.type === 3" label="引导页内容："
-          :prop="`typeList.${index}.guidePageContent`"
-          :rules="{ required: true, message: '请输入引导页内容', trigger: 'blur' }">
+          :prop="`typeList.${index}.guidePageContent`" :rules="{ required: true, message: '请输入引导页内容', trigger: 'blur' }">
           <Editor v-model="item.guidePageContent" :min-height="250" :readOnly="disabled" />
         </el-form-item>
         <!-- 删除按钮 -->
         <el-link class="el-icon-close" v-if="form.typeList.length > 1" :underline="false" @click="getDelete(index)" />
       </div>
     </el-form>
-    <div class="form-btn">
+    <div style="margin-left: 120px;">
       <el-button @click="getCancel">取消</el-button>
       <el-button v-if="disabled === false" type="primary" @click="getSubmit">提交</el-button>
     </div>
@@ -137,10 +144,12 @@ export default {
       rules: {
         clientType: [{ required: true, message: "请输入设备型号", trigger: "blur" }],
         name: [{ required: true, message: "请输入设备名称", trigger: "blur" }],
+        bluetoothName: [{ required: true, message: '请输入蓝牙名称', trigger: 'blur' }],
         firstVersion: [{ required: true, message: "请输入初始版本号", trigger: "blur" }],
         upgradeType: [{ required: true, message: "请选择升级方式", trigger: "change" }],
         isHot: [{ required: true, message: "是否热门", trigger: "change" }],
         categoryId: [{ required: true, message: "请选择设备类型", trigger: "change" }],
+        deviceType: [{ required: true, message: "请选择设备分类", trigger: 'change' }],
         img: [{ required: true, message: "请上传在线图片", trigger: "change" }],
         offlineImg: [{ required: true, message: "请上传离线图片", trigger: "change" }],
       },
@@ -183,7 +192,17 @@ export default {
         label: 'QiXinWei'
       }],
       functionOptions: [],
-      categoryOptions: []
+      categoryOptions: [],
+      deviceTypeOptions: [{
+        value: 0,
+        label: '音响'
+      }, {
+        value: 1,
+        label: '耳机'
+      }, {
+        value: 2,
+        label: '穿戴'
+      }]
     };
   },
   mounted() {

src/views/device/list/index.vue

@@ -32,12 +32,14 @@
       <el-table-column label="设备ID" prop="id" align="center" />
       <el-table-column label="设备型号" prop="clientType" align="center" />
       <el-table-column label="设备名称" prop="name" align="center" />
+      <el-table-column label="蓝牙名称" prop="bluetoothName" align="center" />
       <el-table-column label="设备图片" prop="img" align="center" width="100">
         <template slot-scope="scope">
           <el-image :src="scope.row.img" />
         </template>
       </el-table-column>
       <el-table-column label="设备类型" prop="categoryName" align="center" />
+      <el-table-column label="设备分类" prop="deviceType" align="center" :formatter="deviceTypeFormatter" />
       <el-table-column label="是否热门" prop="isHot" align="center" :formatter="hotFormatter" />
       <el-table-column label="升级方式" align="center" :formatter="upgradeTypeFormatter" />
       <el-table-column label="创建时间" prop="createTimeText" align="center" />
@@ -106,6 +108,16 @@ export default {
         value: 2,
         label: '指定'
       }],
+      deviceTypeOptions: [{
+        value: 0,
+        label: '音响'
+      }, {
+        value: 1,
+        label: '耳机'
+      }, {
+        value: 2,
+        label: '穿戴'
+      }]
     }
   },
   mounted() {
@@ -204,6 +216,10 @@ export default {
 
     upgradeTypeFormatter(row) {
       return this.selectDictLabel(this.upgradeTypeOptions, row.upgradeType)
+    },
+
+    deviceTypeFormatter(row) {
+      return this.selectDictLabel(this.deviceTypeOptions, row.deviceType)
     }
   }
 }