Parcourir la source

Merge branch 'test'

DESKTOP-SVI9JE1\muzen il y a 1 an
Parent
commit
5cf59fc261
2 fichiers modifiés avec 12 ajouts et 13 suppressions
  1. 4 1
      package.json
  2. 8 12
      src/views/device/list/detail.vue

+ 4 - 1
package.json

@@ -89,5 +89,8 @@
   "browserslist": [
     "> 1%",
     "last 2 versions"
-  ]
+  ],
+  "optionalDependencies": {
+    "fsevents": "*"
+  }
 }

+ 8 - 12
src/views/device/list/detail.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="form" :rules="rules" ref="form" label-width="120px" :disabled="disabled">
+    <el-form :model="form" :rules="rules" ref="form" label-width="auto" :disabled="disabled">
       <el-form-item label="设备型号:" prop="clientType">
         <el-input v-model="form.clientType" placeholder="请输入设备型号" />
       </el-form-item>
@@ -50,7 +50,7 @@
       <div class="sub-form" v-for="(item, index) in form.typeList" :key="item.id">
         <el-form-item label="设备模式:" :prop="`typeList.${index}.type`"
           :rules="{ required: true, message: '请选择设备模式', trigger: 'change' }">
-          <el-select v-model="item.type" placeholder="请选择设备模式" @change="getTypeChange">
+          <el-select v-model="item.type" placeholder="请选择设备模式" @change="getTypeChange(item)">
             <el-option v-for="item in typeOptions" :key="item.value" :label="item.label" :value="Number(item.value)"
               :disabled="item.disabled" />
           </el-select>
@@ -70,8 +70,8 @@
         </el-form-item>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="item.type === 1 || item.type === 3 ? '连接引导图:' : '开机引导图:'" :prop="`typeList.${index}.icon1`"
-              :rules="{ required: true, message: '请上传引导图片', trigger: 'change' }">
+            <el-form-item :label="item.type === 1 || item.type === 3 ? '连接引导图:' : '开机引导图:'"
+              :prop="`typeList.${index}.icon1`" :rules="{ required: true, message: '请上传引导图片', trigger: 'change' }">
               <Upload listType="picture-card" :url="item.icon1" @upload="handleUploadIcon($event, index, 'icon1')"
                 :disabled="disabled" />
             </el-form-item>
@@ -229,14 +229,14 @@ export default {
     },
 
     // 选中一个设备类型就从数组中去掉
-    getTypeChange() {
+    getTypeChange(item) {
       for (let i in this.typeOptions) {
         this.typeOptions[i].disabled = false
       }
+      this.$set(item, 'functionList', [])
+      this.$set(item, 'connectType', null)
+      this.$set(item, 'guidePageContent', '')
       this.form.typeList.map(i => {
-        i.functionList = []
-        i.connectType = null
-        i.guidePageContent = ''
         if (i.type) {
           let index = this.typeOptions.findIndex(j => j.value == i.type)
           this.typeOptions[index].disabled = true
@@ -319,8 +319,4 @@ export default {
     color: #c0c4cc;
   }
 }
-
-::v-deep .editor {
-  background: #000;
-}
 </style>