|
|
@@ -26,17 +26,17 @@
|
|
|
</view>
|
|
|
<view class="condition">
|
|
|
<scroll-view scroll-x="true" class="scroll-X" scroll-top="0">
|
|
|
- <table class="table" v-if="$QueryPermission(265)">
|
|
|
+ <table class="table" v-if="$QueryPermission(265) ||$QueryPermission(304) ||$QueryPermission(313)">
|
|
|
<tr class="tr">
|
|
|
- <th class="th" v-for="(item,index) in thdata" :key="index">{{item}}</th>
|
|
|
+ <th class="th" v-for="(item,index) in thdata" :key="index" v-if="(!isShowBwc && item.indexOf('保温仓') < 0) || isShowBwc">{{item}}</th>
|
|
|
</tr>
|
|
|
<tr class="tr" v-for="(items,indexs) in historylistdata" :key="indexs" v-if="!forbidden">
|
|
|
<td class="td">{{items.d_h_t.addtime|timeFormat()}}</td>
|
|
|
<td class="td">{{items.d_h_t.ds==0?"关":"开"}}</td>
|
|
|
<td class="td">{{items.d_h_t.at}}</td>
|
|
|
<td class="td">{{items.d_h_t.ah}}</td>
|
|
|
- <td class="td">{{items.d_h_t.set_temp}}</td>
|
|
|
- <td class="td">{{items.d_h_t.pre_temp}}</td>
|
|
|
+ <td class="td" v-if="isShowBwc">{{items.d_h_t.set_temp}}</td>
|
|
|
+ <td class="td" v-if="isShowBwc">{{items.d_h_t.pre_temp}}</td>
|
|
|
<td class="td">{{items.d_h_t.batStatus==0?"正常":"欠压"}}</td>
|
|
|
<td class="td">{{items.d_h_t.rps==0?"正常":"雨控"}}</td>
|
|
|
<td class="td">{{Circulation.work_sta.value[items.d_h_t.work_sta]}}</td>
|
|
|
@@ -51,15 +51,15 @@
|
|
|
</table>
|
|
|
<table class="table" v-else>
|
|
|
<tr class="tr">
|
|
|
- <th class="th" v-for="(item,index) in thdata2" :key="index">{{item}}</th>
|
|
|
+ <th class="th" v-for="(item,index) in thdata2" :key="index" v-if="(!isShowBwc && item.indexOf('保温仓') < 0) || isShowBwc">{{item}}</th>
|
|
|
</tr>
|
|
|
<tr class="tr" v-for="(items,indexs) in historylistdata" :key="indexs" v-if="!forbidden">
|
|
|
<td class="td">{{items.d_h_t.addtime|timeFormat()}}</td>
|
|
|
<td class="td">{{items.d_h_t.ds==0?"关":"开"}}</td>
|
|
|
<td class="td">{{items.d_h_t.at}}</td>
|
|
|
<td class="td">{{items.d_h_t.ah}}</td>
|
|
|
- <td class="td">{{items.d_h_t.set_temp}}</td>
|
|
|
- <td class="td">{{items.d_h_t.pre_temp}}</td>
|
|
|
+ <td class="td" v-if="isShowBwc">{{items.d_h_t.set_temp}}</td>
|
|
|
+ <td class="td" v-if="isShowBwc">{{items.d_h_t.pre_temp}}</td>
|
|
|
<td class="td">{{items.d_h_t.batStatus==0?"正常":"欠压"}}</td>
|
|
|
<td class="td">{{items.d_h_t.rps==0?"正常":"雨控"}}</td>
|
|
|
<td class="td">{{Circulation.work_sta.value[items.d_h_t.work_sta]}}</td>
|
|
|
@@ -92,6 +92,7 @@
|
|
|
export default {
|
|
|
data() {
|
|
|
return {
|
|
|
+ isShowBwc: false,
|
|
|
styles: {
|
|
|
// width: "650rpx",
|
|
|
height: "400rpx"
|
|
|
@@ -156,7 +157,13 @@
|
|
|
xtitle.push(times.getMonth() + 1 + "/" + times.getDate() + "-" + times.getHours() + ":" + times.getMinutes())
|
|
|
arr1.push(res[i].temperature == "" ? "0" : res[i].temperature)
|
|
|
arr2.push(res[i].humidity == "" ? "0" : res[i].humidity)
|
|
|
- arr3.push(res[i].others == "" ? "0" : res[i].others)
|
|
|
+ if(res[i].others) {
|
|
|
+ arr3.push(res[i].others)
|
|
|
+ } else {
|
|
|
+ if(res[i].others == "") {
|
|
|
+ arr3.push(0)
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
var obj = [{
|
|
|
name: '温度',
|
|
|
@@ -166,11 +173,14 @@
|
|
|
name: '湿度',
|
|
|
data: arr2,
|
|
|
color: '#6CBBFF'
|
|
|
- }, {
|
|
|
+ }]
|
|
|
+ if(arr3.length > 0) {
|
|
|
+ obj.push({
|
|
|
name: '保温仓温度',
|
|
|
data: arr3,
|
|
|
color: '#FF3F3F'
|
|
|
- }]
|
|
|
+ })
|
|
|
+ }
|
|
|
this.showColumn("canvasColumnA", xtitle, obj)
|
|
|
}
|
|
|
},
|
|
|
@@ -192,8 +202,12 @@
|
|
|
this.forbidden = true
|
|
|
console.log(res.data.length)
|
|
|
} else {
|
|
|
+ if(res.data[0].d_h_t.set_temp) {
|
|
|
+ this.isShowBwc = true
|
|
|
+ } else {
|
|
|
+ this.isShowBwc = false;
|
|
|
+ }
|
|
|
this.forbidden = false
|
|
|
- console.log(res.data.length)
|
|
|
}
|
|
|
// console.log(this.historylistdata)
|
|
|
},
|
