|
@@ -12,10 +12,12 @@
|
|
v-model="pickerVal2"
|
|
v-model="pickerVal2"
|
|
type="daterange"
|
|
type="daterange"
|
|
format="yyyy.MM.dd"
|
|
format="yyyy.MM.dd"
|
|
- value-format="yyyy.MM.dd"
|
|
|
|
|
|
+ value-format="timestamp"
|
|
range-separator="至"
|
|
range-separator="至"
|
|
start-placeholder="开始日期"
|
|
start-placeholder="开始日期"
|
|
end-placeholder="结束日期"
|
|
end-placeholder="结束日期"
|
|
|
|
+ :picker-options="pickerOptions"
|
|
|
|
+ @change="query"
|
|
></el-date-picker>
|
|
></el-date-picker>
|
|
<span class="arrow-line" @click="daterangeRight"></span>
|
|
<span class="arrow-line" @click="daterangeRight"></span>
|
|
<span class="arrow-right" @click="daterangeRight"></span>
|
|
<span class="arrow-right" @click="daterangeRight"></span>
|
|
@@ -80,7 +82,7 @@
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="ev-footer">
|
|
<div class="ev-footer">
|
|
- <ev-indoor-temperature :date="date"></ev-indoor-temperature>
|
|
|
|
|
|
+ <ev-indoor-temperature :energyDataList ="energyDataList"></ev-indoor-temperature>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -91,17 +93,36 @@ import EvEnergySavingRate from "./evEnergySavingRate";
|
|
import EvImplementationRate from "./evImplementationRate";
|
|
import EvImplementationRate from "./evImplementationRate";
|
|
import EvSatisfactionRate from "./evSatisfactionRate";
|
|
import EvSatisfactionRate from "./evSatisfactionRate";
|
|
import EvIndoorTemperature from "./evIndoorTemperature";
|
|
import EvIndoorTemperature from "./evIndoorTemperature";
|
|
-import { runDataQury } from "@/api/evaluate/evaluate.js";
|
|
|
|
|
|
+import { runDataQury,energyDayQuery} from "@/api/evaluate/evaluate.js";
|
|
|
|
|
|
var moment = require("moment");
|
|
var moment = require("moment");
|
|
import "moment/locale/zh-cn";
|
|
import "moment/locale/zh-cn";
|
|
-
|
|
|
|
|
|
+import {toTimestamp,timestamp2String} from '@/utils/helper.js'
|
|
export default {
|
|
export default {
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
headText: "运行评价",
|
|
headText: "运行评价",
|
|
|
|
+ pickerOptions: {
|
|
|
|
+ onPick: ({ maxDate, minDate }) => {
|
|
|
|
+ this.pickerMinDate = minDate.getTime()
|
|
|
|
+ if (maxDate) {
|
|
|
|
+ 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()
|
|
|
|
+ },
|
|
|
|
+ },
|
|
date: "2",
|
|
date: "2",
|
|
- pickerVal2: "",
|
|
|
|
|
|
+ pickerVal2: [new Date(),new Date()],
|
|
radio: "1",
|
|
radio: "1",
|
|
tindoorFillRate: "", //室内温度满足率
|
|
tindoorFillRate: "", //室内温度满足率
|
|
energySavingRate: "", //节能率
|
|
energySavingRate: "", //节能率
|
|
@@ -109,7 +130,8 @@ export default {
|
|
energySaving: "", //节能量
|
|
energySaving: "", //节能量
|
|
isExecutedNum: "", //已执行数量
|
|
isExecutedNum: "", //已执行数量
|
|
allReceivedNum: "", //共收到数量
|
|
allReceivedNum: "", //共收到数量
|
|
- tindoorOverrunDegree: "" //超限程度
|
|
|
|
|
|
+ tindoorOverrunDegree: "", //超限程度
|
|
|
|
+ energyDataList:[] //图标数据
|
|
};
|
|
};
|
|
},
|
|
},
|
|
components: {
|
|
components: {
|
|
@@ -128,7 +150,11 @@ export default {
|
|
},
|
|
},
|
|
query() {
|
|
query() {
|
|
this.runDataQuryArr = [];
|
|
this.runDataQuryArr = [];
|
|
- runDataQury({}).then(res => {
|
|
|
|
|
|
+ let getParams = {
|
|
|
|
+ begin:timestamp2String(this.pickerVal2[0]).slice(0,8),
|
|
|
|
+ end:timestamp2String(this.pickerVal2[1]).slice(0,8)
|
|
|
|
+ }
|
|
|
|
+ runDataQury({getParams}).then(res => {
|
|
if (res.result == "success") {
|
|
if (res.result == "success") {
|
|
this.tindoorFillRate = res.tindoorFillRate; //室内温度满足率
|
|
this.tindoorFillRate = res.tindoorFillRate; //室内温度满足率
|
|
this.energySavingRate = res.energySavingRate; //节能率
|
|
this.energySavingRate = res.energySavingRate; //节能率
|
|
@@ -137,9 +163,22 @@ export default {
|
|
this.isExecutedNum = res.isExecutedNum; //已执行数量
|
|
this.isExecutedNum = res.isExecutedNum; //已执行数量
|
|
this.allReceivedNum = res.allReceivedNum; //共收到数量
|
|
this.allReceivedNum = res.allReceivedNum; //共收到数量
|
|
this.tindoorOverrunDegree = res.tindoorOverrunDegree; //超限程度
|
|
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() {
|
|
daterangeLeft() {
|
|
if (this.pickerVal2.length > 0) {
|
|
if (this.pickerVal2.length > 0) {
|
|
let dateTime = new Date(this.pickerVal2[0]);
|
|
let dateTime = new Date(this.pickerVal2[0]);
|