Yansen 2 年前
父节点
当前提交
a2774cc419
共有 5 个文件被更改,包括 19 次插入3 次删除
  1. 3
    0
      public/config.js
  2. 13
    1
      src/layouts/AuthLayout/components/Menus.jsx
  3. 1
    0
      src/routes/routes.jsx
  4. 1
    1
      src/services/statis.js
  5. 1
    1
      src/utils/request.js

+ 3
- 0
public/config.js 查看文件

@@ -4,3 +4,6 @@ DH_MONITOR = 'http://192.168.3.2';
4 4
 
5 5
 // 海康监控
6 6
 HK_MONITOR = 'http://192.168.3.3';
7
+
8
+// 服务接口
9
+SERVER_BASE = 'http://jgz.njyunzhi.com/api';

+ 13
- 1
src/layouts/AuthLayout/components/Menus.jsx 查看文件

@@ -6,7 +6,19 @@ const menuStyle = { height: '100%' };
6 6
 export default (props) => {
7 7
   const { theme, items, location } = props;
8 8
 
9
+  const selectedKeys = React.useMemo(() => {
10
+    const parts = location.pathname.split('/').filter(Boolean);
11
+    const keys = parts.reduce((acc, it) => {
12
+      const parent = acc.pop();
13
+      const path = !parent ? `/${it}` : `${parent}/${it}`
14
+
15
+      return acc.concat([parent, path].filter(Boolean));
16
+    }, []);
17
+
18
+    return keys;
19
+  }, [location.pathname]);
20
+
9 21
   return (
10
-    <Menu style={menuStyle} theme={theme} items={items} selectedKeys={[location.pathname]} />
22
+    <Menu style={menuStyle} theme={theme} items={items} selectedKeys={selectedKeys} />
11 23
   )
12 24
 }

+ 1
- 0
src/routes/routes.jsx 查看文件

@@ -294,6 +294,7 @@ export const authRoutes = [
294 294
         meta: {
295 295
           title: "公告详情",
296 296
           hideInMenu: true,
297
+          noSiderBar: true,
297 298
           permission: 'rotationChart.detail',
298 299
         },
299 300
       },

+ 1
- 1
src/services/statis.js 查看文件

@@ -6,7 +6,7 @@ export const getTaskInfo = (params) => request('/statis/taskInfo', { params, suc
6 6
 
7 7
 export const getDeviceType = () => request('/statis/deviceType', { successTip: false });
8 8
 
9
-export const getStoreType = (params) => request('/statis/deviceType', { params, successTip: false });
9
+export const getStoreType = (params) => request('/statis/storeType', { params, successTip: false });
10 10
 
11 11
 export const getUserEdu = () => request('/statis/userEdu', { successTip: false });
12 12
 

+ 1
- 1
src/utils/request.js 查看文件

@@ -2,7 +2,7 @@ import axios from "axios";
2 2
 import { message } from 'antd';
3 3
 
4 4
 const instance = axios.create({
5
-  baseURL: import.meta.env.VITE_SERVER_BASE,
5
+  baseURL: import.meta.env.PROD ? SERVER_BASE : import.meta.env.VITE_SERVER_BASE,
6 6
   timeout: 10000,
7 7
 });
8 8