heyang

api/index.js

@@ -21,6 +21,23 @@ export const getDemoInfoList  = (data) => {
     })
 };
 
+//报警抓拍------------------
+// 预警通知-列表
+export const warningNoticeLogList  = (data) => {
+    return apiResquest({
+        url: `/laboratory/warningNoticeLog/appList`,
+        method: 'POST',
+        data: {...data}
+    })
+};
+// 预警通知-列表
+export const warningNoticeLogDetail  = (data) => {
+    return apiResquest({
+        url: `/laboratory/warningNoticeLog/getById`,
+        method: 'GET',
+        data: data,
+    })
+};
 
 //指纹-查询用户指纹录取数量
 export const fingerprintQuantity  = (data) => {

api/request/config.js

@@ -2,14 +2,14 @@ const config = {
 	//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.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服务器
 	// base_url: 'https://demo.zjznai.com/xzgd/',
 
 	// base_url: 'https://lab.zjznai.com/labNhSystem/',//43服务器高升测试
-	base_url: 'https://lab.zjznai.com/labAppTest/',//43服务器线上
+	//base_url: 'https://lab.zjznai.com/labAppTest/',//43服务器线上
     // base_url: 'https://lab.zjznai.com/appTest/',//88服务器线上
 	 //base_url: 'https://lab.zjznai.com//labSystem/', //矿大地址
       // base_url: 'https://lab.zjznai.com/labSaasSystem/', //矿大化工

pages.json

@@ -1,6 +1,11 @@
 {
 	"pages": [
-		
+		{
+			"path": "pages/earlyWarningManage/earlyWarningList",
+			"style": {
+				"navigationBarTitleText": "预警记录"
+			}
+		},
 		{
 			"path": "pages/home",//首页
 			"style": {
@@ -23,12 +28,7 @@
 				"navigationBarTitleText": "预案预警信息"
 			}
 		},
-		{
-			"path": "pages/earlyWarningManage/earlyWarningList",
-			"style": {
-				"navigationBarTitleText": "预警记录"
-			}
-		},
+		
 
 		{
 			"path": "pages/supplierWorkbench",

pages/earlyWarningManage/earlyWarningDetail.vue

@@ -3,126 +3,118 @@
   <view class="earlyWarning">
 	<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
 		<!-- 预案报警 -->
-		<view class="header" v-if="pageType==0">甲烷气体泄露-中风险</view>
+		<view class="header" v-if="form.warningType==4">甲烷气体泄露-中风险</view>
 		<!-- 化学品 -->
-		<view class="header_tow" v-if="pageType==1">化学品违规带离</view>
+		<view class="header_tow" v-if="form.warningType==2">化学品违规带离</view>
 		<!-- 气瓶 -->
-		<view class="header_three" v-if="pageType==2">气瓶违规带离</view>
+		<view class="header_three" v-if="form.warningType==3">气瓶违规带离</view>
 		<!-- 算法识别 -->
-		<view class="header_four" v-if="pageType==3">多人未穿戴实验服</view>
+		<view class="header_four" v-if="form.warningType==1">多人未穿戴实验服</view>
 		<!-- 预案报警 -->
-		<view class="site" v-if="pageType==0">
+		<view class="site" v-if="form.warningType==4">
 			<img src="@/images/Version2.2/icon_wtzg_xx.png"/>
-			<text>一号实验室</text>
+			<text>{{form.subName}}</text>
 			<text></text>
-			<text>一号楼二楼C区C111</text>
+			<text>{{form.buildName}}{{form.floorName}}{{form.roomNum}}</text>
 		</view>
 		<!-- 化学品 -->
-		<view class="site_tow" v-if="pageType==1 || pageType==2 || pageType==3">
+		<view class="site_tow" v-if="form.warningType==2 || form.warningType==3 || form.warningType==1">
 			<view class="site_tow_t">
 				<img src="@/images/Version2.2/icon_wtzg_xx.png"/>
-				<text>2023-10-1014:00</text>
+				<text>{{form.warningTime}}</text>
 			</view>
 			<view class="site_tow_b">
 				<img src="@/images/Version2.2/icon_wtzg_xx.png"/>
-				<text>一号实验室</text>
+				<text>{{form.subName}}</text>
 				<text></text>
-				<text>一号楼二楼C区C111</text>
+				<text>{{form.buildName}}{{form.floorName}}{{form.roomNum}}</text>
 			</view>
 		</view>
 		<!-- 预案报警 -->
-		<view class="basics" v-if="pageType==0">
+		<view class="basics" v-if="form.warningType==4">
 			<view class="small_title"><text></text><text>风险概况</text></view>
 			<view class="basics_li" style="margin-top:20rpx;">
 				<text>发生时间：</text>
-				<text>10-12 12:00:56至12:03:03 </text>
+				<text>{{form.startTime}}至{{form.endTime}}</text>
 			</view>
 			<view class="basics_li">
 				<text>持续时间：</text>
-				<text>30秒</text>
+				<text>{{form.riskDuration}}</text>
 			</view>
 			<view class="basics_li">
 				<text>风险响应人员：</text>
-				<text>曹秀康、杨虎城、刘波 </text>
+				<text>{{form.responder}}</text>
 			</view>
 			<view class="basics_li">
 				<text>实验室内人员：</text>
-				<text>刘然、李茶、周瑶瑶、李娇、 李雪、陈记、李玉玉</text>
+				<text>{{form.indoorUser}}</text>
 			</view>
 		</view>
 		<!-- 化学品 -->
-		<view class="basics" v-if="pageType==1">
+		<view class="basics" v-if="form.warningType==2">
 			<view class="small_title"><text></text><text>化学品信息</text></view>
 			<view class="basics_li" style="margin-top:20rpx;">
-				<text>化学品名称</text>
+				<text>{{form.name}}</text>
 				<text></text>
 			</view>
 			<view class="basics_li">
 				<text>存放位置：</text>
-				<text>3号柜化学品余量：100g</text>
+				<text>{{form.deposit}}</text>
 			</view>
 			<view class="basics_li">
 				<text>化学品余量：</text>
-				<text>100g</text>
+				<text>{{form.margin}}</text>
 			</view>
 			<view class="basics_li">
 				<text>申领人：</text>
-				<text>曹秀康</text>
+				<text>{{form.apply}}</text>
 			</view>
 			<view class="basics_li">
 				<text>申领时间：</text>
-				<text>10-10 10:00:23</text>
+				<text>{{form.applyTime}}</text>
 			</view>
 			<view class="basics_li">
 				<text>过期时间：</text>
-				<text>10-10 10:00:23</text>
+				<text>{{form.applyTime}}</text>
 			</view>
 		</view>
 		<!-- 气瓶 -->
-		<view class="basics" v-if="pageType==2">
+		<view class="basics" v-if="form.warningType==3">
 			<view class="small_title"><text></text><text>气瓶信息</text></view>
 			<view class="basics_li" style="margin-top:20rpx;">
-				<text>气体名称</text>
+				<text>{{form.name}}</text>
 				<text></text>
 			</view>
 			<view class="basics_li">
 				<text>气体余量：</text>
-				<text>10L</text>
+				<text>{{form.margin}}</text>
 			</view>
 			<view class="basics_li">
 				<text>气瓶规格：</text>
-				<text>100g/瓶 </text>
+				<text>{{form.specification}}</text>
 			</view>
 			<view class="basics_li">
 				<text>所有人：</text>
-				<text>刘然</text>
+				<text>{{form.specification}}</text>
 			</view>
 			<view class="basics_li">
 				<text>入库时间：</text>
-				<text>10-10 10:00:23</text>
+				<text>{{form.specification}}</text>
 			</view>
 			<view class="basics_li">
 				<text>申领人：</text>
-				<text>刘然</text>
+				<text>{{form.apply}}</text>apply
 			</view>
 			<view class="basics_li">
 				<text>申领时间：</text>
-				<text>10-10 10:00:23</text>
+				<text>{{form.applyTime}}</text>
 			</view>
 		</view>
-		<view class="note" v-if="pageType==0 || pageType==3">
+		<view class="note" v-if="form.warningType==4 || form.warningType==1">
 			<view class="small_title"><text></text><text>通知短信</text></view>
-			<view class="note_li" style="margin-top:20rpx;">
-				<text>曹秀康（实验室负责人）</text>
-				<view class="note_li_r"><img  src="@/images/icon_yjxx_ytz.png"/><text>已通知</text></view>
-			</view>
-			<view class="note_li">
-				<text>李秀丽（安全责任人）</text>
-				<view class="note_li_r"><img  src="@/images/icon_yjxx_ytz.png"/><text>已通知</text></view>
-			</view>
-			<view class="note_li">
-				<text>周燕（安全责任人）</text>
-				<view class="note_li_r"><img  src="@/images/icon_yjxx_ytz.png"/><text>已通知</text></view>
+			<view class="note_li" style="margin-top:20rpx;" v-for="(item,index) in form.messageVOList">
+				<text>{{item.name}}</text>
+				<view class="note_li_r" v-if="item.isSuccess=='成功'"><img  src="@/images/icon_yjxx_ytz.png"/><text>已通知</text></view>
 			</view>
 		</view>
 		<view class="note">
@@ -134,9 +126,11 @@
 		</view>
 		<view class="picture">
 			<view class="small_title"><text></text><text>报警抓拍</text></view>
-			<view class="picture_b" @click="lockImg(item.uploadDtoList)">
-				<img  src="@/images/icon_yjxx_ytz.png"/>
-				<!-- <img  :src="baseUrl+imgItem.fileUrl"   v-for="(imgItem,imgIndex) in item.uploadDtoList"/> -->
+			<view class="picture_b" >
+				<view class="video">
+					<video id="myvideo" class="video_t" :src="configUrl+infoData.recordVideo"></video>
+					<img  class="video_b" @click="lockVideo()" src="@/images/icon_bjzp_spbof.png"/>
+				</view>
 			</view>
 		</view>
 		<view class="bottom_btn">查看监控</view>
@@ -147,7 +141,7 @@
 
 <script>
 import { config } from '@/api/request/config.js'
-import {checkManageList,conditionCollegeInfo} from '@/api/index.js'
+import {checkManageList,conditionCollegeInfo,warningNoticeLogDetail} from '@/api/index.js'
 export default {
   name: "rectifyList",
   components: {
@@ -155,41 +149,28 @@ export default {
   },
   data() {
     return {
-		pageType:2,//0预案报警信息 1化学品 2气瓶  3算法识别
+		configUrl:config.base_url,
 		//列表请求参数
 		getData:{
 			pageNum:1,
 			pageSize:20,
 		},
 		total:0,
+		id:'',
+		form:{},
 		
 	}
   },
   onLoad(option) {
-	  
+	  if(option.id){
+		  this.id=option.id;
+	  }
   },
   onShow() {
 	
   },
   mounted(){
-	 if(this.pageType==0){
-		uni.setNavigationBarTitle({
-			title:'预案报警信息'
-		})
-	 }else if(this.pageType==1){
-		uni.setNavigationBarTitle({
-			title:'化学品预警信息'
-		}) 
-	 }else if(this.pageType==2){
-		uni.setNavigationBarTitle({
-			title:'气瓶预警信息'
-		}) 
-	 }else if(this.pageType==3){
-		uni.setNavigationBarTitle({
-			title:'算法识别预警信息'
-		}) 
-	 }
-	  
+	this.getInfo(); 
   },
   methods: {
 		
@@ -216,7 +197,39 @@ export default {
 				complete: function(res) {},
 			})
 		},
-		
+		//视频全屏播放
+		lockVideo(){
+			this.videoContext = uni.createVideoContext("myvideo", this);    
+			this.videoContext.requestFullScreen({ direction: 90 });  
+			this.videoContext.play();
+		},
+		//获取详情
+		async getInfo(){
+		    let _this = this;
+			const {data} = await warningNoticeLogDetail({id:this.id})
+			if(data.code==200){
+				let res=data.data
+				this.form=res;
+				
+				if(res.warningType==1){
+					uni.setNavigationBarTitle({
+						title:'算法识别预警信息'
+					})
+				}else if(res.warningType==2){
+					uni.setNavigationBarTitle({
+						title:'化学品预警信息'
+					}) 
+				}else if(res.warningType==3){
+					uni.setNavigationBarTitle({
+						title:'气瓶预警信息'
+					}) 
+				}else if(res.warningType==4){
+					uni.setNavigationBarTitle({
+						title:'预案报警信息'
+					}) 
+				}
+			}
+		},
 		handleClick(row,doType){
 		  let self=this;
 		  if( doType=='detail'){//详情	
@@ -498,16 +511,29 @@ export default {
 			flex-wrap: wrap;
 			padding: 40rpx 30rpx 10rpx;
 			box-sizing: border-box;
-			>img{
-				width: 180rpx;
-				height: 180rpx;
+			
+			.video{
+				position: relative;
+				width: 150rpx;
+				height: 150rpx;
 				border-radius: 10rpx 10rpx 10rpx 10rpx;
 				margin-right: 38rpx;
 				margin-bottom: 10rpx;
+				.video_t{
+					width: 150rpx;
+					height: 150rpx;
+					border-radius: 10rpx 10rpx 10rpx 10rpx;
+					position: absolute;
+				}
+				.video_b{
+					width: 40rpx;
+					height: 40rpx;
+					position: absolute;
+					left: 55rpx;
+					top: 55rpx;
+				}
 			}
-			>img:nth-of-type(3n+3){
-				margin-right: 0rpx;
-			}
+			
 		}
 	}
 	.bottom_btn{

pages/earlyWarningManage/earlyWarningList.vue

@@ -2,23 +2,26 @@
 <template>
   <view class="earlyWarning">
 	<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
-		<viw class="list">
-			<view class="list_t">2023-07-02</view>
-			<view class="list_li" @click="handleClick(item,'detail')">
+		<viw class="list" v-for="(item,index) in dataList" :key="index">
+			<view class="list_t">{{item.date}}</view>
+			<view class="list_li" v-for="(item2,index2) in item.list" :key="index2" @click="handleClick(item2,'detail')">
 				<view class="list_li_t">
 					<view class="list_li_t_l"></view>
-					<view class="list_li_t_c red_color">预案</view>
-					<view class="list_li_t_c2">甲烷气体泄露-中风险</view>
+					<view class="list_li_t_c orange_color" v-if="item2.warningType==1">算法识别</view>
+					<view class="list_li_t_c yellow_color" v-if="item2.warningType==2">化学品</view>
+					<view class="list_li_t_c yellow_color" v-if="item2.warningType==3">气瓶</view>
+					<view class="list_li_t_c red_color" v-if="item2.warningType==4">预案</view>
+					<view class="list_li_t_c2">{{item2.warningContent}}</view>
 					<view class="list_li_t_r"></view>
 				</view>
 				<view class="list_li_b">
 					<view class="list_li_b_t">
-						<text>甲烷监测实验室</text>
-						<text>17:20</text>
+						<text>{{item2.subName}}</text>
+						<text>{{item2.warningTime}}</text>
 					</view>
 					<view class="list_li_b_b">
 						<img src="@/images/Version2.2/icon_wtzg_xx.png"/>
-						<text>测试一号楼-三层-C111</text>
+						<text>{{item2.buildName}}-{{item2.floorName}}{{item2.roomNum}}</text>
 					</view>
 				</view>
 			</view>
@@ -31,7 +34,7 @@
 
 <script>
 import { config } from '@/api/request/config.js'
-import {checkManageList,conditionCollegeInfo} from '@/api/index.js'
+import {checkManageList,conditionCollegeInfo,warningNoticeLogList} from '@/api/index.js'
 export default {
   name: "rectifyList",
   components: {
@@ -44,7 +47,7 @@ export default {
 			pageNum:1,
 			pageSize:20,
 		},
-		dataList:[{}],
+		dataList:[],
 		total:0,
 		
 	}
@@ -56,7 +59,7 @@ export default {
 	
   },
   mounted(){
-	 
+	 this.getList();
 	  
   },
   methods: {
@@ -79,16 +82,23 @@ export default {
 		handleClick(row,doType){
 		  let self=this;
 		  if( doType=='detail'){//详情	
-			  
+			  uni.navigateTo({
+			    url: '/pages/earlyWarningManage/earlyWarningDetail?id='+row.id,//安全警报
+			  });
 		  }
 		  
 		},
 		async getList(){
 			let self = this;
-			const {data} = await checkManageList(this.getData);
+			const {data} = await warningNoticeLogList(this.getData);
 			if(data.code==200){
-				this.dataList=[...this.dataList,...data.data.records]
+				let list=[];
+				for(let i in data.data.records[0]){
+					list.push({'date':i,'list':data.data.records[0][i]})
+				}
+				this.dataList=[...this.dataList,...list]
 				this.total=data.data.total;
+				 console.log(this.dataList)
 			}
 		},
 	  
@@ -136,6 +146,7 @@ export default {
 			border-radius: 10rpx;
 			padding-bottom: 52rpx;
 			box-sizing: border-box;
+			margin-bottom: 20rpx;
 			.list_li_t{
 				position: relative;
 				height: 110rpx;

pages/mine.vue

@@ -315,9 +315,13 @@ export default {
           url: '/pages_manage/workbench/laboratory/meLaboratory',//我的实验室
         });
       }else if(type == 'alarm'){
-        uni.navigateTo({
-          url: '/pages_manage/workbench/securityAlert/securityAlertList',//安全警报
-        });
+        // uni.navigateTo({
+        //   url: '/pages_manage/workbench/securityAlert/securityAlertList',//安全警报
+        // });
+		uni.navigateTo({
+		  url: '/pages/earlyWarningManage/earlyWarningList',//安全警报
+		});
+		
       }else if(type == 'record'){
         uni.navigateTo({
           url: '/pages_manage/workbench/plan/planList',//预案执行记录