Commit Graph

1291 Commits

Author SHA1 Message Date
gaofei 8e73412eb6 0414-001 2022-04-14 11:15:34 +08:00
杨红卫 fd90925333 项目首页 项目切换下拉框事件修改 2022-04-09 10:14:04 +08:00
杨红卫 3e4410437c 修改人工时校正方法 2022-04-01 23:00:24 +08:00
gaofei 274010da92 Merge branch 'master' of https://gitee.com/frane-yang/SGGL_CWCEC 2022-03-26 18:08:11 +08:00
gaofei 39dd9da9a8 0326-001-gaofei 2022-03-26 18:07:57 +08:00
杨红卫 31691b2d1f Merge branch 'master' of https://gitee.com/frane-yang/SGGL_CWCEC 2022-03-25 14:57:22 +08:00
杨红卫 84d4439f84 20220325 列表翻页 2022-03-25 14:57:05 +08:00
gaofei b46c3f0cf8 0324-001-gaofei 2022-03-24 14:59:58 +08:00
gaofei f372db34a0 Merge branch 'master' of https://gitee.com/frane-yang/SGGL_CWCEC 2022-03-23 09:56:00 +08:00
gaofei 0040e3812b 0323-001-gaofei 2022-03-23 09:55:32 +08:00
杨红卫 afe93d04b9 20220320 修改项目单位同步实名制 根据设置是否同步标识 2022-03-20 22:46:04 +08:00
gaofei 1ca2236fc9 0316-002-gaofei 2022-03-16 15:27:47 +08:00
gaofei ab09cf21d2 Merge branch 'master' of https://gitee.com/frane-yang/SGGL_CWCEC 2022-03-16 14:17:45 +08:00
gaofei 57788cdb3d 0316-001-gaofei 2022-03-16 14:16:55 +08:00
杨红卫 65dfdb13a9 20220304 考勤导入、接口修改 2022-03-04 16:15:21 +08:00
杨红卫 5dd16e8bf7 20220301 考勤导入优化 2022-03-01 10:38:44 +08:00
gaofei 7157212b10 Merge branch 'master' of https://gitee.com/frane-yang/SGGL_CWCEC 2022-02-25 10:17:00 +08:00
gaofei 84b15f0d8b 0225-001-gaofei 2022-02-25 10:16:00 +08:00
杨红卫 d2562d6ae0 20220220 实名制退场、更新上报优化 2022-02-20 11:43:11 +08:00
杨红卫 e2e11493d9 20220216 人员照片保存时加判断 2022-02-16 10:18:27 +08:00
gaofei 74f7cd5c17 0118-gaofei 2022-01-18 09:48:03 +08:00
gaofei d02cd7ff74 0110-gaofei 2022-01-10 10:55:18 +08:00
杨红卫 93996822ec 20211229与博晟数据对接接口优化 2021-12-29 18:38:36 +08:00
gaofei 3bda153d7c 1229-gaofei 2021-12-29 15:03:49 +08:00
gaofei 0bf6d1efd7 1221-002-gaofei 2021-12-21 16:10:02 +08:00
杨红卫 f1d0559ab0 20211220 实名制获取token方法用系统时间-4分钟 2021-12-20 10:32:46 +08:00
杨红卫 eb96e7fcba 20211216 项目实名制 2021-12-16 17:09:14 +08:00
gaofei fd78c38d0d 1214-gaofei 2021-12-14 09:01:00 +08:00
gaofei 880bbecb52 1213-gaofei 2021-12-13 12:31:03 +08:00
gaofei 92fec76ac4 1210-gaofei 2021-12-10 09:56:20 +08:00
gaofei f74ab99b9f 1208-003-gaofei 2021-12-08 10:35:36 +08:00
gaofei aaf9629b87 Merge branch 'master' of https://gitee.com/frane-yang/SGGL_CWCEC 2021-12-08 10:28:47 +08:00
gaofei 92c5facf4d 1208-002-gaofei 2021-12-08 10:28:36 +08:00
杨红卫 fa779f17b2 20211208 定时器优化,当日人数定时校正方法开放 2021-12-08 10:22:41 +08:00
gaofei a0c757ae2f 1208-gaofei 2021-12-08 09:12:33 +08:00
杨红卫 c55a180a8a 20211207 从集团获取安全公共资源功能添加 2021-12-07 18:42:00 +08:00
杨红卫 899a39776a 20211207 新增与博晟培训考试对接写入数据接口以及页面数据呈现 2021-12-07 16:34:32 +08:00
gaofei 3d3e34606e 1203-002 2021-12-03 17:30:38 +08:00
gaofei 69451f8610 1203-gaofei 2021-12-03 17:27:46 +08:00
杨红卫 84ad1490c6 Merge branch 'master' of https://gitee.com/frane-yang/SGGL_CWCEC 2021-12-03 11:32:27 +08:00
杨红卫 00cd27c308 20211203 集团安全检查及报表、企业检查数据迁移脚本 2021-12-03 11:30:54 +08:00
gaofei ffe2ea7fcc 1202-003-gaofei 2021-12-02 16:13:37 +08:00
gaofei 4b4f6e4389 1 2021-12-02 15:05:33 +08:00
gaofei c091208a47 1202-002-gaofei 2021-12-02 14:59:15 +08:00
杨红卫 27591ca3e8 20211202 代码整理 材料系统webserive重新引用 2021-12-02 14:50:25 +08:00
gaofei ce8adb5c7b Merge branch 'master' of https://gitee.com/frane-yang/SGGL_CWCEC 2021-12-02 10:53:07 +08:00
gaofei 997374d7e8 1202-gaofei 2021-12-02 10:52:43 +08:00
杨红卫 39cd93e266 20211202 与集团安全信息报表及检查对接接口实现 2021-12-02 10:44:15 +08:00
杨红卫 8932645f54 20211130 与材料系统对接接口打通 2021-11-30 10:17:46 +08:00
杨红卫 7e0564dde6 20211125人员照片更改时 置空同步时间 2021-11-25 15:07:09 +08:00
杨红卫 a0b59c0a6f 20211125 2021-11-25 14:37:57 +08:00
gaofei 2829654a33 1125-gaofei-首页只显示未关闭的关键事项数据 2021-11-25 13:15:13 +08:00
gaofei 77a1316da5 1123-003-gaofei-优化焊接首页 2021-11-23 10:51:03 +08:00
gaofei e9cc8d9914 1123-002-gaofei-开放焊接功能 2021-11-23 10:21:37 +08:00
gaofei 3918b608b6 1123-gaofei-开放试车管理功能模块 2021-11-23 10:16:42 +08:00
gaofei ed3517280a 1118-gaofei-焊接首页 2021-11-18 10:34:25 +08:00
杨红卫 0aa91d6a8f Merge branch 'master' of https://gitee.com/frane-yang/SGGL_CWCEC 2021-11-11 14:38:36 +08:00
杨红卫 10ce5c40ac 20211111 监控页面还原 2021-11-11 14:38:02 +08:00
gaofei 659cb4cbaa Merge branch 'master' of https://gitee.com/frane-yang/SGGL_CWCEC 2021-11-11 10:30:57 +08:00
gaofei 9d1a4e20b1 1111-002-gaofei 2021-11-11 10:30:43 +08:00
杨红卫 56662ce2c8 20211111整合监控视频页面 2021-11-11 10:27:26 +08:00
杨红卫 b614e3b4db 20211111整合监控视频页面到施工平台 2021-11-11 10:24:56 +08:00
gaofei 1f1d11cb42 1111-gaofei 2021-11-11 09:49:31 +08:00
gaofei d9ca7b3bf7 1109-gaofei 2021-11-09 10:29:14 +08:00
gaofei 97904d080f 1102-gaofei 2021-11-02 13:32:31 +08:00
gaofei d830ad232c Merge branch 'master' of https://gitee.com/frane-yang/SGGL_CWCEC 2021-10-28 18:25:07 +08:00
gaofei 537a0e8894 1028-gaofei 2021-10-28 18:24:30 +08:00
杨红卫 d348939699 20211028 安全首页巡检集合静态初始处理后再取值 2021-10-28 18:10:38 +08:00
gaofei 6b41214a49 1022-002-gaofei 2021-10-22 10:55:10 +08:00
gaofei 282cb7bd08 1022-gaofei 2021-10-22 10:10:15 +08:00
gaofei 36c572af6d 1019-003-gaofei 2021-10-19 17:53:35 +08:00
gaofei b6e254bfca 1019-003-gaofei 2021-10-19 17:50:34 +08:00
杨红卫 ee6a8bd998 Merge branch 'master' of https://gitee.com/frane-yang/SGGL_CWCEC 2021-10-19 17:42:34 +08:00
杨红卫 2cb980f348 20211019 2021-10-19 17:42:21 +08:00
gaofei fbe44ac308 1019-002-gaofei 2021-10-19 13:52:51 +08:00
gaofei b0dda3b8b2 1019-gaofei 2021-10-19 12:24:38 +08:00
杨红卫 9cdd25128d 20211013 2021-10-13 17:42:59 +08:00
杨红卫 f786812569 20211011考勤首页去重 2021-10-11 22:01:12 +08:00
杨红卫 f1c846da8a 20211011 考勤限制业主监理推送 2021-10-11 09:10:19 +08:00
gaofei a7934da88a 0930-gafei 2021-09-30 10:37:37 +08:00
gaofei cb7884ea5d 0929-002 2021-09-29 21:27:57 +08:00
gaofei a19f1b28cd Merge branch 'master' of https://gitee.com/frane-yang/SGGL_CWCEC 2021-09-29 16:07:47 +08:00
gaofei 38b94ff3b2 0929-gaofei 2021-09-29 16:07:32 +08:00
杨红卫 eb31f58346 20210928 2021-09-28 16:14:21 +08:00
gaofei 82af498870 0923-04-gaofei 2021-09-23 17:31:16 +08:00
gaofei b538f1eb58 0923-03-gaofei 2021-09-23 15:48:02 +08:00
gaofei 0bfbeeb079 0923-gaofei 2021-09-23 14:46:45 +08:00
gaofei 56e48d5d6b 0923-gaofei 2021-09-23 14:45:21 +08:00
杨红卫 2689ea392b 20210919 实名制同步身份证有效期 永久 2021-09-19 09:04:08 +08:00
杨红卫 18068677f0 20210918 2021-09-18 14:10:25 +08:00
杨红卫 04b926db45 20210918 单点登陆修改 2021-09-18 13:26:51 +08:00
gaofei c0798d8358 Merge branch 'master' of https://gitee.com/frane-yang/SGGL_CWCEC 2021-09-17 16:05:01 +08:00
gaofei 938713a942 0917-005-gaofei 2021-09-17 16:04:52 +08:00
杨红卫 9ec418ed88 20210917 2021-09-17 15:32:02 +08:00
杨红卫 44caaa879b Merge branch 'master' of https://gitee.com/frane-yang/SGGL_CWCEC 2021-09-17 15:22:58 +08:00
杨红卫 738a601386 20210917 与五环OA单点登陆 2021-09-17 15:22:38 +08:00
gaofei b583bf47ce 0917-002-gaofei 2021-09-17 11:44:05 +08:00
杨红卫 01cef410fd 20210917 2021-09-17 11:05:31 +08:00
gaofei 10562ffb0d 0917-gaofei 2021-09-17 10:51:44 +08:00
gaofei 38d92fe96a 0915-002-gaofei 2021-09-15 16:28:22 +08:00
gaofei 4ef1799fec 0915-002-gaofei 2021-09-15 15:05:16 +08:00
gaofei c330245a88 0915-gaofei 2021-09-15 14:50:52 +08:00
杨红卫 176d79aa61 20210915新增按身份证号码删除 实名制考勤记录 2021-09-15 09:11:58 +08:00
杨红卫 0543d5bfbc 20210909 2021-09-09 16:46:34 +08:00
杨红卫 41dafe1113 20210908 实名制推送日志增加推送内容、返回数据字段 2021-09-08 19:13:25 +08:00
杨红卫 9245f516f4 20210908 离职人员不上传实名制 2021-09-08 15:15:08 +08:00
杨红卫 5ccec3cd9f 20210907 2021-09-07 11:10:20 +08:00
杨红卫 8add136b66 20210906 2021-09-06 16:46:05 +08:00
杨红卫 4955bbcba0 20210906 2021-09-06 12:27:07 +08:00
杨红卫 8ce6070be5 20210830 2021-08-30 21:49:56 +08:00
杨红卫 969c81925b 20210829 2021-08-29 12:41:15 +08:00
gaofei c2b5344d0f 0827-1826 2021-08-27 18:26:31 +08:00
杨红卫 d4905aac01 2021-826 2021-08-26 16:55:27 +08:00
杨红卫 d21c25aabb 20210826 2021-08-26 11:26:04 +08:00
杨红卫 21b3fd1b44 20210821 2021-08-21 10:53:31 +08:00
杨红卫 64655b051c 20210820 2021-08-20 10:00:34 +08:00
杨红卫 f7f5a70066 20210819 2021-08-19 18:41:33 +08:00
杨红卫 04202b8c1c 20210819单位人员考勤未知人员查询方法修改 2021-08-19 18:33:20 +08:00
gaofei 6efc9d1c61 0818-1555 2021-08-18 15:55:24 +08:00
gaofei a3031f2003 0818-1400 2021-08-18 14:00:24 +08:00
杨红卫 33835b762e 20210817人员批量离场修改 2021-08-17 20:04:45 +08:00
杨红卫 9b4b36afdd 20210807 2021-08-17 11:01:22 +08:00
杨红卫 dba64994c3 20210816 2021-08-16 17:41:00 +08:00
杨红卫 dfd370a9b0 项目人员 参与项目加在岗判断 2021-08-13 21:10:25 +08:00
杨红卫 29c4db2384 20210813 2021-08-13 14:49:45 +08:00
杨红卫 bb5cd0ef3f 2021-08-13门禁对接接口 字段是否启用取值修改 2021-08-13 14:13:05 +08:00
gaofei d8dff88c39 0813 2021-08-13 11:15:59 +08:00
杨红卫 43acc57060 20210813 对接门禁接口调整 2021-08-13 10:48:08 +08:00
杨红卫 bacbffb714 20210812 2021-08-12 10:45:31 +08:00
杨红卫 16bd4f1767 20210726 2021-07-26 11:08:59 +08:00
杨红卫 7700a66999 20210720 2021-07-20 16:02:27 +08:00
杨红卫 b3d23a52d9 20210719 2021-07-19 10:41:58 +08:00
杨红卫 4f2057ccd3 20210714 2021-07-14 19:57:50 +08:00
杨红卫 ff100e0b7b 20210709 2021-07-09 16:47:06 +08:00
杨红卫 e092c6cfb0 20210708 2021-07-08 20:34:29 +08:00
杨红卫 7f785d6423 20210706 2021-07-06 15:16:17 +08:00
杨红卫 957d206c2b 20210630 2021-06-30 16:00:32 +08:00
杨红卫 8bc3189f9f 20210621 2021-06-21 14:10:40 +08:00
杨红卫 65a719e331 20210618 2021-06-18 20:37:07 +08:00
杨红卫 e7cb804684 20210520 2021-05-20 17:16:01 +08:00
杨红卫 f901e87a6e 20210430 2021-04-30 10:28:37 +08:00