|
@@ -1,5 +1,6 @@
|
|
<template>
|
|
<template>
|
|
- <div style="width:100%;height:100%;background-color:blue">
|
|
|
|
|
|
+ <div style="width:100%;height:100%;background-color:rgb(0, 9, 40)">
|
|
|
|
+ <mapdiv></mapdiv>
|
|
<div class="shipDiv" v-show="shipShow">
|
|
<div class="shipDiv" v-show="shipShow">
|
|
<div class="shipTitle">
|
|
<div class="shipTitle">
|
|
<span style="float:left">一号船</span>
|
|
<span style="float:left">一号船</span>
|
|
@@ -310,11 +311,13 @@
|
|
<script>
|
|
<script>
|
|
import scroll from "./scroll.vue"
|
|
import scroll from "./scroll.vue"
|
|
import {getDeviceType, getIllegalShipStatic, getStaticDevice,getSo2Time,queryIllegalInfoList} from "@/api/data/staticalData";
|
|
import {getDeviceType, getIllegalShipStatic, getStaticDevice,getSo2Time,queryIllegalInfoList} from "@/api/data/staticalData";
|
|
|
|
+import mapdiv from '../../../components/map/index.vue'
|
|
|
|
|
|
export default {
|
|
export default {
|
|
name: "homeTable",
|
|
name: "homeTable",
|
|
components: {
|
|
components: {
|
|
- scroll
|
|
|
|
|
|
+ scroll,
|
|
|
|
+ mapdiv
|
|
},
|
|
},
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
@@ -388,7 +391,7 @@ export default {
|
|
}
|
|
}
|
|
}, mounted() {
|
|
}, mounted() {
|
|
this.getMonthDate();
|
|
this.getMonthDate();
|
|
- this.getStaticDevice();
|
|
|
|
|
|
+ //this.getStaticDevice();
|
|
this.getIllegalShipStatic();
|
|
this.getIllegalShipStatic();
|
|
// console.log(111111111111)
|
|
// console.log(111111111111)
|
|
// this.getChart();
|
|
// this.getChart();
|
|
@@ -398,38 +401,38 @@ export default {
|
|
getSo2Time(this.shipDate).then(data =>{
|
|
getSo2Time(this.shipDate).then(data =>{
|
|
this.getMonthArry(this.shipDate.startMonth,this.shipDate.endMonth);
|
|
this.getMonthArry(this.shipDate.startMonth,this.shipDate.endMonth);
|
|
this.so2TimeData = data.data
|
|
this.so2TimeData = data.data
|
|
- this.getShipChart();
|
|
|
|
|
|
+ this.getShipChart();
|
|
});
|
|
});
|
|
},
|
|
},
|
|
getMonthArry(start,end){
|
|
getMonthArry(start,end){
|
|
// this.shipDateArry.push(start);
|
|
// this.shipDateArry.push(start);
|
|
- var startYear = start.split('-')[0];
|
|
|
|
- var startMonth = parseInt(start.split('-')[1]);
|
|
|
|
- var endYear = end.split('-')[0];
|
|
|
|
- var endMonth = parseInt(end.split('-')[1]);
|
|
|
|
|
|
+ var startYear = start.split('-')[0];
|
|
|
|
+ var startMonth = parseInt(start.split('-')[1]);
|
|
|
|
+ var endYear = end.split('-')[0];
|
|
|
|
+ var endMonth = parseInt(end.split('-')[1]);
|
|
if(startYear == endYear){
|
|
if(startYear == endYear){
|
|
for(var i = startMonth;i<endMonth+1;i++){
|
|
for(var i = startMonth;i<endMonth+1;i++){
|
|
if(i<10){
|
|
if(i<10){
|
|
this.shipDateArry.push(startYear+'-'+"0"+i);
|
|
this.shipDateArry.push(startYear+'-'+"0"+i);
|
|
}else{
|
|
}else{
|
|
- this.shipDateArry.push(startYear+'-'+i);
|
|
|
|
- }
|
|
|
|
|
|
+ this.shipDateArry.push(startYear+'-'+i);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}else{
|
|
}else{
|
|
for(var i = startMonth;i<13;i++){
|
|
for(var i = startMonth;i<13;i++){
|
|
if(i<10){
|
|
if(i<10){
|
|
this.shipDateArry.push(startYear+'-'+"0"+i);
|
|
this.shipDateArry.push(startYear+'-'+"0"+i);
|
|
}else{
|
|
}else{
|
|
- this.shipDateArry.push(startYear+'-'+i);
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ this.shipDateArry.push(startYear+'-'+i);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
for(var i = 1;i<endMonth;i++){
|
|
for(var i = 1;i<endMonth;i++){
|
|
if(i<10){
|
|
if(i<10){
|
|
this.shipDateArry.push(endYear+'-'+"0"+i);
|
|
this.shipDateArry.push(endYear+'-'+"0"+i);
|
|
}else{
|
|
}else{
|
|
- this.shipDateArry.push(endYear+'-'+i);
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ this.shipDateArry.push(endYear+'-'+i);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
|
|
}
|
|
}
|
|
console.log(this.shipDateArry);
|
|
console.log(this.shipDateArry);
|
|
@@ -512,7 +515,7 @@ export default {
|
|
so2Arry.push(this.so2TimeData.so2[this.shipDateArry[index]+'-01T00:00:00Z']);
|
|
so2Arry.push(this.so2TimeData.so2[this.shipDateArry[index]+'-01T00:00:00Z']);
|
|
}else {
|
|
}else {
|
|
so2Arry.push(0);
|
|
so2Arry.push(0);
|
|
- }
|
|
|
|
|
|
+ }
|
|
if(this.so2TimeData.ais[this.shipDateArry[index]+'-01T00:00:00Z']){
|
|
if(this.so2TimeData.ais[this.shipDateArry[index]+'-01T00:00:00Z']){
|
|
aisArry.push(this.so2TimeData.ais[this.shipDateArry[index]+'-01T00:00:00Z']);
|
|
aisArry.push(this.so2TimeData.ais[this.shipDateArry[index]+'-01T00:00:00Z']);
|
|
}else{
|
|
}else{
|