|
|
@@ -57,7 +57,7 @@
|
|
|
<!-- <view class="navbar-screen" >
|
|
|
{{startTime}}至{{endTime}}
|
|
|
</view> -->
|
|
|
- <view class="navbar-screen" @click="popupShow = true">
|
|
|
+ <view class="navbar-screen" @click="popupShow = true" v-if="false">
|
|
|
<span>{{showTime(queryTime)}}</span>
|
|
|
<u-icon name="arrow-down" color="#b0b8c8" size="32" v-show="!popupShow"></u-icon>
|
|
|
<u-icon name="arrow-up" color="#b0b8c8" size="32" v-show="popupShow"></u-icon>
|
|
|
@@ -66,8 +66,13 @@
|
|
|
|
|
|
|
|
|
</view>
|
|
|
+ <u-calendar v-model="popupShow4" mode="range" @change="changedate4"></u-calendar>
|
|
|
+ <view class="details detailstable">
|
|
|
+ <p style="text-align: center; margin-bottom: 5px;" @click="popupShow4 = true">{{startTime}}至{{endTime}}
|
|
|
+ <u-icon name="arrow-down" color="#b0b8c8" size="32" v-show="!popupShow4"></u-icon>
|
|
|
+ <u-icon name="arrow-up" color="#b0b8c8" size="32" v-show="popupShow4"></u-icon>
|
|
|
+ </p>
|
|
|
|
|
|
- <view class="details detailstable">
|
|
|
<u-collapse :headStyle="{
|
|
|
color:'#101010',
|
|
|
fontWeight: 'bold',
|
|
|
@@ -106,7 +111,7 @@
|
|
|
<view class="span2">快充{{item.fastNum}}/慢充{{item.slowNum}}</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
-
|
|
|
+
|
|
|
<view class="detailsline" v-if="item.fastNum&&item.slowNum">
|
|
|
<view class="details-row details-row-1">
|
|
|
|
|
|
@@ -122,8 +127,10 @@
|
|
|
<view class="span2" v-else>0<span>度/枪/天</span></view>
|
|
|
</view>
|
|
|
</view>
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+ <view :style="item.slowDayNum==nowTime?'color: #ffffff;':'border-bottom: 1px solid #ededed;'"
|
|
|
+ >查询范围内实际订单天数{{item.slowDayNum}}</view>
|
|
|
+
|
|
|
</u-collapse-item>
|
|
|
</u-collapse>
|
|
|
|
|
|
@@ -218,7 +225,8 @@
|
|
|
selectstationId: "",
|
|
|
selectdeviceNo: "",
|
|
|
popupShow2: false,
|
|
|
- popupShow: false,
|
|
|
+ popupShow: false,
|
|
|
+ popupShow4:false,
|
|
|
nowTime:0,
|
|
|
selectstationId2: "",
|
|
|
selectstationIndex:0,
|
|
|
@@ -286,7 +294,8 @@
|
|
|
show: false,
|
|
|
border: true,
|
|
|
step: 0,
|
|
|
- stepname: '',
|
|
|
+ stepname: '',
|
|
|
+ startTime:'',
|
|
|
stepid: 0,
|
|
|
|
|
|
}
|
|
|
@@ -315,17 +324,17 @@
|
|
|
|
|
|
console.log(this.queryTime);
|
|
|
|
|
|
- //this.startTime = parseUnixTime(beforeTimeStamp(6), '{y}-{m}-{d}')
|
|
|
- this.endTime = parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}')
|
|
|
+ this.startTime = parseUnixTime(beforeTimeStamp(7), '{y}-{m}-{d}')
|
|
|
+ this.endTime = parseUnixTime(beforeTimeStamp(1), '{y}-{m}-{d}')
|
|
|
//this.startTime2 = parseUnixTime(beforeTimeStamp(6), '{y}-{m}-{d}')
|
|
|
this.endTime2 = parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}')
|
|
|
|
|
|
this.getStation()
|
|
|
},computed:{
|
|
|
|
|
|
- startTime(){
|
|
|
- return this.queryTime+'-1'
|
|
|
- },
|
|
|
+ // startTime(){
|
|
|
+ // return this.queryTime+'-1'
|
|
|
+ // },
|
|
|
startTime2(){
|
|
|
return this.queryTime2+'-1'
|
|
|
},
|
|
|
@@ -481,6 +490,12 @@
|
|
|
this.current = e
|
|
|
this.getPie()
|
|
|
},
|
|
|
+ changedate4(e) {
|
|
|
+ this.startTime = e.startDate
|
|
|
+ this.endTime = e.endDate
|
|
|
+ this.okbtn()
|
|
|
+
|
|
|
+ },
|
|
|
changedate3(e) {
|
|
|
console.log(e)
|
|
|
var index=e[0];
|
|
|
@@ -492,8 +507,9 @@
|
|
|
},
|
|
|
changedate(e) {
|
|
|
console.log(e)
|
|
|
- this.queryTime=e.year+'-'+e.month;
|
|
|
|
|
|
+ this.queryTime=e.year+'-'+e.month;
|
|
|
+ this.startTime=e.year+'-'+e.month+'-1';
|
|
|
if(e.month=='12'){
|
|
|
this.endTime=(e.year)+"/12/31"
|
|
|
}else{
|
zhengkaixin