设备管理 设备升级

src/views/device/version/detail.vue

@@ -6,9 +6,9 @@
           <el-option v-for="item in clientTypeOptions" :key="item.id" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
-      <el-form-item prop="type" label="设备类型：">
-        <el-select v-model="form.type" placeholder="请选择设备类型">
-          <el-option v-for="item in typeOptions" :key="item.value" :label="item.label" :value="item.value" />
+      <el-form-item prop="type" label="设备模式：">
+        <el-select v-model="form.type" placeholder="请选择设备模式">
+          <el-option v-for="item in dict.type.dev_list_type" :key="item.value" :label="item.label" :value="Number(item.value)" />
         </el-select>
       </el-form-item>
       <el-form-item prop="version" label="版本号：">
@@ -32,17 +32,17 @@
       </el-form-item>
       <el-form-item prop="isEnforcement" label="强制升级：">
         <el-select v-model="form.isEnforcement" placeholder="是否强制升级">
-          <el-option v-for="item in Yes_No" :key="item.value" :label="item.label" :value="item.value" />
+          <el-option v-for="item in dict.type.dev_yes_no" :key="item.value" :label="item.label" :value="Number(item.value)" />
         </el-select>
       </el-form-item>
       <el-form-item prop="isPush" label="同步推送：">
         <el-select v-model="form.isPush" placeholder="是否同步推送">
-          <el-option v-for="item in Yes_No" :key="item.value" :label="item.label" :value="item.value" />
+          <el-option v-for="item in dict.type.dev_yes_no" :key="item.value" :label="item.label" :value="Number(item.value)" />
         </el-select>
       </el-form-item>
       <el-form-item prop="userType" label="升级对象：">
         <el-select v-model="form.userType" placeholder="请选择升级对象">
-          <el-option v-for="item in userTypeOptions" :key="item.value" :label="item.label" :value="item.value" />
+          <el-option v-for="item in dict.type.push_user_type" :key="item.value" :label="item.label" :value="Number(item.value)" />
         </el-select>
       </el-form-item>
       <el-form-item :prop="user" v-if="form.userType === 3" label="指定用户：">
@@ -59,9 +59,10 @@
 <script>
 import { getDetailInfo, updateEdit, getVersionAdd } from "@/api/device/version";
 import Upload from "@/components/Upload/index";
-import { typeMixin, clientTypeMixin } from "../mixin/index";
+import { clientType } from "../mixin/index";
 export default {
-  mixins: [typeMixin, clientTypeMixin],
+  dicts: ['dev_list_type', 'dev_yes_no', 'push_user_type'],
+  mixins: [clientType],
   components: {
     Upload,
   },
@@ -75,28 +76,6 @@ export default {
       },
       // 指定用户表单中间参数
       user: "",
-      // 是否强制升级 // 是否推送
-      Yes_No: [
-        {
-          value: 1,
-          label: "是",
-        },
-        {
-          value: 2,
-          label: "否",
-        },
-      ],
-      // 推送用户类型
-      userTypeOptions: [
-        {
-          value: 1,
-          label: "全部",
-        },
-        {
-          value: 3,
-          label: "指定",
-        },
-      ],
       // 表单验证
       rules: {
         deviceTypeId: [

src/views/device/version/index.vue

@@ -18,10 +18,10 @@
       </el-form-item>
     </el-form>
     <!-- 列表 -->
-    <el-table :data="tableData">
+    <el-table :data="tableData" v-loading="loading">
       <el-table-column prop="id" label="型号ID" align="center" />
       <el-table-column prop="title" label="升级标题" align="center" />
-      <el-table-column prop="deviceTypeName" label="设备型号" align="center" />
+      <el-table-column prop="deviceTypeName" label="设备名称" align="center" />
       <el-table-column prop="type" label="设备类型" align="center" :formatter="typeFormatter" />
       <el-table-column prop="version" label="版本号" align="center" />
       <el-table-column label="下载路径" align="center" show-overflow-tooltip>
@@ -47,9 +47,10 @@
 
 <script>
 import { getPageList, getVersionDelete } from '@/api/device/version'
-import { typeMixin, clientTypeMixin } from '../mixin/index'
+import { clientType } from '../mixin/index'
 export default {
-  mixins: [typeMixin, clientTypeMixin],
+  dicts: ['dev_list_type'],
+  mixins: [clientType],
   data() {
     return {
       // 遮罩层
@@ -71,10 +72,18 @@ export default {
   methods: {
     // 列表
     getList() {
+      this.loading = true
       getPageList(this.form).then(res => {
         if (res.code === 0) {
-          this.tableData = res.data.records
+          this.tableData = []
+          res.data.records.forEach(i => {
+            this.tableData.push({
+              ...i,
+              enforcementValue: i.enforcementValue ? i.enforcementValue : '否'
+            })
+          })
           this.total = res.data.total
+          this.loading = false
         }
       })
     },
@@ -114,7 +123,7 @@ export default {
 
     // 字典翻译
     typeFormatter(row) {
-      return this.selectDictLabel(this.typeOptions, row.type)
+      return this.selectDictLabel(this.dict.type.dev_list_type, row.type)
     }
   }
 }