From a989857c26172b81e856584debe5c79745e50f6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=95=E5=B5=A9?= <17854119262@163.com>
Date: Fri, 25 Jul 2025 17:27:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AA=92=E4=BD=93=E5=BA=93-=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=92=8C=E5=8E=86=E5=8F=B2=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84-=E7=BC=A9=E7=95=A5=E5=9B=BE=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/demo/system/mediaLibrary/index.vue        |  4 ++--
 .../demo/system/mediaLibrary/path/pathImageInfo.vue | 13 +++++++++----
 src/views/demo/system/mediaLibrary/path/pathMap.vue |  5 ++++-
 src/views/demo/system/mediaLibrary/preview/Map.vue  |  6 +++++-
 .../system/mediaLibrary/preview/previewImage.vue    |  2 +-
 5 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/views/demo/system/mediaLibrary/index.vue b/src/views/demo/system/mediaLibrary/index.vue
index 0f0df88..f7fa148 100644
--- a/src/views/demo/system/mediaLibrary/index.vue
+++ b/src/views/demo/system/mediaLibrary/index.vue
@@ -39,7 +39,7 @@
               />
               <img
                 v-if="record.objectKey && record.objectKey.includes('jpeg')"
-                :src="VITE_MEDIALIBRARY_IMAGE_URL + record.objectKey"
+                :src="`${VITE_MEDIALIBRARY_IMAGE_URL + (record.minipic ? record.minipic : record.objectKey)}`"
                 :width="30"
                 :height="20"
               />
@@ -157,7 +157,7 @@
           />
           <img
             v-if="record.objectKey"
-            :src="VITE_MEDIALIBRARY_IMAGE_URL + record.objectKey"
+            :src="`${VITE_MEDIALIBRARY_IMAGE_URL + (record.minipic ? record.minipic : record.objectKey)}`"
             :width="60"
             :height="40"
             @click="lookRecord(record)"
diff --git a/src/views/demo/system/mediaLibrary/path/pathImageInfo.vue b/src/views/demo/system/mediaLibrary/path/pathImageInfo.vue
index 06b7fda..a382de9 100644
--- a/src/views/demo/system/mediaLibrary/path/pathImageInfo.vue
+++ b/src/views/demo/system/mediaLibrary/path/pathImageInfo.vue
@@ -490,13 +490,18 @@
         </div>
       </div>
       <div class="imageChooseList">
-        <div v-for="li in props.allImageDataList" :key="li.id" @click="setNowShowImageData(li)">
+        <div
+          v-for="li in props.allImageDataList.filter(
+            (item) => item.display == 1 && item.showOnMap == 1,
+          )"
+          :key="li.id"
+          @click="setNowShowImageData(li)"
+        >
           <div :class="li.id == props.nowShowImageData.id ? 'bottom_div_choose' : 'bottom_div'">
             <img
-              v-if="li.display == 1 && li.showOnMap == 1"
               :src="
-                li.preview_url
-                  ? li.preview_url
+                props.nowShowImageData.minipic
+                  ? VITE_MEDIALIBRARY_IMAGE_URL + li.minipic
                   : 'https://m.tuniucdn.com/fb2/t1/G5/M00/44/52/Cii-s1soezyIF2UxABn76u-yKl8AAIwBgB34jAAGfwC3020871'
               "
               width="75"
diff --git a/src/views/demo/system/mediaLibrary/path/pathMap.vue b/src/views/demo/system/mediaLibrary/path/pathMap.vue
index 8d613cd..404e057 100644
--- a/src/views/demo/system/mediaLibrary/path/pathMap.vue
+++ b/src/views/demo/system/mediaLibrary/path/pathMap.vue
@@ -373,9 +373,12 @@
       if (item.lng && item.lat && item.absoluteAltitude && item.showOnMap == 1) {
         const image = new Image();
         image.crossOrigin = 'Anonymous';
-        // image.src = VITE_MEDIALIBRARY_IMAGE_URL + item.minipic;
+        // if (item.minipic) {
+        //   image.src = VITE_MEDIALIBRARY_IMAGE_URL + item.minipic;
+        // } else {
         image.src =
           'https://m.tuniucdn.com/fb2/t1/G5/M00/44/52/Cii-s1soezyIF2UxABn76u-yKl8AAIwBgB34jAAGfwC3020871';
+        // }
         image.onload = () => {
           // 创建Canvas元素
           const canvas = document.createElement('canvas');
diff --git a/src/views/demo/system/mediaLibrary/preview/Map.vue b/src/views/demo/system/mediaLibrary/preview/Map.vue
index 2bceec1..9aa6af3 100644
--- a/src/views/demo/system/mediaLibrary/preview/Map.vue
+++ b/src/views/demo/system/mediaLibrary/preview/Map.vue
@@ -319,9 +319,13 @@
       if (item.lng && item.lat && item.absoluteAltitude) {
         const image = new Image();
         image.crossOrigin = 'Anonymous';
-        // image.src = VITE_MEDIALIBRARY_IMAGE_URL + item.minipic;
+        // if (item.minipic) {
+        //   image.src = VITE_MEDIALIBRARY_IMAGE_URL + item.minipic;
+        // } else {
         image.src =
           'https://m.tuniucdn.com/fb2/t1/G5/M00/44/52/Cii-s1soezyIF2UxABn76u-yKl8AAIwBgB34jAAGfwC3020871';
+        // }
+
         image.onload = () => {
           // 创建Canvas元素
           const canvas = document.createElement('canvas');
diff --git a/src/views/demo/system/mediaLibrary/preview/previewImage.vue b/src/views/demo/system/mediaLibrary/preview/previewImage.vue
index 8ff1451..bf096e2 100644
--- a/src/views/demo/system/mediaLibrary/preview/previewImage.vue
+++ b/src/views/demo/system/mediaLibrary/preview/previewImage.vue
@@ -400,7 +400,7 @@
             :class="li.id == props.nowPreviewRecord.id ? 'bottom_div_choose' : 'bottom_div'"
           >
             <img
-              :src="VITE_MEDIALIBRARY_IMAGE_URL + li.objectKey"
+              :src="VITE_MEDIALIBRARY_IMAGE_URL + (li.minipic ? li.minipic : li.objectKey)"
               loading="lazy"
               :width="60"
               :height="35"