From ec065c84d7ee0b7e05efe9b991b528f6a5feb5a0 Mon Sep 17 00:00:00 2001
From: lixuliang <lixuliang_hd@126.com>
Date: 星期三, 06 三月 2024 18:10:43 +0800
Subject: [PATCH] 修改
---
src/assets/img/layer/yxdt.png | 0
src/assets/img/collection/compass.png | 0
src/assets/img/collection/recover-1.png | 0
src/components/rightMenu/bottom2.vue | 52 +++++++++---
src/assets/img/layer/tudiguanli.png | 0
src/assets/img/layer/lishiyingxiang.png | 0
src/assets/img/layer/qiyexinxi.png | 0
src/assets/img/layer/shipinjiankong.png | 0
src/assets/img/layer/shizhengganti.png | 0
src/assets/img/collection/recover.png | 0
static/YouSheBiaoTiHei.ttf | 0
src/utils/ztt2.js | 2
/dev/null | 0
src/components/sideMenu/layerMenu/layerPanel2.vue | 113 ++++++++++++++++++++--------
src/assets/img/navigation/tucA.png | 0
src/utils/ztt.js | 2
src/assets/img/navigation/tucA-1.png | 0
src/components/rightNavigation/NavigationBar2.vue | 30 ++++---
src/assets/img/navigation/tuc-1.png | 0
src/assets/img/navigation/tuc.png | 0
src/assets/img/layer/ewdt.png | 0
21 files changed, 137 insertions(+), 62 deletions(-)
diff --git a/src/assets/img/collection/compass.png b/src/assets/img/collection/compass.png
new file mode 100644
index 0000000..67dcf9e
--- /dev/null
+++ b/src/assets/img/collection/compass.png
Binary files differ
diff --git a/src/assets/img/collection/recover-1.png b/src/assets/img/collection/recover-1.png
new file mode 100644
index 0000000..688b86b
--- /dev/null
+++ b/src/assets/img/collection/recover-1.png
Binary files differ
diff --git a/src/assets/img/collection/recover.png b/src/assets/img/collection/recover.png
index 688b86b..7791c72 100644
--- a/src/assets/img/collection/recover.png
+++ b/src/assets/img/collection/recover.png
Binary files differ
diff --git a/src/assets/img/layer/ewdt.png b/src/assets/img/layer/ewdt.png
index 9bd699f..b7aa783 100644
--- a/src/assets/img/layer/ewdt.png
+++ b/src/assets/img/layer/ewdt.png
Binary files differ
diff --git a/src/assets/img/layer/lishiyingxiang.png b/src/assets/img/layer/lishiyingxiang.png
index 83b0ae6..45051cc 100644
--- a/src/assets/img/layer/lishiyingxiang.png
+++ b/src/assets/img/layer/lishiyingxiang.png
Binary files differ
diff --git a/src/assets/img/layer/qiyefenbu.png b/src/assets/img/layer/qiyefenbu.png
deleted file mode 100644
index d666dc8..0000000
--- a/src/assets/img/layer/qiyefenbu.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/img/layer/qiyexinxi.png b/src/assets/img/layer/qiyexinxi.png
new file mode 100644
index 0000000..67235b8
--- /dev/null
+++ b/src/assets/img/layer/qiyexinxi.png
Binary files differ
diff --git a/src/assets/img/layer/shipinjiankong.png b/src/assets/img/layer/shipinjiankong.png
index b8841dc..eae5564 100644
--- a/src/assets/img/layer/shipinjiankong.png
+++ b/src/assets/img/layer/shipinjiankong.png
Binary files differ
diff --git a/src/assets/img/layer/shizhengganti.png b/src/assets/img/layer/shizhengganti.png
index 244dbc0..d55c1b2 100644
--- a/src/assets/img/layer/shizhengganti.png
+++ b/src/assets/img/layer/shizhengganti.png
Binary files differ
diff --git a/src/assets/img/layer/tudiguanli.png b/src/assets/img/layer/tudiguanli.png
index 72722bb..b074c11 100644
--- a/src/assets/img/layer/tudiguanli.png
+++ b/src/assets/img/layer/tudiguanli.png
Binary files differ
diff --git a/src/assets/img/layer/yxdt.png b/src/assets/img/layer/yxdt.png
index 27d8da5..b608bbd 100644
--- a/src/assets/img/layer/yxdt.png
+++ b/src/assets/img/layer/yxdt.png
Binary files differ
diff --git a/src/assets/img/navigation/tuc-1.png b/src/assets/img/navigation/tuc-1.png
new file mode 100644
index 0000000..cc1ea0c
--- /dev/null
+++ b/src/assets/img/navigation/tuc-1.png
Binary files differ
diff --git a/src/assets/img/navigation/tuc.png b/src/assets/img/navigation/tuc.png
index cc1ea0c..b31b97d 100644
--- a/src/assets/img/navigation/tuc.png
+++ b/src/assets/img/navigation/tuc.png
Binary files differ
diff --git a/src/assets/img/navigation/tucA-1.png b/src/assets/img/navigation/tucA-1.png
new file mode 100644
index 0000000..604910f
--- /dev/null
+++ b/src/assets/img/navigation/tucA-1.png
Binary files differ
diff --git a/src/assets/img/navigation/tucA.png b/src/assets/img/navigation/tucA.png
index 604910f..8afac6c 100644
--- a/src/assets/img/navigation/tucA.png
+++ b/src/assets/img/navigation/tucA.png
Binary files differ
diff --git a/src/components/rightMenu/bottom2.vue b/src/components/rightMenu/bottom2.vue
index 2517718..85a6458 100644
--- a/src/components/rightMenu/bottom2.vue
+++ b/src/components/rightMenu/bottom2.vue
@@ -1,11 +1,16 @@
<template>
<div class="bottom" id="bottom" :style="customStyle" v-if="state1.show">
+ <!-- <div class="mapTool">
+ <div class="tool-rotate" @click="PointingNorth" title="鎸囧寳">
+ <img src="@/assets/img/collection/compass.png" />
+ </div>
+ </div> -->
<div class="mapTool">
<div class="tool-rotate" @click="flyBack" title="澶嶄綅">
<img src="@/assets/img/collection/recover.png" />
</div>
</div>
- <div class="mapTool" v-show="test.fwval">
+ <div class="mapTool2" v-show="test.fwval">
<div class="tool-rotate" @click="zoomIn" title="鏀惧ぇ">
<img src="@/assets/img/collection/add.png" />
</div>
@@ -19,23 +24,38 @@
<style scoped>
.mapTool {
- border-radius: 10px;
+ width: 51px;
+ /* border-radius: 10px; */
+ /* background: #ffffff; */
+ /* margin-bottom: 8px; */
+}
+.mapTool .tool-rotate img {
+ width: 100%;
+}
+.mapTool2 {
+ width: 40px;
+ height: 80px;
+ margin: 0 auto;
background: #ffffff;
- margin-bottom: 8px;
+ box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.21);
+ border-radius: 13px;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-evenly;
+ align-items: center;
}
-
+.mapTool2 .tool-rotate img {
+ width: 18px;
+}
.border {
- border: 0.5px solid #efecec;
+ width: 36px;
+ height: 1px;
+ border: 1px solid #e5e5e5;
}
-.tool-rotate {
+/* .tool-rotate {
padding: 8px;
-}
-
-.tool-rotate img {
- width: 20px;
- height: 20px;
-}
+} */
</style>
<script>
@@ -45,7 +65,7 @@
props: ["test"],
data() {
return {
- state1:store.mapTools,
+ state1: store.mapTools,
state: store.layerPanel,
customStyle: {
position: "absolute",
@@ -61,7 +81,7 @@
if (newVal) {
this.customStyle = {
position: "absolute",
- top: "2rem",
+ top: "calc(0.75rem + 51px)",
right: "0.1rem",
};
} else {
@@ -107,6 +127,10 @@
duration: 1000, // 缂╂斁鎸佺画鏃堕棿锛岄粯璁や笉闇�瑕佽缃�
});
},
+ PointingNorth() {
+ alert("鎸囧寳閽堝紑鍙戜腑");
+ // console.log("鎸囧寳閽堝紑鍙戜腑")
+ },
},
};
</script>
\ No newline at end of file
diff --git a/src/components/rightNavigation/NavigationBar2.vue b/src/components/rightNavigation/NavigationBar2.vue
index b1b4b64..d9f3beb 100644
--- a/src/components/rightNavigation/NavigationBar2.vue
+++ b/src/components/rightNavigation/NavigationBar2.vue
@@ -1,9 +1,10 @@
<template>
<div class="navigationBar" v-if="state.show">
- <div class="menuBtn" @click="handleMenuListShow">
+ <!-- <div class="menuBtn" @click="handleMenuListShow">
<img src="@/assets/img/navigation/menuicon.png" />
- </div>
- <div class="menuList" v-show="showMenuList.show">
+ </div> -->
+ <!-- <div class="menuList" v-show="showMenuList.show"> -->
+ <div class="menuList" v-show="true">
<ul>
<li
v-for="(value, key) in menuList"
@@ -16,7 +17,7 @@
:src="showState[value.attr].show ? value.imgActive : value.img"
:class="showState[value.attr].show ? 'Active' : 'noActive'"
/>
- <span>{{ value.name }}</span>
+ <!-- <span>{{ value.name }}</span> -->
</div>
</li>
</ul>
@@ -30,7 +31,7 @@
name: "NavigationBar",
data() {
return {
- state:store.navigator,
+ state: store.navigator,
showMenuList: store.MenuList,
resetShowState: store.resetLink,
favoriteShowState: store.favorite,
@@ -221,22 +222,25 @@
}
.menuList {
- padding: 0px 2px;
+ /* background-color: red; */
+ /* padding: 0px 2px;
position: absolute;
margin-top: 0.1rem;
right: 0;
background-color: white;
- border-radius: 10px;
+ border-radius: 10px; */
}
.menuItem {
- width: 32px;
+ width: 51px;
+ /* width: 32px;
color: black;
margin-top: 10px;
margin-bottom: 7px;
border-bottom: 1px solid #e8e8e9;
+ background-color: #bfa;
text-align: center;
- cursor: pointer;
+ cursor: pointer; */
}
li:last-child .menuItem {
@@ -244,13 +248,13 @@
}
.menuItem img {
- width: 24px;
- text-align: center;
+ width: 100%;
+ /* text-align: center; */
}
-.menuItem span {
+/* .menuItem span {
display: block;
text-align: center;
margin-top: 2px;
-}
+} */
</style>
diff --git a/src/components/sideMenu/layerMenu/layerPanel2.vue b/src/components/sideMenu/layerMenu/layerPanel2.vue
index 266415e..571844b 100644
--- a/src/components/sideMenu/layerMenu/layerPanel2.vue
+++ b/src/components/sideMenu/layerMenu/layerPanel2.vue
@@ -1,7 +1,7 @@
<template>
<div class="layerPanel">
<div class="mapMode">
- <div class="title" style="margin-top: 0px">鍦板浘妯″紡</div>
+ <div class="title">鍦板浘妯″紡</div>
<div class="container">
<div
class="layerItem"
@@ -33,8 +33,8 @@
</div>
</div>
</div>
- <div class="areaType" style="margin-top: 10px">
- <div class="title">
+ <div class="areaType">
+ <div class="title ZTtitle">
涓撻搴旂敤
<!-- 涓嶆樉绀烘洿澶氬浘灞� -->
<span class="more" v-show="false" @click.stop="showLayerTree"
@@ -53,9 +53,6 @@
ZTValue.name
}}</span>
</div>
- </div>
- <div class="title2"></div>
- <div class="container">
<div
class="layerItem"
v-for="(funcValue, funcIndex) in FuncList"
@@ -71,6 +68,22 @@
}}</span>
</div>
</div>
+ <!-- <div class="container">
+ <div
+ class="layerItem"
+ v-for="(funcValue, funcIndex) in FuncList"
+ :key="funcValue.id"
+ @click.stop="handleFuncClick(funcIndex)"
+ >
+ <img
+ :src="funcValue.src"
+ :class="{ active: curFuncIndex == funcIndex }"
+ />
+ <span :class="{ spanActive: curFuncIndex == funcIndex }">{{
+ funcValue.name
+ }}</span>
+ </div>
+ </div> -->
</div>
<!-- <div class="yjsxt">
@@ -532,66 +545,100 @@
<style scoped>
.layerPanel {
width: 100%;
+ /* height: 396px; */
position: absolute;
bottom: 0px;
align-items: center;
- padding: 0.1rem;
- background: white;
+ /* padding: 0.1rem; */
+ background: #ffffff;
z-index: 1000;
- padding-left: 0.25rem;
+ /* padding-left: 0.25rem; */
border-radius: 15px 15px 0px 0px;
}
+.mapMode {
+ width: 100%;
+ margin-top: 24px;
+ padding-left: 28px;
+}
+@font-face {
+ font-family: "YouSheBiaoTiHei";
+ src: url("../../../../static/YouSheBiaoTiHei.ttf");
+}
.title {
- height: 25px;
- font-size: 16px;
- font-family: Source Han Sans SC;
- font-weight: 700;
- color: #181818;
- line-height: 25px;
- margin: 10px 0px 10px 0;
+ width: 72px;
+ height: 14px;
+ font-family: "YouSheBiaoTiHei";
+ font-weight: 400;
+ font-size: 19px;
+ color: #2e2e2e;
+ line-height: 15px;
+ margin-bottom: 18px;
}
-
-.title2 {
- height: 15px;
-}
-
.container {
+ width: 100%;
display: flex;
align-items: center;
text-align: center;
+ flex-wrap: wrap;
}
.layerItem {
/* font-size: 14px; */
- font-family: Source Han Sans SC;
+ font-family: "寰蒋闆呴粦";
font-weight: 400;
- margin-right: 30px;
cursor: pointer;
}
-
+.mapMode .layerItem {
+ width: 91px;
+ margin-right: 24px;
+}
+.mapMode img {
+ display: block;
+ width: 91px;
+ border-radius: 11px;
+ border: 1px dashed #127dff;
+ /* height: 40px; */
+ margin-bottom: 11px;
+}
+span {
+ font-family: "寰蒋闆呴粦";
+ font-weight: 500;
+ font-size: 15px;
+ color: #212121;
+ line-height: 12px;
+}
.active {
- color: #4187ff;
- border: 2px solid #4187ff;
+ color: #127dff;
+ border: 2px solid #127dff;
border-radius: 10px;
}
.spanActive {
- color: #4187ff;
+ color: #127dff;
}
-
-img {
+.areaType {
+ width: 100%;
+ margin-top: 30px;
+}
+.areaType .ZTtitle {
+ margin-left: 28px;
+ margin-bottom: 3px;
+}
+.areaType .container{
+ padding: 0 18px 22px;
+ justify-content: space-between;
+}
+.areaType img {
display: block;
- width: 60px;
- height: 40px;
- margin-bottom: 5px;
+ width: 84px;
}
.more {
float: right;
margin-right: 20px;
font-size: 0.12rem;
- color: #4187ff;
+ color: #127dff;
line-height: 25px;
font-weight: 500;
font-family: unset;
diff --git a/src/utils/ztt.js b/src/utils/ztt.js
index 75e148c..ae1012a 100644
--- a/src/utils/ztt.js
+++ b/src/utils/ztt.js
@@ -9,7 +9,7 @@
id: "qiyexinxi",
name: "浼佷笟淇℃伅",
active: false,
- src: require("@/assets/img/layer/qiyefenbu.png"),
+ src: require("@/assets/img/layer/qiyexinxi.png"),
},
{
id: "shizhengganti",
diff --git a/src/utils/ztt2.js b/src/utils/ztt2.js
index 75e148c..ae1012a 100644
--- a/src/utils/ztt2.js
+++ b/src/utils/ztt2.js
@@ -9,7 +9,7 @@
id: "qiyexinxi",
name: "浼佷笟淇℃伅",
active: false,
- src: require("@/assets/img/layer/qiyefenbu.png"),
+ src: require("@/assets/img/layer/qiyexinxi.png"),
},
{
id: "shizhengganti",
diff --git a/static/YouSheBiaoTiHei.ttf b/static/YouSheBiaoTiHei.ttf
new file mode 100644
index 0000000..3729151
--- /dev/null
+++ b/static/YouSheBiaoTiHei.ttf
Binary files differ
--
Gitblit v1.9.3