From d2194a55c832469d5f47dc852c67d9baf3980a33 Mon Sep 17 00:00:00 2001
From: wgx <31655391@qq.com>
Date: Wed, 29 Jul 2026 15:39:28 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95?=
=?UTF-8?q?=E3=80=81=E4=BC=98=E5=8C=96=E5=9B=BE=E7=89=87=E5=8A=A0=E8=BD=BD?=
=?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitignore | 25 +-
components/my-icon/my-icon.vue | 460 +++++++++++++++++++++++++++++++++
2 files changed, 483 insertions(+), 2 deletions(-)
create mode 100644 components/my-icon/my-icon.vue
diff --git a/.gitignore b/.gitignore
index d6212fc..403adbc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,23 @@
-/unpackage/
-/.idea/
+.DS_Store
+node_modules
+/dist
+
+
+# local env files
+.env.local
+.env.*.local
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
diff --git a/components/my-icon/my-icon.vue b/components/my-icon/my-icon.vue
new file mode 100644
index 0000000..317de3f
--- /dev/null
+++ b/components/my-icon/my-icon.vue
@@ -0,0 +1,460 @@
+
+
+
+
+
+
+
From 314b87149311e63ff630d7a3bc4c70558411a030 Mon Sep 17 00:00:00 2001
From: wgx <31655391@qq.com>
Date: Wed, 29 Jul 2026 15:40:09 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95?=
=?UTF-8?q?=E3=80=81=E4=BC=98=E5=8C=96=E5=9B=BE=E7=89=87=E5=8A=A0=E8=BD=BD?=
=?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitignore b/.gitignore
index 403adbc..3806f96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
node_modules
/dist
+/unpackage
# local env files
.env.local
From 246f34358c6f57284acedc7e0ce1443c1a916726 Mon Sep 17 00:00:00 2001
From: "978184212@qq.com" <978184212@qq.com>
Date: Thu, 30 Jul 2026 17:02:24 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/maps/index.vue | 39 ++++++++++++++++++++++-----------------
1 file changed, 22 insertions(+), 17 deletions(-)
diff --git a/pages/maps/index.vue b/pages/maps/index.vue
index 77352c4..f569ccb 100644
--- a/pages/maps/index.vue
+++ b/pages/maps/index.vue
@@ -187,26 +187,31 @@
monitorRender() {// 监测点位渲染
this.soilStationList.forEach((item, index) => {
let iconPath = '';
- let width = 35;
- let height = 35;
+ let width = 32;
+ let height = 47;
// 根据设备类型设置不同的图标
- switch(item.type) {
- case 'soil':
- iconPath = this.baseUrl + '/icon/device/soil.png';
- width = 32;
- height = 47;
- break;
- case 'camera':
- iconPath = this.baseUrl + '/icon/device/cam.png';
- width = 45;
- height = 45;
- break;
- default:
- iconPath = this.baseUrl + '/icon/device/default.png';
- }
+ // switch(item.type) {
+ // case 'soil':
+ // iconPath = this.baseUrl + '/icon/device/soil.png';
+ // width = 32;
+ // height = 47;
+ // break;
+ // case 'camera':
+ // iconPath = this.baseUrl + '/icon/device/cam.png';
+ // width = 45;
+ // height = 45;
+ // break;
+ // case '10_flowmeter':
+ // iconPath = this.baseUrl + '/icon/device/liuliang.png';
+ // width = 45;
+ // height = 45;
+ // break;
+ // default:
+ // iconPath = this.baseUrl + '/icon/device/default.png';
+ // }
const markerItem = {
id: item.id,
- iconPath: iconPath,
+ iconPath: this.baseUrl +'/' + item.mapIcon,
latitude: Number(item.latitude),
longitude: Number(item.longitude),
width: width,
From 5fb3ab000fe79543c9acffb0f6689f43f9ca2bd9 Mon Sep 17 00:00:00 2001
From: wgx <31655391@qq.com>
Date: Thu, 13 Aug 2026 16:00:15 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95?=
=?UTF-8?q?=E3=80=81=E4=BC=98=E5=8C=96=E5=9B=BE=E7=89=87=E5=8A=A0=E8=BD=BD?=
=?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitignore | 26 ++++++++++++++++++++++++--
1 file changed, 24 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index d6212fc..3806f96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,24 @@
-/unpackage/
-/.idea/
+.DS_Store
+node_modules
+/dist
+
+/unpackage
+
+# local env files
+.env.local
+.env.*.local
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?