Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/views/board/equipment/index.vue

@@ -68,8 +68,19 @@
       <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'))]"
+            :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'))]"
+            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>
           <div style="position: absolute;left: 24%;top: 0px;width: 55%;height: 100%;">
@@ -80,6 +91,7 @@
               <div class="spanBg"></div>
               <div class="num">{{ i.deviceDataMap[val] }}</div>
             </div>
+
           </div>
           <div class="btn">
             <div class="btnC" style="top: 50%">
@@ -102,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
@@ -111,6 +124,7 @@ export default {
     return {
       defaultImg,
       defaultImg1,
+      defaultImg2,
       show: false,
       monitorUnitId: '',
       data1: true,

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