Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
58,758 Commits 2 Branches 292 Tags
d60bbd6fc5d2ddbceed830fd87258fe4775fa9e0
Commit Graph
69 Commits
Author SHA1 Message Date
songchenxuan f0b4ae3734 * Fix bug #40611 again. 2023-11-16 10:05:16 +08:00
zhouxin 2288972e70 Revert "Add method to get waterpolo option." 
This reverts commit a439aec6c1.
 2023-11-15 09:55:59 +08:00
songchenxuan 185cbd0f60 * Add limit for design chart. 2023-11-15 09:03:10 +08:00
宋辰轩 d6dc566518 revert 7f73187ba6 
revert * Show waterpolo type.
 2023-11-15 08:51:08 +08:00
zhouxin a439aec6c1 * Add method to get waterpolo option. 2023-11-14 16:47:59 +08:00
songchenxuan 7f73187ba6 * Show waterpolo type. 2023-11-14 12:41:28 +08:00
songchenxuan 2eee884bef * Finish feedback #4495. 2023-11-09 15:44:39 +08:00
songchenxuan 102b51ec67 * Finish feedback #4095. 2023-11-09 15:34:43 +08:00
songchenxuan 3aabf63c83 * Unset waterpolo type chart. 2023-11-09 15:08:09 +08:00
songchenxuan ccfcb57570 * Fix bug #40252. 2023-11-09 11:47:37 +08:00
songchenxuan 29ac575e50 * Fix bug #40252. 2023-11-09 11:42:07 +08:00
songchenxuan 22630e6452 * Annotation chart getTables method code. 2023-11-06 13:38:33 +08:00
songchenxuan 5cd5a04316 * Finish task #105324. 2023-11-06 09:00:09 +08:00
songchenxuan a0d669d689 * Change water polo background color. 2023-11-03 13:36:37 +08:00
songchenxuan 4acbf314e4 * Fix bug #40087. 2023-11-03 13:26:49 +08:00
songchenxuan cb366d0719 * Number is treated as a string at chart function ajaxGetSysOption. 2023-11-03 12:58:03 +08:00
songchenxuan 9e366e3e30 * Fix bug 40120. 2023-11-03 09:53:17 +08:00
songchenxuan cbaa9b9249 * Fix bug #40120. 2023-11-02 12:53:54 +08:00
songchenxuan b4a0b2a0eb * Fix bug #40077. 2023-11-02 11:11:25 +08:00
songchenxuan 31fdc9156d * Use echart liquidfill at preview page. 2023-11-01 15:30:59 +08:00
songchenxuan c8ce951f86 * Add genWaterpolo function. 2023-11-01 12:11:48 +08:00
zhujinyong 1e8616c812 + Add slave dbs and bi db. 2023-08-30 18:06:32 +08:00
Yagami 434aed0830 Merge branch '18.4' into zentaoipd 2023-05-19 14:47:42 +08:00
Yagami ffd2b525c8 * Change judgment condition. 2023-05-04 17:05:52 +08:00
wangyuting2 be82f90fd8 * Fix chart langs bug. 2023-04-28 15:00:36 +08:00
qixinzhi 8b64069757 * Fix bug#34083. 2023-04-27 05:38:26 +00:00
daitingting 2697978732 * Fix bug. 2023-04-27 03:10:19 +00:00
qixinzhi 29031e1fd8 * Fix bug #34687. 2023-04-26 10:01:18 +00:00
qixinzhi 4af6c50489 * Fix bug#34538. 2023-04-25 07:08:29 +00:00
liugang d8a1234ecd * Fix error the type of chart was overwritten. 2023-04-24 11:51:51 +00:00
liugang 3a7ba8e58f * Change lang items to upper case. 2023-04-24 11:51:21 +00:00
qixinzhi a9f7c36692 * Fix bug#34665. 2023-04-24 11:26:05 +00:00
宋辰轩 3a0195009c * Modify dom. 2023-04-24 13:39:22 +08:00
宋辰轩 b013c400c8 * Fix bug #34583. 2023-04-24 13:34:18 +08:00
xieqiyu 7527b808bb * Code for bug#34621. 2023-04-24 02:01:32 +00:00
wangyuting2 1ef6a08016 * Fix langs bug. 2023-04-21 15:49:06 +08:00
wangyuting2 a2611624ff * Fix lang bug. 2023-04-21 10:30:01 +08:00
wangyuting2 6473ae0ce0 * Finish task #91811. 2023-04-21 10:01:46 +08:00
qixinzhi f6c6c55ad2 * Fix bug#33357. 2023-04-20 08:47:54 +00:00
xieqiyu 8d4cc7844f * Fix bug of radar error of select no data filter. 2023-04-20 08:06:37 +00:00
刘刚 668d9689b1 Merge branch 'zentaobiz39_bi_wangyuting' into 'master' 
* Fix chart browse bug.

See merge request easycorp/zentaopms!7497
 2023-04-20 03:14:39 +00:00
wangyuting2 e3818f2999 * Fix chart browse bug. 2023-04-20 11:13:04 +08:00
qixinzhi 2dad2fab89 * Fix bug#33355. 2023-04-20 03:04:29 +00:00
wangyuting2 0261dbccee * Show builtin chart. 2023-04-19 16:26:06 +08:00
王怡栋 7399979c28 Merge branch 'sprint/scx_bug34275' into 'master' 
* Fix bug #34275.

See merge request easycorp/zentaopms!7442
 2023-04-18 00:24:26 +00:00
liugang 01e3f26c57 * Use export instead of exportChart. 2023-04-17 09:29:31 +00:00
宋辰轩 b1eea9afa7 * Fix bug #34275. 2023-04-17 17:15:07 +08:00
qixinzhi 0201ca4050 * Fix where condition sql with key words. 2023-04-17 05:18:46 +00:00
宋辰轩 5424de798c * Finish task #91131. 2023-04-14 16:55:50 +08:00
刘刚 dedce62d79 Merge branch 'fix_bug_qxz' into 'master' 
* Fix bug #34124.

See merge request easycorp/zentaopms!7412
 2023-04-14 03:03:23 +00:00