优化

src/layout/components/Navbar.vue

@@ -128,7 +128,7 @@ export default {
 }
 
 .navbar {
-  height: 100px;
+  height: 50px;
   overflow: hidden;
   position: relative;
   background: #fff;

src/utils/auth.js

@@ -1,6 +1,6 @@
 import Cookies from 'js-cookie'
 
-const TokenKey = 'Admin-Token'
+const TokenKey = 'Water-Monitor-Token'
 
 export function getToken() {
   return Cookies.get(TokenKey)

src/views/index.vue

@@ -77,7 +77,7 @@
         </div>
 
         <!-- 地图 -->
-        <div id="container" style="height: 840px;width: 100%"></div>
+        <div id="container" style="width: 100%"></div>
         <!-- 放大图片 -->
         <transition name="fade">
           <div id="mask" v-show="showMask" @click="showMask = false">
@@ -88,6 +88,16 @@
     </div>
   </div>
 </template>
+<style>
+  
+    /*去掉百度地图logo*/
+    .BMap_cpyCtrl {
+      display: none;
+    }
+    .anchorBL {
+      display: none;
+    }
+</style>
 <script>
 import echarts from 'echarts'
 import "../utils/flexible"
@@ -146,7 +156,7 @@ export default {
   },
   mounted() {
     // 间隔5分钟获取数据
-    this.getList()
+    this.init()
     // setInterval(this.getList(), 300000)
     this.setMap()
     this.setTime()
@@ -157,56 +167,52 @@ export default {
   },
   methods: {
     // 获取数据
-    async getList() {
+    init(){
+      this.get1().then(()=>{
+        // 水位数据
+        let show = this.showLevel.filter(item => item.flag)
+        let id = show.length? show.map(item => item.id).join(): this.showLevel[0].id
+        this.get1_2(id)
+      });
+      this.get2();
+      this.get3();
+    },
+    async get1() {
       // 测站数据
-      fetch(this.api+'info')
+      let res = await this.$axiosGet('/api/daping/station/info');
-        .then(e => e.json())
+      if(res.code == 0){
-        .then(e => {
+        this.station = res.data;
-          this.station = e
+        for (var i = 0; i < this.station.length; i++) {
-          e.forEach(station => {
+          let station = this.station[i];
-            if(this.showLevel.some(item => item.id == station.id)) return
+          if(this.showLevel.some(item => item.id == station.id)) return
-            this.showLevel.push({
+          this.showLevel.push({
-              id: station.id,
+            id: station.id,
-              stnm: station.stnm,
+            stnm: station.stnm,
-              flag: this.showLevel.filter(e => e.flag).length<5? true: false
+            flag: this.showLevel.filter(e => e.flag).length<5? true: false
-            })
           })
+        }
 
-          // 水位数据
+        this.setMarks()
-          let show = this.showLevel.filter(item => item.flag)
+        this.playInfobox()
-          let id = show.length? show.map(item => item.id).join(): this.showLevel[0].id
+        this.setTable()
-          fetch(this.api + 'waterLevelTrend?ids=' + id)
+      }
-            .then(e => e.json())
+    },
-            .then(e => {
+    async get1_2(id){
-              this.level = e.data
+      let res = await this.$axiosGet('/api/daping/station/waterLevelTrend?ids='+id);
-              this.setLine()
+      this.level = res.data
-            })
+      this.setLine()
-            .catch(e => { console.error(e) })
+    },
-
+    async get2(){
-          this.setMarks()
+      let res = await this.$axiosGet('/api/daping/station/status');
-          this.playInfobox()
+      this.status = res.data
-          this.setTable()
+      this.setPie()
-        })
+    },
-        .catch(e => { console.error(e) })
+    async get3(){
-      // 在线数据
+      let res = await this.$axiosGet('/api/daping/station/count');
-      fetch(this.api + 'status')
+        this.dist.stnms = res.data.stnms
-        .then(e => e.json())
+        this.dist.values[0].value = res.data.zx
-        .then(e => {
+        this.dist.values[1].value = res.data.lx
-          this.status = e.data
+        this.setDist()
-          this.setPie()
-        })
-        .catch(e => { console.error(e) })
-      // 水位计分布
-      fetch(this.api + 'count')
-        .then(e => e.json())
-        .then(e => {
-          this.dist.stnms = e.data.stnms
-          this.dist.values[0].value = e.data.zx
-          this.dist.values[1].value = e.data.lx
-          this.setDist()
-        })
-        .catch(e => { console.error(e) })
-      return this.getList
     },
     // 实时时间
     setTime() {
@@ -667,7 +673,7 @@ export default {
 
 <style scoped>
   .app-container{
-    height: 840px;
+    height: calc(100vh - 50px);
     width: 100%;
   }
   .network_show{
@@ -740,7 +746,7 @@ export default {
   #container {
     position: absolute;
     width: 100%;
-    height: 100%;
+    height: calc(100vh - 50px);
   }
   /* 去logo */
   .BMap_cpyCtrl {