Commit 2bb84548 authored by 纪泽龙's avatar 纪泽龙

Merge branch 'jzl'

parents 00b9dc3b 370a2747
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2022-01-11 13:44:17 * @Date: 2022-01-11 13:44:17
* @LastEditTime: 2024-08-01 16:03:35 * @LastEditTime: 2024-08-02 09:36:27
* @LastEditors: 纪泽龙 jizelong@qq.com * @LastEditors: 纪泽龙 jizelong@qq.com
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: /test/hello-world/src/views/Home.vue * @FilePath: /test/hello-world/src/views/Home.vue
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
right: 0; right: 0;
z-index: 999; z-index: 999;
width: 200px; width: 200px;
height: 50px; height: 0px;
color: #fff; color: #fff;
" "
> >
...@@ -189,7 +189,7 @@ export default { ...@@ -189,7 +189,7 @@ export default {
map: null, map: null,
show: false, show: false,
// centerData: null, // centerData: null,
selarr: [1,2,3], selarr: [1, 2, 3],
weather: "", weather: "",
lower: "", lower: "",
higher: "", higher: "",
...@@ -710,7 +710,7 @@ export default { ...@@ -710,7 +710,7 @@ export default {
// }, // },
// 更改下方列表 // 更改下方列表
listChange(arr) { listChange(arr) {
console.log("listChange",arr,this.selarr1); console.log("listChange", arr, this.selarr1);
// return; // return;
this.selarr = [...arr]; this.selarr = [...arr];
this.map.allfilter(this.selarr, this.selarr1); this.map.allfilter(this.selarr, this.selarr1);
...@@ -861,7 +861,7 @@ export default { ...@@ -861,7 +861,7 @@ export default {
height: 100vh; height: 100vh;
} }
.goSystem { .goSystem {
position: fixed; position: absolute;
z-index: 9999; z-index: 9999;
top: -32px; top: -32px;
right: 20px; right: 20px;
...@@ -875,12 +875,13 @@ export default { ...@@ -875,12 +875,13 @@ export default {
line-height: 28px; line-height: 28px;
text-align: center; text-align: center;
transition: all 0.2s linear; transition: all 0.2s linear;
pointer-events: auto; pointer-events: auto !important;
&:hover { &:hover {
background: url("~@/assets/firstimage/btm-item-active.png") no-repeat bottom background: url("~@/assets/firstimage/btm-item-active.png") no-repeat bottom
center; center;
opacity: 0.7; opacity: 0.7;
pointer-events: auto !important;
} }
} }
#map { #map {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment