From b4fa6fafc2db40fba48676e38f4340ce14e99179 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 17 三月 2025 11:51:34 +0800
Subject: [PATCH] Merge branch 'dev'
---
src/views/components/Map/index.vue | 23 ++++++++---------------
1 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/src/views/components/Map/index.vue b/src/views/components/Map/index.vue
index 2b838fd..f59eef7 100644
--- a/src/views/components/Map/index.vue
+++ b/src/views/components/Map/index.vue
@@ -281,17 +281,10 @@
},
showProjectStatusStr(status) {
switch (status) {
- case "1":
- return "鍌ㄥ椤圭洰";
- case "2":
- return "鍓嶆湡椤圭洰";
- case "3":
- return "瀹炴柦椤圭洰";
- case "4":
- return "绔ｅ伐椤圭洰";
- case "5":
- return "寮傚父椤圭洰";
-
+ case "pendding":
+ return "鏈紑宸�";
+ case "working":
+ return "宸插紑宸�";
default:
return "寮傚父椤圭洰";
}
@@ -410,11 +403,11 @@
? item.yearInvestAmount + "鍏�"
: "鏆傛棤鏁版嵁",
projectAddr: item.projectAddress,
- projectStatus: item.usedStatus,
+ projectStatus: item.projectStatus,
};
-
+
_this.makeMask(item.longitude, item.latitude, config);
-
+
if (item.longitude && item.longitude > maxX) {
maxX = item.longitude;
}
@@ -428,7 +421,7 @@
minY = item.latitude;
}
});
-
+
this.moveTo(
(parseFloat(maxX) + parseFloat(minX)) / 2,
(parseFloat(maxY) + parseFloat(minY)) / 2
--
Gitblit v1.8.0