diff --git a/xiuosiot-frontend/src/assets/images/action.png b/xiuosiot-frontend/src/assets/images/action.png new file mode 100644 index 0000000..ec491d4 Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/action.png differ diff --git a/xiuosiot-frontend/src/assets/images/arrow_three.png b/xiuosiot-frontend/src/assets/images/arrow_three.png new file mode 100644 index 0000000..882b7d5 Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/arrow_three.png differ diff --git a/xiuosiot-frontend/src/assets/images/class.png b/xiuosiot-frontend/src/assets/images/class.png new file mode 100644 index 0000000..f522bba Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/class.png differ diff --git a/xiuosiot-frontend/src/assets/images/clip.png b/xiuosiot-frontend/src/assets/images/clip.png new file mode 100644 index 0000000..da943d3 Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/clip.png differ diff --git a/xiuosiot-frontend/src/assets/images/header.png b/xiuosiot-frontend/src/assets/images/header.png new file mode 100644 index 0000000..8aa12af Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/header.png differ diff --git a/xiuosiot-frontend/src/assets/images/http_method.png b/xiuosiot-frontend/src/assets/images/http_method.png new file mode 100644 index 0000000..1fadada Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/http_method.png differ diff --git a/xiuosiot-frontend/src/assets/images/ip.png b/xiuosiot-frontend/src/assets/images/ip.png new file mode 100644 index 0000000..86d7190 Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/ip.png differ diff --git a/xiuosiot-frontend/src/assets/images/ip_white_border.png b/xiuosiot-frontend/src/assets/images/ip_white_border.png new file mode 100644 index 0000000..7124d0d Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/ip_white_border.png differ diff --git a/xiuosiot-frontend/src/assets/images/ip_without_border.png b/xiuosiot-frontend/src/assets/images/ip_without_border.png new file mode 100644 index 0000000..9a47c47 Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/ip_without_border.png differ diff --git a/xiuosiot-frontend/src/assets/images/log_box.png b/xiuosiot-frontend/src/assets/images/log_box.png new file mode 100644 index 0000000..3927ba6 Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/log_box.png differ diff --git a/xiuosiot-frontend/src/assets/images/method.png b/xiuosiot-frontend/src/assets/images/method.png new file mode 100644 index 0000000..a7b734a Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/method.png differ diff --git a/xiuosiot-frontend/src/assets/images/param.png b/xiuosiot-frontend/src/assets/images/param.png new file mode 100644 index 0000000..69c0205 Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/param.png differ diff --git a/xiuosiot-frontend/src/assets/images/path.png b/xiuosiot-frontend/src/assets/images/path.png new file mode 100644 index 0000000..4c4aede Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/path.png differ diff --git a/xiuosiot-frontend/src/assets/images/sysLog_content.png b/xiuosiot-frontend/src/assets/images/sysLog_content.png new file mode 100644 index 0000000..a2132ad Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/sysLog_content.png differ diff --git a/xiuosiot-frontend/src/assets/images/sysLog_link.png b/xiuosiot-frontend/src/assets/images/sysLog_link.png new file mode 100644 index 0000000..b77ea1f Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/sysLog_link.png differ diff --git a/xiuosiot-frontend/src/assets/images/sysLog_msg.png b/xiuosiot-frontend/src/assets/images/sysLog_msg.png new file mode 100644 index 0000000..4398ee3 Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/sysLog_msg.png differ diff --git a/xiuosiot-frontend/src/assets/images/sysLog_no.png b/xiuosiot-frontend/src/assets/images/sysLog_no.png new file mode 100644 index 0000000..e1fb77d Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/sysLog_no.png differ diff --git a/xiuosiot-frontend/src/assets/images/sysLog_thread.png b/xiuosiot-frontend/src/assets/images/sysLog_thread.png new file mode 100644 index 0000000..5e7f2ea Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/sysLog_thread.png differ diff --git a/xiuosiot-frontend/src/assets/images/sysLog_time.png b/xiuosiot-frontend/src/assets/images/sysLog_time.png new file mode 100644 index 0000000..eacca2a Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/sysLog_time.png differ diff --git a/xiuosiot-frontend/src/assets/images/sysLog_type.png b/xiuosiot-frontend/src/assets/images/sysLog_type.png new file mode 100644 index 0000000..7ffc477 Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/sysLog_type.png differ diff --git a/xiuosiot-frontend/src/assets/images/sysLog_type_white.png b/xiuosiot-frontend/src/assets/images/sysLog_type_white.png new file mode 100644 index 0000000..62c92be Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/sysLog_type_white.png differ diff --git a/xiuosiot-frontend/src/assets/images/systemlog_box_error.png b/xiuosiot-frontend/src/assets/images/systemlog_box_error.png new file mode 100644 index 0000000..a47c4c1 Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/systemlog_box_error.png differ diff --git a/xiuosiot-frontend/src/assets/images/systemlog_box_info.png b/xiuosiot-frontend/src/assets/images/systemlog_box_info.png new file mode 100644 index 0000000..cc0d2bc Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/systemlog_box_info.png differ diff --git a/xiuosiot-frontend/src/assets/images/systemlog_box_warning.png b/xiuosiot-frontend/src/assets/images/systemlog_box_warning.png new file mode 100644 index 0000000..7471002 Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/systemlog_box_warning.png differ diff --git a/xiuosiot-frontend/src/assets/images/take_time.png b/xiuosiot-frontend/src/assets/images/take_time.png new file mode 100644 index 0000000..7b8e9c8 Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/take_time.png differ diff --git a/xiuosiot-frontend/src/assets/images/take_time_without_border.png b/xiuosiot-frontend/src/assets/images/take_time_without_border.png new file mode 100644 index 0000000..c58e442 Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/take_time_without_border.png differ diff --git a/xiuosiot-frontend/src/assets/images/timestamp.png b/xiuosiot-frontend/src/assets/images/timestamp.png new file mode 100644 index 0000000..73342b8 Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/timestamp.png differ diff --git a/xiuosiot-frontend/src/assets/images/timestamp_without_border.png b/xiuosiot-frontend/src/assets/images/timestamp_without_border.png new file mode 100644 index 0000000..4e7e3ed Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/timestamp_without_border.png differ diff --git a/xiuosiot-frontend/src/assets/images/usr.png b/xiuosiot-frontend/src/assets/images/usr.png new file mode 100644 index 0000000..6e5966f Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/usr.png differ diff --git a/xiuosiot-frontend/src/layout/components/Navbar.vue b/xiuosiot-frontend/src/layout/components/Navbar.vue index a592add..872ef11 100644 --- a/xiuosiot-frontend/src/layout/components/Navbar.vue +++ b/xiuosiot-frontend/src/layout/components/Navbar.vue @@ -35,7 +35,7 @@ export default { }, async logout() { await this.$store.dispatch('user/logout') - this.$router.push('/login') + this.$router.push('/home') } } } diff --git a/xiuosiot-frontend/src/layout/index.vue b/xiuosiot-frontend/src/layout/index.vue index f52b6aa..5ed1196 100644 --- a/xiuosiot-frontend/src/layout/index.vue +++ b/xiuosiot-frontend/src/layout/index.vue @@ -48,7 +48,7 @@ export default { } }, showBreadcrumb() { - const whiteList = ['overview', 'terminal/add', 'terminal/plc', 'data/value', 'configuration/development', 'dashboard'] + const whiteList = ['overview', 'terminal/add', 'terminal/plc', 'data/value', 'configuration/development', 'dashboard', 'log/accessLog'] return whiteList.every((item) => this.$route.path.indexOf(item) === -1) } }, diff --git a/xiuosiot-frontend/src/permission.js b/xiuosiot-frontend/src/permission.js index 2737c84..3821411 100644 --- a/xiuosiot-frontend/src/permission.js +++ b/xiuosiot-frontend/src/permission.js @@ -2,7 +2,7 @@ * @Author: 龚祖望 573413756@qq.com * @Date: 2022-05-16 09:16:41 * @LastEditors: 龚祖望 573413756@qq.com - * @LastEditTime: 2022-10-09 15:28:49 + * @LastEditTime: 2022-10-19 14:37:55 * @FilePath: \dashengda\src\permission.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -16,7 +16,7 @@ import getPageTitle from '@/utils/get-page-title' NProgress.configure({ showSpinner: false }) // NProgress Configuration -const whiteList = ['/login', '/home', '/product/M168', '/product/RV400', '/product/RV400-SR100', '/product/RV400-AR100', '/product/M528', '/solution/shengda', '/solution/qianjiang'] // no redirect whitelist +const whiteList = ['/login', '/home', '/product/M168', '/product/RV400', '/product/RV400-SR100', '/product/RV400-AR100', '/product/M528', '/solution/shengda', '/solution/qianjiang', '/configuration/development', '/configuration/transferStation', '/configuration/AiCity', '/configuration/bridgeMachine'] // no redirect whitelist router.beforeEach(async(to, from, next) => { // start progress bar diff --git a/xiuosiot-frontend/src/router/index.js b/xiuosiot-frontend/src/router/index.js index 13fa61b..4f97b0f 100644 --- a/xiuosiot-frontend/src/router/index.js +++ b/xiuosiot-frontend/src/router/index.js @@ -172,6 +172,7 @@ export const constantRoutes = [ { path: 'ota', name: 'OTA', + component: () => import('@/views/terminal/OTA/index'), meta: { title: 'OTA升级', disabled: true } } ] @@ -238,19 +239,19 @@ export const constantRoutes = [ path: '/log', component: Layout, name: 'Log', - meta: { title: '日志管理', icon: 'log', disabled: true }, + meta: { title: '日志管理', icon: 'log' }, children: [ { path: 'accessLog', name: 'AccessLog', - // component: () => import(''), - meta: { title: '访问日志', disabled: true } + component: () => import('@/views/log/accessLog/index'), + meta: { title: '访问日志' } }, { path: 'systemLog', name: 'SystemLog', - // component: () => import('@/views/terminal/add/index'), - meta: { title: '系统日志', disabled: true } + component: () => import('@/views/log/systemLog/index'), + meta: { title: '系统日志' } } ] }, diff --git a/xiuosiot-frontend/src/views/log/accessLog/index.vue b/xiuosiot-frontend/src/views/log/accessLog/index.vue new file mode 100644 index 0000000..8dcef5c --- /dev/null +++ b/xiuosiot-frontend/src/views/log/accessLog/index.vue @@ -0,0 +1,413 @@ + + + + + diff --git a/xiuosiot-frontend/src/views/log/systemLog/index.vue b/xiuosiot-frontend/src/views/log/systemLog/index.vue new file mode 100644 index 0000000..207dca6 --- /dev/null +++ b/xiuosiot-frontend/src/views/log/systemLog/index.vue @@ -0,0 +1,359 @@ + + + + + + diff --git a/xiuosiot-frontend/src/views/terminal/OTA/index.vue b/xiuosiot-frontend/src/views/terminal/OTA/index.vue new file mode 100644 index 0000000..a5c1833 --- /dev/null +++ b/xiuosiot-frontend/src/views/terminal/OTA/index.vue @@ -0,0 +1,3 @@ +