修改已知bug

src/views/article/list/detail.vue

@@ -52,7 +52,6 @@ export default {
       detail({
         id: this.form.id
       }).then(res => {
-        console.log(res);
         if (res.code === 0) {
           this.form = res.data
           this.linkDevice = res.data.linkDevice.split(',')

src/views/device/list/detail.vue

@@ -72,8 +72,7 @@
                 :value="item.type" />
             </el-select>
           </el-form-item>
-          <el-form-item v-if="item.type == 2" label="连接方式："
-            :prop="`typeList.${index}.connectType`"
+          <el-form-item v-if="item.type == 2" label="连接方式：" :prop="`typeList.${index}.connectType`"
             :rules="{required: true, message: '请选择连接方式', trigger: 'change'}">
             <el-select v-model="item.connectType" placeholder="请选择连接方式">
               <el-option v-for="item in dict.type.dev_connect_type" :key="item.value" :label="item.label"
@@ -247,11 +246,16 @@ export default {
     },
 
     // 选中一个设备类型就从数组中去掉
-    getTypeChange(e) {
+    getTypeChange() {
       for (let i in this.dict.type.dev_list_type) {
-        this.dict.type.dev_list_type[i].disabled = false;
+        this.dict.type.dev_list_type[i].disabled = false
       }
-      this.dict.type.dev_list_type[e - 1].disabled = true;
+      this.form.typeList.map(i => {
+        if (i.type) {
+          let index = this.dict.type.dev_list_type.findIndex(j => j.value == i.type)
+          this.dict.type.dev_list_type[index].disabled = true
+        }
+      })
     },
 
     // 新增子表单

src/views/ohplay/operation/index.vue

@@ -99,7 +99,6 @@ export default {
         type: 'warning'
       }).then(() => {
         remove(id).then(res => {
-          console.log(res);
           if (res.code === 0) {
             this.$message.success('删除成功！')
             this.getList()

src/views/operation/recommend/index.vue

@@ -451,7 +451,6 @@ export default {
     getDelete(row, index) {
       let e = this.list[index].childList.findIndex(i => i.contentId === row.contentId)
       this.list[index].childList.splice(e, 1)
-      console.log(this.list[index].childList);
     },
 
     // 上传图片

src/views/push/message/index.vue

@@ -45,7 +45,7 @@
     <pagination v-show="total>0" :total="total" :page.sync="form.pageNum" :limit.sync="form.pageSize"
       @pagination="getList" />
     <!-- 弹窗 -->
-    <el-dialog :visible.sync="dialogVisible" title="新增推送" width="500px">
+    <el-dialog :visible.sync="dialogVisible" title="新增推送" width="500px" :before-close="cancel">
       <el-form label-width="100px">
         <el-form-item label="推送类型：">
           <el-select v-model="dialogForm.messageType" placeholder="请选择推送类型">
@@ -83,7 +83,7 @@
         </el-form-item>
       </el-form>
       <div slot="footer">
-        <el-button>取消</el-button>
+        <el-button @click="cancel">取消</el-button>
         <el-button type="primary" @click="getSubmit">确定</el-button>
       </div>
     </el-dialog>
@@ -185,7 +185,6 @@ export default {
     // 详情
     getDialog(id) {
       this.dialogVisible = true
-      this.dialogForm = {}
       if (id) {
         detail(id).then(res => {
           if (res.code === 0) {
@@ -213,7 +212,13 @@ export default {
             this.getList()
           }
         })
-      } wo
+      }
+    },
+
+    // 取消
+    cancel() {
+      this.dialogVisible = false
+      this.dialogForm = {}
     },
 
     // 字典翻译

src/views/service/flowPackage/detail.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form label-width="100px">
+    <el-form :model="form" :rules="rules" ref="form" label-width="100px">
       <el-form-item label="关联设备：">
         <el-select v-model="deviceIds" multiple placeholder="请选择关联设备">
           <el-option v-for="item in devOptions" :key="item.value" :label="item.label"
@@ -16,10 +16,10 @@
             :value="item.value" />
         </el-select>
       </el-form-item>
-      <el-form-item label="原价：">
+      <el-form-item label="原价：" prop="price">
         <el-input v-model="form.price" placeholder="请输入原价" />
       </el-form-item>
-      <el-form-item label="活动价：">
+      <el-form-item label="活动价：" prop="discount">
         <el-input v-model="form.discount" placeholder="请输入活动价" />
       </el-form-item>
       <el-form-item label="是否推荐：">

src/views/service/musicPackage/detail.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form label-width="100px">
+    <el-form :model="form" :rules="rules" ref="form" label-width="100px">
       <el-form-item label="关联设备：">
         <el-select v-model="deviceIds" multiple placeholder="请选择关联设备">
           <el-option v-for="item in devOptions" :key="item.value" :label="item.label"
@@ -16,10 +16,10 @@
             :value="item.value" />
         </el-select>
       </el-form-item>
-      <el-form-item label="原价：">
+      <el-form-item label="原价：" prop="price">
         <el-input v-model="form.price" placeholder="请输入原价" />
       </el-form-item>
-      <el-form-item label="活动价：">
+      <el-form-item label="活动价：" prop="discount">
         <el-input v-model="form.discount" placeholder="请输入活动价" />
       </el-form-item>
       <el-form-item label="服务时长：">
@@ -55,8 +55,6 @@ export default {
       }
     }
   },
-
-
   methods: {
     // 取消
     cancel() {