|
@@ -4,27 +4,27 @@
|
|
|
<Head :headText="headText"></Head>
|
|
|
<div class="nav-right">
|
|
|
<img class="nav-icon" v-if="navText" src="@/assets/shape.png" alt />
|
|
|
- <span class="nav-text1" v-if="navText">今日已收到 {{quickData.chillerCount || 0}} 条策略,其中有 {{quickData.hillerIsNotExecutedCount || 0}} 条未执行</span>
|
|
|
- <span class="nav-text" v-else>今天已收到 {{quickData.chillerCount || 0}} 条策略</span>
|
|
|
+ <span class="nav-text1" v-if="navText">今日已收到 {{chillerCommand.chillerCount || 0}} 条策略,其中有 {{chillerCommand.hillerIsNotExecutedCount || 0}} 条未执行</span>
|
|
|
+ <span class="nav-text" v-else>今天已收到 {{chillerCommand.chillerCount || 0}} 条策略</span>
|
|
|
<span class="nav-look MicrYaHei" @click="showTodayStrategy = true">查看</span>
|
|
|
</div>
|
|
|
<div class="strategyContainer">
|
|
|
<div class="strate-left">
|
|
|
<div class="strate-left-1">今天营业时间</div>
|
|
|
- <div class="strate-left-2">{{quickData.openTime || '--'}} - {{quickData.endTime || '--'}}</div>
|
|
|
+ <div class="strate-left-2">{{chillerCommand.openTime?( chillerCommand.openTime.slice(0,2)+':'+chillerCommand.openTime.slice(2,4)):"--"}} - {{chillerCommand.endTime?(chillerCommand.endTime.slice(0,2)+':'+chillerCommand.endTime.slice(2,4)):"--"}}</div>
|
|
|
<div class="strate-left-1">当前运行模式</div>
|
|
|
- <div class="strate-left-2">{{quickData.model || '--'}}</div>
|
|
|
+ <div class="strate-left-2">{{chillerCommand.model || '--'}}</div>
|
|
|
<div class="strate-left-box">
|
|
|
<div class="strate-left-info-1">通风策略</div>
|
|
|
- <div class="strate-left-info">开启时间:{{quickData.freshAirEqOpenTime || '--'}} - {{quickData.freshAirEqCloseTime || '--'}}</div>
|
|
|
+ <div class="strate-left-info">开启时间:{{chillerCommand.freshAirEqOpenTime?(chillerCommand.freshAirEqOpenTime.slice(0,2)+":"+chillerCommand.freshAirEqOpenTime.slice(2,4)):"--"}} - {{chillerCommand.freshAirEqCloseTime?(chillerCommand.freshAirEqCloseTime.slice(0,2)+":"+chillerCommand.freshAirEqCloseTime.slice(2,4)):"--"}}</div>
|
|
|
<div class="strate-left-info">新风机组:开启</div>
|
|
|
<div class="strate-left-info">组合式空调机组:全新风</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="starte-right">
|
|
|
<p class="strate-right-title">当前状态</p>
|
|
|
- <water-unit :data='quickData'></water-unit>
|
|
|
- <animation-box :data='quickData'></animation-box>
|
|
|
+ <water-unit :data='chillerOrg '></water-unit>
|
|
|
+ <animation-box v-if="chillerHourList.length>0" :data='chillerCommand' :chillerHourList='chillerHourList'></animation-box>
|
|
|
</div>
|
|
|
</div>
|
|
|
<el-dialog title="提示" :visible.sync="showTodayStrategy" width="1260px">
|
|
@@ -46,9 +46,11 @@ export default {
|
|
|
navText: true,
|
|
|
showTodayStrategy: false,
|
|
|
tableData:[],
|
|
|
- quickData:{},
|
|
|
+ chillerCommand:{},
|
|
|
today:'',
|
|
|
- now:''
|
|
|
+ now:'',
|
|
|
+ chillerOrg:{},
|
|
|
+ chillerHourList:[]
|
|
|
};
|
|
|
},
|
|
|
components: {
|
|
@@ -74,22 +76,15 @@ export default {
|
|
|
},
|
|
|
getQuickData(){
|
|
|
let params = {
|
|
|
- postParams:{
|
|
|
- criteria:{
|
|
|
- projectId:"Pj4419000005",
|
|
|
- date: this.today, //日期 yyyyMMdd
|
|
|
- time: this.now, //时间 H24mi (最近的一个15分钟时间点,例如现在是23点35分,应传2330)
|
|
|
- },
|
|
|
- withColumns: [
|
|
|
- "chillerOrg","chillerHourList"
|
|
|
- ]
|
|
|
+ getParams:{
|
|
|
+ date: this.today, //日期 yyyyMMdd
|
|
|
}
|
|
|
}
|
|
|
queryCommand(params).then(res=>{
|
|
|
console.log(res)
|
|
|
- if(res.data){
|
|
|
- this.quickData = res.data.content?res.data.content[0]:{}
|
|
|
- }
|
|
|
+ this.chillerOrg = res.chillerOrg
|
|
|
+ this.chillerCommand = res.chillerCommand
|
|
|
+ this.chillerHourList = res.chillerHourList
|
|
|
})
|
|
|
},
|
|
|
getData(){
|
|
@@ -102,10 +97,9 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
getCommand(params).then(res=>{
|
|
|
- console.log(res)
|
|
|
- if(res.data){
|
|
|
- this.tableData = res.data.content?res.data.content:[]
|
|
|
- }
|
|
|
+
|
|
|
+ this.tableData = res.content?res.data.content:[]
|
|
|
+
|
|
|
})
|
|
|
}
|
|
|
},
|