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 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E6=98=BE=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

From 20d96e866d6e9783b41cf2acff9375831f246672 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:31:19 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E6=98=BE=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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ruoyi-ui/src/views/board/equipment/index.vue b/ruoyi-ui/src/views/board/equipment/index.vue
index 35902d8..1884e68 100644
--- a/ruoyi-ui/src/views/board/equipment/index.vue
+++ b/ruoyi-ui/src/views/board/equipment/index.vue
@@ -69,12 +69,11 @@
         <div class="iconBg"></div>
         <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%"
+            :preview-src-list="[i.deviceDataMap[Object.keys(i.deviceDataMap).find(e=> i.deviceDataMap[e].toString().includes('http'))]]"
             :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'))]]">
+            style="width: 100%; height: 100%">
           </el-image>
         </div>
         <div class="rightBg">
@@ -87,6 +86,7 @@
               <div class="spanBg"></div>
               <div class="num">{{ i.deviceDataMap[val] }}</div>
             </div>
+
           </div>
           <div class="btn">
             <div class="btnC" style="top: 50%">

From bbdc214485ec4f9d45aa96040b1c58ecb7b457d3 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 13:43:12 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/assets/board/equipment/defaultImg.png    | Bin 0 -> 4245 bytes
 ruoyi-ui/src/views/board/equipment/index.vue     |   7 +++++++
 2 files changed, 7 insertions(+)
 create mode 100644 ruoyi-ui/src/assets/board/equipment/defaultImg.png

diff --git a/ruoyi-ui/src/assets/board/equipment/defaultImg.png b/ruoyi-ui/src/assets/board/equipment/defaultImg.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee082552be8882ee51675d45f105ca15db6fd3a9
GIT binary patch
literal 4245
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

literal 0
HcmV?d00001

diff --git a/ruoyi-ui/src/views/board/equipment/index.vue b/ruoyi-ui/src/views/board/equipment/index.vue
index 1884e68..da75bc4 100644
--- a/ruoyi-ui/src/views/board/equipment/index.vue
+++ b/ruoyi-ui/src/views/board/equipment/index.vue
@@ -75,6 +75,11 @@
             :src="i.deviceDataMap[Object.keys(i.deviceDataMap).find(e=> i.deviceDataMap[e].toString().includes('http'))]"
             style="width: 100%; height: 100%">
           </el-image>
+          <el-image
+            v-else
+            :src="defaultImg2"
+            style="width: 100%; height: 100%">
+          </el-image>
         </div>
         <div class="rightBg">
           <div class="title">{{ i.deviceName }}</div>
@@ -109,6 +114,7 @@ import {
 } from '@/api/board/equipment'
 import defaultImg from '@/assets/board/equipment/icon.png'
 import defaultImg1 from '@/assets/board/equipment/icon2.png'
+import defaultImg2 from '@/assets/board/equipment/defaultImg.png'
 
 
 let getDeviceInterval = null
@@ -118,6 +124,7 @@ export default {
     return {
       defaultImg,
       defaultImg1,
+      defaultImg2,
       show: false,
       monitorUnitId: '',
       data1: true,