Kaynağa Gözat

竖井立面图修改

haojianlong 4 yıl önce
ebeveyn
işleme
57f7136b3d
1 değiştirilmiş dosya ile 16 ekleme ve 17 silme
  1. 16 17
      src/components/ledger/cenote/elevationMap.vue

+ 16 - 17
src/components/ledger/cenote/elevationMap.vue

@@ -7,9 +7,9 @@
           <div class="saga-group" v-for="(winth, index) in groupWidth" :key="index" :style="`width: ${100*winth}px;`"></div>
           <div class="saga-group" v-for="(winth, index) in groupWidth" :key="index" :style="`width: ${100*winth}px;`"></div>
         </div>
         </div>
       </div>
       </div>
-      <div class="saga-floor-item" v-for="floor in elevationData" :key="floor.FloorID">
-        <p class="saga-floorName" :title="floor.FloorLocalName?floor.FloorLocalName:floor.FloorName">
-          {{floor.FloorLocalName?floor.FloorLocalName:floor.FloorName}}
+      <div class="saga-floor-item" v-for="floor in elevationData" :key="floor.id">
+        <p class="saga-floorName" :title="floor.localName?floor.localName:floor.name">
+          {{floor.localName?floor.localName:floor.name}}
           <i class="el-icon-right"></i>
           <i class="el-icon-right"></i>
         </p>
         </p>
         <div class="saga-spaceList">
         <div class="saga-spaceList">
@@ -21,7 +21,7 @@
             :title="spaceItem.RoomLocalName?spaceItem.RoomLocalName:spaceItem.RoomName"
             :title="spaceItem.RoomLocalName?spaceItem.RoomLocalName:spaceItem.RoomName"
             @click="handleClickCheck(spaceItem)"
             @click="handleClickCheck(spaceItem)"
             >
             >
-            {{spaceItem.RoomLocalName?spaceItem.RoomLocalName:spaceItem.RoomName}}
+            {{spaceItem.localName || spaceItem.name}}
             </div>
             </div>
           </div>
           </div>
         </div>
         </div>
@@ -64,26 +64,26 @@
       this.load = true;
       this.load = true;
       // 查询竖井关联的空间垂直交通关系
       // 查询竖井关联的空间垂直交通关系
       shaftVerticalSpace(this.params, (res) => {
       shaftVerticalSpace(this.params, (res) => {
-        let data = res.Content?res.Content:[];
+        let data = res.content || [];
         let max = 0, idMap = {}, groupMap = {}, copyData = JSON.parse(JSON.stringify(data));
         let max = 0, idMap = {}, groupMap = {}, copyData = JSON.parse(JSON.stringify(data));
         this.groupWidth = {};
         this.groupWidth = {};
         copyData.reverse().forEach(floor => {
         copyData.reverse().forEach(floor => {
-          if (floor.ZoneSpaceList && floor.ZoneSpaceList.length) {
-            floor.ZoneSpaceList.forEach(space => {
-              if (idMap[space.RoomID]) {  // 该业务空间在映射列表中
-                groupMap[idMap[space.RoomID]].push(space)
-                space.SpaceIdList.forEach(RoomID =>{
+          if (floor.zoneSpaceList && floor.zoneSpaceList.length) {
+            floor.zoneSpaceList.forEach(space => {
+              if (idMap[space.id]) {  // 该业务空间在映射列表中
+                groupMap[idMap[space.id]].push(space)
+                space.spaceIdList.forEach(RoomID =>{
                   if (!idMap[RoomID]) {
                   if (!idMap[RoomID]) {
-                    idMap[RoomID] = idMap[space.RoomID];
+                    idMap[RoomID] = idMap[space.id];
                   }
                   }
                 })
                 })
               } else { // 该业务空间不在映射列表中
               } else { // 该业务空间不在映射列表中
                 max++;
                 max++;
-                idMap[space.RoomID] = max;
+                idMap[space.id] = max;
                 groupMap[max] = [];
                 groupMap[max] = [];
                 this.groupWidth[max] = 0;
                 this.groupWidth[max] = 0;
                 groupMap[max].push(space);
                 groupMap[max].push(space);
-                space.SpaceIdList.forEach(RoomID =>{
+                space.spaceIdList.forEach(RoomID =>{
                   if (!idMap[RoomID]) {
                   if (!idMap[RoomID]) {
                     idMap[RoomID] = max;
                     idMap[RoomID] = max;
                   }
                   }
@@ -99,9 +99,9 @@
             floor.group[groupIndex] = {
             floor.group[groupIndex] = {
               spaceList: []
               spaceList: []
             };
             };
-            if (floor.ZoneSpaceList && floor.ZoneSpaceList.length) {
-              floor.ZoneSpaceList.forEach(space => {
-                if (groupMap[groupIndex].find(item => { return space.RoomID == item.RoomID })) {
+            if (floor.zoneSpaceList && floor.zoneSpaceList.length) {
+              floor.zoneSpaceList.forEach(space => {
+                if (groupMap[groupIndex].find(item => { return space.id == item.id })) {
                   space.checked = false;
                   space.checked = false;
                   floor.group[groupIndex].spaceList.push(space);
                   floor.group[groupIndex].spaceList.push(space);
                   max++;
                   max++;
@@ -114,7 +114,6 @@
           })
           })
         });
         });
         this.elevationData = data
         this.elevationData = data
-        console.log(this.elevationData)
         this.load = false;
         this.load = false;
       })
       })
     },
     },