From 2a680ac51a49467c1df03effa1581824537aae61 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 8 Oct 2021 10:08:48 +0800 Subject: [PATCH] commit --- src/App.vue | 425 +++++---- src/components/comHeader/index.vue | 152 ++-- src/components/navMenu/index.vue | 852 +++++++++--------- .../components/conferenceMaterials/index.vue | 81 ++ .../home2/components/empennage/index.vue | 90 ++ src/pages/home2/components/navMenu/index.vue | 116 +++ .../components/noticeOfMeeting/index.vue | 23 + .../home2/components/realtimeinfo/index.vue | 70 ++ src/pages/home2/components/release/index.vue | 115 +++ .../home2/components/searchGroup/index.vue | 127 +++ .../components/solicitopinions/index.vue | 113 +++ src/pages/home2/components/todoList/index.vue | 680 ++++++++++++++ src/pages/home2/index.vue | 187 ++++ src/pages/login/index.vue | 10 +- src/router/index.js | 32 +- 15 files changed, 2386 insertions(+), 687 deletions(-) create mode 100644 src/pages/home2/components/conferenceMaterials/index.vue create mode 100644 src/pages/home2/components/empennage/index.vue create mode 100644 src/pages/home2/components/navMenu/index.vue create mode 100644 src/pages/home2/components/noticeOfMeeting/index.vue create mode 100644 src/pages/home2/components/realtimeinfo/index.vue create mode 100644 src/pages/home2/components/release/index.vue create mode 100644 src/pages/home2/components/searchGroup/index.vue create mode 100644 src/pages/home2/components/solicitopinions/index.vue create mode 100644 src/pages/home2/components/todoList/index.vue create mode 100644 src/pages/home2/index.vue diff --git a/src/App.vue b/src/App.vue index 0d30a4010..6290e5be0 100644 --- a/src/App.vue +++ b/src/App.vue @@ -4,7 +4,34 @@
- +
+ + 标准法规管理系统 standard and regulations management system + + +
+ +
+ +
+
@@ -14,198 +41,228 @@ diff --git a/src/pages/home2/components/empennage/index.vue b/src/pages/home2/components/empennage/index.vue new file mode 100644 index 000000000..192676bef --- /dev/null +++ b/src/pages/home2/components/empennage/index.vue @@ -0,0 +1,90 @@ + + + + + + + diff --git a/src/pages/home2/components/navMenu/index.vue b/src/pages/home2/components/navMenu/index.vue new file mode 100644 index 000000000..11a2617e7 --- /dev/null +++ b/src/pages/home2/components/navMenu/index.vue @@ -0,0 +1,116 @@ + + + + + + + diff --git a/src/pages/home2/components/noticeOfMeeting/index.vue b/src/pages/home2/components/noticeOfMeeting/index.vue new file mode 100644 index 000000000..9010bcc2d --- /dev/null +++ b/src/pages/home2/components/noticeOfMeeting/index.vue @@ -0,0 +1,23 @@ + + + + + + diff --git a/src/pages/home2/components/realtimeinfo/index.vue b/src/pages/home2/components/realtimeinfo/index.vue new file mode 100644 index 000000000..ccfcc8ccf --- /dev/null +++ b/src/pages/home2/components/realtimeinfo/index.vue @@ -0,0 +1,70 @@ + + + + + + + diff --git a/src/pages/home2/components/release/index.vue b/src/pages/home2/components/release/index.vue new file mode 100644 index 000000000..b2782f7a5 --- /dev/null +++ b/src/pages/home2/components/release/index.vue @@ -0,0 +1,115 @@ + + + + + + diff --git a/src/pages/home2/components/searchGroup/index.vue b/src/pages/home2/components/searchGroup/index.vue new file mode 100644 index 000000000..36f515e05 --- /dev/null +++ b/src/pages/home2/components/searchGroup/index.vue @@ -0,0 +1,127 @@ + + + + + + diff --git a/src/pages/home2/components/solicitopinions/index.vue b/src/pages/home2/components/solicitopinions/index.vue new file mode 100644 index 000000000..0ce541ab1 --- /dev/null +++ b/src/pages/home2/components/solicitopinions/index.vue @@ -0,0 +1,113 @@ + + + + + + diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue new file mode 100644 index 000000000..12cef0cb7 --- /dev/null +++ b/src/pages/home2/components/todoList/index.vue @@ -0,0 +1,680 @@ + + + + + + diff --git a/src/pages/home2/index.vue b/src/pages/home2/index.vue new file mode 100644 index 000000000..36a0babfc --- /dev/null +++ b/src/pages/home2/index.vue @@ -0,0 +1,187 @@ + + + + + diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index 6e69bf328..2aa5e7794 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -60,7 +60,7 @@ } else if (this.password === '') { this.$message.warning('密码不能为空') } else { - // this.$router.push('/home1') + // this.$router.push('/home2') this.loginUser(this.username, this.password) this.getEditPermission() } @@ -124,7 +124,7 @@ if (hasHomeMenu) { this.setMenu(JSON.stringify(menuList)).then(res => { this.loading = false - this.$router.push('/home1') + this.$router.push('/home2') }, e => { this.loading = false this.$message.warning('未获取到菜单') @@ -165,7 +165,7 @@ }) if (hasHomeMenu) { this.setMenu(JSON.stringify(menuList)).then(res => { - this.$router.push('/home1') + this.$router.push('/home2') }, e => { this.$message.warning('未获取到菜单') }) @@ -208,7 +208,7 @@ }) if (hasHomeMenu) { this.setMenu(JSON.stringify(menuList)).then(res => { - this.$router.push('/home1') + this.$router.push('/home2') }, e => { this.$message.warning('未获取到菜单') }) @@ -323,7 +323,7 @@ window.sessionStorage.setItem('menuList', menuList); // del if (hasHomeMenu) { this.setMenu(JSON.stringify(menuList)).then(res => { - this.$router.push('/home1') + this.$router.push('/home2') }, e => { this.$message.warning('未获取到菜单') }) diff --git a/src/router/index.js b/src/router/index.js index 580b53415..e508867cf 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -59,6 +59,18 @@ const routes = [ isBoolean: true } }, + // { + // path: '/home2', + // name: 'Home2', + // component: () => + // import('@/pages/home2'), + // meta: { + // requireAuth: true, + // title: '福田首页', + // menuId: '', + // isBoolean: true + // } + // }, // 个人中心 { path: '/personal', @@ -231,15 +243,6 @@ const routes = [ title: '流程详情' } }, - { - path: '/processAcceptDetail', - name: 'ProcessAcceptDetail', - component: () => import('@/pages/processCenter/pages/processAcceptDetail/index.vue'), - meta: { - requireAuth: true, - title: '流程详情' - } - }, { path: '/bzffStep1', name: 'bzffStep1', @@ -1164,6 +1167,17 @@ const routes = [ menuId: 'RAFQ4N4ARF' } }, + { + path: '/home2', + name: 'Home2', + component: () => + import('@/pages/home2/index'), + meta: { + requireAuth: true, + title: '首页', + menuId: 'RAFQ4N4ARF' + } + }, { path: '/dynamicInformationMore', name: 'DynamicInformationMore',