factory

Commit Graph

Select branches

Hide Pull Requests

base

dev_cqm

dev_sj

master

#2

#3

#4

#5

#6

#7

2.6.2025031919

2.6.2025033109

2.6.2025040115

2.6.2025040211

2.6.2025040316

2.6.2025040710

2.6.2025040813

2.6.2025040913

2.6.2025041113

2.6.2025041613

2.6.2025042311

2.6.2025042816

2.6.2025043014

2.6.2025050816

2.6.2025051208

2.6.2025051609

2.6.2025051913

2.6.2025052615

2.6.2025060409

2.6.2025060617

2.6.2025060913

2.6.2025061715

2.6.2025062015

2.7.2025062414

2.7.2025070310

2.7.2025071516

2.7.2025073110

2.7.2025080409

2.7.2025080716

2.7.2025081813

2.7.2025082616

2.7.2025082816

2.8.2025090815

2.8.2025091616

2.8.2025092816

2.8.2025101011

3.0.2025110710

3.0.2025122514

3.0.2026010716

3.1.2026031316

3.1.2026033008

3.1.2026042912

f4e003b9f0 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 修改edu/examrecord zty 2024-06-11 14:04:39 +0800
5178cb0daa fix: edu/Examrecord zty 2024-06-11 14:03:58 +0800
6851dd3f94 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-06-11 11:29:00 +0800
af879ca01b fix: myschedule 保存时的bug caoqianming 2024-06-11 11:28:58 +0800
18b0429044 fix: edu/submit zty 2024-06-11 09:11:32 +0800
71e7d4d187 feat: base send_mail_task支持发送多人 zty 2024-06-07 17:08:50 +0800
7258d2e0ca Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2024-06-07 16:51:02 +0800
87311668f5 fix: exam attend bulk_create bug zty 2024-06-07 16:50:58 +0800
c55005994b feat: base myschedule加入url caoqianming 2024-06-07 16:01:16 +0800
255867b2d3 fix: myscheduleserializer 返回字段bug caoqianming 2024-06-07 15:46:37 +0800
108e40bb3d feat: base 去除MySchedule的权限控制 caoqianming 2024-06-07 13:41:35 +0800
6eccfb67cb feat: 增加riskpoint返回信息 caoqianming 2024-06-07 09:50:32 +0800
fe40facfa2 fix: base 对循环引用抛出异常 caoqianming 2024-06-07 09:49:17 +0800
0fdaa0a7d5 feat: dpm加入url caoqianming 2024-06-06 14:51:22 +0800
a14c411795 fix: base 调整handle_parent caoqianming 2024-06-06 14:50:43 +0800
d36de5bc00 feat: 正式添加dpm模块 caoqianming 2024-06-06 14:50:14 +0800
d40389df76 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-06-06 09:13:13 +0800
9e0241f209 fix: 改变培训级别以与风险点一致 caoqianming 2024-06-06 09:13:11 +0800
b38f31ec35 fix: 修改node版本过高的bug zty 2024-06-05 16:37:02 +0800
917f3ff52b feat: 增加edu 线下培训表 caoqianming 2024-06-05 14:43:39 +0800
59cf693115 Merge branch 'base' of https://github.com/caoqianming/django-vue-admin into base caoqianming 2024-06-05 14:13:51 +0800
252dbaf0da feat: 获取子集的性能优化2 caoqianming 2024-06-05 14:07:50 +0800
16ead75d3b feat: 获取子集的性能优化2 caoqianming 2024-06-05 14:07:50 +0800
8616cf8c30 fix: 完善父子关系parent_link处理 caoqianming 2024-06-05 12:49:52 +0800
c28f7546f3 feat: base 增加parentmodel caoqianming 2024-06-05 10:24:38 +0800
7c080d9198 feat: base 在第一次实例化时添加权限标识 caoqianming 2024-06-05 09:27:33 +0800
8c238e90b7 doc: CustomListmixin添加注释 caoqianming 2024-05-31 18:59:32 +0800
d5d4c67527 feat: base 增加get_queryset_custom caoqianming 2024-06-03 08:36:02 +0800
a92fb56372 feat: base 增加了baseserializermixin caoqianming 2024-05-31 14:12:08 +0800
403fae5dd6 feat: base 优化邮件报错频率过高自动屏蔽else未处理 caoqianming 2024-05-21 15:07:13 +0800
6084630636 feat: base 优化邮件报错频率过高自动屏蔽 caoqianming 2024-05-21 15:00:13 +0800
102e737729 feat: base task_error携带self.name caoqianming 2024-05-21 13:49:38 +0800
3ef1985632 feat: base 增加is_close函数 caoqianming 2024-05-15 08:30:10 +0800
5df0b4f614 feat: base 使用custommodelmixin替代listmodelmixin以定制返回数据 caoqianming 2024-05-10 09:11:33 +0800
8595f41011 feat: base 完整的task on_failure日志记录和邮件推送 caoqianming 2024-04-29 21:46:49 +0800
d296cd7b63 feat: base 完整的task on_failure日志记录和邮件推送 caoqianming 2024-04-29 21:45:35 +0800
817eac722b feat: base 生产环境关闭swagger2 caoqianming 2024-04-28 14:18:29 +0800
ec0b025b79 feat: base 生产环境关闭swagger caoqianming 2024-04-28 13:59:06 +0800
5db2ce5351 fix: base get_sysconfig caoqianming 2024-04-28 11:13:23 +0800
c1d9e91591 feat: base get_sysconfig支持传入具体key值 caoqianming 2024-04-25 16:57:00 +0800
da0b21eb2d feat: base 添加gitignore caoqianming 2024-04-19 16:28:54 +0800
c1ad79ffcc feat: base wxmp, wx无需显示在conf指定 caoqianming 2024-04-19 16:28:05 +0800
d923ac7e70 feat: base systemuser增加筛选条件 caoqianming 2024-04-12 16:43:48 +0800
b2b2cf70bc fix: base period_dict错误修改 caoqianming 2024-04-11 10:59:13 +0800
309907f678 feat: base 增加ctask_run将普通函数转celery执行 caoqianming 2024-04-11 10:53:39 +0800
efdbbe4931 feat: base 调整项目可自定义配置精简settings.py caoqianming 2024-03-17 22:06:52 +0800
e836195bd2 feat: base 提供监测celery的实例 caoqianming 2024-03-13 17:37:46 +0800
47a66cc765 fix: base 支持从request.data中获取page和page_size caoqianming 2024-03-08 18:15:58 +0800
985eb2ac22 fix: base 支持从request.data中获取page和page_size caoqianming 2024-03-08 18:14:15 +0800
5be04a14dd feat: base complexserializer 非必填 caoqianming 2024-03-08 17:59:35 +0800
48c6acd652 feat: base complexserializer支持传入page或自行在url中传page caoqianming 2024-03-08 17:56:47 +0800
e21e3f34df feat: base 支持从request.data中获取page和page_size caoqianming 2024-03-08 17:56:04 +0800
dd196cb84a feat: base 可给list返回数据添加额外信息 caoqianming 2024-02-28 15:00:53 +0800
2ae62141d7 doc: 增加config查询文档 caoqianming 2024-02-27 09:20:27 +0800
e49b360cbe feat: base viewset增加query定制返回参数 caoqianming 2024-02-27 09:14:27 +0800
f86834444b feat: base 提供查询子集数据方法 caoqianming 2024-02-26 08:08:47 +0800
fd2b7ba5b0 feat: base 优化utils queryset查询 caoqianming 2024-02-25 21:12:46 +0800
acba76e0e2 feat: base 增加MyJsonListFilter caoqianming 2024-02-21 09:53:41 +0800
1dadb717e5 fix: base- put config 时update_dict的bug caoqianming 2024-01-10 10:54:58 +0800
2cb4ca00d3 feat: base- 基于项目code返回或更改配置信息 caoqianming 2024-01-10 10:11:43 +0800
5856965d28 fix: base user phone校验可为空 caoqianming 2023-12-28 10:31:19 +0800
524e2f2b9c feat: base 添加了对比字典及其嵌套内容的方法 caoqianming 2023-12-07 09:37:54 +0800
a54030e9c0 feat: 获取子集的性能优化及删除提示 caoqianming 2024-06-05 12:50:47 +0800
7b1013ea64 fix: 完善父子关系parent_link处理 caoqianming 2024-06-05 12:49:52 +0800
a590eb298b feat: base 增加parentmodel caoqianming 2024-06-05 10:24:38 +0800
2d7f1152ff fix: 只继承CustomGenericViewSet的设置perms_map为{}2 caoqianming 2024-06-05 10:24:18 +0800
9c8d58c35c fix: 解决swagger显示错误 caoqianming 2024-06-05 09:31:51 +0800
14e421dd5b fix: 只继承CustomGenericViewSet的设置perms_map为{} caoqianming 2024-06-05 09:31:29 +0800
5b8b262e42 feat: base 在第一次实例化时添加权限标识 caoqianming 2024-06-05 09:27:33 +0800
e656f3e542 feat: edu接口完善 caoqianming 2024-06-05 08:36:30 +0800
8548004690 fix: 用于混料的原料不与车间库存交互 caoqianming 2024-06-04 09:11:06 +0800
4f6610c821 feat: 添加questioncat_name字段 caoqianming 2024-06-03 17:42:08 +0800
db39aa6519 feat: 添加examlist can_attend返回 caoqianming 2024-06-03 17:41:46 +0800
57acaa2e06 feat: examserializer增加返回数据 caoqianming 2024-06-03 10:08:25 +0800
f5428febf3 feat: 增加examdetail serializer caoqianming 2024-06-03 08:40:28 +0800
62b012b690 feat: base 增加get_queryset_custom caoqianming 2024-06-03 08:36:02 +0800
e695543932 doc: CustomListmixin添加注释 caoqianming 2024-05-31 18:59:32 +0800
ac49088efa feat: 暂时去除多余的paper_json字段 caoqianming 2024-05-31 18:26:47 +0800
84eaf31fff feat: examserializer添加字段 caoqianming 2024-05-31 18:26:24 +0800
bbee8defa8 feat: 修改drain字段属性 caoqianming 2024-05-31 16:39:25 +0800
49f3341a01 feat: 添加edu模块 caoqianming 2024-05-31 15:42:15 +0800
0fcecf9a64 feat: base 增加了baseserializermixin caoqianming 2024-05-31 14:12:08 +0800
0473be4d30 feat: 检验撤回test_date在count_notok时直接置空 caoqianming 2024-05-30 10:55:13 +0800
458385c0f6 feat: material增加count_mb字段 caoqianming 2024-05-28 14:29:20 +0800
2ac4f5b04f refector: get_analyse_data_mgroups_duration 增加run_hour返回 caoqianming 2024-05-22 17:11:46 +0800
8627d5f9dc feat: 增加工段数据按任意时间范围分析 caoqianming 2024-05-22 17:04:51 +0800
bf5df19a59 feat: mlog添加两个不合格项目 caoqianming 2024-05-22 14:53:46 +0800
7819aa5b5e feat: stlog的sflog的cascad改一下 caoqianming 2024-05-21 18:18:13 +0800
dd5b88e300 feat: 增加吨熟料电耗计算功能 caoqianming 2024-05-21 18:17:51 +0800
138d202a28 fix: 监测工段是否运行的bug2去除多余逻辑 caoqianming 2024-05-21 17:59:11 +0800
34386ae26d fix: 监测工段是否运行的bug去除多余逻辑 caoqianming 2024-05-21 17:47:18 +0800
5e8bdcf1a8 fix: 监测工段是否运行的bug caoqianming 2024-05-21 17:44:03 +0800
f66cd0f277 feat: base 优化邮件报错频率过高自动屏蔽else未处理 caoqianming 2024-05-21 15:07:13 +0800
a7d7a312f8 feat: base 优化邮件报错频率过高自动屏蔽 caoqianming 2024-05-21 15:00:13 +0800
e8ced88547 feat: 邮件报错频率过高自动屏蔽2 caoqianming 2024-05-21 14:48:28 +0800
5e905519bf feat: 邮件报错频率过高自动屏蔽 caoqianming 2024-05-21 14:46:06 +0800
2ed77b9f0f feat: base task_error携带self.name caoqianming 2024-05-21 13:49:38 +0800
cdfa35851d feat: 算总煤耗时month_s以day_s相加 caoqianming 2024-05-21 11:34:23 +0800
617013f299 fix: sflog展示run_hour caoqianming 2024-05-17 09:16:45 +0800
32c1647b9b feat: sflog展示run_hour caoqianming 2024-05-17 09:13:10 +0800