fix

README.md

@@ -100,6 +100,7 @@ sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES
 - 三子系统ES中共同的字段：mmsi、shipName、destination、berthName、monitorPointName
 - 黑烟提供的接口文档地址：https://yx00mdxxzb.feishu.cn/docs/doccnv5xXUqxHYTqMyhj5UkQjPd#
 - 不过期的token： Authorization:Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjJiNzliMGJjLWIzYzktNDYzNi1hODRiLTQ2NGM2OGM5MTYxNSJ9.QHG8CoKPfGizflQAKXcl8et-PpNdmmwRCwGRnt4jgRkwmZaiG5c4ibNg_oVD1XBL2XIU-oVlkHHRoot4g8Zy6w
+- VPN堡垒机:zhaohx-gangfeng/Xt@123456 访问地址：172.17.25.199
 
 > 服务器启动
 

ruoyi-ui/src/components/map/index.vue

@@ -200,7 +200,7 @@
               <el-table-column
                 :label="'黑度'">
                 <template slot-scope="scope">
-                  <div v-if="scope.row.rcgSoot!=null && scope.row.rcgSoot > normalCount" style="color:red">
+                  <div v-if="scope.row.rcgSoot!=null && scope.row.rcgSoot >= normalCount" style="color:red">
                     {{ scope.row.rcgSoot }}度 ↑ {{ ((scope.row.rcgSoot - normalCount) / normalCount * 100).toFixed(0) }}%
                   </div>
                   <div v-if="scope.row.rcgSoot!=null &&  scope.row.rcgSoot < normalCount">正常</div>
@@ -341,11 +341,11 @@
         <el-table :header-cell-style="{ background: '#e4eafc'}" ref="singleTable" :data="pointDevice.list" height="200px" 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 property="monitorName" label="设备位置" width="100">-->
+          <!--          </el-table-column>-->
+          <el-table-column property="name" label="设备名称">
           </el-table-column>
-          <el-table-column property="name" label="设备名称" width="100">
-          </el-table-column>
-          <el-table-column property="deviceType" label="设备类型" width="100">
+          <el-table-column property="deviceType" label="设备类型">
           </el-table-column>
           <el-table-column property="status" label="设备状态">
           </el-table-column>
@@ -575,6 +575,8 @@ export default {
 
       that.pointDevice.list = that.deviceList[value];
       that.deviceTableShow = true;
+      that.deviceShow = false;
+      that.shipShow = false;
       that.pointDevice.name = value;
       that.addrlist.forEach(element => {
         if (element.name == value) {

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

@@ -79,19 +79,21 @@
         @open="openShipChart">
         <div style="position:absolute;z-index:3001">
           <div style="float:left;color:#ffffff">开始</div>
-          <div style="float:left;margin-left:3rem">
+          <div style="float:left;margin-left:3rem;width: 55rem;">
             <el-date-picker
               @change='getSo2Time'
               value-format='yyyy-MM'
               v-model="shipDate.startMonth"
+              size="small"
               type="month"
               placeholder="选择月份">
             </el-date-picker>
           </div>
           <div style="float:left;margin-left:3rem;color:#ffffff">结束</div>
-          <div style="float:left;margin-left:3rem">
+          <div style="float:left;margin-left:3rem;width: 55rem;">
             <el-date-picker
               v-model="shipDate.endMonth"
+              size="small"
               @change='getSo2Time'
               value-format='yyyy-MM'
               type="month"
@@ -142,7 +144,7 @@ export default {
       dialogVisibleAzwz: false,
       dialogVisibleType: false,
       normalCount: 1,
-      reqcount:0,
+      reqcount: 0,
       dialogVisibleShip: false,
       beginTime: '',
       lastdatep: 0,
@@ -238,9 +240,9 @@ export default {
 
     }, 5 * 60 * 1000);
     setInterval(() => {
-      if(that.reqcount>0){
-         that.lastdatep=new Date().valueOf()-11000;
-         that.getallshipData();
+      if (that.reqcount > 0) {
+        that.lastdatep = new Date().valueOf() - 11000;
+        that.getallshipData();
       }
 
     }, 5000);
@@ -335,7 +337,7 @@ export default {
 
       var cdatep = new Date().valueOf();
       if (cdatep - this.lastdatep > 10000) {
-        this.reqcount=0;
+        this.reqcount = 0;
         this.lastdatep = cdatep;
       } else {
         this.reqcount++;

ruoyi-ui/src/views/home.vue

@@ -106,12 +106,24 @@
       </div>
     </div>
     <div style="position: absolute;right: 0;color: #3FC9FD;top: 28rem;font-size: 9rem;">
-      <div style="display: inline-block;margin-right:6rem"><a target="view_window" :href="gosubsys('http://198.17.188.56:9020/door','manager','admin123',1)"><img style="width:20px;vertical-align: middle;margin-right:2px"
-                                                                                                                                                                  src="../assets/images/txsb_selected@2x.png"/>光谱</a></div>
+      <div style="display: inline-block;margin-right:6rem">
+        <a target="view_window" :href="gosubsys('http://198.17.188.56:9020/door','manager','admin123',1)">
+          <img style="width:20px;vertical-align: middle;margin-right:2px" src="../assets/images/txsb_selected@2x.png"/>光谱
+        </a>
+      </div>
       <div
-        style="display: inline-block;margin-right:6rem"><a target="view_window" :href="gosubsys('http://198.17.188.2:83/index.html','js_admin','js@123456',1)"><img style="width:20px;vertical-align: middle;margin-right:2px"
-                                                                                                                                                                    src="../assets/images/gpsb@2x.png"/>嗅探</a></div>
-      <div style="display: inline-block;margin-right:20rem"><a target="view_window" :href="gosubsys('http://198.17.23.29:8090','admin','word',1)"><img style="width:20px;vertical-align: middle;margin-right:2px" src="../assets/images/heiyan@2x.png"/>黑烟</a>
+        style="display: inline-block;margin-right:6rem">
+        <a target="view_window" :href="gosubsys('http://198.17.188.2:83/index.html','js_admin','js@123456',1)">
+          <img style="width:20px;vertical-align: middle;margin-right:2px" src="../assets/images/gpsb@2x.png"/>嗅探
+        </a></div>
+      <div style="display: inline-block;margin-right:9rem">
+        <a target="view_window" :href="gosubsys('http://198.17.23.29:8090','admin','word',1)">
+          <img style="width:20px;vertical-align: middle;margin-right:2px" src="../assets/images/heiyan@2x.png"/>黑烟
+        </a>
+      </div>
+      <div style="display: inline-block;margin-right:20rem;cursor: pointer" @click="logout">
+        <img style="width:20px;vertical-align: middle;margin-right:2px" src="../assets/images/logout.png"/>
+        <span>注销</span>
       </div>
     </div>
     <div class="center_content">
@@ -229,6 +241,18 @@ export default {
     clickMenu(event) {
       console.log(1111)
       console.log(event)
+    },
+    async logout() {
+      this.$confirm('确定注销并退出系统吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.$store.dispatch('LogOut').then(() => {
+          location.href = '/home';
+        })
+      }).catch(() => {
+      });
     }
   }
 }