haojianlong 6 سال پیش
والد
کامیت
38832795dd

+ 8 - 0
config/index.js

@@ -49,6 +49,14 @@ module.exports = {
                 // 将主机标头的原点更改为目标URL
                 changeOrigin: false
             },
+            '/venders-dp': {
+                // 目标 API 地址
+                target: 'http://192.168.20.225:8080/',
+                // 如果要代理 websockets
+                ws: true,
+                // 将主机标头的原点更改为目标URL
+                changeOrigin: false
+            },
             '/venders': {
                 // 目标 API 地址
                 target: 'http://192.168.20.225:8080/',

+ 2 - 2
src/api/scan/request.js

@@ -608,14 +608,14 @@ export function delProperty(param, success) {
 
 //获取制定供应商下的供应合同编号
 export function getListForSupplier(param, success) {
-    let url = `venders-dp/supplier/property/query?projectId=${param.ProjId}&secret=${param.secret}`
+    let url = `/venders-dp/supplier/property/query?projectId=${param.ProjId}&secret=${param.secret}`
     let data = param.data
     http.postJson(url, data, success)
 }
 
 //获取保单列表
 export function getListForGuarantee(param, success) {
-    let url = `${physics}/venders-dp/insurance/contract/query`
+    let url = `/venders-dp/insurance/contract/query`
     let data = param.data
     http.postJson(url, data, success)
 }

+ 1 - 1
src/views/ledger/facility/parts/index.vue

@@ -280,7 +280,7 @@ export default {
           readOnly: true
         },
         {
-          data: "PropertyName",
+          data: "PropertyLocalName",
           readOnly: true
         }
       );

+ 24 - 5
src/views/ledger/facility/partsmanage/addparts/index.vue

@@ -208,7 +208,8 @@ export default {
             delete item[key];
           }
         });
-        if (keys.length && Object.keys(item).length) {
+        let newK = Object.keys(item)
+        if ((item.Checked&&newK.length>1) || (!item.Checked&&newK.length)) {
           return item;
         }
       });
@@ -216,13 +217,23 @@ export default {
         this.$message("创建信息为空,请录入信息后再创建!");
         return;
       }
-      let data = {
-        ParentId: this.category.deviceId, //当前设备id
-        Category: this.category.Code //当前部件分类
-      };
+      let flag = false;
+      newData.map(item=>{
+        if(item.Checked&&!item.EquipLocalName){
+          flag = true;
+        }
+      })
+      if (flag) {
+        this.$message.info("存在设备的本地名称为空,请检查")
+        return;
+      }
       let params = { projectId: this.projectId }
 
       for (let i = 0; i < newData.length; i++) {
+        let data = {
+          ParentId: this.category.deviceId, //当前设备id
+          Category: this.category.Code //当前部件分类
+        };
         params.data = Object.assign(data, newData[i]);
         await createPart(params).then(res => {
           let response = res.data;
@@ -243,6 +254,13 @@ export default {
             }
           }
         });
+        if (keys.length && Object.keys(item).length) {
+          return item;
+        }
+      });
+      if (!newData.length) {
+        this.$message("创建信息为空,请录入信息后再创建!");
+        return;
       }
     },
     // 删除表格行
@@ -358,6 +376,7 @@ export default {
     },
     //选择型号修改
     firmChange(data) {
+      console.log(this.row)
       tools.setDataForKey(this.tableData[this.row],"DPSpecificationID",data.specificationId)
       tools.setDataForKey(this.tableData[this.row],"LedgerParam.EquipManufactor.Brand",data.brand)
       tools.setDataForKey(this.tableData[this.row],"LedgerParam.EquipManufactor.Specification",data.name)

+ 1 - 1
src/views/ledger/facility/partsmanage/index.vue

@@ -427,7 +427,7 @@ export default {
           readOnly: true
         },
         {
-          data: "PropertyName",
+          data: "PropertyLocalName",
           readOnly: true
         }
       );