Explorar o código

Merge branch 'visu_traffic_01_siping_2.5d' of http://121.37.83.100:3000/sooka_onest/sooka_onest_forestfire_vue2_visualization into visu_traffic_01_siping_2.5d

whao %!s(int64=2) %!d(string=hai) anos
pai
achega
a8afd1b7d6
Modificáronse 1 ficheiros con 3 adicións e 1 borrados
  1. 3 1
      src/views/forest.vue

+ 3 - 1
src/views/forest.vue

@@ -531,6 +531,7 @@
         forestInfo: '', //基本情况
         //左侧获取事件信息统计
         totalStr: '000000',
+        totalAllEvent: 0,
         aiTotal: '',
         newReport: '',
         otherTotal: '',
@@ -1057,6 +1058,7 @@
           this.readySure = res.data.readySure
           this.readySure_pre = res.data.readySure_pre
           this.totalStr = res.data.totalStr
+          this.totalAllEvent = +res.data.totalStr
           this.total = res.data.total
           this.eventChartAi(this.aiTotal_pre, this.otherTotal_pre)
         })
@@ -1207,7 +1209,7 @@
         if (pageNum < 1) {
           this.$modal.msg('当前已是第一页')
           return
-        } else if(pageNum>num)
+        } else if(pageNum>this.totalAllEvent/10+1)
         {
           this.$modal.msg('当前已是最后一页')
           return;