Commit Graph
49262 Commits
Author SHA1 Message Date
王怡栋 4af7ffbfa9 Merge branch 'sprint/konglinmao_optimize_code2' into 'master'
* Optimize code.

See merge request easycorp/zentaopms!6640
2022-12-27 08:48:41 +00:00
孔令茂 610e22f948 * Optimize code. 2022-12-27 08:45:32 +00:00
朱金勇 d562a9cf29 Merge branch 'sprint/bi_liumengyi_fixbug' into 'master'
* Fix bug #31236,#31241.

See merge request easycorp/zentaopms!6638
2022-12-27 08:14:03 +00:00
liugang 115877723a * Update the builtin charts and screens. 2022-12-27 15:39:35 +08:00
liumengyi e451c759f8 * Optimize code. 2022-12-27 15:33:38 +08:00
liugang e13de50d7b * Fix bug of the company-dynamic report. 2022-12-27 14:35:44 +08:00
liumengyi 5c867a5b7e * Fix bug #31241. 2022-12-27 14:29:14 +08:00
liumengyi f02ddfb6b2 * Fix bug #31236. 2022-12-27 14:28:51 +08:00
liugang 3141fb89f3 * Rename the screen menu. 2022-12-27 10:58:14 +08:00
王怡栋 8da7e6ab2a Merge branch 'sprint/hufangzhou_fixbug' into 'master'
* Fix bug for add module.

See merge request easycorp/zentaopms!6637
2022-12-27 01:31:29 +00:00
王怡栋 0692155514 Merge branch 'zentaopms_279_bug#31190' into 'master'
* Fix bug #31190.

See merge request easycorp/zentaopms!6636
2022-12-27 01:30:51 +00:00
hufangzhou 464cd34cd5 * Fix bug for add module. 2022-12-27 01:28:22 +00:00
wangyuting 770881fd4f * Fix bug #31190. 2022-12-27 01:10:26 +00:00
王怡栋 9e13bd16c3 Merge branch 'sprint/hufangzhou_newVersion_BI' into 'master'
* Add the new Version.

See merge request easycorp/zentaopms!6635
2022-12-27 01:08:12 +00:00
hufangzhou 3a51b751ef * Add the new Version. 2022-12-27 00:54:30 +00:00
liugang 9a89860dc4 * Comment codes. 2022-12-27 08:40:48 +08:00
liugang 1401333297 * Update the builtin charts and screens. 2022-12-27 08:37:59 +08:00
朱金勇 4ce3ae6716 Merge branch 'sprint/bi_liumengyi_sortPie' into 'master'
* Optimize code.

See merge request easycorp/zentaopms!6634
2022-12-26 13:56:17 +00:00
liumengyi f5d69f3999 * Optimize code. 2022-12-26 21:41:04 +08:00
朱金勇 d69c1f1d67 Merge branch 'sprint/bi_liumengyi_sortPie' into 'master'
* Add build piecircle chart method.

See merge request easycorp/zentaopms!6633
2022-12-26 13:38:10 +00:00
liumengyi 4c85e5adf2 * Optimize code. 2022-12-26 21:23:16 +08:00
liumengyi 4769e6ce97 * Modify comment. 2022-12-26 21:06:29 +08:00
liumengyi 2a64c3ed6a * Add build piecircle chart method. 2022-12-26 21:05:22 +08:00
zhujinyong a62746a724 * Use annualData instead for screen 4. 2022-12-26 17:04:28 +08:00
zhujinyong 06d3231321 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-12-26 17:00:59 +08:00
zhujinyong 848dca384a - Remove debug code. 2022-12-26 17:00:44 +08:00
王怡栋 b520d3333e Merge branch 'sprint/scx_gfl_something' into 'master'
* Fix bug for story finished percent.

See merge request easycorp/zentaopms!6632
2022-12-26 08:49:13 +00:00
liugang d66a961b00 * Update sql. 2022-12-26 16:38:51 +08:00
宋辰轩 c211acfadc * Fix bug for story finished percent. 2022-12-26 16:30:17 +08:00
wangyidong 489d7aa695 * fix bug save lastExecution. 2022-12-26 16:21:09 +08:00
zhujinyong 4498447a19 * Support sum for bar chart. 2022-12-26 16:08:46 +08:00
liugang 5c2da929f6 * Add the builtin field. 2022-12-26 15:53:39 +08:00
王怡栋 681e43fbb4 Merge branch 'sprint/bi_liumengyi_sortPie' into 'master'
* Sort data in build pie chart.

See merge request easycorp/zentaopms!6629
2022-12-26 07:24:41 +00:00
王怡栋 c6307dd6eb Merge branch 'sprint/scx_gfl_something' into 'master'
Sprint/scx gfl something

See merge request easycorp/zentaopms!6631
2022-12-26 07:24:31 +00:00
宋辰轩 0ae429c5ad * Finish story 41069,41070. 2022-12-26 15:10:10 +08:00
宋辰轩 635d42682c * screen container add bg-image 2022-12-26 13:58:14 +08:00
liumengyi 2fd9543b4b * Sort data in build pie chart. 2022-12-26 11:11:21 +08:00
王怡栋 130cdfcbba Merge branch 'sprint/wangzemei/28210' into 'master'
* fix bug 28210

See merge request easycorp/zentaopms!6626
2022-12-26 03:03:54 +00:00
王怡栋 4b76e66c31 Merge branch 'sprint/feedback1821' into 'master'
* Fix feedback1821.

See merge request easycorp/zentaopms!6624
2022-12-26 03:03:41 +00:00
王怡栋 0a551cdc98 Merge branch 'bug_26051' into 'master'
* Fix bug#26051

See merge request easycorp/zentaopms!6622
2022-12-26 03:02:10 +00:00
王怡栋 c7396478aa Merge branch 'sprint/scx_screen' into 'master'
* Filter execution status.

See merge request easycorp/zentaopms!6628
2022-12-26 03:01:03 +00:00
宋辰轩 03591f4e00 * Filter execution status. 2022-12-26 10:57:06 +08:00
wangzemei 4aa434b954 * fix bug 2022-12-26 10:32:07 +08:00
liugang 0d4f0f34ab * Rename update sql. 2022-12-26 08:54:02 +08:00
liugang 8100689bb2 Merge branch 'sprint/biz17' 2022-12-26 08:50:31 +08:00
zhujinyong f6c4838800 + Add cover for screen. 2022-12-26 08:40:47 +08:00
chaideqing c3bd48c366 * Fix feedback1821. 2022-12-23 16:00:54 +08:00
liugang 469702357b * Remove useless codes. 2022-12-23 15:02:58 +08:00
liugang 9f5d1c3b32 * Update the screen module from zentaobiz. 2022-12-23 14:59:47 +08:00
liugang 0257517d94 * Add privilege control of screen. 2022-12-23 14:53:28 +08:00