From 7855172b6ea7cb128807c866da5ea26be0cc3945 Mon Sep 17 00:00:00 2001
From: surprise <15810472099@163.com>
Date: 星期四, 12 十月 2023 17:58:29 +0800
Subject: [PATCH] 代码更新
---
src/api/api.js | 5 +++++
src/assets/js/rpc.js | 21 +++++++++------------
static/mapData.js | 2 +-
src/assets/js/mapMsg.js | 11 +++++++----
4 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/src/api/api.js b/src/api/api.js
index d90d819..e75cc00 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -34,3 +34,8 @@
"&geom=true&requesttype=json"
);
}
+export function shengwuSearch() {
+ return request.get(
+ 'gisserver/wfsserver/liushisijiayuanqu1005?version=1.3.0&request=GetFeature&typename=64jiayuanqujibenqingkuang&propertyname=*&filter=<Filter><PropertyIsLike+wildCard%3D"*"><PropertyName>chanyeDW<%2FPropertyName><Literal>*鐢熺墿鍖昏嵂*<%2FLiteral><%2FPropertyIsLike><%2FFilter>&format=json'
+ );
+}
\ No newline at end of file
diff --git a/src/assets/js/mapMsg.js b/src/assets/js/mapMsg.js
index 7a34b44..c71bcf1 100644
--- a/src/assets/js/mapMsg.js
+++ b/src/assets/js/mapMsg.js
@@ -86,11 +86,14 @@
})
if (accept.length > 0) {
rpc.getFuzzyQuery(result)
- }else{
- vueEvents.$emit("queryData", false);
- rpc.setClearAllMsg();
- rpc.setMapRest();
}
+
+
+ // else{
+ // vueEvents.$emit("queryData", false);
+ // rpc.setClearAllMsg();
+ // rpc.setMapRest();
+ // }
diff --git a/src/assets/js/rpc.js b/src/assets/js/rpc.js
index 4b39f48..5708571 100644
--- a/src/assets/js/rpc.js
+++ b/src/assets/js/rpc.js
@@ -6,7 +6,8 @@
liushisijiayuanqudizhibianmafuwu,
findAddressCandidates,
getDiKuanFanWei,
- ent_selectByName
+ ent_selectByName,
+ shengwuSearch
} from "../../api/api";
import vueEvents from "@/utils/vueEvent.js";
let PoiLayerConstructor = Vue.extend(coord);
@@ -31,9 +32,7 @@
getFuzzyQuery(res) {
if(res.message.indexOf('濂旈┌')>-1){
store.queryLayer.val ='濂旈┌鍏徃'
- } else if(res.message.indexOf('姘告槍')>-1){
- store.queryLayer.val ='姘告槍宸ヤ笟鍥�'
- }else if(res.message.indexOf('浜笢')>-1){
+ } else if(res.message.indexOf('浜笢')>-1){
store.queryLayer.val ='浜笢'
}else if(res.message.indexOf('灏忕背')>-1){
store.queryLayer.val ='灏忕背'
@@ -41,7 +40,7 @@
store.queryLayer.val ='鍗氬ぇ澶у帵'
}else{
- // store.queryLayer.val = res.message;
+ store.queryLayer.val = res.message;
}
this.setClearAllMsg();
@@ -92,17 +91,13 @@
if(world.indexOf('濂旈┌')>-1){
world ='濂旈┌';
this.pointrange = 12000
- } else if(world.indexOf('姘告槍')>-1){
- world ='姘告槍'
- }else if(world.indexOf('浜笢')>-1){
+ } else if(world.indexOf('浜笢')>-1){
world ='浜笢'
}else if(world.indexOf('灏忕背')>-1){
world ='灏忕背'
}else if(world.indexOf('鍗氬ぇ澶у帵')>-1){
world ='鍗氬ぇ澶у帵'
- }else{
- continue;
- }
+ }
this.setFuzzyQueryData(world, i, length - 1);
}
}
@@ -111,7 +106,8 @@
Promise.all([
ent_selectByName(res), //浼佷笟
liushisijiayuanqudizhibianmafuwu(res), //鍥尯
- findAddressCandidates(res) //鍦板潡
+ findAddressCandidates(res) ,//鍦板潡,
+
]).then(result => {
var that = this;
store.queryLayer.data = [];
@@ -163,6 +159,7 @@
};
that.objArr.push(itemObj);
});
+
if (index == length) {
if (that.objArr.length <= 0) {
diff --git a/static/mapData.js b/static/mapData.js
index 1b86919..a50b7f0 100644
--- a/static/mapData.js
+++ b/static/mapData.js
@@ -96,7 +96,7 @@
lineRoam: ['婕父', '瀵艰埅'],
closeRoam: ['鍋滄婕父', '鍋滄瀵艰埅'],
localPage: ['涓�', '浜�', '涓�', '鍥�', '浜�', '鍏�'],
- acceptMsg:['宸ヤ笟鍥�','濂旈┌','浜笢','灏忕背','鍗氬ぇ澶у帵','鏌ョ湅绗�','鍔炰簨娴佺▼']
+ acceptMsg:['瀹氫綅','濂旈┌','浜笢','灏忕背','鍗氬ぇ澶у帵','绗�','鍔炰簨娴佺▼']
}
};
export default mapData;
--
Gitblit v1.9.3