修改图片显示

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

@@ -89,20 +89,27 @@
         <!--        </div>-->
         <div class="rightBg">
           <div class="index">{{ k + 1 }}</div>
-          <div class="title">{{ i.deviceName }}</div>
+          <div class="title" style="text-align: center">
+            <span style="line-height: calc(10vh - 40px)">
+              {{ i.deviceName }}
+            </span>
+
+            <div class="num" style="line-height: 20px">{{ i.updateTime.split(' ')[0] }}</div>
+            <div class="num" style="line-height: 20px">{{ i.updateTime.split(' ')[1] }}</div>
+          </div>
           <div style="position: absolute;left: 27%;top: 0px;width: 45%;height: 100%;">
             <div style="width: 100%; height: 100%" v-if="Object.keys(i.deviceDataMap).find(e=>(i.deviceDataMap[e].toString().includes('http')))">
               <el-image
                   fit="contain"
-                  style="width: 100%; height: calc(100% - 20px)"
+                  style="width: 100%; height: calc(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 class="infoItem" style="width: 100%;height: 20px">
+              <!--              <div class="infoItem" style="width: 100%;height: 20px;text-align: center">-->
-                <div class="span" style="line-height: 20px"> 时间 :</div>
+              <!--                <div class="span" style="line-height: 20px"> 时间 :</div>-->
-                <div class="spanBg" style="line-height: 20px;height: 20px"></div>
+              <!--                <div class="spanBg" style="line-height: 20px;height: 20px"></div>-->
-                <div class="num" style="line-height: 20px">{{ i.updateTime }}</div>
+              <!--                <div class="num" style="line-height: 20px">{{ i.updateTime }}</div>-->
-              </div>
+              <!--              </div>-->
             </div>
             <div v-if="!Object.keys(i.deviceDataMap).find(e=>(i.deviceDataMap[e].toString().includes('http')))">
               <div
@@ -112,11 +119,11 @@
                 <div class="spanBg"></div>
                 <div class="num">{{ i.deviceDataMap[val] }}</div>
               </div>
-              <div class="infoItem" style="width: 100%">
+              <!--              <div class="infoItem" style="width: 100%">-->
-                <div class="span"> 时间 :</div>
+              <!--                <div class="span"> 时间 :</div>-->
-                <div class="spanBg"></div>
+              <!--                <div class="spanBg"></div>-->
-                <div class="num">{{ i.updateTime }}</div>
+              <!--                <div class="num">{{ i.updateTime }}</div>-->
-              </div>
+              <!--              </div>-->
             </div>
 
           </div>
@@ -164,8 +171,8 @@
           width="50">
         </el-table-column>
         <el-table-column
-          v-for="i in Object.keys(historyTh)"
+            v-for="i in Object.keys(historyTh)"
-          v-if="historyTh[i]"
+          v-if="historyTh[i] && historyTh[i] !== '时间'"
           :prop="i"
           :label="historyTh[i]"
           >
@@ -183,6 +190,13 @@
             <div v-else>{{ scope.row[i] }}</div>
           </template>
         </el-table-column>
+        <el-table-column
+            label="时间"
+        >
+          <template slot-scope="scope">
+            <div  >{{ parseTime(scope.row['ts']) }}</div>
+          </template>
+        </el-table-column>
       </el-table>
       <pagination
         v-if="isHistoryTable"