Guoxiaohuan 5 лет назад
Родитель
Сommit
becb418d22

+ 9 - 6
src/views/audit/index.vue

@@ -35,7 +35,7 @@
               </div>
               <div class="content">
                 <span>申请人:{{'--'}}</span>
-                <span>申请时间:{{item.updateTime||'--'}}</span>
+                <span>申请时间:{{item.updateTime?formatter1(item.updateTime):'--'}}</span>
                 <span>申请原因:{{item.reasonType||'--'}}</span>
               </div>
             </div>
@@ -47,11 +47,11 @@
             <div class="nav MicrYaHei">
               <span>项目名称:{{'--'}}</span>
               <span>申请人:{{auditObj.applyUser||'--'}}</span>
-              <span>申请时间:{{'--'}}</span>
+              <span>申请时间:{{auditObj.updateTime?formatter1(auditObj.updateTime):'--'}}</span>
             </div>
             <div class="cont1 MicrYaHei">申诉未执行指令:{{auditObj.title||'--'}}</div>
             <div class="cont2">
-              <audit-table :tableList='tableList'></audit-table>
+              <audit-table :tableList="tableList"></audit-table>
             </div>
             <div class="cont3">
               <span class="Micbold">策略评价</span>
@@ -138,7 +138,7 @@ export default {
       value: "0",
       comment: "",
       souseArr: [],
-      tableList:[]
+      tableList: []
     };
   },
   components: {
@@ -177,6 +177,9 @@ export default {
     formatter(date) {
       return moment.unix(date / 1000).format("YYYY.MM.DD hh:mm");
     },
+    formatter1(date) {
+      return moment.unix(date / 1000).format("YYYY.MM.DD");
+    },
     appealClick(item, index) {
       this.auditObj = item;
       this.quertName(item.applyUser);
@@ -189,8 +192,8 @@ export default {
         }
       };
       queryChillerExecuteInfo(params).then(res => {
-        const list = res.data || [{}, {}, {}]
-        this.tableList = Object.values(list[0]).map(i => i || {})
+        const list = res.data || [{}, {}, {}];
+        this.tableList = Object.values(list[0]).map(i => i || {});
       });
     },
     query() {

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

@@ -9,7 +9,7 @@ export default {
     return {};
   },
   mounted() {
-    this.pie(this.energySavingRate, "#box3", ["#00D6B9", "#D5F6F2"]);
+    this.pie(this.energySavingRate || 0, "#box3", ["#00D6B9", "#D5F6F2"]);
   },
   props: ["energySavingRate"],
   methods: {

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

@@ -10,7 +10,7 @@ export default {
   },
   props: ["chillerExecuteRate"],
   mounted() {
-    this.pie(this.chillerExecuteRate, "#box2", ["#FFBA6B", "#FEE9D2"]);
+    this.pie(this.chillerExecuteRate || 0, "#box2", ["#FFBA6B", "#FEE9D2"]);
   },
   methods: {
     pie(pieData, box, colors) {

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

@@ -10,7 +10,7 @@ export default {
   },
   props: ["tindoorFillRate"],
   mounted() {
-    this.pie(this.tindoorFillRate, "#box1", ["#0091FF", "#E1F2FF"]);
+    this.pie(this.tindoorFillRate || 0, "#box1", ["#0091FF", "#E1F2FF"]);
   },
   methods: {
     pie(pieData, box, colors) {

+ 34 - 33
src/views/evaluate/index.vue

@@ -82,7 +82,7 @@
         </div>
       </div>
       <div class="ev-footer">
-        <ev-indoor-temperature v-if="energyDataList.length>0" :energyDataList ="energyDataList"></ev-indoor-temperature>
+        <ev-indoor-temperature v-if="energyDataList.length>0" :energyDataList="energyDataList"></ev-indoor-temperature>
       </div>
     </div>
   </div>
@@ -93,36 +93,36 @@ import EvEnergySavingRate from "./evEnergySavingRate";
 import EvImplementationRate from "./evImplementationRate";
 import EvSatisfactionRate from "./evSatisfactionRate";
 import EvIndoorTemperature from "./evIndoorTemperature";
-import { runDataQury,energyDayQuery} 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'
-import { mapGetters } from 'vuex'
+import { toTimestamp, timestamp2String } from "@/utils/helper.js";
+import { mapGetters } from "vuex";
 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
+      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() > Date.now()
-          },
-       },
+            return time.getTime() > maxTime;
+          }
+          return time.getTime() > Date.now();
+        }
+      },
       date: "2",
-      pickerVal2: [new Date(),new Date()],
+      pickerVal2: [new Date(), new Date()],
       radio: "1",
       tindoorFillRate: "", //室内温度满足率
       energySavingRate: "", //节能率
@@ -131,7 +131,7 @@ export default {
       isExecutedNum: "", //已执行数量
       allReceivedNum: "", //共收到数量
       tindoorOverrunDegree: "", //超限程度
-      energyDataList:[] //图标数据
+      energyDataList: [] //图标数据
     };
   },
   components: {
@@ -143,9 +143,10 @@ export default {
   },
   mounted() {
     this.query();
+    console.log(this.projects.projects, this.projectId);
   },
-  computed:{
-     ...mapGetters(['projectId']),
+  computed: {
+    ...mapGetters(["projects", "projectId"])
   },
   methods: {
     formatter(date) {
@@ -154,10 +155,10 @@ export default {
     query() {
       this.runDataQuryArr = [];
       let getParams = {
-        begin:timestamp2String(this.pickerVal2[0]).slice(0,8),
-        end:timestamp2String(this.pickerVal2[1]).slice(0,8)
-      }
-      runDataQury({getParams}).then(res => {
+        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; //节能率
@@ -166,8 +167,8 @@ export default {
           this.isExecutedNum = res.isExecutedNum; //已执行数量
           this.allReceivedNum = res.allReceivedNum; //共收到数量
           this.tindoorOverrunDegree = res.tindoorOverrunDegree; //超限程度
-          this.energyDataList = res.dataList
-          console.log(this.energyDataList)
+          this.energyDataList = res.dataList;
+          console.log(this.energyDataList);
         }
       });
     },
@@ -179,7 +180,7 @@ export default {
     //   }
     //   energyDayQuery(params).then(res=>{
     //     console.log(res)
-        
+
     //   })
     // },
     daterangeLeft() {