....

src/views/forest.vue

@@ -519,7 +519,6 @@
         this.title = '四平市态势感知平台'
       }, 1000)
       setTimeout(() => {
-        this.getResourcesCount();
         this.getTodayEvents(this.getCurrentDataStr())
         this.getWeather(this.getCurrentDataStr())
         this.getEventList(this.getCurrentDataStr(), this.pageSize, this.pageNum)
@@ -528,6 +527,7 @@
         this.getExposureStage(this.getCurrentDataStr())
         this.getSupermap(this.getCurrentDataStr())
         this.getMenuEventType()
+        this.getResourcesCount();
       }, 2000)
       /** ----------------------------------weosocket开始------------------------------------- */
       // this.initWebSocket()
@@ -636,8 +636,8 @@
             eventType.push(item.eventTypeXl)
             eventTypeDl.push(item.eventType)
           })
-          Cookies.set("eventType",eventType)
-          Cookies.set("eventTypeDl",eventTypeDl)
+          Cookies.set("eventType", eventType)
+          Cookies.set("eventTypeDl", eventTypeDl)
         })
       },
       showDefaultImg() {
@@ -694,8 +694,9 @@
             //每个图标对应固定颜色
             that.$set(that.resourcesList[index], "bg", getIconBg(icon));
           });
-          console.log(that.resourcesList)
-          that.fireControlViewPoint("jiaotong", "");
+          if (that.eventList.length == 0) {
+            that.fireControlViewPoint("jiaotong", "");
+          }
         });
       },
       fireControlViewPoint(resourceTable, name) {
@@ -706,8 +707,6 @@
         } else {
           this.showSearch = true;
         }
-        console.log("name=", name);
-        console.log("this.showSearch=", this.showSearch);
         if (resourceTable == this.resourceTable) {
           resourceTable = "jiaotong"
           this.iconCurrentIndex = "jiaotong"
@@ -1079,11 +1078,13 @@
       },
       getMenuEventType() {
         let that = this
-          that.websockSid.userId = Cookies.get('userId')
-          that.websockSid.eventTypeDl = Cookies.get("eventTypeDl").split(",").length == 0 ? ['-1'] : Cookies.get("eventTypeDl").split(",")
-          that.websockSid.eventType = Cookies.get("eventType").split(",").length == 0 ? ['-1'] : Cookies.get("eventType").split(",")
-          that.initWebSocket(that.websockSid.userId, that.websockSid.eventTypeDl, that.websockSid.eventType)
-          console.log(that.websockSid)
+        that.websockSid.userId = Cookies.get('userId')
+        that.websockSid.eventTypeDl = Cookies.get("eventTypeDl").split(",").length == 0 ? ['-1'] : Cookies.get(
+          "eventTypeDl").split(",")
+        that.websockSid.eventType = Cookies.get("eventType").split(",").length == 0 ? ['-1'] : Cookies.get("eventType")
+          .split(",")
+        that.initWebSocket(that.websockSid.userId, that.websockSid.eventTypeDl, that.websockSid.eventType)
+        console.log(that.websockSid)
       },
       dropLocation(lat, lng, eventCode) {
         this.$refs.supermap.dropLocation(lat, lng, 18)
@@ -1314,8 +1315,9 @@
         let that = this
         //左侧获取事件信息统计
         getTodayEvents({
-          eventTypeIdDl: this.eventTypeIdDl.length == 0 ? Cookies.get("eventTypeDl").split(",") : this.eventTypeIdDl,
-          eventTypeId: this.eventTypeId.length == 0?Cookies.get("eventType").split(","): this.eventTypeId,
+          eventTypeIdDl: this.eventTypeIdDl.length == 0 ? Cookies.get("eventTypeDl").split(",") : this
+            .eventTypeIdDl,
+          eventTypeId: this.eventTypeId.length == 0 ? Cookies.get("eventType").split(",") : this.eventTypeId,
           day: day
         }, loading).then(res => {
           this.aiTotal = res.data.aiTotal
@@ -1479,8 +1481,9 @@
         this.eventList = []
         //右侧获取事件列表
         getEventList({
-          eventTypeIdDl: that.eventTypeIdDl.length == 0?Cookies.get("eventTypeDl").split(",") : that.eventTypeIdDl,
-          eventTypeId: that.eventTypeId.length == 0?Cookies.get("eventType").split(",") : that.eventTypeId,
+          eventTypeIdDl: that.eventTypeIdDl.length == 0 ? Cookies.get("eventTypeDl").split(",") : that
+            .eventTypeIdDl,
+          eventTypeId: that.eventTypeId.length == 0 ? Cookies.get("eventType").split(",") : that.eventTypeId,
           day: day,
           pageSize: pageSize,
           pageNum: pageNum,
@@ -1506,7 +1509,8 @@
         let that = this
         //右侧获取事件分类
         getEventByEventType({
-          eventTypeIdDl: that.eventTypeIdDl.length == 0 ? Cookies.get("eventTypeDl").split(",") : that.eventTypeIdDl,
+          eventTypeIdDl: that.eventTypeIdDl.length == 0 ? Cookies.get("eventTypeDl").split(",") : that
+            .eventTypeIdDl,
           eventTypeId: that.eventTypeId.length == 0 ? Cookies.get("eventType").split(",") : that.eventTypeId,
           day: day
         }, loading).then(res => {
@@ -1531,7 +1535,8 @@
         let that = this
         //右侧获取上报排名
         getEventByReportorOrder({
-          eventTypeIdDl: that.eventTypeIdDl.length == 0 ? Cookies.get("eventTypeDl").split(",") : that.eventTypeIdDl,
+          eventTypeIdDl: that.eventTypeIdDl.length == 0 ? Cookies.get("eventTypeDl").split(",") : that
+            .eventTypeIdDl,
           eventTypeId: that.eventTypeId.length == 0 ? Cookies.get("eventType").split(",") : that.eventTypeId,
           day: day
         }, loading).then(res => {
@@ -1644,7 +1649,8 @@
         let that = this
         //右侧获取曝光台
         getExposureStage({
-          eventTypeIdDl: that.eventTypeIdDl.length == 0 ? Cookies.get("eventTypeDl").split(",") : that.eventTypeIdDl,
+          eventTypeIdDl: that.eventTypeIdDl.length == 0 ? Cookies.get("eventTypeDl").split(",") : that
+            .eventTypeIdDl,
           eventTypeId: that.eventTypeId.length == 0 ? Cookies.get("eventType").split(",") : that.eventTypeId,
           day: day
         }, loading).then(res => {
@@ -1946,4 +1952,4 @@
       background-color: #0f3655;
     }
   }
-</style>
+</style>