From 69af2b03fbf5bbd13a018acd4fcb0a1f191f4dcd Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 18 二月 2025 10:54:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 src/components/Table/lims-table.vue |   33 +++++++++++++++++++--------------
 1 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/components/Table/lims-table.vue b/src/components/Table/lims-table.vue
index 84e3c1b..bf7a97b 100644
--- a/src/components/Table/lims-table.vue
+++ b/src/components/Table/lims-table.vue
@@ -77,6 +77,11 @@
             <div v-else-if="item.dataType == 'progress'">
               <el-progress :percentage="Number(scope.row[item.prop])" />
             </div>
+            <!-- 鍥剧墖 -->
+            <div v-else-if="item.dataType == 'image'">
+              <img :src="javaApi+'/img/'+item.prop"
+                   alt="" style="width: 40px;height: 40px;margin-top: 10px;">
+            </div>
 
             <!-- tag -->
             <div v-else-if="item.dataType == 'tag'">
@@ -323,21 +328,21 @@
       default() {
         return [];
       },
-      rowKey: {
-        type: String,
-        default: undefined
+    },
+    rowKey: {
+      type: String,
+      default: undefined,
+    },
+    page: {
+      type: Object,
+      default() {
+        return {
+          total: 0,
+          current: 0,
+          size: 10,
+          layout: "total, sizes, prev, pager, next, jumper",
+        };
       },
-      page:{
-        type:Object,
-        default() {
-          return {
-            total:0,
-            current:0,
-            size:10,
-            layout: 'total, sizes, prev, pager, next, jumper'
-          };
-        }
-      }
     },
   },
 

--
Gitblit v1.9.3