Merge branch 'dev_gcg' into dev

src/views/dashboard/components/type5.vue

@@ -223,12 +223,12 @@
           </div>
           <div>
             <!-- === -->
-            <el-row v-if="statusl.length!=0" class="text" :gutter="24">
+            <el-row  class="text" :gutter="24">
               <el-col :span="10">
                 <div class="item_name">漏缆状态</div>
               </el-col>
               <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 :span="6" >
                 <el-button class="alarmbtn" type="primary" size="mini" 
@@ -340,14 +340,14 @@ export default {
 
        for(let i=0; i<this.statusAlarmfun.length;i++){
          if (i % 2 != 0) {
-           if (this.statusAlarmfun[i].name=='时间') {
+           if (this.statusAlarmfun[i].name=='最后更新时间') {
             arr1.push(this.statusAlarmfun[i])
            } else{
               arr2.push(this.statusAlarmfun[i])
            }
          
          } else{
-           if (this.statusAlarmfun[i].name=='设备状态') {
+           if (this.statusAlarmfun[i].name=='漏缆状态') {
               arr1.push(this.statusAlarmfun[i])
            } else{
              arr3.push(this.statusAlarmfun[i])