完成管理账号，完善菜单

.idea/vcs.xml

@@ -2,5 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/bin" vcs="Git" />
   </component>
 </project>

bin

@@ -1 +1 @@
-Subproject commit 2329fea1f84e829d3a703c60cfd8da9014766e91
+Subproject commit a69a346804bec6f22ca7e5bd7cf006997f7bdaa4

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("员工信息修改成功");

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

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: '套餐管理',
               },

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)

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)

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)

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)

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)

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

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: '套餐管理',
               },

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)

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)

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)

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)

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)