diff --git a/src/views/components/carouselChart.vue b/src/views/components/carouselChart.vue index 3c708a5..b1eaa67 100644 --- a/src/views/components/carouselChart.vue +++ b/src/views/components/carouselChart.vue @@ -81,12 +81,29 @@ class="smallnoPic" v-else-if="item.path.indexOf('videos') !== -1" > - + +

+ + {{ $moment(item.photoTime).format("HH:mm:ss") }} + + + ( + + {{ $moment(item.recvTime).format("HH:mm:ss") }} + + ) + --通道{{ item.channelId }} +

diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue index 08851e6..8657901 100644 --- a/src/views/realTimeMonitor/index.vue +++ b/src/views/realTimeMonitor/index.vue @@ -84,8 +84,8 @@ :label="item.label" :value="item.value" > - - --> + + -->
@@ -202,8 +202,8 @@ export default { channelId: "", //通道装置id channelList: "", //通道数据 channelOption: [], //通道分类 - channelListOption:[],//通道内容 - channelListValue:'', + channelListOption: [], //通道内容 + channelListValue: "", channelValue: [], //选中的通道 terminalPhoto: [], //获取拍照装置当前数据 totalPic: "", @@ -297,7 +297,7 @@ export default { this.channelValue = []; this.channelOption = []; - this.channelListOption = [] + this.channelListOption = []; this.getChannelList(this.channelId); //获取通道id接口 }, //获取通道的接口 @@ -319,19 +319,19 @@ export default { }); // 选择通道一通道二select框 console.log(this.channelOption); console.log(this.channelValue); - this.channelListOption = [] + this.channelListOption = []; this.channelListOption.push({ - label: '全部', - value: '', - termid: '', - }); + label: "全部", + value: "", + termid: "", + }); this.channelList.forEach((item) => { this.channelListOption.push({ label: item.channelname, value: item.channelid, termid: item.termId, }); - }); + }); this.channelListValue = this.channelListOption[0].value; //默认选中所有通道 // console.log(JSON.parse(JSON.stringify(this.channelValue))); // this.channelValue = JSON.parse(JSON.stringify(this.channelValue)); @@ -354,6 +354,14 @@ export default { } }) .catch((err) => { + this.loading = false; + console.log("没有绑定通道"); + this.terminalPhoto = [ + { + path: this.nopicPath, + }, + ]; + console.log(this.terminalPhoto); console.log(err); //代码错误、请求失败捕获 }); }, @@ -392,13 +400,13 @@ export default { }, //切换通道 changeChannelId(val) { - let selchannel = [] + let selchannel = []; if (!val) { this.channelList.forEach((item) => { selchannel.push(item.channelid); //选中所有通道 }); - }else{ - selchannel.push(val) + } else { + selchannel.push(val); } let channelObj = {}; channelObj = this.channelOption.find(function (i) { @@ -453,7 +461,7 @@ export default { }, //获取GPS位置 handleShowGPS() { - getTermGPSJoggle({ termId: this.channelId }) + getTermGPSJoggle({ termid: this.channelId }) .then((res) => { console.log(res); this.$alert( @@ -600,7 +608,7 @@ export default { //装置信息handleShowInfo handleShowInfo() { this.$refs.infodialog_ref.display(); - this.$refs.infodialog_ref.getListData(this.channelId,this.cmdid); + this.$refs.infodialog_ref.getListData(this.channelId, this.cmdid); }, //历史图片 // handlehistoryPic() { diff --git a/src/views/realTimeSearch/index.vue b/src/views/realTimeSearch/index.vue index 01e24b4..ab74849 100644 --- a/src/views/realTimeSearch/index.vue +++ b/src/views/realTimeSearch/index.vue @@ -5,6 +5,7 @@ + + + +