Merge branch 'develop/3.0.3' into test

src/views/device/version/detail.vue

@@ -8,12 +8,8 @@
       </el-form-item>
       <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-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="版本号：">
@@ -35,34 +31,28 @@
       <el-form-item prop="content" label="升级描述：">
         <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="是否强制升级">
-          <el-option
-            v-for="item in dict.type.dev_yes_no"
-            :key="item.value"
-            :label="item.label"
-            :value="Number(item.value)"
-          />
+      <el-form-item prop="isEnforcement" label="设备升级：">
+        <el-select v-model="form.deviceIsEnforcement" placeholder="是否强制设备升级">
+          <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="isEnforcement" label="APP升级：">
+        <el-select v-model="form.isEnforcement" placeholder="是否强制APP升级">
+          <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 dict.type.dev_yes_no"
-            :key="item.value"
-            :label="item.label"
-            :value="Number(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 dict.type.push_user_type"
-            :key="item.value"
-            :label="item.label"
-            :value="Number(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="指定用户：">

src/views/device/version/index.vue

@@ -31,7 +31,8 @@
         </template>
       </el-table-column>
       <el-table-column prop="userTypeValue" label="升级对象" align="center" />
-      <el-table-column prop="enforcementValue" label="是否强制升级" align="center" />
+      <el-table-column prop="enforcementValue" label="APP强制升级" align="center" />
+      <el-table-column prop="deviceIsEnforcement" label="设备强制升级" align="center" />
       <el-table-column prop="updateTimeStr" label="更新时间" align="center" />
       <el-table-column label="操作" align="center">
         <template slot-scope="scope">