Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/views/components/table/homeTable.vue

@@ -111,7 +111,7 @@
               <el-table-column
                 property="name"
                 label="监测点"
-                width="60">
+                width="100">
               </el-table-column>
               <el-table-column
                 :label="'硫含量'"
@@ -154,7 +154,7 @@
               <el-table-column
                 property="name"
                 label="监测点"
-                width="60">
+                >
               </el-table-column>
               <el-table-column
                 :label="'SO2浓度'"
@@ -189,7 +189,7 @@
               </el-table-column>
               <el-table-column
                 property="date"
-                label="监测时间" width="90">
+                label="监测时间">
               </el-table-column>
             </el-table>
 

ruoyi-ui/src/views/components/table/liuTable.vue

@@ -167,7 +167,7 @@
       <!--       </el-form-item>-->
 
 
-      <el-form-item style="margin-left:10rem">
+      <el-form-item style="margin-left:1rem">
         <el-button icon="el-icon-search" size="mini" @click="getLiuLists" class="search">查询</el-button>
         <el-button icon="el-icon-upload2" size="mini" @click="" class="export">导出</el-button>
         <el-button icon="el-icon-setting" size="mini" @click="dialogVisible = true" class="export">阈值</el-button>

ruoyi-ui/src/views/components/table/xtTable.vue

@@ -144,17 +144,17 @@
         prop="rcgSoot"
         label="黑度等级">
       </el-table-column>
-      <!-- <el-table-column
+      <el-table-column
       prop="address"
       label="详情">
         <template slot-scope="scope">
-              <video style="width:40rem;height:40rem" controls="" autoplay="" name="media"><source src="http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4" type="video/mp4"></video>
+              <!-- <video style="width:40rem;height:40rem" controls="" autoplay="" name="media"><source src="http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4" type="video/mp4"></video> -->
         </template>
-    </el-table-column> -->
-      <!-- <el-table-column
-      prop="address"
+    </el-table-column>
+      <el-table-column
+      prop="orgName"
       label="管辖海事机构">
-    </el-table-column> -->
+    </el-table-column>
     </el-table>
 
     <pagination