浏览代码

fix 设备图片

温红权 3 年之前
父节点
当前提交
892a099934
共有 2 个文件被更改,包括 41 次插入13 次删除
  1. 4 0
      ruoyi-ui/public/index.html
  2. 37 13
      ruoyi-ui/src/components/map/index.vue

+ 4 - 0
ruoyi-ui/public/index.html

@@ -198,6 +198,10 @@
         .el-tabs__header {
             margin: 0 !important;
         }
+        
+        .el-image-viewer__img {
+            min-height: 80%;
+        }
     </style>
 </head>
 

+ 37 - 13
ruoyi-ui/src/components/map/index.vue

@@ -55,6 +55,28 @@
             </el-row>
 
           </el-tab-pane>
+          <el-tab-pane label="设备图片" name="d_four">
+
+            <!-- <el-row  style="margin-top:3rem"> -->
+              <div v-if="deviceData.devicePhoto!=undefined && deviceData.devicePhoto.length>0">
+              <div  style="padding:10rem;display:inline-block;margin-top:5rem" v-for="item,idex in deviceData.devicePhoto" v-bind:key="index">
+                 <el-image
+                style="width: 60rem; height: 60rem"
+                :src="item"
+                :preview-src-list="deviceData.devicePhoto">
+            </el-image>
+              </div>
+              </div>
+              <div v-else >
+                  <div style="margin-top: 33rem;">该设备无图片</div>
+
+              </div>
+
+            <!-- </el-row> -->
+
+
+
+          </el-tab-pane>
           <el-tab-pane label="嫌疑船舶" name="d_second">
             <el-table :header-cell-style="{ background: '#e4eafc'}" ref="singleTable" :data="tabledatas" height="200px" highlight-current-row style="width: 100%;" class="tableSc">
               <el-table-column type="index" label="序号" width="50">
@@ -286,34 +308,34 @@
 
     <div class="icon_div">
       <div style="margin-top:5rem">
-        <div style="float:left;margin-left:5rem"><img src="../../assets/images/icon/zc.png"></img></div>
+        <div style="float:left;margin-left:5rem"><img src="../../assets/images/icon/zc.png" /></div>
         <div style="float:left;margin-left:8rem"><span class="line_font">正常船舶</span></div>
       </div>
       <br/>
       <div style="margin-top:8rem">
-        <div style="float:left;margin-left:5rem"><img src="../../assets/images/icon/xy.png"></img></div>
+        <div style="float:left;margin-left:5rem"><img src="../../assets/images/icon/xy.png" /></div>
         <div style="float:left;margin-left:8rem"><span class="line_font">嫌疑船舶</span></div>
       </div>
       <br/>
       <div style="margin-top:8rem">
-        <div style="float:left;margin-left:5rem"><img src="../../assets/images/icon/wg.png"></img></div>
+        <div style="float:left;margin-left:5rem"><img src="../../assets/images/icon/wg.png" /></div>
         <div style="float:left;margin-left:8rem"><span class="line_font">违规船舶</span></div>
       </div>
       <!-- <div style="margin-top:75rem"><div></div><span class="line_font">支路</span></div> -->
     </div>
     <div class="icon_div" style="right: 263rem;">
       <div style="margin-top:5rem">
-        <div style="float:left;margin-left:5rem"><img src="../../assets/images/icon/hy.png"></img></div>
+        <div style="float:left;margin-left:5rem"><img src="../../assets/images/icon/hy.png" /></div>
         <div style="float:left;margin-left:8rem"><span class="line_font">黑烟设备</span></div>
       </div>
       <br/>
       <div style="margin-top:8rem">
-        <div style="float:left;margin-left:5rem"><img src="../../assets/images/icon/ais.png"></img></div>
+        <div style="float:left;margin-left:5rem"><img src="../../assets/images/icon/ais.png" /></div>
         <div style="float:left;margin-left:8rem"><span class="line_font">嗅探设备</span></div>
       </div>
       <br/>
       <div style="margin-top:8rem">
-        <div style="float:left;margin-left:5rem"><img src="../../assets/images/icon/so2.png"></img></div>
+        <div style="float:left;margin-left:5rem"><img src="../../assets/images/icon/so2.png" /></div>
         <div style="float:left;margin-left:8rem"><span class="line_font">光谱设备</span></div>
       </div>
       <br/>
@@ -338,18 +360,18 @@
         <i class="el-icon-close" style="font-size:9rem;margin-top:2rem;float:right" @click="deviceTableShow=false"></i>
       </div>
       <div style="padding—left:10rem" class="shipContent">
-        <el-table :header-cell-style="{ background: '#e4eafc'}" ref="singleTable" :data="pointDevice.list" height="200px" highlight-current-row style="width: 100%;" class="tableSc">
+        <el-table :header-cell-style="{ background: '#e4eafc'}" ref="singleTable"  :data="pointDevice.list" height="241px" highlight-current-row style="width: 100%;" class="tableSc">
           <el-table-column type="index" label="序号" width="50">
           </el-table-column>
           <!--          <el-table-column property="monitorName" label="设备位置" width="100">-->
           <!--          </el-table-column>-->
           <el-table-column property="name" label="设备名称">
           </el-table-column>
-          <el-table-column property="deviceType" label="设备类型">
+          <el-table-column property="deviceType" label="设备类型" width="80">
           </el-table-column>
-          <el-table-column property="status" label="设备状态">
+          <el-table-column property="status" label="设备状态" width="80">
           </el-table-column>
-          <el-table-column property="orgName" label="管辖机构">
+          <el-table-column property="orgName" label="管辖机构" width="100">
           </el-table-column>
         </el-table>
       </div>
@@ -550,7 +572,7 @@ export default {
     handleClick1: function (tab, event) {
 
       var sect = tab.name;
-      if (sect == "d_first") {
+      if (sect == "d_first"||sect == "d_four") {
         return;
       }
 
@@ -1153,10 +1175,12 @@ export default {
   color: white;
   font-size: 7rem
 }
-
+.shipContent{
+  text-align: center;
+}
 .shipContent >>> .el-tabs__item {
   font-weight: bold;
-  color: #A8A8A8
+  color: #A8A8A8;
 }
 
 .shipContent >>> .el-tabs__item.is-active {