zc

App.vue

@@ -28,7 +28,7 @@
                 mtopicBigview:"lab/bigview",
                 mtopicFunction:"lab/function/data",
                 mtopicHardware:"lab/hardware/data",
-				mtopicLine:"lab/exit/line",
+				mtopicLine:"lab/riskPlan/trigger/notice",
                 //监听数据
                 watchObj:{},
 				//当前通道数组
@@ -139,7 +139,7 @@
 							        console.log("报警信息订阅成功",self.mqttIdList[i].type)
 							    }
 							});
-						}else if(self.mqttIdList[i].type == 'lab/exit/line'){
+						}else if(self.mqttIdList[i].type == 'lab/riskPlan/trigger/notice'){
 							self.client.subscribe(self.mqttIdList[i].type, (err) => {
 							    if (!err) {
 							        console.log("应急疏散订阅成功",self.mqttIdList[i].type)
@@ -175,7 +175,7 @@
                     let data = JSON.parse(message)
 					 //console.log('消息message',data);
 					if(data){
-						if(topic == 'lab/exit/line'){
+						if(topic == 'lab/riskPlan/trigger/notice'){
 							// console.log("应急",data);
 							this.globalData.lineData = data.data;
 						}else if(topic.search("lab/fireDevice/Warn/") != -1){
@@ -233,7 +233,7 @@
 									console.log('Unsubscribe error mtopicBigview', error)
 								}
 							})
-						}else if(self.mqttIdList[i].type == 'lab/exit/line'){
+						}else if(self.mqttIdList[i].type == 'lab/riskPlan/trigger/notice'){
 							//断开疏散
 							self.client.unsubscribe(self.mqttIdList[i].type, error => {
 								if (error) {

api/index.js

@@ -1781,4 +1781,12 @@ export const endEvacuation  = (data) => {
         method: 'post',
         data: data
     })
+};
+//查询当前用户下的预案触发数据
+export const selectTriggerInfo = (data) => {
+    return apiResquest({
+        url: `/zd-laboratory/plan/selectTriggerInfo`,
+        method: 'GET',
+        data: data,
+    })
 };

api/request/config.js

@@ -1,7 +1,7 @@
 const config = {
-	// base_url: 'http://192.168.1.9:8080',//柴
+	base_url: 'http://192.168.1.9:8080',//柴
 	// base_url: 'http://192.168.1.7:8080',//刘波
-     base_url: 'http://192.168.1.17:8080',//小飞
+    // base_url: 'http://192.168.1.17:8080',//小飞
     // base_url: 'http://192.168.1.20:8080',//志伟
     // base_url: 'http://192.168.1.8:8080',//高升
 	// base_url: 'http://192.168.1.29:8080',//何成

component/topWarn.vue

@@ -7,20 +7,23 @@
 </template>
 
 <script>
-    import { getListStatusTwo,evacuate,closeRiskPlan } from '@/api/index.js'
+    import { selectTriggerInfo,evacuate,closeRiskPlan } from '@/api/index.js'
 
 	export default {
 		data() {
 			return {
 				pageType:false,
 				text:"",
+				buildId:"",
+				floorId:"",
+				subId:"",
+				closePlan:false,//  true 火焰报警，false 没有火焰报警
+				whetherRoute:true,
+				
 				subjectId:"",
 				buildingId:"",
-				floorId:"",
 				subjectName:"",
-				closePlan:false,
 				closeId:"",
-        whetherRoute:true,//  true 有疏散路线，false 没有疏散路线
 			}
 		},
 		created() {
@@ -28,56 +31,41 @@
 		},
 		mounted(){
 			this.getWarn();
-			getApp().watch(this.getWarn,'warnData');
+			// getApp().watch(this.getWarn,'warnData');
 			getApp().watch(this.lineDataFunction,'lineData');
-			this.timeFuncontion();
+			// this.timeFuncontion();
 		},
 		methods: {
 			//应急变更
 			lineDataFunction(val){
-				console.log("val",val);
+				console.log("预警",val);
+				this.getWarn();
 			},
 			buttonClick(){
 				let self = this;
 				let list = [];
 				if(self.closePlan){
-					list = ['执行疏散', '结束预案'];
+					list = ['查看', '结束预案'];
 				}else{
-					list = ['执行疏散'];
+					self.goPage();
 				}
 				uni.showActionSheet({
 					itemList: list,
 					success: function (res) {
+						console.log('res.tapIndex',res.tapIndex);
+						console.log('选中了第' + (res.tapIndex + 1) + '个按钮');
 						if(res.tapIndex == 0){
-							self.evacuationClick();
+							self.goPage();
 						}else if(res.tapIndex == 1){
 							self.offEvacuationClick();
 						}
-						console.log('res.tapIndex',res.tapIndex);
-						console.log('选中了第' + (res.tapIndex + 1) + '个按钮');
 					},
 					fail: function (res) {
 						console.log(res.errMsg);
 					}
 				});
 			},
-			//执行疏散
-			evacuationClick(){
-				let self = this;
-				uni.showModal({
-				    content: '确认执行疏散?',
-				    cancelColor:"#999",
-				    confirmColor:"#0183FA",
-				    success: function (res) {
-				        if (res.confirm) {
-							self.goPage();
-				            console.log('用户点击确定');
-				        } else if (res.cancel) {
-				            console.log('用户点击取消');
-				        }
-				    }
-				});
-			},
+			//结束预案
 			offEvacuationClick(){
 				let self = this;
 				uni.showModal({
@@ -108,43 +96,56 @@
 			},
 			//页面跳转
 			goPage(){
-				let obj = {
-					buildingId:this.buildingId,
-					subId:this.subjectId,
-					floorId:this.floorId,
-					subjectName:this.subjectName,
-					address:this.text,
-					type:"1",
-				}
 				uni.navigateTo({
-					url:'/pages/emergencyEvacuationBig?item='+encodeURIComponent(JSON.stringify(obj))
+					url:'/pages/emergencyEvacuationBig'
 				});
 			},
 			//获取报警信息
 			async getWarn(){
 				let self = this;
-				const {data} = await getListStatusTwo();
-				console.log("baojing",data)
-				if(data.code == 200){
-					let num = 0;
-					for(let i=0;i<data.data.length;i++){
-					  if(data.data[i].floorId != 7 && data.data[i].whetherRoute){
-						num++;
-						self.text = data.data[i].buildName + data.data[i].floorName + data.data[i].roomName + data.data[i].subjectName + '发生应急预案.';
-						self.subjectId = data.data[i].subjectId;
-						self.buildingId = data.data[i].buildId;
-						self.floorId = data.data[i].floorId;
-						self.whetherRoute = data.data[i].whetherRoute;
-						self.subjectName = data.data[i].subjectName;
-						self.pageType = true;
-						self.closePlan =data.data[i].closePlan;
-						self.closeId = data.data[i].id;
+				const {data} = await selectTriggerInfo();
+				console.log('data',data);
+					if(data.data[0]){
+					  this.$set(this,'text',data.data.length>1?'有多个实验室发生预案':'有实验室发生预案');
+					  this.$set(this,'buildId',data.data[0].buildId);
+					  this.$set(this,'floorId',data.data[0].floorId);
+					  this.$set(this,'subId',data.data[0].subId);
+					  if(data.data[0].riskAttribute == 1){
+						this.$set(this,'closePlan',true);
 					  }
+					  this.$set(this,'pageType',true);
+					  for(let i=0;i<data.data.length;i++){
+						if(data.data[i].riskAttribute == '1'&&data.data[i].ifcheck != '1'){
+							let obj = {
+							  buildId: data.data[i].buildId,
+							  floorId:data.data[i].floorId,
+							  subId:data.data[i].subId,
+							  riskPlanId:data.data[i].riskPlanId,
+							}
+							uni.navigateTo({
+								url:'/pages/emergencyEvacuationBig?item='+encodeURIComponent(JSON.stringify(obj))
+							});
+							return
+						}
+					  }
+					  //没有火焰预案并且没有查看过
+					  for(let i=0;i<data.data.length;i++){
+						if(data.data[i].riskAttribute != '1'&&data.data[i].ifcheck != '1'){
+							let obj = {
+							  buildId: data.data[i].buildId,
+							  floorId:data.data[i].floorId,
+							  subId:data.data[i].subId,
+							  riskPlanId:data.data[i].riskPlanId,
+							}
+							uni.navigateTo({
+								url:'/pages/emergencyEvacuationBig?item='+encodeURIComponent(JSON.stringify(obj))
+							});
+							return
+						}
+					  }
+					}else{
+					  this.$set(this,'pageType',false);
 					}
-					if(num == 0){
-					  self.pageType = false;
-					}
-				}
 			},
 			timeFuncontion(){
 				let self = this;

pages/emergencyEvacuationBig.vue

@@ -48,8 +48,11 @@
 			<view class="evacuation-max-box">
 				<!-- 头部 -->
 				<view class="evacuation-title-box">
-					<view class="evacuation-title-name-box">{{subName}}</view>
-					<view class="site"><img src="@/images/icon_14.png">{{address}}</view>
+					<view class="evacuation-title-left">
+						<view class="evacuation-title-name-box">{{checkSubName}}</view>
+						<view class="site"><img src="@/images/icon_14.png">{{address}}</view>
+					</view>
+					<view class="evacuation-title-right" @click="backButton()">选择房间</view>
 				</view>
 				<!-- 地图部分 -->
 				<view class="roadmap">
@@ -224,7 +227,8 @@
 		openLight,
 		closeLight,
 		executeEvacuation,
-		endEvacuation
+		endEvacuation,
+		selectTriggerInfo
 	} from '@/api/index.js'
 	export default {
 		data() {
@@ -308,6 +312,8 @@
 					name: '',
 				},
 				broadcastType: false,
+				//选中楼栋
+				checkSubName:"",
 				address: "",
 				videoHardwareNUM: [], //实验室和楼道摄像头编码
 				
@@ -343,24 +349,53 @@
 			}
 		},
 		onLoad(option) {
-			this.treeselectByUser();
+			console.log('option',option)
+			// if(option.item){
+			// 	let obj = JSON.parse(decodeURIComponent(option.item));
+			// 	this.$set(this,'buildingId',obj.buildId);
+			// 	this.$set(this,'deptId',obj.buildId);
+			// 	this.$set(this,'floorId',obj.floorId);
+			// 	this.$set(this,'subId',obj.subId);
+			// 	this.$set(this,'pageType',2);
+			// 	this.getBuildingData();
+			// 	this.confirmBtn();
+			// }else{
+			// 	this.treeselectByUser();
+			// }
 			  //一键灭火正式使用需要注销
 			  // this.itemData.subjectId=85
 			  // this.firedeviceStatus();
 		
 		},
 		onShow() {
-
+			console.log('asd')
+			this.treeselectByUser();
+			if(this.floorId&&this.subId){
+				this.getBuildingData();
+			}
 		},
 		onUnload() {
-
 		},
 		methods: {
+			//返回按钮
+			backButton(){
+				this.offMQTT();
+				this.$set(this,'buildingName',null);
+				this.$set(this,'buildingId',null);
+				this.$set(this,'deptId',null);
+				this.$set(this,'floorName',null);
+				this.$set(this,'floorId',null);
+				this.$set(this,'subId',null);
+				this.$set(this,'subName',null);
+				this.$set(this,'pageType',1);
+				this.treeselectByUser();
+			},
 			//全屏疏散页面
 			goAllPage() {
 				let obj = {
 					buildingId:this.buildingId,
-					floorId:this.floorId
+					floorId:this.floorId,
+					type:1,
 				}
 				uni.navigateTo({
 					url: '/pages/emergencyEvacuationBigFullScreen?item='+encodeURIComponent(JSON.stringify(obj)),
@@ -525,6 +560,7 @@
 				this.$set(this, 'fjListArray', []);
 				this.$set(this, 'subName', "");
 				this.$set(this, 'subId', "");
+				this.selectTriggerInfo(1);
 			},
 			//获取楼层数据
 			async getBuilding(buildingId) {
@@ -535,18 +571,30 @@
 				this.$set(this, 'fjListArray', []);
 				this.$set(this, 'subName', "");
 				this.$set(this, 'subId', "");
+				this.selectTriggerInfo(2);
 			},
 			//楼栋选中
 			buildingChange(e) {
 				this.$set(this, 'buildingName', this.buildingList[e.detail.value].name);
 				this.$set(this, 'buildingId', this.buildingList[e.detail.value].id);
 				this.$set(this, 'deptId', this.buildingList[e.detail.value].id);
+				this.$set(this, 'floorId', null);
+				this.$set(this, 'floorName', null);
+				this.$set(this, 'subId', null);
+				this.$set(this, 'subName', null);
+				this.$set(this.itemData, 'subjectId', null);
+				this.$set(this, 'floorList', []);
+				this.$set(this, 'fjListArray', []);
 				this.getBuilding(this.buildingList[e.detail.value].id);
 			},
 			//楼层选中
 			floorChange(e) {
 				this.$set(this, 'floorName', this.floorList[e.detail.value].name);
 				this.$set(this, 'floorId', this.floorList[e.detail.value].id);
+				this.$set(this, 'subId', null);
+				this.$set(this, 'subName', null);
+				this.$set(this.itemData, 'subjectId', null);
+				this.$set(this, 'fjListArray', []);
 				this.getBuildingData();
 			},
 			//实验室选择
@@ -555,6 +603,44 @@
 				this.$set(this, 'subId', this.fjListArray[e.detail.value].subId);
 				this.$set(this.itemData, 'subjectId', this.fjListArray[e.detail.value].subId);
 			},
+			//获取预案数据
+			async selectTriggerInfo(type){
+				let self = this;
+				const {data} = await selectTriggerInfo();
+				if(data.code == 200){
+					if(type == 1){
+						//标记楼栋
+						for(let o=0;o<self.buildingList.length;o++){
+							for(let i=0;i<data.data.length;i++){
+								if(data.data[i].buildId == self.buildingList[o].id){
+									self.buildingList[o].name = '(预案发生) '+self.buildingList[o].name
+								}
+							}
+						}
+					}
+					if(type == 2){
+						//标记楼层
+						for(let o=0;o<self.floorList.length;o++){
+							for(let i=0;i<data.data.length;i++){
+								if(data.data[i].floorId == self.floorList[o].id){
+									self.floorList[o].name = '(预案发生) '+self.floorList[o].name
+								}
+							}
+						}
+					}
+					if(type == 3){
+						//标记实验室
+						for(let o=0;o<self.fjListArray.length;o++){
+							for(let i=0;i<data.data.length;i++){
+								if(data.data[i].subId == self.fjListArray[o].subId){
+									self.fjListArray[o].subName = '(预案发生) '+self.fjListArray[o].subName
+								}
+							}
+						}
+					}
+				}
+				console.log('data.data',data.data);
+			},
 			getAppExitLine() {
 				let list = [{
 					type: "lab/exit/line"
@@ -865,7 +951,8 @@
 					});
 					return
 				}
-				this.$set(this,'address',this.buildingName + '' + this.floorName);
+				this.$set(this,'checkSubName',this.subName.replace('(预案发生) ',""));
+				this.$set(this,'address',this.buildingName.replace('(预案发生) ',"") + '' + this.floorName.replace('(预案发生) ',""));
 				this.$set(this,'pageType',2);
 				this.getDeviceList();
 				this.laboratoryInfo();
@@ -874,34 +961,14 @@
 			},
 			//执行疏散
 			async lineEvacuate() {
-				if (!this.subId) {
-					uni.showToast({
-						title: '请选择实验室',
-						icon: "none",
-						mask: true,
-						duration: 2000
-					});
-					return
-				}
-				if (!this.buttonArrayIndex) {
-					uni.showToast({
-						title: '请选择疏散路线',
-						icon: "none",
-						mask: true,
-						duration: 2000
-					});
-					return
-				}
-				const {
-					data
-				} = await lineEvacuate(this.subId, this.buttonArray[this.buttonArrayIndex].id)
-
-				if (data.code == 200) {
-					if (data.data) {
-						console.log('执行疏散')
-						this.initialization(data.data);
-					}
+				let obj = {
+					buildingId:this.buildingId,
+					floorId:this.floorId,
+					type:2,
 				}
+				uni.navigateTo({
+					url: '/pages/emergencyEvacuationBigFullScreen?item='+encodeURIComponent(JSON.stringify(obj)),
+				});
 			},
 			//获取喇叭列表
 			async getDeviceList() {
@@ -976,6 +1043,7 @@
 						setTimeout(function() {
 							self.getRedisEvacuation();
 						}, 500);
+					this.selectTriggerInfo(3);
 
 					}
 				}
@@ -1017,7 +1085,10 @@
 								}
 							}
 						}
+						this.$set(this,'isEvacuate',false)
 						this.$forceUpdate();
+					}else{
+						this.$set(this,'isEvacuate',true)
 					}
 				};
 			},
@@ -1071,23 +1142,35 @@
 			//结束疏散
 			evacuationButton() {
 				let self = this;
-				uni.showModal({
-					content: '确认'+(this.isEvacuate?'执行':'结束')+'疏散吗?',
-					cancelColor: "#999",
-					confirmColor: "#0183FA",
-					success: function(res) {
-						if (res.confirm) {
-							if(self.isEvacuate){
-								self.executeEvacuation();
-							}else{
-								self.endEvacuation();
+				if(this.isEvacuate){
+					let obj = {
+						buildingId:this.buildingId,
+						floorId:this.floorId,
+						subId:this.subId,
+						type:2,
+					}
+					uni.navigateTo({
+						url: '/pages/emergencyEvacuationBigFullScreen?item='+encodeURIComponent(JSON.stringify(obj)),
+					});
+				}else{
+					uni.showModal({
+						content: '确认'+(this.isEvacuate?'执行':'结束')+'疏散吗?',
+						cancelColor: "#999",
+						confirmColor: "#0183FA",
+						success: function(res) {
+							if (res.confirm) {
+								if(self.isEvacuate){
+									self.executeEvacuation();
+								}else{
+									self.endEvacuation();
+								}
+								console.log('用户点击确定');
+							} else if (res.cancel) {
+								console.log('用户点击取消');
 							}
-							console.log('用户点击确定');
-						} else if (res.cancel) {
-							console.log('用户点击取消');
 						}
-					}
-				});
+					});
+				}
 			},
 			//开始疏散
 			async executeEvacuation(){
@@ -1371,31 +1454,39 @@
 					border-radius: 20rpx;
 					padding: 34rpx 22rpx;
 					box-sizing: border-box;
-
-					.evacuation-title-name-box {
-						font-size: 30rpx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #333333;
-						line-height: 30rpx;
+					display: flex;
+					.evacuation-title-left{
+						flex:1;
+						.evacuation-title-name-box {
+							font-size: 30rpx;
+							font-family: PingFang SC;
+							font-weight: 500;
+							color: #333333;
+							line-height: 30rpx;
+						}
+						
+						.site {
+							font-size: 28rpx;
+							font-family: PingFang SC;
+							font-weight: 500;
+							color: #999999;
+							line-height: 30rpx;
+							margin-top: 32rpx;
+							display: flex;
+							justify-content: flex-start;
+							align-items: center;
+						
+							>img {
+								width: 28rpx;
+								height: 30rpx;
+								margin-right: 18rpx;
+							}
+						}
 					}
-
-					.site {
+					.evacuation-title-right{
+						color:#0183FA;
 						font-size: 28rpx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #999999;
-						line-height: 30rpx;
-						margin-top: 32rpx;
-						display: flex;
-						justify-content: flex-start;
-						align-items: center;
-
-						>img {
-							width: 28rpx;
-							height: 30rpx;
-							margin-right: 18rpx;
-						}
+						line-height: 100rpx;
 					}
 				}
 

pages/emergencyEvacuationBigFullScreen.vue

@@ -35,12 +35,14 @@
 					</view>
 				</view>
 				<view class="map-max-for-box for-map-box-two" v-if="item.type == 3" v-for="(item,index) in mapList"
+					@click="checkRoom(item)"
 					:key="index" :class="item.roomCheckType?'for-map-box-two-check':''"
 					:style="'top:'+item.y+'px;left:'+item.x+'px;width:'+item.w+'px;height:'+item.h+'px;'">
 				</view>
 			</view>
 		</view>
 		<view class="position-button" @click="backButton">退出全屏</view>
+		<view class="position-button-two" @click="executeEvacuation">已确定疏散出口,立即执行疏散</view>
 	</view>
 </template>
 
@@ -50,7 +52,8 @@
 		getFloorData,
 		getRedisEvacuation,
 		openLight,
-		closeLight
+		closeLight,
+		executeEvacuation
 	} from '@/api/index.js'
 	export default {
 		data() {
@@ -59,12 +62,13 @@
 				buildingId: null,
 				//楼层id
 				floorId: null,
+				//实验室ID
+				subId:null,
 				//当前选中实验室
 				checkSubId: null,
 				//页面开关
 				mapType: false,
 				mapList: [],
-				shadeMapList: [],
 				//缩放相关数据
 				zoomData: null,
 				mapWidth: null, //40边框距离
@@ -74,6 +78,8 @@
 				//mqtt
 				floorClient: {},
 				evacuationTopic: "lab/newexit/line", //疏散
+				//疏散按钮
+				buttonType:false
 			}
 		},
 		onLoad(option) {
@@ -81,6 +87,13 @@
 				let obj = JSON.parse(decodeURIComponent(option.item));
 				this.$set(this,'buildingId',obj.buildingId);
 				this.$set(this,'floorId',obj.floorId);
+				this.$set(this,'subId',obj.subId);
+				this.$set(this,'checkSubId',obj.subId);
+				if(obj.type == 2){
+					this.$set(this,'buttonType',true);
+				}else{
+					this.$set(this,'buttonType',false);
+				}
 			}
 		},
 		onShow() {
@@ -88,6 +101,57 @@
 			this.getBuildingData();
 		},
 		methods: {
+			checkRoom(item){
+				console.log('item',item)
+				if(this.buttonType){
+					item.roomCheckType = !item.roomCheckType;
+					this.$forceUpdate();
+				}
+			},
+			//开始疏散
+			async executeEvacuation(){
+				let self = this;
+				let list = [];
+				let doorPointNames = [];
+				for(let i=0;i<self.mapList.length;i++){
+					if(self.mapList[i].type == 3){
+						if(!self.mapList[i].roomCheckType){
+							list.push(self.mapList[i].key)
+						}else{
+							doorPointNames.push(self.mapList[i].key)
+						}
+					}
+				}
+				if(!doorPointNames[0]){
+					uni.showToast({
+						title: '请选择疏散出口',
+						icon: "none",
+						mask: true,
+						duration: 2000
+					});
+					return
+				}
+				let obj = {
+				buildId:this.buildingId,
+				floorId:this.floorId,
+				subId: this.subId,
+				badPointNames:list,
+				doorPointNames:doorPointNames,
+				}
+				const {	data } = await executeEvacuation(obj)
+				console.log('data', data)
+				if (data.code == 200) {
+					uni.showToast({
+						title: '执行成功',
+						icon: "none",
+						mask: true,
+						duration: 2000
+					});
+					setTimeout(function(){
+						uni.navigateBack();
+					},2000);
+				}
+			},
 			//疏散页面
 			backButton() {
 				uni.navigateBack()
@@ -130,7 +194,6 @@
 							}
 						}
 						this.$set(this, 'mapList', JSON.parse(JSON.stringify(list)));
-						this.$set(this, 'shadeMapList', JSON.parse(JSON.stringify(list)));
 						this.$set(this, 'mapType', true);
 						setTimeout(function() {
 							self.getRedisEvacuation();
@@ -569,5 +632,19 @@
 			border-radius: 18px;
 			border: none;
 		}
+		.position-button-two{
+			position: fixed;
+			bottom: 20px;
+			left: 50%;
+			width: 240px;
+			line-height: 30px;
+			font-size: 16px;
+			text-align: center;
+			color: #fff;
+			background: #0183FA;
+			border-radius: 4px;
+			margin-left: -120px;
+			border: none;
+		}
 	}
 </style>

pages/manageWorkbench.vue

@@ -13,18 +13,6 @@
         <img src="@/images/Version2.2/icon_sy_aqjc.png">
         <view>安全检查</view>
       </view>
-      <!-- <view class="position-button" style="position: relative;" v-if="buttonArray[1]">
-        <picker @change="buttonChange" :range-key="'name'" :value="id" :range="buttonArray">
-          <img src="@/images/Version2.2/icon_sy_aqjc.png">
-          <view>安全检查</view>
-          <view v-if="userInfo.list>0" style="position: absolute;top:40rpx;right:56rpx;height:15rpx;width:15rpx;border-radius:50%;background: red;"></view>
-        </picker>
-      </view>
-      <view style="position: relative;" @click="goCheckPage" v-if="!buttonArray[1]">
-        <img src="@/images/Version2.2/icon_sy_aqjc.png">
-        <view>安全检查</view>
-        <view v-if="userInfo.list>0" style="position: absolute;top:40rpx;right:56rpx;height:15rpx;width:15rpx;border-radius:50%;background: red;"></view>
-      </view> -->
       <view @click="goPage('photoInspection')">
         <img src="@/images/icon_dzt_pzjc.png">
         <view>拍照检查</view>
@@ -49,17 +37,7 @@
         <img src="@/images/Version3.0/icon_sy_aqxx.png">
         <view>安全档案</view>
       </view>
-      <!-- <view @click="goPage('alarm')">
-        <img src="@/images/Version2.2/icon_sy_aqbj.png">
-        <view>安全报警</view>
-      </view> -->
     </view>
-    <!-- <view class="min-icon-button-box" style="margin-top: 0;"> -->
-    <!-- <view @click="goPage('emergencyEvacuation')">
-      <img src="@/images/Version2.3/icon_sy_yjss.png">
-      <view>应急疏散</view>
-    </view> -->
-    <!-- </view> -->
     <view class=big-icon-button-box>
       <!-- 安全报警 -->
       <img src="@/images/Version2.3/button_1.png" @click="goPage('alarm')">
@@ -373,8 +351,8 @@ export default {
 		}
 		// mqtt订阅因为返回数据频率问题 暂时取消列表的MQTT刷新
 		// list.push(obj);
-		list.push({type:"lab/bigview",});
-		list.push({type:"lab/exit/line",});
+		// list.push({type:"lab/bigview",});
+		list.push({type:"lab/riskPlan/trigger/notice",});
 		getApp().appMqttOn(1,list);
       }
     },