diff --git a/src/page/index/logo.vue b/src/page/index/logo.vue index da723bf..d18fcb5 100644 --- a/src/page/index/logo.vue +++ b/src/page/index/logo.vue @@ -25,7 +25,9 @@ export default { // }, methods: { goIndex: function () { - window.location.href = '/' + this.$router.push({ + path:'/wel' + }) } } } diff --git a/src/page/index/tags.vue b/src/page/index/tags.vue index f53af41..380c183 100644 --- a/src/page/index/tags.vue +++ b/src/page/index/tags.vue @@ -4,7 +4,7 @@ @click="contextmenuFlag=false" class="avue-tags"> -
@@ -16,7 +16,7 @@ class="item" @click="closeAllTags">关闭全部
- + -->
diff --git a/src/views/Equipment/equipmentDetailList.vue b/src/views/Equipment/equipmentDetailList.vue index 6384e24..6fde31d 100644 --- a/src/views/Equipment/equipmentDetailList.vue +++ b/src/views/Equipment/equipmentDetailList.vue @@ -89,7 +89,7 @@
设备总数
@@ -114,7 +114,7 @@
在线设备数
@@ -138,7 +138,7 @@
在线设备平均占比
@@ -164,7 +164,7 @@
活跃设备数
@@ -188,7 +188,7 @@
活跃设备平均占比
@@ -214,7 +214,7 @@
指派次数
@@ -238,7 +238,7 @@
完整录音次数
@@ -264,7 +264,7 @@
完整录音占比
@@ -290,7 +290,7 @@
部分录音
@@ -318,7 +318,7 @@
未录音
@@ -342,7 +342,7 @@
正常关机次数
@@ -370,7 +370,7 @@
低电关机次数
@@ -398,7 +398,7 @@
异常关机次数
@@ -1070,6 +1070,7 @@ export default { } // 获取到数据后对数据进行操作 // 循环大数组,赋值 + if(this.selectTime1){ let timeDate=[] let arr1=[] let arr2=[] @@ -1086,6 +1087,7 @@ export default { this.compareList = Object.assign([], this.compareList); this.$forceUpdate(); var chartDom = document.getElementById("compare"); + echarts.init(chartDom).dispose() var myChart = echarts.init(chartDom); var option; @@ -1165,6 +1167,10 @@ export default { window.addEventListener("resize", () => { myChart.resize(); }); + }else{ + console.log('第一种'); + } + }, //获取统计数据 getdetail() { diff --git a/src/views/Equipment/index.vue b/src/views/Equipment/index.vue index 08ac216..70e2a4f 100644 --- a/src/views/Equipment/index.vue +++ b/src/views/Equipment/index.vue @@ -392,7 +392,7 @@ > --> 绑定