From c278e89469ce8954e82ec4b4e721957c251eab99 Mon Sep 17 00:00:00 2001
From: SurprisePlus <845948745@qq.com>
Date: 星期四, 12 十月 2023 11:20:20 +0800
Subject: [PATCH] 代码更新
---
src/assets/js/rpc.js | 38 ++++++++++++++++++++++++++++++++------
static/mapData.js | 3 ++-
src/components/map/viewer.vue | 2 +-
src/assets/js/mapMsg.js | 15 ++++++++++++++-
4 files changed, 49 insertions(+), 9 deletions(-)
diff --git a/src/assets/js/mapMsg.js b/src/assets/js/mapMsg.js
index b8e2beb..8abda3e 100644
--- a/src/assets/js/mapMsg.js
+++ b/src/assets/js/mapMsg.js
@@ -40,6 +40,7 @@
var rest = mapData.msgMach.rest;
var rom = mapData.msgMach.lineRoam;
var closeRomData = mapData.msgMach.closeRoam;
+ var acceptData =mapData.msgMach.acceptMsg;
var valRest = rest.filter((rs) => {
if (param.indexOf(rs) > -1) {
return rs;
@@ -77,8 +78,20 @@
rpc.setCloseLineRomaing();
return
}
+ var accept = acceptData.filter(res => {
+ if (param.indexOf(res) > -1) {
+ return res;
+ }
+ })
+ if (accept.length > 0) {
+ rpc.getFuzzyQuery(result)
+ }else{
+ vueEvents.$emit("queryData", false);
+ rpc.setClearAllMsg();
+ rpc.setMapRest();
+ }
- rpc.getFuzzyQuery(result)
+
},
};
diff --git a/src/assets/js/rpc.js b/src/assets/js/rpc.js
index 6a1dcaf..5818f96 100644
--- a/src/assets/js/rpc.js
+++ b/src/assets/js/rpc.js
@@ -27,7 +27,21 @@
objArr: [],
//鍏抽敭瀛楁煡璇�
getFuzzyQuery(res) {
- store.queryLayer.val = res.message;
+ if(res.message.indexOf('濂旈┌')>-1){
+ store.queryLayer.val ='濂旈┌鍏徃'
+ } else if(res.message.indexOf('姘告槍')>-1){
+ store.queryLayer.val ='姘告槍宸ヤ笟鍥�'
+ }else if(res.message.indexOf('浜笢')>-1){
+ store.queryLayer.val ='浜笢'
+ }else if(res.message.indexOf('灏忕背')>-1){
+ store.queryLayer.val ='灏忕背'
+ }else if(res.message.indexOf('鍗氬ぇ')>-1){
+ store.queryLayer.val ='鍗氬ぇ澶у帵'
+ }else{
+
+ // store.queryLayer.val = res.message;
+ }
+
this.setClearAllMsg();
if (!res.baidu_keys) return;
var flag = true;
@@ -72,7 +86,19 @@
this.objArr = [];
for (var i = 0; i < length; i++) {
var world = keyWorld[i].word;
- console.log("world", world);
+ if(world.indexOf('濂旈┌')>-1){
+ world ='濂旈┌'
+ } else if(world.indexOf('姘告槍')>-1){
+ world ='姘告槍'
+ }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);
}
}
@@ -190,7 +216,7 @@
coord.push(parseFloat(geom[i]))
}
this.setDrawPolyExtent(coord)
- } else if (res.type == "鍦板潡") {
+ } else if (res.type == "鍦板潡" || res.type == "浼佷笟") {
getDiKuanFanWei(res.lon, res.lat).then(response => {
let center = { lon: 0, lat: 0 };
let polygon = that.read(response.geometry);
@@ -561,9 +587,9 @@
});
window.Viewer.flyTo(this.position, {
offset: {
- heading: Cesium.Math.toRadians(0.0),
- pitch: Cesium.Math.toRadians(-30),
- range: 1500
+ heading: Cesium.Math.toRadians(-200),
+ pitch: Cesium.Math.toRadians(-45),
+ range: 4000
},
duration: 3
});
diff --git a/src/components/map/viewer.vue b/src/components/map/viewer.vue
index 602266b..0a5a9b8 100644
--- a/src/components/map/viewer.vue
+++ b/src/components/map/viewer.vue
@@ -124,7 +124,7 @@
},
duration: 10, //椋炶鏃堕棿8s
});
- }, 9000);
+ }, `9000`);
that.setCesiumInit(true);
// rpc.initRpc();
}
diff --git a/static/mapData.js b/static/mapData.js
index 741f227..74fb5b9 100644
--- a/static/mapData.js
+++ b/static/mapData.js
@@ -92,7 +92,8 @@
rest: ['澶嶄綅', '杩樺師', '鍒濆鍖�', '鍒濆浣嶇疆'],
lineRoam: ['婕父', '瀵艰埅'],
closeRoam: ['鍋滄婕父', '鍋滄瀵艰埅'],
- localPage: ['涓�', '浜�', '涓�', '鍥�', '浜�', '鍏�']
+ localPage: ['涓�', '浜�', '涓�', '鍥�', '浜�', '鍏�'],
+ acceptMsg:['姘告槍','濂旈┌','浜笢','灏忕背','鍗氬ぇ','鏌ョ湅绗�','浜烘墠']
}
};
export default mapData;
--
Gitblit v1.9.3