From 1316e3cb2918fc3bbbea804caf24d48b3448ff0c Mon Sep 17 00:00:00 2001
From: wwp <782568523@qq.com>
Date: Thu, 10 Oct 2024 11:02:54 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E8=AF=A6=E6=83=85pc=E5=92=8C?=
 =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SafeCampus.WEB/src/views/warn/zjrq/index.vue |  2 +-
 monitorMobile/pages/earlyWarning/detail.vue  |  4 +-
 monitorMobile/pages/earlyWarning/index.vue   |  7 +-
 monitorMobile/pages/monitor/index.vue        | 78 +++++++++++---------
 4 files changed, 52 insertions(+), 39 deletions(-)

diff --git a/SafeCampus.WEB/src/views/warn/zjrq/index.vue b/SafeCampus.WEB/src/views/warn/zjrq/index.vue
index ddd9041..949b3ef 100644
--- a/SafeCampus.WEB/src/views/warn/zjrq/index.vue
+++ b/SafeCampus.WEB/src/views/warn/zjrq/index.vue
@@ -68,7 +68,7 @@
           <img class="detailpic" :src="detailData.snapshotUrl" alt="" />
           <el-row :gutter="20">
             <el-col :span="12">
-              <div class="linebox">所属学校：演示学校</div>
+              <div class="linebox">场景名称：{{ detailData.sceneName ? detailData.sceneName : "暂无数据" }}</div>
             </el-col>
             <el-col :span="12">
               <div class="linebox">班级：{{ detailData.personSetName ? detailData.personSetName : "暂无数据" }}</div>
diff --git a/monitorMobile/pages/earlyWarning/detail.vue b/monitorMobile/pages/earlyWarning/detail.vue
index 009c399..6cdf23c 100644
--- a/monitorMobile/pages/earlyWarning/detail.vue
+++ b/monitorMobile/pages/earlyWarning/detail.vue
@@ -12,10 +12,10 @@
 			<image style="width: 100%;height:422rpx;" :src="detailData.snapshotUrl" mode="aspectFit"></image>
 			<view class="cli">
 				<view class="labelBox">
-					所属学校：
+					场景名称：
 				</view>
 				<view class="valueBox">
-					演示学校
+					{{ detailData.sceneName || "--" }}
 				</view>
 			</view>
 			<view class="cli">
diff --git a/monitorMobile/pages/earlyWarning/index.vue b/monitorMobile/pages/earlyWarning/index.vue
index f9ed897..073e68d 100644
--- a/monitorMobile/pages/earlyWarning/index.vue
+++ b/monitorMobile/pages/earlyWarning/index.vue
@@ -116,7 +116,7 @@
 							<view class="liBox">
 								<view class="headerCard">
 									<view class="schoolName">
-										演示学校
+										{{item.sceneName || '--'}}
 									</view>
 									<view class="statusBox" :class="[item.warnHand == 1?'handle':'nohandle']">
 										{{item.warnHand == 1 ? '已处理' : '未处理'}}
@@ -269,9 +269,10 @@
 		onLoad() {
 			// console.log(this.sysInfo,111)
 			// 获取logo和平台名称
-			let titleObj = this.sysInfo.find(e=>e.configKey == 'SYS_NAME')
+			const sysInfo = uni.getStorageSync('sysInfo');
+			let titleObj = sysInfo.find(e=>e.configKey == 'SYS_NAME')
 			if(titleObj)this.title = titleObj.configValue
-			let logoObj = this.sysInfo.find(e=>e.configKey == 'SYS_LOGO')
+			let logoObj = sysInfo.find(e=>e.configKey == 'SYS_LOGO')
 			if(logoObj)this.logo = logoObj.configValue
 			// 获取预警类型
 			this.getWarnTypeList()
diff --git a/monitorMobile/pages/monitor/index.vue b/monitorMobile/pages/monitor/index.vue
index 9dfa136..2532ebe 100644
--- a/monitorMobile/pages/monitor/index.vue
+++ b/monitorMobile/pages/monitor/index.vue
@@ -251,14 +251,14 @@
 				}
 
 				this.showVideo = false;
-				let params = {
-					sensorId: this.sensorId,
-					streamId: this.streamId,
-					videoToken: this.videoToken
-				};
-				stopUrl(params).then(res => {
-
-				})
+				// let params = {
+				// 	sensorId: this.sensorId,
+				// 	streamId: this.streamId,
+				// 	videoToken: this.videoToken
+				// };
+				// stopUrl(params).then(res => {
+
+				// })
 			},
 			loadWebPlayerSDK() {
 				return new Promise((resolve, reject) => {
@@ -342,32 +342,44 @@
 				this.sensorName = name;
 				this.showVideo = true;
 
-				startUrl({
-					sensorId: id
-				}).then(res => {
-
-					let {
-						code,
-						data
-					} = res;
-					if (code == 200) {
-						if (this.sensorId == 'SXT001') {
-							this.videoUrl = 'http://123.57.209.16:8004/video/1.mp4'
-							
-						} else if (this.sensorId == 'SXT002') {
-							this.videoUrl = 'http://123.57.209.16:8004/video/5.mp4'
-					
-						} else if (this.sensorId == 'SXT003') {
-							this.videoUrl = 'http://123.57.209.16:8004/video/2.mp4'
-							
-						}
-						// this.videoUrl = data.rtsPullStreamUrls[0].url;
-						this.streamId = data.streamId;
-						this.videoToken = data.videoToken;
-						this.setVideo()
-					}
-				})
+				// startUrl({
+				// 	sensorId: id
+				// }).then(res => {
+
+				// 	let {
+				// 		code,
+				// 		data
+				// 	} = res;
+				// 	if (code == 200) {
+				// 		if (this.sensorId == 'SXT001') {
+				// 			this.videoUrl = 'http://123.57.209.16:8004/video/1.mp4'
+
+				// 		} else if (this.sensorId == 'SXT002') {
+				// 			this.videoUrl = 'http://123.57.209.16:8004/video/5.mp4'
+
+				// 		} else if (this.sensorId == 'SXT003') {
+				// 			this.videoUrl = 'http://123.57.209.16:8004/video/2.mp4'
+
+				// 		}
+				// 		// this.videoUrl = data.rtsPullStreamUrls[0].url;
+				// 		this.streamId = data.streamId;
+				// 		this.videoToken = data.videoToken;
+				// 		this.setVideo()
+				// 	}
+				// })
+				if (this.sensorId == 'SXT001') {
+					this.videoUrl = 'http://123.57.209.16:8004/video/1.mp4'
+
+				} else if (this.sensorId == 'SXT002') {
+					this.videoUrl = 'http://123.57.209.16:8004/video/5.mp4'
+
+				} else if (this.sensorId == 'SXT003') {
+					this.videoUrl = 'http://123.57.209.16:8004/video/2.mp4'
+
+				}
+				// this.videoUrl = data.rtsPullStreamUrls[0].url;
 
+				this.setVideo()
 			},
 			confirmVideo() {
 				this.showVideo = false;