From 89fa48f9eab17c8899caa62f0d343e37a87ea336 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期二, 12 九月 2023 15:19:33 +0800
Subject: [PATCH] 定位功能优化
---
src/views/query/SpatialQuery.vue | 17 ++++++++
src/views/layer/layerDetail.vue | 15 ++++---
src/assets/js/Map/menuTool.js | 2
src/views/search/search.vue | 2
src/views/layer/layerManage.vue | 29 +++++++++++++-
public/CIMSDK/Workers/image/location.png | 0
6 files changed, 53 insertions(+), 12 deletions(-)
diff --git a/public/CIMSDK/Workers/image/location.png b/public/CIMSDK/Workers/image/location.png
index f0f0f7d..ad1941b 100644
--- a/public/CIMSDK/Workers/image/location.png
+++ b/public/CIMSDK/Workers/image/location.png
Binary files differ
diff --git a/src/assets/js/Map/menuTool.js b/src/assets/js/Map/menuTool.js
index 0ae8ed2..4e280f0 100644
--- a/src/assets/js/Map/menuTool.js
+++ b/src/assets/js/Map/menuTool.js
@@ -631,7 +631,7 @@
// 璁剧疆璐村湴
heightReference: Cesium.Color.CORNFLOWERBLUE.withAlpha(0.4),
verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
- scale: 5.0,
+ scale: 1.0,
},
});
diff --git a/src/views/layer/layerDetail.vue b/src/views/layer/layerDetail.vue
index de400e2..304821e 100644
--- a/src/views/layer/layerDetail.vue
+++ b/src/views/layer/layerDetail.vue
@@ -441,12 +441,15 @@
geom: geom,
pubid: releaseLayer.value.pubid,
};
- const data = publish_updateSjService(obj);
- if (data.count != 200) {
- return ElMessage(data.msg);
- }
- store.state.restLayer = true;
- setSpatialClose();
+ publish_updateSjService(obj).then((res) => {
+ if (res.code != 200) {
+ return ElMessage(data.msg);
+ }
+ store.state.restLayer = true;
+ setSpatialClose();
+ });
+ // const data = ;
+ // console.log("1122223" + data.code);
};
onMounted(() => {
typeDisplay(props.layerData);
diff --git a/src/views/layer/layerManage.vue b/src/views/layer/layerManage.vue
index 4b91f4e..798f6c8 100644
--- a/src/views/layer/layerManage.vue
+++ b/src/views/layer/layerManage.vue
@@ -269,7 +269,29 @@
// });
// treeData = handleTree(menuOption, "id", "pid", "children");
};
+const setRestLayerData = () => {
+ let son = estreeRef.value.getCheckedNodes().reverse();
+ server.delLayerAll();
+ var setGeoWms = [];
+ var url = null;
+ for (var i in son) {
+ var layerArr = son[i];
+ layerArr.checked = true;
+ if (layerArr.category == 2 && layerArr.type == 3) {
+ if (layerArr.tab != "moon:geo_mappable_unit") {
+ setGeoWms.push(layerArr.tab);
+ url = layerArr.url;
+ }
+ } else {
+ server.addTreeData(layerArr);
+ }
+ }
+ if (setGeoWms.length > 0) {
+ server.addGeoServerMmsLayers(setGeoWms, url);
+ }
+ store.commit("SET_CHECKLAYER", son);
+};
const getLayer = async () => {
store.state.restLayer = false;
server.delLayerAll();
@@ -311,11 +333,11 @@
url = layer.url;
}
} else {
- server.addTreeData(layer);
+ server.addTreeData(layer);
}
}
if (setGeoWms.length > 0) {
- server.addGeoServerMmsLayers(setGeoWms.reverse(), url);
+ server.addGeoServerMmsLayers(setGeoWms, url);
}
//;
nextTick(() => {
@@ -344,11 +366,12 @@
return father.pid == 0; // 杩斿洖涓�绾ц彍鍗�
});
}
+
watch(
() => store.state.restLayer,
(nVal, oVal) => {
if (nVal) {
- getLayer();
+ setRestLayerData();
}
},
{ deep: true }
diff --git a/src/views/query/SpatialQuery.vue b/src/views/query/SpatialQuery.vue
index ae5b9ac..1668d16 100644
--- a/src/views/query/SpatialQuery.vue
+++ b/src/views/query/SpatialQuery.vue
@@ -527,7 +527,22 @@
});
tableData.value = val;
};
-
+//鏍煎紡鍖栨椂闂�
+const format = (shijianchuo) => {
+ //shijianchuo鏄暣鏁帮紝鍚﹀垯瑕乸arseInt杞崲
+ var time = new Date(shijianchuo);
+ var y = time.getFullYear();
+ var m = time.getMonth() + 1;
+ var d = time.getDate();
+ var h = time.getHours();
+ var mm = time.getMinutes();
+ var s = time.getSeconds();
+ return y + "-" + add01(m) + "-" + add01(d) + " " + h + ":" + mm + ":" + s;
+};
+//鏍煎紡鍖栨椂闂�
+const add01 = (m) => {
+ return m < 10 ? "0" + m : m;
+};
const setQueySpatialFields = async () => {
const data = await dataQuery_selectFields({
ns: "mn",
diff --git a/src/views/search/search.vue b/src/views/search/search.vue
index 5a3b7f2..546e6f9 100644
--- a/src/views/search/search.vue
+++ b/src/views/search/search.vue
@@ -141,7 +141,7 @@
var position = { X: res.lon, Y: res.lat, Altitude: 10 };
imageLabel = window.sgworld.Creator.CreateImageLabel(
position,
- config.StaticFileBaseUrl + "/Workers/image/mark.png",
+ config.StaticFileBaseUrl + "/Workers/image/location.png",
{},
0,
"鏍囩鐐�"
--
Gitblit v1.9.3