Guoxiaohuan 5 gadi atpakaļ
vecāks
revīzija
58f8b0ed02

+ 19 - 5
src/views/evaluate/dateTemp.vue

@@ -2,7 +2,14 @@
   <div class="date-temp">
     <span class="arrow-left" @click="pickerChangeLeft"></span>
     <span class="arrow-line arrow-line1" @click="pickerChangeLeft"></span>
-    <el-date-picker v-model="pickerVal" type="date" format="yyyy.MM.dd" value-format="yyyy.MM.dd"></el-date-picker>
+    <el-date-picker
+      v-model="pickerVal"
+      type="date"
+      format="yyyy.MM.dd"
+      value-format="yyyy.MM.dd"
+      @change="changeDate"
+      :picker-options="pickerOptions0"
+    ></el-date-picker>
     <span class="arrow-line" @click="pickerChangeRight"></span>
     <span class="arrow-right" @click="pickerChangeRight"></span>
   </div>
@@ -13,7 +20,12 @@ import "moment/locale/zh-cn";
 export default {
   data() {
     return {
-      pickerVal: new Date()
+      pickerVal: new Date(),
+      pickerOptions0: {
+        disabledDate(time) {
+          return time.getTime() > Date.now();
+        }
+      }
     };
   },
   props: ["date"],
@@ -56,6 +68,9 @@ export default {
       }
       this.$emit("pickerVal", this.pickerVal);
     },
+    changeDate(val) {
+      this.$emit("pickerVal", val);
+    },
     formatterStr(str) {
       if (str) {
         return (
@@ -70,9 +85,8 @@ export default {
   },
   mounted() {
     if (this.date) {
-      this.pickerVal = this.formatterStr(
-        new Date().getFullYear() + this.formatterStr2(this.date)
-      );
+      this.pickerVal = this.formatterStr(this.date);
+      // new Date().getFullYear() + this.formatterStr2(this.date)
       this.$emit("pickerVal", this.pickerVal);
     }
   }

+ 3 - 3
src/views/evaluate/evRateTitle.vue

@@ -3,14 +3,14 @@
     <span v-if="tab==1" class="count-bottom-text">
       <span class="span1"></span>
       <span class="span2 Micbold">室内温度满足率</span>
-      <span class="span3">{{rate}}%</span>
+      <span class="span3">{{rate||'--'}}%</span>
     </span>
     <span v-if="tab==2" class="count-bottom-text">
       <span class="span1"></span>
       <span class="span2 Micbold">节能率</span>
       <span class="span4">{{rate || '--'}}%</span>
       <span class="span5">准确率</span>
-      <span class="span6">90%</span>
+      <span class="span6">{{accuracy||'--'}}%</span>
     </span>
     <span v-if="tab==3" class="count-bottom-text">
       <span class="span1"></span>
@@ -25,7 +25,7 @@ export default {
     return {};
   },
   mounted() {},
-  props: ["tab", "rate"]
+  props: ["tab", "rate",'accuracy']
 };
 </script>
 <style lang="scss" scoped>

+ 1 - 0
src/views/evaluate/evStackedLine.vue

@@ -11,6 +11,7 @@ export default {
   mounted() {
     this.drawItLine();
   },
+  props: ["stackArr"],
   methods: {
     drawItLine() {
       let myCharts = echarts.init(document.getElementById("lineCharts"));

+ 32 - 7
src/views/evaluate/evTwoLevelMenu.vue

@@ -21,7 +21,7 @@
         </ul>
         <div class="count-bottom">
           <div v-show="num == 1">
-            <ev-rate-title :tab="1" :rate="tindoorFillRate"></ev-rate-title>
+            <ev-rate-title :tab="1" :rate="tindoorFillRate" :accuracy="null"></ev-rate-title>
             <div class="count-bottom-switch">
               <span class="switchSpan">只显示不满足的点位</span>
               <el-switch v-model="value2"></el-switch>
@@ -30,11 +30,11 @@
               <ev-two-table v-if="dataList.length>=0" :switch="value2" :dataList="dataList"></ev-two-table>
             </div>
             <div class="count-bottom-foot">
-              <ev-stacked-line></ev-stacked-line>
+              <ev-stacked-line v-if="stackArr.length>0" :stackArr="stackArr"></ev-stacked-line>
             </div>
           </div>
           <div v-show="num == 2">
-            <ev-rate-title :tab="2" :rate="energySavingRate"></ev-rate-title>
+            <ev-rate-title :tab="2" :rate="energySavingRate" :accuracy="accuracy"></ev-rate-title>
             <div class="count-historical-data">
               <ev-history
                 v-if="Object.keys(current).length>0||Object.keys(similarDay).length>0||Object.keys(maxArr).length>0"
@@ -54,7 +54,7 @@
             </div>
           </div>
           <div v-show="num == 3">
-            <ev-rate-title :tab="3"></ev-rate-title>
+            <ev-rate-title :tab="3" :rate="null" :accuracy="null"></ev-rate-title>
             <ev-card v-if="cardList.length>0" :cardList="cardList"></ev-card>
           </div>
         </div>
@@ -97,7 +97,9 @@ export default {
       tindoorFillRate: "", //室内温度满足率@
       energySavingRate: "", //节能率
       cardList: [], //执行率@
-      dateVal: "" //@
+      dateVal: "", //@
+      stackArr: [], //@
+      accuracy: "" //准确率
     };
   },
   components: {
@@ -117,6 +119,7 @@ export default {
     init() {
       this.type = this.$route.query.type;
       this.date = this.$route.query.name;
+      console.log(this.date);
       if (this.type) {
         this.num = this.type;
       }
@@ -124,11 +127,26 @@ export default {
         this.date = this.formatterStr3(
           new Date().getFullYear() + this.formatterStr2(this.date)
         );
+        this.querychillerMethods(this.date);
       }
       if (this.num && this.date) {
         this.changeNumMethod();
       }
     },
+    querychillerMethods(date) {
+      let params = {
+        postParams: {
+          criteria: {
+            projectId: this.$store.state.projectId,
+            date: date
+          }
+        }
+      };
+      querychiller(params).then(res => {
+        console.log(res);
+        this.accuracy = res.content[0].accuracy;
+      });
+    },
     // @
     formatterStr2(str) {
       if (str) {
@@ -146,6 +164,13 @@ export default {
         let content = res.content;
         if (content.length > 0) {
           content.forEach(item => {
+            if (item.spaceDayRpt.isSatisfy == false) {
+              let obj2 = {
+                name: item.spaceDayRpt.spaceLocalName,
+                data: item.tdbList.data
+              };
+              this.stackArr.push(obj2);
+            }
             arr1.push(item.spaceDayRpt.floorLocalName);
           });
           arr1 = Array.from(new Set(arr1));
@@ -165,7 +190,6 @@ export default {
           });
         }
         this.dataList = arr2;
-        console.log(this.dataList);
       });
     },
     // @
@@ -212,7 +236,8 @@ export default {
     // @
     pickerVal(val) {
       if (val) {
-        this.dateVal = this.formatterStr(val);
+        this.date = this.formatterStr(val);
+        this.changeNumMethod();
       }
     },
     // @