Merge branch 'master-v32-xwx' into 'master'
基础资源采集时间样式重叠 See merge request !808
Showing
1 changed file
with
2 additions
and
2 deletions
@@ -165,12 +165,12 @@ | @@ -165,12 +165,12 @@ | ||
165 | <el-col :span="3" class="align-center"> | 165 | <el-col :span="3" class="align-center"> |
166 | {{item.alarm}} | 166 | {{item.alarm}} |
167 | </el-col> | 167 | </el-col> |
168 | - <el-col :span="9" style="line-height: 36px;color: gainsboro;"> | 168 | + <el-col :span="8" style="line-height: 36px;color: gainsboro;"> |
169 | </el-col> | 169 | </el-col> |
170 | <el-col :span="1" class="align-center"> | 170 | <el-col :span="1" class="align-center"> |
171 | <img src="../src/style/img/fault/base/time-green.png"> | 171 | <img src="../src/style/img/fault/base/time-green.png"> |
172 | </el-col> | 172 | </el-col> |
173 | - <el-col :span="5" class="align-center"> | 173 | + <el-col :span="6" class="align-center"> |
174 | {{item.collTime}} | 174 | {{item.collTime}} |
175 | </el-col> | 175 | </el-col> |
176 | </el-row> | 176 | </el-row> |
-
Please register or login to post a comment