From 68a52db344885c61856e148adc8091420996749f Mon Sep 17 00:00:00 2001 From: easy <1358086367@qq.com> Date: Thu, 2 Mar 2023 21:40:21 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8F=B3=E4=B8=8A=E8=A7=92=E9=83=A8?= =?UTF-8?q?=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/login.ts | 7 +- src/components/Layout/BasicLayoutPage.vue | 142 ++++++++++-------- src/components/Layout/components/Notice.vue | 31 ++++ .../Layout/components/NoticeInfo.vue | 24 +++ src/components/Layout/components/UserInfo.vue | 45 ++++++ .../components/ViewDialog.vue | 78 ++++++---- .../account/NotificationRecord/index.vue | 4 +- yarn.lock | 94 +++++++++++- 8 files changed, 325 insertions(+), 100 deletions(-) create mode 100644 src/components/Layout/components/Notice.vue create mode 100644 src/components/Layout/components/NoticeInfo.vue create mode 100644 src/components/Layout/components/UserInfo.vue diff --git a/src/api/login.ts b/src/api/login.ts index 6391c6b8..fd3eed95 100644 --- a/src/api/login.ts +++ b/src/api/login.ts @@ -51,4 +51,9 @@ export const settingDetail = (scopes: string) => server.get(`/system/config/${sc /** * 获取当前登录用户信息 */ -export const userDetail = () => server.get('/user/detail') \ No newline at end of file +export const userDetail = () => server.get('/user/detail') + +/** + * 退出登录 + */ +export const loginout_api = () => server.get('/user-token/reset') diff --git a/src/components/Layout/BasicLayoutPage.vue b/src/components/Layout/BasicLayoutPage.vue index 59079f75..7d00fd37 100644 --- a/src/components/Layout/BasicLayoutPage.vue +++ b/src/components/Layout/BasicLayoutPage.vue @@ -1,84 +1,102 @@ - - + diff --git a/src/components/Layout/components/Notice.vue b/src/components/Layout/components/Notice.vue new file mode 100644 index 00000000..2ed7f639 --- /dev/null +++ b/src/components/Layout/components/Notice.vue @@ -0,0 +1,31 @@ + + + + + diff --git a/src/components/Layout/components/NoticeInfo.vue b/src/components/Layout/components/NoticeInfo.vue new file mode 100644 index 00000000..dd1e0aa7 --- /dev/null +++ b/src/components/Layout/components/NoticeInfo.vue @@ -0,0 +1,24 @@ + + + + + diff --git a/src/components/Layout/components/UserInfo.vue b/src/components/Layout/components/UserInfo.vue new file mode 100644 index 00000000..d1a920df --- /dev/null +++ b/src/components/Layout/components/UserInfo.vue @@ -0,0 +1,45 @@ + + + + + diff --git a/src/views/account/NotificationRecord/components/ViewDialog.vue b/src/views/account/NotificationRecord/components/ViewDialog.vue index 2085f3b6..d5bc7010 100644 --- a/src/views/account/NotificationRecord/components/ViewDialog.vue +++ b/src/views/account/NotificationRecord/components/ViewDialog.vue @@ -5,50 +5,55 @@ width="1000px" @ok="emits('update:visible', false)" @cancel="emits('update:visible', false)" + class="view-dialog-container" > - 告警设备 - + 告警设备 + {{ data?.targetName || '' }} - 设备ID - + 设备ID + {{ data?.targetId || '' }} - 告警名称 - + 告警名称 + {{ data?.alarmName || data?.alarmConfigName || '' }} - 告警时间 - + 告警时间 + {{ moment(data?.alarmTime).format('YYYY-MM-DD HH:mm:ss') }} - 告警级别 - + 告警级别 + {{ (levelList.length > 0 && getLevelLabel(data.level)) || '' }} - 告警说明 - {{ data?.description || '' }} + 告警说明 + {{ data?.description || '' }} - 告警流水 - - - + 告警流水 + + - + diff --git a/src/views/account/NotificationRecord/index.vue b/src/views/account/NotificationRecord/index.vue index 977ec8b3..70b27377 100644 --- a/src/views/account/NotificationRecord/index.vue +++ b/src/views/account/NotificationRecord/index.vue @@ -3,7 +3,7 @@
- - +
diff --git a/yarn.lock b/yarn.lock index d32136ba..2d33894c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1072,6 +1072,16 @@ estree-walker "^2.0.2" source-map "^0.6.1" +"@vue/compiler-core@3.2.47": + version "3.2.47" + resolved "https://registry.jetlinks.cn/@vue%2fcompiler-core/-/compiler-core-3.2.47.tgz#3e07c684d74897ac9aa5922c520741f3029267f8" + integrity sha512-p4D7FDnQb7+YJmO2iPEv0SQNeNzcbHdGByJDsT4lynf63AFkOTFN07HsiRSvjGo0QrxR/o3d0hUyNCUnBU2Tig== + dependencies: + "@babel/parser" "^7.16.4" + "@vue/shared" "3.2.47" + estree-walker "^2.0.2" + source-map "^0.6.1" + "@vue/compiler-dom@3.2.45", "@vue/compiler-dom@^3.2.45": version "3.2.45" resolved "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.45.tgz" @@ -1080,6 +1090,14 @@ "@vue/compiler-core" "3.2.45" "@vue/shared" "3.2.45" +"@vue/compiler-dom@3.2.47": + version "3.2.47" + resolved "https://registry.jetlinks.cn/@vue%2fcompiler-dom/-/compiler-dom-3.2.47.tgz#a0b06caf7ef7056939e563dcaa9cbde30794f305" + integrity sha512-dBBnEHEPoftUiS03a4ggEig74J2YBZ2UIeyfpcRM2tavgMWo4bsEfgCGsu+uJIL/vax9S+JztH8NmQerUo7shQ== + dependencies: + "@vue/compiler-core" "3.2.47" + "@vue/shared" "3.2.47" + "@vue/compiler-sfc@3.2.45", "@vue/compiler-sfc@^3.2.29", "@vue/compiler-sfc@^3.2.45": version "3.2.45" resolved "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.45.tgz" @@ -1096,6 +1114,22 @@ postcss "^8.1.10" source-map "^0.6.1" +"@vue/compiler-sfc@3.2.47": + version "3.2.47" + resolved "https://registry.jetlinks.cn/@vue%2fcompiler-sfc/-/compiler-sfc-3.2.47.tgz#1bdc36f6cdc1643f72e2c397eb1a398f5004ad3d" + integrity sha512-rog05W+2IFfxjMcFw10tM9+f7i/+FFpZJJ5XHX72NP9eC2uRD+42M3pYcQqDXVYoj74kHMSEdQ/WmCjt8JFksQ== + dependencies: + "@babel/parser" "^7.16.4" + "@vue/compiler-core" "3.2.47" + "@vue/compiler-dom" "3.2.47" + "@vue/compiler-ssr" "3.2.47" + "@vue/reactivity-transform" "3.2.47" + "@vue/shared" "3.2.47" + estree-walker "^2.0.2" + magic-string "^0.25.7" + postcss "^8.1.10" + source-map "^0.6.1" + "@vue/compiler-ssr@3.2.45": version "3.2.45" resolved "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.45.tgz" @@ -1104,6 +1138,14 @@ "@vue/compiler-dom" "3.2.45" "@vue/shared" "3.2.45" +"@vue/compiler-ssr@3.2.47": + version "3.2.47" + resolved "https://registry.jetlinks.cn/@vue%2fcompiler-ssr/-/compiler-ssr-3.2.47.tgz#35872c01a273aac4d6070ab9d8da918ab13057ee" + integrity sha512-wVXC+gszhulcMD8wpxMsqSOpvDZ6xKXSVWkf50Guf/S+28hTAXPDYRTbLQ3EDkOP5Xz/+SY37YiwDquKbJOgZw== + dependencies: + "@vue/compiler-dom" "3.2.47" + "@vue/shared" "3.2.47" + "@vue/devtools-api@^6.4.5": version "6.4.5" resolved "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.4.5.tgz" @@ -1120,6 +1162,17 @@ estree-walker "^2.0.2" magic-string "^0.25.7" +"@vue/reactivity-transform@3.2.47": + version "3.2.47" + resolved "https://registry.jetlinks.cn/@vue%2freactivity-transform/-/reactivity-transform-3.2.47.tgz#e45df4d06370f8abf29081a16afd25cffba6d84e" + integrity sha512-m8lGXw8rdnPVVIdIFhf0LeQ/ixyHkH5plYuS83yop5n7ggVJU+z5v0zecwEnX7fa7HNLBhh2qngJJkxpwEEmYA== + dependencies: + "@babel/parser" "^7.16.4" + "@vue/compiler-core" "3.2.47" + "@vue/shared" "3.2.47" + estree-walker "^2.0.2" + magic-string "^0.25.7" + "@vue/reactivity@3.2.45", "@vue/reactivity@^3.2.45": version "3.2.45" resolved "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.45.tgz" @@ -1127,6 +1180,13 @@ dependencies: "@vue/shared" "3.2.45" +"@vue/reactivity@3.2.47": + version "3.2.47" + resolved "https://registry.jetlinks.cn/@vue%2freactivity/-/reactivity-3.2.47.tgz#1d6399074eadfc3ed35c727e2fd707d6881140b6" + integrity sha512-7khqQ/75oyyg+N/e+iwV6lpy1f5wq759NdlS1fpAhFXa8VeAIKGgk2E/C4VF59lx5b+Ezs5fpp/5WsRYXQiKxQ== + dependencies: + "@vue/shared" "3.2.47" + "@vue/runtime-core@3.2.45": version "3.2.45" resolved "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.45.tgz" @@ -1135,6 +1195,14 @@ "@vue/reactivity" "3.2.45" "@vue/shared" "3.2.45" +"@vue/runtime-core@3.2.47": + version "3.2.47" + resolved "https://registry.jetlinks.cn/@vue%2fruntime-core/-/runtime-core-3.2.47.tgz#406ebade3d5551c00fc6409bbc1eeb10f32e121d" + integrity sha512-RZxbLQIRB/K0ev0K9FXhNbBzT32H9iRtYbaXb0ZIz2usLms/D55dJR2t6cIEUn6vyhS3ALNvNthI+Q95C+NOpA== + dependencies: + "@vue/reactivity" "3.2.47" + "@vue/shared" "3.2.47" + "@vue/runtime-dom@3.2.45": version "3.2.45" resolved "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.45.tgz" @@ -1144,6 +1212,15 @@ "@vue/shared" "3.2.45" csstype "^2.6.8" +"@vue/runtime-dom@3.2.47": + version "3.2.47" + resolved "https://registry.jetlinks.cn/@vue%2fruntime-dom/-/runtime-dom-3.2.47.tgz#93e760eeaeab84dedfb7c3eaf3ed58d776299382" + integrity sha512-ArXrFTjS6TsDei4qwNvgrdmHtD930KgSKGhS5M+j8QxXrDJYLqYw4RRcDy1bz1m1wMmb6j+zGLifdVHtkXA7gA== + dependencies: + "@vue/runtime-core" "3.2.47" + "@vue/shared" "3.2.47" + csstype "^2.6.8" + "@vue/server-renderer@3.2.45": version "3.2.45" resolved "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.45.tgz" @@ -1152,11 +1229,24 @@ "@vue/compiler-ssr" "3.2.45" "@vue/shared" "3.2.45" +"@vue/server-renderer@3.2.47": + version "3.2.47" + resolved "https://registry.jetlinks.cn/@vue%2fserver-renderer/-/server-renderer-3.2.47.tgz#8aa1d1871fc4eb5a7851aa7f741f8f700e6de3c0" + integrity sha512-dN9gc1i8EvmP9RCzvneONXsKfBRgqFeFZLurmHOveL7oH6HiFXJw5OGu294n1nHc/HMgTy6LulU/tv5/A7f/LA== + dependencies: + "@vue/compiler-ssr" "3.2.47" + "@vue/shared" "3.2.47" + "@vue/shared@3.2.45", "@vue/shared@^3.2.45": version "3.2.45" resolved "https://registry.npmjs.org/@vue/shared/-/shared-3.2.45.tgz" integrity sha512-Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg== +"@vue/shared@3.2.47": + version "3.2.47" + resolved "https://registry.jetlinks.cn/@vue%2fshared/-/shared-3.2.47.tgz#e597ef75086c6e896ff5478a6bfc0a7aa4bbd14c" + integrity sha512-BHGyyGN3Q97EZx0taMQ+OLNuZcW3d37ZEVmEAyeoA9ERdGvm9Irc/0Fua8SNyOtV1w6BS4q25wbMzJujO9HIfQ== + "@vuemap/layer-3dtiles@^0.0.3": version "0.0.3" resolved "https://registry.npmjs.org/@vuemap/layer-3dtiles/-/layer-3dtiles-0.0.3.tgz" @@ -3644,8 +3734,8 @@ jetlinks-store@^0.0.3: jetlinks-ui-components@^1.0.1: version "1.0.1" - resolved "https://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.1.tgz#12fe9a193af14b859e1baf02fbd706a2be5b31cf" - integrity sha512-4hdEJUaKNMSIcmbn4qKcG8oK7h6VSYP3X3fCNndBm6WhHh+9ONf8f+3OSrUy1PvxdenmqO0VN2QdWV0KupByKQ== + resolved "https://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.1.tgz#d9e6f5bd9b98523fb4708269be9b4e9bba3437b9" + integrity sha512-P8ykIynH6ti9c4KndFfHu/dwewqiWm4Gjki4e+IlCJcwq1at2iokWAITOVm9UsBnEBqWhTQowpK6vlSyTlW+9g== dependencies: "@vueuse/core" "^9.12.0" ant-design-vue "^3.2.15"