84 Commits

Author	SHA1	Message	Date
yujicun	b2619a406e	修改菜单	2023-08-08 19:03:38 +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
dongruihua	cc09605e04	Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop	2023-03-06 09:16:37 +08:00
yuping	b3c86ffecb	-- fix bug	2023-03-06 02:21:05 +08:00
wyx	3a8686ee52	fix:左侧导航菜单重复	2023-03-05 20:53:49 +08:00
huangshengfa	87317b60df	Merge branch 'pre-dev' into 'develop' ... Pre dev See merge request !55	2023-03-04 17:02:19 +08:00
yuping	2c9bf37df4	-- fix bug	2023-03-04 14:24:40 +08:00
dongruihua	5bd354c83b	Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop	2023-03-02 14:59:09 +08:00
yuping	369fa8e263	-- fix bug	2023-03-02 11:54:50 +08:00
yuping	5f1157c028	-- fix bug	2023-03-02 11:48:11 +08:00
huangshengfa	5ac2e40633	Merge branch 'pre-dev' into 'develop' ... Pre dev See merge request !44	2023-02-28 09:02:53 +08:00
yuping	0781a1710b	-- fix bug	2023-02-28 01:09:34 +08:00
dongruihua	6fac22c9d5	Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop ... # Conflicts: # vue.config.js	2023-02-24 09:04:29 +08:00
yuping	ee6b50cf87	-- fix bug 旧系统对接	2023-02-23 18:32:56 +08:00
mx00085@163.com	87094d3f77	fix: 左侧导航更改，概览页面tab总数更改	2023-02-21 17:05:50 +08:00
mx00085@163.com	6af842daaa	fix: 冲突解决	2023-02-20 16:59:37 +08:00
mx00085@163.com	f79829ade0	feat: 报表管理接口联调	2023-02-20 16:23:06 +08:00
mx00085@163.com	e0a18e1e4d	feat: 报表管理接口联调	2023-02-20 16:00:13 +08:00
mx00085@163.com	d19aba8623	feat: 概览，学习组织数据接口联调	2023-02-20 14:33:36 +08:00
yuping	84106e4fb1	--fix 字典管理	2023-02-17 18:21:25 +08:00
mx00085@163.com	e23339bea3	feat: 三期报表管理页面编写	2023-02-07 15:47:29 +08:00
15200171637	d5a93142a7	feat: 报表管理开发	2023-02-07 09:05:32 +08:00