Merge remote-tracking branch 'origin' into dev_wanke

src/components/strategyLine.vue

@@ -1,356 +1,394 @@
 <template>
-  <div class="line-container">
-    <div class="leftL">
-      <div class="leftLengend">
-        <i class="outIcon"></i> 室外温度 <i class="innerIcon"></i> 室内平均温度
-        <i class="innerMax"></i> 室内最高温度
-      </div>
+    <div class='line-container'>
+        <div class='leftL'>
+            <div class='leftLengend'>
+                <i class='outIcon'></i> 室外温度
+                <i class='innerIcon'></i> 室内平均温度
+                <i class='innerMax'></i> 室内最高温度
+            </div>
 
-      <div style="width:100%;height:100%;">
-        <div id="leftLine" style="width:100%;height:100%;"></div>
-      </div>
-    </div>
-    <div class="rightL">
-      <div class="rightLengend">
-        <i class="blue-bg"></i> 实际供冷量
-        <i class="preCool"></i>
-        预测冷量
-      </div>
+            <div style='width:100%;height:100%;'>
+                <div id='leftLine' style='width:100%;height:100%;'></div>
+            </div>
+        </div>
+        <div class='rightL'>
+            <div class='rightLengend'>
+                <i class='blue-bg'></i> 实际供冷量
+                <i class='preCool'></i>
+                预测冷量
+            </div>
 
-      <div style="width:100%;height:100%;">
-        <div id="RightLine" style="width:100%;height:100%;"></div>
-      </div>
+            <div style='width:100%;height:100%;'>
+                <div id='RightLine' style='width:100%;height:100%;'></div>
+            </div>
+        </div>
     </div>
-  </div>
 </template>
 
 <script>
-import echarts from "echarts";
+import echarts from 'echarts'
 
 export default {
-  data() {
-    return {
-      dataX: [],
-      loadX: [],
-      dataY1: [],
-      dataY2: [],
-      dataY3: [],
-      loadY1: [],
-      loadY2: [],
-      loadY3: [],
-      dataY1Min: "",
-      dataY1Max: ""
-    };
-  },
-  props: ["chillerList"],
-  methods: {
-    getMax(arr) {
-      var max = arr[0];
-      for (var i = 0; i < arr.length; i++) {
-        if (max < arr[i]) {
-          max = arr[i];
-        }
-      }
-      return max;
-    },
-    getMin(arr) {
-      var min = arr[0];
-      for (var i = 0; i < arr.length; i++) {
-        if (arr[i] == "") {
-          arr.splice(arr[i], 1);
+    data() {
+        return {
+            dataX: [],
+            loadX: [],
+            dataY1: [],
+            dataY2: [],
+            dataY3: [],
+            loadY1: [],
+            loadY2: [],
+            loadY3: [],
+            loadY4: [],
+            dataY1Min: '',
+            dataY1Max: ''
         }
-        if (min > arr[i]) {
-          min = arr[i];
-        }
-      }
-
-      return min;
     },
-    drawData() {
-      this.dataY1 = [];
-      this.dataX = [];
-      this.loadX = [];
-      this.dataY2 = [];
-      this.dataY3 = [];
-      this.loadY1 = [];
-      this.loadY2 = [];
-      this.loadY3 = [];
-      this.chillerList.forEach(el => {
-        el.value = el.time.slice(0, 2) + ":" + el.time.slice(2, 4);
-        this.dataX.push(el.value);
-        this.loadX.push(el.value);
-        this.dataY1.push(el.tout == "-9999" ? undefined : el.tout);
-        this.dataY2.push(
-          el.meanTindoor == "-9999" ? undefined : el.meanTindoor
-        );
-        this.dataY3.push(el.maxTindoor == "-9999" ? undefined : el.maxTindoor);
-        this.loadY1.push(
-          el.nowPlantLoad == "-9999" && el.nowPlantLoad == "-9998"
-            ? undefined
-            : el.nowPlantLoad
-        );
-        this.loadY2.push(
-          el.predictedLoadUpLimit != "-9999" &&
-            el.predictedLoadUpLimit != "-9998"
-            ? el.predictedLoadUpLimit
-            : undefined
-        );
-        this.loadY3.push(
-          el.redictedLoadDownLimit != "-9999" &&
-            el.redictedLoadDownLimit != "-9998"
-            ? el.redictedLoadDownLimit
-            : undefined
-        );
-      });
-      let arr = [];
-      arr = arr
-        .concat(this.dataY1)
-        .concat(this.dataY2)
-        .concat(this.dataY3);
-      this.dataY1Min = this.getMin(arr);
-      this.dataY1Max = this.getMax(arr);
-      let minG = parseInt(this.dataY1Min % 10),
-        minS = parseInt((this.dataY1Min % 100) / 10),
-        maxG = parseInt(this.dataY1Max % 10),
-        maxS = parseInt((this.dataY1Max % 100) / 10);
-      if (minG > 5) {
-        this.dataY1Min = String(minS) + "5";
-      } else if (minG <= 5) {
-        this.dataY1Min = String(minS) + "0";
-      }
-      if (maxG > 5) {
-        this.dataY1Max = String(maxS + 1) + "0";
-      } else if (maxG <= 5) {
-        this.dataY1Max = String(maxS) + "5";
-      }
-      this.drawLeft();
-      this.drawRight();
-    },
-    drawLeft() {
-      var leftLine = echarts.init(document.getElementById("leftLine"));
-      let option = {
-        tooltip: {
-          trigger: "axis",
-          formatter: function(data) {
-            let val1 = "",
-              val2 = "",
-              val3 = "";
-            data.forEach(i => {
-              console.log(i);
-              if (i.seriesName == "室外温度") {
-                val1 = `<br/>室外温度：${i.value ? i.value.toFixed(1) : ""}`;
-              }
-              if (i.seriesName == "室内平均温度") {
-                val2 = `<br/>室内平均温度：${
-                  i.value ? i.value.toFixed(1) : ""
-                }`;
-              }
-              if (i.seriesName == "室内最高温度") {
-                val3 = `<br/>室内最高温度：${
-                  i.value ? i.value.toFixed(1) : ""
-                }`;
-              }
-            });
-            return `${data[0].name}${val1}${val2}${val3}`;
-          }
+    props: ['chillerList'],
+    methods: {
+        getMax(arr) {
+            var max = arr[0]
+            for (var i = 0; i < arr.length; i++) {
+                if (max < arr[i]) {
+                    max = arr[i]
+                }
+            }
+            return max
         },
-        title: {
-          text: "室内外温度",
-          fontSize: "16px",
-          color: "#1F2429"
+        getMin(arr) {
+            var min = arr[0]
+            for (var i = 0; i < arr.length; i++) {
+                if (arr[i] == '') {
+                    arr.splice(arr[i], 1)
+                }
+                if (min > arr[i]) {
+                    min = arr[i]
+                }
+            }
+            return min
         },
-
-        grid: {
-          left: "3%",
-          right: "4%",
-          bottom: "3%",
-          containLabel: true
+        drawData() {
+            this.dataY1 = []
+            this.dataX = []
+            this.loadX = []
+            this.dataY2 = []
+            this.dataY3 = []
+            this.loadY1 = []
+            this.loadY2 = []
+            this.loadY3 = []
+            this.loadY4 = []
+            this.chillerList.forEach(el => {
+                el.value = el.time.slice(0, 2) + ':' + el.time.slice(2, 4)
+                this.dataX.push(el.value)
+                this.loadX.push(el.value)
+                this.dataY1.push(el.tout == '-9999' ? undefined : el.tout)
+                this.dataY2.push(el.meanTindoor == '-9999' ? undefined : el.meanTindoor)
+                this.dataY3.push(el.maxTindoor == '-9999' ? undefined : el.maxTindoor)
+                this.loadY1.push(el.nowPlantLoad == '-9999' && el.nowPlantLoad == '-9998' ? undefined : el.nowPlantLoad)
+                this.loadY2.push({
+                    predictedLoadUpLimit:
+                        el.predictedLoadUpLimit != '-9999' && el.predictedLoadUpLimit != '-9998' ? el.predictedLoadUpLimit : undefined,
+                    predictedLoadDownLimit:
+                        el.predictedLoadDownLimit != '-9999' && el.predictedLoadDownLimit != '-9998' ? el.predictedLoadDownLimit : undefined
+                })
+                this.loadY3.push(el.predictedLoadDownLimit != '-9999' && el.predictedLoadDownLimit != '-9998' ? el.predictedLoadDownLimit : undefined)
+            })
+            this.loadY4 = this.loadY2.map(value => {
+                if (value.predictedLoadUpLimit != undefined && value.predictedLoadDownLimit != undefined) {
+                    return value.predictedLoadUpLimit - value.predictedLoadDownLimit
+                } else {
+                    return undefined
+                }
+            })
+            this.loadY3.unshift(undefined, undefined, undefined, undefined)
+            this.loadY4.unshift(undefined, undefined, undefined, undefined)
+            let arr = []
+            arr = arr
+                .concat(this.dataY1)
+                .concat(this.dataY2)
+                .concat(this.dataY3)
+            this.dataY1Min = this.getMin(arr)
+            this.dataY1Max = this.getMax(arr)
+            let minG = parseInt(this.dataY1Min % 10),
+                minS = parseInt((this.dataY1Min % 100) / 10),
+                maxG = parseInt(this.dataY1Max % 10),
+                maxS = parseInt((this.dataY1Max % 100) / 10)
+            if (minG > 5) {
+                this.dataY1Min = String(minS) + '5'
+            } else if (minG <= 5) {
+                this.dataY1Min = String(minS) + '0'
+            }
+            if (maxG >= 5) {
+                this.dataY1Max = String(maxS + 1) + '0'
+            } else if (maxG < 5) {
+                this.dataY1Max = String(maxS) + '5'
+            }
+            this.drawLeft()
+            this.drawRight()
         },
+        drawLeft() {
+            var leftLine = echarts.init(document.getElementById('leftLine'))
+            let option = {
+                tooltip: {
+                    trigger: 'axis',
+                    formatter: function(data) {
+                        let val1 = '',
+                            val2 = '',
+                            val3 = ''
+                        data.forEach(i => {
+                            if (i.seriesName == '室外温度') {
+                                val1 = `<br/>室外温度：${i.value ? i.value.toFixed(1) : ''}`
+                            }
+                            if (i.seriesName == '室内平均温度') {
+                                val2 = `<br/>室内平均温度：${i.value ? i.value.toFixed(1) : ''}`
+                            }
+                            if (i.seriesName == '室内最高温度') {
+                                val3 = `<br/>室内最高温度：${i.value ? i.value.toFixed(1) : ''}`
+                            }
+                        })
+                        return `${data[0].name}${val1}${val2}${val3}`
+                    }
+                },
+                title: {
+                    text: '室内外温度',
+                    fontSize: '16px',
+                    color: '#1F2429'
+                },
 
-        xAxis: {
-          type: "category",
-          boundaryGap: false,
-          data: this.dataX
-        },
-        yAxis: {
-          type: "value",
-          min: Number(this.dataY1Min),
-          max: Number(this.dataY1Max),
-          interval: 2,
-          axisLabel: { formatter: "{value}  ℃" }
-        },
-        series: [
-          {
-            name: "室外温度",
-            type: "line",
+                grid: {
+                    left: '3%',
+                    right: '4%',
+                    bottom: '3%',
+                    containLabel: true
+                },
 
-            data: this.dataY1,
-            color: "#0091FF"
-          },
-          {
-            name: "室内平均温度",
-            type: "line",
+                xAxis: {
+                    type: 'category',
+                    boundaryGap: false,
+                    data: this.dataX
+                },
+                yAxis: {
+                    type: 'value',
+                    min: Number(this.dataY1Min),
+                    max: Number(this.dataY1Max),
+                    interval: 2,
+                    axisLabel: { formatter: '{value}  ℃' }
+                },
+                series: [
+                    {
+                        name: '室外温度',
+                        type: 'line',
 
-            data: this.dataY2,
-            color: "#00D6B9"
-          },
-          {
-            name: "室内最高温度",
-            type: "line",
+                        data: this.dataY1,
+                        color: '#0091FF'
+                    },
+                    {
+                        name: '室内平均温度',
+                        type: 'line',
 
-            data: this.dataY3,
-            color: "#FFBA6B"
-          }
-        ]
-      };
-      leftLine.setOption(option);
-    },
-    drawRight() {
-      var RightLine = echarts.init(document.getElementById("RightLine"));
-      RightLine.setOption({
-        tooltip: {
-          trigger: "axis",
-          axisPointer: {
-            type: "cross",
-            animation: false,
-            label: {
-              backgroundColor: "#ccc",
-              borderColor: "#aaa",
-              borderWidth: 1,
-              shadowBlur: 0,
-              shadowOffsetX: 0,
-              shadowOffsetY: 0,
-              color: "#222"
-            }
-          }
-        },
-        grid: {
-          left: "3%",
-          right: "4%",
-          bottom: "3%",
-          containLabel: true
-        },
-        title: {
-          text: "预测冷量",
-          fontSize: "16px",
-          color: "#1F2429"
-        },
-        xAxis: {
-          type: "category",
-          data: this.loadX
-        },
-        yAxis: {
-          splitLine: {
-            lineStyle: {
-              type: "dotted"
+                        data: this.dataY2,
+                        color: '#00D6B9'
+                    },
+                    {
+                        name: '室内最高温度',
+                        type: 'line',
+
+                        data: this.dataY3,
+                        color: '#FFBA6B'
+                    }
+                ]
             }
-          },
-          axisLabel: { formatter: "{value}  kW" }
+            leftLine.setOption(option)
         },
-        series: [
-          {
-            name: "L",
-            type: "line",
-            data: this.loadY2,
-            lineStyle: {
-              opacity: 0
-            },
-            stack: "confidence-band",
-            symbol: "none"
-          },
-          {
-            name: "U",
-            type: "line",
-            data: this.loadY3,
-            lineStyle: {
-              opacity: 0
-            },
-            areaStyle: {
-              color: "#ccc"
-            },
-            stack: "confidence-band"
-            // symbol: 'none'
-          },
-          {
-            type: "line",
-            data: this.loadY1,
-            // hoverAnimation: false,
-            // symbolSize: 6,
-            itemStyle: {
-              color: "#0091FF"
+        drawRight() {
+            var RightLine = echarts.init(document.getElementById('RightLine'))
+            RightLine.setOption({
+                backgroundColor: '#fff',
+                tooltip: {
+                    trigger: 'axis',
+                    axisPointer: {
+                        type: 'cross',
+                        animation: false,
+                        label: {
+                            backgroundColor: '#ccc',
+                            borderColor: '#aaa',
+                            borderWidth: 1,
+                            shadowBlur: 0,
+                            shadowOffsetX: 0,
+                            shadowOffsetY: 0,
+                            color: '#222'
+                        }
+                    },
+                    formatter: function(data) {
+                        let val1 = '',
+                            val2 = '',
+                            val3 = ''
+                        data.forEach(i => {
+                            if (i.seriesName == '预测冷量上限') {
+                                val1 = `${i.value != undefined ? i.value.toFixed(1) : ''}`
+                            }
+                            if (i.seriesName == '预测冷量下限') {
+                                val2 = `${i.value != undefined ? i.value.toFixed(1) : ''}`
+                            }
+                            if (i.seriesName == '实际供冷量') {
+                                val3 = `${i.value != undefined ? i.value.toFixed(1) : ''}`
+                            }
+                        })
+                        if (val1 && val2) {
+                            val1 = (Number(val1) + Number(val2)).toFixed(1)
+                        } else {
+                            val1 = ''
+                        }
+                        return `${data[0].name}<br/>预测冷量上限：${val1 ? val1 : '--'}<br/>预测冷量下限：${val2 ? val2 : '--'}<br/>实际供冷量：${
+                            val3 ? val3 : '--'
+                        }`
+                    }
+                },
+                grid: {
+                    left: '3%',
+                    right: '4%',
+                    bottom: '3%',
+                    containLabel: true
+                },
+                xAxis: {
+                    type: 'category',
+                    data: this.loadX
+                },
+                yAxis: {
+                    splitLine: {
+                        lineStyle: {
+                            type: 'dotted'
+                        }
+                    },
+                    axisLabel: { formatter: '{value}  kW' }
+                },
+                series: [
+                    {
+                        name: '实际供冷量',
+                        type: 'line',
+                        data: this.loadY1,
+                        itemStyle: {
+                            color: '#0091FF'
+                        }
+                    },
+                    {
+                        name: '预测冷量下限',
+                        type: 'line',
+                        stack: '总量',
+
+                        areaStyle: {},
+                        data: this.loadY3,
+                        itemStyle: {
+                            color: '#fff'
+                        }
+                    },
+                    {
+                        name: '预测冷量上限',
+                        type: 'line',
+                        stack: '总量',
+                        areaStyle: {},
+                        color: '#B6E0FF',
+                        data: this.loadY4
+                    }
+                    // {
+                    //     name: '预测冷量上限',
+                    //     type: 'line',
+                    //     data: this.loadY2,
+                    //     color: '#B6E0FF',
+                    //     areaStyle: {
+                    //         normal: {
+                    //             color: '#B6E0FF'
+                    //         }
+                    //     }
+                    //     // lineStyle: {
+                    //     //     opacity: 0
+                    //     // },
+                    //     // stack: 'confidence-band',
+                    //     // symbol: 'none'
+                    // },
+                    // {
+                    //     name: '预测冷量下限',
+                    //     type: 'line',
+                    //     data: this.loadY3,
+                    //     color: '#B6E0FF',
+                    //     areaStyle: {
+                    //         normal: {
+                    //             color: '#fff'
+                    //         }
+                    //     }
+                    //     // stack: 'confidence-band',
+                    //     // symbol: 'none'
+                    // }
+                ]
+            })
+        }
+    },
+    mounted() {
+        this.$nextTick(function() {
+            this.drawData()
+        })
+    },
+    watch: {
+        chillerList: {
+            immediate: true,
+            handler(val, old) {
+                if (old) {
+                    this.drawData()
+                }
             }
-            // showSymbol: false
-          }
-        ]
-      });
-    }
-  },
-  mounted() {
-    this.$nextTick(function() {
-      this.drawData();
-    });
-  },
-  watch: {
-    chillerList: {
-      immediate: true,
-      handler(val, old) {
-        if (old) {
-          this.drawData();
         }
-      }
     }
-  }
-};
+}
 </script>
 <style lang="scss" scoped>
 .line-container {
-  width: 100%;
-  height: 100%;
-  display: flex;
-  .leftL {
-    width: 45%;
-    flex: 1;
-    .leftLengend {
-      text-align: center;
-      margin-bottom: 10px;
-      i {
-        display: inline-block;
-        width: 16px;
-        height: 6px;
-        border-radius: 3px;
-        vertical-align: middle;
-      }
-      .innerIcon {
-        background: rgba(0, 214, 185, 1);
-        margin: 0 20px;
-      }
-      .outIcon {
-        background: rgba(0, 145, 255, 1);
-      }
-      .innerMax {
-        background: rgba(255, 186, 107, 1);
-      }
+    width: 100%;
+    height: 100%;
+    display: flex;
+    .leftL {
+        width: 45%;
+        flex: 1;
+        .leftLengend {
+            text-align: center;
+            margin-bottom: 10px;
+            i {
+                display: inline-block;
+                width: 16px;
+                height: 6px;
+                border-radius: 3px;
+                vertical-align: middle;
+            }
+            .innerIcon {
+                background: rgba(0, 214, 185, 1);
+                margin: 0 20px;
+            }
+            .outIcon {
+                background: rgba(0, 145, 255, 1);
+            }
+            .innerMax {
+                background: rgba(255, 186, 107, 1);
+            }
+        }
     }
-  }
-  .rightL {
-    flex: 1;
-    width: 45%;
-    .rightLengend {
-      text-align: center;
-      margin-bottom: 10px;
-      i {
-        display: inline-block;
-        width: 16px;
-        height: 6px;
-        border-radius: 3px;
-        vertical-align: middle;
-      }
-      .preCool {
-        background: #0091ff;
-        opacity: 0.29;
-        margin-left: 20px;
-      }
+    .rightL {
+        flex: 1;
+        width: 45%;
+        .rightLengend {
+            text-align: center;
+            margin-bottom: 10px;
+            i {
+                display: inline-block;
+                width: 16px;
+                height: 6px;
+                border-radius: 3px;
+                vertical-align: middle;
+            }
+            .preCool {
+                background: #0091ff;
+                opacity: 0.29;
+                margin-left: 20px;
+            }
+        }
     }
-  }
 }
 </style>

src/views/evaluate/evCard.vue

@@ -43,7 +43,7 @@
                     </span>
                 </div>
 
-                <div class='card-div4'>备注：{{item.h||'--'}}</div>
+                <div class='card-div4'>备注：{{item.recommend.remarks||'--'}}</div>
                 <div class='card-div5'>
                     <span class='card-div7' v-if='item.recommend.isExecuted'>
                         <img src='../../assets/completed.png' alt />
@@ -101,8 +101,9 @@ export default {
     },
     methods: {
         lookQuickData(item) {
-            this.time = item.recommend.time
-            this.viewSnapshots = true
+            this.time = item.recommend.time;
+            this.date=item.recommend&&item.recommend.date ;
+            this.viewSnapshots = true;
         },
         formatterStr2(str) {
             if (str) {
@@ -132,8 +133,15 @@ export default {
         this.getAppealId()
     },
     watch: {
-        cardList(n, o) {
-            this.getAppealId()
+        cardList: {
+            handler(n){
+                this.cardList=n;
+                this.getAppealId()
+            },
+            deep:true
+        },
+        date(n){
+            this.date=n;
         }
     }
 }
@@ -144,7 +152,9 @@ export default {
     display: flex;
     flex-wrap: wrap;
     .count-card {
-        min-width: 436px;
+        width: 530px;
+        // min-width: 436px;
+        // max-width: 510px;
         margin-right: 6px;
         margin-top: 16px;
         padding: 16px 20px;
@@ -160,6 +170,7 @@ export default {
             display: flex;
             justify-content: space-between;
             align-items: center;
+            // width: 480px;
         }
         .card-div1 {
             height: 22px;
@@ -219,12 +230,12 @@ export default {
             margin-bottom: 16px;
         }
         .card-div4 {
-            height: 20px;
+            // height: 20px;
             font-size: 14px;
             font-family: PingFangSC-Regular, PingFang SC;
             font-weight: 400;
             color: rgba(100, 108, 115, 1);
-            line-height: 20px;
+            line-height: 22px;
             margin-bottom: 26px;
         }
         .recommend-b {
@@ -246,6 +257,7 @@ export default {
                 display: flex;
                 align-items: center;
                 height: 22px;
+                line-height: 22px;
                 border-radius: 12px;
                 font-size: 14px;
                 font-family: MicrosoftYaHeiSemibold;

src/views/strategy/animationBox.vue

@@ -86,6 +86,9 @@ export default {
             } else {
                 this.showDraw = false
             }
+            if (this.chillerCommandQ.isExecuted) {
+                this.showDraw = false
+            }
         }
     },
     props: ['data', 'chillerHourList', 'chillerCommandQ']

src/views/strategy/index.vue

@@ -28,7 +28,8 @@
             <div class='starte-right'>
                 <p class='strate-right-title'>当前状态</p>
                 <water-unit :data='chillerOrg ' :type='1'></water-unit>
-                <animation-box ref="box"
+                <animation-box
+                    ref='box'
                     v-if='Object.keys(chillerCommand).length>=0||chillerHourList.length>=0'
                     :data='chillerOrg'
                     :chillerHourList='chillerHourList'
@@ -63,7 +64,7 @@ export default {
             chillerOrg: {},
             chillerHourList: [],
             idArr: [],
-            clearId:null,
+            clearId: null
         }
     },
     components: {
@@ -97,11 +98,11 @@ export default {
                 this.chillerOrg = res.chillerOrg || {}
                 this.chillerCommand = res.chillerCommand || {}
                 this.chillerHourList = res.chillerHourList || []
-                 if(Object.keys(this.chillerCommand).length>=0||this.chillerHourList.length>=0){
-                    let vm =this
-                    setTimeout(function(){
-                         vm.$refs.box.isShowDraw()
-                    },100) 
+                if (Object.keys(this.chillerCommand).length >= 0 || this.chillerHourList.length >= 0) {
+                    let vm = this
+                    setTimeout(function() {
+                        vm.$refs.box.isShowDraw()
+                    }, 100)
                 }
             })
         },
@@ -126,19 +127,27 @@ export default {
                     })
                 }
             })
+        },
+        whenMinutes() {
+            // 00 15 30 45
+            let minutes = new Date().getMinutes()
+            let arrs = ['00', '15', '30', '45']
+            arrs.forEach(el => {
+                if (el == minutes) {
+                    this.getChiller()
+                }
+            })
         }
     },
     mounted() {
         this.formatTime()
         let vm = this
-        this.clearId = setInterval(function(){
-           vm.getChiller()
-           vm.$refs.box.isShowDraw()
-        },1000*60)
+        this.clearId = setInterval(function() {
+            vm.whenMinutes()
+        }, 1000 * 60)
         this.getChiller()
-       
     },
-    destroyed(){
+    destroyed() {
         window.clearInterval(this.clearId)
     }
 }