Browse Source

Merge remote-tracking branch 'origin/dev' into dev

shaun-sheep 4 years ago
parent
commit
6830ee651d

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

@@ -1447,13 +1447,13 @@ export function getEquipNotInSys(param, success) {
 
 //创建系统所在建筑关系,系统一对多,覆盖
 export function sysRelateBuild(param, success) {
-  let url = `${baseUrl}${dataCenter}/sy-in-bd/link-bd`;
+  let url = `${baseUrl}${rel}/sy-in-bd/link-bd`;
   http.postJson(url, param, success)
 }
 
 //创建系统所在楼层关系,系统一对多,覆盖
 export function sysRelateFloor(param, success) {
-  let url = `${baseUrl}${dataCenter}/sy-in-fl/link-fl`;
+  let url = `${baseUrl}${rel}/sy-in-fl/link-fl`;
   http.postJson(url, param, success)
 }
 

+ 4 - 4
src/components/dialogs/changeRea.vue

@@ -30,17 +30,17 @@
               <template slot-scope="scope">
                 {{
                   scope.row.building ? scope.row.building.localName ? scope.row.building.localName : '' : ''
-                }}-{{ scope.row.Floor ? scope.row.Floor.FloorLocalName ? scope.row.Floor.FloorLocalName : '' : '' }}
+                }}-{{ scope.row.floor ? scope.row.floor.localName ? scope.row.floor.localName : '' : '' }}
               </template>
             </el-table-column>
             <el-table-column label="设备族">
               <template slot-scope="scope">
-                {{ scope.row.EquipFamilyList[0].FamilyName }}
+                {{ scope.row.equipFamilyList[0].familyName }}
               </template>
             </el-table-column>
             <el-table-column label="安装位置">
               <template slot-scope="scope">
-                {{ scope.row.LedgerParam ? scope.row.LedgerParam.Siteinstall ? scope.row.LedgerParam.Siteinstall.InstallLocation : "--" : "--" }}
+                {{ scope.row.infos ? scope.row.infos.InstallLocation ? scope.row.infos.InstallLocation : "--" : "--" }}
               </template>
             </el-table-column>
           </el-table>
@@ -106,7 +106,7 @@ export default {
     //确认选择
     clickTrue() {
       if (this.radio) {
-        this.$emit('changeProperty', { PropertyId: this.radio, LinkEquipLocalName: this.$refs[this.radio].value });
+        this.$emit('changeProperty', { propertyId: this.radio, linkEquipLocalName: this.$refs[this.radio].value });
         this.dialog.changeRea = false;
       } else {
         this.$message("请先选择资产")

+ 4 - 4
src/components/ledger/handsontables/assets.vue

@@ -639,7 +639,7 @@ export default {
           data: "caozuo",
           renderer: tools.lookDetails
         }, {
-          data: "LinkEquipLocalName",
+          data: "linkEquipLocalName",
           renderer: tools.LinkEquipLocalName,
           readOnly: true
         }
@@ -901,7 +901,7 @@ export default {
           }
           return false
         //关联资产
-        case 'LinkEquipLocalName':
+        case 'linkEquipLocalName':
           if (this.linkNameFalg) {
             this.myDialog.changeRea = true;
           }
@@ -1168,8 +1168,8 @@ export default {
     },
     //修改关联的资产
     changeProperty(val) {
-      this.setDataToMain(val.PropertyId, 'PropertyId', this.row);
-      this.setDataToMain(val.LinkEquipLocalName, 'LinkEquipLocalName', this.row);
+      this.setDataToMain(val.propertyId, 'propertyId', this.row);
+      this.setDataToMain(val.linkEquipLocalName, 'linkEquipLocalName', this.row);
     },
     //上传文件弹窗触发事件
     fileChange(keys, type, file) {

+ 7 - 7
src/components/ledger/handsontables/device.vue

@@ -830,7 +830,7 @@ export default {
             readOnly: true
           },
           {
-            data: "LinkEquipLocalName",
+            data: "linkEquipLocalName",
             readOnly: true,
             renderer: tools.LinkEquipLocalName
           },
@@ -840,7 +840,7 @@ export default {
             readOnly: true
           },
           {
-            data: "Count",
+            data: "count",
             readOnly: true,
             renderer: tools.lookDetails
           }
@@ -853,7 +853,7 @@ export default {
             readOnly: true
           },
           {
-            data: "LinkEquipLocalName",
+            data: "linkEquipLocalName",
             readOnly: true,
             renderer: tools.LinkEquipLocalName
           },
@@ -1334,7 +1334,7 @@ export default {
           this.myDialog.systemType = true;
           return false;
         //关联资产()
-        case "LinkEquipLocalName":
+        case "linkEquipLocalName":
           if (!this.onlyRead) {
             this.myDialog.changeRea = true;
           }
@@ -1697,10 +1697,10 @@ export default {
     },
     //修改关联的资产
     changeProperty(val) {
-      this.setDataToMain(val.PropertyId, "PropertyId", this.row);
+      this.setDataToMain(val.propertyId, "propertyId", this.row);
       this.setDataToMain(
-        val.LinkEquipLocalName,
-        "LinkEquipLocalName",
+        val.linkEquipLocalName,
+        "linkEquipLocalName",
         this.row
       );
     },

+ 4 - 4
src/components/ledger/lib/editSysFloor.vue

@@ -74,12 +74,12 @@ export default {
         }
       })
       let buildPa = {
-        SysId: this.system.SysID,
-        BuildingIdList: buildIds
+        sysId: this.system.id,
+        buildingIdList: buildIds
       }
       let floorPa = {
-        SysId: this.system.SysID,
-        FloorIdList: floorIds
+        sysId: this.system.id,
+        floorIdList: floorIds
       }
       let promise1 = new Promise((resolve, reject) => {
         sysRelateBuild(buildPa, res => {

+ 1 - 1
src/views/ledger/facility/addfacility.vue

@@ -562,7 +562,7 @@ export default {
           }
           break;
         //关联资产
-        case 'LinkEquipLocalName':
+        case 'linkEquipLocalName':
           if (this.linkNameFalg) {
             this.myDialog.changeRea = true;
           }

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

@@ -562,8 +562,8 @@ export default {
     },
     //修改关联的资产
     changeProperty(val) {
-      this.setDataToMain(val.PropertyId, 'PropertyId', this.row);
-      this.setDataToMain(val.LinkEquipLocalName, 'LinkEquipLocalName', this.row);
+      this.setDataToMain(val.propertyId, 'propertyId', this.row);
+      this.setDataToMain(val.linkEquipLocalName, 'linkEquipLocalName', this.row);
     },
     //上传文件弹窗触发事件
     fileChange(keys) {