tj

src/layout/header-aside/components/line-header/index.vue

@@ -122,7 +122,7 @@ export default {
       localStorage.stationId = e.id;
       this.stationId=e.id;
       // console.log(this.$store.state.d2admin,11111111)
-      let path=this.$store.state.d2admin.menu.header[1].list[0].path
+      let path=this.$store.state.d2admin.menu.header[0].list[0].path
       that.$router.push({path})
       setTimeout(()=>{
           that.$router.go(0);

src/pages/alarms/processed/index.vue

@@ -30,8 +30,8 @@
                     query-list(v-if="activeName == 'ed401f7d9291b508d411d8192b016c6e'" ref="queryList")
                 el-tab-pane(label="入侵报警系统" name="75c7c11716713edfd2ce3581f5e7c193")
                     query-list(v-if="activeName == '75c7c11716713edfd2ce3581f5e7c193'" ref="queryList")
-                el-tab-pane(label="安全检查及探测系统" name="3a64b86b1a5dead8ff9d2ad913744e50")
-                    query-list(v-if="activeName == '3a64b86b1a5dead8ff9d2ad913744e50'" ref="queryList")
+                //- el-tab-pane(label="安全检查及探测系统" name="3a64b86b1a5dead8ff9d2ad913744e50")
+                //-     query-list(v-if="activeName == '3a64b86b1a5dead8ff9d2ad913744e50'" ref="queryList")
 </template>
 <script>
     import QueryList from '../processed/query-list'
@@ -119,7 +119,8 @@
                 }).then(data => {
                     this.leftLoading = false
                     if (data && data.code === 0) {
-                        this.eventList = data.list
+                        const list = data.list.filter(item => item.systemName != '安全检查及探测系统')
+                        this.eventList = list
                         let oneCount, twoCount, threeCount
                         oneCount = twoCount = threeCount = 0
                         for (let i in this.eventList) {

src/pages/alarms/untreated/index.vue

@@ -30,8 +30,8 @@
                     query-list(v-if="activeName == 'ed401f7d9291b508d411d8192b016c6e'" ref="queryList")
                 el-tab-pane(label="入侵报警系统" name="75c7c11716713edfd2ce3581f5e7c193")
                     query-list(v-if="activeName == '75c7c11716713edfd2ce3581f5e7c193'" ref="queryList")
-                el-tab-pane(label="安全检查及探测系统" name="3a64b86b1a5dead8ff9d2ad913744e50")
-                    query-list(v-if="activeName == '3a64b86b1a5dead8ff9d2ad913744e50'" ref="queryList")
+                //- el-tab-pane(label="安全检查及探测系统" name="3a64b86b1a5dead8ff9d2ad913744e50")
+                //-     query-list(v-if="activeName == '3a64b86b1a5dead8ff9d2ad913744e50'" ref="queryList")
 </template>
 <script>
     import QueryList from '../untreated/query-list'
@@ -119,7 +119,8 @@
                 }).then(data => {
                     this.leftLoading = false
                     if (data && data.code === 0) {
-                        this.eventList = data.list
+                        const list = data.list.filter(item => item.systemName != '安全检查及探测系统')
+                        this.eventList = list
                         let oneCount, twoCount, threeCount
                         oneCount = twoCount = threeCount = 0
                         for (let i in this.eventList) {

src/pages/routes/alarms/processed/index.vue

@@ -30,8 +30,8 @@
                     query-list(v-if="activeName == 'ed401f7d9291b508d411d8192b016c6e'" ref="queryList")
                 el-tab-pane(label="入侵报警系统" name="75c7c11716713edfd2ce3581f5e7c193")
                     query-list(v-if="activeName == '75c7c11716713edfd2ce3581f5e7c193'" ref="queryList")
-                el-tab-pane(label="安全检查及探测系统" name="3a64b86b1a5dead8ff9d2ad913744e50")
-                    query-list(v-if="activeName == '3a64b86b1a5dead8ff9d2ad913744e50'" ref="queryList")
+                //- el-tab-pane(label="安全检查及探测系统" name="3a64b86b1a5dead8ff9d2ad913744e50")
+                //-     query-list(v-if="activeName == '3a64b86b1a5dead8ff9d2ad913744e50'" ref="queryList")
 </template>
 <script>
     import QueryList from '../processed/query-list'
@@ -114,7 +114,8 @@
                 }).then(data => {
                     this.leftLoading = false
                     if (data && data.code === 0) {
-                        this.eventList = data.list
+                        const list = data.list.filter(item => item.systemName != '安全检查及探测系统')
+                        this.eventList = list
                         let oneCount, twoCount, threeCount
                         oneCount = twoCount = threeCount = 0
                         for (let i in this.eventList) {

src/pages/routes/alarms/untreated/index.vue

@@ -30,8 +30,8 @@
                     query-list(v-if="activeName == 'ed401f7d9291b508d411d8192b016c6e'" ref="queryList")
                 el-tab-pane(label="入侵报警系统" name="75c7c11716713edfd2ce3581f5e7c193")
                     query-list(v-if="activeName == '75c7c11716713edfd2ce3581f5e7c193'" ref="queryList")
-                el-tab-pane(label="安全检查及探测系统" name="3a64b86b1a5dead8ff9d2ad913744e50")
-                    query-list(v-if="activeName == '3a64b86b1a5dead8ff9d2ad913744e50'" ref="queryList")
+                //- el-tab-pane(label="安全检查及探测系统" name="3a64b86b1a5dead8ff9d2ad913744e50")
+                //-     query-list(v-if="activeName == '3a64b86b1a5dead8ff9d2ad913744e50'" ref="queryList")
 </template>
 <script>
     import QueryList from '../untreated/query-list'
@@ -114,7 +114,8 @@
                 }).then(data => {
                     this.leftLoading = false
                     if (data && data.code === 0) {
-                        this.eventList = data.list
+                        const list = data.list.filter(item => item.systemName != '安全检查及探测系统')
+                        this.eventList = list
                         let oneCount, twoCount, threeCount
                         oneCount = twoCount = threeCount = 0
                         for (let i in this.eventList) {

src/pages/routes/ol/index/index.vue

@@ -58,7 +58,7 @@
                                 </el-col>
                                 <el-col :span="24" class="map_right_main_col">
                                     <el-image class="place-image" :src="require('@/assets/images/map/place.png')"/>
-                                    <div class="tip-label">{{item.lineName+"-"+item.stationName+"-"+item.tierName}}</div>
+                                    <div class="tip-label" :title="item.lineName+'-'+item.stationName+'-'+item.tierName">{{item.lineName+"-"+item.stationName+"-"+item.tierName | ellipsis}}</div>
                                 </el-col>
                             </el-row>
                         </div>
@@ -90,6 +90,7 @@
 
     import alarmDetail from '../../alarms/untreated/alarm-detail'
     import store from '@/store'
+    var mapTime
     let that
     export default {
         components: {
@@ -161,11 +162,25 @@
         },
         //页面切换时触发
         beforeDestroy() {
+            if (mapTime) {
+                clearInterval(mapTime)
+                mapTime = null
+            } else { //IE销毁之前获取不到topologyTime不能清除定时任务;
+                this.$nextTick(() => {
+                    let time = this.setTime + 500
+                    setTimeout(function () {
+                        clearInterval(mapTime)
+                        mapTime = null
+                    }, time)
+                })
+            }
             // 断开
             this.websocketclose()
         },
         mounted() {
             this.init()
+
+            this.mapInterval()
             //监听鼠标滚动事件
             window.addEventListener('mousewheel', this.debounce(this.handleScroll, 300), true) || window.addEventListener('DOMMouseScroll', this.debounce(this.handleScroll, 300), false)
         //    初始
@@ -300,8 +315,15 @@
                     }
                 })
             },
+            mapInterval: function() {
+                mapTime = setInterval(this.init, this.setTime)
+            },
             //刷新时触发
             beforeunloadFn (e) {
+                if (mapTime) {
+                    clearInterval(mapTime)
+                    mapTime = null
+                }
             },
             //函数防抖
             debounce(func, wait) {