Commit Graph
364 Commits
Author SHA1 Message Date
刘刚 aa9212c821 Merge branch 'sprint/biz37_task90074' into 'master'
Add chart module.

See merge request easycorp/zentaopms!7326
2023-04-07 02:34:33 +00:00
tianshujie bb84c7a731 * Change the name of my spatial function. 2023-04-06 16:57:14 +08:00
liugang 95e217b661 + Add chart menu. 2023-04-06 06:24:16 +00:00
tianshujie 0e813c1ea3 * Refactoring list page. 2023-04-06 13:07:36 +08:00
tianshujie e90d2c0d66 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-04 20:52:39 +08:00
tianshujie b87a68b349 * Code for task #89906. 2023-04-04 17:29:13 +08:00
liugang 4a1be481d9 * Format code. 2023-04-04 07:53:03 +00:00
tianshujie 978ded6788 * Code for task #89927. 2023-04-03 16:12:48 +08:00
caoyanyi d477203aa7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-03 08:30:03 +08:00
liugang 19fe082665 * Replace the subNavbar of pivot with mainMenu. 2023-03-29 07:31:15 +00:00
liugang f6430b6050 * Replace report with pivot. 2023-03-29 00:46:16 +00:00
caoyanyi 58c2ca3a27 * Modify api doc style. 2023-03-28 16:09:56 +08:00
liugang 54876704c6 * Add pivot module. 2023-03-28 07:25:50 +00:00
qixinzhi 511240d0fa Merge branch 'master' into sprint/biz17 2023-03-22 17:15:46 +08:00
caoyanyi c7cb7e96c2 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-21 17:00:05 +08:00
caoyanyi 597131cd71 * Code for bug #33089, modify second menu active. 2023-03-20 15:14:23 +08:00
田淑杰 e223267649 * Code for finish task #87420. 2023-03-20 11:23:57 +08:00
tianshujie fd209a3167 * Finish task 87399. 2023-03-14 15:53:03 +08:00
liumengyi 3f63404953 * Finish task #86258. 2023-03-06 06:09:13 +00:00
qixinzhi b4e8de97e5 Merge branch 'master' into sprint/biz17 2023-03-06 09:04:52 +08:00
wangyidong 01bb8130dd Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-01 08:50:31 +08:00
wangyidong 1a352410a6 * code for task #85503. 2023-03-01 08:49:44 +08:00
tianshujie eef2c1c356 * Change the order of the custom navigation. 2023-02-28 15:36:04 +08:00
tianshujie 2a003865f4 * Code for finish task #84526. 2023-02-28 09:09:16 +08:00
caoyanyi f2441f7197 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-27 15:28:14 +08:00
liugang c9115f7a21 * Revert menus, privileges and pages of report. 2023-02-27 06:39:37 +00:00
宋辰轩 1071241556 * Fix report-preview menu. 2023-02-23 16:15:14 +08:00
caoyanyi c8374b1e14 Merge branch 'master' into zentaopms_289 2023-02-17 10:11:16 +08:00
wangyidong 9e1cfb2b25 * code for task #84532. 2023-02-16 14:53:30 +08:00
wangyidong 1b70d6e8a4 * code for task #84532. 2023-02-16 13:55:23 +08:00
caoyanyi a3d9cda86b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-15 09:13:10 +08:00
caoyanyi dff2e8a00c * Add search tab. 2023-02-14 14:01:16 +08:00
guofeilong 6bf8c6388e * Code for add menuOrder in langItem . 2023-02-14 08:45:35 +08:00
guofeilong b9d288fd23 * Code for add langitem.html.php 2023-02-13 16:56:34 +08:00
daitingting 060f843b07 * Fix bug #31996. 2023-02-10 05:15:12 +00:00
wangyuting2 e7a66de47f * Fix admin model menu bug. 2023-02-10 10:31:32 +08:00
wangyidong de17879c59 * code for task #83436. 2023-02-01 15:37:07 +08:00
wangyidong 8ec471f950 * code for task #83439. 2023-02-01 11:20:57 +08:00
tianshujie 8b5f786bd2 * Finish task #83329. 2023-01-30 17:23:10 +08:00
tanghucheng c04a1207d0 * Fix bug. 2022-12-30 10:40:41 +08:00
tanghucheng 62c1ed7f9c Merge branch 'master' into zenops_46 2022-12-30 09:40:04 +08:00
liugang 8100689bb2 Merge branch 'sprint/biz17' 2022-12-26 08:50:31 +08:00
liugang 0257517d94 * Add privilege control of screen. 2022-12-23 14:53:28 +08:00
liugang d04fc1fe4a * Move the screen module to open source. 2022-12-23 14:39:01 +08:00
孙广明 d4f5170391 Merge branch 'zenops_46_zhaoke_74993' into 'zenops_46'
Zenops 46 zhaoke 74993

See merge request easycorp/zentaopms!6395
2022-11-28 06:58:42 +00:00
liugang da3e57db0f * Display all reports by report-preview function. 2022-11-24 13:23:37 +08:00
caoyanyi 4361cb4182 Merge branch 'master' into zenops_46 2022-11-24 13:01:30 +08:00
zhaoke c2b0f0a656 * Update zanode name 2022-11-23 02:44:27 +00:00
wangjianhua bedc9e9309 * Show shadow product in Repo module. 2022-11-22 22:13:54 +08:00
caoyanyi 0d81c7f4fe Merge branch 'master' into zenops_46 2022-11-22 15:39:59 +08:00