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

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

@@ -639,7 +639,7 @@
       attributeTypeText(v) {
         if (v) {
           let a = this.attributeList.find((item) => item.value == v);
-          return a.label;
+          return a ? a.label : '';
         }
       },
 

src/views/material/BOMmanage/index.vue

@@ -417,7 +417,7 @@
       attributeTypeText(v) {
         if (v) {
           let a = this.attributeList.find((item) => item.value == v);
-          return a.label;
+          return a ? a.label : '';
         }
       },
       rootCategoryLevelIdText(v) {

src/views/material/product/detail.vue

@@ -1263,7 +1263,7 @@
             name: this.form.name,
             modelType: this.form.modelType,
             specification: this.form.specification,
-            isUpdate: this.isUpdate * 1 || 0
+            isUpdate: this.$route.query.isUpdate
           };
 
           if (!(await this.verifyDuplicate(req))) return;

src/views/material/product/oneProduct.vue

@@ -119,7 +119,7 @@
             </IndexData>
           </div>
         </template>
-      </ele-split-layout>
+      </ele-split-layout>fv
     </el-card>
   </div>
 </template>

vue.config.js

@@ -35,8 +35,8 @@ module.exports = {
         // target: 'http://192.168.1.105:18086',
         // target: 'http://192.168.1.158:18086',
         // target: 'http://192.168.1.176:18086',
-        // target: 'http://192.168.1.251:18086',
-        target: 'http://192.168.1.125:18086',
+        target: 'http://192.168.1.251:18086',
+        // target: 'http://192.168.1.125:18086',
 
         // target: 'http://192.168.1.251:18186',