Commit 796e3fcf authored by xinzhedeai's avatar xinzhedeai

视频显示 监测时间添加

parent ae7ba40b
...@@ -93,21 +93,22 @@ export default { ...@@ -93,21 +93,22 @@ export default {
playerVideo(item) { playerVideo(item) {
if (this.videoContainer.firstElementChild) { if (this.videoContainer.firstElementChild) {
this.videoContainer.innerHTML = ""; this.videoContainer.innerHTML = "";
setTimeout(() => {
this.createVideo(item);
}, 500);
} else {
this.createVideo(item);
} }
if (this.videoContainer2.firstElementChild) { if (this.videoContainer2.firstElementChild) {
this.videoContainer2.innerHTML = ""; this.videoContainer2.innerHTML = "";
}
setTimeout(() => { setTimeout(() => {
this.createVideo2(item); this.createVideo(item);
}, 500); }, 500);
} else {
this.createVideo2(item); // if (this.videoContainer2.firstElementChild) {
} // this.videoContainer2.innerHTML = "";
// setTimeout(() => {
// this.createVideo2(item);
// }, 500);
// } else {
// this.createVideo2(item);
// }
}, },
createVideo(item) { createVideo(item) {
...@@ -118,13 +119,14 @@ export default { ...@@ -118,13 +119,14 @@ export default {
autoplay: true, autoplay: true,
id: "video-container", id: "video-container",
accessToken: accessToken, accessToken: accessToken,
url: url, // url: url,
template: "standard", // simple - 极简版;standard-标准版;security - 安防版(预览回放);voice-语音版; url: 'ezopen://open.ys7.com/AX8345878/1.hd.live',
template: "simple", //"standard", // simple - 极简版;standard-标准版;security - 安防版(预览回放);voice-语音版;
// 视频上方头部控件 // 视频上方头部控件
//header: ["capturePicture", "save", "zoom"], // 如果templete参数不为simple,该字段将被覆盖 //header: ["capturePicture", "save", "zoom"], // 如果templete参数不为simple,该字段将被覆盖
//plugin: ['talk'], // 加载插件,talk-对讲 //plugin: ['talk'], // 加载插件,talk-对讲
// 视频下方底部控件 // 视频下方底部控件
// footer: ["talk", "broadcast", "hd", "fullScreen"], // 如果template参数不为simple,该字段将被覆盖 // footer: ["fullScreen"], // ["talk", "broadcast", "hd", "fullScreen"], // 如果template参数不为simple,该字段将被覆盖
// audio: 1, // 是否默认开启声音 0 - 关闭 1 - 开启 // audio: 1, // 是否默认开启声音 0 - 关闭 1 - 开启
// openSoundCallBack: data => console.log("开启声音回调", data), // openSoundCallBack: data => console.log("开启声音回调", data),
// closeSoundCallBack: data => console.log("关闭声音回调", data), // closeSoundCallBack: data => console.log("关闭声音回调", data),
...@@ -134,23 +136,33 @@ export default { ...@@ -134,23 +136,33 @@ export default {
// fullScreenCallBack: data => console.log("全屏回调", data), // fullScreenCallBack: data => console.log("全屏回调", data),
// getOSDTimeCallBack: data => console.log("获取OSDTime回调", data), // getOSDTimeCallBack: data => console.log("获取OSDTime回调", data),
}); });
}
);
},
createVideo2(item) {
this.getAccessToken(this.info.appKey, this.info.appSecret).then(
(accessToken) => {
this.player2 = new EZUIKit.EZUIKitPlayer({ this.player2 = new EZUIKit.EZUIKitPlayer({
autoplay: true, autoplay: true,
id: "video-container2", id: "video-container2",
accessToken: accessToken, accessToken: accessToken,
url: 'ezopen://open.ys7.com/BA2171975/1.hd.live', url: 'ezopen://open.ys7.com/BA2171975/1.hd.live',
template: "standard", // simple - 极简版;standard-标准版;security - 安防版(预览回放);voice-语音版; template: "simple",// simple - 极简版;standard-标准版;security - 安防版(预览回放);voice-语音版;
footer: ["fullScreen"],
}); });
} }
); );
}, },
// createVideo2(item) {
// this.getAccessToken(this.info.appKey, this.info.appSecret).then(
// (accessToken) => {
// this.player2 = new EZUIKit.EZUIKitPlayer({
// autoplay: true,
// id: "video-container2",
// accessToken: accessToken,
// url: 'ezopen://open.ys7.com/BA2171975/1.hd.live',
// template: "standard",// simple - 极简版;standard-标准版;security - 安防版(预览回放);voice-语音版;
// // footer: ["fullScreen"],
// });
// }
// );
// },
/** /**
* 获取Token * 获取Token
* @param: {String} appKey * @param: {String} appKey
...@@ -209,7 +221,7 @@ export default { ...@@ -209,7 +221,7 @@ export default {
.cv-inbox { .cv-inbox {
position: relative; position: relative;
height: 200px; height: 200px;
width: 670px; width: 770px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.vi-select { .vi-select {
...@@ -253,10 +265,11 @@ export default { ...@@ -253,10 +265,11 @@ export default {
// height: 100%; // height: 100%;
height: 200px !important; height: 200px !important;
width: 100%; width: 100%;
width: 330px !important;
iframe { iframe {
// height: 100%; // height: 100%;
height: 200px !important; height: 200px !important;
width: 1 width: 330px;
} }
} }
} }
......
...@@ -202,10 +202,11 @@ ...@@ -202,10 +202,11 @@
<div class="tit-bg"></div> <div class="tit-bg"></div>
<h3 class="el-icon-s-unfold">沉降监测GNSS</h3> <h3 class="el-icon-s-unfold">沉降监测GNSS</h3>
<div class="km-thead col02d upop scrollListTitle4Gnss"> <div class="km-thead col02d upop scrollListTitle4Gnss">
<div>边坡监测点</div> <div>监测点</div>
<div>X</div> <div>X</div>
<div>Y</div> <div>Y</div>
<div>Z</div> <div>Z</div>
<div>监测时间</div>
</div> </div>
<vue-seamless-scroll :data="listData4gnss" class="warp"> <vue-seamless-scroll :data="listData4gnss" class="warp">
<ul class="item"> <ul class="item">
...@@ -214,6 +215,7 @@ ...@@ -214,6 +215,7 @@
<span class="title gnsspan" v-text="item.dispX"></span> <span class="title gnsspan" v-text="item.dispX"></span>
<span class="date gnsspan" v-text="item.dispY"></span> <span class="date gnsspan" v-text="item.dispY"></span>
<span class="date gnsspan" v-text="item.dispH"></span> <span class="date gnsspan" v-text="item.dispH"></span>
<span class="date gnsspan" v-text="item.time"></span>
</li> </li>
</ul> </ul>
</vue-seamless-scroll> </vue-seamless-scroll>
...@@ -1310,6 +1312,7 @@ export default { ...@@ -1310,6 +1312,7 @@ export default {
], ],
statusChart: null, statusChart: null,
option: {}, option: {},
intervalId: null
}; };
}, },
created() { created() {
...@@ -1383,9 +1386,13 @@ export default { ...@@ -1383,9 +1386,13 @@ export default {
// this.initLiquidEchart2(); // this.initLiquidEchart2();
// this.nowWaterData(); // this.nowWaterData();
// this.indexCl(); // this.indexCl();
// try {
this.getJianCeList();
this.getBianpoChenJiangList();
this.intervalId = setInterval(() => {
this.getJianCeList() this.getJianCeList()
this.getBianpoChenJiangList() this.getBianpoChenJiangList()
}, 5 * 60 * 1000); // 五分钟刷新一次
}); });
this.chartConfig = { this.chartConfig = {
...@@ -6076,10 +6083,13 @@ body .el-dialog__body { ...@@ -6076,10 +6083,13 @@ body .el-dialog__body {
font-size: 18px; font-size: 18px;
font-weight: bold; font-weight: bold;
div{ div{
width: 20%; width: 12%;
text-align: center; text-align: center;
&:first-child{ &:first-child{
width: 40%; width: 32%;
}
&:last-child{
width: 32%;
} }
} }
} }
...@@ -6113,9 +6123,12 @@ body .el-dialog__body { ...@@ -6113,9 +6123,12 @@ body .el-dialog__body {
.gnsspan{ .gnsspan{
display: inline-block; display: inline-block;
text-align: center; text-align: center;
width: 20%; width: 12%;
&:first-child{ &:first-child{
width: 40%; width: 32%;
}
&:last-child{
width: 32%;
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment