Merge remote-tracking branch 'origin/master'

src/views/museums/specimeninfo/index.vue

@@ -330,7 +330,6 @@
           plain
           @click="handleExport"
           :loading="exportLoading"
-
         >
           <Icon icon="ep:download" class="mr-5px" /> 导出
         </el-button>
@@ -388,19 +387,24 @@
       </el-table-column>
 <!--      <el-table-column label="备注" align="center" prop="notes" />-->
 <!--      <el-table-column label="图片名称" align="center" prop="imageName" />-->
-      <el-table-column label="图片" align="center" prop="url" width="110px">
+      <el-table-column label="图片" align="center" prop="url" >
         <template #default="{ row }">
-        <div class="demo-image__preview" v-if="queryParams">
+
+        <div class="demo-image__preview" v-if="queryParams" >
+          <block  v-for="(image, index) in row.imagePath" :key="index">
           <el-image
-            style="width: 40px; height:40px"
+            style="width: 40px; height:40px;margin-right: 5px"
             class="h-80px w-80px"
             lazy
-            :src="row.imagePath"
-            :preview-src-list="[row.imagePath]"
+            :src="image"
+            :preview-src-list="row.imagePath"
             preview-teleported
             fit="cover"
+
           />
+          </block>
         </div>
+
         </template>
       </el-table-column>
 <!--      <el-table-column label="创建时间" align="center" prop="createTime" />-->

src/views/museums/specimeninfo/specimenDetails.vue

@@ -25,19 +25,19 @@
                     specimenData.specimenNumber
                   }}
                 </el-descriptions-item>
-                <el-descriptions-item label="资产号:" label-align="right">{{
+                <el-descriptions-item label="资产号:" label-align="right" label-class-name="my-label" >{{
                     specimenData.assetNumber
                   }}
                 </el-descriptions-item>
-                <el-descriptions-item label="存放位置:" label-align="right">{{
+                <el-descriptions-item label="存放位置:" label-align="right" label-class-name="my-label" >{{
                     specimenData.storageLocation
                   }}
                 </el-descriptions-item>
-                <el-descriptions-item label="中文名称:" label-align="right">{{
+                <el-descriptions-item label="中文名称:" label-align="right" label-class-name="my-label" >{{
                     specimenData.chineseName
                   }}
                 </el-descriptions-item>
-                <el-descriptions-item label="英文名称:" label-align="right">{{
+                <el-descriptions-item label="英文名称:" label-align="right" label-class-name="my-label" >{{
                     specimenData.englishName
                   }}
                 </el-descriptions-item>
@@ -57,26 +57,26 @@
                 :size="size"
                 border
               >
-                <el-descriptions-item label="成分:"  label-align="right">{{
+                <el-descriptions-item label="成分:"  label-align="right" label-class-name="my-label" > {{
                     specimenData.composition
                   }}
                 </el-descriptions-item>
-                <el-descriptions-item label="产地:" label-align="right">{{
+                <el-descriptions-item label="产地:" label-align="right" label-class-name="my-label" >{{
                     specimenData.origin
                   }}
                 </el-descriptions-item>
-                <el-descriptions-item label="时代:" label-align="right">{{ specimenData.era }}</el-descriptions-item>
-                <el-descriptions-item label="保存地层:" label-width="100px" label-align="right">{{
+                <el-descriptions-item label="时代:" label-align="right" label-class-name="my-label" >{{ specimenData.era }}</el-descriptions-item>
+                <el-descriptions-item label="保存地层:" label-width="100px" label-align="right" label-class-name="my-label" >{{
                     specimenData.discoveryTime
                   }}
                 </el-descriptions-item>
-                <el-descriptions-item label="陨石类型:" label-width="100px" label-align="right">{{ specimenData.meteoriteType }}
+                <el-descriptions-item label="陨石类型:" label-width="100px" label-align="right" label-class-name="my-label" >{{ specimenData.meteoriteType }}
                 </el-descriptions-item>
-                <el-descriptions-item label="国际命名:" label-width="100px" label-align="right">{{
+                <el-descriptions-item label="国际命名:" label-width="100px" label-align="right" label-class-name="my-label" >{{
                     specimenData.internationalName
                   }}
                 </el-descriptions-item>
-                <el-descriptions-item label="重量(g):" label-width="100px" label-align="right">{{
+                <el-descriptions-item label="重量(g):" label-width="100px" label-align="right" label-class-name="my-label" >{{
                     specimenData.weight
                   }}
                 </el-descriptions-item>
@@ -95,18 +95,18 @@
                 :size="size"
                 border
               >
-                <el-descriptions-item label="保存类型">{{ preservationTypeText }}
+                <el-descriptions-item label="保存类型" label-class-name="my-label" >{{ preservationTypeText }}
                 </el-descriptions-item>
-                <el-descriptions-item label="来源">{{ sourceText }}</el-descriptions-item>
-                <el-descriptions-item label="标本提供者">{{
+                <el-descriptions-item label="来源" label-class-name="my-label" >{{ sourceText }}</el-descriptions-item>
+                <el-descriptions-item label="标本提供者" label-class-name="my-label" >{{
                     specimenData.provider
                   }}
                 </el-descriptions-item>
-                <el-descriptions-item label="发现时间">  {{
+                <el-descriptions-item label="发现时间" label-class-name="my-label" >  {{
                     specimenData.discoveryTime
                   }}
                 </el-descriptions-item>
-                <el-descriptions-item label="降落时间">{{
+                <el-descriptions-item label="降落时间" label-class-name="my-label" >{{
                     specimenData.fallTime
                   }}
                 </el-descriptions-item>
@@ -124,19 +124,19 @@
                 :size="size"
                 border
               >
-                <el-descriptions-item label="入馆时间">{{
+                <el-descriptions-item label="入馆时间" label-class-name="my-label" >{{
                     specimenData.acquisitionTime
                   }}
                 </el-descriptions-item>
-                <el-descriptions-item label="描述">{{
+                <el-descriptions-item label="描述" label-class-name="my-label" >{{
                     specimenData.description
                   }}
                 </el-descriptions-item>
-                <el-descriptions-item label="用途">{{
+                <el-descriptions-item label="用途" label-class-name="my-label" >{{
                     specimenData.purpose
                   }}
                 </el-descriptions-item>
-                <el-descriptions-item label="备注">{{
+                <el-descriptions-item label="备注" label-class-name="my-label" >{{
                     specimenData.notes
                   }}
                 </el-descriptions-item>
@@ -159,7 +159,7 @@
           <div class="demo-image__preview" v-if="specimenData ">
             <el-image
               style=" align-items: center"
-              :src="specimenData.imagePath"
+              :src="specimenData.imagePath[0]"
               :zoom-rate="1.2"
               :max-scale="7"
               :min-scale="0.2"
@@ -170,8 +170,8 @@
           </div>
 
           <div>
-            <el-space style="margin-top: 10px">
-              <div class="demo-image__preview" v-for="(url, index) in srcList"
+            <el-space style="margin-top: 10px"  v-if="specimenData ">
+              <div class="demo-image__preview" v-for="(url, index) in specimenData.imagePath"
                    :key="index">
                 <el-image
                   style="width: 50px; height: 40px"
@@ -179,8 +179,8 @@
                   :zoom-rate="1.2"
                   :max-scale="7"
                   :min-scale="0.2"
-                  :preview-src-list="srcList"
                   :initial-index="4"
+                  :preview-src-list="[url]"
                   fit="cover"
                 />
               </div>
@@ -276,12 +276,6 @@ const fetchData = async () => {
 
     specimenData.value = res
     console.log(specimenData.value)
-    // 假设res中的图片路径是以逗号分隔的字符串
-    // if (res && res.imagePath) {
-    //   srcList.value = res.imagePath.split(',');
-    //   url.value = srcList.value[0]; // 如果需要，可以设置默认图片URL
-    //   console.log(srcList.value);
-    // }
   }  finally {
   }
 }
@@ -383,7 +377,7 @@ const sourceText = computed(() => {
   color: #0f2438;
 }
 :deep(.my-label) {
-  background: var(--el-color-success-light-9) !important;
+  background: #FAF8F7 !important;
 }
 .label {
   display: inline-block;