合并代码

.env.prod

@@ -12,5 +12,5 @@ VUE_APP_OIDC_SILENTREDIRECTURI = http://demo.openauth.me:1803/silent-renew-oidc.
 #VUE_APP_BASE_API = http://192.168.10.123:9159/api
 #VUE_APP_BASE_IMG_URL = http://192.168.10.123:9159
 
-VUE_APP_BASE_API =http://112.36.23.242:9158/api
-VUE_APP_BASE_IMG_URL = http://112.36.23.242:9158
+VUE_APP_BASE_API = http://123.132.248.154:9224/api
+VUE_APP_BASE_IMG_URL = http://123.132.248.154:9224

public/widgets/toolBarRight/view.css

@@ -3,7 +3,7 @@
 .toolBarRight {
   position: absolute;
   right: 120px;
-  z-index: 20210101;
+  z-index: 10;
   background: rgba(43, 44, 47, 0.8);
   border-radius: 3px;
   box-shadow: 1px 2px 1px rgba(0, 0, 0, .15);

src/views/home/index.vue

@@ -4,7 +4,7 @@
         <div class="el-header">
           <div class="app-name">{{appName}}</div>
           
-          <div class="header-info" style="position:absolute;z-index:9999999999999999;right:200px;">
+          <div class="header-info" style="z-index:9999999999999999;">
             <!-- 天气中心 -->
             <div class="weather-info">
               <div class="weater">{{weater}}</div>
@@ -261,7 +261,7 @@ export default {
 
 
   mounted(){
-   
+    
   },
   created(){
     window.AppConfig = AppConfigInfo[localStorage.getItem("areaName")];
@@ -314,11 +314,16 @@ export default {
     // 退出登录
     logout(){
       localStorage.setItem("X-Token","");
-      let arr = document.getElementById("map-querybar");
-      arr.forEach((item,index)=>{
-        arr[index].style.display = "none"
-      })
-      this.$router.push({'path':'/login'})
+
+      if(document.getElementById("map-querybar")){
+        document.getElementById("map-querybar").style.display = "none"
+      }
+
+      if(document.getElementById("querybar-ssk")){
+        document.getElementById("querybar-ssk").style.display = "none";
+      }
+      
+      window.location.reload();
     },
     // 物资
     wuzi(item){

src/views/home/widget/toolbox.vue

@@ -29,7 +29,6 @@
                 清空测量数据
             </div>
         </div>
-
         <div class="draw" v-show="active == 2">
             <div class="draw-container">
                 <div class="item" v-for="(item,index) in draws" :key="index" @click="drawEntity(item.type,item.img)">
@@ -116,7 +115,7 @@
                     img:"/img/homeimg/4.png",
                     type:"label"
                 },{
-                    icon:"qizhi",
+                    icon:"qizhi-1",
                     img:"/img/homeimg/5.png",
                     type:"label"
                 },{