添加列表参数

src/views/device/list/index.vue

@@ -10,6 +10,21 @@
           <el-option v-for="item in devOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
+      <el-form-item label="设备分类：">
+        <el-select v-model="form.deviceType" placeholder="请选择设备分类" clearable>
+          <el-option v-for="item in categoryOptions" :key="item.id" :value="item.id" :label="item.name" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="当前状态：">
+        <el-select v-model="form.status" placeholder="请选择当前状态" clearable>
+          <el-option v-for="item in onOrOffOptions" :key="item.value" :value="item.value" :label="item.label" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="是否热门：">
+        <el-select v-model="form.isHot" placeholder="请选择是否热门" clearable>
+          <el-option v-for="item in hotOptions" :key="item.value" :value="item.value" :label="item.label" />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="getSearch">搜索</el-button>
         <el-button icon="el-icon-refresh" @click="getRefresh">重置</el-button>
@@ -41,7 +56,6 @@
       <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" />
       <el-table-column label="操作" align="center">
         <template slot-scope="scope">
@@ -71,9 +85,10 @@
 
 <script>
 import { List, Delete, upDown } from '@/api/device/list'
-import { devMixin } from '@/mixin/index'
+import { devMixin, onOrOffMixin } from '@/mixin/index'
+import { categoryList } from "@/api/device/category";
 export default {
-  mixins: [devMixin],
+  mixins: [devMixin, onOrOffMixin],
   data() {
     return {
       // 遮罩层
@@ -100,14 +115,6 @@ export default {
         value: 1,
         label: '是'
       }],
-      // 是否强制
-      upgradeTypeOptions: [{
-        value: 1,
-        label: '强制'
-      }, {
-        value: 2,
-        label: '指定'
-      }],
       deviceTypeOptions: [{
         value: 0,
         label: '音响'
@@ -117,11 +124,14 @@ export default {
       }, {
         value: 2,
         label: '穿戴'
-      }]
+      }],
+      // 设备分类
+      categoryOptions: []
     }
   },
   mounted() {
     this.getList()
+    this.getCategory()
   },
   methods: {
     // 列表
@@ -156,6 +166,13 @@ export default {
       return this.changeForm.ids === '' ? true : false
     },
 
+    // 设备分类
+    getCategory() {
+      categoryList().then(res => {
+        this.categoryOptions = res.data
+      })
+    },
+
     // 上下架
     getShelves(key, e) {
       if (e) {
@@ -214,10 +231,6 @@ export default {
       return this.selectDictLabel(this.hotOptions, row.isHot)
     },
 
-    upgradeTypeFormatter(row) {
-      return this.selectDictLabel(this.upgradeTypeOptions, row.upgradeType)
-    },
-
     deviceTypeFormatter(row) {
       return this.selectDictLabel(this.deviceTypeOptions, row.deviceType)
     }