Commit 29572b87939fea2bdd57f533038dbb1df6c911ad
Merge branch 'ww' into 'main'
fix: data board component update time max font size over 12 See merge request huang/yun-teng-iot-front!315
Showing
2 changed files
with
12 additions
and
8 deletions
| @@ -144,19 +144,23 @@ | @@ -144,19 +144,23 @@ | ||
| 144 | </div> | 144 | </div> |
| 145 | <Tooltip | 145 | <Tooltip |
| 146 | placement="top" | 146 | placement="top" |
| 147 | - :title="props.value?.updateTime | ||
| 148 | - ? dateUtil(props?.value?.updateTime).format(DEFAULT_DATE_FORMAT) | ||
| 149 | - : '暂无更新时间'" | 147 | + :title=" |
| 148 | + props.value?.updateTime | ||
| 149 | + ? dateUtil(props?.value?.updateTime).format(DEFAULT_DATE_FORMAT) | ||
| 150 | + : '暂无更新时间' | ||
| 151 | + " | ||
| 150 | > | 152 | > |
| 151 | <div | 153 | <div |
| 152 | class="text-xs text-center truncate p-5" | 154 | class="text-xs text-center truncate p-5" |
| 153 | - :style="{ fontSize: fontSize({ radio: getRadio, basic: 12, max: 16 }), color: '#999' }" | 155 | + :style="{ fontSize: fontSize({ radio: getRadio, basic: 12, max: 12 }), color: '#999' }" |
| 154 | > | 156 | > |
| 155 | <span class="mr-2">更新时间:</span> | 157 | <span class="mr-2">更新时间:</span> |
| 156 | <span> | 158 | <span> |
| 157 | - {{ props.value?.updateTime | ||
| 158 | - ? dateUtil(props?.value?.updateTime).format(DEFAULT_DATE_FORMAT) | ||
| 159 | - : '暂无更新时间' }} | 159 | + {{ |
| 160 | + props.value?.updateTime | ||
| 161 | + ? dateUtil(props?.value?.updateTime).format(DEFAULT_DATE_FORMAT) | ||
| 162 | + : '暂无更新时间' | ||
| 163 | + }} | ||
| 160 | </span> | 164 | </span> |
| 161 | </div> | 165 | </div> |
| 162 | </Tooltip> | 166 | </Tooltip> |
| @@ -103,7 +103,7 @@ | @@ -103,7 +103,7 @@ | ||
| 103 | > | 103 | > |
| 104 | <div class="text-center text-xs truncate p-5" style="color: #999"> | 104 | <div class="text-center text-xs truncate p-5" style="color: #999"> |
| 105 | <div | 105 | <div |
| 106 | - :style="{ fontSize: fontSize({ radio: getRadio, basic: 12, max: 14 }) }" | 106 | + :style="{ fontSize: fontSize({ radio: getRadio, basic: 12, max: 12 }) }" |
| 107 | class="truncate" | 107 | class="truncate" |
| 108 | > | 108 | > |
| 109 | <span class="mr-1">更新时间:</span> | 109 | <span class="mr-1">更新时间:</span> |