首页告警信息列宽修正，监控模式楼层切换园区回到主视角

src/components/monitoring/clickCp.vue

@@ -266,9 +266,33 @@ export default {
 
 				bfHelper.resetStatus(2, null, '照明');
 				bfHelper.lookEquipmentCop('照明');
-				this.$parent.openTotal();
+				// this.$parent.openTotal();
 				this.$parent.setTowerLight('00');
-
+				bfHelper.setCameraStatus({
+                  aspect: 1.889763779527559,
+                  coordinateSystem: "world",
+                  far: 960464.7787185954,
+                  fov: 45,
+                  name: "persp",
+                  near: 105041.57557288553,
+                  position: {
+                    x: 114923.08877241895,
+                    y: -391542.9803033385,
+                    z: 219845.7809478254
+                  },
+                  target: {
+                    x: -8729.420142852026,
+                    y: 863922.0428858905,
+                    z: -496665.6824418152
+                  },
+                  up: {
+                    x: -0.048407478040169157,
+                    y: 0.4914893345691443,
+                    z: 0.8695372045373162
+                  },
+                  version: 1,
+                  zoom: 1
+                });
 				return
 			}
 			// 切换到滚轮效果
@@ -286,7 +310,15 @@ export default {
 					} else if (this.sbType == '监控') {
 						this.$parent.$refs.backHome.clickBack();
 					} else if (this.sbType == '空调') {
+						bfHelper.extObjMngClear(); //清除外部构件
+						bfHelper.clearDrawableContainer(); //清除外部标签
+						bfHelper.clearTags();
 						this.$parent.setTowerKT();
+						this.$parent.removeEvent();
+						this.$parent.initial();
+						this.$parent.isControl = false;
+
+						// this.$parent.setTowerKT();
 					} else if (this.sbType == '消防') {
 						this.$parent.setTowerFire();
 					}
@@ -294,6 +326,34 @@ export default {
 						this.$parent.setTowerDoor();
 						bfHelper.lookPipeline(null, null, this.conditions, '电子门禁');
 					}
+					//20221205-园区点击回主视角
+					// if(this.sbType == '电' || this.sbType == '暖' || this.sbType == '监控' || this.sbType == '空调'){
+						bfHelper.setCameraStatus({
+							aspect: 1.889763779527559,
+							coordinateSystem: "world",
+							far: 960464.7787185954,
+							fov: 45,
+							name: "persp",
+							near: 105041.57557288553,
+							position: {
+								x: 114923.08877241895,
+								y: -391542.9803033385,
+								z: 219845.7809478254
+							},
+							target: {
+								x: -8729.420142852026,
+								y: 863922.0428858905,
+								z: -496665.6824418152
+							},
+							up: {
+								x: -0.048407478040169157,
+								y: 0.4914893345691443,
+								z: 0.8695372045373162
+							},
+							version: 1,
+							zoom: 1
+							});
+					// }
 				} else {
 					if (this.sbType == '监控') {
 						bfHelper.TtLookEquipmentCop('监控', null, this.conditions);

src/components/monitoring/conditioner.vue

@@ -797,7 +797,7 @@ export default {
               this.testObject1.open = 1;
               var arr = bfHelper.getAll();
               bfHelper.clearTags();
-              if (arr.length < 2) {
+              if (arr.length < 2) {getOAContent
                 bfHelper.customTag(
                   {
                     x: this.testObject1.xmove,
@@ -896,7 +896,7 @@ export default {
           bfHelper.customTag(
             this.position,
             null,
-            this.testObject1.funcCat == 1 ? this.getContent(this.testObject1) : this.getOAContent(this.testObject1)
+            row.funcCat == 1 ? this.getContent(this.testObject1) : this.getOAContent(this.testObject1)
           );
           window.addEventListener("click", this.addEvent);
           this.conditionNum = 1;

src/components/monitoring/light.vue

@@ -386,12 +386,10 @@ export default {
                   "空开",
                   bfHelper.equipmentCondition2[2]
                 );
-                // bfHelper.setCameraStatus(bfHelper.lightCamera[6]);
               } else if (build == 26) {
                 //如果点击的是园区
-                bfHelper.resetStatus(2, null, "空开");
+                bfHelper.resetStatus(2, null, "照明");
-                bfHelper.lookEquipmentCop("空开");
+                bfHelper.lookEquipmentCop("照明");
-                // this.openTotal();
                 setTimeout(() => {
                   this.setTowerLight("00");
                 }, 300);
@@ -431,8 +429,6 @@ export default {
                     bfHelper.equipmentCondition2[2]
                   );
                 }
-                // console.log(build - 1, '楼层视角');
-                // bfHelper.setCameraStatus(bfHelper.lightCamera[build - 1]);
               }
             } else {
               bfHelper.lookEquipmentCop("照明");

src/views/garden/generalizePattern.vue

@@ -291,7 +291,7 @@
             </div>
             <span class="data">{{ getNameByClassCode(item.classCode) }}</span>
             <span class="data">{{ item.equipName }}</span>
-            <span class="data">{{ item.location }}</span>
+            <span class="data" style="width:19%">{{ item.location }}</span>
             <span
               class="data"
               v-text="item.warnContent"