From ac755c3add30177675e189cf7cb637e1f09eb827 Mon Sep 17 00:00:00 2001
From: lixuliang <lixuliang_hd@126.com>
Date: 星期五, 08 三月 2024 17:36:51 +0800
Subject: [PATCH] 20240308
---
src/assets/closeinput1.png | 0
src/assets/img/layer/tudiguanli.png | 0
src/assets/img/layer/lishiyingxiang.png | 0
src/components/poplayer/history2.vue | 45 ++++++--
static/SmartEarthSDK/Workers/image/xzspj/ganti.png | 0
src/assets/img/layer/qiyexinxi.png | 0
src/assets/img/layer/shipinjiankong.png | 0
src/components/leftMenu/sousuo2.vue | 221 +++++++++++++++++++++++++++++--------------
src/assets/img/search/back.png | 0
src/utils/tool.js | 2
src/assets/img/layer/shizhengganti.png | 0
static/SmartEarthSDK/Workers/image/xzspj/camera.png | 0
static/SmartEarthSDK/Workers/image/xzspj/qiye.png | 0
src/components/sideMenu/layerMenu/layerPanel2.vue | 32 ++++-
src/assets/img/search/形状 1@2x.png | 0
src/assets/img/navigation/location.png | 0
16 files changed, 203 insertions(+), 97 deletions(-)
diff --git a/src/assets/closeinput1.png b/src/assets/closeinput1.png
index 537d9b5..d36b052 100644
--- a/src/assets/closeinput1.png
+++ b/src/assets/closeinput1.png
Binary files differ
diff --git a/src/assets/img/layer/lishiyingxiang.png b/src/assets/img/layer/lishiyingxiang.png
index 45051cc..e2a6bc2 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/qiyexinxi.png b/src/assets/img/layer/qiyexinxi.png
index 67235b8..da26ff2 100644
--- a/src/assets/img/layer/qiyexinxi.png
+++ 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 eae5564..adf57e8 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 d55c1b2..60cdc5d 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 b074c11..ff8cb3e 100644
--- a/src/assets/img/layer/tudiguanli.png
+++ b/src/assets/img/layer/tudiguanli.png
Binary files differ
diff --git a/src/assets/img/navigation/location.png b/src/assets/img/navigation/location.png
new file mode 100644
index 0000000..ba7aba5
--- /dev/null
+++ b/src/assets/img/navigation/location.png
Binary files differ
diff --git a/src/assets/img/search/back.png b/src/assets/img/search/back.png
new file mode 100644
index 0000000..85cf0e7
--- /dev/null
+++ b/src/assets/img/search/back.png
Binary files differ
diff --git "a/src/assets/img/search/\345\275\242\347\212\266 1@2x.png" "b/src/assets/img/search/\345\275\242\347\212\266 1@2x.png"
new file mode 100644
index 0000000..3c3e9fc
--- /dev/null
+++ "b/src/assets/img/search/\345\275\242\347\212\266 1@2x.png"
Binary files differ
diff --git a/src/components/leftMenu/sousuo2.vue b/src/components/leftMenu/sousuo2.vue
index e592b06..06abd69 100644
--- a/src/components/leftMenu/sousuo2.vue
+++ b/src/components/leftMenu/sousuo2.vue
@@ -2,18 +2,29 @@
<div id="sousuo" class="sousuo">
<!-- 鎼滅储妗� -->
<div class="ssk" v-show="ssk.show">
- <span @click="ssjmxs" style="float: left; height: 100%; width: 80%; overflow: hidden"><i class="el-icon-search"
- style="padding: 0px 15px 0px 20px"></i>{{ syssval }}</span>
- <span v-show="syssval !== '璇疯緭鍏ュ叧閿瘝鎼滅储鍦板浘'" @click="clearval" style="float: right; height: 100%; width: 20%"><i
- class="el-icon-circle-close"></i></span>
- <span v-show="syssval !== '璇疯緭鍏ュ叧閿瘝鎼滅储鍦板浘'" style="
+ <span
+ @click="ssjmxs"
+ style="float: left; height: 100%; width: 80%; overflow: hidden"
+ ><i class="el-icon-search" style="padding: 0px 15px 0px 20px"></i
+ >{{ syssval }}</span
+ >
+ <span
+ v-show="syssval !== '璇疯緭鍏ュ叧閿瘝鎼滅储鍦板浘'"
+ @click="clearval"
+ style="float: right; height: 100%; width: 20%"
+ ><i class="el-icon-circle-close"></i
+ ></span>
+ <span
+ v-show="syssval !== '璇疯緭鍏ュ叧閿瘝鎼滅储鍦板浘'"
+ style="
float: right;
height: 100%;
width: 10%;
position: absolute;
top: -1px;
right: -3px;
- ">
+ "
+ >
<!-- <img src="@/assets/img/navigation/addf.png" style="width: 20px" @click.stop="AddFavorite" /> -->
</span>
<!-- <span v-show="syssval == '璇疯緭鍏ュ叧閿瘝鎼滅储鍦板浘'" style="float: right; height: 100%; width: 10%">
@@ -22,33 +33,42 @@
</div>
<!-- 鎼滅储鐣岄潰 -->
<div class="ssjm" v-show="ssjm">
- <!-- 鎼滅储鐣岄潰椤堕儴 -->
- <div class="menutop">
- <div class="menutitle">鎼滅储</div>
- <div class="menuback" @click="cancless">鍏抽棴</div>
- </div>
<!-- 鎼滅储妗� -->
- <div style="margin: 0.1rem 0">
- <el-input placeholder="杈撳叆鍏抽敭瀛楁悳绱㈠湴鍥�" autofocus v-model="poi_text" @input="changeInput" clearable>
+ <div class="search-container" style="margin: 0.1rem 0">
+ <div class="back" @click="cancless"></div>
+ <el-input
+ placeholder="杈撳叆鍏抽敭瀛楁悳绱㈠湴鍥�"
+ autofocus
+ v-model="poi_text"
+ @input="changeInput"
+ clearable
+ >
<el-select v-model="select" slot="prepend" placeholder="璇烽�夋嫨">
- <el-option v-for="(item, index) in options" :key="index" :label="item.label" :value="item.value"></el-option>
+ <el-option
+ v-for="(item, index) in options"
+ :key="index"
+ :label="item.label"
+ :value="item.value"
+ ></el-option>
</el-select>
- <el-button slot="append" icon="el-icon-search" @click="search"></el-button>
+ <el-button slot="append" @click="search">鎼滅储</el-button>
</el-input>
</div>
<!-- 缁撴灉鏄剧ず -->
<div v-if="total != 0">
<div class="ssjg" v-show="ssjgxs">
- <div class="everyinfo" v-for="(item, index) in poiList" :key="index" @click="flyTo(item)">
- <div style="margin: 0.05rem 0">
- <i class="el-icon-map-location"></i>{{ item.name }}
+ <div
+ class="everyinfo"
+ v-for="(item, index) in poiList"
+ :key="index"
+ @click="flyTo(item)"
+ >
+ <div class="poiName" style="margin: 0.05rem 0">
+ <img src="@/assets/img/navigation/location.png" alt="" />
+ <span>{{ item.name }}</span>
</div>
- <div style="font-size: 0.12rem; color: black">
- <!-- <span>鍦板潃:{{ item.address ? item.address : "鏆傛棤璇︾粏鍦板潃" }}</span><br />
- <span>鐢佃瘽:{{ item.telphone ? item.telphone : "鏆傛棤鑱旂郴鏂瑰紡" }}</span> -->
- <!-- <span>鍖哄煙:{{ item.area ? item.area : "鏆傛棤鍖哄煙淇℃伅" }}</span> -->
- <!-- <br /> -->
- <span>鍦板潃:{{ item.address ? item.address : "鏆傛棤璇︾粏鍦板潃" }}</span>
+ <div class="addressBox">
+ <span>{{ item.address ? item.address : "鏆傛棤璇︾粏鍦板潃" }}</span>
</div>
</div>
</div>
@@ -94,35 +114,107 @@
background-color: #f3f3f3;
z-index: 99;
}
-
-.el-select {
- width: 80px;
+.search-container {
+ /* background-color: #fff; */
+ background-color: #fff;
+ display: flex;
+ height: 52px;
+ align-items: center;
+}
+.back {
+ background: url("~@/assets/img/search/back.png") center center no-repeat;
+ background-size: 10px 17px;
+ height: 40px;
+ width: 50px;
}
+.el-input {
+ width: 85%;
+ background-color: #eee;
+ border-radius: 13px;
+}
+.el-input /deep/ .el-input-group__append,
+.el-input /deep/ .el-input-group__prepend {
+ background-color: transparent;
+ border: none;
+}
+
+.el-input /deep/ .el-input__inner {
+ border: none;
+ font-weight: 500;
+ font-size: 17px;
+ color: #3e3d3d;
+}
+.el-select {
+ width: 80px;
+ position: relative;
+}
+.el-select:after {
+ content: "";
+ position: absolute;
+ right: 0;
+ height: 24px;
+ border-left: 1px solid #dcdcdc;
+ top: 50%;
+ transform: translateY(-50%);
+}
+.el-input /deep/ .el-input-group__append {
+ width: 50px;
+ padding-right: 25px;
+}
+.el-input /deep/ .el-input-group__append .el-button {
+ font-size: 15px;
+ color: #ffffff;
+ line-height: 17px;
+ background: #2477ff;
+ border-radius: 13px;
+ padding: 10px;
+ width: 62px;
+ height: 33px;
+}
.el-scrollbar .hover {
background: none;
}
-
-/* 姣忔潯鎼滅储缁撴灉 */
-.everyinfo {
- color: #409eff;
- padding: 0.05rem;
- font-size: 0.16rem;
- border-bottom: 1px solid lightgray;
-}
-
+/*
+ 鎼滅储缁撴灉
+*/
.ssjg {
overflow-x: hidden;
overflow-y: scroll;
/* max-height: 4rem; */
- max-height: 80vh;
+ max-height: calc(98vh - 50px);
background: white;
padding: 0.2rem;
border-radius: 0.05rem;
}
+.ssjg .everyinfo {
+ color: #409eff;
+ padding: 0.05rem;
+ font-size: 0.16rem;
+ border-bottom: 1px solid lightgray;
+}
+.ssjg .poiName {
+ display: flex;
+ align-items: center;
+ height: 20px;
+}
+.ssjg .poiName img {
+ width: 20px;
+}
+.ssjg .poiName span {
+ margin-left: 7px;
+ line-height: 20px;
+}
+.ssjg .addressBox {
+ text-indent: 27px;
+ margin-top: 5px;
+ color: #000;
+ font-weight: 500;
+ font-size: 13px;
+}
.ssjg::-webkit-scrollbar {
/*婊氬姩鏉℃暣浣撴牱寮�*/
width: 8px;
@@ -153,7 +245,7 @@
import axios from "axios";
import store from "@/utils/store2.js";
import common from "@/components/common";
-import { createPointMarker, flyToPoint } from '@/utils/map2.js'
+import { createPointMarker, flyToPoint } from "@/utils/map2.js";
window.flyPoint = null;
window.flyLine = null;
let Allresults = [];
@@ -196,10 +288,10 @@
this.poi_text = "";
this.ssjgxs = false;
if (window.pointArr && window.pointArr.length > 0) {
- window.pointArr.forEach(item => {
- window.mapapi.removeLayer(item)
- })
- window.pointArr = []
+ window.pointArr.forEach((item) => {
+ window.mapapi.removeLayer(item);
+ });
+ window.pointArr = [];
}
},
changeInput() {
@@ -224,10 +316,10 @@
cancless() {
this.ssjm = false;
if (window.pointArr && window.pointArr.length > 0) {
- window.pointArr.forEach(item => {
- window.mapapi.removeLayer(item)
- })
- window.pointArr = []
+ window.pointArr.forEach((item) => {
+ window.mapapi.removeLayer(item);
+ });
+ window.pointArr = [];
}
},
getArea() {
@@ -275,14 +367,14 @@
if (res.data.status == "1") {
res.data.pois &&
res.data.pois
- // .filter((item) => {
- // var reg = new RegExp("[\\u4E00-\\u9FFF]+", "g");
- // return (
- // item.pname.includes("鍖椾含") &&
- // item.name.includes(this.poi_text) &&
- // !reg.test(item.typecode)
- // );
- // })
+ .filter((item) => {
+ var reg = new RegExp("[\\u4E00-\\u9FFF]+", "g");
+ return (
+ item.pname.includes("鍖椾含") &&
+ item.name.includes(this.poi_text) &&
+ !reg.test(item.typecode)
+ );
+ })
.forEach((val) => {
let poiarr = val.location.split(",");
let poi = {
@@ -504,27 +596,10 @@
this.ssjm = false;
this.syssval = item.name;
//椋炶瀹氫綅
- flyToPoint([item.lng, item.lat])
+ flyToPoint([item.lng, item.lat]);
//鍒涘缓鐐逛綅
let layer = createPointMarker([item.lng, item.lat], item);
- window.mapapi.addLayer(layer)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ window.mapapi.addLayer(layer);
// let that = this;
// let degrees = item.location.split(',');
diff --git a/src/components/poplayer/history2.vue b/src/components/poplayer/history2.vue
index fd2a20a..e134ba1 100644
--- a/src/components/poplayer/history2.vue
+++ b/src/components/poplayer/history2.vue
@@ -11,7 +11,9 @@
@click="changeLeftMap(item)"
:class="{ active: currentValue == item }"
>
- {{ item }}
+ <span>
+ {{ item }}
+ </span>
</li>
</ul>
</div>
@@ -19,6 +21,7 @@
</template>
<script>
+import _GLOBAL from "@/assets/GLOBAL";
import store from "@/utils/store2";
import { addHistoryLayer } from "@/utils/tool";
export default {
@@ -60,30 +63,45 @@
<style scoped>
.colseBtn {
position: absolute;
- top: 3vh;
- right: 20px;
+ top: 20px;
+ right: 9px;
}
.searchBtn {
- width: 40px;
- height: 40px;
+ width: 51px;
+ /* height: 40px; */
}
.listBox {
position: absolute;
- right: 20px;
- bottom: 0.5rem;
- background-color: #373737;
+ right: 10px;
+ bottom: 18px;
+ width: 48px;
+ height: 594px;
+ background: #ffffff;
+ box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.21);
+ border-radius: 13px;
}
+.listBox ul {
+ margin-top: 3px;
+}
.listBox li {
- padding: 2px;
- border: 1px solid #000;
- color: white;
+ font-weight: bold;
+ font-size: 15px;
+ color: #1c222f;
+ height: 28px;
+ line-height: 28px;
+ border-bottom: 1px solid #e5e5e5;
+ text-align: center;
+}
+.listBox li:last-child {
+ border: none;
}
.listBox li:hover {
- background-color: #00e1ff;
+ /* background-color: #00e1ff; */
+ color: #127dff;
}
.mapLeft {
@@ -94,6 +112,7 @@
}
.active {
- background-color: #4590d7;
+ /* background-color: #4590d7; */
+ color: #127dff;
}
</style>
diff --git a/src/components/sideMenu/layerMenu/layerPanel2.vue b/src/components/sideMenu/layerMenu/layerPanel2.vue
index 571844b..6a2f1ba 100644
--- a/src/components/sideMenu/layerMenu/layerPanel2.vue
+++ b/src/components/sideMenu/layerMenu/layerPanel2.vue
@@ -67,6 +67,7 @@
funcValue.name
}}</span>
</div>
+ <!-- <div style="height: 0" class="layerItem" v-for="n in 3" :key="n"></div> -->
</div>
<!-- <div class="container">
<div
@@ -551,7 +552,7 @@
align-items: center;
/* padding: 0.1rem; */
background: #ffffff;
- z-index: 1000;
+ /* z-index: 1000; */
/* padding-left: 0.25rem; */
border-radius: 15px 15px 0px 0px;
}
@@ -575,8 +576,7 @@
line-height: 15px;
margin-bottom: 18px;
}
-.container {
- width: 100%;
+.mapMode .container {
display: flex;
align-items: center;
text-align: center;
@@ -598,7 +598,6 @@
width: 91px;
border-radius: 11px;
border: 1px dashed #127dff;
- /* height: 40px; */
margin-bottom: 11px;
}
span {
@@ -608,7 +607,8 @@
color: #212121;
line-height: 12px;
}
-.active {
+.mapMode .active,
+.areaType .active {
color: #127dff;
border: 2px solid #127dff;
border-radius: 10px;
@@ -621,17 +621,31 @@
width: 100%;
margin-top: 30px;
}
+
.areaType .ZTtitle {
margin-left: 28px;
margin-bottom: 3px;
}
-.areaType .container{
- padding: 0 18px 22px;
- justify-content: space-between;
+.areaType .container {
+ margin-top: 18px;
+ padding: 0 4%;
+ display: grid;
+ justify-items: center;
+ grid-template-columns: repeat(4, 1fr);
+ overflow: hidden;
}
+.areaType .layerItem {
+ margin-bottom: 15px;
+}
+
.areaType img {
+ margin: 0 auto;
+ /* background-color: green; */
display: block;
- width: 84px;
+ width: 53px;
+ border-radius: 11px;
+ box-shadow: 0 0 5px 5px rgb(196 222 236 / 30%);
+ margin-bottom: 11px;
}
.more {
diff --git a/src/utils/tool.js b/src/utils/tool.js
index d70071b..a8e0345 100644
--- a/src/utils/tool.js
+++ b/src/utils/tool.js
@@ -130,8 +130,6 @@
window.mapapi.addLayer(_GLOBAL.historyLayer);
}
-
-
//瀹炴椂鑾峰彇瀹氫綅
export function getCurrentPosition() {
if (navigator.geolocation) {
diff --git a/static/SmartEarthSDK/Workers/image/xzspj/camera.png b/static/SmartEarthSDK/Workers/image/xzspj/camera.png
index dd710af..19a9f26 100644
--- a/static/SmartEarthSDK/Workers/image/xzspj/camera.png
+++ b/static/SmartEarthSDK/Workers/image/xzspj/camera.png
Binary files differ
diff --git a/static/SmartEarthSDK/Workers/image/xzspj/ganti.png b/static/SmartEarthSDK/Workers/image/xzspj/ganti.png
index f27c280..74265fb 100644
--- a/static/SmartEarthSDK/Workers/image/xzspj/ganti.png
+++ b/static/SmartEarthSDK/Workers/image/xzspj/ganti.png
Binary files differ
diff --git a/static/SmartEarthSDK/Workers/image/xzspj/qiye.png b/static/SmartEarthSDK/Workers/image/xzspj/qiye.png
index af5f2ac..9c97f3d 100644
--- a/static/SmartEarthSDK/Workers/image/xzspj/qiye.png
+++ b/static/SmartEarthSDK/Workers/image/xzspj/qiye.png
Binary files differ
--
Gitblit v1.9.3