From 7f5ed1e4c925d87d87551a8f86ad53a7b563935e Mon Sep 17 00:00:00 2001
From: lixuliang <lixuliang_hd@126.com>
Date: 星期二, 23 一月 2024 17:48:55 +0800
Subject: [PATCH] 历史影响与土地管理切换bug
---
src/components/leftMenu/sousuo.vue | 161 ++++++++++++++++++++++++++++-------------------------
src/components/sideMenu/layerMenu/layerPanel.vue | 9 +-
src/components/poplayer/history.vue | 1
3 files changed, 92 insertions(+), 79 deletions(-)
diff --git a/src/components/leftMenu/sousuo.vue b/src/components/leftMenu/sousuo.vue
index 13d2cda..a7740c9 100644
--- a/src/components/leftMenu/sousuo.vue
+++ b/src/components/leftMenu/sousuo.vue
@@ -98,7 +98,7 @@
</div>
</div>
<div v-else>
- <div class="ssjg" v-show="ssjgxs">璇疯緭鍏ュ叧閿瘝鎼滅储鍦板浘</div>
+ <div class="ssjg" v-show="ssjgxs">鏈悳绱㈠埌缁撴灉</div>
</div>
</div>
</div>
@@ -343,13 +343,14 @@
// data.data && data.data.pois;
//115鎺ュ彛
if (data[0].status == 200) {
- data[0].data.data.res
- .filter((item) => {
- return item.name.includes(this.poi_text);
- })
- .forEach((val) => {
- Allresults.push(val);
- });
+ data[0].data.data.res &&
+ data[0].data.data.res
+ .filter((item) => {
+ return item.name.includes(this.poi_text);
+ })
+ .forEach((val) => {
+ Allresults.push(val);
+ });
}
// 甯傜骇骞冲彴
// // 鐧惧害
@@ -370,36 +371,37 @@
// }
// 楂樺痉
if (data[1].data.status == 1) {
- data[1].data.pois
- .filter((item) => {
- return (
- item.pname.includes("鍖椾含") &&
- item.name.includes(this.poi_text)
- );
- })
- .forEach((val) => {
- let poiarr = val.location.split(",");
- let poi = {
- lon: parseFloat(poiarr[0]),
- lat: parseFloat(poiarr[1]),
- };
- let obj = {
- adcode: val.adcode,
- address: val.address,
- adname: val.area,
- citycode: val.citycode,
- cityname: val.cityname,
- id: val.uid,
- lat: poi.lat,
- lng: poi.lon,
- name: val.name,
- pcode: val.pcode,
- pname: val.province,
- type: val.type,
- typecode: val.typecode,
- };
- Allresults.push(obj);
- });
+ data[1].data.pois &&
+ data[1].data.pois
+ .filter((item) => {
+ return (
+ item.pname.includes("鍖椾含") &&
+ item.name.includes(this.poi_text)
+ );
+ })
+ .forEach((val) => {
+ let poiarr = val.location.split(",");
+ let poi = {
+ lon: parseFloat(poiarr[0]),
+ lat: parseFloat(poiarr[1]),
+ };
+ let obj = {
+ adcode: val.adcode,
+ address: val.address,
+ adname: val.area,
+ citycode: val.citycode,
+ cityname: val.cityname,
+ id: val.uid,
+ lat: poi.lat,
+ lng: poi.lon,
+ name: val.name,
+ pcode: val.pcode,
+ pname: val.province,
+ type: val.type,
+ typecode: val.typecode,
+ };
+ Allresults.push(obj);
+ });
}
this.total = Allresults.length;
this.poiList = Allresults;
@@ -426,36 +428,39 @@
.then((res) => {
// 楂樺痉
if (res.data.status == 1) {
- res.data.pois
- .filter((item) => {
- return (
- item.pname.includes("鍖椾含") &&
- item.name.includes(this.poi_text)
- );
- })
- .forEach((val) => {
- let poiarr = val.location.split(",");
- let poi = {
- lon: parseFloat(poiarr[0]),
- lat: parseFloat(poiarr[1]),
- };
- let obj = {
- adcode: val.adcode,
- address: val.address,
- adname: val.area,
- citycode: val.citycode,
- cityname: val.cityname,
- id: val.uid,
- lat: poi.lat,
- lng: poi.lon,
- name: val.name,
- pcode: val.pcode,
- pname: val.province,
- type: val.type,
- typecode: val.typecode,
- };
- Allresults.push(obj);
- });
+ 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)
+ );
+ })
+ .forEach((val) => {
+ let poiarr = val.location.split(",");
+ let poi = {
+ lon: parseFloat(poiarr[0]),
+ lat: parseFloat(poiarr[1]),
+ };
+ let obj = {
+ adcode: val.adcode,
+ address: val.address,
+ adname: val.area,
+ citycode: val.citycode,
+ cityname: val.cityname,
+ id: val.uid,
+ lat: poi.lat,
+ lng: poi.lon,
+ name: val.name,
+ pcode: val.pcode,
+ pname: val.province,
+ type: val.type,
+ typecode: val.typecode,
+ };
+ Allresults.push(obj);
+ });
}
this.total = Allresults.length;
this.poiList = Allresults;
@@ -484,13 +489,19 @@
})
.then((res) => {
if (res.status == 200) {
- res.data.data.res
- .filter((item) => {
- return item.name.includes(this.poi_text);
- })
- .forEach((val) => {
- Allresults.push(val);
- });
+ res.data.data.res &&
+ res.data.data.res
+ .filter((item) => {
+ // 鍒ゆ柇鍦板潡鏄惁鏈夋眽瀛�
+ var reg = new RegExp("[\\u4E00-\\u9FFF]+", "g");
+ return (
+ item.name.includes(this.poi_text) &&
+ reg.test(item.typecode)
+ );
+ })
+ .forEach((val) => {
+ Allresults.push(val);
+ });
}
this.total = Allresults.length;
this.poiList = Allresults;
diff --git a/src/components/poplayer/history.vue b/src/components/poplayer/history.vue
index 0e1a048..8519f2e 100644
--- a/src/components/poplayer/history.vue
+++ b/src/components/poplayer/history.vue
@@ -33,6 +33,7 @@
let view = new View({
center: olProj.fromLonLat([4.606512, 2.621472]),
zoom: 13,
+ enableRotation: false,
});
var topResolution = 896.0859375;
var resolutions = [];
diff --git a/src/components/sideMenu/layerMenu/layerPanel.vue b/src/components/sideMenu/layerMenu/layerPanel.vue
index 72e07c4..014d927 100644
--- a/src/components/sideMenu/layerMenu/layerPanel.vue
+++ b/src/components/sideMenu/layerMenu/layerPanel.vue
@@ -477,7 +477,6 @@
handleFuncClick(index) {
if (this.curFuncIndex == index) {
store.setTdglFlag(false);
- store.setSliderShow(false);
store.setPoplayerListAction({});
divPoint3 && divPoint3.deleteObject();
store.setPoplayerShowAction(false);
@@ -488,6 +487,7 @@
this.curFuncIndex = -1;
window.clusterLayer && window.clusterLayer.clear();
if (window.tdglLayer) {
+ store.setSliderShow(false);
sgworld.Creator.DeleteObject(window.tdglLayer);
}
} else {
@@ -497,11 +497,10 @@
store.setMenuListShow(false);
// 闅愯棌搴曢儴婕父闈㈡澘
store.setRoamPanelShow(false);
- //鏄剧ず婊戝姩鏉�
- store.setSliderShow(true);
this.curFuncIndex = index;
switch (index) {
case 0:
+ store.setSliderShow(true);
window.tdglLayer = sgworld.Creator.createImageryProvider(
layers[8].name,
"tms",
@@ -525,12 +524,14 @@
true,
""
);
+ //鏄剧ず婊戝姩鏉�
store.setTdglFlag(true);
break;
case 1:
this.curFuncIndex = -1;
store.setTdglFlag(false);
if (window.tdglLayer) {
+ store.setSliderShow(false);
sgworld.Creator.DeleteObject(window.tdglLayer);
}
store.setHistoryShow(true);
@@ -567,7 +568,7 @@
"basicMapChecked.val": {
handler: function (newVal, oldVal) {
if (newVal == "涓夌淮妯″瀷") {
- debugger
+ debugger;
this.handleSMapClick(
{
id: "swmx",
--
Gitblit v1.9.3