diff --git a/src/assets/newImgs/HMScreen/closeIcon.png b/src/assets/newImgs/HMScreen/closeIcon.png new file mode 100644 index 0000000..c98e69b --- /dev/null +++ b/src/assets/newImgs/HMScreen/closeIcon.png Binary files differ diff --git a/src/assets/newImgs/HMScreen/closeIcon.png b/src/assets/newImgs/HMScreen/closeIcon.png new file mode 100644 index 0000000..c98e69b --- /dev/null +++ b/src/assets/newImgs/HMScreen/closeIcon.png Binary files differ diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue index 8b7bc67..7122a63 100644 --- a/src/views/sponeScreen/HaiMianScreen/index.vue +++ b/src/views/sponeScreen/HaiMianScreen/index.vue @@ -5,7 +5,7 @@ - +
@@ -94,6 +94,9 @@ // 展开收起 function controlPanel() { showPanel.value = !showPanel.value; + if (showPanel.value) { + showLegend.value = false; + } } // 获取天气信息 diff --git a/src/assets/newImgs/HMScreen/closeIcon.png b/src/assets/newImgs/HMScreen/closeIcon.png new file mode 100644 index 0000000..c98e69b --- /dev/null +++ b/src/assets/newImgs/HMScreen/closeIcon.png Binary files differ diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue index 8b7bc67..7122a63 100644 --- a/src/views/sponeScreen/HaiMianScreen/index.vue +++ b/src/views/sponeScreen/HaiMianScreen/index.vue @@ -5,7 +5,7 @@ - +
@@ -94,6 +94,9 @@ // 展开收起 function controlPanel() { showPanel.value = !showPanel.value; + if (showPanel.value) { + showLegend.value = false; + } } // 获取天气信息 diff --git a/src/views/sponeScreen/gisMF/legendKF.vue b/src/views/sponeScreen/gisMF/legendKF.vue index 4cff064..bfaa987 100644 --- a/src/views/sponeScreen/gisMF/legendKF.vue +++ b/src/views/sponeScreen/gisMF/legendKF.vue @@ -4,7 +4,10 @@
-
图层控制
+
+ 图层控制 + +
@@ -157,16 +160,24 @@ .publicLegendHM { opacity: 0.8; .legendTitle { + width: 100%; height: 46px; position: absolute; top: 1px; background: url('@/assets/cesiumMap/legendIcon/legendTitle_img.png'); .legendName { - margin: 10px 255px 15px 9px; + margin: 10px 0px 15px 9px; font-family: YouSheBiaoTiHei; font-weight: 400; font-size: 22px; color: #e4f5ff; + img { + width: 22px; + height: 22px; + float: right; + margin-right: 10px; + cursor: pointer; + } } } .legendContent {