Explorar o código

Merge branch 'develop/3.1.7' into test

DESKTOP-SVI9JE1\muzen hai 1 ano
pai
achega
cd872c9353
Modificáronse 1 ficheiros con 25 adicións e 14 borrados
  1. 25 14
      src/views/device/class/detail.vue

+ 25 - 14
src/views/device/class/detail.vue

@@ -68,9 +68,22 @@
             <el-option v-for="item in connectOptions" :key="item.value" :value="item.value" :label="item.label" />
             <el-option v-for="item in connectOptions" :key="item.value" :value="item.value" :label="item.label" />
           </el-select>
           </el-select>
         </el-form-item>
         </el-form-item>
-        <el-form-item label="引导图:" :prop="`typeList.${index}.icon`" :rules="rules.icon">
-          <Upload listType="picture-card" :url="i.icon" @upload="uploadIcon($event, index)" :disabled="disabled" />
-        </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item :label="[1, 3].includes(i.type) ? '连接引导图:' : '开机引导图:'" :prop="`typeList.${index}.icon1`"
+              :rules="{ required: true, message: '请上传引导图', trigger: 'change' }">
+              <Upload listType="picture-card" :url="i.icon1" @upload="upload($event, 'icon1', index)"
+                :disabled="disabled" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="配对引导图:" :prop="`typeList.${index}.icon2`"
+              :rules="{ required: true, message: '请上传引导图', trigger: 'change' }">
+              <Upload listType="picture-card" :url="i.icon2" @upload="upload($event, 'icon2', index)"
+                :disabled="disabled" />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-form-item v-if="[1, 3].includes(i.type)" label="引导页:">
         <el-form-item v-if="[1, 3].includes(i.type)" label="引导页:">
           <Editor v-model="i.guidePageContent" :min-height="250" :readOnly="disabled" />
           <Editor v-model="i.guidePageContent" :min-height="250" :readOnly="disabled" />
         </el-form-item>
         </el-form-item>
@@ -98,7 +111,6 @@ export default {
         deviceIds: [],
         deviceIds: [],
         typeList: [{
         typeList: [{
           functionList: [],
           functionList: [],
-          icon: ''
         }],
         }],
       },
       },
       // 校验
       // 校验
@@ -111,8 +123,7 @@ export default {
         userType: [{ required: true, message: '请选择可见用户', trigger: 'change' }],
         userType: [{ required: true, message: '请选择可见用户', trigger: 'change' }],
         user: [{ required: true, message: '请输入指定用户', trigger: 'blur' }],
         user: [{ required: true, message: '请输入指定用户', trigger: 'blur' }],
         img: [{ required: true, message: '请上传在线图片', trigger: 'change' }],
         img: [{ required: true, message: '请上传在线图片', trigger: 'change' }],
-        offlineImg: [{ required: true, message: '请上传离线图片', trigger: 'change' }],
-        icon: [{ required: true, message: '请上传引导图', trigger: 'change' }]
+        offlineImg: [{ required: true, message: '请上传离线图片', trigger: 'change' }]
       },
       },
       // 设备列表
       // 设备列表
       devOptions: [],
       devOptions: [],
@@ -174,7 +185,8 @@ export default {
         type: null,
         type: null,
         functionList: [],
         functionList: [],
         connectType: null,
         connectType: null,
-        icon: '',
+        icon1: '',
+        icon2: '',
         guidePageContent: ''
         guidePageContent: ''
       })
       })
     },
     },
@@ -208,13 +220,12 @@ export default {
     },
     },
 
 
     // 上传图片
     // 上传图片
-    upload(e, key) {
-      this.form[key] = e.file
-    },
-
-    // 上传引导图
-    uploadIcon(e, index) {
-      this.$set(this.form.typeList[index], 'icon', e.file)
+    upload(e, key, index) {
+      if (index == undefined) {
+        this.form[key] = e.file
+      } else {
+        this.form.typeList[index][key] = e.file
+      }
     },
     },
 
 
     // 提交
     // 提交