Commit fcba4323 authored by neogcg's avatar neogcg

Merge branch 'dev_gcg' into dev

parents ac3bf6e4 6e7380f5
...@@ -223,12 +223,12 @@ ...@@ -223,12 +223,12 @@
</div> </div>
<div> <div>
<!-- === --> <!-- === -->
<el-row v-if="statusl.length!=0" class="text" :gutter="24"> <el-row class="text" :gutter="24">
<el-col :span="10"> <el-col :span="10">
<div class="item_name">漏缆状态</div> <div class="item_name">漏缆状态</div>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="item_data levelData" :style="acolor" >{{ this.statusl[0].value }}</div> <div class="item_data levelData" :style="acolor" v-if="statusl.length!=0">{{ this.statusl[0].value }}</div>
</el-col> </el-col>
<el-col :span="6" > <el-col :span="6" >
<el-button class="alarmbtn" type="primary" size="mini" <el-button class="alarmbtn" type="primary" size="mini"
...@@ -340,14 +340,14 @@ export default { ...@@ -340,14 +340,14 @@ export default {
for(let i=0; i<this.statusAlarmfun.length;i++){ for(let i=0; i<this.statusAlarmfun.length;i++){
if (i % 2 != 0) { if (i % 2 != 0) {
if (this.statusAlarmfun[i].name=='时间') { if (this.statusAlarmfun[i].name=='最后更新时间') {
arr1.push(this.statusAlarmfun[i]) arr1.push(this.statusAlarmfun[i])
} else{ } else{
arr2.push(this.statusAlarmfun[i]) arr2.push(this.statusAlarmfun[i])
} }
} else{ } else{
if (this.statusAlarmfun[i].name=='设备状态') { if (this.statusAlarmfun[i].name=='漏缆状态') {
arr1.push(this.statusAlarmfun[i]) arr1.push(this.statusAlarmfun[i])
} else{ } else{
arr3.push(this.statusAlarmfun[i]) arr3.push(this.statusAlarmfun[i])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment