bug修复

src/views/rulesManagement/components/MaterialAdd.vue

@@ -25,6 +25,7 @@
             :highlight-current="true"
             node-key="id"
             @node-click="handleNodeClick"
+            :default-checked-keys="checkedKeys"
           ></el-tree>
         </div>
 
@@ -146,7 +147,8 @@
 
         // 表格选中数据
         selection: [],
-        processData: []
+        processData: [],
+        checkedKeys: []
       };
     },
     components: {

src/views/rulesManagement/releaseRules/components/permitAdd.vue

@@ -18,7 +18,7 @@
       v-loading="loading"
       :disabled="type == 'detail'"
     >
-      <el-row style="margin-bottom: 10px">
+      <el-row style="margin-bottom: 15px">
         <el-col :span="8">
           <el-form-item label="记录规则类型" prop="classify" required>
             <el-select
@@ -56,7 +56,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row style="margin-bottom: 10px">
+      <el-row style="margin-bottom: 15px">
         <el-col :span="8">
           <el-form-item label="记录规则名称" prop="name">
             <el-input
@@ -90,7 +90,9 @@
             />
           </el-form-item>
         </el-col>
-        <el-col v-if="formData.classify == 3" :span="8">
+      </el-row>
+      <el-row v-if="formData.classify == 3" style="margin-bottom: 15px">
+        <el-col :span="8">
           <el-form-item label="关联设备" prop="deviceName" required>
             <el-input
               v-model="formData.deviceName"
@@ -104,7 +106,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row style="margin-bottom: 10px">
+      <el-row style="margin-bottom: 15px">
         <el-col :span="8">
           <el-form-item label="模块分类" required prop="reportWorkType">
             <dict-selection
@@ -148,7 +150,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row style="margin-bottom: 10px">
+      <el-row style="margin-bottom: 15px">
         <el-col :span="24">
           <el-form-item label="周期" prop="frequencyValue" required>
             <rule-cycle

src/views/technology/production/components/user-setting-matter-process.vue

@@ -321,9 +321,8 @@
             (item) => item.rulesId === matter.rulesId
           );
           if (exists) {
-            this.$message.warning('规则已存在，请勿重复添加');
+            return this.$message.warning('规则已存在，请勿重复添加');
           }
-          return;
         }
 
         // 处理detials
@@ -350,6 +349,7 @@
           produceTaskName: this.produceTaskName,
           reportWorkType: this.reportWorkType
         });
+        console.log('this.matterList', this.matterList);
         this.handleSort();
       },
       editMatter(matter) {

vue.config.js

@@ -43,8 +43,8 @@ module.exports = {
         // target: 'http://192.168.1.116:18086',
         // target: 'http://192.168.1.251:18086',
 
-        // target: 'http://192.168.1.251:18086', // 开发
-        target: 'http://192.168.1.116:18086', // 赵沙金
+        target: 'http://192.168.1.251:18086', // 开发
+        // target: 'http://192.168.1.116:18086', // 赵沙金
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {