Commit Graph

23 Commits

Author SHA1 Message Date
liumengyi
845b829aaa * Fix bug #26246. 2022-08-11 10:08:06 +08:00
liumengyi
20a208f1f6 * Finish task #63691. 2022-08-08 13:43:16 +08:00
zenggang
fd9b0b1053 * Fix bug#25241 2022-07-14 02:20:00 +00:00
zenggang
38e996bd18 * Fix bug#25222,25232 2022-07-14 01:38:00 +00:00
mayue
0a5cf0a831 * Optimize code. 2022-07-12 14:28:17 +08:00
mayue
a21626979e * Fix bug #25081. 2022-07-12 14:25:58 +08:00
zenggang
5d116c16c9 * Finish task#60640 2022-07-12 02:29:20 +00:00
孙广明
107060744e Merge branch 'sprint/216_mayue_task#60639' into 'master'
* Finish task #60639.

See merge request easycorp/zentaopms!4463
2022-07-12 00:54:34 +00:00
mayue
9248adc1af * Finish task #60639. 2022-07-11 18:10:09 +08:00
mayue
ea0500a20c * Finish task #60641. 2022-07-11 15:26:14 +08:00
zenggang
b8c23acb69 * Adjust code 2022-07-08 01:42:17 +00:00
zenggang
a01d530a0a * Hide cfd stat 2022-07-08 01:38:33 +00:00
mayue
f6d94ad4cb * Fix bug #24848#24817. 2022-07-08 09:06:39 +08:00
mayue
8192f8b185 * Fix bug #24811. 2022-07-07 10:52:45 +08:00
孙广明
c97ff18621 Merge branch 'master' into 'sprint213_zg'
# Conflicts:
#   module/execution/css/cfd.css
#   module/execution/js/cfd.js
2022-07-06 07:02:38 +00:00
mayue
ef88d29c90 * Fix bug #24811#24814. 2022-07-06 14:58:46 +08:00
zenggang
b1d6a4a93d * Adjust code 2022-07-06 06:44:54 +00:00
zenggang
8773257051 * Finish task#59703,59711 2022-07-06 06:42:19 +00:00
孙广明
84876b851d * Fix cfd line style. 2022-07-06 14:05:52 +08:00
孙广明
cbe74dd653 * Code for cfd details. 2022-07-06 08:44:57 +08:00
孙广明
781259ee6f * Code for CFD. 2022-07-05 21:11:03 +08:00
孙广明
9ed8604daf * Code for cfd. 2022-07-05 16:52:47 +08:00
孙广明
25028997fa * Finish task #59701. 2022-07-05 15:03:15 +08:00