zhulizhen 5 years ago
parent
commit
49e3b3f2c1

+ 1 - 1
src/api/doBusiness/business.js

@@ -1,7 +1,7 @@
 import httputils from '@/api/httputils'
 import store from '@/store'
 export function queryHours({postParams}) {
-    return httputils.postJson(`/duoduo-service/transfer/chiller/business/hours/query?projectId=${store.state.projectId}`, postParams)
+    return httputils.postJson(`/duoduo-service/transfer/chiller/command/business/hours/query?projectId=${store.state.projectId}`, postParams)
 }
 export function updateHours({postParams}) {
     return httputils.postJson(`/duoduo-service/transfer/chiller/business/hours/save?projectId=${store.state.projectId}`, postParams)

+ 4 - 0
src/api/strategy/strategy.js

@@ -11,4 +11,8 @@ export function getCommand({postParams}) {
 //修改策略备注
 export function updateCommand({postParams}) {
     return httputils.postJson(`/duoduo-service/transfer/chiller/command/update?projectId=${store.state.projectId}`, postParams)
+}
+//查看快照
+export function queryQuickData({getParams}) {
+    return httputils.getJson(`/duoduo-service/transfer/chiller/command/queryHisData?projectId=${store.state.projectId}`, getParams)
 }

+ 8 - 3
src/views/appeal/index.vue

@@ -39,7 +39,7 @@
                                         </div>
                                         <div v-else class='refute2'></div>
                                         <div class='btn'>
-                                            <el-button size='mini' @click='viewSnapshots = true'>查看快照</el-button>
+                                            <el-button size='mini' @click='lookQuickData(item)'>查看快照</el-button>
                                             <el-button size='mini' type='primary' @click='menu(item)'>申诉</el-button>
                                         </div>
                                     </div>
@@ -107,7 +107,7 @@
         </div>
         <div class='view-dialog'>
             <el-dialog title='策略推出时状况' :visible.sync='viewSnapshots' :close-on-click-modal='false' width='1260px'>
-                <ev-snapshots-dialog :appealsDate='appealsDate'></ev-snapshots-dialog>
+                <ev-snapshots-dialog :appealsDate='appealsDate' :time='time'></ev-snapshots-dialog>
             </el-dialog>
         </div>
     </div>
@@ -135,7 +135,8 @@ export default {
             busy: true,
             page: 1,
             pageSize: 15,
-            loading: false
+            loading: false,
+            time:""
         }
     },
     components: {
@@ -147,6 +148,10 @@ export default {
         console.log(1)
     },
     methods: {
+        lookQuickData(item){
+            this.viewSnapshots = true
+            this.time = item.recommend.time
+        },
         backoutClick(item, type) {
             let params = {
                 postParams: {

+ 14 - 6
src/views/doBusiness/index.vue

@@ -15,6 +15,7 @@
           >
           <el-time-picker
             is-range
+            :class="{isBlue:item.isUpdate}"
             v-model="item.timeRange"
             size="mini"
             range-separator="-"
@@ -114,7 +115,7 @@ export default {
         }
       }
       updateHours(params).then(res=>{
-        console.log(res)
+      this.getHours()
       })
     },
     // 只展示当前月份的
@@ -134,13 +135,10 @@ export default {
   width: 148px;
   padding: 16px;
 }
+
 .doBusinessContainer {
   margin-top: 20px;
   background: #fff;
-  .isBlue{
-    background:rgba(0,145,255,1);
-    color: #fff;
-  }
   .time-duration {
     .el-input__inner {
       width: 134px;
@@ -162,7 +160,6 @@ export default {
       background: rgba(245, 246, 247, 1);
     }
   }
-
 }
 </style>
 <style lang="scss">
@@ -186,5 +183,16 @@ export default {
   .el-calendar-table .el-calendar-day {
     display: flex;
   }
+  .isBlue{
+      color: #fff !important;  
+      background:rgba(0,145,255,1) !important;
+      .el-range-input {
+        color: #fff !important;  
+        background:rgba(0,145,255,1) !important;
+      }
+      .el-range-separator {
+        color: #fff !important;  
+      }
+  }
 }
 </style>

+ 9 - 3
src/views/evaluate/evCard.vue

@@ -32,7 +32,7 @@
             申诉中
           </span>
         </span>
-        <span class="MicrYaHei" @click="viewSnapshots = true">查看快照</span>
+        <span class="MicrYaHei" @click="lookQuickData(item)">查看快照</span>
       </div>
     </div>
     <div class="view-dialog">
@@ -42,7 +42,7 @@
         :close-on-click-modal="false"
         width="1260px"
       >
-        <ev-snapshots-dialog :appealsDate='date'></ev-snapshots-dialog>
+        <ev-snapshots-dialog :appealsDate='date' :time='time'></ev-snapshots-dialog>
       </el-dialog>
     </div>
   </div>
@@ -57,7 +57,8 @@ export default {
     return {
       viewSnapshots: false,
       ids:[],
-      titles:[]
+      titles:[],
+      time:""
     };
   },
   props: ["cardList",'date'],
@@ -65,6 +66,11 @@ export default {
     EvSnapshotsDialog
   },
   methods: {
+    lookQuickData(item){
+      console.log(item)
+      this.time = item.recommend.time
+      this.viewSnapshots = true
+    },
     formatterStr2(str) {
       if (str) {
         return str.substring(0, 2) + ":" + str.substring(2, 4);

+ 8 - 7
src/views/evaluate/evSnapshotsDialog.vue

@@ -130,9 +130,9 @@
 </template>
 <script>
 import echarts from "echarts";
-import { queryCommand, getCommand } from "@/api/strategy/strategy.js";
+import { queryQuickData, getCommand } from "@/api/strategy/strategy.js";
 export default {
-  props:['appealsDate'],
+  props:['appealsDate','time'],
   data() {
     return {
       imgFinish: true,
@@ -175,13 +175,14 @@ export default {
     getQuickData() {
       let params = {
         getParams: {
-          date: this.appealsDate //日期 yyyyMMdd
+          date: this.appealsDate, //日期 yyyyMMdd
+          time: this.time
         }
       };
-      queryCommand(params).then(res => {
-        this.chillerOrg = res.chillerOrg;
-        this.chillerCommand = res.chillerCommand;
-        this.chillerHourList = res.chillerHourList;
+      queryQuickData(params).then(res => {
+        this.chillerOrg = res.chillerOrg || {};
+        this.chillerCommand = res.chillerCommand || {};
+        this.chillerHourList = res.chillerHourList || [];
         this.drawData();
       });
     },

+ 15 - 3
src/views/evaluate/evTwoLevelMenu.vue

@@ -23,8 +23,8 @@
           <div v-if="num == 1">
             <ev-rate-title :tab="1" :rate="tindoorFillRate"></ev-rate-title>
             <div class="count-bottom-switch">
-              <span class="switchSpan">只显示不满足的点位</span>
-              <el-switch v-model="value2"></el-switch>
+              <span class="switchSpan" >只显示不满足的点位</span>
+              <el-switch v-model="value2" @change="changeNum('1')"></el-switch>
             </div>
             <div class="count-bottom-content">
               <ev-two-table v-if="dataList.length>0" :switch="value2" :dataList="dataList"></ev-two-table>
@@ -117,6 +117,14 @@ export default {
     this.init();
   },
   methods: {
+    // changeSwitch(){
+    //   let getParams = {
+    //     isSatisfy:this.value2    
+    //   }
+    //   queryTdbDay({getParams}).then(res=>{
+
+    //   })
+    // },
     init() {
       this.type = this.$route.query.type;
       this.date = this.$route.query.name;
@@ -148,7 +156,11 @@ export default {
         //   children: []
         // }
       };
-      queryTdbDay(date, {}).then(res => {
+      // isSatisfy:this.value2
+      let getParams={
+        isSatisfy:this.value2
+      }
+      queryTdbDay(date, {getParams}).then(res => {
         this.tindoorFillRate = res.tindoorFillRate;
         console.log("室内温度满足率", res);
         let content = res.content;

+ 1 - 1
src/views/strategy/animationBox.vue

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

+ 0 - 12
src/views/strategy/index.vue

@@ -105,18 +105,6 @@ 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;
-    //   });
-    // },
     getChiller() {
       let params = {
         getParams: {}