From 3f2b5f1dd9c642bb9c1812dce3e90b030584f45b Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期一, 04 三月 2024 15:10:59 +0800
Subject: [PATCH] fix:修改路径问题

---
 src/views/daoAnOffice/right/publicize/index.vue |   14 +++++--
 src/views/daoAnOffice/center/map.vue            |   28 +++++++++----
 src/utils/require.js                            |    3 -
 src/views/daoAnOffice/right/danger/infoView.vue |   40 +++++++++++---------
 4 files changed, 52 insertions(+), 33 deletions(-)

diff --git a/src/utils/require.js b/src/utils/require.js
index 27709ce..4126729 100644
--- a/src/utils/require.js
+++ b/src/utils/require.js
@@ -1,7 +1,6 @@
 export const require = (imgPath) => {
   try {
-    const handlePath = imgPath.replace('@', '..');
-    return new URL(handlePath, import.meta.url).href;
+    return new URL(imgPath, import.meta.url).href;
   } catch(err) {
     console.warn(err);
   }
diff --git a/src/views/daoAnOffice/center/map.vue b/src/views/daoAnOffice/center/map.vue
index 2adb5ef..eb4fa85 100644
--- a/src/views/daoAnOffice/center/map.vue
+++ b/src/views/daoAnOffice/center/map.vue
@@ -35,6 +35,16 @@
 
 import { require } from '@/utils/require.js';
 
+import icon1 from '@/assets/img/sgyfd.png';
+import icon2 from '@/assets/img/zdlytd.png';
+import icon3 from '@/assets/img/djyjq.png';
+import icon4 from '@/assets/img/jlpb.png';
+import icon5 from '@/assets/img/dwsg.png';
+import icon6 from '@/assets/img/jtysqy.png';
+import icon7 from '@/assets/img/zdlytd.png';
+import icon8 from '@/assets/img/gjxl.png';
+import icon9 from '@/assets/img/aqyh.png';
+
 
 const map = ref(null);
 let mapInstance = null;
@@ -53,7 +63,7 @@
     name: '浜嬫晠鏄撳彂澶氬彂璺',
     num: 78,
     type: 1,
-    icon: require('@/assets/img/sgyfd.png'),
+    icon: icon1,
     positions: [[103.647593, 30.981856], [103.646627, 30.988235], [103.650077, 30.988074]],
     isActive: false
   },
@@ -63,7 +73,7 @@
     type: 2,
     num: 178,
     positions: [[103.647888, 30.985006], [103.650983, 30.986252], [103.641461, 30.984588]],
-    icon: require('@/assets/img/zdlytd.png'),
+    icon: icon2,
     isActive: false
   },
   {
@@ -72,7 +82,7 @@
     num: 278,
     positions: [[103.637916, 30.986298], [103.636751, 30.989508], [103.64093, 30.99344]],
     type: 3,
-    icon: require('@/assets/img/djyjq.png'),
+    icon: icon3,
     isActive: false
   },
   {
@@ -81,7 +91,7 @@
     num: 348,
     positions: [[103.646413, 30.996714], [103.634337, 31.0026], [103.620841, 31.001253]],
     type: 4,
-    icon: require('@/assets/img/jlpb.png'),
+    icon: icon4,
     isActive: false
   },
   {
@@ -90,7 +100,7 @@
     num: 578,
     positions: [[103.62134, 30.996972], [103.622005, 30.991923], [103.63062, 30.986588]],
     type: 5,
-    icon: require('@/assets/img/dwsg.png'),
+    icon: icon5,
     isActive: false
   },
   {
@@ -99,7 +109,7 @@
     num: 788,
     positions: [[103.640319, 30.984486], [103.644916, 30.986956], [103.646853, 30.992143]],
     type: 1,
-    icon: require('@/assets/img/jtysqy.png'),
+    icon: icon6,
     isActive: false
   },
   {
@@ -108,7 +118,7 @@
     num: 758,
     positions: [[103.651482, 30.995956], [103.639654, 30.995206], [103.631119, 30.987425]],
     type: 7,
-    icon: require('@/assets/img/zdlytd.png'),
+    icon: icon7,
     isActive: false
   },
   {
@@ -117,7 +127,7 @@
     num: 758,
     positions: [[103.652716, 30.974745], [103.668166, 30.976447], [103.672511, 30.979961]],
     type: 8,
-    icon: require('@/assets/img/gjxl.png'),
+    icon: icon8,
     isActive: false
   },
   {
@@ -126,7 +136,7 @@
     num: 718,
     positions: [[103.674056, 30.988625], [103.668155, 30.996379], [103.660333, 30.998098]],
     type: 9,
-    icon: require('@/assets/img/aqyh.png'),
+    icon: icon9,
     isActive: false
   },
 
diff --git a/src/views/daoAnOffice/right/danger/infoView.vue b/src/views/daoAnOffice/right/danger/infoView.vue
index 1cd21ee..5b8d89b 100644
--- a/src/views/daoAnOffice/right/danger/infoView.vue
+++ b/src/views/daoAnOffice/right/danger/infoView.vue
@@ -39,6 +39,10 @@
 <script setup>
 import { require } from '@/utils/require.js';
 
+import Test1 from '@/assets/img/test_img/t1.jpg';
+import Test2 from '@/assets/img/test_img/t2.png';
+import Test3 from '@/assets/img/test_img/t3.png';
+
 import ImageSwiper from './imageSwiper.vue';
 import { ref } from 'vue';
 
@@ -51,12 +55,12 @@
     rectTime: '2023-13-23',
     state: '鎶慨涓�',
     images: [
-      require('@/assets/img/test_img/t1.jpg'),
-      require('@/assets/img/test_img/t2.png'),
-      require('@/assets/img/test_img/t3.png'),
-      require('@/assets/img/test_img/t1.jpg'),
-      require('@/assets/img/test_img/t2.png'),
-      require('@/assets/img/test_img/t3.png'),
+      Test1,
+      Test2,
+      Test3,
+      Test1,
+      Test2,
+      Test3,
     ]
   },
   {
@@ -67,12 +71,12 @@
     rectTime: '2023-13-23',
     state: '鎶慨涓�',
     images: [
-      require('@/assets/img/test_img/t1.jpg'),
-      require('@/assets/img/test_img/t2.png'),
-      require('@/assets/img/test_img/t3.png'),
-      require('@/assets/img/test_img/t1.jpg'),
-      require('@/assets/img/test_img/t2.png'),
-      require('@/assets/img/test_img/t3.png'),
+      Test1,
+      Test2,
+      Test3,
+      Test1,
+      Test2,
+      Test3,
     ]
   },
   {
@@ -83,12 +87,12 @@
     rectTime: '2023-13-23',
     state: '鎶慨涓�',
     images: [
-      require('@/assets/img/test_img/t1.jpg'),
-      require('@/assets/img/test_img/t2.png'),
-      require('@/assets/img/test_img/t3.png'),
-      require('@/assets/img/test_img/t1.jpg'),
-      require('@/assets/img/test_img/t2.png'),
-      require('@/assets/img/test_img/t3.png'),
+      Test1,
+      Test2,
+      Test3,
+      Test1,
+      Test2,
+      Test3,
     ]
   }
 ]);
diff --git a/src/views/daoAnOffice/right/publicize/index.vue b/src/views/daoAnOffice/right/publicize/index.vue
index 6a7d87b..264468d 100644
--- a/src/views/daoAnOffice/right/publicize/index.vue
+++ b/src/views/daoAnOffice/right/publicize/index.vue
@@ -43,6 +43,12 @@
 <script setup>
 import { require } from '@/utils/require.js';
 
+import Test1 from '@/assets/img/test_img/t4.jpg';
+import Test2 from '@/assets/img/test_img/t5.jpg';
+import Test3 from '@/assets/img/test_img/t6.jpg';
+import Test4 from '@/assets/img/test_img/t7.jpg';
+
+
 import RightTitle from "@/components/right-title";
 import { ref } from 'vue';
 
@@ -63,7 +69,7 @@
     unit: '閮芥睙鍫板競鍏畨灞�',
     rectTime: '2023-13-23',
     state: '鎶慨涓�',
-    image: require('@/assets/img/test_img/t4.jpg'),
+    image: Test1,
   },
   {
     itemIndex: 2,
@@ -72,7 +78,7 @@
     unit: '閮芥睙鍫板競鍏畨灞�',
     rectTime: '2023-13-23',
     state: '鎶慨涓�',
-    image: require('@/assets/img/test_img/t5.jpg'),
+    image: Test2,
   },
   {
     itemIndex: 3,
@@ -81,7 +87,7 @@
     unit: '閮芥睙鍫板競鍏畨灞�',
     rectTime: '2023-13-23',
     state: '鎶慨涓�',
-    image: require('@/assets/img/test_img/t6.jpg'),
+    image: Test3,
   },
   {
     itemIndex: 4,
@@ -90,7 +96,7 @@
     unit: '閮芥睙鍫板競鍏畨灞�',
     rectTime: '2023-13-23',
     state: '鎶慨涓�',
-    image: require('@/assets/img/test_img/t7.jpg'),
+    image: Test4,
   },
 ]);
 

--
Gitblit v1.8.0