Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dev

src/views/rulesManagement/matterRules/components/matter-add.vue

@@ -144,7 +144,7 @@
             >
           </template>
         </el-table-column>
-      </el-table>  
+      </el-table>
     </el-form>
 	 <template v-slot:footer>
 	   <el-button @click="handleClose">取消</el-button>
@@ -199,7 +199,6 @@ export default {
 		      name: '', // 巡点检事项
 		      content: '', // 巡点检内容
 		      norm: '', // 巡点检标准
-		      // readonly: false
 		    }
 		  ]
 		};
@@ -207,7 +206,7 @@ export default {
       addMatterDialog: false,
       cycleValue: '',
       uploadList: [],
-      formData: { },
+      formData: {},
       contentConfigFormRules: {
         name: [{ required: true, message: '请输入规则名称', trigger: 'blur' }],
         ruleType: [
@@ -232,7 +231,7 @@ export default {
     }
   },
 	watch: {
-	
+
 	},
   methods: {
 		openDialog(row,type){
@@ -249,7 +248,7 @@ export default {
 				this.getOrderCode()
 			}
 		},
-	
+
 	async getRuleInfo(id,type){
 		const data = await getDetail(id)
 		this.formData = data
@@ -258,12 +257,12 @@ export default {
 			delete this.formData.id
 		}
 	},
-	
+
 	async getOrderCode () {
 	  const data = await getCode('rule_code');
 	  this.$set(this.formData, 'code', data);
-	},  
-	
+	},
+
     handleClose () {
       this.addMatterDialog = false
       this.$emit('handleClose')
@@ -277,14 +276,15 @@ export default {
           readonly: false
         })
       } else {
-        this.formData.ruleItems = [
+        let arr = [
           {
             name: '', // 巡点检事项
             content: '', // 巡点检内容
             norm: '', // 巡点检标准
-            readonly: false
           }
         ]
+        this.$set(this.formData,'ruleItems',arr)
+        // this.formData.ruleItems =
       }
     },
     saveItem (index, row) {

vue.config.js

@@ -33,11 +33,11 @@ module.exports = {
       '/api': {
         // target: 'http://192.168.3.51:18086', // 测试
         // target: 'http://192.168.3.35:8080', // kang杨威
-        // target: 'http://192.168.3.25:8080', // 黄峥嵘
+        target: 'http://192.168.3.25:8080', // 黄峥嵘
         // target: 'http://192.168.3.41:8080', // 何江鹏
-        target: 'http://192.168.3.33:8080', // 谢一平
+        // target: 'http://192.168.3.33:8080', // 谢一平
         // target: 'http://192.168.3.64:8080', // 粟勋
-
+        // target: 'http://192.168.3.34:8080', // 刘毅勋
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''