From 5c1b66b03ddc71653ff32b3da6ab57f2b5703f3e Mon Sep 17 00:00:00 2001 From: lilinyuan <1084668738@qq.com> Date: Thu, 9 May 2024 15:29:00 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9Esidermenu?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/stores/permisstion.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/stores/permisstion.js b/src/stores/permisstion.js index 3744eb0..2a90914 100644 --- a/src/stores/permisstion.js +++ b/src/stores/permisstion.js @@ -10,7 +10,17 @@ export const usePermisstionStroe = defineStore('permisstion', () => { const asyncRouters = ref([]) //定义是否加载路由变量 const isLoadRoutes = ref(false) - const menuList = ref([]) + const menuList = ref([ + { + name: 'home', + path: '/home', + icon: 'home', + title: '首页', + meta: { + breadcrumb: true + } + } + ]) const setIsLoadRoutes = (status) => { return isLoadRoutes.value = status @@ -21,7 +31,7 @@ export const usePermisstionStroe = defineStore('permisstion', () => { const sRouter = JSON.parse(JSON.stringify(res.data)) const mData = JSON.parse(JSON.stringify(res.data)) asyncRouters.value = formatAsyncRouters(sRouter) - menuList.value = generateMenu(mData) + menuList.value = [...menuList.value, ...generateMenu(mData)] addAsyncRouters(asyncRouters.value) isLoadRoutes.value = false } else { From 0e0d206cc74220ff061a856a963193cb0e3fb4d4 Mon Sep 17 00:00:00 2001 From: lilinyuan <1084668738@qq.com> Date: Thu, 9 May 2024 16:14:48 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=9C=80=E6=B1=82=E7=9B=AE=E5=BD=95=E5=8F=8A?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectdemand/demandcollection/index.vue | 13 +++++++++++++ src/views/projectdemand/demandsummary/index.vue | 13 +++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 src/views/projectdemand/demandcollection/index.vue create mode 100644 src/views/projectdemand/demandsummary/index.vue diff --git a/src/views/projectdemand/demandcollection/index.vue b/src/views/projectdemand/demandcollection/index.vue new file mode 100644 index 0000000..ff05203 --- /dev/null +++ b/src/views/projectdemand/demandcollection/index.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/src/views/projectdemand/demandsummary/index.vue b/src/views/projectdemand/demandsummary/index.vue new file mode 100644 index 0000000..18fde93 --- /dev/null +++ b/src/views/projectdemand/demandsummary/index.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file From dcc68662113ff0d9e44da9d77d63a581d1767aa6 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Thu, 9 May 2024 17:16:39 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat=20:=20=E6=96=B0=E5=A2=9E=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/index.scss | 28 +- src/assets/svg/home1.svg | 6 + src/assets/svg/home2.svg | 6 + src/assets/svg/home3.svg | 6 + src/assets/svg/home4.svg | 6 + src/views/home/index.vue | 481 +++++++++++++++++++---------------- 6 files changed, 301 insertions(+), 232 deletions(-) create mode 100644 src/assets/svg/home1.svg create mode 100644 src/assets/svg/home2.svg create mode 100644 src/assets/svg/home3.svg create mode 100644 src/assets/svg/home4.svg diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 5c1a3c7..2231156 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -19,7 +19,7 @@ html, body, #app, .el-container, .el-aside, .el-main { } .el-main { - background: #F4F6F8; + background: #EFEFEF; padding: 0 0 0 18px; position: fixed; left: 200px; @@ -27,6 +27,7 @@ html, body, #app, .el-container, .el-aside, .el-main { margin-left: 0; transition: margin-left .15s; width: calc(100vw - 200px); + &::-webkit-scrollbar { width: 6px; } @@ -83,9 +84,11 @@ html, body, #app, .el-container, .el-aside, .el-main { align-items: center; margin-bottom: 10px; } -.el-dialog__body{ + +.el-dialog__body { padding: 10px 20px; } + .stateIcon { margin-top: 9px; margin-right: 7px; @@ -248,7 +251,8 @@ html, body, #app, .el-container, .el-aside, .el-main { justify-content: center; z-index: 0; position: relative; - .el-icon{ + + .el-icon { width: 1.4em; height: 1.4em; } @@ -287,9 +291,10 @@ html, body, #app, .el-container, .el-aside, .el-main { .layout { display: flex; justify-content: space-around; + .scrollbar-user { - height: calc(100vh - 250px)!important; - overflow: auto!important; + height: calc(100vh - 250px) !important; + overflow: auto !important; } .scrollbar-dict { @@ -401,6 +406,15 @@ html, body, #app, .el-container, .el-aside, .el-main { } //SvgIcon组件的样式 +.home-icon { + width: 4em; + height: 4em; + vertical-align: -0.15em; + fill: currentColor; + overflow: hidden; + margin-right: 5px; +} + .svg-icon { width: 1.2em; height: 1.2em; @@ -445,10 +459,12 @@ html, body, #app, .el-container, .el-aside, .el-main { overflow: hidden; margin-right: 5px; } -.fen-icon{ + +.fen-icon { width: 1.8em; height: 1.7em; } + .middle-icon { width: 1.4em; height: 1.4em; diff --git a/src/assets/svg/home1.svg b/src/assets/svg/home1.svg new file mode 100644 index 0000000..0a99452 --- /dev/null +++ b/src/assets/svg/home1.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/svg/home2.svg b/src/assets/svg/home2.svg new file mode 100644 index 0000000..a71b307 --- /dev/null +++ b/src/assets/svg/home2.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/svg/home3.svg b/src/assets/svg/home3.svg new file mode 100644 index 0000000..98d2c13 --- /dev/null +++ b/src/assets/svg/home3.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/svg/home4.svg b/src/assets/svg/home4.svg new file mode 100644 index 0000000..d9206cd --- /dev/null +++ b/src/assets/svg/home4.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/views/home/index.vue b/src/views/home/index.vue index cea4307..695f767 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -1,266 +1,295 @@ -