|
|
@@ -48,25 +48,25 @@
|
|
|
<el-col :span="12">
|
|
|
<div class="titleContent">硫含量超标船舶统计</div>
|
|
|
<div>
|
|
|
- <div @click="back" style="float:left;margin-top:60rem">
|
|
|
- <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" v-show="nextFlag">
|
|
|
- <img src="@/assets/images/next.png" class="icon_size"/>
|
|
|
- </div>
|
|
|
+ <!-- <div @click="back" style="float:left;margin-top:60rem">
|
|
|
+ <img src="@/assets/images/return.png" class="icon_size"/>
|
|
|
+ </div>-->
|
|
|
+ <div id="myChart" style="width:250rem;height:145rem;"></div>
|
|
|
+ <!-- <div @click="next" style="float:left;margin-top:60rem" v-show="nextFlag">
|
|
|
+ <img src="@/assets/images/next.png" class="icon_size"/>
|
|
|
+ </div>-->
|
|
|
</div>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
<div class="titleContent">黑烟抓拍统计</div>
|
|
|
<div>
|
|
|
- <div @click="hyback" style="float:left;margin-top:60rem">
|
|
|
- <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" v-show="nextFlag2">
|
|
|
- <img src="@/assets/images/next.png" class="icon_size"/>
|
|
|
- </div>
|
|
|
+ <!-- <div @click="hyback" style="float:left;margin-top:60rem">
|
|
|
+ <img src="@/assets/images/return.png" class="icon_size"/>
|
|
|
+ </div>-->
|
|
|
+ <div id="hyChart" style="width:250rem;height:145rem;"></div>
|
|
|
+ <!-- <div @click="hynext" style="float:left;margin-top:60rem" v-show="nextFlag2">
|
|
|
+ <img src="@/assets/images/next.png" class="icon_size"/>
|
|
|
+ </div>-->
|
|
|
</div>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -109,7 +109,7 @@ export default {
|
|
|
};
|
|
|
},
|
|
|
mounted() {
|
|
|
- var myDate = new Date();
|
|
|
+ /*var myDate = new Date();
|
|
|
var tYear = myDate.getFullYear();
|
|
|
var tMonth = myDate.getMonth();
|
|
|
if (tMonth < 5) {
|
|
|
@@ -128,14 +128,27 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- console.log(tMonth)
|
|
|
+ console.log(tMonth)*/
|
|
|
+ let nowDate = new Date();
|
|
|
+ let year = nowDate.getFullYear();
|
|
|
+ let mon = nowDate.getMonth() + 1;
|
|
|
+ for (let i = 0; i < 8; i++) {
|
|
|
+ if (mon <= 0) {
|
|
|
+ year = year - 1;
|
|
|
+ mon = mon + 12;
|
|
|
+ }
|
|
|
+ if (mon < 10) {
|
|
|
+ mon = "0" + mon;
|
|
|
+ }
|
|
|
+ this.months[i] = year + "-" + mon;
|
|
|
+ this.hyMonths[i] = year + "-" + mon;
|
|
|
+ mon = mon - 1;
|
|
|
+ }
|
|
|
+ this.months.reverse();
|
|
|
+ this.hyMonths.reverse();
|
|
|
this.getDicts('heiyan_snap_pos');
|
|
|
this.getDicts('so2_snap_pos');
|
|
|
- // console.log(this.blackName);
|
|
|
- // this.hyLine();
|
|
|
this.getSo2Time();
|
|
|
- // this.liuPie();
|
|
|
- // this.hyPie();
|
|
|
},
|
|
|
methods: {
|
|
|
getSo2Time() {
|
|
|
@@ -157,112 +170,106 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
+ // 硫含量统计图向左切换
|
|
|
back() {
|
|
|
- var myDate = new Date();
|
|
|
- var tYear = myDate.getFullYear();
|
|
|
- var year = parseInt(this.months[0].split("-")[0])
|
|
|
-
|
|
|
- if (parseInt(tYear) >= year) {
|
|
|
+ let nowDate = new Date();
|
|
|
+ let tYear = nowDate.getFullYear();
|
|
|
+ let year = parseInt(this.months[0].split("-")[0])
|
|
|
+ if (tYear >= year) {
|
|
|
this.nextFlag = true;
|
|
|
}
|
|
|
-
|
|
|
- var month = parseInt(this.months[0].split("-")[1])
|
|
|
+ let mon = parseInt(this.months[0].split("-")[1])
|
|
|
this.months = [];
|
|
|
- if (month > 5) {
|
|
|
- for (var m = 1; m < 7; m++) {
|
|
|
- this.months.push(year + "-" + "0" + m);
|
|
|
+ for (let i = 0; i < 8; i++) {
|
|
|
+ mon = mon - 1;
|
|
|
+ if (mon <= 0) {
|
|
|
+ year = year - 1;
|
|
|
+ mon = mon + 12;
|
|
|
}
|
|
|
- } else {
|
|
|
- for (var m = 7; m < 13; m++) {
|
|
|
- if (m < 10) {
|
|
|
- this.months.push((year - 1) + "-" + "0" + m);
|
|
|
- } else {
|
|
|
- this.months.push((year - 1) + "-" + m);
|
|
|
- }
|
|
|
+ if (mon < 10) {
|
|
|
+ mon = "0" + mon;
|
|
|
}
|
|
|
+ this.months[i] = year + "-" + mon;
|
|
|
}
|
|
|
+ this.months.reverse();
|
|
|
this.drawLine();
|
|
|
},
|
|
|
+ // 硫含量统计图向右切换
|
|
|
next() {
|
|
|
- var myDate = new Date();
|
|
|
- var tYear = myDate.getFullYear();
|
|
|
- if (tYear == parseInt(this.months[this.months.length - 1].split("-")[0])) {
|
|
|
+ let nowDate = new Date();
|
|
|
+ let tYear = nowDate.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])
|
|
|
+ let year = parseInt(this.months[5].split("-")[0]);
|
|
|
+ let mon = parseInt(this.months[5].split("-")[1])
|
|
|
this.months = [];
|
|
|
- if (month > 5) {
|
|
|
- for (var m = 1; m < 7; m++) {
|
|
|
- this.months.push((year + 1) + "-" + "0" + m);
|
|
|
+ for (let i = 0; i < 8; i++) {
|
|
|
+ if (mon >= 12) {
|
|
|
+ year = year + 1;
|
|
|
+ mon = 1;
|
|
|
}
|
|
|
- } else {
|
|
|
- for (var m = 7; m < 13; m++) {
|
|
|
- if (m < 10) {
|
|
|
- this.months.push(year + "-" + "0" + m);
|
|
|
- } else {
|
|
|
- this.months.push(year + "-" + m);
|
|
|
- }
|
|
|
+ if (mon < 10) {
|
|
|
+ mon = "0" + mon;
|
|
|
}
|
|
|
+ this.months[i] = year + "-" + mon;
|
|
|
+ mon = mon + 1;
|
|
|
}
|
|
|
+ console.log(this.months);
|
|
|
this.drawLine();
|
|
|
},
|
|
|
+ // 黑烟统计图向左切换
|
|
|
hyback() {
|
|
|
- var myDate = new Date();
|
|
|
- var tYear = myDate.getFullYear();
|
|
|
- var year = parseInt(this.hyMonths[0].split("-")[0])
|
|
|
- if (parseInt(tYear) >= year) {
|
|
|
+ let nowDate = new Date();
|
|
|
+ let tYear = nowDate.getFullYear();
|
|
|
+ let year = parseInt(this.hyMonths[0].split("-")[0])
|
|
|
+ if (tYear >= year) {
|
|
|
this.nextFlag2 = true;
|
|
|
}
|
|
|
- var month = parseInt(this.hyMonths[0].split("-")[1])
|
|
|
+ let mon = parseInt(this.hyMonths[0].split("-")[1])
|
|
|
this.hyMonths = [];
|
|
|
- if (month > 5) {
|
|
|
- for (var m = 1; m < 7; m++) {
|
|
|
- this.hyMonths.push(year + "-" + "0" + m);
|
|
|
+ for (let i = 0; i < 6; i++) {
|
|
|
+ mon = mon - 1;
|
|
|
+ if (mon <= 0) {
|
|
|
+ year = year - 1;
|
|
|
+ mon = mon + 12;
|
|
|
}
|
|
|
- } else {
|
|
|
- for (var m = 7; m < 13; m++) {
|
|
|
- if (m < 10) {
|
|
|
- this.hyMonths.push((year - 1) + "-" + "0" + m);
|
|
|
- } else {
|
|
|
- this.hyMonths.push((year - 1) + "-" + m);
|
|
|
- }
|
|
|
+ if (mon < 10) {
|
|
|
+ mon = "0" + mon;
|
|
|
}
|
|
|
+ this.hyMonths[i] = year + "-" + mon;
|
|
|
}
|
|
|
+ this.hyMonths.reverse();
|
|
|
this.hyLine();
|
|
|
},
|
|
|
+ // 黑烟统计图向右切换
|
|
|
hynext() {
|
|
|
- var myDate = new Date();
|
|
|
- var tYear = myDate.getFullYear();
|
|
|
- if (tYear == parseInt(this.hyMonths[this.hyMonths.length - 1].split("-")[0])) {
|
|
|
+ let nowDate = new Date();
|
|
|
+ let tYear = nowDate.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])
|
|
|
+ let year = parseInt(this.hyMonths[5].split("-")[0])
|
|
|
+ let mon = parseInt(this.hyMonths[5].split("-")[1])
|
|
|
this.hyMonths = [];
|
|
|
- if (month > 5) {
|
|
|
- for (var m = 1; m < 7; m++) {
|
|
|
- this.hyMonths.push((year + 1) + "-" + "0" + m);
|
|
|
+ for (let i = 0; i < 6; i++) {
|
|
|
+ if (mon <= 0) {
|
|
|
+ year = year - 1;
|
|
|
+ mon = mon + 12;
|
|
|
}
|
|
|
- } else {
|
|
|
- for (var m = 7; m < 13; m++) {
|
|
|
- if (m < 10) {
|
|
|
- this.hyMonths.push(year + "-" + "0" + m);
|
|
|
- } else {
|
|
|
- this.hyMonths.push(year + "-" + m);
|
|
|
- }
|
|
|
+ if (mon < 10) {
|
|
|
+ mon = "0" + mon;
|
|
|
}
|
|
|
+ this.hyMonths[i] = year + "-" + mon;
|
|
|
+ mon = mon - 1;
|
|
|
}
|
|
|
this.hyLine();
|
|
|
},
|
|
|
liuPie() {
|
|
|
getSo2SnapPos({'month': this.liuDate}).then(response => {
|
|
|
- // console.log(response);
|
|
|
var myChart = this.$echarts.init(document.getElementById('liuPieChart'));
|
|
|
var series = [];
|
|
|
for (var index in this.so2Name) {
|
|
|
- // console.log(this.so2Name[index].dictLabel);
|
|
|
var object = {
|
|
|
'value': response.data[this.so2Name[index].dictLabel],
|
|
|
'name': this.so2Name[index].dictLabel,
|
459242451@qq.com