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

src/views/regulationManagement/components/addOrEditDialog.vue

@@ -282,7 +282,15 @@
         if (type !== 'add') {
           row.assessmentIndicators = Number(row.assessmentIndicators);
           this.form = JSON.parse(JSON.stringify(row));
-          this.tableList = this.form.assessmentCriteria;
+          // 转换value为number类型
+          this.tableList = this.form.assessmentCriteria?.map((i) => {
+            return i.map((j) => {
+              return {
+                ...j,
+                value: Number(j.value)
+              };
+            });
+          });
           this.buissChange(row.type, 'init');
           this.salesChange(row.assessmentIndicators, 'init');
         } else {
@@ -322,6 +330,7 @@
       salesChange(val, type) {
         let data = this.options.find((el) => el.value == val);
         this.valueOptions = data.nodes;
+        console.log('this.valueOptions', this.valueOptions);
         this.statusOptions = data.equles;
         if (type == 'init') {
           return;

vue.config.js

@@ -36,11 +36,11 @@ module.exports = {
         // target: 'http://192.168.1.158:18086',
         // target: 'http://192.168.1.176:18086',
 
-        target: 'http://192.168.1.125:18086',
+        // target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.251:18186',
 
         // target: 'http://192.168.1.251:18087',
-        // target: 'http://192.168.1.251:18086',
+        target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.116:18086',
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域