diff --git a/monitorMobile/pages/earlyWarning/index.vue b/monitorMobile/pages/earlyWarning/index.vue
index 1789295..f9ed897 100644
--- a/monitorMobile/pages/earlyWarning/index.vue
+++ b/monitorMobile/pages/earlyWarning/index.vue
@@ -7,7 +7,10 @@
-->
-
+
+
+
+ {{title}}
@@ -213,6 +216,8 @@
},
data() {
return {
+ title: '',
+ logo: '',
searchValue: '全部',
isShowSearch: false,
isTriggered: true,
@@ -262,7 +267,12 @@
},
},
onLoad() {
- console.log(this.searchForm.$alarmType)
+ // console.log(this.sysInfo,111)
+ // 获取logo和平台名称
+ let titleObj = this.sysInfo.find(e=>e.configKey == 'SYS_NAME')
+ if(titleObj)this.title = titleObj.configValue
+ let logoObj = this.sysInfo.find(e=>e.configKey == 'SYS_LOGO')
+ if(logoObj)this.logo = logoObj.configValue
// 获取预警类型
this.getWarnTypeList()
// 隐藏导航栏
@@ -408,7 +418,7 @@
.headerBox {
/*#ifdef H5*/
height: 272rpx;
- background: url("@/static/image/earlyWarning/back2.png") no-repeat center center / cover;
+ background: url("@/static/image/earlyWarning/logoBack.png") no-repeat center center / cover;
/*#endif*/
/*#ifdef APP-PLUS || MP-ALIPAY || MP-WEIXIN*/
@@ -439,12 +449,28 @@
position: absolute;
left: 36rpx;
/*#ifdef H5*/
- top: 50rpx;
+ top: 55rpx;
/*#endif*/
/*#ifdef APP-PLUS || MP-ALIPAY || MP-WEIXIN*/
top: 110rpx;
/*#endif*/
}
+ .logoTitle {
+ position: absolute;
+ left: 36rpx;
+ /*#ifdef H5*/
+ top: 150rpx;
+ /*#endif*/
+ /*#ifdef APP-PLUS || MP-ALIPAY || MP-WEIXIN*/
+ top: 170rpx;
+ /*#endif*/
+ font-family: 'Alimama ShuHeiTi';
+ font-weight: 700;
+ color: #2388FF;
+ font-size: 50rpx;
+ letter-spacing: 6%;
+ text-shadow: #fff 1px 0 0,#fff 0 1px 0,#fff -1px 0 0, #fff 0 -1px 0;
+ }
}
.contentBox {
diff --git a/monitorMobile/pages/monitor/index - 副本.vue b/monitorMobile/pages/monitor/index - 副本.vue
new file mode 100644
index 0000000..411bb95
--- /dev/null
+++ b/monitorMobile/pages/monitor/index - 副本.vue
@@ -0,0 +1,747 @@
+
+
+
+
+
+
+
+ {{sensorName+'(' + sensorId + ')'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 选择分组
+ {{this.searchForm.groupName}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{'警告类型'}}
+
+
+
+
+
+
+
+
+
+ {{'处理状态'}}
+
+
+
+
+
+
+
+
+
+
+ 重置
+
+
+ 确认
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.resWidth}}*{{item.resHeight}}
+
+
+
+
+
+ 摄像头ID:{{item.sensorId}}
+
+
+
+
+
+ 摄像头名称:{{item.sensorName}}
+
+
+
+
+
+ 设备IP:{{item.directUrlIp}}
+
+
+
+
+
+
+
+
+
+ 所属学校:演示学校
+
+
+
+
+ 播放
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/monitorMobile/pages/monitor/index.vue b/monitorMobile/pages/monitor/index.vue
index 411bb95..9dfa136 100644
--- a/monitorMobile/pages/monitor/index.vue
+++ b/monitorMobile/pages/monitor/index.vue
@@ -16,7 +16,7 @@
-
+
@@ -78,7 +78,8 @@
-
+
@@ -201,10 +202,10 @@
this.loadmore()
},
onUnload() {
- if(this.showVideo) {
+ if (this.showVideo) {
this.closeDialog()
}
-
+
},
onPullDownRefresh() {
uni.stopPullDownRefresh()
@@ -222,7 +223,7 @@
// this.loadComponent().then(() => {
this.player = new Aliplayer({
id: "url-player-test",
- source: this.videoUrl + "&subaudio=no&jitterbuffer=6000",
+ source: this.videoUrl,
width: "100%",
height: "100%",
isLive: true,
@@ -336,7 +337,7 @@
});
},
// 获取视频地址
- startClick(id,name) {
+ startClick(id, name) {
this.sensorId = id;
this.sensorName = name;
this.showVideo = true;
@@ -350,7 +351,17 @@
data
} = res;
if (code == 200) {
- this.videoUrl = data.rtsPullStreamUrls[0].url;
+ 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()
@@ -443,17 +454,20 @@
align-items: center;
padding: 0 25rpx;
background: #fff;
+
.title {
font-weight: 700;
font-size: 28rpx;
}
+
.closes {
-
+
// background: #ccc;
}
}
+
.botbox {
- height:calc(100% - 80rpx);
+ height: calc(100% - 80rpx);
}
}
diff --git a/monitorMobile/static/image/earlyWarning/back3.png b/monitorMobile/static/image/earlyWarning/back3.png
new file mode 100644
index 0000000..ed0b383
Binary files /dev/null and b/monitorMobile/static/image/earlyWarning/back3.png differ
diff --git a/monitorMobile/static/image/earlyWarning/logoBack.png b/monitorMobile/static/image/earlyWarning/logoBack.png
new file mode 100644
index 0000000..502c2a8
Binary files /dev/null and b/monitorMobile/static/image/earlyWarning/logoBack.png differ
diff --git a/monitorMobile/store/index.js b/monitorMobile/store/index.js
index f265cc5..3f30634 100644
--- a/monitorMobile/store/index.js
+++ b/monitorMobile/store/index.js
@@ -21,7 +21,7 @@ try {
}
// 需要永久存储,且下次APP启动需要取出的,在state中的变量名
-let saveStateKeys = ['token', 'userInfo', 'allOptions', 'refreshToken'];
+let saveStateKeys = ['token', 'userInfo', 'allOptions', 'refreshToken','sysInfo'];
// 保存变量到本地存储中
const saveLifeData = function(key, value) {
@@ -54,6 +54,7 @@ const store = new Vuex.Store({
monitorList: [], //摄像头列表
buildingList:[], //楼栋列表
},
+ sysInfo: []
},
actions: {
async getUserInfo(context) {