Browse Source

Merge branch 'dev' of http://39.106.8.246:3003/web/ibms into dev

shaun-sheep 5 years ago
parent
commit
05252be0fa

+ 15 - 5
src/components/business_space/newGraphy/graphy.vue

@@ -502,9 +502,11 @@ export default {
       //     zoneObj.Outline.push([temp]);
       //   })
       //   let curISP = this.sourceIdToISP[key];
+      // if (curISP) {
       //   curISP && IspaceIdList.push(curISP.RoomID);
       //   zoneObj.Height = zoneObj.Height == 0 ? curISP.Height : zoneObj.Height > curISP.Height ? curISP.Height : zoneObj.Height;
       // }
+      // }
       // 数据计算导致浏览器奔溃,临时注释
       let zoneObj = { Outline: [], Height: 0 }, IspaceIdList = [];
       let selectSpaces = this.scene.getSelectedSpaces();
@@ -512,8 +514,10 @@ export default {
         zoneObj.Outline.push(t.data.OutLine);
         let key = t.data.SourceId;
         let curISP = this.sourceIdToISP[key];
-        curISP && IspaceIdList.push(curISP.RoomID);
-        zoneObj.Height = zoneObj.Height == 0 ? curISP.Height : zoneObj.Height > curISP.Height ? curISP.Height : zoneObj.Height;
+        if (curISP) {
+          IspaceIdList.push(curISP.RoomID);
+          zoneObj.Height = zoneObj.Height == 0 ? curISP.Height : zoneObj.Height > curISP.Height ? curISP.Height : zoneObj.Height;
+        }
       })
       // 如果有划分,求交集
       if (this.scene.cutItem || this.scene.sceneMark) {
@@ -566,9 +570,11 @@ export default {
       //     zoneObj.Outline.push([temp]);
       //   })
       //   let curISP = this.sourceIdToISP[key];
+      // if(curISP){
       //   curISP && IspaceIdList.push(curISP.RoomID);
       //   zoneObj.Height = zoneObj.Height == 0 ? curISP.Height : zoneObj.Height > curISP.Height ? curISP.Height : zoneObj.Height;
       // }
+      // }
 
       // 改回之前逻辑
       zoneObj.Outline = [];
@@ -579,8 +585,10 @@ export default {
         zoneObj.Outline.push(t.data.OutLine);
         let key = t.data.SourceId;
         let curISP = this.sourceIdToISP[key];
-        curISP && IspaceIdList.push(curISP.RoomID);
-        zoneObj.Height = zoneObj.Height == 0 ? curISP.Height : zoneObj.Height > curISP.Height ? curISP.Height : zoneObj.Height;
+        if (curISP) {
+          curISP && IspaceIdList.push(curISP.RoomID);
+          zoneObj.Height = zoneObj.Height == 0 ? curISP.Height : zoneObj.Height > curISP.Height ? curISP.Height : zoneObj.Height;
+        }
       })
       // 如果有划分,求交集
       if (this.scene.cutItem || this.scene.sceneMark) {
@@ -712,14 +720,16 @@ export default {
       //     continue
       //   }
       //   let curISP = this.sourceIdToISP[key];
+      // if (curISP) {
       //   zoneObj.Height = zoneObj.Height == 0 ? curISP.Height : zoneObj.Height > curISP.Height ? curISP.Height : zoneObj.Height;
       //   zoneObj.IspaceId = curISP.RoomID;
       //   zoneObj.RoomLocalName = curISP.RoomLocalName;
+      // }
       //   zoneObj.BuildingId = this.buildFloor[0];
       //   zoneObj.FloorId = this.buildFloor[1];
       //   createSpaces.push(zoneObj);
       // }
-      
+
       // 改回之前逻辑
       let arr = this.scene.getSelectedSpaces();
       let createSpaces = [];

+ 6 - 2
src/components/model/file/floorTable.vue

@@ -37,13 +37,17 @@
             </div>
             <div class="progress-right">
               <span v-if="!scope.row.Status">上传中...</span>
+              <span v-else-if="scope.row.Status == 1">等待检查...</span>
+              <span v-else>模型检查中...</span>
+
+              <!-- <span v-show="!scope.row.Status">上传中...</span>
               <span v-show="scope.row.Status == 1">等待检查...</span>
               <span v-show="scope.row.Status == 10">模型检查中...</span>
               <span v-show="scope.row.Status == 11">未通过检查</span>
-              <span v-show="scope.row.Status == 2">等待数据导出...</span>
+              <span v-show="scope.row.Status == 2 || scope.row.Status == 20">等待数据导出...</span>
               <span v-show="scope.row.Status == 21">模型数据导出失败</span>
               <span v-show="scope.row.Status == 3">处理导出数据中...</span>
-              <span v-show="scope.row.Status == 31">同步到数据中心失败</span>
+              <span v-show="scope.row.Status == 31">同步到数据中心失败</span> -->
             </div>
           </div>
         </template>