From ceca28ac6673f3263c5c08eacd91a06b1de6f5d6 Mon Sep 17 00:00:00 2001 From: chenke Date: Wed, 16 Feb 2022 16:16:26 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/menu.js | 12 +- src/styles/scss/index.scss | 1 + src/views/menu/index.vue | 675 ++++++++++++++++++++----------------- 3 files changed, 375 insertions(+), 313 deletions(-) diff --git a/src/api/menu.js b/src/api/menu.js index c11c617..4017529 100644 --- a/src/api/menu.js +++ b/src/api/menu.js @@ -37,17 +37,17 @@ export function roleMenuTreeselect(roleId) { // 新增菜单 export function addMenu(data) { return request({ - url: '/api/v1/menu', + url: '/menu/AddMenu', method: 'post', data: data }) } // 修改菜单 -export function updateMenu(data, id) { +export function updateMenu(data ) { return request({ - url: '/api/v1/menu/' + id, - method: 'put', + url: '/menu/menuEdit', + method: 'post', data: data }) } @@ -55,8 +55,8 @@ export function updateMenu(data, id) { // 删除菜单 export function delMenu(data) { return request({ - url: '/api/v1/menu', - method: 'delete', + url: '/menu/menuDel', + method: 'post', data: data }) } diff --git a/src/styles/scss/index.scss b/src/styles/scss/index.scss index 1ae9715..a7d0ef8 100644 --- a/src/styles/scss/index.scss +++ b/src/styles/scss/index.scss @@ -4,6 +4,7 @@ @import './element-ui.scss'; @import './sidebar.scss'; @import './btn.scss'; +@import './admin.scss'; body { margin: 0; diff --git a/src/views/menu/index.vue b/src/views/menu/index.vue index 80de1f2..702ddb8 100644 --- a/src/views/menu/index.vue +++ b/src/views/menu/index.vue @@ -1,270 +1,287 @@ From 993d6190fc16fa9dad22afd6f5bbe9a8dd1b6c27 Mon Sep 17 00:00:00 2001 From: chenke Date: Wed, 16 Feb 2022 17:18:43 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=87=E7=AB=A0?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=EF=BC=8C=E5=A2=9E=E5=8A=A0=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6=E5=92=8C=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/article/index.vue | 429 +++++++++++++++++++++++------------- 1 file changed, 275 insertions(+), 154 deletions(-) diff --git a/src/views/article/index.vue b/src/views/article/index.vue index 4978f47..e39707c 100644 --- a/src/views/article/index.vue +++ b/src/views/article/index.vue @@ -1,84 +1,147 @@ From 9313065375c05ea75a6693c2b213622c462aff67 Mon Sep 17 00:00:00 2001 From: chenke Date: Wed, 16 Feb 2022 17:38:00 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=87=E7=AB=A0?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E9=A1=B9=EF=BC=9A=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/article/index.vue | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/src/views/article/index.vue b/src/views/article/index.vue index e39707c..94caec7 100644 --- a/src/views/article/index.vue +++ b/src/views/article/index.vue @@ -40,6 +40,16 @@ @keyup.enter.native="getList" /> + + + 搜索 + + + 新增 + + { From 18be0c703838f6a2e0bcb2bb29ee62eece4d951d Mon Sep 17 00:00:00 2001 From: chenke Date: Wed, 16 Feb 2022 17:48:22 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=A1=86=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD=E6=85=A2=E7=9A=84=E5=A4=84=E7=90=86-=E5=AD=90?= =?UTF-8?q?=E9=80=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/article/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/article/index.vue b/src/views/article/index.vue index 94caec7..7b2e8ef 100644 --- a/src/views/article/index.vue +++ b/src/views/article/index.vue @@ -160,7 +160,7 @@ custom-class="demo-drawer" size="950px" > -
+
{ this.temp = res.data; From 34e68849ab64d30be9de2e8c02e54017a02dfcc9 Mon Sep 17 00:00:00 2001 From: pzy Date: Thu, 17 Feb 2022 10:55:22 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=AE=BD=E9=AB=98?= =?UTF-8?q?=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/Navbar.vue | 33 ++- src/main.js | 4 + src/utils/get-img-width.js | 29 ++ src/views/article/index.vue | 444 ++++++++++++++++++------------- 4 files changed, 307 insertions(+), 203 deletions(-) create mode 100644 src/utils/get-img-width.js diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 839e9c2..996cf9b 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -1,8 +1,6 @@