diff --git a/.env.development b/.env.development index b36cd33..3ca38aa 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ # 页面标题 -VITE_APP_TITLE = 标题 +VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 VITE_APP_API_BASEURL = http://111.198.10.15:11638 diff --git a/.env.development b/.env.development index b36cd33..3ca38aa 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ # 页面标题 -VITE_APP_TITLE = 标题 +VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 VITE_APP_API_BASEURL = http://111.198.10.15:11638 diff --git a/.env.production b/.env.production index ed8a601..fa6df5c 100644 --- a/.env.production +++ b/.env.production @@ -1,9 +1,9 @@ NODE_ENV = production # 页面标题 -VITE_APP_TITLE = 标题 +VITE_APP_TITLE = 西昌计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://XXXXXXX:XXXXXXX +VITE_APP_API_BASEURL = http://111.198.10.15:11638 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/.env.development b/.env.development index b36cd33..3ca38aa 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ # 页面标题 -VITE_APP_TITLE = 标题 +VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 VITE_APP_API_BASEURL = http://111.198.10.15:11638 diff --git a/.env.production b/.env.production index ed8a601..fa6df5c 100644 --- a/.env.production +++ b/.env.production @@ -1,9 +1,9 @@ NODE_ENV = production # 页面标题 -VITE_APP_TITLE = 标题 +VITE_APP_TITLE = 西昌计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://XXXXXXX:XXXXXXX +VITE_APP_API_BASEURL = http://111.198.10.15:11638 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/README.md b/README.md index 72d0577..7a500ab 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

vue3-framework-only-sidebar

+

西昌计量业务系统

-

vue3框架-只有侧边栏

+

分为三个子系统:1.计量业务管理系统 2.受检设备管理系统 3.实验室环境监控系统

## 简要说明

@@ -26,8 +26,6 @@ - `master` Vue3 版本框架源码分支，不含示例代码，可直接用于实际开发 - `dev` 开发分支 -- `vue3-only-sidebar` Vue3 版本框架源码分支，只含有系统设置，布局只有侧边栏导航，可直接用于开发 -- `metering` Vue3 版本框架源码分支，只含有系统设置，布局含有顶部导航，可直接用于开发 ## 预览 diff --git a/.env.development b/.env.development index b36cd33..3ca38aa 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ # 页面标题 -VITE_APP_TITLE = 标题 +VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 VITE_APP_API_BASEURL = http://111.198.10.15:11638 diff --git a/.env.production b/.env.production index ed8a601..fa6df5c 100644 --- a/.env.production +++ b/.env.production @@ -1,9 +1,9 @@ NODE_ENV = production # 页面标题 -VITE_APP_TITLE = 标题 +VITE_APP_TITLE = 西昌计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://XXXXXXX:XXXXXXX +VITE_APP_API_BASEURL = http://111.198.10.15:11638 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/README.md b/README.md index 72d0577..7a500ab 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

vue3-framework-only-sidebar

+

西昌计量业务系统

-

vue3框架-只有侧边栏

+

分为三个子系统:1.计量业务管理系统 2.受检设备管理系统 3.实验室环境监控系统

## 简要说明

@@ -26,8 +26,6 @@ - `master` Vue3 版本框架源码分支，不含示例代码，可直接用于实际开发 - `dev` 开发分支 -- `vue3-only-sidebar` Vue3 版本框架源码分支，只含有系统设置，布局只有侧边栏导航，可直接用于开发 -- `metering` Vue3 版本框架源码分支，只含有系统设置，布局含有顶部导航，可直接用于开发 ## 预览 diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue index c0a9540..6039298 100644 --- a/src/layouts/components/Tools/index.vue +++ b/src/layouts/components/Tools/index.vue @@ -68,7 +68,7 @@ } onMounted(() => { // 连接 websocket - websocket.initWebSocket() + // websocket.initWebSocket() }) onBeforeMount(() => { // 断开 websocket diff --git a/.env.development b/.env.development index b36cd33..3ca38aa 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ # 页面标题 -VITE_APP_TITLE = 标题 +VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 VITE_APP_API_BASEURL = http://111.198.10.15:11638 diff --git a/.env.production b/.env.production index ed8a601..fa6df5c 100644 --- a/.env.production +++ b/.env.production @@ -1,9 +1,9 @@ NODE_ENV = production # 页面标题 -VITE_APP_TITLE = 标题 +VITE_APP_TITLE = 西昌计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://XXXXXXX:XXXXXXX +VITE_APP_API_BASEURL = http://111.198.10.15:11638 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/README.md b/README.md index 72d0577..7a500ab 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

vue3-framework-only-sidebar

+

西昌计量业务系统

-

vue3框架-只有侧边栏

+

分为三个子系统:1.计量业务管理系统 2.受检设备管理系统 3.实验室环境监控系统

## 简要说明

@@ -26,8 +26,6 @@ - `master` Vue3 版本框架源码分支，不含示例代码，可直接用于实际开发 - `dev` 开发分支 -- `vue3-only-sidebar` Vue3 版本框架源码分支，只含有系统设置，布局只有侧边栏导航，可直接用于开发 -- `metering` Vue3 版本框架源码分支，只含有系统设置，布局含有顶部导航，可直接用于开发 ## 预览 diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue index c0a9540..6039298 100644 --- a/src/layouts/components/Tools/index.vue +++ b/src/layouts/components/Tools/index.vue @@ -68,7 +68,7 @@ } onMounted(() => { // 连接 websocket - websocket.initWebSocket() + // websocket.initWebSocket() }) onBeforeMount(() => { // 断开 websocket diff --git a/src/router/index.ts b/src/router/index.ts index 6b9ba93..579b155 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -44,7 +44,7 @@ // 如果已登录状态下，进入登录页会强制跳转到控制台页面 if (to.name === 'login') { next({ - name: 'dashboard', + name: 'index', replace: true, }) } diff --git a/.env.development b/.env.development index b36cd33..3ca38aa 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ # 页面标题 -VITE_APP_TITLE = 标题 +VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 VITE_APP_API_BASEURL = http://111.198.10.15:11638 diff --git a/.env.production b/.env.production index ed8a601..fa6df5c 100644 --- a/.env.production +++ b/.env.production @@ -1,9 +1,9 @@ NODE_ENV = production # 页面标题 -VITE_APP_TITLE = 标题 +VITE_APP_TITLE = 西昌计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://XXXXXXX:XXXXXXX +VITE_APP_API_BASEURL = http://111.198.10.15:11638 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/README.md b/README.md index 72d0577..7a500ab 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

vue3-framework-only-sidebar

+

西昌计量业务系统

-

vue3框架-只有侧边栏

+

分为三个子系统:1.计量业务管理系统 2.受检设备管理系统 3.实验室环境监控系统

## 简要说明

@@ -26,8 +26,6 @@ - `master` Vue3 版本框架源码分支，不含示例代码，可直接用于实际开发 - `dev` 开发分支 -- `vue3-only-sidebar` Vue3 版本框架源码分支，只含有系统设置，布局只有侧边栏导航，可直接用于开发 -- `metering` Vue3 版本框架源码分支，只含有系统设置，布局含有顶部导航，可直接用于开发 ## 预览 diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue index c0a9540..6039298 100644 --- a/src/layouts/components/Tools/index.vue +++ b/src/layouts/components/Tools/index.vue @@ -68,7 +68,7 @@ } onMounted(() => { // 连接 websocket - websocket.initWebSocket() + // websocket.initWebSocket() }) onBeforeMount(() => { // 断开 websocket diff --git a/src/router/index.ts b/src/router/index.ts index 6b9ba93..579b155 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -44,7 +44,7 @@ // 如果已登录状态下，进入登录页会强制跳转到控制台页面 if (to.name === 'login') { next({ - name: 'dashboard', + name: 'index', replace: true, }) } diff --git a/src/router/modules/laboratory.ts b/src/router/modules/laboratory.ts new file mode 100644 index 0000000..e433127 --- /dev/null +++ b/src/router/modules/laboratory.ts @@ -0,0 +1,46 @@ +import type { Route } from '@/global' + +const Layout = () => import('@/layouts/index.vue') + +const routes: Route.recordRaw[] = [ + { + path: '/laboratory', + component: Layout, + redirect: '/laboratory/index2', + name: 'Metering', + meta: { + title: '实验室', + icon: 'ep:key', + auth: '/laboratory/index', + }, + children: [ + { + path: '/index2', + component: Layout, + redirect: '/index2/list2', + name: 'Index112', + meta: { + title: '区域管理', + icon: 'ep:key', + auth: '/laboratory/index', + }, + children: [ + { + path: 'list2', + name: 'AreaList2', + component: () => import('@/views/laboratory/index.vue'), + meta: { + title: '区域管理', + auth: '/laboratory/index', + sidebar: false, + breadcrumb: false, + activeMenu: '/laboratory', + }, + }, + ], + }], + }, + +] + +export default routes diff --git a/.env.development b/.env.development index b36cd33..3ca38aa 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ # 页面标题 -VITE_APP_TITLE = 标题 +VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 VITE_APP_API_BASEURL = http://111.198.10.15:11638 diff --git a/.env.production b/.env.production index ed8a601..fa6df5c 100644 --- a/.env.production +++ b/.env.production @@ -1,9 +1,9 @@ NODE_ENV = production # 页面标题 -VITE_APP_TITLE = 标题 +VITE_APP_TITLE = 西昌计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://XXXXXXX:XXXXXXX +VITE_APP_API_BASEURL = http://111.198.10.15:11638 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/README.md b/README.md index 72d0577..7a500ab 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

vue3-framework-only-sidebar

+

西昌计量业务系统

-

vue3框架-只有侧边栏

+

分为三个子系统:1.计量业务管理系统 2.受检设备管理系统 3.实验室环境监控系统

## 简要说明

@@ -26,8 +26,6 @@ - `master` Vue3 版本框架源码分支，不含示例代码，可直接用于实际开发 - `dev` 开发分支 -- `vue3-only-sidebar` Vue3 版本框架源码分支，只含有系统设置，布局只有侧边栏导航，可直接用于开发 -- `metering` Vue3 版本框架源码分支，只含有系统设置，布局含有顶部导航，可直接用于开发 ## 预览 diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue index c0a9540..6039298 100644 --- a/src/layouts/components/Tools/index.vue +++ b/src/layouts/components/Tools/index.vue @@ -68,7 +68,7 @@ } onMounted(() => { // 连接 websocket - websocket.initWebSocket() + // websocket.initWebSocket() }) onBeforeMount(() => { // 断开 websocket diff --git a/src/router/index.ts b/src/router/index.ts index 6b9ba93..579b155 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -44,7 +44,7 @@ // 如果已登录状态下，进入登录页会强制跳转到控制台页面 if (to.name === 'login') { next({ - name: 'dashboard', + name: 'index', replace: true, }) } diff --git a/src/router/modules/laboratory.ts b/src/router/modules/laboratory.ts new file mode 100644 index 0000000..e433127 --- /dev/null +++ b/src/router/modules/laboratory.ts @@ -0,0 +1,46 @@ +import type { Route } from '@/global' + +const Layout = () => import('@/layouts/index.vue') + +const routes: Route.recordRaw[] = [ + { + path: '/laboratory', + component: Layout, + redirect: '/laboratory/index2', + name: 'Metering', + meta: { + title: '实验室', + icon: 'ep:key', + auth: '/laboratory/index', + }, + children: [ + { + path: '/index2', + component: Layout, + redirect: '/index2/list2', + name: 'Index112', + meta: { + title: '区域管理', + icon: 'ep:key', + auth: '/laboratory/index', + }, + children: [ + { + path: 'list2', + name: 'AreaList2', + component: () => import('@/views/laboratory/index.vue'), + meta: { + title: '区域管理', + auth: '/laboratory/index', + sidebar: false, + breadcrumb: false, + activeMenu: '/laboratory', + }, + }, + ], + }], + }, + +] + +export default routes diff --git a/src/router/modules/mentering.ts b/src/router/modules/mentering.ts new file mode 100644 index 0000000..9a18e27 --- /dev/null +++ b/src/router/modules/mentering.ts @@ -0,0 +1,83 @@ +import type { Route } from '@/global' + +const Layout = () => import('@/layouts/index.vue') + +const routes: Route.recordRaw[] = [ + { + path: '/metering', + component: Layout, + redirect: '/metering/index1', + name: 'Metering', + meta: { + title: '计量业务', + icon: 'ep:key', + auth: '/metering/test2', + }, + children: [ + { + path: '/index1', + component: Layout, + redirect: '/index1/list1', + name: 'Index11', + meta: { + title: '区域管理', + icon: 'ep:key', + auth: '/metering/test2', + }, + children: [ + { + path: 'list1', + name: 'AreaList1', + component: () => import('@/views/metering/index.vue'), + meta: { + title: '区域管理', + auth: '/metering/test2', + sidebar: false, + breadcrumb: false, + activeMenu: '/metering', + }, + }, + ], + }], + }, + { + path: '/metering1', + component: Layout, + redirect: '/metering1/index11', + name: 'Metering11', + meta: { + title: '计量业务', + icon: 'ep:key', + auth: '/metering/test1', + }, + children: [ + { + path: '/index11', + component: Layout, + redirect: '/index11/list11', + name: 'Index111', + meta: { + title: '区域管理', + icon: 'ep:key', + auth: '/metering/test1', + }, + children: [ + { + path: 'list11', + name: 'AreaList11', + component: () => import('@/views/metering/index.vue'), + meta: { + title: '区域管理', + auth: '/metering/test1', + sidebar: false, + breadcrumb: false, + activeMenu: '/metering1', + }, + }, + ], + }], + }, + +] + +export default routes diff --git a/.env.development b/.env.development index b36cd33..3ca38aa 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ # 页面标题 -VITE_APP_TITLE = 标题 +VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 VITE_APP_API_BASEURL = http://111.198.10.15:11638 diff --git a/.env.production b/.env.production index ed8a601..fa6df5c 100644 --- a/.env.production +++ b/.env.production @@ -1,9 +1,9 @@ NODE_ENV = production # 页面标题 -VITE_APP_TITLE = 标题 +VITE_APP_TITLE = 西昌计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://XXXXXXX:XXXXXXX +VITE_APP_API_BASEURL = http://111.198.10.15:11638 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/README.md b/README.md index 72d0577..7a500ab 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

vue3-framework-only-sidebar

+

西昌计量业务系统

-

vue3框架-只有侧边栏

+

分为三个子系统:1.计量业务管理系统 2.受检设备管理系统 3.实验室环境监控系统

## 简要说明

@@ -26,8 +26,6 @@ - `master` Vue3 版本框架源码分支，不含示例代码，可直接用于实际开发 - `dev` 开发分支 -- `vue3-only-sidebar` Vue3 版本框架源码分支，只含有系统设置，布局只有侧边栏导航，可直接用于开发 -- `metering` Vue3 版本框架源码分支，只含有系统设置，布局含有顶部导航，可直接用于开发 ## 预览 diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue index c0a9540..6039298 100644 --- a/src/layouts/components/Tools/index.vue +++ b/src/layouts/components/Tools/index.vue @@ -68,7 +68,7 @@ } onMounted(() => { // 连接 websocket - websocket.initWebSocket() + // websocket.initWebSocket() }) onBeforeMount(() => { // 断开 websocket diff --git a/src/router/index.ts b/src/router/index.ts index 6b9ba93..579b155 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -44,7 +44,7 @@ // 如果已登录状态下，进入登录页会强制跳转到控制台页面 if (to.name === 'login') { next({ - name: 'dashboard', + name: 'index', replace: true, }) } diff --git a/src/router/modules/laboratory.ts b/src/router/modules/laboratory.ts new file mode 100644 index 0000000..e433127 --- /dev/null +++ b/src/router/modules/laboratory.ts @@ -0,0 +1,46 @@ +import type { Route } from '@/global' + +const Layout = () => import('@/layouts/index.vue') + +const routes: Route.recordRaw[] = [ + { + path: '/laboratory', + component: Layout, + redirect: '/laboratory/index2', + name: 'Metering', + meta: { + title: '实验室', + icon: 'ep:key', + auth: '/laboratory/index', + }, + children: [ + { + path: '/index2', + component: Layout, + redirect: '/index2/list2', + name: 'Index112', + meta: { + title: '区域管理', + icon: 'ep:key', + auth: '/laboratory/index', + }, + children: [ + { + path: 'list2', + name: 'AreaList2', + component: () => import('@/views/laboratory/index.vue'), + meta: { + title: '区域管理', + auth: '/laboratory/index', + sidebar: false, + breadcrumb: false, + activeMenu: '/laboratory', + }, + }, + ], + }], + }, + +] + +export default routes diff --git a/src/router/modules/mentering.ts b/src/router/modules/mentering.ts new file mode 100644 index 0000000..9a18e27 --- /dev/null +++ b/src/router/modules/mentering.ts @@ -0,0 +1,83 @@ +import type { Route } from '@/global' + +const Layout = () => import('@/layouts/index.vue') + +const routes: Route.recordRaw[] = [ + { + path: '/metering', + component: Layout, + redirect: '/metering/index1', + name: 'Metering', + meta: { + title: '计量业务', + icon: 'ep:key', + auth: '/metering/test2', + }, + children: [ + { + path: '/index1', + component: Layout, + redirect: '/index1/list1', + name: 'Index11', + meta: { + title: '区域管理', + icon: 'ep:key', + auth: '/metering/test2', + }, + children: [ + { + path: 'list1', + name: 'AreaList1', + component: () => import('@/views/metering/index.vue'), + meta: { + title: '区域管理', + auth: '/metering/test2', + sidebar: false, + breadcrumb: false, + activeMenu: '/metering', + }, + }, + ], + }], + }, + { + path: '/metering1', + component: Layout, + redirect: '/metering1/index11', + name: 'Metering11', + meta: { + title: '计量业务', + icon: 'ep:key', + auth: '/metering/test1', + }, + children: [ + { + path: '/index11', + component: Layout, + redirect: '/index11/list11', + name: 'Index111', + meta: { + title: '区域管理', + icon: 'ep:key', + auth: '/metering/test1', + }, + children: [ + { + path: 'list11', + name: 'AreaList11', + component: () => import('@/views/metering/index.vue'), + meta: { + title: '区域管理', + auth: '/metering/test1', + sidebar: false, + breadcrumb: false, + activeMenu: '/metering1', + }, + }, + ], + }], + }, + +] + +export default routes diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts new file mode 100644 index 0000000..c9edcf1 --- /dev/null +++ b/src/router/modules/tested.ts @@ -0,0 +1,46 @@ +import type { Route } from '@/global' + +const Layout = () => import('@/layouts/index.vue') + +const routes: Route.recordRaw[] = [ + { + path: '/tested', + component: Layout, + redirect: '/tested/index3', + name: 'Metering', + meta: { + title: '受检设备', + icon: 'ep:key', + auth: '/tested/index', + }, + children: [ + { + path: '/index3', + component: Layout, + redirect: '/index3/list3', + name: 'Index113', + meta: { + title: '区域管理', + icon: 'ep:key', + auth: '/tested/index', + }, + children: [ + { + path: 'list3', + name: 'AreaList122', + component: () => import('@/views/tested/index.vue'), + meta: { + title: '区域管理', + auth: '/tested/index', + sidebar: false, + breadcrumb: false, + activeMenu: '/tested', + }, + }, + ], + }], + }, + +] + +export default routes diff --git a/.env.development b/.env.development index b36cd33..3ca38aa 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ # 页面标题 -VITE_APP_TITLE = 标题 +VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 VITE_APP_API_BASEURL = http://111.198.10.15:11638 diff --git a/.env.production b/.env.production index ed8a601..fa6df5c 100644 --- a/.env.production +++ b/.env.production @@ -1,9 +1,9 @@ NODE_ENV = production # 页面标题 -VITE_APP_TITLE = 标题 +VITE_APP_TITLE = 西昌计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://XXXXXXX:XXXXXXX +VITE_APP_API_BASEURL = http://111.198.10.15:11638 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/README.md b/README.md index 72d0577..7a500ab 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

vue3-framework-only-sidebar

+

西昌计量业务系统

-

vue3框架-只有侧边栏

+

分为三个子系统:1.计量业务管理系统 2.受检设备管理系统 3.实验室环境监控系统

## 简要说明

@@ -26,8 +26,6 @@ - `master` Vue3 版本框架源码分支，不含示例代码，可直接用于实际开发 - `dev` 开发分支 -- `vue3-only-sidebar` Vue3 版本框架源码分支，只含有系统设置，布局只有侧边栏导航，可直接用于开发 -- `metering` Vue3 版本框架源码分支，只含有系统设置，布局含有顶部导航，可直接用于开发 ## 预览 diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue index c0a9540..6039298 100644 --- a/src/layouts/components/Tools/index.vue +++ b/src/layouts/components/Tools/index.vue @@ -68,7 +68,7 @@ } onMounted(() => { // 连接 websocket - websocket.initWebSocket() + // websocket.initWebSocket() }) onBeforeMount(() => { // 断开 websocket diff --git a/src/router/index.ts b/src/router/index.ts index 6b9ba93..579b155 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -44,7 +44,7 @@ // 如果已登录状态下，进入登录页会强制跳转到控制台页面 if (to.name === 'login') { next({ - name: 'dashboard', + name: 'index', replace: true, }) } diff --git a/src/router/modules/laboratory.ts b/src/router/modules/laboratory.ts new file mode 100644 index 0000000..e433127 --- /dev/null +++ b/src/router/modules/laboratory.ts @@ -0,0 +1,46 @@ +import type { Route } from '@/global' + +const Layout = () => import('@/layouts/index.vue') + +const routes: Route.recordRaw[] = [ + { + path: '/laboratory', + component: Layout, + redirect: '/laboratory/index2', + name: 'Metering', + meta: { + title: '实验室', + icon: 'ep:key', + auth: '/laboratory/index', + }, + children: [ + { + path: '/index2', + component: Layout, + redirect: '/index2/list2', + name: 'Index112', + meta: { + title: '区域管理', + icon: 'ep:key', + auth: '/laboratory/index', + }, + children: [ + { + path: 'list2', + name: 'AreaList2', + component: () => import('@/views/laboratory/index.vue'), + meta: { + title: '区域管理', + auth: '/laboratory/index', + sidebar: false, + breadcrumb: false, + activeMenu: '/laboratory', + }, + }, + ], + }], + }, + +] + +export default routes diff --git a/src/router/modules/mentering.ts b/src/router/modules/mentering.ts new file mode 100644 index 0000000..9a18e27 --- /dev/null +++ b/src/router/modules/mentering.ts @@ -0,0 +1,83 @@ +import type { Route } from '@/global' + +const Layout = () => import('@/layouts/index.vue') + +const routes: Route.recordRaw[] = [ + { + path: '/metering', + component: Layout, + redirect: '/metering/index1', + name: 'Metering', + meta: { + title: '计量业务', + icon: 'ep:key', + auth: '/metering/test2', + }, + children: [ + { + path: '/index1', + component: Layout, + redirect: '/index1/list1', + name: 'Index11', + meta: { + title: '区域管理', + icon: 'ep:key', + auth: '/metering/test2', + }, + children: [ + { + path: 'list1', + name: 'AreaList1', + component: () => import('@/views/metering/index.vue'), + meta: { + title: '区域管理', + auth: '/metering/test2', + sidebar: false, + breadcrumb: false, + activeMenu: '/metering', + }, + }, + ], + }], + }, + { + path: '/metering1', + component: Layout, + redirect: '/metering1/index11', + name: 'Metering11', + meta: { + title: '计量业务', + icon: 'ep:key', + auth: '/metering/test1', + }, + children: [ + { + path: '/index11', + component: Layout, + redirect: '/index11/list11', + name: 'Index111', + meta: { + title: '区域管理', + icon: 'ep:key', + auth: '/metering/test1', + }, + children: [ + { + path: 'list11', + name: 'AreaList11', + component: () => import('@/views/metering/index.vue'), + meta: { + title: '区域管理', + auth: '/metering/test1', + sidebar: false, + breadcrumb: false, + activeMenu: '/metering1', + }, + }, + ], + }], + }, + +] + +export default routes diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts new file mode 100644 index 0000000..c9edcf1 --- /dev/null +++ b/src/router/modules/tested.ts @@ -0,0 +1,46 @@ +import type { Route } from '@/global' + +const Layout = () => import('@/layouts/index.vue') + +const routes: Route.recordRaw[] = [ + { + path: '/tested', + component: Layout, + redirect: '/tested/index3', + name: 'Metering', + meta: { + title: '受检设备', + icon: 'ep:key', + auth: '/tested/index', + }, + children: [ + { + path: '/index3', + component: Layout, + redirect: '/index3/list3', + name: 'Index113', + meta: { + title: '区域管理', + icon: 'ep:key', + auth: '/tested/index', + }, + children: [ + { + path: 'list3', + name: 'AreaList122', + component: () => import('@/views/tested/index.vue'), + meta: { + title: '区域管理', + auth: '/tested/index', + sidebar: false, + breadcrumb: false, + activeMenu: '/tested', + }, + }, + ], + }], + }, + +] + +export default routes diff --git a/src/router/routes.ts b/src/router/routes.ts index 743e00b..75421d1 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -1,6 +1,9 @@ import { setupLayouts } from 'virtual:generated-layouts' import generatedRoutes from 'virtual:generated-pages' import systemRoute from './modules/system' +import meterRoute from './modules/mentering' +import testedRoute from './modules/tested' +import laboratoryRoute from './modules/laboratory' import type { Route } from '@/global' import useSettingsStore from '@/store/modules/settings' @@ -14,6 +17,14 @@ }, }, { + path: '/index', + name: 'index', + component: () => import('@/views/dashboard.vue'), + meta: { + title: '子系统列表', + }, + }, + { path: '/login', name: 'login', component: () => import('@/views/login.vue'), @@ -105,9 +116,39 @@ const asyncRoutes: Route.recordMainRaw[] = [ { meta: { - title: '系统设置', + title: '计量业务管理系统', icon: '', - auth: '/system', + auth: '/metering/index', + }, + children: [ + ...meterRoute, + ], + }, + { + meta: { + title: '受检设备管理系统', + icon: '', + auth: '/tested/index', + }, + children: [ + ...testedRoute, + ], + }, + { + meta: { + title: '实验室环境监控系统', + icon: '', + auth: '/laboratory/index', + }, + children: [ + ...laboratoryRoute, + ], + }, + { + meta: { + title: '通用设置', + icon: '', + auth: '/common/index', }, children: [ ...systemRoute, diff --git a/.env.development b/.env.development index b36cd33..3ca38aa 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ # 页面标题 -VITE_APP_TITLE = 标题 +VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 VITE_APP_API_BASEURL = http://111.198.10.15:11638 diff --git a/.env.production b/.env.production index ed8a601..fa6df5c 100644 --- a/.env.production +++ b/.env.production @@ -1,9 +1,9 @@ NODE_ENV = production # 页面标题 -VITE_APP_TITLE = 标题 +VITE_APP_TITLE = 西昌计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://XXXXXXX:XXXXXXX +VITE_APP_API_BASEURL = http://111.198.10.15:11638 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/README.md b/README.md index 72d0577..7a500ab 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

vue3-framework-only-sidebar

+

西昌计量业务系统

-

vue3框架-只有侧边栏

+

分为三个子系统:1.计量业务管理系统 2.受检设备管理系统 3.实验室环境监控系统

## 简要说明

@@ -26,8 +26,6 @@ - `master` Vue3 版本框架源码分支，不含示例代码，可直接用于实际开发 - `dev` 开发分支 -- `vue3-only-sidebar` Vue3 版本框架源码分支，只含有系统设置，布局只有侧边栏导航，可直接用于开发 -- `metering` Vue3 版本框架源码分支，只含有系统设置，布局含有顶部导航，可直接用于开发 ## 预览 diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue index c0a9540..6039298 100644 --- a/src/layouts/components/Tools/index.vue +++ b/src/layouts/components/Tools/index.vue @@ -68,7 +68,7 @@ } onMounted(() => { // 连接 websocket - websocket.initWebSocket() + // websocket.initWebSocket() }) onBeforeMount(() => { // 断开 websocket diff --git a/src/router/index.ts b/src/router/index.ts index 6b9ba93..579b155 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -44,7 +44,7 @@ // 如果已登录状态下，进入登录页会强制跳转到控制台页面 if (to.name === 'login') { next({ - name: 'dashboard', + name: 'index', replace: true, }) } diff --git a/src/router/modules/laboratory.ts b/src/router/modules/laboratory.ts new file mode 100644 index 0000000..e433127 --- /dev/null +++ b/src/router/modules/laboratory.ts @@ -0,0 +1,46 @@ +import type { Route } from '@/global' + +const Layout = () => import('@/layouts/index.vue') + +const routes: Route.recordRaw[] = [ + { + path: '/laboratory', + component: Layout, + redirect: '/laboratory/index2', + name: 'Metering', + meta: { + title: '实验室', + icon: 'ep:key', + auth: '/laboratory/index', + }, + children: [ + { + path: '/index2', + component: Layout, + redirect: '/index2/list2', + name: 'Index112', + meta: { + title: '区域管理', + icon: 'ep:key', + auth: '/laboratory/index', + }, + children: [ + { + path: 'list2', + name: 'AreaList2', + component: () => import('@/views/laboratory/index.vue'), + meta: { + title: '区域管理', + auth: '/laboratory/index', + sidebar: false, + breadcrumb: false, + activeMenu: '/laboratory', + }, + }, + ], + }], + }, + +] + +export default routes diff --git a/src/router/modules/mentering.ts b/src/router/modules/mentering.ts new file mode 100644 index 0000000..9a18e27 --- /dev/null +++ b/src/router/modules/mentering.ts @@ -0,0 +1,83 @@ +import type { Route } from '@/global' + +const Layout = () => import('@/layouts/index.vue') + +const routes: Route.recordRaw[] = [ + { + path: '/metering', + component: Layout, + redirect: '/metering/index1', + name: 'Metering', + meta: { + title: '计量业务', + icon: 'ep:key', + auth: '/metering/test2', + }, + children: [ + { + path: '/index1', + component: Layout, + redirect: '/index1/list1', + name: 'Index11', + meta: { + title: '区域管理', + icon: 'ep:key', + auth: '/metering/test2', + }, + children: [ + { + path: 'list1', + name: 'AreaList1', + component: () => import('@/views/metering/index.vue'), + meta: { + title: '区域管理', + auth: '/metering/test2', + sidebar: false, + breadcrumb: false, + activeMenu: '/metering', + }, + }, + ], + }], + }, + { + path: '/metering1', + component: Layout, + redirect: '/metering1/index11', + name: 'Metering11', + meta: { + title: '计量业务', + icon: 'ep:key', + auth: '/metering/test1', + }, + children: [ + { + path: '/index11', + component: Layout, + redirect: '/index11/list11', + name: 'Index111', + meta: { + title: '区域管理', + icon: 'ep:key', + auth: '/metering/test1', + }, + children: [ + { + path: 'list11', + name: 'AreaList11', + component: () => import('@/views/metering/index.vue'), + meta: { + title: '区域管理', + auth: '/metering/test1', + sidebar: false, + breadcrumb: false, + activeMenu: '/metering1', + }, + }, + ], + }], + }, + +] + +export default routes diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts new file mode 100644 index 0000000..c9edcf1 --- /dev/null +++ b/src/router/modules/tested.ts @@ -0,0 +1,46 @@ +import type { Route } from '@/global' + +const Layout = () => import('@/layouts/index.vue') + +const routes: Route.recordRaw[] = [ + { + path: '/tested', + component: Layout, + redirect: '/tested/index3', + name: 'Metering', + meta: { + title: '受检设备', + icon: 'ep:key', + auth: '/tested/index', + }, + children: [ + { + path: '/index3', + component: Layout, + redirect: '/index3/list3', + name: 'Index113', + meta: { + title: '区域管理', + icon: 'ep:key', + auth: '/tested/index', + }, + children: [ + { + path: 'list3', + name: 'AreaList122', + component: () => import('@/views/tested/index.vue'), + meta: { + title: '区域管理', + auth: '/tested/index', + sidebar: false, + breadcrumb: false, + activeMenu: '/tested', + }, + }, + ], + }], + }, + +] + +export default routes diff --git a/src/router/routes.ts b/src/router/routes.ts index 743e00b..75421d1 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -1,6 +1,9 @@ import { setupLayouts } from 'virtual:generated-layouts' import generatedRoutes from 'virtual:generated-pages' import systemRoute from './modules/system' +import meterRoute from './modules/mentering' +import testedRoute from './modules/tested' +import laboratoryRoute from './modules/laboratory' import type { Route } from '@/global' import useSettingsStore from '@/store/modules/settings' @@ -14,6 +17,14 @@ }, }, { + path: '/index', + name: 'index', + component: () => import('@/views/dashboard.vue'), + meta: { + title: '子系统列表', + }, + }, + { path: '/login', name: 'login', component: () => import('@/views/login.vue'), @@ -105,9 +116,39 @@ const asyncRoutes: Route.recordMainRaw[] = [ { meta: { - title: '系统设置', + title: '计量业务管理系统', icon: '', - auth: '/system', + auth: '/metering/index', + }, + children: [ + ...meterRoute, + ], + }, + { + meta: { + title: '受检设备管理系统', + icon: '', + auth: '/tested/index', + }, + children: [ + ...testedRoute, + ], + }, + { + meta: { + title: '实验室环境监控系统', + icon: '', + auth: '/laboratory/index', + }, + children: [ + ...laboratoryRoute, + ], + }, + { + meta: { + title: '通用设置', + icon: '', + auth: '/common/index', }, children: [ ...systemRoute, diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue new file mode 100644 index 0000000..70bdeb1 --- /dev/null +++ b/src/views/dashboard.vue @@ -0,0 +1,312 @@ + +meta: + title: 登录 + constant: true + layout: false + + + + + + + diff --git a/.env.development b/.env.development index b36cd33..3ca38aa 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ # 页面标题 -VITE_APP_TITLE = 标题 +VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 VITE_APP_API_BASEURL = http://111.198.10.15:11638 diff --git a/.env.production b/.env.production index ed8a601..fa6df5c 100644 --- a/.env.production +++ b/.env.production @@ -1,9 +1,9 @@ NODE_ENV = production # 页面标题 -VITE_APP_TITLE = 标题 +VITE_APP_TITLE = 西昌计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://XXXXXXX:XXXXXXX +VITE_APP_API_BASEURL = http://111.198.10.15:11638 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/README.md b/README.md index 72d0577..7a500ab 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

vue3-framework-only-sidebar

+

西昌计量业务系统

-

vue3框架-只有侧边栏

+

分为三个子系统:1.计量业务管理系统 2.受检设备管理系统 3.实验室环境监控系统

## 简要说明

@@ -26,8 +26,6 @@ - `master` Vue3 版本框架源码分支，不含示例代码，可直接用于实际开发 - `dev` 开发分支 -- `vue3-only-sidebar` Vue3 版本框架源码分支，只含有系统设置，布局只有侧边栏导航，可直接用于开发 -- `metering` Vue3 版本框架源码分支，只含有系统设置，布局含有顶部导航，可直接用于开发 ## 预览 diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue index c0a9540..6039298 100644 --- a/src/layouts/components/Tools/index.vue +++ b/src/layouts/components/Tools/index.vue @@ -68,7 +68,7 @@ } onMounted(() => { // 连接 websocket - websocket.initWebSocket() + // websocket.initWebSocket() }) onBeforeMount(() => { // 断开 websocket diff --git a/src/router/index.ts b/src/router/index.ts index 6b9ba93..579b155 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -44,7 +44,7 @@ // 如果已登录状态下，进入登录页会强制跳转到控制台页面 if (to.name === 'login') { next({ - name: 'dashboard', + name: 'index', replace: true, }) } diff --git a/src/router/modules/laboratory.ts b/src/router/modules/laboratory.ts new file mode 100644 index 0000000..e433127 --- /dev/null +++ b/src/router/modules/laboratory.ts @@ -0,0 +1,46 @@ +import type { Route } from '@/global' + +const Layout = () => import('@/layouts/index.vue') + +const routes: Route.recordRaw[] = [ + { + path: '/laboratory', + component: Layout, + redirect: '/laboratory/index2', + name: 'Metering', + meta: { + title: '实验室', + icon: 'ep:key', + auth: '/laboratory/index', + }, + children: [ + { + path: '/index2', + component: Layout, + redirect: '/index2/list2', + name: 'Index112', + meta: { + title: '区域管理', + icon: 'ep:key', + auth: '/laboratory/index', + }, + children: [ + { + path: 'list2', + name: 'AreaList2', + component: () => import('@/views/laboratory/index.vue'), + meta: { + title: '区域管理', + auth: '/laboratory/index', + sidebar: false, + breadcrumb: false, + activeMenu: '/laboratory', + }, + }, + ], + }], + }, + +] + +export default routes diff --git a/src/router/modules/mentering.ts b/src/router/modules/mentering.ts new file mode 100644 index 0000000..9a18e27 --- /dev/null +++ b/src/router/modules/mentering.ts @@ -0,0 +1,83 @@ +import type { Route } from '@/global' + +const Layout = () => import('@/layouts/index.vue') + +const routes: Route.recordRaw[] = [ + { + path: '/metering', + component: Layout, + redirect: '/metering/index1', + name: 'Metering', + meta: { + title: '计量业务', + icon: 'ep:key', + auth: '/metering/test2', + }, + children: [ + { + path: '/index1', + component: Layout, + redirect: '/index1/list1', + name: 'Index11', + meta: { + title: '区域管理', + icon: 'ep:key', + auth: '/metering/test2', + }, + children: [ + { + path: 'list1', + name: 'AreaList1', + component: () => import('@/views/metering/index.vue'), + meta: { + title: '区域管理', + auth: '/metering/test2', + sidebar: false, + breadcrumb: false, + activeMenu: '/metering', + }, + }, + ], + }], + }, + { + path: '/metering1', + component: Layout, + redirect: '/metering1/index11', + name: 'Metering11', + meta: { + title: '计量业务', + icon: 'ep:key', + auth: '/metering/test1', + }, + children: [ + { + path: '/index11', + component: Layout, + redirect: '/index11/list11', + name: 'Index111', + meta: { + title: '区域管理', + icon: 'ep:key', + auth: '/metering/test1', + }, + children: [ + { + path: 'list11', + name: 'AreaList11', + component: () => import('@/views/metering/index.vue'), + meta: { + title: '区域管理', + auth: '/metering/test1', + sidebar: false, + breadcrumb: false, + activeMenu: '/metering1', + }, + }, + ], + }], + }, + +] + +export default routes diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts new file mode 100644 index 0000000..c9edcf1 --- /dev/null +++ b/src/router/modules/tested.ts @@ -0,0 +1,46 @@ +import type { Route } from '@/global' + +const Layout = () => import('@/layouts/index.vue') + +const routes: Route.recordRaw[] = [ + { + path: '/tested', + component: Layout, + redirect: '/tested/index3', + name: 'Metering', + meta: { + title: '受检设备', + icon: 'ep:key', + auth: '/tested/index', + }, + children: [ + { + path: '/index3', + component: Layout, + redirect: '/index3/list3', + name: 'Index113', + meta: { + title: '区域管理', + icon: 'ep:key', + auth: '/tested/index', + }, + children: [ + { + path: 'list3', + name: 'AreaList122', + component: () => import('@/views/tested/index.vue'), + meta: { + title: '区域管理', + auth: '/tested/index', + sidebar: false, + breadcrumb: false, + activeMenu: '/tested', + }, + }, + ], + }], + }, + +] + +export default routes diff --git a/src/router/routes.ts b/src/router/routes.ts index 743e00b..75421d1 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -1,6 +1,9 @@ import { setupLayouts } from 'virtual:generated-layouts' import generatedRoutes from 'virtual:generated-pages' import systemRoute from './modules/system' +import meterRoute from './modules/mentering' +import testedRoute from './modules/tested' +import laboratoryRoute from './modules/laboratory' import type { Route } from '@/global' import useSettingsStore from '@/store/modules/settings' @@ -14,6 +17,14 @@ }, }, { + path: '/index', + name: 'index', + component: () => import('@/views/dashboard.vue'), + meta: { + title: '子系统列表', + }, + }, + { path: '/login', name: 'login', component: () => import('@/views/login.vue'), @@ -105,9 +116,39 @@ const asyncRoutes: Route.recordMainRaw[] = [ { meta: { - title: '系统设置', + title: '计量业务管理系统', icon: '', - auth: '/system', + auth: '/metering/index', + }, + children: [ + ...meterRoute, + ], + }, + { + meta: { + title: '受检设备管理系统', + icon: '', + auth: '/tested/index', + }, + children: [ + ...testedRoute, + ], + }, + { + meta: { + title: '实验室环境监控系统', + icon: '', + auth: '/laboratory/index', + }, + children: [ + ...laboratoryRoute, + ], + }, + { + meta: { + title: '通用设置', + icon: '', + auth: '/common/index', }, children: [ ...systemRoute, diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue new file mode 100644 index 0000000..70bdeb1 --- /dev/null +++ b/src/views/dashboard.vue @@ -0,0 +1,312 @@ + +meta: + title: 登录 + constant: true + layout: false + + + + + + + diff --git a/src/views/laboratory/index.vue b/src/views/laboratory/index.vue new file mode 100644 index 0000000..6de9817 --- /dev/null +++ b/src/views/laboratory/index.vue @@ -0,0 +1,3 @@ + diff --git a/.env.development b/.env.development index b36cd33..3ca38aa 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ # 页面标题 -VITE_APP_TITLE = 标题 +VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 VITE_APP_API_BASEURL = http://111.198.10.15:11638 diff --git a/.env.production b/.env.production index ed8a601..fa6df5c 100644 --- a/.env.production +++ b/.env.production @@ -1,9 +1,9 @@ NODE_ENV = production # 页面标题 -VITE_APP_TITLE = 标题 +VITE_APP_TITLE = 西昌计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://XXXXXXX:XXXXXXX +VITE_APP_API_BASEURL = http://111.198.10.15:11638 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/README.md b/README.md index 72d0577..7a500ab 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

vue3-framework-only-sidebar

+

西昌计量业务系统

-

vue3框架-只有侧边栏

+

分为三个子系统:1.计量业务管理系统 2.受检设备管理系统 3.实验室环境监控系统

## 简要说明

@@ -26,8 +26,6 @@ - `master` Vue3 版本框架源码分支，不含示例代码，可直接用于实际开发 - `dev` 开发分支 -- `vue3-only-sidebar` Vue3 版本框架源码分支，只含有系统设置，布局只有侧边栏导航，可直接用于开发 -- `metering` Vue3 版本框架源码分支，只含有系统设置，布局含有顶部导航，可直接用于开发 ## 预览 diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue index c0a9540..6039298 100644 --- a/src/layouts/components/Tools/index.vue +++ b/src/layouts/components/Tools/index.vue @@ -68,7 +68,7 @@ } onMounted(() => { // 连接 websocket - websocket.initWebSocket() + // websocket.initWebSocket() }) onBeforeMount(() => { // 断开 websocket diff --git a/src/router/index.ts b/src/router/index.ts index 6b9ba93..579b155 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -44,7 +44,7 @@ // 如果已登录状态下，进入登录页会强制跳转到控制台页面 if (to.name === 'login') { next({ - name: 'dashboard', + name: 'index', replace: true, }) } diff --git a/src/router/modules/laboratory.ts b/src/router/modules/laboratory.ts new file mode 100644 index 0000000..e433127 --- /dev/null +++ b/src/router/modules/laboratory.ts @@ -0,0 +1,46 @@ +import type { Route } from '@/global' + +const Layout = () => import('@/layouts/index.vue') + +const routes: Route.recordRaw[] = [ + { + path: '/laboratory', + component: Layout, + redirect: '/laboratory/index2', + name: 'Metering', + meta: { + title: '实验室', + icon: 'ep:key', + auth: '/laboratory/index', + }, + children: [ + { + path: '/index2', + component: Layout, + redirect: '/index2/list2', + name: 'Index112', + meta: { + title: '区域管理', + icon: 'ep:key', + auth: '/laboratory/index', + }, + children: [ + { + path: 'list2', + name: 'AreaList2', + component: () => import('@/views/laboratory/index.vue'), + meta: { + title: '区域管理', + auth: '/laboratory/index', + sidebar: false, + breadcrumb: false, + activeMenu: '/laboratory', + }, + }, + ], + }], + }, + +] + +export default routes diff --git a/src/router/modules/mentering.ts b/src/router/modules/mentering.ts new file mode 100644 index 0000000..9a18e27 --- /dev/null +++ b/src/router/modules/mentering.ts @@ -0,0 +1,83 @@ +import type { Route } from '@/global' + +const Layout = () => import('@/layouts/index.vue') + +const routes: Route.recordRaw[] = [ + { + path: '/metering', + component: Layout, + redirect: '/metering/index1', + name: 'Metering', + meta: { + title: '计量业务', + icon: 'ep:key', + auth: '/metering/test2', + }, + children: [ + { + path: '/index1', + component: Layout, + redirect: '/index1/list1', + name: 'Index11', + meta: { + title: '区域管理', + icon: 'ep:key', + auth: '/metering/test2', + }, + children: [ + { + path: 'list1', + name: 'AreaList1', + component: () => import('@/views/metering/index.vue'), + meta: { + title: '区域管理', + auth: '/metering/test2', + sidebar: false, + breadcrumb: false, + activeMenu: '/metering', + }, + }, + ], + }], + }, + { + path: '/metering1', + component: Layout, + redirect: '/metering1/index11', + name: 'Metering11', + meta: { + title: '计量业务', + icon: 'ep:key', + auth: '/metering/test1', + }, + children: [ + { + path: '/index11', + component: Layout, + redirect: '/index11/list11', + name: 'Index111', + meta: { + title: '区域管理', + icon: 'ep:key', + auth: '/metering/test1', + }, + children: [ + { + path: 'list11', + name: 'AreaList11', + component: () => import('@/views/metering/index.vue'), + meta: { + title: '区域管理', + auth: '/metering/test1', + sidebar: false, + breadcrumb: false, + activeMenu: '/metering1', + }, + }, + ], + }], + }, + +] + +export default routes diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts new file mode 100644 index 0000000..c9edcf1 --- /dev/null +++ b/src/router/modules/tested.ts @@ -0,0 +1,46 @@ +import type { Route } from '@/global' + +const Layout = () => import('@/layouts/index.vue') + +const routes: Route.recordRaw[] = [ + { + path: '/tested', + component: Layout, + redirect: '/tested/index3', + name: 'Metering', + meta: { + title: '受检设备', + icon: 'ep:key', + auth: '/tested/index', + }, + children: [ + { + path: '/index3', + component: Layout, + redirect: '/index3/list3', + name: 'Index113', + meta: { + title: '区域管理', + icon: 'ep:key', + auth: '/tested/index', + }, + children: [ + { + path: 'list3', + name: 'AreaList122', + component: () => import('@/views/tested/index.vue'), + meta: { + title: '区域管理', + auth: '/tested/index', + sidebar: false, + breadcrumb: false, + activeMenu: '/tested', + }, + }, + ], + }], + }, + +] + +export default routes diff --git a/src/router/routes.ts b/src/router/routes.ts index 743e00b..75421d1 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -1,6 +1,9 @@ import { setupLayouts } from 'virtual:generated-layouts' import generatedRoutes from 'virtual:generated-pages' import systemRoute from './modules/system' +import meterRoute from './modules/mentering' +import testedRoute from './modules/tested' +import laboratoryRoute from './modules/laboratory' import type { Route } from '@/global' import useSettingsStore from '@/store/modules/settings' @@ -14,6 +17,14 @@ }, }, { + path: '/index', + name: 'index', + component: () => import('@/views/dashboard.vue'), + meta: { + title: '子系统列表', + }, + }, + { path: '/login', name: 'login', component: () => import('@/views/login.vue'), @@ -105,9 +116,39 @@ const asyncRoutes: Route.recordMainRaw[] = [ { meta: { - title: '系统设置', + title: '计量业务管理系统', icon: '', - auth: '/system', + auth: '/metering/index', + }, + children: [ + ...meterRoute, + ], + }, + { + meta: { + title: '受检设备管理系统', + icon: '', + auth: '/tested/index', + }, + children: [ + ...testedRoute, + ], + }, + { + meta: { + title: '实验室环境监控系统', + icon: '', + auth: '/laboratory/index', + }, + children: [ + ...laboratoryRoute, + ], + }, + { + meta: { + title: '通用设置', + icon: '', + auth: '/common/index', }, children: [ ...systemRoute, diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue new file mode 100644 index 0000000..70bdeb1 --- /dev/null +++ b/src/views/dashboard.vue @@ -0,0 +1,312 @@ + +meta: + title: 登录 + constant: true + layout: false + + + + + + + diff --git a/src/views/laboratory/index.vue b/src/views/laboratory/index.vue new file mode 100644 index 0000000..6de9817 --- /dev/null +++ b/src/views/laboratory/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/login.vue b/src/views/login.vue index bd0d64d..714b44f 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -102,7 +102,10 @@ // 移除私钥 removePrivateKey() } - router.push(redirect.value) + // router.push(redirect.value) + router.push({ + path: '/index', + }) }) .catch(() => { loading.value = false diff --git a/.env.development b/.env.development index b36cd33..3ca38aa 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ # 页面标题 -VITE_APP_TITLE = 标题 +VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 VITE_APP_API_BASEURL = http://111.198.10.15:11638 diff --git a/.env.production b/.env.production index ed8a601..fa6df5c 100644 --- a/.env.production +++ b/.env.production @@ -1,9 +1,9 @@ NODE_ENV = production # 页面标题 -VITE_APP_TITLE = 标题 +VITE_APP_TITLE = 西昌计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://XXXXXXX:XXXXXXX +VITE_APP_API_BASEURL = http://111.198.10.15:11638 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/README.md b/README.md index 72d0577..7a500ab 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

vue3-framework-only-sidebar

+

西昌计量业务系统

-

vue3框架-只有侧边栏

+

分为三个子系统:1.计量业务管理系统 2.受检设备管理系统 3.实验室环境监控系统

## 简要说明

@@ -26,8 +26,6 @@ - `master` Vue3 版本框架源码分支，不含示例代码，可直接用于实际开发 - `dev` 开发分支 -- `vue3-only-sidebar` Vue3 版本框架源码分支，只含有系统设置，布局只有侧边栏导航，可直接用于开发 -- `metering` Vue3 版本框架源码分支，只含有系统设置，布局含有顶部导航，可直接用于开发 ## 预览 diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue index c0a9540..6039298 100644 --- a/src/layouts/components/Tools/index.vue +++ b/src/layouts/components/Tools/index.vue @@ -68,7 +68,7 @@ } onMounted(() => { // 连接 websocket - websocket.initWebSocket() + // websocket.initWebSocket() }) onBeforeMount(() => { // 断开 websocket diff --git a/src/router/index.ts b/src/router/index.ts index 6b9ba93..579b155 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -44,7 +44,7 @@ // 如果已登录状态下，进入登录页会强制跳转到控制台页面 if (to.name === 'login') { next({ - name: 'dashboard', + name: 'index', replace: true, }) } diff --git a/src/router/modules/laboratory.ts b/src/router/modules/laboratory.ts new file mode 100644 index 0000000..e433127 --- /dev/null +++ b/src/router/modules/laboratory.ts @@ -0,0 +1,46 @@ +import type { Route } from '@/global' + +const Layout = () => import('@/layouts/index.vue') + +const routes: Route.recordRaw[] = [ + { + path: '/laboratory', + component: Layout, + redirect: '/laboratory/index2', + name: 'Metering', + meta: { + title: '实验室', + icon: 'ep:key', + auth: '/laboratory/index', + }, + children: [ + { + path: '/index2', + component: Layout, + redirect: '/index2/list2', + name: 'Index112', + meta: { + title: '区域管理', + icon: 'ep:key', + auth: '/laboratory/index', + }, + children: [ + { + path: 'list2', + name: 'AreaList2', + component: () => import('@/views/laboratory/index.vue'), + meta: { + title: '区域管理', + auth: '/laboratory/index', + sidebar: false, + breadcrumb: false, + activeMenu: '/laboratory', + }, + }, + ], + }], + }, + +] + +export default routes diff --git a/src/router/modules/mentering.ts b/src/router/modules/mentering.ts new file mode 100644 index 0000000..9a18e27 --- /dev/null +++ b/src/router/modules/mentering.ts @@ -0,0 +1,83 @@ +import type { Route } from '@/global' + +const Layout = () => import('@/layouts/index.vue') + +const routes: Route.recordRaw[] = [ + { + path: '/metering', + component: Layout, + redirect: '/metering/index1', + name: 'Metering', + meta: { + title: '计量业务', + icon: 'ep:key', + auth: '/metering/test2', + }, + children: [ + { + path: '/index1', + component: Layout, + redirect: '/index1/list1', + name: 'Index11', + meta: { + title: '区域管理', + icon: 'ep:key', + auth: '/metering/test2', + }, + children: [ + { + path: 'list1', + name: 'AreaList1', + component: () => import('@/views/metering/index.vue'), + meta: { + title: '区域管理', + auth: '/metering/test2', + sidebar: false, + breadcrumb: false, + activeMenu: '/metering', + }, + }, + ], + }], + }, + { + path: '/metering1', + component: Layout, + redirect: '/metering1/index11', + name: 'Metering11', + meta: { + title: '计量业务', + icon: 'ep:key', + auth: '/metering/test1', + }, + children: [ + { + path: '/index11', + component: Layout, + redirect: '/index11/list11', + name: 'Index111', + meta: { + title: '区域管理', + icon: 'ep:key', + auth: '/metering/test1', + }, + children: [ + { + path: 'list11', + name: 'AreaList11', + component: () => import('@/views/metering/index.vue'), + meta: { + title: '区域管理', + auth: '/metering/test1', + sidebar: false, + breadcrumb: false, + activeMenu: '/metering1', + }, + }, + ], + }], + }, + +] + +export default routes diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts new file mode 100644 index 0000000..c9edcf1 --- /dev/null +++ b/src/router/modules/tested.ts @@ -0,0 +1,46 @@ +import type { Route } from '@/global' + +const Layout = () => import('@/layouts/index.vue') + +const routes: Route.recordRaw[] = [ + { + path: '/tested', + component: Layout, + redirect: '/tested/index3', + name: 'Metering', + meta: { + title: '受检设备', + icon: 'ep:key', + auth: '/tested/index', + }, + children: [ + { + path: '/index3', + component: Layout, + redirect: '/index3/list3', + name: 'Index113', + meta: { + title: '区域管理', + icon: 'ep:key', + auth: '/tested/index', + }, + children: [ + { + path: 'list3', + name: 'AreaList122', + component: () => import('@/views/tested/index.vue'), + meta: { + title: '区域管理', + auth: '/tested/index', + sidebar: false, + breadcrumb: false, + activeMenu: '/tested', + }, + }, + ], + }], + }, + +] + +export default routes diff --git a/src/router/routes.ts b/src/router/routes.ts index 743e00b..75421d1 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -1,6 +1,9 @@ import { setupLayouts } from 'virtual:generated-layouts' import generatedRoutes from 'virtual:generated-pages' import systemRoute from './modules/system' +import meterRoute from './modules/mentering' +import testedRoute from './modules/tested' +import laboratoryRoute from './modules/laboratory' import type { Route } from '@/global' import useSettingsStore from '@/store/modules/settings' @@ -14,6 +17,14 @@ }, }, { + path: '/index', + name: 'index', + component: () => import('@/views/dashboard.vue'), + meta: { + title: '子系统列表', + }, + }, + { path: '/login', name: 'login', component: () => import('@/views/login.vue'), @@ -105,9 +116,39 @@ const asyncRoutes: Route.recordMainRaw[] = [ { meta: { - title: '系统设置', + title: '计量业务管理系统', icon: '', - auth: '/system', + auth: '/metering/index', + }, + children: [ + ...meterRoute, + ], + }, + { + meta: { + title: '受检设备管理系统', + icon: '', + auth: '/tested/index', + }, + children: [ + ...testedRoute, + ], + }, + { + meta: { + title: '实验室环境监控系统', + icon: '', + auth: '/laboratory/index', + }, + children: [ + ...laboratoryRoute, + ], + }, + { + meta: { + title: '通用设置', + icon: '', + auth: '/common/index', }, children: [ ...systemRoute, diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue new file mode 100644 index 0000000..70bdeb1 --- /dev/null +++ b/src/views/dashboard.vue @@ -0,0 +1,312 @@ + +meta: + title: 登录 + constant: true + layout: false + + + + + + + diff --git a/src/views/laboratory/index.vue b/src/views/laboratory/index.vue new file mode 100644 index 0000000..6de9817 --- /dev/null +++ b/src/views/laboratory/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/login.vue b/src/views/login.vue index bd0d64d..714b44f 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -102,7 +102,10 @@ // 移除私钥 removePrivateKey() } - router.push(redirect.value) + // router.push(redirect.value) + router.push({ + path: '/index', + }) }) .catch(() => { loading.value = false diff --git a/src/views/metering/index.vue b/src/views/metering/index.vue new file mode 100644 index 0000000..ec74e4d --- /dev/null +++ b/src/views/metering/index.vue @@ -0,0 +1,3 @@ + diff --git a/.env.development b/.env.development index b36cd33..3ca38aa 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ # 页面标题 -VITE_APP_TITLE = 标题 +VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 VITE_APP_API_BASEURL = http://111.198.10.15:11638 diff --git a/.env.production b/.env.production index ed8a601..fa6df5c 100644 --- a/.env.production +++ b/.env.production @@ -1,9 +1,9 @@ NODE_ENV = production # 页面标题 -VITE_APP_TITLE = 标题 +VITE_APP_TITLE = 西昌计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://XXXXXXX:XXXXXXX +VITE_APP_API_BASEURL = http://111.198.10.15:11638 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/README.md b/README.md index 72d0577..7a500ab 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

vue3-framework-only-sidebar

+

西昌计量业务系统

-

vue3框架-只有侧边栏

+

分为三个子系统:1.计量业务管理系统 2.受检设备管理系统 3.实验室环境监控系统

## 简要说明

@@ -26,8 +26,6 @@ - `master` Vue3 版本框架源码分支，不含示例代码，可直接用于实际开发 - `dev` 开发分支 -- `vue3-only-sidebar` Vue3 版本框架源码分支，只含有系统设置，布局只有侧边栏导航，可直接用于开发 -- `metering` Vue3 版本框架源码分支，只含有系统设置，布局含有顶部导航，可直接用于开发 ## 预览 diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue index c0a9540..6039298 100644 --- a/src/layouts/components/Tools/index.vue +++ b/src/layouts/components/Tools/index.vue @@ -68,7 +68,7 @@ } onMounted(() => { // 连接 websocket - websocket.initWebSocket() + // websocket.initWebSocket() }) onBeforeMount(() => { // 断开 websocket diff --git a/src/router/index.ts b/src/router/index.ts index 6b9ba93..579b155 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -44,7 +44,7 @@ // 如果已登录状态下，进入登录页会强制跳转到控制台页面 if (to.name === 'login') { next({ - name: 'dashboard', + name: 'index', replace: true, }) } diff --git a/src/router/modules/laboratory.ts b/src/router/modules/laboratory.ts new file mode 100644 index 0000000..e433127 --- /dev/null +++ b/src/router/modules/laboratory.ts @@ -0,0 +1,46 @@ +import type { Route } from '@/global' + +const Layout = () => import('@/layouts/index.vue') + +const routes: Route.recordRaw[] = [ + { + path: '/laboratory', + component: Layout, + redirect: '/laboratory/index2', + name: 'Metering', + meta: { + title: '实验室', + icon: 'ep:key', + auth: '/laboratory/index', + }, + children: [ + { + path: '/index2', + component: Layout, + redirect: '/index2/list2', + name: 'Index112', + meta: { + title: '区域管理', + icon: 'ep:key', + auth: '/laboratory/index', + }, + children: [ + { + path: 'list2', + name: 'AreaList2', + component: () => import('@/views/laboratory/index.vue'), + meta: { + title: '区域管理', + auth: '/laboratory/index', + sidebar: false, + breadcrumb: false, + activeMenu: '/laboratory', + }, + }, + ], + }], + }, + +] + +export default routes diff --git a/src/router/modules/mentering.ts b/src/router/modules/mentering.ts new file mode 100644 index 0000000..9a18e27 --- /dev/null +++ b/src/router/modules/mentering.ts @@ -0,0 +1,83 @@ +import type { Route } from '@/global' + +const Layout = () => import('@/layouts/index.vue') + +const routes: Route.recordRaw[] = [ + { + path: '/metering', + component: Layout, + redirect: '/metering/index1', + name: 'Metering', + meta: { + title: '计量业务', + icon: 'ep:key', + auth: '/metering/test2', + }, + children: [ + { + path: '/index1', + component: Layout, + redirect: '/index1/list1', + name: 'Index11', + meta: { + title: '区域管理', + icon: 'ep:key', + auth: '/metering/test2', + }, + children: [ + { + path: 'list1', + name: 'AreaList1', + component: () => import('@/views/metering/index.vue'), + meta: { + title: '区域管理', + auth: '/metering/test2', + sidebar: false, + breadcrumb: false, + activeMenu: '/metering', + }, + }, + ], + }], + }, + { + path: '/metering1', + component: Layout, + redirect: '/metering1/index11', + name: 'Metering11', + meta: { + title: '计量业务', + icon: 'ep:key', + auth: '/metering/test1', + }, + children: [ + { + path: '/index11', + component: Layout, + redirect: '/index11/list11', + name: 'Index111', + meta: { + title: '区域管理', + icon: 'ep:key', + auth: '/metering/test1', + }, + children: [ + { + path: 'list11', + name: 'AreaList11', + component: () => import('@/views/metering/index.vue'), + meta: { + title: '区域管理', + auth: '/metering/test1', + sidebar: false, + breadcrumb: false, + activeMenu: '/metering1', + }, + }, + ], + }], + }, + +] + +export default routes diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts new file mode 100644 index 0000000..c9edcf1 --- /dev/null +++ b/src/router/modules/tested.ts @@ -0,0 +1,46 @@ +import type { Route } from '@/global' + +const Layout = () => import('@/layouts/index.vue') + +const routes: Route.recordRaw[] = [ + { + path: '/tested', + component: Layout, + redirect: '/tested/index3', + name: 'Metering', + meta: { + title: '受检设备', + icon: 'ep:key', + auth: '/tested/index', + }, + children: [ + { + path: '/index3', + component: Layout, + redirect: '/index3/list3', + name: 'Index113', + meta: { + title: '区域管理', + icon: 'ep:key', + auth: '/tested/index', + }, + children: [ + { + path: 'list3', + name: 'AreaList122', + component: () => import('@/views/tested/index.vue'), + meta: { + title: '区域管理', + auth: '/tested/index', + sidebar: false, + breadcrumb: false, + activeMenu: '/tested', + }, + }, + ], + }], + }, + +] + +export default routes diff --git a/src/router/routes.ts b/src/router/routes.ts index 743e00b..75421d1 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -1,6 +1,9 @@ import { setupLayouts } from 'virtual:generated-layouts' import generatedRoutes from 'virtual:generated-pages' import systemRoute from './modules/system' +import meterRoute from './modules/mentering' +import testedRoute from './modules/tested' +import laboratoryRoute from './modules/laboratory' import type { Route } from '@/global' import useSettingsStore from '@/store/modules/settings' @@ -14,6 +17,14 @@ }, }, { + path: '/index', + name: 'index', + component: () => import('@/views/dashboard.vue'), + meta: { + title: '子系统列表', + }, + }, + { path: '/login', name: 'login', component: () => import('@/views/login.vue'), @@ -105,9 +116,39 @@ const asyncRoutes: Route.recordMainRaw[] = [ { meta: { - title: '系统设置', + title: '计量业务管理系统', icon: '', - auth: '/system', + auth: '/metering/index', + }, + children: [ + ...meterRoute, + ], + }, + { + meta: { + title: '受检设备管理系统', + icon: '', + auth: '/tested/index', + }, + children: [ + ...testedRoute, + ], + }, + { + meta: { + title: '实验室环境监控系统', + icon: '', + auth: '/laboratory/index', + }, + children: [ + ...laboratoryRoute, + ], + }, + { + meta: { + title: '通用设置', + icon: '', + auth: '/common/index', }, children: [ ...systemRoute, diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue new file mode 100644 index 0000000..70bdeb1 --- /dev/null +++ b/src/views/dashboard.vue @@ -0,0 +1,312 @@ + +meta: + title: 登录 + constant: true + layout: false + + + + + + + diff --git a/src/views/laboratory/index.vue b/src/views/laboratory/index.vue new file mode 100644 index 0000000..6de9817 --- /dev/null +++ b/src/views/laboratory/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/login.vue b/src/views/login.vue index bd0d64d..714b44f 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -102,7 +102,10 @@ // 移除私钥 removePrivateKey() } - router.push(redirect.value) + // router.push(redirect.value) + router.push({ + path: '/index', + }) }) .catch(() => { loading.value = false diff --git a/src/views/metering/index.vue b/src/views/metering/index.vue new file mode 100644 index 0000000..ec74e4d --- /dev/null +++ b/src/views/metering/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/tested/index.vue b/src/views/tested/index.vue new file mode 100644 index 0000000..3fcd424 --- /dev/null +++ b/src/views/tested/index.vue @@ -0,0 +1,3 @@ + diff --git a/.env.development b/.env.development index b36cd33..3ca38aa 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ # 页面标题 -VITE_APP_TITLE = 标题 +VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 VITE_APP_API_BASEURL = http://111.198.10.15:11638 diff --git a/.env.production b/.env.production index ed8a601..fa6df5c 100644 --- a/.env.production +++ b/.env.production @@ -1,9 +1,9 @@ NODE_ENV = production # 页面标题 -VITE_APP_TITLE = 标题 +VITE_APP_TITLE = 西昌计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://XXXXXXX:XXXXXXX +VITE_APP_API_BASEURL = http://111.198.10.15:11638 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/README.md b/README.md index 72d0577..7a500ab 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -

vue3-framework-only-sidebar

+

西昌计量业务系统

-

vue3框架-只有侧边栏

+

分为三个子系统:1.计量业务管理系统 2.受检设备管理系统 3.实验室环境监控系统

## 简要说明

@@ -26,8 +26,6 @@ - `master` Vue3 版本框架源码分支，不含示例代码，可直接用于实际开发 - `dev` 开发分支 -- `vue3-only-sidebar` Vue3 版本框架源码分支，只含有系统设置，布局只有侧边栏导航，可直接用于开发 -- `metering` Vue3 版本框架源码分支，只含有系统设置，布局含有顶部导航，可直接用于开发 ## 预览 diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue index c0a9540..6039298 100644 --- a/src/layouts/components/Tools/index.vue +++ b/src/layouts/components/Tools/index.vue @@ -68,7 +68,7 @@ } onMounted(() => { // 连接 websocket - websocket.initWebSocket() + // websocket.initWebSocket() }) onBeforeMount(() => { // 断开 websocket diff --git a/src/router/index.ts b/src/router/index.ts index 6b9ba93..579b155 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -44,7 +44,7 @@ // 如果已登录状态下，进入登录页会强制跳转到控制台页面 if (to.name === 'login') { next({ - name: 'dashboard', + name: 'index', replace: true, }) } diff --git a/src/router/modules/laboratory.ts b/src/router/modules/laboratory.ts new file mode 100644 index 0000000..e433127 --- /dev/null +++ b/src/router/modules/laboratory.ts @@ -0,0 +1,46 @@ +import type { Route } from '@/global' + +const Layout = () => import('@/layouts/index.vue') + +const routes: Route.recordRaw[] = [ + { + path: '/laboratory', + component: Layout, + redirect: '/laboratory/index2', + name: 'Metering', + meta: { + title: '实验室', + icon: 'ep:key', + auth: '/laboratory/index', + }, + children: [ + { + path: '/index2', + component: Layout, + redirect: '/index2/list2', + name: 'Index112', + meta: { + title: '区域管理', + icon: 'ep:key', + auth: '/laboratory/index', + }, + children: [ + { + path: 'list2', + name: 'AreaList2', + component: () => import('@/views/laboratory/index.vue'), + meta: { + title: '区域管理', + auth: '/laboratory/index', + sidebar: false, + breadcrumb: false, + activeMenu: '/laboratory', + }, + }, + ], + }], + }, + +] + +export default routes diff --git a/src/router/modules/mentering.ts b/src/router/modules/mentering.ts new file mode 100644 index 0000000..9a18e27 --- /dev/null +++ b/src/router/modules/mentering.ts @@ -0,0 +1,83 @@ +import type { Route } from '@/global' + +const Layout = () => import('@/layouts/index.vue') + +const routes: Route.recordRaw[] = [ + { + path: '/metering', + component: Layout, + redirect: '/metering/index1', + name: 'Metering', + meta: { + title: '计量业务', + icon: 'ep:key', + auth: '/metering/test2', + }, + children: [ + { + path: '/index1', + component: Layout, + redirect: '/index1/list1', + name: 'Index11', + meta: { + title: '区域管理', + icon: 'ep:key', + auth: '/metering/test2', + }, + children: [ + { + path: 'list1', + name: 'AreaList1', + component: () => import('@/views/metering/index.vue'), + meta: { + title: '区域管理', + auth: '/metering/test2', + sidebar: false, + breadcrumb: false, + activeMenu: '/metering', + }, + }, + ], + }], + }, + { + path: '/metering1', + component: Layout, + redirect: '/metering1/index11', + name: 'Metering11', + meta: { + title: '计量业务', + icon: 'ep:key', + auth: '/metering/test1', + }, + children: [ + { + path: '/index11', + component: Layout, + redirect: '/index11/list11', + name: 'Index111', + meta: { + title: '区域管理', + icon: 'ep:key', + auth: '/metering/test1', + }, + children: [ + { + path: 'list11', + name: 'AreaList11', + component: () => import('@/views/metering/index.vue'), + meta: { + title: '区域管理', + auth: '/metering/test1', + sidebar: false, + breadcrumb: false, + activeMenu: '/metering1', + }, + }, + ], + }], + }, + +] + +export default routes diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts new file mode 100644 index 0000000..c9edcf1 --- /dev/null +++ b/src/router/modules/tested.ts @@ -0,0 +1,46 @@ +import type { Route } from '@/global' + +const Layout = () => import('@/layouts/index.vue') + +const routes: Route.recordRaw[] = [ + { + path: '/tested', + component: Layout, + redirect: '/tested/index3', + name: 'Metering', + meta: { + title: '受检设备', + icon: 'ep:key', + auth: '/tested/index', + }, + children: [ + { + path: '/index3', + component: Layout, + redirect: '/index3/list3', + name: 'Index113', + meta: { + title: '区域管理', + icon: 'ep:key', + auth: '/tested/index', + }, + children: [ + { + path: 'list3', + name: 'AreaList122', + component: () => import('@/views/tested/index.vue'), + meta: { + title: '区域管理', + auth: '/tested/index', + sidebar: false, + breadcrumb: false, + activeMenu: '/tested', + }, + }, + ], + }], + }, + +] + +export default routes diff --git a/src/router/routes.ts b/src/router/routes.ts index 743e00b..75421d1 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -1,6 +1,9 @@ import { setupLayouts } from 'virtual:generated-layouts' import generatedRoutes from 'virtual:generated-pages' import systemRoute from './modules/system' +import meterRoute from './modules/mentering' +import testedRoute from './modules/tested' +import laboratoryRoute from './modules/laboratory' import type { Route } from '@/global' import useSettingsStore from '@/store/modules/settings' @@ -14,6 +17,14 @@ }, }, { + path: '/index', + name: 'index', + component: () => import('@/views/dashboard.vue'), + meta: { + title: '子系统列表', + }, + }, + { path: '/login', name: 'login', component: () => import('@/views/login.vue'), @@ -105,9 +116,39 @@ const asyncRoutes: Route.recordMainRaw[] = [ { meta: { - title: '系统设置', + title: '计量业务管理系统', icon: '', - auth: '/system', + auth: '/metering/index', + }, + children: [ + ...meterRoute, + ], + }, + { + meta: { + title: '受检设备管理系统', + icon: '', + auth: '/tested/index', + }, + children: [ + ...testedRoute, + ], + }, + { + meta: { + title: '实验室环境监控系统', + icon: '', + auth: '/laboratory/index', + }, + children: [ + ...laboratoryRoute, + ], + }, + { + meta: { + title: '通用设置', + icon: '', + auth: '/common/index', }, children: [ ...systemRoute, diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue new file mode 100644 index 0000000..70bdeb1 --- /dev/null +++ b/src/views/dashboard.vue @@ -0,0 +1,312 @@ + +meta: + title: 登录 + constant: true + layout: false + + + + + + + diff --git a/src/views/laboratory/index.vue b/src/views/laboratory/index.vue new file mode 100644 index 0000000..6de9817 --- /dev/null +++ b/src/views/laboratory/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/login.vue b/src/views/login.vue index bd0d64d..714b44f 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -102,7 +102,10 @@ // 移除私钥 removePrivateKey() } - router.push(redirect.value) + // router.push(redirect.value) + router.push({ + path: '/index', + }) }) .catch(() => { loading.value = false diff --git a/src/views/metering/index.vue b/src/views/metering/index.vue new file mode 100644 index 0000000..ec74e4d --- /dev/null +++ b/src/views/metering/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/tested/index.vue b/src/views/tested/index.vue new file mode 100644 index 0000000..3fcd424 --- /dev/null +++ b/src/views/tested/index.vue @@ -0,0 +1,3 @@ + diff --git a/vite.config.ts b/vite.config.ts index 8589a2e..1d80cb7 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -25,7 +25,7 @@ // 开发服务器选项 https://cn.vitejs.dev/config/#server-options server: { open: true, - port: 9000, + port: 9527, proxy: { '/proxy': { target: env.VITE_APP_API_BASEURL,