From dbe921c60fbb46e4cb0f278b077fe309be2d84a5 Mon Sep 17 00:00:00 2001 From: helloxujingliang <3225043@qq.com> Date: Fri, 11 Aug 2023 17:11:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.prod | 4 ++-- public/img/icon/qizhi-1.png | Bin 0 -> 2941 bytes public/img/icon/qizhi.png | Bin 2941 -> 790 bytes public/img/qizhi.png | Bin 0 -> 790 bytes public/widgets/toolBarRight/view.css | 2 +- src/views/home/index.vue | 19 ++++++++++++------- src/views/home/widget/toolbox.vue | 3 +-- 7 files changed, 16 insertions(+), 12 deletions(-) create mode 100644 public/img/icon/qizhi-1.png create mode 100644 public/img/qizhi.png diff --git a/.env.prod b/.env.prod index d7e8755..bf1c198 100644 --- a/.env.prod +++ b/.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 \ No newline at end of file +VUE_APP_BASE_API = http://123.132.248.154:9224/api +VUE_APP_BASE_IMG_URL = http://123.132.248.154:9224 \ No newline at end of file diff --git a/public/img/icon/qizhi-1.png b/public/img/icon/qizhi-1.png new file mode 100644 index 0000000000000000000000000000000000000000..53e3c3c9b8ce556686722be0ac4836c0795e1511 GIT binary patch literal 2941 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 literal 0 HcmV?d00001 diff --git a/public/img/icon/qizhi.png b/public/img/icon/qizhi.png index 53e3c3c9b8ce556686722be0ac4836c0795e1511..51b8f9b326c4ee15d6e5676aebea153139d6cc77 100644 GIT binary patch literal 790 zcmV+x1L^#UP)Px%&`Cr=RA@u(SWQS&Q5ZeneKXHdDN3fMAACbX%_y`8S|kMhZR`g^h+5>L*0rj2 ztJb*>EC_6owJfMM?GlCP51FS%>8OEBPEttDn|b$(Cnzd|^JczDB<@|k$M>D{-E+>p zn@a%TCS#{r>$61YV#X&Bzi!VK9|g6ozG%#ewQ1-V0Jg8*EHT|nO%-}83CJWPoeZl* zG4BMZ1*8|CRgRUPi~3gXcck#+$OPsq@zh!;x7B_CLRUEgCVi=WvNX89<~nu{0cQXl zXP_y>@LyoOCD4c$DLg*>4YMIIp;{>8*v|;)3?m@eIKbBdN{3=E(?q~5nEI7g0|#gR zOxMb@j0+_olZ@U}OgDJlF_R1@U|s_QO5sUr!gH(P8rc_fEXzO7MCWMCX}F-l_sbBx zNoT#DrAzMEGt~^JveyUb6|sKLz_5;3xgCYY+;;$th{Y-D$4RR=6vv4vPRz%caAGBa z;3Jca_7c;THJ4a(cWSygya@uT)VsEwg5S~BhFeU0dvz(D_4Y6S|KkLV0F!{|3<$yI z4hRht!%YHW3xxzG0il6nxJf{4p^(5NAT&@6HwlO>6cU&Oga(S?CIPX9LIP<5c?L!m zC{N(L27VI5(hAMQ+{94L1a1O&ujDOhBaKxHV8#%DrxvN9L)pczVGSI2><-P;1>znC z5@B(b`a%m}V30KRrKbxoE0Jzg|9k)myVP)%3Ecp<)xyQVtYYd9-flw)2p(|Dy^+>3 zd^N^xwJ$PonFuFCaCrbe67loYWU+6#Ka_wF)NkHOWJ+LN$ zdblXz_&*XD--BJgZGTvCg7Gjt<=v4uvsu`s1cK!zBd5UDT>^heWxZ>gwE^jzzl7iR U2Add@sQ>@~07*qoM6N<$f*D?3bpQYW literal 2941 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 diff --git a/public/img/qizhi.png b/public/img/qizhi.png new file mode 100644 index 0000000000000000000000000000000000000000..51b8f9b326c4ee15d6e5676aebea153139d6cc77 GIT binary patch literal 790 zcmV+x1L^#UP)Px%&`Cr=RA@u(SWQS&Q5ZeneKXHdDN3fMAACbX%_y`8S|kMhZR`g^h+5>L*0rj2 ztJb*>EC_6owJfMM?GlCP51FS%>8OEBPEttDn|b$(Cnzd|^JczDB<@|k$M>D{-E+>p zn@a%TCS#{r>$61YV#X&Bzi!VK9|g6ozG%#ewQ1-V0Jg8*EHT|nO%-}83CJWPoeZl* zG4BMZ1*8|CRgRUPi~3gXcck#+$OPsq@zh!;x7B_CLRUEgCVi=WvNX89<~nu{0cQXl zXP_y>@LyoOCD4c$DLg*>4YMIIp;{>8*v|;)3?m@eIKbBdN{3=E(?q~5nEI7g0|#gR zOxMb@j0+_olZ@U}OgDJlF_R1@U|s_QO5sUr!gH(P8rc_fEXzO7MCWMCX}F-l_sbBx zNoT#DrAzMEGt~^JveyUb6|sKLz_5;3xgCYY+;;$th{Y-D$4RR=6vv4vPRz%caAGBa z;3Jca_7c;THJ4a(cWSygya@uT)VsEwg5S~BhFeU0dvz(D_4Y6S|KkLV0F!{|3<$yI z4hRht!%YHW3xxzG0il6nxJf{4p^(5NAT&@6HwlO>6cU&Oga(S?CIPX9LIP<5c?L!m zC{N(L27VI5(hAMQ+{94L1a1O&ujDOhBaKxHV8#%DrxvN9L)pczVGSI2><-P;1>znC z5@B(b`a%m}V30KRrKbxoE0Jzg|9k)myVP)%3Ecp<)xyQVtYYd9-flw)2p(|Dy^+>3 zd^N^xwJ$PonFuFCaCrbe67loYWU+6#Ka_wF)NkHOWJ+LN$ zdblXz_&*XD--BJgZGTvCg7Gjt<=v4uvsu`s1cK!zBd5UDT>^heWxZ>gwE^jzzl7iR U2Add@sQ>@~07*qoM6N<$f*D?3bpQYW literal 0 HcmV?d00001 diff --git a/public/widgets/toolBarRight/view.css b/public/widgets/toolBarRight/view.css index 2234dda..97f3377 100644 --- a/public/widgets/toolBarRight/view.css +++ b/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); diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 662d3f4..f66877a 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -4,7 +4,7 @@
{{appName}}
-
+
{{weater}}
@@ -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){ diff --git a/src/views/home/widget/toolbox.vue b/src/views/home/widget/toolbox.vue index 517a4bc..46e4a86 100644 --- a/src/views/home/widget/toolbox.vue +++ b/src/views/home/widget/toolbox.vue @@ -29,7 +29,6 @@ 清空测量数据
-
@@ -116,7 +115,7 @@ img:"/img/homeimg/4.png", type:"label" },{ - icon:"qizhi", + icon:"qizhi-1", img:"/img/homeimg/5.png", type:"label" },{