heyang

api/request/config.js

@@ -13,7 +13,7 @@ const config = {
 	// base_url: 'https://lab.zjznai.com/labNhSystem/',//43服务器高升测试
 	// base_url: 'https://lab.zjznai.com/labTest/',//1.8外网
 	// base_url: 'https://lab.zjznai.com/labAppTest/',//43服务器线上
-	 //base_url: 'https://lab.zjznai.com/appTest/',//88服务器线上
+	// base_url: 'https://lab.zjznai.com/appTest/',//88服务器线上
 	// base_url: 'https://lab.zjznai.com/labSystem/', //矿大地址
 	// base_url: 'https://lab.zjznai.com/jdlabSystem/', //交大地址
 	// base_url: 'https://lab.zjznai.com/jndxlabSystem/', //暨大地址
@@ -21,6 +21,7 @@ const config = {
 	// base_url: 'https://lab.zjznai.com/kdwclabSystem/', //矿大文昌地址
 	// base_url: 'https://znyj.zjznai.suda.edu.cn/labSystem/', //苏大临时地址
 	 base_url: 'https://labcontrol.nwafu.edu.cn/api/', //西北农林
+	// base_url: 'http://172.16.0.65/api/', //西北农林
 	//base_url: 'https://lab.zjznai.com/labapp/', //43测试
 }
 export {

pages/views/login/login.vue

@@ -200,13 +200,14 @@
 				});
 				if (data.code == 200) {
 					let obj = JSON.parse(data.data.configValue)
-					console.log('obj', obj)
 					//文件预览地址
 					uni.setStorageSync('filePreviewUrl', 'https://' + obj.fileExtranetUrl)
 					//小程序视频地址
 					uni.setStorageSync('cameraExtranetAgent', 'https://' + obj.cameraExtranetAgent)
 					//MQTT地址
 					uni.setStorageSync('mqttUrl', Decrypt(obj.mqttExtranetUrl))
+					//MQTT地址-内网
+					uni.setStorageSync('mqttIntranetUrl', Decrypt(obj.mqttIntranetUrl))
 					//MQTT账号
 					uni.setStorageSync('mqttUser', Decrypt(obj.mqttExtranetUser))
 					//MQTT密码

pages/views/teacherPage/laboratoryList.vue

@@ -2,7 +2,7 @@
 <template>
 	<view id="laboratoryList">
 		<view class='top-search-value-max-box'>
-			<view class='top-search-value-box'>
+			<view class='top-search-value-box' @click="searchValueClick()">
 				<img src="@/pages/images/newImage/icon_sys_ss@1x.png">
 				<input class="input-box" v-model="queryParams.searchValue" 
 							 maxlength="10" placeholder="搜索实验室/房间号"

pages_basics/views/earlyWarningManage/earlyWarningDetail.vue

@@ -1,7 +1,7 @@
 <!-- 预案报警信息 -->
 <template>
 	<view class="earlyWarning">
-		<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
+		
 			<!-- 预案报警 -->
 			<view class="header" v-if="form.warnType==4">{{form.eventName}} - {{form.riskPlanLevel ==1?'低风险':(form.riskPlanLevel ==2?'中风险':(form.riskPlanLevel ==3?'较高风险':(form.riskPlanLevel ==4?'高风险':'')))}}</view>
 			<!-- 化学品 -->
@@ -198,21 +198,21 @@
 				</view>
 			</view>
 			<!-- 报警抓拍 -->
-			<view v-if="(form.warnType==1&&form.chemicalWarnType==1&&form.snapImg[0]) || (form.warnType!=1&&form.snapImg[0])"
+			<view v-if="(form.warnType==1&&form.chemicalWarnType==1&&form.recordPhoto[0]) || (form.warnType!=1&&form.recordPhoto[0])"
 				class="picture">
 				<view class="small_title"><text></text><text>报警抓拍</text></view>
 				<view class="picture_b">
 					<view class="img">
-						<img v-for="(item,index) in form.snapImg" @click="lockImg(form.snapImg)" :key="index"
-							:src="configUrl+item" />
+						<img v-for="(item,index) in form.recordPhoto" @click="lockImg(form.recordPhoto)" :key="index"
+							:src="item" />
 					</view>
 				</view>
 			</view>
 			<!-- 查看监控 -->
 			<view class="bottom_btn"
-				v-if="(form.warnType==1&&form.chemicalWarnType==1&&form.snapVideo[0]) || (form.warnType!=1&&form.snapVideo[0])"
+				v-if="(form.warnType==1&&form.chemicalWarnType==1&&form.recordVideo[0]) || (form.warnType!=1&&form.recordVideo[0])"
 				@click="handleClick('','monitor')">查看监控</view>
-		</scroll-view>
+		
 	</view>
 
 </template>
@@ -252,6 +252,7 @@
 			}
 		},
 		onLoad(option) {
+			console.log('短信',option)
 			let self = this;
 			if (!uni.getStorageSync('token')) {
 				if (option.noticeId) {
@@ -260,6 +261,9 @@
 				} else if (option.eventId) {
 					uni.setStorageSync('warningId', option.eventId);
 					uni.setStorageSync('warnType', '4');
+				}else if (option.id) {
+					uni.setStorageSync('warningId', option.id);
+					uni.setStorageSync('warnType', '4');
 				}
 				uni.redirectTo({
 					url: '/pages/views/login/login',
@@ -271,6 +275,9 @@
 				} else if (option.eventId) {
 					this.warningId = option.eventId
 					this.warnType = '4';
+				}else if (option.id) {
+					this.warningId = option.id
+					this.warnType = '4';
 				} else if (uni.getStorageSync('warningId')) {
 					this.warningId = uni.getStorageSync('warningId');
 					this.warnType = uni.getStorageSync('warnType');
@@ -435,6 +442,9 @@
 					data.data.warnType = 4;
 					data.data.eventStartTime = parseTime(data.data.eventStartTime, "{y}-{m}-{d} {h}:{i}:{s}");
 					data.data.eventEndTime = data.data.eventEndTime?parseTime(data.data.eventEndTime, "{h}:{i}:{s}"):null;
+					if(data.data.recordPhoto){
+						data.data.recordPhoto=data.data.recordPhoto.split(',')
+					}
 					let list = [];
 					data.data.messageLogVoList.forEach((item) => {
 						let minList = item.nickRoleName.split(',');
@@ -453,9 +463,16 @@
 			handleClick(row, doType) {
 				let self = this;
 				if (doType == 'monitor') { //监控
-					uni.navigateTo({
+					/* uni.navigateTo({
 						url: '/pages_basics/views/earlyWarningManage/videoMonitoring?subId=' + this.form.subId + '&floorId=' +
 							this.form.floorId //我的实验室
+					}); */
+					let obj = {
+						type:4,
+						subId:this.form.subId
+					}
+					uni.navigateTo({
+							url: '/pages_manage/views/laboratory/videoPlayer?item='+encodeURIComponent(JSON.stringify(obj))
 					});
 				}
 
@@ -468,11 +485,9 @@
 
 <style lang="stylus" scoped>
 	.earlyWarning {
-		height: 100%;
-		display flex;
 		padding-bottom: 30rpx;
 		box-sizing: border-box;
-
+	
 		.red_color {
 			color: #D40000;
 			border: 1rpx solid #D40000;

pages_manage/views/laboratory/voiceBroadcast.vue

@@ -206,7 +206,7 @@
 				  let res = JSON.parse(uploadFileRes.data);
 				  if (res.code == 200) {
 					console.log("上传成功", res)
-					let url = 'http://'+config.base_url.split('://')[1]+res.data.url
+					let url = 'http://'+uni.getStorageSync('mqttIntranetUrl').split(':')[0]+'/'+res.data.url
 					self.iotAppSpeakerPlayVoice(url);
 				  } else {
 					uni.showToast({

pages_safetyCheck/views/inspectManage/inspectList.vue

@@ -611,7 +611,7 @@
 				width: 200rpx;
 				height: 60rpx;
 				border-radius: 50rpx 50rpx 50rpx 50rpx;
-				border: 1rpx solid #E0E0E0;
+				border: 2rpx solid #E0E0E0;
 				font-size: 24rpx;
 				color: #333333;
 				line-height: 60rpx;
@@ -644,7 +644,7 @@
 				width: 480rpx;
 				height: 60rpx;
 				border-radius: 50rpx 50rpx 50rpx 50rpx;
-				border: 1rpx solid #E0E0E0;
+				border: 2rpx solid #E0E0E0;
 				display: flex;
 				justify-content: flex-start;
 				align-items: center;
@@ -698,7 +698,7 @@
 				height: 50rpx;
 				background: #F5F5F5;
 				border-radius: 50rpx 50rpx 50rpx 50rpx;
-				border: 1rpx solid #E0E0E0;
+				border: 2rpx solid #E0E0E0;
 				margin-right: 10rpx;
 				font-size: 24rpx;
 				color: #333333;
@@ -715,7 +715,7 @@
 			#levelColor-B {
 				background: #F5F5F5;
 				color: #333333;
-				border: 1rpx solid #E0E0E0;
+				border: 2rpx solid #E0E0E0;
 			}
 
 		}
@@ -774,7 +774,7 @@
 				width: 636rpx;
 				height: 120rpx;
 				border-radius: 10rpx 10rpx 10rpx 10rpx;
-				border: 1rpx solid #E0E0E0;
+				border: 2rpx solid #E0E0E0;
 				margin: 20rpx 0 0 28rpx;
 				padding: 12rpx 16rpx;
 				box-sizing: border-box;

pages_safetyCheck/views/snapshotManage/snapshotList.vue

@@ -377,6 +377,7 @@
 				uni.scanCode({
 					onlyFromCamera: true,
 					success: function(res) {
+						console.log(res)
 						let list = res.result.split("?")[1].split("&");
 						let codeData = {};
 						list.forEach((item) => {