Commit 2536a9278dc0253587f5335ad5b1cc532a4cf90f
Merge branch 'f-dev' into 'main'
fix:修复设备列表详情 告警详情 详情字段回显问题 See merge request huang/yun-teng-iot-front!225
Showing
4 changed files
with
10 additions
and
5 deletions
... | ... | @@ -3,11 +3,12 @@ |
3 | 3 | <div :class="`${prefixCls}__links`"> |
4 | 4 | <a @click="openWindow(SITE_URL)">{{ t('layout.footer.onlinePreview') }}</a> |
5 | 5 | |
6 | - <GithubFilled @click="openWindow(GITHUB_URL)" :class="`${prefixCls}__github`" /> | |
6 | + <!-- <GithubFilled @click="openWindow(GITHUB_URL)" :class="`${prefixCls}__github`" /> --> | |
7 | + <span style="width: 50px; height: 50px; margin-left: 65px"></span> | |
7 | 8 | |
8 | 9 | <a @click="openWindow(DOC_URL)">{{ t('layout.footer.onlineDocument') }}</a> |
9 | 10 | </div> |
10 | - <div>Copyright ©2020 Vben Admin</div> | |
11 | + <div>Copyright ©2018-2022 云腾五洲</div> | |
11 | 12 | </Footer> |
12 | 13 | </template> |
13 | 14 | ... | ... |
... | ... | @@ -2,7 +2,7 @@ |
2 | 2 | export const GITHUB_URL = 'https://github.com/anncwb/vue-vben-admin'; |
3 | 3 | |
4 | 4 | // vue-vben-admin-next-doc |
5 | -export const DOC_URL = 'https://vvbin.cn/doc-next/'; | |
5 | +export const DOC_URL = 'https://docs.thingskit.com'; | |
6 | 6 | |
7 | 7 | // site url |
8 | -export const SITE_URL = 'https://vvbin.cn/next/'; | |
8 | +export const SITE_URL = 'https://www.thingskit.com'; | ... | ... |
... | ... | @@ -54,6 +54,10 @@ |
54 | 54 | await resetFields(); |
55 | 55 | await setFieldsValue({ |
56 | 56 | ...data, |
57 | + details: JSON.stringify(data?.details?.data).slice( | |
58 | + 1, | |
59 | + JSON.stringify(data?.details?.data).length - 1 | |
60 | + ), | |
57 | 61 | severity: alarmLevel(data.severity), |
58 | 62 | status: statusType(data.status), |
59 | 63 | }); | ... | ... |