Bläddra i källkod

健壮性修改

zhangyu 5 år sedan
förälder
incheckning
35c5d71817

+ 21 - 17
src/components/point/report/objectInstance.vue

@@ -92,24 +92,28 @@ export default {
             }
             //空间
             else if (item.TypeCode == 'Sp') {
-              let pa = {
-                data: {
-                  Filters: `RoomID='${item.TypeCode + this.projectId.substring(2) + item.ObjectID}'`
-                },
-                zone: item.SubTypeCode
-              }
-              //获取空间信息
-              queryZone(pa, zoneMsg => {
-                if (zoneMsg.Content[0] && zoneMsg.Content[0].Outline) {
-                  let canvasOption = {
-                    RoomLocalName: zoneMsg.Content[0].RoomLocalName,
-                    OutLine: zoneMsg.Content[0].Outline,
-                    RoomID: zoneMsg.Content[0].RoomID,
-                    Color: new SColor('#F9C3C3')
-                  }
-                  this.loadDataToInstanceByFloorID(zoneMsg.Content[0].FloorId, key, item.TypeCode, canvasOption);
+              if(item.SubTypeCode){
+                let pa = {
+                  data: {
+                    Filters: `RoomID='${item.TypeCode + this.projectId.substring(2) + item.ObjectID}'`
+                  },
+                  zone: item.SubTypeCode
                 }
-              });
+                //获取空间信息
+                queryZone(pa, zoneMsg => {
+                  if (zoneMsg.Content[0] && zoneMsg.Content[0].Outline) {
+                    let canvasOption = {
+                      RoomLocalName: zoneMsg.Content[0].RoomLocalName,
+                      OutLine: zoneMsg.Content[0].Outline,
+                      RoomID: zoneMsg.Content[0].RoomID,
+                      Color: new SColor('#F9C3C3')
+                    }
+                    this.loadDataToInstanceByFloorID(zoneMsg.Content[0].FloorId, key, item.TypeCode, canvasOption);
+                  }
+                });
+              } else {
+                this.$message.error('缺少空间分区类型字段!')
+              }
             }
           }
         });

+ 23 - 18
src/views/screen/splitscreen/integrateresults/index.vue

@@ -2,7 +2,7 @@
  * @Author: zhangyu
  * @Date: 2019-11-13 17:00:59
  * @Info: 系统集成成果辅助屏
- * @LastEditTime: 2019-11-27 17:33:10
+ * @LastEditTime: 2019-12-02 12:06:53
  -->
 <template>
   <div>
@@ -75,6 +75,7 @@ export default {
   },
   methods:{
     handleChangeExample(example) {
+      this.drawCanvas = false;
       //存在实例ID
       if (example.ObjectID) {
         this.ObjectLocalName = example.ObjectLocalName;
@@ -99,24 +100,28 @@ export default {
             }
           })
         } else if (example.TypeCode == 'Sp') {//空间
-          let pa = {
-            data: {
-              Filters: `RoomID='${example.TypeCode + localStorage.getItem('projectId').substring(2) + example.ObjectID}'`
-            },
-            zone: example.SubTypeCode
-          }
-          //获取空间信息
-          queryZone(pa, zoneMsg => {
-            if (zoneMsg.Content[0] && zoneMsg.Content[0].Outline) {
-              let canvasOption = {
-                RoomLocalName: zoneMsg.Content[0].RoomLocalName,
-                OutLine: zoneMsg.Content[0].Outline,
-                RoomID: zoneMsg.Content[0].RoomID,
-                Color: new SColor('#F9C3C3')
-              }
-              this.loadDataToInstanceByFloorID(zoneMsg.Content[0].FloorId, example.TypeCode, canvasOption);
+          if(example.SubTypeCode) {
+            let pa = {
+              data: {
+                Filters: `RoomID='${example.TypeCode + localStorage.getItem('projectId').substring(2) + example.ObjectID}'`
+              },
+              zone: example.SubTypeCode
             }
-          });
+            //获取空间信息
+            queryZone(pa, zoneMsg => {
+              if (zoneMsg.Content[0] && zoneMsg.Content[0].Outline) {
+                let canvasOption = {
+                  RoomLocalName: zoneMsg.Content[0].RoomLocalName,
+                  OutLine: zoneMsg.Content[0].Outline,
+                  RoomID: zoneMsg.Content[0].RoomID,
+                  Color: new SColor('#F9C3C3')
+                }
+                this.loadDataToInstanceByFloorID(zoneMsg.Content[0].FloorId, example.TypeCode, canvasOption);
+              }
+            });
+          } else {
+            this.$message.error('缺少空间分区类型字段!')
+          }
         }
       }
     },