Your Name 3 years ago
parent
commit
f1b281d431

+ 2
- 2
config/proxy.js View File

8
 export default {
8
 export default {
9
   dev: {
9
   dev: {
10
     '/api/': {
10
     '/api/': {
11
-      // target: 'https://xlk.njyz.tech/',
12
-      target: 'http://localhost:8081/',
11
+      target: 'https://xlj.newlandsh.com/',
12
+      // target: 'http://localhost:8081/',
13
       // target: 'https://xlj.newlandsh.com/',
13
       // target: 'https://xlj.newlandsh.com/',
14
       changeOrigin: true,
14
       changeOrigin: true,
15
       pathRewrite: {
15
       pathRewrite: {

+ 3
- 0
config/routes.js View File

606
             path: '/statistics',
606
             path: '/statistics',
607
             name: '数据统计',
607
             name: '数据统计',
608
             component: '../layouts/BlankLayout',
608
             component: '../layouts/BlankLayout',
609
+            menuCode: '/statistics',
609
             // hideInMenu: true,
610
             // hideInMenu: true,
610
             routes: [
611
             routes: [
611
               {
612
               {
612
                 path: '/statistics/dataReport',
613
                 path: '/statistics/dataReport',
613
                 name: '数据报表',
614
                 name: '数据报表',
614
                 component: './statistics/dataReport',
615
                 component: './statistics/dataReport',
616
+                menuCode: '/statistics/dataReport',
615
               },
617
               },
616
               {
618
               {
617
                 path: '/statistics/activity',
619
                 path: '/statistics/activity',
618
                 name: '活动统计',
620
                 name: '活动统计',
619
                 component: './statistics/activity',
621
                 component: './statistics/activity',
622
+                menuCode: '/statistics/activity',
620
               },
623
               },
621
             ],
624
             ],
622
           },
625
           },

+ 4
- 2
src/layouts/BasicLayout.jsx View File

33
     const needAuth = !!item.menuCode;
33
     const needAuth = !!item.menuCode;
34
 
34
 
35
     const authority =
35
     const authority =
36
-      (menuRoles.filter((x) => x.menuCode === item.menuCode)[0] || {}).roles || [];
36
+      (menuRoles.filter((x) => x.code === item.menuCode)[0] || {}).roles || [];
37
+
38
+    console.log('-------------->', item.menuCode, authority)
37
 
39
 
38
     const localItem = { ...item, children: item.children ? menuDataRender(menuRoles)(item.children) : [] };
40
     const localItem = { ...item, children: item.children ? menuDataRender(menuRoles)(item.children) : [] };
39
     return Authorized.check(needAuth ? authority : undefined, localItem, null);
41
     return Authorized.check(needAuth ? authority : undefined, localItem, null);
71
       };
73
       };
72
     }
74
     }
73
 
75
 
74
-    const authority = (menus.filter((x) => x.menuCode === routeItem.menuCode)[0] || {}).roles;
76
+    const authority = (menus.filter((x) => x.code === routeItem.menuCode)[0] || {}).roles;
75
     return {
77
     return {
76
       authority: authority && authority.length ? authority : ['any-string-for-no-right'],
78
       authority: authority && authority.length ? authority : ['any-string-for-no-right'],
77
     };
79
     };

+ 2
- 1
src/pages/building/Developers/tableColumns.js View File

23
     align: 'center',
23
     align: 'center',
24
   },
24
   },
25
   {
25
   {
26
-    title: '品牌宣传图',
26
+    title: '品牌Logo',
27
     dataIndex: 'brandLogo',
27
     dataIndex: 'brandLogo',
28
     key: 'brandLogo',
28
     key: 'brandLogo',
29
     align: 'center',
29
     align: 'center',
41
     dataIndex: 'brandRemark',
41
     dataIndex: 'brandRemark',
42
     key: 'brandRemark',
42
     key: 'brandRemark',
43
     align: 'center',
43
     align: 'center',
44
+    width: '40%',
44
   },
45
   },
45
   {
46
   {
46
     title: '操作',
47
     title: '操作',