Merge branch 'master-v32-lushangqing' into 'master'
故障诊断中的业务拨测展开后的卡片圆圈中的字体大小更改为18px See merge request !820
Showing
1 changed file
with
2 additions
and
2 deletions
@@ -71,8 +71,8 @@ | @@ -71,8 +71,8 @@ | ||
71 | <div v-else v-for="item in cardData" style="width: 190px"> | 71 | <div v-else v-for="item in cardData" style="width: 190px"> |
72 | <div style="width: 190px;height: 190px;background: url(../src/style/img/fault/dialtest/disBiz.png) no-repeat;background-size: 100% 100%;padding-top: 10px;"> | 72 | <div style="width: 190px;height: 190px;background: url(../src/style/img/fault/dialtest/disBiz.png) no-repeat;background-size: 100% 100%;padding-top: 10px;"> |
73 | <div :style="{backgroundColor: item.color}" | 73 | <div :style="{backgroundColor: item.color}" |
74 | - style="width: 80px;height: 80px;border-radius: 80px;margin: 20px auto;color: white;line-height: 80px;text-align: center;"> | ||
75 | - <span>{{item.shortName}}</span> | 74 | + style="width: 80px;height: 80px;border-radius: 80px;margin: 20px auto;color: white;font-size:18px;display:flex;align-items:center;justify-content:center;text-align: center;"> |
75 | + <span :style="item.shortName?(item.shortName.length>4?'padding:10px;':'padding:15px;'):''">{{item.shortName}}</span> | ||
76 | </div> | 76 | </div> |
77 | <div class="text-overflow-line2 align-center" style="padding: 0px 25px;"> | 77 | <div class="text-overflow-line2 align-center" style="padding: 0px 25px;"> |
78 | <el-tooltip :content="item.taskName" placement="top" effect="light" :disabled="item.isShowTooltip == undefined || item.isShowTooltip == false"> | 78 | <el-tooltip :content="item.taskName" placement="top" effect="light" :disabled="item.isShowTooltip == undefined || item.isShowTooltip == false"> |
-
Please register or login to post a comment