From 27ff2ff67daa2f2fcc712d14a932bbad7ea0ac0d Mon Sep 17 00:00:00 2001 From: JIAL <2287346125@qq.com> Date: Wed, 29 Nov 2023 21:17:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=AE=A1=E7=90=86=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=EF=BC=8C=E5=AE=8C=E5=96=84=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/vcs.xml | 1 + bin | 2 +- .../controller/EmployeeController.java | 1 + src/main/resources/backend/index.html | 7 +++++++ .../resources/backend/page/combo/add.html | 2 +- .../resources/backend/page/combo/list.html | 4 ++-- src/main/resources/backend/page/food/add.html | 2 +- .../resources/backend/page/food/list.html | 4 ++-- .../resources/backend/page/member/add.html | 2 +- .../resources/backend/page/member/list.html | 4 ++-- target/classes/backend/index.html | 7 +++++++ target/classes/backend/page/combo/add.html | 2 +- target/classes/backend/page/combo/list.html | 4 ++-- target/classes/backend/page/food/add.html | 2 +- target/classes/backend/page/food/list.html | 4 ++-- target/classes/backend/page/member/add.html | 2 +- target/classes/backend/page/member/list.html | 4 ++-- .../controller/EmployeeController.class | Bin 8025 -> 8043 bytes 18 files changed, 35 insertions(+), 19 deletions(-) diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 94a25f7..f634aae 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,5 +2,6 @@ + \ No newline at end of file diff --git a/bin b/bin index 2329fea..a69a346 160000 --- a/bin +++ b/bin @@ -1 +1 @@ -Subproject commit 2329fea1f84e829d3a703c60cfd8da9014766e91 +Subproject commit a69a346804bec6f22ca7e5bd7cf006997f7bdaa4 diff --git a/src/main/java/com/JIAL/FMSystem/controller/EmployeeController.java b/src/main/java/com/JIAL/FMSystem/controller/EmployeeController.java index fb3760a..82099e8 100644 --- a/src/main/java/com/JIAL/FMSystem/controller/EmployeeController.java +++ b/src/main/java/com/JIAL/FMSystem/controller/EmployeeController.java @@ -137,6 +137,7 @@ public class EmployeeController { //Long empId = (Long)request.getSession().getAttribute("employee"); //employee.setUpdateTime(LocalDateTime.now()); //employee.setUpdateUser(empId); + employee.setPassword(DigestUtils.md5DigestAsHex(employee.getPassword().getBytes())); employeeService.updateById(employee); return R.success("员工信息修改成功"); diff --git a/src/main/resources/backend/index.html b/src/main/resources/backend/index.html index 55c0d62..b5801a6 100644 --- a/src/main/resources/backend/index.html +++ b/src/main/resources/backend/index.html @@ -133,6 +133,7 @@ } this.menuList = this.generateMenuList(); this.menuHandle(this.menuList.find(item => item.id === this.defAct), false); // 手动调用一次 menuHandle + console.log("调用了create") this.closeLoading() }, beforeDestroy() { @@ -196,13 +197,19 @@ goBack() { // window.location.href = 'javascript:history.go(-1)' const menu = this.menuList.find(item=>item.id===this.menuActived) + console.log(menu.toString()); + console.log(this.menuActived); + // this.goBackFlag = false // this.headTitle = menu.name this.menuHandle(menu,false) }, menuHandle(item, goBackFlag) { + console.log('Before: menuActived', this.menuActived); this.loading = true this.menuActived = item.id + console.log("调用了menuHandle()"); + console.log('After: menuActived', this.menuActived); this.iframeUrl = item.url this.headTitle = item.name this.goBackFlag = goBackFlag diff --git a/src/main/resources/backend/page/combo/add.html b/src/main/resources/backend/page/combo/add.html index 34d3c66..78d4d2e 100644 --- a/src/main/resources/backend/page/combo/add.html +++ b/src/main/resources/backend/page/combo/add.html @@ -629,7 +629,7 @@ goBack() { window.parent.menuHandle( { - id: '5', + id: '4', url: '/backend/page/combo/list.html', name: '套餐管理', }, diff --git a/src/main/resources/backend/page/combo/list.html b/src/main/resources/backend/page/combo/list.html index 6a49f6f..496588b 100644 --- a/src/main/resources/backend/page/combo/list.html +++ b/src/main/resources/backend/page/combo/list.html @@ -189,13 +189,13 @@ addSetMeal (st) { if (st === 'add'){ window.parent.menuHandle({ - id: '5', + id: '4', url: '/backend/page/combo/add.html', name: '添加套餐' },true) } else { window.parent.menuHandle({ - id: '5', + id: '4', url: '/backend/page/combo/add.html?id='+st, name: '修改套餐' },true) diff --git a/src/main/resources/backend/page/food/add.html b/src/main/resources/backend/page/food/add.html index 3876fde..8f130ff 100644 --- a/src/main/resources/backend/page/food/add.html +++ b/src/main/resources/backend/page/food/add.html @@ -534,7 +534,7 @@ goBack(){ window.parent.menuHandle({ - id: '4', + id: '3', url: '/backend/page/food/list.html', name: '菜品管理' },false) diff --git a/src/main/resources/backend/page/food/list.html b/src/main/resources/backend/page/food/list.html index 7c059ac..ec5e533 100644 --- a/src/main/resources/backend/page/food/list.html +++ b/src/main/resources/backend/page/food/list.html @@ -184,13 +184,13 @@ addFoodtype (st) { if (st === 'add'){ window.parent.menuHandle({ - id: '4', + id: '3', url: '/backend/page/food/add.html', name: '添加菜品' },true) } else { window.parent.menuHandle({ - id: '4', + id: '3', url: '/backend/page/food/add.html?id='+st, name: '修改菜品' },true) diff --git a/src/main/resources/backend/page/member/add.html b/src/main/resources/backend/page/member/add.html index a944a63..0768af3 100644 --- a/src/main/resources/backend/page/member/add.html +++ b/src/main/resources/backend/page/member/add.html @@ -210,7 +210,7 @@ }, goBack(){ window.parent.menuHandle({ - id: '2', + id: '6', url: '/backend/page/member/list.html', name: '员工管理' },false) diff --git a/src/main/resources/backend/page/member/list.html b/src/main/resources/backend/page/member/list.html index e98222e..7de9b09 100644 --- a/src/main/resources/backend/page/member/list.html +++ b/src/main/resources/backend/page/member/list.html @@ -158,13 +158,13 @@ addMemberHandle (st) { if (st === 'add'){ window.parent.menuHandle({ - id: '2', + id: '6', url: '/backend/page/member/add.html', name: '添加员工' },true) } else { window.parent.menuHandle({ - id: '2', + id: '6', url: '/backend/page/member/add.html?id='+st, name: '修改员工' },true) diff --git a/target/classes/backend/index.html b/target/classes/backend/index.html index 55c0d62..b5801a6 100644 --- a/target/classes/backend/index.html +++ b/target/classes/backend/index.html @@ -133,6 +133,7 @@ } this.menuList = this.generateMenuList(); this.menuHandle(this.menuList.find(item => item.id === this.defAct), false); // 手动调用一次 menuHandle + console.log("调用了create") this.closeLoading() }, beforeDestroy() { @@ -196,13 +197,19 @@ goBack() { // window.location.href = 'javascript:history.go(-1)' const menu = this.menuList.find(item=>item.id===this.menuActived) + console.log(menu.toString()); + console.log(this.menuActived); + // this.goBackFlag = false // this.headTitle = menu.name this.menuHandle(menu,false) }, menuHandle(item, goBackFlag) { + console.log('Before: menuActived', this.menuActived); this.loading = true this.menuActived = item.id + console.log("调用了menuHandle()"); + console.log('After: menuActived', this.menuActived); this.iframeUrl = item.url this.headTitle = item.name this.goBackFlag = goBackFlag diff --git a/target/classes/backend/page/combo/add.html b/target/classes/backend/page/combo/add.html index 34d3c66..78d4d2e 100644 --- a/target/classes/backend/page/combo/add.html +++ b/target/classes/backend/page/combo/add.html @@ -629,7 +629,7 @@ goBack() { window.parent.menuHandle( { - id: '5', + id: '4', url: '/backend/page/combo/list.html', name: '套餐管理', }, diff --git a/target/classes/backend/page/combo/list.html b/target/classes/backend/page/combo/list.html index 6a49f6f..496588b 100644 --- a/target/classes/backend/page/combo/list.html +++ b/target/classes/backend/page/combo/list.html @@ -189,13 +189,13 @@ addSetMeal (st) { if (st === 'add'){ window.parent.menuHandle({ - id: '5', + id: '4', url: '/backend/page/combo/add.html', name: '添加套餐' },true) } else { window.parent.menuHandle({ - id: '5', + id: '4', url: '/backend/page/combo/add.html?id='+st, name: '修改套餐' },true) diff --git a/target/classes/backend/page/food/add.html b/target/classes/backend/page/food/add.html index 3876fde..8f130ff 100644 --- a/target/classes/backend/page/food/add.html +++ b/target/classes/backend/page/food/add.html @@ -534,7 +534,7 @@ goBack(){ window.parent.menuHandle({ - id: '4', + id: '3', url: '/backend/page/food/list.html', name: '菜品管理' },false) diff --git a/target/classes/backend/page/food/list.html b/target/classes/backend/page/food/list.html index 7c059ac..ec5e533 100644 --- a/target/classes/backend/page/food/list.html +++ b/target/classes/backend/page/food/list.html @@ -184,13 +184,13 @@ addFoodtype (st) { if (st === 'add'){ window.parent.menuHandle({ - id: '4', + id: '3', url: '/backend/page/food/add.html', name: '添加菜品' },true) } else { window.parent.menuHandle({ - id: '4', + id: '3', url: '/backend/page/food/add.html?id='+st, name: '修改菜品' },true) diff --git a/target/classes/backend/page/member/add.html b/target/classes/backend/page/member/add.html index a944a63..0768af3 100644 --- a/target/classes/backend/page/member/add.html +++ b/target/classes/backend/page/member/add.html @@ -210,7 +210,7 @@ }, goBack(){ window.parent.menuHandle({ - id: '2', + id: '6', url: '/backend/page/member/list.html', name: '员工管理' },false) diff --git a/target/classes/backend/page/member/list.html b/target/classes/backend/page/member/list.html index e98222e..7de9b09 100644 --- a/target/classes/backend/page/member/list.html +++ b/target/classes/backend/page/member/list.html @@ -158,13 +158,13 @@ addMemberHandle (st) { if (st === 'add'){ window.parent.menuHandle({ - id: '2', + id: '6', url: '/backend/page/member/add.html', name: '添加员工' },true) } else { window.parent.menuHandle({ - id: '2', + id: '6', url: '/backend/page/member/add.html?id='+st, name: '修改员工' },true) diff --git a/target/classes/com/JIAL/FMSystem/controller/EmployeeController.class b/target/classes/com/JIAL/FMSystem/controller/EmployeeController.class index 9b6cddf28c95571971d62a00ebc4f1854c48da0e..40d0205903fde3360137c3ee95283b9f97ab0bd8 100644 GIT binary patch delta 176 zcmW-ZI|{;36hx0NQAn`S6p9H#+7J;fErOfS2!3j7H{b_E3&kRp8eBs_39+(u3t5Ak z@M<$N%nTyY&4Om7-0qqVj$aOv!1Fl1r~7c$zxAie=8!^98@B*nn0 zS{Zm4+8KlyIv5lgdKh#V`WV81a#}z$fF>}6GeiJs5G$G?hJg{xie-ocnjp*|KRHaM cMQ{cK7sE^j35Hn=G7PhUX3X9ETBd;s06x4J*#H0l