zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,517 Commits 4 Branches 2 Tags 363 MiB
Commit Graph

287 Commits

Author SHA1 Message Date
caoqianming 4cc204c594 feat: 设备管理添加一些字段及部分调整 2024-04-23 13:43:16 +08:00
shijing e02c11634d fix:光子添加库存检验撤回 2024-04-22 15:36:06 +08:00
caoqianming 02b03770c3 fix: 工段表单及相关文件表述修改 2024-04-18 14:46:18 +08:00
caoqianming cafe762fd4 feat: 添加mpoint相应功能页面 2024-04-10 10:40:32 +08:00
shijing 8d10e15d12 fix:出入库记录可编辑 2024-03-27 16:53:47 +08:00
shijing 1bce64dbbd 库存统计、采购统计、库存检验统计 2024-03-21 09:41:23 +08:00
caoqianming 8dc5827c15 fix: dataset删除功能 2024-03-19 17:35:31 +08:00
caoqianming c3898769e5 feat: base 添加celery和redis的状态信息 2024-03-15 17:00:56 +08:00
caoqianming ca925eb0a6 fix: 环境和台账相关页面调整 2024-03-13 15:30:10 +08:00
caoqianming 6228ba367a feat: 添加设备分类页面及相应修改 2024-03-13 09:50:39 +08:00
caoqianming 962dae3fde feat: 物料导入功能 2024-03-04 10:47:36 +08:00
caoqianming 7de24e53c7 feat: 库存增加撤销功能 2024-03-04 08:34:46 +08:00
shijing 488e74ccf0 enp新增接口 2024-02-27 13:48:36 +08:00
caoqianming 8629e1bf61 fix: 根据项目code个性化定制的bug 2024-02-26 18:46:18 +08:00
shijing a7616c4d60 接口添加 2024-02-23 11:20:29 +08:00
shijing bd0f46d7e9 事件相关接口的变动 2024-02-20 10:01:48 +08:00
shijing e60973b274 运输页面 2024-02-05 17:02:41 +08:00
caoqianming eeeadd9b98 feat: cems导出接口完善 2024-02-01 14:15:59 +08:00
caoqianming 60e6e154f7 feat: 添加cems监测清单页及相应的接口 2024-01-31 13:20:18 +08:00
shijing 4e468abfd5 成品检验未完成 2024-01-18 14:13:07 +08:00
shijing 88fcbe4518 enp 2024-01-16 15:41:08 +08:00
shijing 5e1990c1a0 picture 2024-01-15 16:10:49 +08:00
shijing 355159e49a 系统基本信息获取 2024-01-10 13:42:55 +08:00
shijing 890d41dfa4 rukujianyan 2024-01-09 09:13:55 +08:00
caoqianming b1bd32cca0 fix: sysconfig修改 2023-12-20 21:56:44 +08:00
shijing 1a45a24d7c 菜单更改 2023-12-19 15:23:24 +08:00
caoqianming 6febb51cdb feat: 日志撤回，目前只修改了7车间 2023-12-18 12:34:00 +08:00
caoqianming b1e2871e03 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2023-12-17 20:35:18 +08:00
caoqianming 7a4e70626d feat: mtask执行时添加配分料数 2023-12-17 20:35:15 +08:00
shijing d0b651745d 6、7、10mlog提交，退火新增交接记录 2023-12-16 12:32:48 +08:00
shijing ba2d621214 库存改动 2023-12-11 13:41:47 +08:00
caoqianming 5ce7ce250f feat: 添加很多新页面 2023-12-01 16:15:25 +08:00
caoqianming 98d2b3d20f feat: wpm添加了其他日志用于录入avg 2023-11-27 13:52:27 +08:00
shijing 0316f42e11 异常修改（未完成） 2023-11-24 17:13:02 +08:00
caoqianming 5d8621cac0 feat: mgroup增加排班规则字段 2023-11-23 16:07:48 +08:00
shijing dd2fc9a455 更改菜单栏 2023-11-23 11:29:51 +08:00
shijing 5d125d0875 daogangjilu 2023-11-21 09:25:43 +08:00
shijing 22cf49a6b3 到岗 2023-11-17 19:20:29 +08:00
shijing f91ae2f5d2 jianyan 2023-11-06 17:43:19 +08:00
shijing c5b6eb4f58 部分检验 2023-11-03 19:24:34 +08:00
shijing 9fb27aa062 10.26日要修改内容以及检验页面 2023-10-27 17:15:36 +08:00
caoqianming 9557074627 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2023-10-25 17:44:46 +08:00
caoqianming c456086901 feat: 出入库页面基本完成 2023-10-25 17:33:39 +08:00
shijing 8837579a5d mtask日志提交 2023-10-25 14:02:08 +08:00
shijing d15cc32e7d 6车间日志提交 2023-10-25 10:27:10 +08:00
shijing e5f3d24205 worktask 2023-10-24 14:55:11 +08:00
shijing ce1e98df96 worktask 2023-10-20 18:03:04 +08:00
caoqianming b65b83dc20 fix: 订单/采购订单相关页面修改 2023-10-19 14:08:31 +08:00
shijing 355dfc5250 生产执行页面 2023-10-17 09:04:17 +08:00
shijing 6bae3795da Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2023-10-13 08:55:21 +08:00
shijing 19d1a3a847 1013 2023-10-13 08:55:15 +08:00
caoqianming 2f30d9c2ee feat: 门禁权限完成 2023-10-10 12:12:39 +08:00
caoqianming 7fa43de6c7 feat: 门禁权限查看与删除 2023-10-09 15:51:25 +08:00
shijing c40364a1f7 光子基础模块 2023-10-09 12:46:15 +08:00
shijing 3db54ec1f3 fix:工段定位 2023-09-13 17:23:55 +08:00
shijing b871efc464 fix:计量设备 2023-09-06 15:48:15 +08:00
shijing 67aa47adb8 添加手机登录方式密码重置添加提醒 2023-08-24 10:27:17 +08:00
shijing e1cadf9a74 密码强度设置 2023-08-24 08:58:27 +08:00
shijing 285703dbad fixed:首页调整 2023-08-18 17:15:53 +08:00
shijing 6078fb329f 工段菜单 2023-07-24 11:30:08 +08:00
shijing d195b260fa feat:能源统计 2023-07-10 15:00:46 +08:00
shijing f14ee6bb95 报表 2023-07-07 17:05:48 +08:00
shijing 89323113d6 fim 2023-07-05 15:23:01 +08:00
shijing 8bc055bf06 提醒配置文案更改，访客选项更改、添加拉送货车辆图片 2023-06-30 16:10:01 +08:00
shijing 12e533fac9 设备、测点、测点集、班组页面 2023-06-30 08:56:51 +08:00
shijing 2e1411ce04 feat: 能管接口等 2023-06-21 17:52:07 +08:00
shijing aea01b7df0 config&配置&原料磨 2023-06-16 16:55:41 +08:00
caoqianming f2e1f450ef feat: 测试报表功能 2023-05-31 15:36:18 +08:00
shijing 5a910c67d1 feat:添加触发人部门，添加事件删除添和关联的作业票详情 2023-05-25 13:53:40 +08:00
caoqianming a80a1ab83e Merge branch 'ehs' into v2 2023-05-11 14:40:39 +08:00
caoqianming b8d49dd356 feat: 人员列表导出 2023-04-20 10:22:52 +08:00
caoqianming 4a48e69248 feat: 增加相关方黑名单功能 2023-04-07 15:07:06 +08:00
shijing 1cfd216468 项目人员变动 2023-03-24 17:11:36 +08:00
shijing 60d6e00f2b 账户管理添加重置密码 2023-03-16 09:43:04 +08:00
shijing 3fb7918c2e 时间添加默认时间放开作业编辑 2023-03-15 09:12:21 +08:00
shijing 3b2482e492 Merge branch 'master' of https://gitee.com/lolicode/scui into v2 2023-03-09 12:27:05 +08:00
caoqianming b14b57a3b8 事件记录导出 2023-02-08 23:19:57 +08:00
caoqianming 51ea19a0f1 rfile pagination 2022-12-22 17:02:07 +08:00
caoqianming db68c140ca ops增加数据库列表 2022-11-14 13:34:01 +08:00
曹前明 cdf60807fa 导出excel 2022-10-20 09:32:57 +08:00
shijing a0d2ca4068 track&line 2022-09-23 17:12:19 +08:00
shijing 2daa22557b 0907 2022-09-08 10:50:50 +07:00
曹前明 f9868d0494 首页修改 2022-09-06 15:51:06 +08:00
shijing 2d3b9fa8fe weizhibiaoji 2022-08-26 17:21:29 +07:00
曹前明 e03113f25a 修改gitignore 2022-08-23 17:16:00 +08:00
曹前明 d709b41bf1 去除文件追踪 2022-08-23 17:15:06 +08:00
shijing 334625e90b logoChange 2022-08-23 15:59:00 +07:00
曹前明 f27fe96fb2 algo修改 2022-08-18 18:10:48 +08:00
曹前明 8e18267da6 增加打卡记录页 2022-08-11 09:44:02 +08:00
曹前明 f79b37eae7 apk上传 2022-08-08 08:50:12 +08:00
曹前明 8ef71cf24e rpm vm 等模块的界面优化 2022-08-03 12:25:27 +08:00
曹前明 50f025455a fix conflict 2022-07-22 14:24:25 +08:00
曹前明 48e83cc4fa 事件页面美化调整 2022-07-22 14:22:42 +08:00
shijing 243e29568e 动火作业工作流测试 2022-07-22 14:02:33 +08:00
shijing ca5084d20a d3&workflow 2022-07-21 16:01:01 +08:00
2309368887@qq.com b3c432c35d 员工岗位修改 2022-07-18 09:59:46 +08:00
曹前明 5d492ff497 页面效果调整 2022-07-18 01:19:44 +08:00
曹前明 0e1c21710a sctable 修改 外加样式调整 2022-07-16 02:07:10 +08:00
shijing af4a575139 workflowstate&rpj 2022-07-15 12:44:01 +08:00
shijing e80dcecc39 rparty 2022-07-15 08:46:01 +08:00
shijing 490c0e489d ticket&component 2022-07-14 09:02:15 +08:00
shijing b2d50e536a Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-12 13:52:08 +08:00
shijing 9ce7a254bd 0712 2022-07-12 13:52:02 +08:00
2309368887@qq.com 32e3b828b9 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-12 11:00:58 +08:00
2309368887@qq.com 8ebf1d4e31 gongdan 2022-07-12 11:00:46 +08:00
shijing 0231e6ce32 thirdlogs&blt 2022-07-11 17:01:43 +08:00
shijing 01084c4f5b Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-08 17:11:51 +08:00
shijing 54ea10290c personmove 2022-07-08 17:11:45 +08:00
2309368887@qq.com f026024b5f jibenxinxi 2022-07-08 16:30:51 +08:00
shijing dec05c1907 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-07 14:07:40 +08:00
shijing 773eeaa0dd mapcontroller&userdetail 2022-07-07 14:07:32 +08:00
2309368887@qq.com ebcd31833a wodeshijian 2022-07-05 14:13:57 +08:00
2309368887@qq.com 6de230462d xialashijian 2022-07-05 09:14:57 +08:00
shijing 9c88f3f5fb ecm.js 2022-07-04 17:22:12 +08:00
2309368887@qq.com a2204bb4c4 chuliren 2022-07-04 17:18:53 +08:00
2309368887@qq.com 3eaeef63b4 shijian 2022-07-04 13:44:00 +08:00
2309368887@qq.com 960e42f359 ququanxian 2022-07-01 15:44:48 +08:00
shijing b33043b230 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-01 09:10:43 +08:00
shijing ca895ffa52 audio 2022-07-01 09:10:35 +08:00
2309368887@qq.com 9d72def8f1 quyu 2022-07-01 09:09:28 +08:00
2309368887@qq.com 8c5306dc09 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-06-29 10:46:31 +08:00
2309368887@qq.com b86626de20 login 2022-06-29 10:46:22 +08:00
shijing bd2cf50cfa conftotxt 2022-06-28 13:12:00 +08:00
shijing d55a6c1070 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-06-25 17:23:07 +08:00
shijing 68bffb0d14 area 2022-06-25 17:23:00 +08:00
2309368887@qq.com 25f000b3e1 donghuozuoye 2022-06-25 17:22:11 +08:00
2309368887@qq.com 25e9acae47 zuoye 2022-06-24 09:18:18 +08:00
2309368887@qq.com 2039b52b40 zuoyetijiao 2022-06-23 10:04:31 +08:00
2309368887@qq.com 3ae7648954 zuoye 2022-06-23 09:56:25 +08:00
2309368887@qq.com 46b34704d5 zuoye 2022-06-23 09:51:06 +08:00
shijing 1ac0d23016 06222 2022-06-22 16:02:49 +08:00
shijing a0c61a83da woekflow 2022-06-21 18:22:18 +08:00
2309368887@qq.com bda5bb2771 xiala 2022-06-21 15:41:19 +08:00
2309368887@qq.com c8b0f21069 xial 2022-06-21 15:38:34 +08:00
shijing ec6dec9089 dict 2022-06-21 13:04:18 +08:00
shijing 9269677410 0620 2022-06-20 17:04:38 +08:00
shijing 6182435ce5 0620 2022-06-20 17:03:16 +08:00
曹前明 2fbba87176 处理冲突 2022-06-20 16:44:03 +08:00
曹前明 0a03736775 事件列表页面 2022-06-20 16:34:11 +08:00
shijing 940782989b dept 2022-06-17 16:59:39 +08:00
曹前明 b3c99be0fa request修改 2022-06-17 11:07:15 +08:00
曹前明 f7a785e40f request 请求修改 2022-06-17 10:46:01 +08:00
曹前明 c034317790 table.js 修改 2022-06-16 16:01:35 +08:00
曹前明 136d023e37 hrm employee index 2022-06-15 17:30:37 +08:00
曹前明 62874af83d ehs init 2022-06-15 14:55:29 +08:00
sc 6760f7b4ba ADD 系统任务中心 2022-06-13 17:11:43 +08:00
sakuya ce87554ea8 UP 导入增加失败演示 2022-05-27 13:34:05 +08:00
sakuya 22546a1e15 ADD 表单验证演示，并且关闭async-validator全局控制台警告 2022-05-26 15:07:23 +08:00
sakuya e0ba5e81dc ADD scFileImport scFileExport 文件导入导出组件 2022-05-25 13:16:50 +08:00
sakuya 92b34eb5b7 重构 scUpload 组件 
增加了scUploadFile 文件上传组件，取消了与资源库选择器的关联
 2022-05-23 18:51:42 +08:00