Commit a6aaef3e19dba8aaad1426f95ec63ae630321d2e
Merge branch 'local_dev_ft' into 'main'
fix:修复个人头像先上传头像,然后以租户或者客户方式进入,用户名和头像没更新问题;pref:优化设备列表 事件管理时间筛选 See merge request yunteng/thingskit-front!494
Showing
2 changed files
with
6 additions
and
19 deletions
1 | 1 | <template> |
2 | 2 | <Dropdown placement="bottomLeft" :overlayClassName="`${prefixCls}-dropdown-overlay`"> |
3 | 3 | <span :class="[prefixCls, `${prefixCls}--${theme}`]" class="flex"> |
4 | - <img | |
5 | - :class="`${prefixCls}__header`" | |
6 | - :src=" | |
7 | - refreshPersonlData.avatar | |
8 | - ? refreshPersonlData.avatar | |
9 | - : updataPersonlData.avatar | |
10 | - ? updataPersonlData.avatar | |
11 | - : getUserInfo.avatar | |
12 | - " | |
13 | - /> | |
4 | + <img :class="`${prefixCls}__header`" :src="getUserInfo.avatar" /> | |
14 | 5 | <span :class="`${prefixCls}__info hidden md:block`"> |
15 | 6 | <span :class="`${prefixCls}__name `" class="truncate"> |
16 | - {{ | |
17 | - refreshPersonlData.realName | |
18 | - ? refreshPersonlData.realName | |
19 | - : updataPersonlData.realName | |
20 | - ? updataPersonlData.realName | |
21 | - : getUserInfo.realName | |
22 | - }} | |
7 | + {{ getUserInfo.realName }} | |
23 | 8 | </span> |
24 | 9 | </span> |
25 | 10 | </span> |
... | ... | @@ -172,7 +157,6 @@ |
172 | 157 | updataPersonlData.realName = newItem?.realName; |
173 | 158 | }; |
174 | 159 | refreshCacheGetData(); |
175 | - | |
176 | 160 | const refreshPersonalFunc = (v) => { |
177 | 161 | refreshPersonlData.avatar = v.avatar; |
178 | 162 | refreshPersonlData.realName = v.realName; | ... | ... |
1 | +import moment from 'moment'; | |
1 | 2 | import { Tag } from 'ant-design-vue'; |
2 | 3 | import { h } from 'vue'; |
3 | 4 | import { findDictItemByCode } from '/@/api/system/dict'; |
... | ... | @@ -88,7 +89,9 @@ export const formSchemas: FormSchema[] = [ |
88 | 89 | component: 'RangePicker', |
89 | 90 | colProps: { span: 10 }, |
90 | 91 | componentProps: { |
91 | - showTime: true, | |
92 | + showTime: { | |
93 | + defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')], | |
94 | + }, | |
92 | 95 | }, |
93 | 96 | }, |
94 | 97 | ]; | ... | ... |