zc

api/index.js

@@ -1790,3 +1790,12 @@ export const selectTriggerInfo = (data) => {
         data: data,
     })
 };
+//标记预案已读
+export const riskPlanId = (data) => {
+    return apiResquest({
+        url: `/zd-laboratory/plan/writerEnterRiskPlan`,
+        method: 'GET',
+        data: data,
+    })
+};
+

api/request/config.js

@@ -1,8 +1,8 @@
 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.20: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',//何成
     // base_url: 'http://192.168.1.43:9800',//43服务器
@@ -10,8 +10,8 @@ const config = {
 
 	// base_url: 'https://lab.sxitdlc.com/labNhSystem/',//43服务器高升测试
 	// base_url: 'https://lab.sxitdlc.com/labAppTest',//43服务器线上
-    //base_url: 'https://lab.sxitdlc.com/appTest/',//88服务器线上
-	//base_url: 'https://lab.sxitdlc.com/labSystem/', //矿大地址
+    // base_url: 'https://lab.sxitdlc.com/appTest/',//88服务器线上
+	// base_url: 'https://lab.sxitdlc.com/labSystem/', //矿大地址
 	// base_url: 'https://lab.sxitdlc.com/jdlabSystem/', //交大地址
     // base_url: 'https://lab.sxitdlc.com/jndxlabSystem/', //暨大地址
     //  base_url: 'https://lab.sxitdlc.com/kdwclabSystem/', //矿大文昌地址

component/topWarn.vue

@@ -23,7 +23,7 @@
 				subjectId:"",
 				buildingId:"",
 				subjectName:"",
-				closeId:"",
+				groupId:"",
 			}
 		},
 		created() {
@@ -83,7 +83,7 @@
 				});
 			},
 			async closeRiskPlan(){
-				const {data} = await closeRiskPlan({id:this.closeId});
+				const {data} = await closeRiskPlan({id:this.groupId});
 				if(data.code == 200){
 					uni.showToast({
 						title: '操作成功',
@@ -96,8 +96,14 @@
 			},
 			//页面跳转
 			goPage(){
+				let obj = {
+				  buildId: this.buildId,
+				  floorId:this.floorId,
+				  subId:this.subId,
+				  groupId:this.groupId,
+				}
 				uni.navigateTo({
-					url:'/pages/emergencyEvacuationBig'
+					url:'/pages/emergencyEvacuationBig?item='+encodeURIComponent(JSON.stringify(obj))
 				});
 			},
 			//获取报警信息
@@ -112,30 +118,31 @@
 					  this.$set(this,'subId',data.data[0].subId);
 					  if(data.data[0].riskAttribute == 1){
 						this.$set(this,'closePlan',true);
+						this.$set(this,'groupId',data.data[0].groupId);
 					  }
 					  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
+						// }
+					 //  }
 					  //没有火焰预案并且没有查看过
 					  for(let i=0;i<data.data.length;i++){
-						if(data.data[i].riskAttribute != '1'&&data.data[i].ifcheck != '1'){
+						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,
+							  groupId:data.data[i].groupId,
 							}
 							uni.navigateTo({
 								url:'/pages/emergencyEvacuationBig?item='+encodeURIComponent(JSON.stringify(obj))

pages/emergencyEvacuationBig.vue

@@ -228,7 +228,8 @@ import {
   closeLight,
   executeEvacuation,
   endEvacuation,
-  selectTriggerInfo
+  selectTriggerInfo,
+  riskPlanId
 } from '@/api/index.js'
 export default {
   data() {
@@ -349,7 +350,6 @@ export default {
     }
   },
   onLoad(option) {
-    console.log('option',option)
     if(option.item){
       let obj = JSON.parse(decodeURIComponent(option.item));
       this.$set(this,'buildingId',obj.buildId);
@@ -358,10 +358,8 @@ export default {
       this.$set(this,'subId',obj.subId);
       this.$set(this.itemData,'subjectId',obj.subId);
       this.$set(this,'pageType',2);
-      this.getBuildingData();
       this.confirmBtn();
-    }else{
-      this.treeselectByUser();
+	  this.riskPlanId(obj.groupId);
     }
     //一键灭火正式使用需要注销
     // this.itemData.subjectId=85
@@ -369,7 +367,6 @@ export default {
 
   },
   onShow() {
-    console.log('asd')
     this.treeselectByUser();
     if(this.floorId&&this.subId){
       this.getBuildingData();
@@ -605,6 +602,13 @@ export default {
       this.$set(this, 'subId', this.fjListArray[e.detail.value].subId);
       this.$set(this.itemData, 'subjectId', this.fjListArray[e.detail.value].subId);
     },
+	async riskPlanId(id){
+        let obj = {
+          groupId:id,
+          ifCheck:1,
+        };
+		const {data} = await riskPlanId(obj);
+	},
     //获取预案数据
     async selectTriggerInfo(type){
       let self = this;