From 3ac241dca10f0dc85b6a3291a8339f1b1765491f Mon Sep 17 00:00:00 2001
From: WX <1377869194@qq.com>
Date: 星期三, 13 九月 2023 14:25:20 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.20.92:8888/r/PM20230220027_Web
---
public/CIMSDK/Assets/Images/colors75.png | 0
src/views/query/SpatialQuery.vue | 2 +-
public/CIMSDK/Workers/image/colors75.png | 0
public/CIMSDK/Workers/image/colors - 副本.png | 0
public/CIMSDK/Workers/image/colors025.png | 0
src/assets/img/colors025.png | 0
src/views/layer/attributeList.vue | 2 +-
public/CIMSDK/Assets/Images/colors025.png | 0
src/assets/js/Map/menuTool.js | 4 +++-
9 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/public/CIMSDK/Assets/Images/colors025.png b/public/CIMSDK/Assets/Images/colors025.png
new file mode 100644
index 0000000..9db9b5d
--- /dev/null
+++ b/public/CIMSDK/Assets/Images/colors025.png
Binary files differ
diff --git a/public/CIMSDK/Assets/Images/colors75.png b/public/CIMSDK/Assets/Images/colors75.png
new file mode 100644
index 0000000..02c28f0
--- /dev/null
+++ b/public/CIMSDK/Assets/Images/colors75.png
Binary files differ
diff --git "a/public/CIMSDK/Workers/image/colors - \345\211\257\346\234\254.png" "b/public/CIMSDK/Workers/image/colors - \345\211\257\346\234\254.png"
new file mode 100644
index 0000000..b3b2d53
--- /dev/null
+++ "b/public/CIMSDK/Workers/image/colors - \345\211\257\346\234\254.png"
Binary files differ
diff --git a/public/CIMSDK/Workers/image/colors025.png b/public/CIMSDK/Workers/image/colors025.png
new file mode 100644
index 0000000..9db9b5d
--- /dev/null
+++ b/public/CIMSDK/Workers/image/colors025.png
Binary files differ
diff --git a/public/CIMSDK/Workers/image/colors75.png b/public/CIMSDK/Workers/image/colors75.png
new file mode 100644
index 0000000..02c28f0
--- /dev/null
+++ b/public/CIMSDK/Workers/image/colors75.png
Binary files differ
diff --git a/src/assets/img/colors025.png b/src/assets/img/colors025.png
new file mode 100644
index 0000000..9db9b5d
--- /dev/null
+++ b/src/assets/img/colors025.png
Binary files differ
diff --git a/src/assets/js/Map/menuTool.js b/src/assets/js/Map/menuTool.js
index fa94d83..e9617c2 100644
--- a/src/assets/js/Map/menuTool.js
+++ b/src/assets/js/Map/menuTool.js
@@ -152,12 +152,14 @@
fabric: {
type: "ElevationRamp",
uniforms: {
- image: config.StaticFileBaseUrl + "Assets/Images/color.png",
+ image: config.StaticFileBaseUrl + "Assets/Images/colors75.png",
minimumHeight: -10000,
maximumHeight: 10000,
+
},
},
});
+
Viewer.scene.globe.material = window.material;
},
diff --git a/src/views/layer/attributeList.vue b/src/views/layer/attributeList.vue
index 4ec72af..50afbb8 100644
--- a/src/views/layer/attributeList.vue
+++ b/src/views/layer/attributeList.vue
@@ -227,7 +227,7 @@
listData.value.name = listData.value.name.replaceAll("_", "");
const data = await dataQuery_selectByPage(listData.value);
if (data.code != 200) {
- return ElMessage.error("绌洪棿鏌ヨ澶辫触");
+ return ElMessage.error(data.msg);
}
listData.value.count = data.count;
diff --git a/src/views/query/SpatialQuery.vue b/src/views/query/SpatialQuery.vue
index 1668d16..2f0035b 100644
--- a/src/views/query/SpatialQuery.vue
+++ b/src/views/query/SpatialQuery.vue
@@ -510,7 +510,7 @@
listData.value.name = listData.value.name.replaceAll("_", "");
const data = await dataQuery_selectByPage(listData.value);
if (data.code != 200) {
- return ElMessage.error("绌洪棿鏌ヨ澶辫触");
+ return ElMessage.error(data.msg);
}
listData.value.count = data.count;
var val = data.result.filter((res) => {
--
Gitblit v1.9.3