Commit Graph
49284 Commits
Author SHA1 Message Date
孙广明 6df3f17c89 * Exec for dm db. 2022-12-29 14:56:03 +08:00
孙广明 4f8435978d Merge branch 'zhouxin_feedback_843' into 'master'
* Resolve feedback #843.

See merge request easycorp/zentaopms!6648
2022-12-29 06:44:29 +00:00
朱金勇 3cbc18f277 Merge branch 'fix_feishu_webhook' into 'master'
* Fix feishu webhook missing msg_type when no secret.

See merge request easycorp/zentaopms!6623
2022-12-29 06:42:49 +00:00
zhouxin bf3ef7a9ab * Resolve feedback #843. 2022-12-29 06:41:40 +00:00
liugang b3a1c696b2 * Optimize the title of the screen page. zentaopms_18.0.beta3 2022-12-29 09:56:13 +08:00
王怡栋 fc1964e8a8 Merge branch 'sprint/feedback1843' into 'master'
* Fix feedback1843.

See merge request easycorp/zentaopms!6646
2022-12-29 00:17:45 +00:00
王怡栋 c44ac23c73 Merge branch 'sprint/bi_liumengyi_fixbug' into 'master'
* Fix bug #31276.

See merge request easycorp/zentaopms!6644
2022-12-29 00:17:16 +00:00
王怡栋 ddb801568b Merge branch 'feedback_1704' into 'master'
* Resolve feedback#1704

See merge request easycorp/zentaopms!6643
2022-12-29 00:16:39 +00:00
liugang 971f07bfcc * Replace the absolute paths with relative ones. 2022-12-28 17:49:11 +08:00
liugang 3c157f01c4 * Update the builtin screens. 2022-12-28 17:48:55 +08:00
liugang c7dc89a5f2 * Update go view static files. 2022-12-28 17:47:02 +08:00
zhujinyong 32b766bd29 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-12-28 17:09:48 +08:00
zhujinyong 639caa4fc6 * Fix path of goview. 2022-12-28 17:09:06 +08:00
孙广明 067eb064de Merge branch 'lyk_feedback_1849' into 'master'
* Resolve feedback #1849.

See merge request easycorp/zentaopms!6645
2022-12-28 08:32:12 +00:00
liuyongkai 4d20218f56 * Resolve feedback #1849. 2022-12-28 16:28:59 +08:00
liugang 9c46441f98 * Update the builtin charts and screens. 2022-12-28 16:03:30 +08:00
zenggang bdaaac29fa * Resolve feedback#1704 2022-12-28 07:47:03 +00:00
chaideqing c5790ca6e0 * Fix feedback1843. 2022-12-28 14:33:50 +08:00
liumengyi 5ce56de271 * Fix bug #31276. 2022-12-28 13:57:03 +08:00
朱金勇 ff45544bd9 Merge branch 'sprint/scx_anual' into 'master'
* Fromfeedback and fromticket convert to opened.

See merge request easycorp/zentaopms!6641
2022-12-28 01:06:49 +00:00
王怡栋 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
宋辰轩 5d5bec97db * Fromfeedback and fromticket convert to opened. 2022-12-27 15:39:20 +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