bug修改

src/components/Header.vue

@@ -41,7 +41,13 @@
              {{userData.currUserName}}
              <i class="el-icon-arrow-down el-icon--right"></i>
           </span> -->
-
+        <span class="admin-header-right">
+          <a-tooltip class="header-item" title="返回门户" placement="bottom">
+            <a :href="portal">
+              <a-icon type="home" /> 返回门户
+            </a>
+          </a-tooltip>
+        </span>
         <el-dropdown @command="handleCommand">
           <span class="el-dropdown-link" style="color: white">
             {{ userData.currUserName }}
@@ -102,6 +108,7 @@ export default {
     return {
       systemName: process.env.VUE_APP_sysName,
       showMobileMenu: false,
+      portal: process.env.VUE_APP_PORTAL_URL+'/#/home/siteArrange',//门户地址
     };
   },
   methods: {
@@ -208,7 +215,23 @@ export default {
 </script>
 
 <style lang="less">
+
 .layout-header {
+  .admin-header-right{
+    color: inherit;
+    .header-item{
+      color: inherit;
+      padding: 0 12px;
+      cursor: pointer;
+      align-self: center;
+      a{
+        color: inherit;
+        i{
+          font-size: 16px;
+        }
+      }
+    }
+  }
   .mobile-menu-list {
     display: none;
   }

src/components/Map.vue

@@ -74,25 +74,25 @@
             </el-col>
             <el-col :span="4">
               <span style="font-size: 13px"
-                ><b style="color: green">{{ info.onlineCount }}</b></span
+                ><b style="color: green">{{ info.onlineTotal || '--' }}</b></span
               ><br />
               <span style="font-size: 12px">在线</span>
             </el-col>
             <el-col :span="4">
               <span style="font-size: 13px"
-                ><b style="color: red">{{ info.offlineCount }}</b></span
+                ><b style="color: red">{{ info.offlineTotal || '--'}}</b></span
               ><br />
               <span style="font-size: 12px">离线</span>
             </el-col>
             <el-col :span="4">
               <span style="font-size: 13px"
-                ><b style="color: orange">{{ info.stopCount }}</b></span
+                ><b style="color: orange">{{ info.stopCount || '--'}}</b></span
               ><br />
               <span style="font-size: 12px">停用</span>
             </el-col>
             <el-col :span="4">
               <span style="font-size: 13px"
-                ><b style="color: grey">{{ info.unActiveCount }}</b></span
+                ><b style="color: grey">{{ info.unActiveTotal || '--'}}</b></span
               ><br />
               <span style="font-size: 12px">待激活</span>
             </el-col>

src/views/Home.vue

@@ -544,7 +544,7 @@ export default {
           {
             type: "value",
             min: 0, // 配置 Y 轴刻度最小值
-            max: 500, // 配置 Y 轴刻度最大值
+            // max: 500, // 配置 Y 轴刻度最大值
             // interval: 50,
             splitNumber: 5, // 配置 Y 轴数值间隔
             axisTick: {
@@ -567,7 +567,7 @@ export default {
               show: false,
             },
             axisLabel: {
-              formatter: "{value} %",
+              formatter:(value)=>{return value*100 + '%'} ,
             },
           },
         ],
@@ -619,6 +619,16 @@ export default {
               backgroundColor: "#6a7985",
             },
           },
+          formatter:function(data){
+            let str = '';
+            data.forEach((item,idx)=>{
+              str += `${item.marker}${item.seriesName}: ${item.data*100+'%'}`
+              if(!idx){
+                str += '</br>'
+              }
+            })
+            return str
+          }
         },
         legend: {
           top: "40px",
@@ -658,6 +668,9 @@ export default {
             axisLine: {
               show: false,
             },
+            axisLabel: {
+              formatter:(value)=>{return value*100 + '%'} ,
+            },
           },
         ],
         series: [

src/views/sitestat/maplist.vue

@@ -64,13 +64,13 @@
                 <div class="are">{{ item.detailAddress }}</div>
                 <div class="data">
                   <div class="sbzs dataitem">
-                    设备总数：<span>{{ item.deviceTotal }}台</span>
+                    设备总数：<span>{{ item.deviceTotal}}台</span>
                   </div>
                   <div class="zx dataitem">
-                    在线：<span>{{ item.onlineTotal }}台</span>
+                    在线：<span>{{ item.onlineTotal || '--'}}台</span>
                   </div>
                   <div class="lx dataitem">
-                    离线：<span>{{ item.offlineTotal }}台</span>
+                    离线：<span>{{ item.offlineTotal || '--'}}台</span>
                   </div>
                 </div>
               </div>