fix bug

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

@@ -58,24 +58,23 @@
           <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 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>
+            <div v-else>
+              <div style="margin-top: 33rem;">该设备无图片</div>
 
-              </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">
@@ -308,34 +307,34 @@
 
     <div class="icon_div">
       <div style="margin-top:5rem">
-        <div style="float:left;margin-left:5rem"><img src="../../assets/images/icon/zc.png" /></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" /></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" /></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" /></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" /></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" /></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/>
@@ -360,7 +359,7 @@
         <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="241px" 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">-->
@@ -454,21 +453,21 @@ export default {
         rePlay: false,
         isLive: true, //切换为直播流的时候必填
         format: 'm3u8', //切换为直播流的时候必填
-        skinLayout:[
-    {name: "bigPlayButton", align: "blabs", x: 30, y: 80},
-    {name: "errorDisplay", align: "tlabs", x: 0, y: 0},
-    {name: "infoDisplay", align: "cc"},
-    {
-      name: "controlBar", align: "blabs", x: 0, y: 0,
-      children: [
-          {name:"liveDisplay", align:"tlabs", x: 15, y:5},
-          {name:"fullScreenButton", align:"tr",  x:10, y:13},
-          {name:"volume", align:"tr",  x:10, y:10}
+        skinLayout: [
+          {name: "bigPlayButton", align: "blabs", x: 30, y: 80},
+          {name: "errorDisplay", align: "tlabs", x: 0, y: 0},
+          {name: "infoDisplay", align: "cc"},
+          {
+            name: "controlBar", align: "blabs", x: 0, y: 0,
+            children: [
+              {name: "liveDisplay", align: "tlabs", x: 15, y: 5},
+              {name: "fullScreenButton", align: "tr", x: 10, y: 13},
+              {name: "volume", align: "tr", x: 10, y: 10}
+            ]
+          }
         ]
-    }
-  ]
       },
-      source: "http://47.105.123.104:28080/60c9ae6c-e5ca4b81/2/20211209182435000.mp4",
+      source: "",
       pointDevice: {
         name: '',
         list: [],
@@ -585,7 +584,7 @@ export default {
     handleClick1: function (tab, event) {
 
       var sect = tab.name;
-      if (sect == "d_first"||sect == "d_four") {
+      if (sect == "d_first" || sect == "d_four") {
         return;
       }
 
@@ -1188,9 +1187,11 @@ export default {
   color: white;
   font-size: 7rem
 }
-.shipContent{
+
+.shipContent {
   text-align: center;
 }
+
 .shipContent >>> .el-tabs__item {
   font-weight: bold;
   color: #A8A8A8;

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

@@ -52,7 +52,7 @@
             <img src="@/assets/images/return.png" class="icon_size"/>
           </div>
           <div id="myChart" style="width:250rem;height:145rem;float:left"></div>
-          <div @click="next" style="float:left;margin-top:60rem">
+          <div @click="next" style="float:left;margin-top:60rem" v-show="nextFlag">
             <img src="@/assets/images/next.png" class="icon_size"/>
           </div>
         </div>
@@ -64,7 +64,7 @@
             <img src="@/assets/images/return.png" class="icon_size"/>
           </div>
           <div id="hyChart" style="width:250rem;height:145rem;float:left"></div>
-          <div @click="hynext" style="float:left;margin-top:60rem">
+          <div @click="hynext" style="float:left;margin-top:60rem" v-show="nextFlag2">
             <img src="@/assets/images/next.png" class="icon_size"/>
           </div>
         </div>
@@ -84,6 +84,8 @@ export default {
   name: "Statistical",
   data() {
     return {
+      nextFlag: false,
+      nextFlag2: false,
       months: [],
       hyMonths: [],
       liuDate: new Date(),
@@ -156,7 +158,14 @@ export default {
       });
     },
     back() {
+      var myDate = new Date();
+      var tYear = myDate.getFullYear();
       var year = parseInt(this.months[0].split("-")[0])
+
+      if (parseInt(tYear) >= year) {
+        this.nextFlag = true;
+      }
+
       var month = parseInt(this.months[0].split("-")[1])
       this.months = [];
       if (month > 5) {
@@ -175,7 +184,13 @@ export default {
       this.drawLine();
     },
     next() {
-      var year = parseInt(this.months[0].split("-")[0])
+      var myDate = new Date();
+      var tYear = myDate.getFullYear();
+      if (tYear == parseInt(this.months[this.months.length - 1].split("-")[0])) {
+        this.nextFlag = false;
+      }
+
+      var year = parseInt(this.months[0].split("-")[0]);
       var month = parseInt(this.months[0].split("-")[1])
       this.months = [];
       if (month > 5) {
@@ -187,14 +202,19 @@ export default {
           if (m < 10) {
             this.months.push(year + "-" + "0" + m);
           } else {
-            this.months.push(year - 1 + "-" + m);
+            this.months.push(year + "-" + m);
           }
         }
       }
       this.drawLine();
     },
     hyback() {
+      var myDate = new Date();
+      var tYear = myDate.getFullYear();
       var year = parseInt(this.hyMonths[0].split("-")[0])
+      if (parseInt(tYear) >= year) {
+        this.nextFlag2 = true;
+      }
       var month = parseInt(this.hyMonths[0].split("-")[1])
       this.hyMonths = [];
       if (month > 5) {
@@ -213,6 +233,11 @@ export default {
       this.hyLine();
     },
     hynext() {
+      var myDate = new Date();
+      var tYear = myDate.getFullYear();
+      if (tYear == parseInt(this.hyMonths[this.hyMonths.length - 1].split("-")[0])) {
+        this.nextFlag2 = false;
+      }
       var year = parseInt(this.hyMonths[0].split("-")[0])
       var month = parseInt(this.hyMonths[0].split("-")[1])
       this.hyMonths = [];
@@ -225,7 +250,7 @@ export default {
           if (m < 10) {
             this.hyMonths.push(year + "-" + "0" + m);
           } else {
-            this.hyMonths.push(year - 1 + "-" + m);
+            this.hyMonths.push(year + "-" + m);
           }
         }
       }
@@ -357,6 +382,7 @@ export default {
     drawLine() {
       var so2Arry = [];
       var aisArry = [];
+      // console.log(this.months);
       for (var index in this.months) {
         // console.log(this.so2TimeData.so2['2021-01-01T00:00:00Z']);
         if (this.so2TimeData.so2[this.months[index] + '-01T00:00:00Z']) {

ruoyi-ui/src/views/home.vue

@@ -1,9 +1,10 @@
 <template>
   <div style="background-color:#000928;width:100%;height:100%">
     <div class="header">
-      <div style="position: absolute;right: 34rem;color: rgb(63, 201, 253);top: 3rem;font-size: 9rem;">{{username+" 在线"}}</div>
+      <div style="position: absolute;right: 34rem;color: rgb(63, 201, 253);top: 3rem;font-size: 9rem;">{{ username + " 在线" }}</div>
 
-      <div @click="logout" style="background: none;width: 20rem;position: absolute;height: 20rem;text-align: center;vertical-align: middle;margin: auto;right: 11rem;"> <img style="width: 10rem;margin: auto;vertical-align: middle;margin-top: 5rem;" src="../assets/images/off.png" alt=""></div>
+      <div @click="logout" style="background: none;width: 20rem;position: absolute;height: 20rem;text-align: center;vertical-align: middle;margin: auto;right: 11rem;"><img style="width: 10rem;margin: auto;vertical-align: middle;margin-top: 5rem;"
+                                                                                                                                                                            src="../assets/images/off.png" alt=""></div>
 
 
     </div>
@@ -210,7 +211,7 @@ export default {
       showUserMenu: false,
       showTable: 8,
       menuShow: 0,
-      username:this.$store.getters.name
+      username: this.$store.getters.name
     }
   },
   mounted: function () {
@@ -301,10 +302,10 @@ export default {
 
 .center_content {
   background-color: white;
-  width: 670rem;
+  width: 83%;
   height: 350rem;
   float: right;
-  margin-right: 20rem
+  margin-right: 3%;
 }
 
 .icon_class {