Commit 6cca4146cb48b730156ee8e8f6c7239ff1018fcf
1 parent
7cdca435
perf: data board component update time tooltip position
Showing
7 changed files
with
35 additions
and
26 deletions
... | ... | @@ -142,20 +142,20 @@ |
142 | 142 | <div class="text-center" :style="{ fontSize: fontSize({ radio: getRadio, basic: 16 }) }"> |
143 | 143 | {{ props.value.name }} |
144 | 144 | </div> |
145 | - <div | |
146 | - class="text-xs text-center truncate p-5" | |
147 | - :style="{ fontSize: fontSize({ radio: getRadio, basic: 12, max: 16 }), color: '#999' }" | |
145 | + <Tooltip | |
146 | + placement="top" | |
147 | + :title="dateUtil(props?.value?.updateTime || new Date()).format(DEFAULT_DATE_FORMAT)" | |
148 | 148 | > |
149 | - <Tooltip | |
150 | - placement="top" | |
151 | - :title="dateUtil(props?.value?.updateTime || new Date()).format(DEFAULT_DATE_FORMAT)" | |
149 | + <div | |
150 | + class="text-xs text-center truncate p-5" | |
151 | + :style="{ fontSize: fontSize({ radio: getRadio, basic: 12, max: 16 }), color: '#999' }" | |
152 | 152 | > |
153 | 153 | <span class="mr-2">更新时间:</span> |
154 | 154 | <span> |
155 | 155 | {{ dateUtil(props?.value?.updateTime || new Date()).format(DEFAULT_DATE_FORMAT) }} |
156 | 156 | </span> |
157 | - </Tooltip> | |
158 | - </div> | |
157 | + </div> | |
158 | + </Tooltip> | |
159 | 159 | </div> |
160 | 160 | </div> |
161 | 161 | </template> | ... | ... |
... | ... | @@ -151,20 +151,20 @@ |
151 | 151 | > |
152 | 152 | <span>{{ props.value.name || '电表' }}</span> |
153 | 153 | </div> |
154 | - <div | |
155 | - class="text-center text-xs truncate p-5" | |
156 | - :style="{ fontSize: fontSize({ radio: getRadio, basic: 12, max: 16 }), color: '#999' }" | |
154 | + <Tooltip | |
155 | + placement="top" | |
156 | + :title="dateUtil(props?.value?.updateTime || new Date()).format(DEFAULT_DATE_FORMAT)" | |
157 | 157 | > |
158 | - <Tooltip | |
159 | - placement="top" | |
160 | - :title="dateUtil(props?.value?.updateTime || new Date()).format(DEFAULT_DATE_FORMAT)" | |
158 | + <div | |
159 | + class="text-center text-xs truncate p-5" | |
160 | + :style="{ fontSize: fontSize({ radio: getRadio, basic: 12, max: 16 }), color: '#999' }" | |
161 | 161 | > |
162 | 162 | <span class="mr-1">更新时间:</span> |
163 | 163 | <span> |
164 | 164 | {{ dateUtil(props?.value?.updateTime || new Date()).format(DEFAULT_DATE_FORMAT) }} |
165 | 165 | </span> |
166 | - </Tooltip> | |
167 | - </div> | |
166 | + </div> | |
167 | + </Tooltip> | |
168 | 168 | </div> |
169 | 169 | <div></div> |
170 | 170 | </section> | ... | ... |
... | ... | @@ -258,7 +258,7 @@ export const update_instrument_1_font = (radio: number) => { |
258 | 258 | |
259 | 259 | export const update_instrument_2_font = (radio: number) => { |
260 | 260 | const axisLabelFontSize = fontSize({ radio, basic: 10, max: 16 }); |
261 | - const detailFontSize = fontSize({ radio, basic: 20, max: 25, min: 12 }); | |
261 | + const detailFontSize = fontSize({ radio, basic: 18, max: 18, min: 10 }); | |
262 | 262 | return { |
263 | 263 | series: [ |
264 | 264 | { | ... | ... |
... | ... | @@ -91,11 +91,12 @@ |
91 | 91 | </div> |
92 | 92 | </div> |
93 | 93 | </div> |
94 | - <div v-if="getShowUpdate" class="text-center text-xs truncate p-5" style="color: #999"> | |
95 | - <Tooltip | |
96 | - placement="top" | |
97 | - :title="dateUtil(props?.value?.updateTime || new Date()).format(DEFAULT_DATE_FORMAT)" | |
98 | - > | |
94 | + <Tooltip | |
95 | + v-if="getShowUpdate" | |
96 | + placement="top" | |
97 | + :title="dateUtil(props?.value?.updateTime || new Date()).format(DEFAULT_DATE_FORMAT)" | |
98 | + > | |
99 | + <div class="text-center text-xs truncate p-5" style="color: #999"> | |
99 | 100 | <div |
100 | 101 | :style="{ fontSize: fontSize({ radio: getRadio, basic: 12, max: 14 }) }" |
101 | 102 | class="truncate" |
... | ... | @@ -105,7 +106,7 @@ |
105 | 106 | {{ dateUtil(props?.value?.updateTime || new Date()).format(DEFAULT_DATE_FORMAT) }} |
106 | 107 | </span> |
107 | 108 | </div> |
108 | - </Tooltip> | |
109 | - </div> | |
109 | + </div> | |
110 | + </Tooltip> | |
110 | 111 | </div> |
111 | 112 | </template> | ... | ... |
... | ... | @@ -137,7 +137,13 @@ |
137 | 137 | const handleViewBoard = (record: DataBoardRecord) => { |
138 | 138 | const hasDetailPermission = hasPermission('api:yt:data_component:list'); |
139 | 139 | if (hasDetailPermission) |
140 | - router.push(`/data/board/detail/${encode(record.id)}/${encode(record.name)}`); | |
140 | + router.push({ | |
141 | + name: 'dataBoardDetail', | |
142 | + params: { | |
143 | + boardId: encode(record.id), | |
144 | + boardName: encode(record.name), | |
145 | + }, | |
146 | + }); | |
141 | 147 | else createMessage.warning('没有权限'); |
142 | 148 | }; |
143 | 149 | ... | ... |