Browse Source

预警详情pc和移动端修改

master
wwp 1 month ago
parent
commit
1316e3cb29
4 changed files with 52 additions and 39 deletions
  1. +1
    -1
      SafeCampus.WEB/src/views/warn/zjrq/index.vue
  2. +2
    -2
      monitorMobile/pages/earlyWarning/detail.vue
  3. +4
    -3
      monitorMobile/pages/earlyWarning/index.vue
  4. +45
    -33
      monitorMobile/pages/monitor/index.vue

+ 1
- 1
SafeCampus.WEB/src/views/warn/zjrq/index.vue View File

@@ -68,7 +68,7 @@
<img class="detailpic" :src="detailData.snapshotUrl" alt="" /> <img class="detailpic" :src="detailData.snapshotUrl" alt="" />
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<div class="linebox">所属学校:演示学校</div>
<div class="linebox">场景名称:{{ detailData.sceneName ? detailData.sceneName : "暂无数据" }}</div>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<div class="linebox">班级:{{ detailData.personSetName ? detailData.personSetName : "暂无数据" }}</div> <div class="linebox">班级:{{ detailData.personSetName ? detailData.personSetName : "暂无数据" }}</div>


+ 2
- 2
monitorMobile/pages/earlyWarning/detail.vue View File

@@ -12,10 +12,10 @@
<image style="width: 100%;height:422rpx;" :src="detailData.snapshotUrl" mode="aspectFit"></image> <image style="width: 100%;height:422rpx;" :src="detailData.snapshotUrl" mode="aspectFit"></image>
<view class="cli"> <view class="cli">
<view class="labelBox"> <view class="labelBox">
所属学校
场景名称
</view> </view>
<view class="valueBox"> <view class="valueBox">
演示学校
{{ detailData.sceneName || "--" }}
</view> </view>
</view> </view>
<view class="cli"> <view class="cli">


+ 4
- 3
monitorMobile/pages/earlyWarning/index.vue View File

@@ -116,7 +116,7 @@
<view class="liBox"> <view class="liBox">
<view class="headerCard"> <view class="headerCard">
<view class="schoolName"> <view class="schoolName">
演示学校
{{item.sceneName || '--'}}
</view> </view>
<view class="statusBox" :class="[item.warnHand == 1?'handle':'nohandle']"> <view class="statusBox" :class="[item.warnHand == 1?'handle':'nohandle']">
{{item.warnHand == 1 ? '已处理' : '未处理'}} {{item.warnHand == 1 ? '已处理' : '未处理'}}
@@ -269,9 +269,10 @@
onLoad() { onLoad() {
// console.log(this.sysInfo,111) // console.log(this.sysInfo,111)
// 获取logo和平台名称 // 获取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 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 if(logoObj)this.logo = logoObj.configValue
// 获取预警类型 // 获取预警类型
this.getWarnTypeList() this.getWarnTypeList()


+ 45
- 33
monitorMobile/pages/monitor/index.vue View File

@@ -251,14 +251,14 @@
} }


this.showVideo = false; 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() { loadWebPlayerSDK() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
@@ -342,32 +342,44 @@
this.sensorName = name; this.sensorName = name;
this.showVideo = true; 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() { confirmVideo() {
this.showVideo = false; this.showVideo = false;


Loading…
Cancel
Save