设备列表

src/views/device/list/detail.vue

@@ -94,11 +94,10 @@ import { deviceAdd, deviceDetail, deviceEdit } from "@/api/device/list";
 import { categoryList } from "@/api/device/category";
 import { functionList } from "@/api/device/function";
 import imageUpload from "@/components/Upload/index";
-import mixin from "./mixin/index";
-import typeOptions from '../mixin/typeOptions'
+import { typeMixin, deviceTypeMixin, upgradeTypeMixin } from '../mixin/index';
 
 export default {
-  mixins: [mixin, typeOptions],
+  mixins: [typeMixin, deviceTypeMixin, upgradeTypeMixin],
   components: {
     imageUpload,
   },
@@ -106,17 +105,6 @@ export default {
     return {
       // 能否编辑
       disabled: false,
-      // 升级方式列表
-      upgradeTypeOptions: [
-        {
-          value: 1,
-          label: "强制",
-        },
-        {
-          value: 2,
-          label: "指定",
-        },
-      ],
       // 分类列表
       categoryOptions: [],
       functionOptions: [],

src/views/device/list/index.vue

@@ -22,7 +22,7 @@
         </template>
       </el-table-column>
       <el-table-column label="使用分类" prop="deviceType" align="center" :formatter="deviceTypeFormatter" />
-      <el-table-column label="升级方式" prop="upgradeTypeText" align="center" />
+      <el-table-column label="升级方式" prop="upgradeType" align="center" :formatter="upgradeTypeFormatter"/>
       <el-table-column label="创建时间" prop="createTimeText" align="center" />
       <el-table-column label="操作" align="center">
         <template slot-scope="scope">
@@ -39,9 +39,9 @@
 
 <script>
 import { listPage, deviceDelete } from '@/api/device/list'
-import mixin from './mixin/index'
+import { deviceTypeMixin, upgradeTypeMixin } from '../mixin/index'
 export default {
-  mixins: [mixin],
+  mixins: [deviceTypeMixin, upgradeTypeMixin],
   data() {
     return {
       // 遮罩层
@@ -116,7 +116,10 @@ export default {
 
     // 字典翻译
     deviceTypeFormatter(row) {
-      return this.selectDictLabel(this.deviceTypeOptions, row.deviceType);
+      return this.selectDictLabel(this.deviceTypeOptions, row.deviceType)
+    },
+    upgradeTypeFormatter(row) {
+      return this.selectDictLabel(this.upgradeTypeOptions, row.upgradeType)
     }
   }
 }