zhulizhen 5 år sedan
förälder
incheckning
aa771d32cc

+ 5 - 1
src/api/strategy/strategy.js

@@ -1,9 +1,13 @@
 import httputils from '@/api/httputils'
 //查询当前运行策略
 export function queryCommand({getParams}) {
-    return httputils.getJson(`duoduo-service/transfer/chiller/command/queryData?projectId=Pj4413030001`, getParams)
+    return httputils.getJson(`/duoduo-service/transfer/chiller/command/queryData?projectId=Pj4413030001`, getParams)
 }
 //查询当日运行策略列表
 export function getCommand({postParams}) {
     return httputils.postJson(`/duoduo-service/transfer/chiller/command/query?projectId=Pj4413030001`, postParams)
+}
+//修改策略备注
+export function updateCommand({postParams}) {
+    return httputils.postJson(`/duoduo-service/transfer/chiller/command/update?projectId=Pj4413030001`, postParams)
 }

+ 95 - 57
src/views/evaluate/evSnapshotsDialog.vue

@@ -6,15 +6,15 @@
     <div class="snapshotss-top">
       <div class="snapshotss-top-left">
         <span>今日营业时间</span>
-        <span>10:00-22:00</span>
+        <span>{{chillerCommand.openTime?( chillerCommand.openTime.slice(0,2)+':'+chillerCommand.openTime.slice(2,4)):"--"}} - {{chillerCommand.endTime?(chillerCommand.endTime.slice(0,2)+':'+chillerCommand.endTime.slice(2,4)):"--"}}</span>
       </div>
       <div class="snapshotss-top-center">
         <span class="MicrYaHei">当前运行模式</span>
-        <span>间歇供冷</span>
+        <span>{{chillerCommand.model || '--'}}</span>
       </div>
       <div class="snapshotss-top-right">
         <span>室外环境</span>
-        <span>多云25 °C</span>
+        <span>多云 25 °C</span>
       </div>
     </div>
     <div class="snapshotss-center1">
@@ -24,9 +24,9 @@
           <div class="snapshotss-cont-top Micbold">冷水机组</div>
           <div class="snapshotss-cont-bottom">
             <div class="snapshotss-cont-bot-1">
-              <span>0</span>
-              <span>0</span>
-              <span>12 °C</span>
+              <span>{{chillerOrg.chillerNumSetL || 0}}</span>
+              <span>{{chillerOrg.chillerNumSetS || 0}}</span>
+              <span>{{chillerOrg.chillWaterOutTempSet || 0}} °C</span>
             </div>
             <div class="snapshotss-cont-bot-2 MicrYaHei">
               <span>大</span>
@@ -39,9 +39,9 @@
           <div class="snapshotss-cont-top Micbold">冷冻水泵</div>
           <div class="snapshotss-cont-bottom">
             <div class="snapshotss-cont-bot-1">
-              <span>0</span>
-              <span>0</span>
-              <span>12 Hz</span>
+              <span>{{chillerOrg.coolPumpNumSetL || 0}}</span>
+              <span>{{chillerOrg.coolPumpNumSetS || 0}}</span>
+              <span>{{chillerOrg.coolPumpNumSet || 0}} Hz</span>
             </div>
             <div class="snapshotss-cont-bot-2">
               <span>大</span>
@@ -54,9 +54,9 @@
           <div class="snapshotss-cont-top Micbold">冷却水泵</div>
           <div class="snapshotss-cont-bottom">
             <div class="snapshotss-cont-bot-1">
-              <span>0</span>
-              <span>0</span>
-              <span>12 Hz</span>
+              <span>{{chillerOrg.hillPumpNumSetL || 0}}</span>
+              <span>{{chillerOrg.hillPumpNumSetS || 0}}</span>
+              <span>{{chillerOrg.hillPumpNumSet }} Hz</span>
             </div>
             <div class="snapshotss-cont-bot-2">
               <span>大</span>
@@ -69,9 +69,9 @@
           <div class="snapshotss-cont-top Micbold">冷却塔</div>
           <div class="snapshotss-cont-bottom">
             <div class="snapshotss-cont-bot-1">
-              <span>0</span>
-              <span>0</span>
-              <span>12 Hz</span>
+              <span>{{chillerOrg.coolTowerNumSetL || 0}}</span>
+              <span>{{chillerOrg.coolTowerNumSetS || 0}}</span>
+              <span>{{chillerOrg.coolTowerNumSet || 0}} Hz</span>
             </div>
             <div class="snapshotss-cont-bot-2">
               <span>大</span>
@@ -85,17 +85,27 @@
     <div class="snapshotss-center2">
       <div class="snapshotss-cont2-box1 MicrYaHei">
         <span>数据传输情况</span>
-        <span :class="imgFinish?'span1':'span2'" v-for="(item,index) in imgFinishList" :key="index">
-          {{item.name}}
-          <img v-if="imgFinish" :src="item.img1" alt />
-          <img v-else :src="item.img2" alt />
+        <span :class="chillerCommand.isExecuted==1?'span1':'span2'" >
+          能耗
+          <img v-if="chillerCommand.energyErrorFlag==1" src="../../assets/finish.png" alt />
+          <img v-else src="../../assets/wrong.png" alt />
+          </span>
+          <span :class="chillerCommand.isExecuted==1?'span1':'span2'" >
+          环境
+          <img v-if="chillerCommand.environmentErrorFlag==1" src="../../assets/finish.png" alt />
+          <img v-else src="../../assets/wrong.png" alt />
+          </span>
+          <span :class="chillerCommand.isExecuted==1?'span1':'span2'">
+          BA
+          <img v-if="chillerCommand.baErrorFalg==1" src="../../assets/finish.png" alt />
+          <img v-else src="../../assets/wrong.png" alt />
         </span>
       </div>
       <div class="snapshotss-cont2-box2 MicrYaHei">
         <span>实际冷量</span>
-        <span>2800 KW</span>
+        <span>{{chillerCommand.nowPlantLoad || 0}} KW</span>
         <span>未来1小时预测冷量</span>
-        <span>3400 KW</span>
+        <span>{{chillerCommand.predictedLoad1h || 0}}</span>
       </div>
     </div>
     <div class="snapshotss-foot">
@@ -107,7 +117,7 @@
 </template>
 <script>
 import echarts from "echarts";
-
+import {queryCommand,getCommand} from '@/api/strategy/strategy.js'
 export default {
   data() {
     return {
@@ -128,14 +138,62 @@ export default {
           img1: require("../../assets/finish.png"),
           img2: require("../../assets/wrong.png")
         }
-      ]
-    };
+      ],
+      today:"",
+      chillerOrg:{},
+      chillerCommand:{},
+      chillerHourList :[],
+      dataX:[],
+      loadX:[],
+      dataY1:[],
+      dataY2:[],
+      dataY3:[],
+      loadY1:[],
+      loadY2:[],
+      loadY3:[]
+    }
   },
   mounted() {
-    this.drawSnapshotssLeft();
-    this.drawSnapshotssRight();
+    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())
+      console.log(year,month,date)
+      return this.today = year + ''+ month+''+date
+    },
+    getQuickData(){
+      let params = {
+        getParams:{
+          date: this.today, //日期 yyyyMMdd
+        }
+      }
+      queryCommand(params).then(res=>{
+        console.log(res)
+           this.chillerOrg = res.chillerOrg
+           this.chillerCommand = res.chillerCommand
+           this.chillerHourList = res.chillerHourList
+           this.drawData()
+      })
+    },
+     drawData(){
+            this.chillerHourList.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)
+                this.dataY2.push(el.meanTindoor)
+                this.dataY3.push(el.maxTindoor)
+                this.loadY1.push(el.nowPlantLoad)
+                this.loadY2.push(el.predictedLoadUpLimit)
+                this.loadY3.push(el.redictedLoadDownLimit)
+            })
+             this.drawSnapshotssLeft();
+             this.drawSnapshotssRight();
+        },
     drawSnapshotssLeft() {
       var snapshotssLeft = echarts.init(
         document.getElementById("snapshotssLeft")
@@ -160,17 +218,7 @@ export default {
         xAxis: {
           type: "category",
           boundaryGap: false,
-          data: [
-            "00:00",
-            "03:00",
-            "06:00",
-            "09:00",
-            "12:00",
-            "15:00",
-            "18:00",
-            "21:00",
-            "24:00"
-          ]
+          data: this.dataX
         },
         yAxis: {
           type: "value"
@@ -180,19 +228,19 @@ export default {
             name: "室外温度",
             type: "line",
             stack: "总量",
-            data: [120, 132, 101, 134, 90, 230, 210, 112, 150]
+            data: this.dataY1
           },
           {
             name: "室内平均温度",
             type: "line",
             stack: "总量",
-            data: [220, 182, 191, 234, 290, 330, 310, 220, 280]
+            data: this.dataY2
           },
           {
             name: "室内最高温度",
             type: "line",
             stack: "总量",
-            data: [150, 232, 201, 154, 190, 330, 410, 300, 340]
+            data: this.dataY3
           }
         ]
       };
@@ -218,9 +266,9 @@ export default {
               color: "#222"
             }
           },
-          formatter: function(params) {
-            return params[2].name + "<br />" + params[2].value;
-          }
+          // formatter: function(params) {
+          //   return params[2].name + "<br />" + params[2].value;
+          // }
         },
         grid: {
           left: "3%",
@@ -230,17 +278,7 @@ export default {
         },
         xAxis: {
           type: "category",
-          data: [
-            "00:00",
-            "03:00",
-            "06:00",
-            "09:00",
-            "12:00",
-            "15:00",
-            "18:00",
-            "21:00",
-            "24:00"
-          ]
+          data: this.loadX
         },
         yAxis: {
           splitNumber: 3,
@@ -252,7 +290,7 @@ export default {
           {
             name: "L",
             type: "line",
-            data: [20, 30, 40, 50, 60, 50, 40, 30, 20],
+            data: this.loadY2,
             lineStyle: {
               opacity: 0
             },
@@ -262,7 +300,7 @@ export default {
           {
             name: "U",
             type: "line",
-            data: [20, 30, 50, 60, 50, 40, 30, 20, 40],
+            data: this.loadY3,
             lineStyle: {
               opacity: 0
             },
@@ -274,7 +312,7 @@ export default {
           },
           {
             type: "line",
-            data: [20, 30, 40, 50, 60, 40, 30, 20, 50],
+            data: this.loadY1,
             hoverAnimation: false,
             symbolSize: 6,
             itemStyle: {

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

@@ -17,7 +17,7 @@
                 BA
                 <img v-if="data.baErrorFalg==1" src="../../assets/finish.png" alt />
                 <img v-else src="../../assets/wrong.png" alt />
-                </span>
+            </span>
         </div>
         <div class="snapshotss-cont2-box2 MicrYaHei">
             <span>实际冷量</span>
@@ -168,7 +168,7 @@ export default {
                 series: [{
                     name: 'L',
                     type: 'line',
-                    data: this.loadY1,
+                    data: this.loadY2,
                     lineStyle: {
                         opacity: 0
                     },
@@ -177,7 +177,7 @@ export default {
                 }, {
                     name: 'U',
                     type: 'line',
-                    data: this.loadY2,
+                    data: this.loadY3,
                     lineStyle: {
                         opacity: 0
                     },
@@ -188,7 +188,7 @@ export default {
                     symbol: 'none'
                 }, {
                     type: 'line',
-                    data: this.loadY3,
+                    data: this.loadY1,
                     hoverAnimation: false,
                     symbolSize: 6,
                     itemStyle: {

+ 18 - 2
src/views/strategy/bomBox.vue

@@ -38,7 +38,7 @@
             </div>
             </div>
         <div class="bomb-right-bottom">
-            <el-input placeholder="你可以在此处填写备注信息" v-model='data.remarks'> </el-input>
+            <el-input placeholder="你可以在此处填写备注信息" v-model="remarks" @blur="saveRemarks"> </el-input>
         </div>
 
     </div>
@@ -48,16 +48,32 @@
 <script>
 import echarts from 'echarts'
 import waterUnit from './waterUnit'
+import { updateCommand } from '@/api/strategy/strategy.js'
 export default {
     data(){
         return{
             circle1:0,
-            circle2:0
+            circle2:0,
+            remarks:''
         }
     },
     props:['data'],
     components:{waterUnit},
     methods:{
+        saveRemarks(){
+            console.log(this.data)
+            let postParams = {
+                criteria:{
+                    id:this.data.id,
+                    remarks:this.remarks
+                }
+            }
+            updateCommand({postParams}).then(res=>{
+                if(res.result=='success'){
+                    this.$message.success("添加备注成功!")
+                }
+            })
+        },
         getData(){
             this.circle1 = this.data.strategyReliability || 0
             this.circle2 = 100 - this.circle1