Merge branch 'master' of git.sagacloud.cn:sagacloud/sagacloud-cwc-pages

src/views/appeal/index.vue

@@ -111,7 +111,7 @@
         :close-on-click-modal="false"
         width="1260px"
       >
-        <ev-snapshots-dialog></ev-snapshots-dialog>
+        <ev-snapshots-dialog :appealsDate='appealsDate'></ev-snapshots-dialog>
       </el-dialog>
     </div>
   </div>

src/views/evaluate/evCard.vue

@@ -42,7 +42,7 @@
         :close-on-click-modal="false"
         width="1260px"
       >
-        <ev-snapshots-dialog></ev-snapshots-dialog>
+        <ev-snapshots-dialog :appealsDate='date'></ev-snapshots-dialog>
       </el-dialog>
     </div>
   </div>
@@ -60,7 +60,7 @@ export default {
       titles:[]
     };
   },
-  props: ["cardList"],
+  props: ["cardList",'date'],
   components: {
     EvSnapshotsDialog
   },

src/views/evaluate/evSnapshotsDialog.vue

@@ -132,6 +132,7 @@
 import echarts from "echarts";
 import { queryCommand, getCommand } from "@/api/strategy/strategy.js";
 export default {
+  props:['appealsDate'],
   data() {
     return {
       imgFinish: true,
@@ -152,7 +153,6 @@ export default {
           img2: require("../../assets/wrong.png")
         }
       ],
-      today: "",
       chillerOrg: {},
       chillerCommand: {},
       chillerHourList: [],
@@ -167,26 +167,15 @@ export default {
     };
   },
   mounted() {
-    this.formatTime();
+    
     this.getQuickData();
   },
   methods: {
-    formatTime() {
-      let year = new Date().getFullYear();
-      let month =
-        new Date().getMonth() + 1 > 10
-          ? new Date().getMonth() + 1
-          : "0" + (new Date().getMonth() + 1);
-      let date =
-        new Date().getDate() > 10
-          ? new Date().getDate()
-          : "0" + new Date().getDate();
-      return (this.today = year + "" + month + "" + date);
-    },
+   
     getQuickData() {
       let params = {
         getParams: {
-          date: this.today //日期 yyyyMMdd
+          date: this.appealsDate //日期 yyyyMMdd
         }
       };
       queryCommand(params).then(res => {

src/views/evaluate/evTwoLevelMenu.vue

@@ -55,7 +55,7 @@
           </div>
           <div v-show="num == 3">
             <ev-rate-title :tab="3"></ev-rate-title>
-            <ev-card v-if="cardList.length>0" :cardList="cardList"></ev-card>
+            <ev-card v-if="cardList.length>0" :cardList="cardList" :date='date'></ev-card>
           </div>
         </div>
       </div>

src/views/strategy/animationBox.vue

@@ -66,7 +66,7 @@ import bomBox from "./bomBox";
 export default {
   data() {
     return {
-      showDraw: false,
+      showDraw: true,
       dataX: [],
       dataY1: [],
       dataY2: [],

src/views/strategy/index.vue

@@ -35,7 +35,7 @@
           v-if="chillerHourList.length>0"
           :data="chillerCommand"
           :chillerHourList="chillerHourList"
-          :chillerCommandQ="chillerCommandQ"
+          :chillerCommandQ="chillerCommand"
         ></animation-box>
       </div>
     </div>
@@ -59,15 +59,12 @@ export default {
       showTodayStrategy: false,
       tableData: [],
       chillerCommand: {},
-      chillerCommandQ: {},
       chillerCount: 0,
       chillerIsNotExecutedCount: 0,
       today: "",
       now: "",
       chillerOrg: {},
-      chillerOrgQ: {},
       chillerHourList: [],
-      chillerHourListQ: [],
       idArr: []
     };
   },
@@ -108,18 +105,18 @@ export default {
           : new Date(datetime).getMinutes();
       return (this.now = hours + "" + minute);
     },
-    getQuickData() {
-      let params = {
-        getParams: {
-          date: this.today //日期 yyyyMMdd
-        }
-      };
-      queryCommand(params).then(res => {
-        this.chillerOrgQ = res.chillerOrg;
-        this.chillerCommandQ = res.chillerCommand;
-        this.chillerHourListQ = res.chillerHourList;
-      });
-    },
+    // getQuickData() {
+    //   let params = {
+    //     getParams: {
+    //       date: this.today //日期 yyyyMMdd
+    //     }
+    //   };
+    //   queryCommand(params).then(res => {
+    //     this.chillerOrgQ = res.chillerOrg;
+    //     this.chillerCommandQ = res.chillerCommand;
+    //     this.chillerHourListQ = res.chillerHourList;
+    //   });
+    // },
     getChiller() {
       let params = {
         getParams: {}
@@ -165,7 +162,7 @@ export default {
     // setInterval(function(){
     //    vm.getData()
     // },1500)
-    this.getQuickData();
+    // this.getQuickData();
     this.getChiller();
   }
 };