|
@@ -3,8 +3,10 @@
|
|
|
<div>
|
|
|
<Head :headText="headText"></Head>
|
|
|
<div class="nav-right">
|
|
|
- <el-radio v-model="radio" label="1">近30天</el-radio>
|
|
|
- <el-radio v-model="radio" label="2" style="margin-right:10px;">自定义</el-radio>
|
|
|
+ <el-radio-group v-model="radio">
|
|
|
+ <el-radio label="1" @change="radioChange">近30天</el-radio>
|
|
|
+ <el-radio label="2" @change="radioChange" style="margin-right:10px;">自定义</el-radio>
|
|
|
+ </el-radio-group>
|
|
|
<div class="count-top-right">
|
|
|
<span class="arrow-left" @click="daterangeLeft"></span>
|
|
|
<span class="arrow-line arrow-line1" @click="daterangeLeft"></span>
|
|
@@ -17,7 +19,7 @@
|
|
|
start-placeholder="开始日期"
|
|
|
end-placeholder="结束日期"
|
|
|
:picker-options="pickerOptions"
|
|
|
- @change="query"
|
|
|
+ @change="query(1)"
|
|
|
></el-date-picker>
|
|
|
<span class="arrow-line" @click="daterangeRight"></span>
|
|
|
<span class="arrow-right" @click="daterangeRight"></span>
|
|
@@ -109,20 +111,15 @@ export default {
|
|
|
this.pickerMinDate = "";
|
|
|
}
|
|
|
},
|
|
|
- disabledDate: time => {
|
|
|
- if (this.pickerMinDate !== "") {
|
|
|
- const day30 = (30 - 1) * 24 * 3600 * 1000;
|
|
|
- let maxTime = this.pickerMinDate + day30;
|
|
|
- if (maxTime > new Date()) {
|
|
|
- maxTime = new Date();
|
|
|
- }
|
|
|
- return time.getTime() > maxTime;
|
|
|
- }
|
|
|
- return time.getTime() > Date.now();
|
|
|
+ disabledDate(time) {
|
|
|
+ return time.getTime() > Date.now() - 8.64e7;
|
|
|
}
|
|
|
},
|
|
|
date: "2",
|
|
|
- pickerVal2: [new Date(), new Date()],
|
|
|
+ pickerVal2: [
|
|
|
+ new Date().getTime() - 24 * 60 * 60 * 1000 * 30,
|
|
|
+ new Date().getTime() - 24 * 60 * 60 * 1000
|
|
|
+ ],
|
|
|
radio: "1",
|
|
|
tindoorFillRate: "", //室内温度满足率
|
|
|
energySavingRate: "", //节能率
|
|
@@ -142,8 +139,11 @@ export default {
|
|
|
EvIndoorTemperature
|
|
|
},
|
|
|
mounted() {
|
|
|
- this.query();
|
|
|
- console.log(this.projects.projects, this.projectId);
|
|
|
+ this.query(0);
|
|
|
+ console.log(timestamp2String(new Date().getTime() - 24 * 60 * 60 * 1000));
|
|
|
+ console.log(
|
|
|
+ timestamp2String(new Date().getTime() - 24 * 60 * 60 * 1000 * 30)
|
|
|
+ );
|
|
|
},
|
|
|
computed: {
|
|
|
...mapGetters(["projects", "projectId"])
|
|
@@ -152,7 +152,19 @@ export default {
|
|
|
formatter(date) {
|
|
|
return moment.unix(date / 1000).format("YYYYMMDD");
|
|
|
},
|
|
|
- query() {
|
|
|
+ radioChange(val) {
|
|
|
+ if (this.radio == "1") {
|
|
|
+ this.pickerVal2 = [
|
|
|
+ new Date().getTime() - 24 * 60 * 60 * 1000 * 30,
|
|
|
+ new Date().getTime() - 24 * 60 * 60 * 1000
|
|
|
+ ];
|
|
|
+ }
|
|
|
+ this.query(0);
|
|
|
+ },
|
|
|
+ query(type) {
|
|
|
+ if (type == "1") {
|
|
|
+ this.radio = "2";
|
|
|
+ }
|
|
|
this.runDataQuryArr = [];
|
|
|
let getParams = {
|
|
|
begin: timestamp2String(this.pickerVal2[0]).slice(0, 8),
|
|
@@ -168,21 +180,9 @@ export default {
|
|
|
this.allReceivedNum = res.allReceivedNum; //共收到数量
|
|
|
this.tindoorOverrunDegree = res.tindoorOverrunDegree; //超限程度
|
|
|
this.energyDataList = res.dataList;
|
|
|
- console.log(this.energyDataList);
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
- // getEnergyDay(){
|
|
|
- // let params = {
|
|
|
- // getParms:{
|
|
|
- // date: timestamp2String(+new Date())
|
|
|
- // }
|
|
|
- // }
|
|
|
- // energyDayQuery(params).then(res=>{
|
|
|
- // console.log(res)
|
|
|
-
|
|
|
- // })
|
|
|
- // },
|
|
|
daterangeLeft() {
|
|
|
if (this.pickerVal2.length > 0) {
|
|
|
let dateTime = new Date(this.pickerVal2[0]);
|