Browse Source

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

shaun-sheep 4 years ago
parent
commit
ee19697b09

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

@@ -1697,35 +1697,35 @@ export function queryAllZoneType(param, success) {
 // 创建分区信息
 export function createZone(param, success) {
   let data = param.data
-  let url = `${baseUrl}${dataCenter}/${zone[param.zone]}/create-bd-fl`;
+  let url = `${baseUrl}${object}/${zone[param.zone]}/create-bd-fl`;
   http.postJson(url, data, success)
 }
 
 //删除分区信息
 export function deleteZone(param, success) {
   let data = param.data
-  let url = `${baseUrl}${dataCenter}/${zone[param.zone]}/delete`;
+  let url = `${baseUrl}${object}/${zone[param.zone]}/delete`;
   http.postJson(url, data, success)
 }
 
 //查询分区信息
 export function queryZone(param, success) {
   let data = param.data
-  let url = `${baseUrl}${dataCenter}/${zone[param.zone]}/query`;
+  let url = `${baseUrl}${object}/${zone[param.zone]}/query`;
   http.postJson(url, data, success)
 }
 
 //更新分区信息
 export function updateZone(param, success) {
   let data = param.data
-  let url = `${baseUrl}${dataCenter}/${zone[param.zone]}/update`;
+  let url = `${baseUrl}${object}/${zone[param.zone]}/update`;
   http.postJson(url, data, success)
 }
 
 //根据条件查询统计数量
 export function countZone(param, success) {
   let data = param.data
-  let url = `${baseUrl}${dataCenter}/${zone[param.zone]}/count`;
+  let url = `${baseUrl}${object}/${zone[param.zone]}/count`;
   http.postJson(url, data, success)
 }
 
@@ -2327,13 +2327,13 @@ export function zoneQuery(param, success) {
 
 //查询分区对象轮廓线
 export function zoneQueryOutline(param, success) {
-  let url = `${baseUrl}${object}/zone/query-outline`
+  let url = `${baseUrl}${object}/zone/outline/query`
   http.postJson(url, param, success)
 }
 
 //更新分区对象轮廓线
 export function zoneUpdateOutline(param, success) {
-  let url = `${baseUrl}${object}/zone/update-outline`
+  let url = `${baseUrl}${object}/zone/outline/update`
   http.postJson(url, param, success)
 }
 

+ 41 - 118
src/components/business_space/business/handsontable.vue

@@ -160,11 +160,11 @@ export default {
       zoneItemID: '',
       inputMap: {
         flowBuild: {
-          InputMode: 'D1',
-          Editable: true,
-          InfoPointCode: "flowBuild",
-          InfoPointName: "建筑楼层",
-          Path: "flowBuild"
+          inputMode: 'D1',
+          editable:true,
+          code:"flowBuild",
+          name:"建筑楼层",
+          path:"flowBuild"
         }
       }, //信息点和输入方式映射表
       updateInputShow: false, //是否显示临时维护输入框
@@ -197,8 +197,8 @@ export default {
     getHeader(headers, buildFloorSelectd) {
       this.headers = headers
       this.headers.forEach(item => {
-        if (item.Path) {
-          this.inputMap[item.Path] = item
+        if (item.path) {
+          this.inputMap[item.path] = item
         }
       })
       this.buildFloorSelectd = buildFloorSelectd
@@ -208,10 +208,10 @@ export default {
 
     getData() {
       this.zoneParam = {
-        ZoneType: this.zoneCode,
-        PageNumber: this.page.pageNumber,
-        PageSize: this.page.pageSize,
-        Orders: "createTime desc, RoomLocalName desc, RoomLocalID desc, RoomID asc"
+        objectType: this.zoneCode,
+        pageNumber: this.page.pageNumber,
+        pageSize: this.page.pageSize,
+        orders: "createTime desc, localName desc, localId desc, id asc"
       }
       if (this.buildFloorSelectd.length === 1) {
         switch (this.buildFloorSelectd[0]) {
@@ -239,7 +239,7 @@ export default {
         }
       }
       if (this.zoneItemID) {
-        this.zoneParam.Filters = `RoomID="${this.zoneItemID}"`
+        this.zoneParam.Filters = `id="${this.zoneItemID}"`
       }
       if (this.zoneCode != 'OtherZone') {
         this.isLoading = true
@@ -257,28 +257,28 @@ export default {
           this.main = []
         }
         this.isLoading = false
-        this.getOtherType();
+        // this.getOtherType();
       }
     },
     //查询空间信息
     getZoneMessage(param) {
       let params = param
-      params.Orders = "createTime desc, RoomID asc, RoomLocalName desc, RoomLocalID desc"
+      params.Orders = "createTime desc, id asc, localName desc, id desc"
       zoneQuery(params, res => {
         this.page.total = res.Total;
-        this.main = res.Content.map((item) => {
-          if (item.hasOwnProperty("BuildingId") && item.hasOwnProperty("FloorId")) {
-            item.flowBuild = item.BuildingId + "-" + item.FloorId
-          } else if (item.hasOwnProperty("BuildingId") && !item.hasOwnProperty("FloorId")) {
-            item.flowBuild = item.BuildingId
+        this.main = res.content.map((item) => {
+          if (item.hasOwnProperty("buildingId") && item.hasOwnProperty("floorId")) {
+            item.flowBuild = item.buildingId + "-" + item.floorId
+          } else if (item.hasOwnProperty("buildingId") && !item.hasOwnProperty("floorId")) {
+            item.flowBuild = item.buildingId
           }
-          if (item.Outline) {
-            item.Outline = JSON.stringify(item.Outline)
+          if (item.outline) {
+            item.outline = JSON.stringify(item.outline)
           }
           return item
         });
 
-        if (this.main && this.main.length && this.main[0].RoomID) {
+        if (this.main && this.main.length && this.main[0].id) {
           this.copyMain = tools.deepCopy(this.main);
           if (this.onlyRead) {
             this.getBatch(this.main)
@@ -288,70 +288,6 @@ export default {
         this.getMain()
       })
     },
-    // getData() {
-    //   if (this.zoneCode != 'OtherZone') {
-    //     this.isLoading = true
-    //     let params = {
-    //       zone: this.zoneCode,
-    //       data: {
-    //         Filters: ``,
-    //         Orders: "createTime desc, RoomID asc",
-    //         PageNumber: this.page.pageNumber,
-    //         PageSize: this.page.pageSize
-    //       }
-    //     }
-    //     if (this.buildFloorSelectd[0] == "noKnow") {
-    //       params.data.Filters += `buildingId isNull`
-    //     } else if (this.buildFloorSelectd[0] && this.buildFloorSelectd[0] != "all") {
-    //       params.data.Filters += `buildingId='${this.buildFloorSelectd[0]}'`
-    //     }
-    //     if (this.buildFloorSelectd.length > 1) {
-    //       if (this.buildFloorSelectd[1] == "noKnow") {
-    //         params.data.Filters += `;floorId isNull`
-    //       } else if (this.buildFloorSelectd[1] && this.buildFloorSelectd[1] != "all") {
-    //         params.data.Filters += `;floorId='${this.buildFloorSelectd[1]}'`
-    //       }
-    //     }
-    //     if (this.zoneItemID) {
-    //       params.data.Filters += `;RoomID='${this.zoneItemID}'`
-    //     }
-    //     if (!params.data.Filters) {
-    //       delete params.data.Filters
-    //     }
-    //     // if (this.buildFloorSelectd.length && this.buildFloorSelectd[0] && this.buildFloorSelectd[1]) {
-    //     //   params.data.Filters = `BuildingId='${this.buildFloorSelectd[0]}';FloorId='${this.buildFloorSelectd[1]}'`
-    //     // }
-    //     // else if (buildFloorSelectd.length && buildFloorSelectd[0] && !buildFloorSelectd[1]) {
-    //     //   params.data.Filters = `BuildingId='${buildFloorSelectd[0]}'`
-    //     // } else {
-    //     //   params.data.Filters = `BuildingId='';FloorId=''`
-    //     // }
-    //
-    //     queryZone(params, res => {
-    //       this.page.total = res.Total
-    //       this.main = res.Content.map((item) => {
-    //         if (item.hasOwnProperty("BuildingId") && item.hasOwnProperty("FloorId")) {
-    //           item.flowBuild = item.BuildingId + "-" + item.FloorId
-    //         } else if (item.hasOwnProperty("BuildingId") && !item.hasOwnProperty("FloorId")) {
-    //           item.flowBuild = item.BuildingId
-    //         }
-    //         return item
-    //       });
-    //       if (this.main && this.main.length && this.main[0].RoomID) {
-    //         this.copyMain = tools.deepCopy(this.main);
-    //         if (this.onlyRead) {
-    //           this.getBatch(this.main)
-    //         }
-    //       }
-    //       this.isLoading = false
-    //       this.getMain()
-    //     })
-    //   } else {
-    //     // 其他分区类型查询表数据接口
-    //     this.isLoading = false
-    //     this.getOtherType();
-    //   }
-    // },
     //获取表格主体内容
     getMain() {
       if (!!this.hot) {
@@ -435,10 +371,10 @@ export default {
       let val = this.hot.colToProp(row.col);
       this.row = row.row;
       let inputData = this.inputMap[val];
-      lStorage.set('screen_data', { path: this.$route.path, data: { RoomID: infos.RoomID, zone: this.zoneCode } })
+      lStorage.set('screen_data', {path: this.$route.path, data: {RoomID: infos.id, zone: this.zoneCode}})
       if (val == "point") {
         let query = {
-          RoomID: infos.RoomID,
+          RoomID: infos.id,
           zone: this.zoneCode,
           isMyTab: 2,
           buildFloorSelectd: this.buildFloorSelectd
@@ -454,14 +390,16 @@ export default {
         } else {
           this.$message("此空间没有二维码")
         }
-      } else if (val == "Pic") {
+      } else if (val == "pic") {
         let Picdata = tools.dataForKey(this.main[row.row], val);
         this.imgsArr = Picdata ? Picdata : [];
         if (!this.onlyRead || this.imgsArr.length) {
           this.myDialog.uploadImgs = true;
         }
       }
-
+      console.log('=============');
+      console.log(inputData);
+      console.log('=============');
       if (!this.onlyRead && !inputData.editable) {
         this.$message("该信息点的值为自动生成,不可人工维护!");
         return false;
@@ -495,7 +433,7 @@ export default {
           let param = handsonUtils.getParam(changeData, source, this.hot, trimmedArr);
           let data = []
           for (let i = 0; i < param.length; i++) {
-            if (param[i].RoomID) {
+            if (param[i].id) {
               data.push(param[i])
             } else {
               this.handleCreateZone(param[i])
@@ -521,8 +459,8 @@ export default {
       }
       let param = []
       params.map(item => {
-        if (item.RoomID)
-          param.push({ RoomID: item.RoomID })
+        if (item.id)
+          param.push({ id: item.id })
       })
       params.map(i => i.ObjectType = this.zoneParam.ZoneType ? this.zoneParam.ZoneType : i.ObjectType);
       this.$confirm("此操作将删除业务空间,是否继续?", "提示", {
@@ -547,7 +485,7 @@ export default {
           delete param[key]
         }
       })
-      if (!param.RoomLocalName) {
+      if (!param.localName) {
         this.$message("新增业务空间本地名称不能为空!")
         return
       }
@@ -556,37 +494,22 @@ export default {
         return
       }
       if (param.flowBuild) {
-
-        param.BuildingId = param.flowBuild.split('-')[0]
-        param.FloorId = param.flowBuild.split('-')[1] || null
+        param.buildingId = param.flowBuild.split('-')[0]
+        param.floorId = param.flowBuild.split('-')[1] || null
       } else {
         if (this.buildFloorSelectd) {
           if (this.buildFloorSelectd[0] != 'all' && this.buildFloorSelectd[0] != 'noKnow') {
-            param.BuildingId = this.buildFloorSelectd[0]
+            param.buildingId = this.buildFloorSelectd[0]
           }
           if (this.buildFloorSelectd[1] && this.buildFloorSelectd[1] != 'all' && this.buildFloorSelectd[1] != 'noKnow') {
-            param.FloorId = this.buildFloorSelectd[1]
+            param.floorId = this.buildFloorSelectd[1]
           }
         }
       }
-
-      param.ObjectType = this.zoneParam.ZoneType ? this.zoneParam.ZoneType : this.zoneCode;
+      param.objectType = this.zoneParam.ZoneType ? this.zoneParam.ZoneType : this.zoneCode;
       let params = {
         Content: [param]
       };
-
-      // let params = {
-      //   zone: this.zoneCode,
-      //   data: {
-      //     Content: [param]
-      //   }
-      // }
-      // createZone(params, res => {
-      //
-      //   this.$message.success("添加成功!")
-      //   this.getData()
-      // })
-
       zoneCreate(params, res => {
         this.$message.success("添加成功!")
         this.getData()
@@ -646,7 +569,7 @@ export default {
         let pa = param.data.Content.map(t => {
           return {
             Type: this.zoneCode,
-            SpaceId: t.RoomID,
+            SpaceId: t.id,
             Id: t.FloorId || t.BuildingId || null,
           }
         })
@@ -730,8 +653,8 @@ export default {
             let cur = tools.dataForKey(item, head.Path);
             if (cur) {
               param.data.criterias.push({
-                id: item.RoomID,
-                code: head.InfoPointCode
+                id: item.id,
+                code: head.code
               });
             }
           });
@@ -796,7 +719,7 @@ export default {
       let arr = tools.copyArr(list)
       let data = showTools.headerTypeFilter(arr, "space", this.onlyRead, this.showType)
       data.unshift({
-        data: "Outline",
+        data: "outline",
         renderer: this.myRenderer,
         readOnly: true
       }, {

+ 1 - 1
src/components/business_space/dialogs/influenceDialog.vue

@@ -8,7 +8,7 @@
                     <span slot="label">{{item.name}}</span>
                     <p style="line-height:30px;font-size:20px;margin-bottom: 20px;">受影响的业务空间</p>
                     <div v-for="(i,iIndex) in mess" :key="iIndex">
-                        <p style="line-height:20px;margin-left:10px;">{{i.RoomLocalName || '--'}} - {{i.RoomLocalID || '--'}}</p>
+                        <p style="line-height:20px;margin-left:10px;">{{i.localName || '--'}} - {{i.id || '--'}}</p>
                     </div>
                 </el-tab-pane>
             </el-tabs>

+ 140 - 145
src/components/business_space/newGraphy/graphy.vue

@@ -111,7 +111,7 @@
         <el-button size="small" type="primary" @click="confirm">确认</el-button>
       </span>
     </el-dialog>
-    <dialogZone ref="zone" @createSuccess="getOtherType" />
+    <!-- <dialogZone ref="zone" @createSuccess="getOtherType" /> -->
   </div>
 </template>
 <script>
@@ -122,7 +122,7 @@
   import {colorArr} from "@/utils/spaceColor"
   import unRelateBSP from "./unRelateBSP";
   import createBSP from "./createBSP";
-  import dialogZone from "../../ledger/addDialog/dialogZone";
+  // import dialogZone from "../../ledger/addDialog/dialogZone";
   import {
     createRelateInZoneAndISp,
     getIspNotInSpace,
@@ -132,6 +132,7 @@
     queryZone,
     zoneCount,
     zoneCreate,
+    zoneQuery,
     zoneQueryOutline,
     zoneUpdate,
     zoneUpdateOutline
@@ -142,7 +143,7 @@
       canvasFun,
       unRelateBSP,
       createBSP,
-      dialogZone
+      // dialogZone
     },
     data() {
       return {
@@ -250,14 +251,15 @@
         }
       }
       queryZone(pa, res => {
-        if (res.Message == this.buildFloor[1]) {
+        if (res.message == this.buildFloor[1]) {
           this.BIMIDToSID = {}
           this.BIMIDToSIName = {}
           this.sourceIdToISP = {}
-          res.Content.map(t => {
+          res.content.map(t => {
+            ////----
             let key = t.BIMID.split(":")[1];
-            this.BIMIDToSID[key] = t.RoomID;
-            this.BIMIDToSIName[key] = t.RoomLocalName || t.RoomName;
+            this.BIMIDToSID[key] = t.id;
+            this.BIMIDToSIName[key] = t.localName || t.name;
             this.sourceIdToISP[key] = t;
           })
         }
@@ -279,7 +281,7 @@
     // 过滤器
     createFilter(queryString) {
       return restaurant => {
-        return restaurant.data.RoomLocalName.indexOf(queryString) > -1;
+        return restaurant.data.localName.indexOf(queryString) > -1;
       };
     },
     // 查询选中,定位
@@ -296,19 +298,19 @@
     // 父组件调用
     getData(buildFloor, FloorObj, tab) {
       let initType = 1;
-      if (FloorObj.FloorID == this.FloorObj.FloorID) {
+      if (FloorObj.id == this.FloorObj.id) {
         initType = 2;
       }
       this.buildFloor = buildFloor;
       this.FloorObj = FloorObj;
-      this.FloorMap = FloorObj.StructureInfo ? FloorObj.StructureInfo.FloorMap : '';
+      this.FloorMap = FloorObj.infos ? FloorObj.infos.floorMap : '';
       this.tab = tab;
       this.buildFloorName = `${FloorObj.buildName}-${FloorObj.label}`;
       console.log(arguments);
       if (tab.code == "OtherZone") {
         // 其他分区
         this.showOtherFlag = true
-        this.getOtherType();
+        // this.getOtherType();
         // this.OtherValue = (localStorage.getItem('otherZone')) || ''
       } else {
         this.showOtherFlag = false;
@@ -316,33 +318,31 @@
       this.init(initType);
     },
     // 其他分区类型查询
-    getOtherType() {
-      let pa = {
-        cascade: [{ name: 'zoneType', filters: `projectId='${this.projectId}'` }],
-        filters: `code="otherZone"`
-      }
-      queryAllZoneType(pa, res => {
-        if (res.content[0].zoneType && res.content[0].zoneType.length) {
-          this.options = res.content[0].zoneType.map(t => {
-            t.value = t.code;
-            t.label = t.name;
-            return t;
-          })
-        } else {
-          this.options = []
-        }
-      })
-    },
+    // getOtherType() {
+    //   let pa = {
+    //     Cascade: [{ Filters: `ProjectId='${this.projectId}'` }],
+    //     Filters: `Code="OtherZone"`
+    //   }
+    //   queryAllZoneType(pa, res => {
+    //     if (res.content[0].zoneType && res.content[0].zoneType.length) {
+    //       this.options = res.content[0].zoneType.map(t => {
+    //         t.value = t.code;
+    //         t.label = t.name;
+    //         return t;
+    //       })
+    //     } else {
+    //       this.options = []
+    //     }
+    //   })
+    // },
     // 其他类型下拉change
     changeOtherZone(val) {
       this.init(2);
-      // localStorage.setItem('otherZone', val)
     },
     // 获取未绑定业务空间的元空间
     getISPSPUnrelaBSP() {
       let pa = {
         data: {
-          // Filters: `FloorId='${this.buildFloor[1]}'`,
           PageSize: 1000,
           FloorId: this.buildFloor[1]
         },
@@ -351,8 +351,8 @@
       getIspNotInSpace(pa, res => {
         // 类型需要重新获取,直接取pa.objecttype有问题
         let tempType = this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code
-        if (res.FloorId == this.buildFloor[1] && res.ZoneType == tempType) {
-          this.allUnRelatISP = res.Content;
+        if (res.floorId == this.buildFloor[1] && res.zoneType == tempType) {
+          this.allUnRelatISP = res.content;
         }
       })
     },
@@ -382,8 +382,8 @@
       }
       that.view.scene = that.scene;
       // 蒙版
-      if (this.FloorObj.Outline) {
-        let newArr = this.FloorObj.Outline.map(t => {
+      if (this.FloorObj.outline) {
+        let newArr = this.FloorObj.outline.map(t => {
           return new SPoint(t.X, t.Y);
         })
         this.scene.addSceneMark(newArr)
@@ -402,44 +402,39 @@
       this.canvasLoading = true
       let ObjectType = this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code;
       let pa = {
-        ZoneType: ObjectType,
-        Filters: `not RoomID isNull`,
-        Orders: "createTime desc, RoomID asc",
-        PageSize: 10000
+        cascader: [{name: 'spaceOutline'}],
+        classCode: ObjectType,
+        filters: `not id isNull`,
+        orders: "createTime desc, id asc",
+        pageSize: 10000
       }
       if (this.buildFloor.length && this.buildFloor.length > 1) {
         pa.BuildingId = this.buildFloor[0];
         pa.FloorId = this.buildFloor[1];
       }
-      zoneQueryOutline(pa, res => {
+      zoneQuery(pa, res => {
         // 类型需要重新获取,直接取pa.ZoneType
         let tempType = this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code;
-        if (res.FloorId == this.buildFloor[1] && res.ZoneType == tempType) {
+        if (res.floorId == this.buildFloor[1] && res.zoneType == tempType) {
           // 所有业务空间
-          this.businessSpaceList = res.Content;
+          this.businessSpaceList = res.content;
           // 已关联元空间的业务空间
           this.BSPRelaISPList = [];
-          res.Content.map(t => {
-            if (t.Outline && t.Outline.length) {
+          res.content.map(t => {
+            if (t.outline && t.outline.length) {
               this.BSPRelaISPList.push(t)
             }
           })
           // 绘制业务空间
           let tempArr = this.BSPRelaISPList.map((t, i) => {
-            // if (t.FloorId == this.buildFloor[1] && t.ObjectType == tempType) {
             return {
-              RoomLocalName: t.RoomLocalName,
-              OutLine: t.Outline,
-              RoomID: t.RoomID,
+              RoomLocalName: t.localName,
+              OutLine: t.outline,
+              RoomID: t.id,
               Color: colorArr[i % colorArr.length],
-              Infected: t.State
+              Infected: t.state
             }
-            // } else {
-            //   console.log('internet slow')
-            //   return undefined;
-            // }
           }).filter(item => item)
-          console.log(this.scene)
           this.scene.removeAllZone();
           this.scene.addZoneList(tempArr);
           this.scene.click(this, this.canvasClick);
@@ -476,7 +471,7 @@
           this.curZoneItem = item;
           this.scene.clearZoneSelection();
           item.selected = true;
-          this.$emit('copyID', this.curZoneItem.data.RoomID)
+          this.$emit('copyID', this.curZoneItem.data.id)
         }
       }
     },
@@ -532,13 +527,13 @@
     groupCreateBSpace() {
       let text = []
       let Spaces = this.allUnRelatISP.map(t => {
-        if (t.Outline) {
+        if (t.outline) {
           let area = 0;
-          if (t.Outline[0]) {
-            area = this.getarea(t.Outline[0]);
-            if (t.Outline.length > 1) {
-              for (let i = 1; i < t.Outline.length; i++) {
-                let temp = this.getarea(t.Outline[i]);
+          if (t.outline[0]) {
+            area = this.getarea(t.outline[0]);
+            if (t.outline.length > 1) {
+              for (let i = 1; i < t.outline.length; i++) {
+                let temp = this.getarea(t.outline[i]);
                 area = area - temp
               }
             }
@@ -549,17 +544,17 @@
           } else {
             return undefined;
           }
-          text.push(t.RoomLocalName || t.RoomName)
+          text.push(t.localName || t.name)
           let obj = {
-            IspaceId: t.RoomID,
-            RoomLocalName: t.RoomLocalName || t.RoomName,
-            Outline: [t.Outline],
+            IspaceId: t.id,
+            RoomLocalName: t.localName || t.name,
+            Outline: [t.outline],
             BuildingId: this.buildFloor[0],
             FloorId: this.buildFloor[1],
             Height: this.spaceHeight
           }
-          if (t.CustomParam) {
-            obj.CustomParam = t.CustomParam
+          if (t.customParam) {
+            obj.customParam = t.customParam
           }
           return obj;
         } else {
@@ -599,7 +594,7 @@
       if (arr.length) {
         let tempArr = [];
         arr.map(t => {
-          tempArr.push(this.BIMIDToSIName[t.data.SourceId]);
+          tempArr.push(this.BIMIDToSIName[t.data.sourceId]);
         })
         this.$refs.createBSP.showDialog(tempArr.toString());
       } else {
@@ -608,7 +603,7 @@
     },
     // 根据图创建新的业务空间-弹窗返回确认创建
     createRoom(val) {
-      const zoneObj = { Outline: [], Height: 0 }, IspaceIdList = [];
+      const zoneObj = { outline: [], height: 0 }, IspaceIdList = [];
       let spaces = {};
       try {
         if (this.scene.cutItem || this.scene.sceneMark) {
@@ -633,28 +628,28 @@
             return temp;
           })
           let newarr = this.makeMaxAreaFirst(spaces[key])
-          zoneObj.Outline.push(newarr);
+          zoneObj.outline.push(newarr);
           let curISP = this.sourceIdToISP[key];
           if (curISP) {
-            curISP && IspaceIdList.push(curISP.RoomID);
-            zoneObj.Height = this.spaceHeight;
+            curISP && IspaceIdList.push(curISP.id);
+            zoneObj.height = this.spaceHeight;
           }
         }
       } catch (err) {
         console.log(err)
         let selectSpaces = this.scene.getSelectedSpaces();
         selectSpaces.map(t => {
-          zoneObj.Outline.push(t.data.OutLine);
-          let key = t.data.SourceId;
+          zoneObj.outline.push(t.data.outLine);
+          let key = t.data.sourceId;
           let curISP = this.sourceIdToISP[key];
           if (curISP) {
-            IspaceIdList.push(curISP.RoomID);
-            zoneObj.Height = this.spaceHeight;
+            IspaceIdList.push(curISP.id);
+            zoneObj.height = this.spaceHeight;
           }
         })
         // 如果有划分,求交集
         if (this.scene.cutItem || this.scene.sceneMark) {
-          zoneObj.Outline = [];
+          zoneObj.outline = [];
           let arr = this.scene.getIntersect();
           arr.map(t => {
             let temp = t.map(item => {
@@ -664,23 +659,23 @@
                 Z: 0
               }
             })
-            zoneObj.Outline.push([temp]);
+            zoneObj.outline.push([temp]);
           })
         }
       }
       // 至此
-      if (!zoneObj.Outline.length) {
-        zoneObj.Outline = null;
+      if (!zoneObj.outline.length) {
+        zoneObj.outline = null;
       }
-      zoneObj.RoomLocalName = val;
-      zoneObj.BuildingId = this.buildFloor[0];
-      zoneObj.FloorId = this.buildFloor[1];
+      zoneObj.localName = val;
+      zoneObj.buildingId = this.buildFloor[0];
+      zoneObj.floorId = this.buildFloor[1];
       this.createSingleBSP(zoneObj, IspaceIdList)
     },
     // 根据图从未关联平面图的业务空间中选择--按钮返回关联信号
     createFromUnrelated(zoneObj) {
-      zoneObj.Outline = [];
-      zoneObj.Height = 0;
+      zoneObj.outline = [];
+      zoneObj.height = 0;
       let spaces = {}, IspaceIdList = [];
       try {
         if (this.scene.cutItem || this.scene.sceneMark) {
@@ -705,28 +700,28 @@
             return temp;
           })
           let newarr = this.makeMaxAreaFirst(spaces[key])
-          zoneObj.Outline.push(newarr);
+          zoneObj.outline.push(newarr);
           let curISP = this.sourceIdToISP[key];
           if (curISP) {
-            curISP && IspaceIdList.push(curISP.RoomID);
-            zoneObj.Height = this.spaceHeight;
+            curISP && IspaceIdList.push(curISP.id);
+            zoneObj.height = this.spaceHeight;
           }
         }
       } catch (err) {
         console.log(err);
         let selectSpaces = this.scene.getSelectedSpaces();
         selectSpaces.map(t => {
-          zoneObj.Outline.push(t.data.OutLine);
-          let key = t.data.SourceId;
+          zoneObj.outline.push(t.data.outLine);
+          let key = t.data.sourceId;
           let curISP = this.sourceIdToISP[key];
           if (curISP) {
-            curISP && IspaceIdList.push(curISP.RoomID);
-            zoneObj.Height = this.spaceHeight;
+            curISP && IspaceIdList.push(curISP.id);
+            zoneObj.height = this.spaceHeight;
           }
         })
         // 如果有划分,求交集
         if (this.scene.cutItem || this.scene.sceneMark) {
-          zoneObj.Outline = [];
+          zoneObj.outline = [];
           let arr = this.scene.getIntersect();
           arr.map(t => {
             let temp = t.map(item => {
@@ -736,12 +731,12 @@
                 Z: 0
               }
             })
-            zoneObj.Outline.push([temp]);
+            zoneObj.outline.push([temp]);
           })
         }
       }
-      if (!zoneObj.Outline.length) {
-        zoneObj.Outline = null;
+      if (!zoneObj.outline.length) {
+        zoneObj.outline = null;
       }
       this.updateBSPOutline(zoneObj, IspaceIdList)
     },
@@ -749,7 +744,7 @@
     editeSpaceDetail() {
       let item = this.curZoneItem.data;
       let query = {
-        RoomID: item.RoomID,
+        RoomID: item.id,
         zone: this.tab.code,
         isMyTab: 1,
         buildFloorSelectd: this.buildFloor
@@ -777,7 +772,7 @@
     confirmZoneSpace() {
       let ObjectType = this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code;
       let space = {
-        RoomID: this.curZoneItem.data.RoomID,
+        RoomID: this.curZoneItem.data.id,
         State: 0,
         ObjectType: ObjectType
       }
@@ -801,26 +796,26 @@
       let selectSpace = this.scene.getSelectedSpaces();
       let selectLikeSpace = this.scene.getSelectedLikeSpace();
       //更新业务空间
-      let zoneObj = { Outline: [], Height: 0, State: this.confirmAndSaveFlag ? 0 : this.curZoneItem.isInfected ? 1 : 0 }, IspaceIdList = [];
+      let zoneObj = { outline: [], height: 0, state: this.confirmAndSaveFlag ? 0 : this.curZoneItem.isInfected ? 1 : 0 }, IspaceIdList = [];
       // 空间
       selectSpace.map(t => {
-        zoneObj.Outline.push(t.data.OutLine);
-        if (this.BIMIDToSID[t.data.SourceId]) {
-          IspaceIdList.push(this.BIMIDToSID[t.data.SourceId]);
+        zoneObj.outline.push(t.data.outLine);
+        if (this.BIMIDToSID[t.data.sourceId]) {
+          IspaceIdList.push(this.BIMIDToSID[t.data.sourceId]);
         }
 
         // if (t.Height && (zoneObj.Height == 0 || t.Height < zoneObj.Height)) {
         //   zoneObj.Height = t.Height > 100 ? (t.Height / 1000).toFixed(2) : t.Height;
-        zoneObj.Height = this.spaceHeight
+        zoneObj.height = this.spaceHeight
         // }
       })
       // 类空间
       selectLikeSpace.map(t => {
-        zoneObj.Outline.push(t.data);
+        zoneObj.outline.push(t.data);
       })
       // 如果有划分,求交集
       if (this.scene.cutItem || this.scene.sceneMark) {
-        zoneObj.Outline = [];
+        zoneObj.outline = [];
         let spaceIntersect = this.scene.getIntersect();
         spaceIntersect.map(t => {
           let temp = t.map(item => {
@@ -830,7 +825,7 @@
               Z: 0
             }
           })
-          zoneObj.Outline.push([temp]);
+          zoneObj.outline.push([temp]);
         })
         let likeSpaceIntersect = this.scene.getLikeIntersect();
         likeSpaceIntersect.map(t => {
@@ -841,13 +836,13 @@
               Z: 0
             }
           })
-          zoneObj.Outline.push([temp]);
+          zoneObj.outline.push([temp]);
         })
       }
-      if (!zoneObj.Outline.length) {
-        zoneObj.Outline = null;
+      if (!zoneObj.outline.length) {
+        zoneObj.outline = null;
       }
-      zoneObj.RoomID = this.curZoneItem.data.RoomID;
+      zoneObj.id = this.curZoneItem.data.id;
       this.updateBSPOutline(zoneObj, IspaceIdList)
     },
     // 根据图批量创建所选业务空间
@@ -866,7 +861,7 @@
           spaces = this.scene.getZoneDifference();
         }
         for (let key in spaces) {
-          let zoneObj = { Outline: [], Height: 0 }
+          let zoneObj = { outline: [], height: 0 }
           spaces[key] = spaces[key].map(t => {
             let temp = t.map(item => {
               return {
@@ -878,12 +873,12 @@
             return temp;
           })
           let newarr = this.makeMaxAreaFirst(spaces[key])
-          zoneObj.Outline.push(newarr);
-          if (!zoneObj.Outline.length) {
+          zoneObj.outline.push(newarr);
+          if (!zoneObj.outline.length) {
             continue
           }
           //计算面积
-          let area = 0, line = zoneObj.Outline;
+          let area = 0, line = zoneObj.outline;
           for (let i = 0; i < line.length; i++) {
             for (let j = 0; j < line[i].length; j++) {
               if (j == 0) {
@@ -900,13 +895,13 @@
           //生成空间对象
           let curISP = this.sourceIdToISP[key];
           if (curISP) {
-            zoneObj.Height = this.spaceHeight;
+            zoneObj.height = this.spaceHeight;
             // zoneObj.Height = zoneObj.Height == 0 ? curISP.Height : zoneObj.Height > curISP.Height ? curISP.Height : zoneObj.Height;
-            zoneObj.IspaceId = curISP.RoomID;
-            zoneObj.RoomLocalName = curISP.RoomLocalName;
+            zoneObj.ispaceId = curISP.id;
+            zoneObj.localName = curISP.localName;
           }
-          zoneObj.BuildingId = this.buildFloor[0];
-          zoneObj.FloorId = this.buildFloor[1];
+          zoneObj.buildingId = this.buildFloor[0];
+          zoneObj.floorId = this.buildFloor[1];
           createSpaces.push(zoneObj);
         }
       } catch (err) {
@@ -947,17 +942,17 @@
               }
             }
             return {
-              IspaceId: this.BIMIDToSID[t.data.SourceId],
-              RoomLocalName: this.BIMIDToSIName[t.data.SourceId],
-              Outline: line,
-              BuildingId: this.buildFloor[0],
-              FloorId: this.buildFloor[1],
-              Height: this.spaceHeight
+              ispaceId: this.BIMIDToSID[t.data.sourceId],
+              localName: this.BIMIDToSIName[t.data.sourceId],
+              outline: line,
+              buildingId: this.buildFloor[0],
+              floorId: this.buildFloor[1],
+              height: this.spaceHeight
             }
           }).filter(item => item)
         } else {
           createSpaces = arr.map(t => {
-            let line = t.data.OutLine;
+            let line = t.data.outLine;
             if (!line || !line.length) {
               return undefined
             } else {
@@ -973,12 +968,12 @@
               }
             }
             return {
-              IspaceId: this.BIMIDToSID[t.data.SourceId],
-              RoomLocalName: this.BIMIDToSIName[t.data.SourceId],
-              Outline: [line],
-              BuildingId: this.buildFloor[0],
-              FloorId: this.buildFloor[1],
-              Height: this.spaceHeight
+              ispaceId: this.BIMIDToSID[t.data.sourceId],
+              roomLocalName: this.BIMIDToSIName[t.data.sourceId],
+              outline: [line],
+              buildingId: this.buildFloor[0],
+              floorId: this.buildFloor[1],
+              height: this.spaceHeight
             }
           }).filter(item => item);
         }
@@ -1010,7 +1005,7 @@
     },
     // 批量更新业务空间和元空间的关系
     groupCreRelaZoneAndISp(Spaces) {
-      Spaces = Spaces.filter(item => item.IspaceId);
+      Spaces = Spaces.filter(item => item.ispaceId);
       let ObjectType = this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code;
       if (Spaces.length) {
         let param = {
@@ -1043,10 +1038,10 @@
         Content: spaces,
       }
       zoneCreate(pa, res => {
-        res.EntityList.map(t => {
+        res.entityList.map(t => {
           spaces = spaces.map(item => {
-            if (t.RoomLocalName == item.RoomLocalName) {
-              item.SpaceId = t.RoomID
+            if (t.localName == item.localName) {
+              item.spaceId = t.id
             }
             return item;
           })
@@ -1057,22 +1052,22 @@
     // 单个创建
     createSingleBSP(space, IspaceIdList) {
       let ObjectType = this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code;
-      space.BIMLocation = space.Outline ? this.getAverageVal(space.Outline) : null;
+      space.BIMLocation = space.outline ? this.getAverageVal(space.outline) : null;
       space.ObjectType = ObjectType;
       let pa = {
         Content: [space]
       }
       zoneCreate(pa, res => {
-        this.relationInBSPandISP(res.EntityList[0].RoomID, IspaceIdList)
+        this.relationInBSPandISP(res.entityList[0].id, IspaceIdList)
       })
     },
     // 更新业务空间区域
     updateBSPOutline(zoneObj, IspaceIdList) {
       let ObjectType = this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code;
-      zoneObj.BIMLocation = zoneObj.Outline ? this.getAverageVal(zoneObj.Outline) : null;
+      zoneObj.BIMLocation = zoneObj.outline ? this.getAverageVal(zoneObj.outline) : null;
       zoneObj.ObjectType = ObjectType;
-      zoneObj.BuildingId = this.buildFloor[0];
-      zoneObj.FloorId = this.buildFloor[1];
+      zoneObj.buildingId = this.buildFloor[0];
+      zoneObj.floorId = this.buildFloor[1];
       let pa = {
         Content: [zoneObj],
         Projection: ['BIMLocation', 'ObjectType', 'Outline', 'Height', 'BuildingId', 'FloorId']
@@ -1085,19 +1080,19 @@
     // 从未关联平面图的业务空间中选择时更新业务空间建筑楼层
     updateZoneBF(zoneObj, IspaceIdList) {
       let pa = [{
-        Type: zoneObj.ObjectType,
-        SpaceId: zoneObj.RoomID,
-        Id: zoneObj.FloorId,
+        type: zoneObj.classCode,
+        spaceId: zoneObj.id,
+        id: zoneObj.floorId,
       }]
       handleZoneUpdateBd(pa, res => {
-        this.relationInBSPandISP(zoneObj.RoomID, IspaceIdList)
+        this.relationInBSPandISP(zoneObj.id, ispaceIdList)
       })
     },
     // 查询未关联平面图的业务空间(项目下+当前分区)
     getBSPunrelaISP() {
       let ObjectType = this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code;
       let pa = {
-        Filters: `Outline isNull;ObjectType="${ObjectType}"`
+        Filters: `outline isNull;classCode="${ObjectType}"`
       }
       zoneCount(pa, res => {
         this.num = res.count;

+ 1 - 1
src/components/business_space/newGraphy/unRelateBSP.vue

@@ -136,7 +136,7 @@ export default {
       let pa = {
         ZoneType: this.code,
         Filters: `Outline isNull`,
-        Orders: "createTime desc, RoomID asc",
+        Orders: "createTime desc, id asc",
         PageSize: this.page.pageSize,
         pageNumber: this.page.pageNumber
       }

+ 1 - 1
src/components/business_space/newTables/eqToSpaceTable.vue

@@ -132,7 +132,7 @@ export default {
     getTableData() {
       this.loading = true;
       let pa = {
-        Filters: `RoomID='${this.params.RoomID}'`,
+        Filters: `id='${this.params.RoomID}'`,
         Cascade: [
           {
             Name: this.type.replace(this.type[0], this.type[0].toLowerCase()),

+ 1 - 1
src/components/business_space/newTables/syInSpaceTable.vue

@@ -103,7 +103,7 @@ export default {
       this.loading = true;
       let pa = {
         Cascade: [{ Name: "generalSystem" }],
-        Filters: `RoomID="${this.params.RoomID}"`,
+        Filters: `id="${this.params.RoomID}"`,
         ZoneType: this.params.zone
       }
       zoneQuery(pa, res => {

+ 1 - 1
src/components/dialogs/influenceDialog.vue

@@ -11,7 +11,7 @@
             <span slot="label">{{item.name}}</span>
             <p style="line-height:30px;font-size:20px;margin-bottom: 20px;">受影响的业务空间</p>
             <div v-for="i in mess">
-              <p style="line-height:20px;margin-left:10px;">{{i.RoomLocalName || '--'}} - {{i.RoomLocalID || '--'}}</p>
+              <p style="line-height:20px;margin-left:10px;">{{i.localName || '--'}} - {{i.id || '--'}}</p>
             </div>
           </el-tab-pane>
         </el-tabs>

+ 2 - 2
src/components/ledger/cenote/dialog/addSpaceDialog.vue

@@ -24,7 +24,7 @@
             {{scope.row.RoomLocalName||scope.row.RoomName||''}}
           </template>
         </el-table-column>
-        <el-table-column prop="RoomLocalID" :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100"></el-table-column>
+        <el-table-column prop="localId" :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100"></el-table-column>
         <el-table-column prop :label="`所属建筑楼层`" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">
             {{ scope.row.BuildingId && floorType[scope.row.BuildingId]? ((floorType[scope.row.BuildingId] || '') + (scope.row.FloorId && floorType[scope.row.FloorId] ? (' - ' + floorType[scope.row.FloorId] || '') : '')) : ''}}
@@ -126,7 +126,7 @@ export default {
       let params = {
         data: {
           Filters: "not RoomID isNull",
-          Orders: "RoomLocalName desc",
+          Orders: "localName desc",
           PageNumber: this.page.pageNumber,
           PageSize: this.page.pageSize
         },

+ 2 - 2
src/components/ledger/cenote/relatedSpaceList.vue

@@ -21,7 +21,7 @@
         </el-table-column>
         <el-table-column prop='RoomLocalName' label='业务空间本地名称' show-overflow-tooltip min-width="200" header-align='center' align="center">
         </el-table-column>
-        <el-table-column prop='RoomLocalID' label='业务空间本地编码' show-overflow-tooltip min-width="200" header-align='center' align="center">
+        <el-table-column prop='localId' label='业务空间本地编码' show-overflow-tooltip min-width="200" header-align='center' align="center">
         </el-table-column>
         <el-table-column v-if="!$route.query.onlyRead" prop='' label='操作' show-overflow-tooltip min-width="90" header-align='center' align='center'>
           <template slot-scope="scope">
@@ -74,7 +74,7 @@ export default {
       let params = {
         data: {
           Filters: "not RoomID isNull",
-          Orders: "RoomLocalName desc",
+          Orders: "localName desc",
           PageNumber: this.page.pageNumber,
           PageSize: this.page.pageSize
         },

+ 1 - 1
src/components/ledger/lib/cenoteGraphy.vue

@@ -138,7 +138,7 @@ export default {
         let params = {
           data: {
             Filters: `not RoomID isNull;ObjectType = '${this.space}';buildingId = '${this.buildingData[0]}';floorId = '${this.buildingData[1]}'`,
-            Orders: "RoomLocalName desc"
+            Orders: "localName desc"
           },
           ShaftId: this.$route.query.ShaftId
         };

+ 2 - 2
src/components/ledger/lib/linkassets.vue

@@ -224,10 +224,10 @@ export default {
         let recursionGetData = (pageNum, zone) => {
           pageNum = pageNum ? pageNum : 1
           let params = {
-            Orders: "CreateTime desc, RoomID asc",
+            Orders: "CreateTime desc, id asc",
             PageNumber: pageNum,
             PageSize: 1000,
-            Projection: ["RoomID", "RoomName", "RoomLocalName", "CreateTime"],
+            Projection: ["id", "RoomName", "RoomLocalName", "CreateTime"],
             ZoneType: zone
           }
           if (this.spaceShow) {

+ 15 - 13
src/components/ledger/lib/spaceSelect.vue

@@ -5,9 +5,9 @@
       v-model="value"
       placeholder="请选择空间类型"
       clearable
-      :style="isWidth ? '' : 'width:160px;'" size="small"
-      :props="{value:'Code',label:'Name',children:'ZoneType'}"
-      :options="options"
+      :style="isWidth ? '' : 'width:160px;'" size="small" 
+      :props="{value:'code',label:'name',children:'ZoneType'}"
+      :options="options" 
       @change="changeVal">
     </el-cascader>
   </div>
@@ -43,7 +43,8 @@ export default {
     },
     //获取下拉框数据
     getOptionData() {
-      let params1 = {cascade: [{ name: 'zoneType', filters: `projectId='${this.projectId}'` }]}
+      let params1 = {}
+      //Cascade: [{ Name: 'zoneType', Filters: `ProjectId='${this.projectId}'` }]
       queryAllZoneType(params1, res => {
         this.options = res.content;
         this.changeVal(this.value);
@@ -54,17 +55,18 @@ export default {
       let val = value[value.length - 1];
       let space = {};
       this.options.forEach(item => {
-        if (item.ZoneType) {
-          item.ZoneType.forEach(other => {
-            if (other.Code == val) {
-              space = other
-            }
-          })
-        } else {
-          if (item.Code == val) {
+        // if (item.ZoneType) {
+          // zoneType级联其他分区, 新版已删除
+          // item.ZoneType.forEach(other => {
+          //   if (other.code == val) {
+          //     space = other
+          //   }
+          // })
+        // } else {
+          if (item.code == val) {
             space = item
           }
-        }
+        // }
       })
       this.$emit('change', val, space, value)
     }

+ 2 - 3
src/components/ledger/system/dialog/addSpaceDialog.vue

@@ -24,8 +24,7 @@
             {{ scope.row.localName || scope.row.name || '' }}
           </template>
         </el-table-column>
-        <el-table-column prop="localId" :label="`${inSpaceType}本地编码`" show-overflow-tooltip
-                         min-width="100"></el-table-column>
+        <el-table-column prop="localId" :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100"></el-table-column>
         <el-table-column prop :label="`所属建筑楼层`" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">
             {{
@@ -134,7 +133,7 @@ export default {
       let params = {
         data: {
           filters: "not id isNull",
-          orders: "localId desc",
+          orders: "localName desc",
           pageNumber: this.page.pageNumber,
           pageSize: this.page.pageSize
         },

+ 1 - 1
src/components/point/dynamicdata/delRelationDialog.vue

@@ -300,7 +300,7 @@ export default {
             if (tempArr.length) {
               zoneQuery({
                 PageSize: 500,
-                Filters: `RoomID in ${JSON.stringify(tempArr)}`,
+                Filters: `id in ${JSON.stringify(tempArr)}`,
                 Cascade: [{ Name: 'building' }, { Name: 'floor' }],
               }, response => {
                 let Data = response.Content;

+ 5 - 5
src/components/point/dynamicdata/spaceRules.vue

@@ -219,11 +219,11 @@ export default {
             let Data = response.Content;
             dyData.forEach(item => {
               Data.forEach(t => {
-                if (t.RoomID == item.RoomID) {
-                  if (t.RoomLocalName && t.RoomLocalID) {
-                    item.ObjectLocalName = t.RoomLocalName + '/' + t.RoomLocalID;
-                  } else if (t.RoomLocalName || t.RoomLocalID) {
-                    item.ObjectLocalName = t.RoomLocalName || t.RoomLocalID;
+                if (t.id == item.id) {
+                  if (t.localName && t.localId) {
+                    item.ObjectLocalName = t.localName + '/' + t.localId;
+                  } else if (t.localName || t.localId) {
+                    item.ObjectLocalName = t.localName || t.localId;
                   }
                   item.BuildLocalName = t.Building ? t.Building.BuildLocalName : '';
                   item.FloorLocalName = t.Floor ? t.Floor.FloorLocalName : '';

+ 1 - 1
src/views/data_admin/buildGraphy/createPointZone.vue

@@ -13,7 +13,7 @@
             <el-input placeholder="请输入业务空间名称" v-model="RoomLocalName" clearable
                       style="width:215px;margin-right:10px;"></el-input>
             <label>业务空间编码</label>
-            <el-input placeholder="请输入业务空间编码" v-model="RoomLocalID" clearable
+            <el-input placeholder="请输入业务空间编码" v-model="localId" clearable
                       style="width:215px;margin-right:10px;"></el-input>
           </div>
           <div>

+ 2 - 2
src/views/data_admin/buildGraphy/updatePointZone.vue

@@ -163,8 +163,8 @@ export default {
       //业务空间
       else {
         let pa = {
-          Filters: `not RoomID isNull`,
-          Orders: "createTime desc, RoomID asc",
+          Filters: `not id isNull`,
+          Orders: "createTime desc, id asc",
           PageNumber: 1,
           PageSize: 1000,
           ZoneType: node.value,

+ 3 - 2
src/views/ledger/cenotelist/relatedSpace.vue

@@ -153,8 +153,9 @@ export default {
           this.showDefaultSpace();
         });
       } else {
-        let params1 = { cascade: [{ name: 'zoneType', filters: `projectId='${this.projectId}'` }] },
-          params2 = { shaftId: this.$route.query.ShaftId };
+        let params1 = {},
+        //Cascade: [{ Name: 'zoneType', Filters: `ProjectId='${this.projectId}'` }]
+            params2 = {shaftId: this.$route.query.ShaftId};
         let promise1 = new Promise((resolve, reject) => {
           queryAllZoneType(params1, res => {
             resolve(res)

+ 11 - 12
src/views/ledger/spacelist/index.vue

@@ -33,9 +33,9 @@
         <div class="types">
           <el-tabs v-model="activeName" type='card' @tab-click="tabClick">
             <template v-for="(item,index) in tabsList">
-              <el-tab-pane :name="item.Code" :key="index">
-                <span slot="label"><i class="el-icon-warning-outline" v-if="item.Count>0"
-                                      style="color:red;margin-right:10px;"></i>{{ item.Name }}</span>
+              <el-tab-pane :name="item.code" :key="index">
+                <span slot="label"><i class="el-icon-warning-outline" v-if="item.count>0"  
+                                      style="color:red;margin-right:10px;"></i>{{ item.name }}</span>
               </el-tab-pane>
             </template>
           </el-tabs>
@@ -213,7 +213,7 @@ export default {
     // 获取tabs的列表
     getTypes(floorid) {
       let pa = {
-        cascade: [{ name: 'zoneType' }]
+        // Cascade: [{ Name: 'zoneType' }]
       }
       if (floorid) {
         pa.floorId = floorid
@@ -263,9 +263,9 @@ export default {
     getItemForType() {
       let data = {}
       this.tabsList.map(item => {
-        if (item.Code == this.activeName) {
-          data.code = item.Code;
-          data.name = item.Name;
+        if (item.code == this.activeName) {
+          data.code = item.code;
+          data.name = item.name;
         }
       })
       return data
@@ -283,8 +283,6 @@ export default {
         name = name.join(' ')
         localStorage.setItem('buildingFloor', name)
       })
-
-
       // 如果选择的是全部或者未明确
       if (val.indexOf('noKnow') > -1 || val.indexOf('all') > -1) {
         this.getTypes()
@@ -292,7 +290,7 @@ export default {
         this.FloorMap = {}
       } else {
         // 选择的是具体某个楼层
-        if (!this.floorToMap[val[1]].StructureInfo || !this.floorToMap[val[1]].StructureInfo.FloorMap) {
+        if (!this.floorToMap[val[1]].infos || !this.floorToMap[val[1]].infos.floorMap) {
           this.isMyTab = 2;
         }
         this.getTypes(val[1]);
@@ -312,6 +310,7 @@ export default {
         this.initMessage();
       } else {
         this.getInfected(this.buildFloorSelectd[1]);
+        /// 
         this.$refs.graphy.getData(this.buildFloorSelectd, this.FloorMap, this.activeTabType);
         this.childBackParam = {}
       }
@@ -355,8 +354,8 @@ export default {
       this.$refs.details.getData(list, this.buildMess);
     },
     lookEqu(infos) {
-      infos.id = infos.RoomID
-      infos.name = infos.RoomLocalName
+      infos.id = infos.id
+      infos.name = infos.localName
       this.floor.facility = true
       this.$refs.facility.getData(infos, this.buildMess)
     },

+ 1 - 1
src/views/ledger/spacelist/spaceDetail/index.vue

@@ -193,7 +193,7 @@ export default {
         pageSize: 1000,
         type: this.params.zone
       }, params2 = {
-        Filters: `RoomID='${this.params.RoomID}'`,
+        Filters: `id='${this.params.RoomID}'`,
         ZoneType: this.params.zone
       };
       let promise1 = new Promise((resolve, reject) => {

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

@@ -178,18 +178,18 @@ export default {
       }
       let flag = false;
       newData.map(item => {
-        if (!item.RoomLocalName) {
+        if (!item.localName) {
           flag = true;
         }
         // 处理建筑-楼层
         if (item.flowBuild) {
           let bid = item.flowBuild.split("-");
-          item.BuildingId = item.flowBuild.split("-")[0]
+          item.buildingId = item.flowBuild.split("-")[0]
           if (bid[1]) {
-            item.FloorId = item.flowBuild.split("-")[1]
+            item.floorId = item.flowBuild.split("-")[1]
           }
         }
-        item.ObjectType = this.space.spaceType;
+        item.objectType = this.space.spaceType;
       })
       if (flag) {
         this.$message.info("存在业务空间的本地名称为空,请检查")