Browse Source

评论的图和申诉的默认

zhulizhen 5 years ago
parent
commit
91f46b78d8

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

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

+ 4 - 0
src/views/audit/index.vue

@@ -170,6 +170,7 @@ export default {
       return moment.unix(date / 1000).format("YYYY.MM.DD hh:mm");
     },
     appealClick(item, index) {
+      console.log(item)
       this.auditObj = item;
       this.isactive = index;
       let params = {
@@ -194,6 +195,9 @@ export default {
       };
       queryWorkflow(params).then(res => {
         this.auditArr = res.content ? res.content : [];
+        this.auditObj = this.auditArr[0]
+        console.log(this.auditObj)
+        this.appealClick(this.auditObj,0)
       });
     }
   }

+ 40 - 199
src/views/evaluate/evIndoorTemperature.vue

@@ -15,13 +15,45 @@
 var echarts = require("echarts");
 export default {
   data() {
-    return {};
+    return {
+      dataX:[],
+      energyY:[],
+      indoorY:[],
+      strategy1:[],
+      strategy2:[],
+      strategy3:[]
+    };
   },
   props: ["energyDataList"],
   mounted() {
-    this.drawIt();
+    this.getDrawData()
+    
   },
   methods: {
+    getDrawData(){
+      this.energyDataList.forEach(el=>{
+        el.time = el.date.slice(4,6)+":"+el.date.slice(6,8)
+        this.dataX.push(el.time)
+        this.indoorY.push(el.tindoorFillRate?el.tindoorFillRate.toFixed(2):0)
+        this.energyY.push(el.energySavingRate?el.energySavingRate.toFixed(2):0)
+        if(el.chillerExecuteRateReal >= 75){
+          this.strategy1.push(1)
+        }else{
+          this.strategy1.push(null)
+        }
+        if(el.chillerExecuteRate >= 75){
+          this.strategy2.push(1)
+        }else{
+          this.strategy2.push(null)
+        }
+        if(el.chillerExecuteRateReal < 75 || el.chillerExecuteRate < 75){
+          this.strategy3.push(1)
+        }else{
+          this.strategy3.push(null)
+        }
+      })
+     this.drawIt();
+    },
     drawIt() {
       let myCharts = echarts.init(document.getElementById("pCharts2"));
       var colors = ["#34C724", "#8D9399", "#F54E45", "#00D6B9", "#0091FF"];
@@ -54,38 +86,7 @@ export default {
             axisLabel: {
               interval: 0 //代表显示所有x轴标签显示
             },
-            data: [
-              "11.01",
-              "11.02",
-              "11.03",
-              "11.04",
-              "11.05",
-              "11.06",
-              "11.07",
-              "11.08",
-              "11.09",
-              "11.10",
-              "11.12",
-              "11.13",
-              "11.14",
-              "11.15",
-              "11.16",
-              "11.17",
-              "11.18",
-              "11.19",
-              "11.20",
-              "11.21",
-              "11.22",
-              "11.23",
-              "11.24",
-              "11.25",
-              "11.26",
-              "11.27",
-              "11.28",
-              "11.29",
-              "11.30",
-              "11.31"
-            ]
+            data: this.dataX,
           }
         ],
         yAxis: [
@@ -149,191 +150,31 @@ export default {
             name: "按照策略执行",
             type: "bar",
             barWidth: 30,
-            data: [
-              1,
-              null,
-              null,
-              1,
-              null,
-              null,
-              1,
-              null,
-              null,
-              1,
-              null,
-              null,
-              1,
-              null,
-              null,
-              1,
-              null,
-              null,
-              1,
-              null,
-              null,
-              1,
-              null,
-              null,
-              1,
-              null,
-              null,
-              1,
-              null,
-              null,
-              null
-            ]
+            data: this.strategy1
           },
           {
             name: "未按照策略执行",
             type: "bar",
             barWidth: 30,
-            data: [
-              null,
-              1,
-              1,
-              null,
-              1,
-              null,
-              null,
-              1,
-              null,
-              null,
-              1,
-              null,
-              null,
-              1,
-              null,
-              null,
-              1,
-              null,
-              null,
-              1,
-              null,
-              null,
-              1,
-              null,
-              null,
-              1,
-              null,
-              null,
-              1,
-              null,
-              null
-            ]
+            data: this.strategy2
           },
           {
             name: "未按照策略执行,申诉通过",
             type: "bar",
             barWidth: 30,
-            data: [
-              null,
-              null,
-              null,
-              null,
-              null,
-              1,
-              null,
-              null,
-              1,
-              null,
-              null,
-              1,
-              null,
-              null,
-              1,
-              null,
-              null,
-              1,
-              null,
-              null,
-              1,
-              null,
-              null,
-              1,
-              null,
-              null,
-              1,
-              null,
-              null,
-              1,
-              1
-            ]
+            data: this.strategy3
           },
           {
             name: "室内温度满足率",
             type: "line",
             yAxisIndex: 2,
-            data: [
-              2.0,
-              2.2,
-              3.3,
-              4.5,
-              6.3,
-              10.2,
-              20.3,
-              23.4,
-              23.0,
-              16.5,
-              12.0,
-              6.2,
-              2.0,
-              2.2,
-              3.3,
-              4.5,
-              6.3,
-              10.2,
-              20.3,
-              23.4,
-              23.0,
-              16.5,
-              12.0,
-              6.2,
-              2.0,
-              2.2,
-              3.3,
-              4.5,
-              6.3,
-              10.2,
-              20.3
-            ]
+            data: this.indoorY
           },
           {
             name: "节能率",
             type: "line",
             yAxisIndex: 2,
-            data: [
-              2.2,
-              3.0,
-              4.5,
-              6.3,
-              10.2,
-              20.3,
-              23.4,
-              23.0,
-              16.5,
-              12.0,
-              6.2,
-              14.0,
-              2.2,
-              3.0,
-              4.5,
-              6.3,
-              10.2,
-              20.3,
-              23.4,
-              23.0,
-              16.5,
-              12.0,
-              6.2,
-              14.0,
-              2.2,
-              3.0,
-              4.5,
-              6.3,
-              10.2,
-              20.3,
-              23.4
-            ]
+            data: this.energyY
           }
         ]
       };

+ 5 - 2
src/views/evaluate/index.vue

@@ -82,7 +82,7 @@
         </div>
       </div>
       <div class="ev-footer">
-        <ev-indoor-temperature :energyDataList ="energyDataList"></ev-indoor-temperature>
+        <ev-indoor-temperature v-if="energyDataList.length>0" :energyDataList ="energyDataList"></ev-indoor-temperature>
       </div>
     </div>
   </div>
@@ -94,10 +94,10 @@ import EvImplementationRate from "./evImplementationRate";
 import EvSatisfactionRate from "./evSatisfactionRate";
 import EvIndoorTemperature from "./evIndoorTemperature";
 import { runDataQury,energyDayQuery} from "@/api/evaluate/evaluate.js";
-
 var moment = require("moment");
 import "moment/locale/zh-cn";
 import {toTimestamp,timestamp2String} from '@/utils/helper.js'
+import { mapGetters } from 'vuex'
 export default {
   data() {
     return {
@@ -144,6 +144,9 @@ export default {
   mounted() {
     this.query();
   },
+  computed:{
+     ...mapGetters(['projectId']),
+  },
   methods: {
     formatter(date) {
       return moment.unix(date / 1000).format("YYYYMMDD");