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

src/views/material/BOMmanage/components/workingProcedure.vue

@@ -1186,7 +1186,6 @@
             prop: 'storagePath',
             label: '文件名称',
             align: 'center',
-
             showOverflowTooltip: true,
             minWidth: 200,
             formatter: (_row, _column, cellValue) => {
@@ -1577,7 +1576,15 @@
         }
 
         this.tableData.taskParam[this.currentIndex][type].splice(index, 1);
+
+        if (type == 'fileParam') {
+          const data = this.$refs.fileTable.getData();
+          const id = row.id ? row.id : row;
+          const newData = data.filter((item) => item.id != id);
+          this.$refs.fileTable.setData(newData);
+        }
       },
+
       addProductList(list) {
         let subCode = 0;
         let array = [];

src/views/material/BOMmanage/qualityTesting/term.vue

@@ -240,8 +240,7 @@
             fixed: 'right'
           }
         ],
-        tableHeight: 'calc(100vh - 500px)',
-        isQualityInspection: true
+        tableHeight: 'calc(100vh - 500px)'
       };
     },
 

vue.config.js

@@ -35,9 +35,9 @@ module.exports = {
         // target: 'http://192.168.1.3:18086',
         // 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:18086',
+        // target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.251:18186',
         // target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.251:18186', // 测试环境