diff --git a/config/index.js b/config/index.js index f72a89b..065082d 100644 --- a/config/index.js +++ b/config/index.js @@ -12,16 +12,16 @@ module.exports = { assetsPublicPath: '/', proxyTable: { '/api': { - target: 'http://192.168.111.200:9990', - // target: 'http://60.255.186.185:9024/api', + // target: 'http://192.168.111.200:9990', + target: 'http://60.255.186.185:9024/api', changeOrigin: true, pathRewrite: { '^/api': '' } }, '/localImage': { - // target: 'http://60.255.186.185:9024/', - target: 'http://localhost:9990/', + target: 'http://60.255.186.185:9024/', + // target: 'http://localhost:9990/', changeOrigin: true, }, '/socket.io': { diff --git a/src/views/common-components/common-live-player.vue b/src/views/common-components/common-live-player.vue index f3c0e22..bbc9b8f 100644 --- a/src/views/common-components/common-live-player.vue +++ b/src/views/common-components/common-live-player.vue @@ -2,7 +2,7 @@ @@ -61,6 +61,7 @@ export default { components: {LivePlayer}, data() { return { + altText: "暂无监控资源" }; }, //计算属性 @@ -72,7 +73,10 @@ export default { methods: { ended () { this.$emit("ended") - } + }, + error () { + this.$message.error("监控异常,请切换其他监控") + }, }, //生命周期 - 挂载完成 mounted() { diff --git a/src/views/screen/smart-travel.vue b/src/views/screen/smart-travel.vue index 56c3a48..b6668ba 100644 --- a/src/views/screen/smart-travel.vue +++ b/src/views/screen/smart-travel.vue @@ -208,16 +208,7 @@ export default { videoUrl: "", tabs: ["省份", "城市"], tabIndex: 0, - videoList: [ - { - deviceName: "监控监控监控1111", - url: "", - }, - { - deviceName: "监控监控监控1111", - url: "", - }, - ], + videoList: [], videoIndex: 0, treeList: [ { @@ -225,6 +216,11 @@ export default { code: "F511502", expand: true, children: [ + { + title: "合江门冠英街", + code: "F51150202", + expand: true, + }, { title: "流杯池公园", code: "F51150205", @@ -240,11 +236,6 @@ export default { code: "F51150203", expand: true, }, - { - title: "合江门冠英街", - code: "F51150202", - expand: true, - }, { title: "五粮液景区", code: "F51150201", @@ -259,6 +250,7 @@ export default { dayvalue: 0, provinceList: [], cityList: [], + timer: null }; }, computed: {}, @@ -268,9 +260,14 @@ export default { calcRate(); windowDraw(); this.changeTree(this.treeList[0].children[0]); + this.timer = setInterval(()=> { + this.realtimeTourist(); + this.touristCumulative(); + }, 300000) }, beforeDestroy() { echartsClear(); + this.timer = null }, methods: { openApp () {