From 28cf30d594e8d3b931d90a66017ca78a5011d061 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Tue, 17 Oct 2023 11:01:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/board/equipment/index.vue | 11 +++++++++--
 ruoyi-ui/src/views/board/senso/index.vue     | 12 +++++++++++-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/ruoyi-ui/src/views/board/equipment/index.vue b/ruoyi-ui/src/views/board/equipment/index.vue
index f06ecd1..35902d8 100644
--- a/ruoyi-ui/src/views/board/equipment/index.vue
+++ b/ruoyi-ui/src/views/board/equipment/index.vue
@@ -68,8 +68,15 @@
       <div v-for="i in acquisitionList" class="item">
         <div class="iconBg"></div>
         <div
-          :style="'background-image: url('+i.deviceDataMap[Object.keys(i.deviceDataMap).find(e=> i.deviceDataMap[e].toString().includes('http'))] ? i.deviceDataMap[Object.keys(i.deviceDataMap).find(e=> i.deviceDataMap[e].toString().includes('http'))]:''+')'"
-          class="icon"></div>
+          class="icon">
+
+          <el-image
+            v-if="i.deviceDataMap[Object.keys(i.deviceDataMap).find(e=> i.deviceDataMap[e].toString().includes('http'))]"
+            style="width: 100%; height: 100%"
+            :src="i.deviceDataMap[Object.keys(i.deviceDataMap).find(e=> i.deviceDataMap[e].toString().includes('http'))]"
+            :preview-src-list="[i.deviceDataMap[Object.keys(i.deviceDataMap).find(e=> i.deviceDataMap[e].toString().includes('http'))]]">
+          </el-image>
+        </div>
         <div class="rightBg">
           <div class="title">{{ i.deviceName }}</div>
           <div style="position: absolute;left: 24%;top: 0px;width: 55%;height: 100%;">
diff --git a/ruoyi-ui/src/views/board/senso/index.vue b/ruoyi-ui/src/views/board/senso/index.vue
index 17574ce..77f6bfb 100644
--- a/ruoyi-ui/src/views/board/senso/index.vue
+++ b/ruoyi-ui/src/views/board/senso/index.vue
@@ -57,7 +57,17 @@
                 <el-table v-if="show" :cell-style="setStyle"
                           :data="tableData" :header-cell-style="{ textAlign: 'center',backgroundColor:'#0a457d' }"
                           style="width: 100%;margin-top: 12px;">
-                  <el-table-column v-for="i in deviceDataColumns" :label="i.columnName" :prop="i.columnKey">
+                  <el-table-column v-for="i in deviceDataColumns" :label="i.columnName" :prop="i.columnKey">\
+                    <template slot-scope="scope">
+                      <el-image
+                        v-if="scope.row[i.columnKey].includes('http')"
+                        style="width: 100px; height: 100px"
+                        :src="scope.row[i.columnKey]"
+                        :preview-src-list="[scope.row[i.columnKey]]">
+                      </el-image>
+                      <span v-else>{{scope.row[i.columnKey]}}</span>
+
+                    </template>
                   </el-table-column>
                 </el-table>
                 <el-pagination v-show="!isMap" :currentPage="currentPage" :pageSize="10" :total="total" background