Pārlūkot izejas kodu

之江bug修改

zhaojijng 3 gadi atpakaļ
vecāks
revīzija
ec4ef9045c

+ 5 - 1
src/store/index.ts

@@ -2,7 +2,7 @@ import Vue from "vue";
 import Vuex from "vuex";
 import axios from "@/utils/axios";
 import api from "@/api/index";
-
+import moment from "moment";
 Vue.use(Vuex);
 
 let projectId: any = (<any>window).projectId;
@@ -88,10 +88,14 @@ export default new Vuex.Store({
 
         getLastAllEnergy({ state, commit }, data) {
             //上月所有能耗数据  上月总能耗 上月节约能耗
+            var monthTime = moment().subtract(1, "month"); //往前取15分钟
+            var monthTimeStr = monthTime.format("YYYYMM");
+
             axios
                 .post(api.queryLastAllEnergy, {
                     criteria: {
                         projectId: projectId,
+                        yyyymm: monthTimeStr,
                     },
                 })
                 .then((res: any) => {

+ 4 - 4
src/views/valueDelivery/lastEnergyChart.vue

@@ -135,10 +135,10 @@ export default {
                             dateStr.substr(6, 2);
                         item.value = Number(
                             (
-                                item.energyAcTerminal +
-                                item.energyCooling +
-                                item.energyHeating +
-                                item.energyLight
+                                (item.energyAcTerminal||0) +
+                                (item.energyCooling||0) +
+                                (item.energyHeating||0) +
+                                (item.energyLight||0)+(item.energyOthers||0)
                             ).toFixed(0)
                         );
                     });

+ 5 - 5
src/views/valueDelivery/pageHead.vue

@@ -1,9 +1,9 @@
 <template>
     <div class="horHead horSty">
         <div class="horHead-content">
-            <!-- <img :src="title" /> 北京中海OFFICEZIP -->
-            <!-- <div class="firtitle">之江实验室一期西区</div> -->
-            <div class="firtitle">北京中海OFFICEZIP</div>
+            <!-- <img :src="title" /> 北京中海OFFICEZIP  -->
+            <div class="firtitle">之江实验室一期西区</div>
+            <!-- <div class="firtitle">北京中海OFFICEZIP</div> -->
             <div class="sectitle">懂空间,更懂办公</div>
         </div>
         <div></div>
@@ -46,8 +46,8 @@ import moment from "moment";
 export default Vue.extend({
     data() {
         return {
-            //logo: zhijiangLogo,
-            logo:persagyLogo,
+            logo: zhijiangLogo,
+            //logo:persagyLogo,
             title: title,
             changeVer: changeVer,
             changeHor: changeHor,