Browse Source

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

shaun-sheep 4 years ago
parent
commit
e7cc93ccd5

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

@@ -298,11 +298,11 @@ export default {
       dieNum: 0, // 查询设备部件数量
       inputMap: {
         flowBuild: {
-          InputMode: 'D1',
-          Editable: true,
-          InfoPointCode: "flowBuild",
-          InfoPointName: "建筑楼层",
-          Path: "flowBuild"
+          inputMode: 'D1',
+          editable: true,
+          code: "flowBuild",
+          name: "建筑楼层",
+          path: "flowBuild"
         }
       }, //信息点和输入方式映射表
       updateInputShow: false, //是否显示临时维护输入框

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

@@ -420,11 +420,11 @@ export default {
       showParts: false,
       inputMap: {
         flowBuild: {
-          InputMode: "D1",
-          Editable: true,
-          InfoPointCode: "flowBuild",
-          InfoPointName: "建筑楼层",
-          Path: "flowBuild"
+          inputMode: "D1",
+          editable: true,
+          code: "flowBuild",
+          name: "建筑楼层",
+          path: "flowBuild"
         }
       }, //信息点和输入方式映射表
       updateInputShow: false, //是否显示临时维护输入框
@@ -1444,6 +1444,8 @@ export default {
         default:
           break;
       }
+      console.log(inputData);
+      console.log('====================');
       if (!this.onlyRead && !inputData.editable) {
         this.$message("该信息点的值为自动生成,不可人工维护!");
         return false;

+ 5 - 5
src/components/ledger/handsontables/system.vue

@@ -161,11 +161,11 @@ export default {
       addData: {}, //添加设备选择的设备类型
       inputMap: {
         flowBuild: {
-          InputMode: 'D1',
-          Editable: true,
-          InfoPointCode: "flowBuild",
-          InfoPointName: "建筑楼层",
-          Path: "flowBuild"
+          inputMode: 'D1',
+          editable: true,
+          code: "flowBuild",
+          name: "建筑楼层",
+          path: "flowBuild"
         }
       }, //信息点和输入方式映射表
       updateInputShow: false, //是否显示临时维护输入框

+ 17 - 17
src/components/ledger/lib/bimDialog.vue

@@ -78,17 +78,16 @@ export default {
     init() {
       this.isShow = true
       this.$nextTick(function () {
-        if (this.bimcodeobj.FloorId) {
+        if (this.bimcodeobj.floorId) {
           this.isShow = false
         }
         if (this.$refs.floors) {
-          this.$refs.floors.setValue([this.bimcodeobj.BuildingId, this.bimcodeobj.FloorId])
+          this.$refs.floors.setValue([this.bimcodeobj.buildingId, this.bimcodeobj.floorId])
         }
       })
     },
     //切换楼层
     changeFloor(value) {
-      this.Buildfloor = value
       this.isShow = true
       if (value.length > 1) {
         this.isShow = false
@@ -132,10 +131,10 @@ export default {
         return
       }
       this.view.scene = this.drawMainScene
-      if (this.bimcodeobj.LocationJson) {
+      if (this.bimcodeobj.locationJson) {
         let obj = {
-          X: this.bimcodeobj.LocationJson.X,
-          Y: -this.bimcodeobj.LocationJson.Y,
+          X: this.bimcodeobj.locationJson.x,
+          Y: -this.bimcodeobj.locationJson.y,
         }
         //回写编辑
         this.drawMainScene.addMarker(obj)
@@ -143,8 +142,8 @@ export default {
       this.view.fitSceneToView()
       this.drawMainScene.isSpaceSelectable = false
       this.drawMainScene.spaceClick(this, this.canvasClick) //锚点触发
-      if (this.floorData.Outline && this.floorData.Outline.length) {
-        let newArr = this.floorData.Outline.map((t) => {
+      if (this.floorData.outline && this.floorData.outline.length) {
+        let newArr = this.floorData.outline.map((t) => {
           return new SPoint(t.X, t.Y)
         })
         this.drawMainScene.addSceneMark(newArr)
@@ -152,9 +151,9 @@ export default {
     },
     //获取楼层数据
     getFloorData() {
-      if (this.floorData && this.floorData.StructureInfo && this.floorData.StructureInfo.FloorMap) {
+      if (this.floorData && this.floorData.infos && this.floorData.infos.floorMap) {
         this.isdata = true
-        let floorMap = this.floorData.StructureInfo.FloorMap
+        let floorMap = this.floorData.infos.floorMap
         const temp = floorMap.split('.')[1];
         if (temp && (temp.toLowerCase() == 'png' || temp.toLowerCase() == 'jpg')) {
           this.initGraphy(floorMap, 3)
@@ -179,17 +178,18 @@ export default {
         if (this.drawMainScene.markerList.length) {
           let obj = this.drawMainScene.markerList[0], BIMLocation;
 
-          if (this.bimcodeobj.BIMLocation && this.bimcodeobj.BIMLocation.split(',')[2]) {
-            BIMLocation = `${obj.x.toFixed(2)},${(obj.y * -1).toFixed(2)},${this.bimcodeobj.BIMLocation.split(',')[2]}`
+          if (this.bimcodeobj.bimLocation && this.bimcodeobj.bimLocation.split(',')[2]) {
+            BIMLocation = `${obj.x.toFixed(2)},${(obj.y * -1).toFixed(2)},${this.bimcodeobj.bimLocation.split(',')[2]}`
           } else {
             BIMLocation = `${obj.x.toFixed(2)},${(obj.y * -1).toFixed(2)},0`
           }
+          const bfloor = this.$refs.floors.value
           let param = {
             content: [
               {
-                equipId: this.bimcodeobj.EquipID,
-                buildingId: this.Buildfloor[0],
-                floorId: this.Buildfloor[1],
+                id: this.bimcodeobj.id,
+                buildingId: bfloor[0] == 'noKnow'?undefined:bfloor[0],
+                floorId: bfloor[1] == 'noKnow'?undefined:bfloor[1],
                 bimLocation: BIMLocation
               },
             ],
@@ -216,12 +216,12 @@ export default {
     //得到floormap
     getFloorMap(val) {
       this.floorToMap = val
-      this.floorData = this.floorToMap[this.bimcodeobj.FloorId]
+      this.floorData = this.floorToMap[this.bimcodeobj.floorId]
       this.getFloorData()
     },
     // canvas点击事件
     canvasClick(item, event) {
-      if (item instanceof SGraphyItem) {
+      if (item instanceof SGraphItem) {
         this.clearMark()
         let obj = {
           X: event[0].x,

+ 5 - 5
src/views/ledger/cenotelist/index.vue

@@ -103,11 +103,11 @@ export default {
       },
       inputMap: {
         flowBuild: {
-          InputMode: 'D1',
-          Editable: true,
-          InfoPointCode: "flowBuild",
-          InfoPointName: "建筑楼层",
-          Path: "flowBuild"
+          inputMode: 'D1',
+          editable: true,
+          code: "flowBuild",
+          name: "建筑楼层",
+          path: "flowBuild"
         }
       }, //信息点和输入方式映射表
       updateInputShow: false, //是否显示临时维护输入框

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

@@ -149,11 +149,11 @@ export default {
       copyTableData: [],
       inputMap: {
         flowBuild: {
-          InputMode: 'D1',
-          Editable: true,
-          InfoPointCode: "flowBuild",
-          InfoPointName: "建筑楼层",
-          Path: "flowBuild"
+          inputMode: 'D1',
+          editable: true,
+          code: "flowBuild",
+          name: "建筑楼层",
+          path: "flowBuild"
         }
       }, //信息点和输入方式映射表
       updateInputShow: false, //是否显示临时维护输入框
@@ -264,7 +264,7 @@ export default {
       let params = {
         pageNumber: this.page.pageNumber,
         pageSize: this.page.pageSize,
-        orders: "createTime desc, EquipLocalName desc, EquipLocalID desc, EquipID desc",
+        orders: "createTime desc, localName desc, localId desc, id desc",
         filters: `category='${this.tabVal}';parentId='${this.deviceId}'`
       };
       await getEquipPartsCon(params, res => {
@@ -442,7 +442,7 @@ export default {
           readOnly: true
         },
         {
-          data: "PropertyLocalName",
+          data: "propertyLocalName",
           readOnly: true
         }
       );

+ 5 - 5
src/views/ledger/rentlist/index.vue

@@ -116,11 +116,11 @@ export default {
       },
       inputMap: {
         FloorId: {
-          InputMode: 'B1',
-          Editable: true,
-          InfoPointCode: "FloorId",
-          InfoPointName: "所属楼层",
-          Path: "FloorId"
+          inputMode: 'B1',
+          editable: true,
+          code: "FloorId",
+          name: "所属楼层",
+          path: "FloorId"
         }
       }, //信息点和输入方式映射表
       updateInputShow: false, //是否显示临时维护输入框

+ 8 - 8
src/views/ledger/spacelist/spaceadd/index.vue

@@ -93,11 +93,11 @@ export default {
       },
       inputMap: {
         flowBuild: {
-          InputMode: 'D1',
-          Editable: true,
-          InfoPointCode: "flowBuild",
-          InfoPointName: "建筑楼层",
-          Path: "flowBuild"
+          inputMode: 'D1',
+          editable: true,
+          code: "flowBuild",
+          name: "建筑楼层",
+          path: "flowBuild"
         }
       }, //信息点和输入方式映射表
       updateInputShow: false, //是否显示临时维护输入框
@@ -358,15 +358,15 @@ export default {
       let inputData = this.inputMap[val];
       switch (val) {
         //空间二维码图片
-        case 'RoomQRCode':
-          this.qrcodeUrl = this.tableData[row.row].RoomQRCode;
+        case 'qRCodePicgg':
+          this.qrcodeUrl = this.tableData[row.row].qRCodePic;
           if (!!this.qrcodeUrl) {
             this.myDialog.qrcode = true;
           } else {
             this.$message("此空间没有二维码");
           }
           break;
-        case 'Pic':
+        case 'pic':
           let Pdata = tools.dataForKey(this.tableData[row.row], val);
           this.imgsArr = Pdata ? Pdata : [];
           this.myDialog.uploadImgs = true;