|
|
@@ -81,6 +81,8 @@
|
|
|
<div style="float:left;color:#ffffff">开始</div>
|
|
|
<div style="float:left;margin-left:3rem">
|
|
|
<el-date-picker
|
|
|
+ @change='getSo2Time'
|
|
|
+ value-format='yyyy-MM'
|
|
|
v-model="shipDate.startMonth"
|
|
|
type="month"
|
|
|
placeholder="选择月份">
|
|
|
@@ -90,6 +92,8 @@
|
|
|
<div style="float:left;margin-left:3rem">
|
|
|
<el-date-picker
|
|
|
v-model="shipDate.endMonth"
|
|
|
+ @change='getSo2Time'
|
|
|
+ value-format='yyyy-MM'
|
|
|
type="month"
|
|
|
placeholder="选择月份">
|
|
|
</el-date-picker>
|
|
|
@@ -315,6 +319,7 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
getSo2Time() {
|
|
|
+ console.log(111);
|
|
|
getSo2Time(this.shipDate).then(data => {
|
|
|
this.getMonthArry(this.shipDate.startMonth, this.shipDate.endMonth);
|
|
|
this.so2TimeData = data.data
|
|
|
@@ -322,11 +327,14 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
getMonthArry(start, end) {
|
|
|
+ this.shipDateArry = [];
|
|
|
// 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]);
|
|
|
+ if(start.getFullYear == null){
|
|
|
+ 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) {
|
|
|
for (var i = startMonth; i < endMonth + 1; i++) {
|
|
|
if (i < 10) {
|
