设备升级 推送类型标题修改成升级对象

src/views/device/version/detail.vue

@@ -9,7 +9,7 @@
       </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-option v-for="item in typeOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item prop="version" label="版本号：">
@@ -29,7 +29,7 @@
         <el-input v-model="form.title" placeholder="请输入升级标题" />
       </el-form-item>
       <el-form-item prop="content" label="升级描述：">
-        <el-input v-model="form.content" type="textarea" rows="4" placeholder="请输入版本号" />
+        <el-input v-model="form.content" type="textarea" rows="4" placeholder="请输入升级描述" />
       </el-form-item>
       <el-form-item prop="isEnforcement" label="强制升级：">
         <el-select v-model="form.isEnforcement" placeholder="是否强制升级">
@@ -41,7 +41,7 @@
           <el-option v-for="item in Yes_No" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
-      <el-form-item prop="userType" label="推送类型：">
+      <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" />
@@ -61,9 +61,9 @@
 <script>
 import { getDetailInfo, updateEdit, getVersionAdd } from '@/api/device/version';
 import Upload from "@/components/Upload/index";
-import mixin from './mixin/index'
+import { typeMixin, clientTypeMixin } from '../mixin/index'
 export default {
-  mixins: [mixin],
+  mixins: [typeMixin, clientTypeMixin],
   components: {
     Upload
   },
@@ -91,26 +91,12 @@ export default {
         value: 3,
         label: '指定'
       }],
-      // 设备类型
-      typeOptions:[{
-        value: 1,
-        label: '蓝牙'
-      },{
-        value: 2,
-        label: 'WiFi'
-      },{
-        value: 3,
-        label: '传统蓝牙'
-      },{
-        value: 4,
-        label: '4G'
-      }],
       // 表单验证
       rules: {
         deviceTypeId: [{
           required: true, message: '请选择设备型号', trigger: 'change'
         }],
-        type:[{
+        type: [{
           required: true, message: '请选择设备类型', trigger: 'change'
         }],
         version: [{

src/views/device/version/index.vue

@@ -29,7 +29,7 @@
           <el-link :href="scope.row.url" :underline="false">{{ scope.row.url }}</el-link>
         </template>
       </el-table-column>
-      <el-table-column prop="userTypeValue" label="推送类型" align="center" />
+      <el-table-column prop="userTypeValue" label="升级对象" align="center" />
       <el-table-column prop="enforcementValue" label="是否强制升级" align="center" />
       <el-table-column prop="updateTimeStr" label="更新时间" align="center" />
       <el-table-column label="操作">
@@ -47,10 +47,9 @@
 
 <script>
 import { getPageList, getVersionDelete } from '@/api/device/version'
-import mixin from './mixin/index'
-import typeOptions from '../mixin/typeOptions'
+import { typeMixin, clientTypeMixin } from '../mixin/index'
 export default {
-  mixins: [mixin, typeOptions],
+  mixins: [typeMixin, clientTypeMixin],
   data() {
     return {
       // 遮罩层
@@ -112,6 +111,11 @@ export default {
         }
       })
     },
+
+    // 字典翻译
+    typeFormatter(row) {
+      return this.selectDictLabel(this.typeOptions, row.type)
+    }
   }
 }
 </script>