Commit Graph

104 Commits

Author SHA1 Message Date
zhangsir
f81fc37c67 修改路径未返回问题 2024-03-12 10:15:59 +08:00
zhangsir
e5c5c28fe3 优化 2023-09-25 10:55:37 +08:00
zhangsir
8ca301256d 推荐课程初始 2023-09-21 15:04:07 +08:00
BOE\10867418
2a50f04e0c 报表合并到生产 2023-09-07 14:45:53 +08:00
nisen
4709e99cc3 修改 2023-09-06 17:48:16 +08:00
joshen@zcwytd.com
f543d1ee5b 新增教师节 2023-09-06 17:21:30 +08:00
BOE\10867418
72b134b24d 父级权限 2023-09-01 15:48:35 +08:00
BOE\10867418
c013ff62ce 配置权限 2023-09-01 15:21:10 +08:00
nisen
dcef0fc852 案例权限问题 2023-08-31 12:30:16 +08:00
BOE\10867418
753014e681 隐藏报表 2023-08-30 10:54:41 +08:00
BOE\10867418
582806b2d8 Merge branch 'dongwu-master'
# Conflicts:
#	src/views/case/CaseManage.vue
2023-08-27 16:46:12 +08:00
yuping
f95a83270b ---fix bug 2023-08-27 16:10:13 +08:00
yuping
dfdb67f87d ---fix bug 2023-08-27 15:58:24 +08:00
yuping
c2113a33e6 Merge branch 'user-modify'
# Conflicts:
#	src/api/ThirdApi.js
2023-08-25 16:10:34 +08:00
yuping
2e19f357a5 ---fix bug 2023-08-25 14:52:40 +08:00
yuping
945f25a07b fix bug 2023-08-25 11:55:22 +08:00
BOE\10867418
edd9d95fbf Merge branch 'dev_0801test' into dev0731
# Conflicts:
#	src/components/NavLeft.vue
2023-08-15 10:38:04 +08:00
weixiaobo@boe.com.cn
272d91f721 餐单放开报表中心 2023-08-15 10:36:18 +08:00
yujicun
b2619a406e 修改菜单 2023-08-08 19:03:38 +08:00
yuping
dbdf3fb27c ---fix bug 2023-08-08 18:52:13 +08:00
yuping
0771f610af ---fix bug 2023-08-08 17:18:11 +08:00
yujicun
bacc3249a9 修改合并错误 2023-08-08 17:17:57 +08:00
yujicun
eef5e2a61d 合并解决冲突 2023-08-08 17:00:48 +08:00
yuping
fa31a9ff12 ---fix bug 2023-08-08 15:33:49 +08:00
yuping
56f64149a7 ---fix bug 2023-08-08 15:29:04 +08:00
yujicun
3c2bd7af14 Merge remote-tracking branch 'origin/user-modify' into dev0731 2023-08-08 11:24:44 +08:00
yuping
6f088ec29c ---fix bug 2023-08-08 08:47:55 +08:00
yuping
f3306efce0 ---fix bug 2023-08-08 08:20:29 +08:00
yujicun
e208f5ab92 Merge remote-tracking branch 'boe/dev_0801test' into dev0731 2023-08-04 13:55:00 +08:00
weixiaobo@boe.com.cn
fb4bca77b3 左侧菜单影藏报表中心 2023-08-04 13:54:13 +08:00
lims1@hunktimes.com
0611639330 zcwy-dev 补充 2023-08-01 20:53:35 +08:00
nisen
19c8dee418 合并zcwy-dev 2023-08-01 18:03:29 +08:00
weixiaobo@boe.com.cn
c2b08827fa 受众管理菜单控制 2023-08-01 16:49:39 +08:00
weixiaobo@boe.com.cn
f10b1c1fde 加固定受众餐单 2023-08-01 16:35:33 +08:00
yujicun
8fbc18a1dc Merge remote-tracking branch 'origin/user-modify' into cloud 2023-07-28 16:04:05 +08:00
yuping
692eabb474 fix bug 用户中心接口调整 2023-07-10 09:56:24 +08:00
NiSen
b1bebb8ef1 案例所有人可见和判断没有案例操作 2023-06-26 12:21:45 +08:00
NiSen
fc0aa8223a 修改跨域和菜单栏的添加 2023-06-14 19:30:56 +08:00
NiSen
593158ebf3 firset submit 2023-06-13 13:31:01 +08:00
BOE\10867418
f4552c5a6f 修改面包屑冲突 2023-04-11 16:57:34 +08:00
BOE\10867418
1b78971e2d 更改导航 2023-04-11 09:26:38 +08:00
mx00085@163.com
521d4a2c82 fix: 运营数据概览bug修复 2023-03-31 10:50:16 +08:00
mx00085@163.com
76413d767a fix: 报表三期其他页面注释解开 2023-03-28 09:29:51 +08:00
dongruihua
ac618dd084 Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop
# Conflicts:
#	src/App.vue
2023-03-17 10:54:49 +08:00
wyx
bef43237b0 feat:旧版管理员界面跳转添加 2023-03-15 15:55:10 +08:00
yujicun
62d5e6e97d Merge remote-tracking branch 'origin/develop' into develop 2023-03-13 10:22:39 +08:00
caozc
507f4a1e6b fix:跳转新tab页 2023-03-10 20:35:30 +08:00
mx00085@163.com
0f22c8a458 fix: 菜单修改 2023-03-08 15:43:02 +08:00
huangshengfa
683f74a7a0 Merge branch 'develop' into 'pre-dev'
# Conflicts:
#   src/components/NavLeft.vue
2023-03-07 18:10:11 +08:00
lixg
eaefc4ebd7 feat:修改导航 2023-03-07 12:56:27 +08:00