فهرست منبع

评价的时间限制

zhulizhen 5 سال پیش
والد
کامیت
e3f399d339
3فایلهای تغییر یافته به همراه49 افزوده شده و 10 حذف شده
  1. 2 2
      src/api/evaluate/evaluate.js
  2. 1 1
      src/views/evaluate/evIndoorTemperature.vue
  3. 46 7
      src/views/evaluate/index.vue

+ 2 - 2
src/api/evaluate/evaluate.js

@@ -1,9 +1,9 @@
 import httputils from '@/api/httputils'
 // 查询运行评价
 export function runDataQury({ getParams }) {
-    return httputils.getJson(`/duoduo-service/transfer/chiller/command/runDataQuery?projectId=Pj5101050001&begin=20200224&end=20200224`, getParams)
+    return httputils.getJson(`/duoduo-service/transfer/chiller/command/runDataQuery?projectId=Pj5101050001`, getParams)
 }
 // 查询相似日样本
 export function energyDayQuery({ getParams }) {
-    return httputils.getJson(`/duoduo-service/transfer/chiller/command/energyDayQuery?projectId=Pj3206120001&date=20191105`, getParams)
+    return httputils.getJson(`/duoduo-service/transfer/chiller/command/energyDayQuery?projectId=Pj3206120001`, getParams)
 }

+ 1 - 1
src/views/evaluate/evIndoorTemperature.vue

@@ -17,7 +17,7 @@ export default {
   data() {
     return {};
   },
-  props: ["date"],
+  props: ["energyDataList"],
   mounted() {
     this.drawIt();
   },

+ 46 - 7
src/views/evaluate/index.vue

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