Commit Graph

371 Commits

Author SHA1 Message Date
caoqianming 07ba19054a 出题乱序 2020-02-18 23:08:33 +08:00
caoqianming 145cb66cf7 小程序解绑问题 2020-02-18 22:46:43 +08:00
caoqianming ceffc702be 资料排序 2020-02-18 18:15:00 +08:00
caoqianming 65d7f8bc8a Merge branch 'master' of https://e.coding.net/ctcdevteam/safesite 2020-02-18 11:43:08 +08:00
caoqianming e6d3e29ca1 上传文件限制 2020-02-18 11:42:29 +08:00
caoqianming f8ebfb22c6 编辑资料部分修改 2020-02-18 09:50:28 +08:00
caoqianming 38be1b2e5f Merge branch 'master' of https://e.coding.net/ctcdevteam/safesite 2020-02-17 23:22:55 +08:00
caoqianming bec5c2fbbf 自动抽屉生成的考试二维码bug 2020-02-17 23:22:37 +08:00
caoqianming 7cef248038 按题型排序 2020-02-17 15:09:55 +08:00
caoqianming 4d03740bc9 按题型排序 2020-02-17 15:00:21 +08:00
caoqianming 22f2538245 get_user_from_username 2020-02-17 14:40:00 +08:00
caoqianming 79a025904d 文件分享优化 2020-02-15 18:34:27 +08:00
caoqianming d11c44e062 国检集团答题活动 2020-02-15 16:52:05 +08:00
caoqianming f5c4b37b00 captcha remake 2020-01-19 23:56:35 +08:00
caoqianming 3b41d17151 trouble scan again 2020-01-19 23:26:23 +08:00
caoqianming ec4bac283b equipmentcheck form add 2020-01-16 17:08:31 +08:00
caoqianming b2748fd560 easyui tree checked menu button 2020-01-13 09:32:03 +08:00
caoqianming 400caabaa9 superadmin can add company and some transfer limit 2020-01-09 12:49:24 +08:00
caoqianming 3c6fce8b75 Merge branch 'master' of https://e.coding.net/ctcdevteam/safesite 2020-01-08 20:45:47 +08:00
caoqianming 1610a9fd9d superadmin new company and transfer user 2020-01-08 20:45:13 +08:00
shilixia 7f25654e58 xiugaiguanlizhidu 2020-01-03 14:27:07 +08:00
shilixia 96d62ed0d1 guanlizhidu 2020-01-03 14:06:47 +08:00
caoqianming 9da58b81aa datashow2 random popup 2019-12-30 16:39:58 +08:00
caoqianming 7cea8fe683 datashow 191230 2019-12-30 10:13:19 +08:00
caoqianming 0301f15381 ignore 2019-12-30 09:16:35 +08:00
caoqianming 38872385da datashow2 2019-12-30 06:28:41 +08:00
caoqianming 94dbdce5cb datashow2 meihua 2019-12-27 14:15:43 +08:00
caoqianming 81ac208003 index datashow2 2019-12-27 10:35:37 +08:00
caoqianming 67932f2f2e datashow2 operation guangling 2019-12-27 10:17:21 +08:00
caoqianming dabf935a79 datashow operation 2019-12-27 01:26:49 +08:00
caoqianming fd54a366f9 menu button complete admin 2019-12-25 21:43:21 +08:00
caoqianming 771259ac43 menu button control complete 2019-12-25 17:37:08 +08:00
caoqianming e6ac039e9d Merge branch 'master' of https://e.coding.net/ctcdevteam/safesite 2019-12-25 17:04:54 +08:00
caoqianming 02987f39ae button control part1 2019-12-25 17:04:44 +08:00
shilixia c1fc602e26 annaiu 2019-12-25 16:54:57 +08:00
shilixia 80dd24a14c xuigaiquanxian2 2019-12-25 13:57:05 +08:00
shilixia 8bda1e3d2c xuigaiquanxian 2019-12-25 13:55:25 +08:00
caoqianming 3453a33f0c button control 2019-12-25 13:39:18 +08:00
caoqianming 9cd9836656 add company menulist bug 2019-12-24 14:00:05 +08:00
caoqianming 8933b14b9c add menu 2019-12-24 09:01:12 +08:00
caoqianming 63646dc011 daoru trouble 2019-12-22 20:49:13 +08:00
caoqianming 4dd7e88f52 Merge branch 'master' of https://e.coding.net/ctcdevteam/safesite 2019-12-22 22:47:24 +08:00
caoqianming d6b8f00585 daoru trouble 2019-12-22 00:46:23 +08:00
shilixia 4d0659c403 责任制度 2019-12-19 14:48:42 +08:00
shilixia 2f83444d7a 责任制度 2019-12-19 14:40:12 +08:00
caoqianming a4a3b20c8a server verify 2019-12-12 17:45:54 +08:00
caoqianming 545fa8bf85 server verify 2019-12-12 17:34:11 +08:00
caoqianming 5c6dcf315f verify wechat 2019-12-11 22:45:32 +08:00
shilixia 08565de0e3 修改在线考试详情 2019-12-11 09:31:30 +08:00
shilixia c2867598d8 在线考试有问题 2019-12-10 16:59:25 +08:00
caoqianming b8885bba8b 作业审批详情显示 2019-12-09 20:54:48 +08:00
caoqianming af48a12425 Merge branch 'master' of https://e.coding.net/ctcdevteam/safesite 2019-12-06 17:36:59 +08:00
caoqianming fec9589d03 operation commit 2019-12-06 17:36:05 +08:00
shilixia 8e82d7a2ba Merge branch 'master' of https://e.coding.net/ctcdevteam/safesite 2019-12-06 16:31:05 +08:00
shilixia 4552945fde 在线考试修改 2019-12-06 16:30:35 +08:00
caoqianming c1f9c9414d Merge branch 'master' of https://e.coding.net/ctcdevteam/safesite 2019-12-05 21:06:30 +08:00
caoqianming 07eae98390 operation spxq 2019-12-05 21:06:12 +08:00
shilixia 1019cd2549 在线考试重新考试 2019-12-05 09:16:52 +08:00
shilixia 65b6a37622 从新pull 2019-12-05 09:02:17 +08:00
shilixia f87b25db35 从新发布考试 2019-12-05 08:46:58 +08:00
caoqianming cde61132f2 file type xianzhi 2019-12-04 20:55:17 +08:00
caoqianming 15ff36c244 equipment daoru 2019-12-04 20:52:25 +08:00
caoqianming d99b375c4d Merge branch 'master' of https://e.coding.net/ctcdevteam/safesite 2019-12-04 18:01:23 +08:00
caoqianming 103b0ae82b equipment import;observe noread;correct bmzg 2019-12-04 18:01:07 +08:00
caoqianming a8d06aeaf4 合并审批人3 2019-12-03 00:19:31 +08:00
caoqianming f521f49e3a Merge branch 'master' of https://e.coding.net/ctcdevteam/safesite 2019-12-03 00:16:35 +08:00
caoqianming bf2f990a72 合并审批人2 2019-12-03 00:15:58 +08:00
caoqianming d06de9eb39 合并跳过审批人 2019-12-02 23:58:01 +08:00
caoqianming 18190d1100 operation check complete2 2019-12-02 21:43:10 +08:00
caoqianming 0848977438 operation check complete 2019-12-02 21:08:02 +08:00
shilixia b388dce777 Merge branch 'master' of https://e.coding.net/ctcdevteam/safesite 2019-12-02 10:39:21 +08:00
shilixia f55f840316 dashuju 2019-12-02 10:38:27 +08:00
shilixia dcff299c75 ziduan 2019-12-02 09:00:43 +08:00
caoqianming 4a1af9c8d6 operation check 2019-12-02 08:51:54 +08:00
caoqianming 2796a986a6 作业审批通知 2019-11-27 00:51:58 +08:00
caoqianming a164dbce6a operation notice 2019-11-27 00:27:04 +08:00
caoqianming 08522c858b riskacttask start 2019-11-26 23:48:43 +08:00
caoqianming 61d6faf297 operation notification jdmc 2019-11-25 18:15:51 +08:00
caoqianming 9154ada5a3 operation notification 2019-11-25 17:43:07 +08:00
caoqianming 55e2aeedf7 Merge branch 'master' of https://e.coding.net/ctcdevteam/safesite 2019-11-25 16:56:55 +08:00
caoqianming 55a77bb643 personal train list:duration,examtest 2019-11-25 16:56:20 +08:00
shilixia 67d1e36e3b dd 2019-11-25 11:57:40 +08:00
shilixia 3f79b3dbdc xiugai 2019-11-25 11:54:43 +08:00
caoqianming f85581222f password correct 2019-11-24 01:14:05 +08:00
caoqianming 900e84e785 add user password encrapt 2019-11-22 22:51:33 +08:00
caoqianming c552919c62 login safety 2019-11-22 17:49:08 +08:00
shilixia 2e7ae132ad kaoshi2 2019-11-20 14:37:24 +08:00
shilixia e8b6e827eb kaoshi 2019-11-20 14:33:29 +08:00
caoqianming 306a5d8497 password encrapt daoru 2019-11-20 14:19:51 +08:00
caoqianming 18362bbeec password encrapt 2019-11-19 21:02:18 +08:00
caoqianming 7fb85edf6f epassword model 2019-11-18 23:34:18 +08:00
caoqianming e63749c8ed password encrpt 2019-11-18 19:32:59 +08:00
caoqianming 9ae0918a59 server1118 2019-11-18 10:32:34 +08:00
caoqianming 27e4219cf9 requirements.txt 2019-11-14 13:56:05 +08:00
caoqianming 282090a8fc export sbs 2019-11-14 11:23:53 +08:00
caoqianming cc3ff02701 index 2019-11-10 20:55:32 +08:00
shilixia 11b09e4288 cdjhkf 2019-11-07 14:16:02 +08:00
shilixia add6f8b46c shanxingxiugai 2019-11-07 10:42:03 +08:00
caoqianming fdc649f0be Merge branch 'master' of 10.7.100.160:/job/safesite 2019-11-06 17:42:13 +08:00
caoqianming 98a14eb044 登陆修改 2019-11-06 17:41:57 +08:00
shilixia 4efd33677d Merge branch 'master' of 10.7.100.160:/job/safesite 2019-11-06 15:32:43 +08:00
shilixia 9fe3fda052 peixun2 2019-11-06 15:32:19 +08:00
shilixia a288c876cf peixun 2019-11-06 10:04:11 +08:00
caoqianming 37799315bd zuoye shenpi ren 2019-11-05 18:48:23 +08:00
caoqianming 84e06bdc45 zuoyexiuz 2019-11-05 16:33:10 +08:00
caoqianming b54cae64a6 zuoyelog 2019-11-05 16:31:02 +08:00
shilixia b35ec7ea8f groupxiugai 2019-11-05 15:35:18 +08:00
shilixia b0ce0da639 xiugai2 2019-11-05 15:10:00 +08:00
caoqianming 747ea9cf05 Merge branch 'master' of 10.7.100.160:/job/safesite 2019-11-04 16:56:44 +08:00
caoqianming a6808ea7f0 spjdedit 2019-11-04 16:55:29 +08:00
wcharles 98b0542ec1 add main login pulled 2019-11-04 16:40:53 +08:00
shilixia 3bc9705961 peixunxiugai 2019-11-04 16:31:57 +08:00
shilixia 136e76775a 'nowedit' 2019-11-04 16:20:01 +08:00
shilixia eab3f3d977 peixun 2019-11-04 16:00:48 +08:00
wcharles 0ca9c2a7e9 add main login 2019-11-01 10:46:44 +08:00
caoqianming d29708426f login one user,log 2019-10-30 16:14:48 +08:00
caoqianming 9c0d91c148 partment del 2019-10-28 08:14:31 +08:00
caoqianming b0b32dd23e groupmodel2 2019-10-25 11:29:47 +08:00
caoqianming bffd4441c1 group model 2019-10-24 15:19:04 +08:00
caoqianming c4112bad4f group index 岗位 2019-10-23 17:32:10 +08:00
caoqianming 1d31462c8d Merge branch 'master' of 10.7.100.160:/job/safesite 2019-10-21 10:45:41 +08:00
caoqianming e63737a9fa groups1 2019-10-21 10:28:58 +08:00
shilixia 3da5b1851e nianxian 2019-10-18 17:18:01 +08:00
shilixia cf6aedda8f urlxiugai 2019-10-18 16:53:50 +08:00
shilixia ba9b02c9d1 xiugai 2019-10-18 16:51:05 +08:00
caoqianming 56788e689f 风险分析图 2019-10-18 16:44:35 +08:00
shilixia b698651baa xingweitongji 2019-10-18 16:37:19 +08:00
caoqianming 1f70f6e47f 风险分析图 2019-10-18 16:36:15 +08:00
caoqianming 929d0bffca groupadmin1 2019-10-17 15:02:30 +08:00
caoqianming 5c3d5b204f Merge branch 'master' of 10.7.100.160:/job/safesite 2019-10-16 15:48:52 +08:00
caoqianming 780daadbfa 作业爬虫 2019-10-16 15:36:07 +08:00
wcharles 05e78a2a98 Merge branch 'master' of 10.7.100.160:/job/safesite 2019-10-15 17:38:04 +08:00
caoqianming 277fc87699 tmdaoru 2019-10-12 17:56:36 +08:00
caoqianming 0ccd5a69dc xx 2019-10-12 09:35:59 +08:00
caoqianming 26c4d25cbc 题目导入 2019-10-12 09:34:13 +08:00
shilixia 1b0b31bae6 shouye 2019-10-12 08:54:46 +08:00
shilixia 15ff79c60a Merge branch 'master' of 10.7.100.160:/job/safesite 2019-10-10 17:10:21 +08:00
shilixia 7e6288b5aa jiexi 2019-10-10 17:10:02 +08:00
caoqianming 023709fd9b Merge branch 'master' of 10.7.100.160:/job/safesite 2019-10-10 16:02:30 +08:00
caoqianming af81fbf1d0 作业审批 2019-10-10 16:02:06 +08:00
shilixia 44fe311c69 kaoshixiangqing 2019-10-10 15:49:45 +08:00
wcharles 865579f8d2 login with captcha 2019-10-09 14:21:19 +08:00
wcharles 98003e547b login 2019-10-09 08:35:35 +08:00
caoqianming 47310b5d5f 转交审批 2019-10-08 23:27:56 +08:00
caoqianming 21be18b1a4 zuoye 2019-10-08 21:29:55 +08:00
shilixia 08e42ae7ad sc 2019-10-08 09:53:16 +08:00
shilixia a6c7571ccc shangchuan 2019-10-08 09:41:00 +08:00
caoqianming 783a0cb6ce xx 2019-09-27 17:54:26 +08:00
caoqianming fcea021379 隐患、建议布茨纳 2019-09-25 20:18:41 +08:00
caoqianming e4d32db4d2 二维码函数和公司基本信息 2019-09-21 09:25:50 +08:00
shilixia f0b6b728a7 Merge branch 'master' of 10.7.100.160:/job/safesite 2019-09-20 10:16:00 +08:00
shilixia 970060a2ff xinbiao 2019-09-20 10:15:49 +08:00
caoqianming d91c0681a7 Merge branch 'master' of 10.7.100.160:/job/safesite 2019-09-19 22:08:10 +08:00
caoqianming 96459324d6 区域二维码 2019-09-19 22:07:25 +08:00
shilixia cf8a235156 law 2019-09-19 16:26:47 +08:00
shilixia 08d344c2b5 jy 2019-09-19 14:34:13 +08:00
caoqianming 113b7abf08 gc 2019-09-19 14:19:18 +08:00
caoqianming 3e7002c37f 法律法规、集团端 2019-09-18 21:22:49 +08:00
caoqianming 4df053163e Merge branch 'master' of 10.7.100.160:/job/safesite 2019-09-18 15:54:27 +08:00
caoqianming f2724c7806 修正区域删除颜色存在的错误 2019-09-18 15:54:06 +08:00
shilixia 0ad24c67c5 Merge branch 'master' of 10.7.100.160:/job/safesite 2019-09-18 15:25:15 +08:00
shilixia 05b1bfc14e falv 2019-09-18 15:24:15 +08:00
caoqianming f8bb4c1ace 培训导出企业信息 2019-09-17 22:33:38 +08:00
caoqianming a6e67b8106 Merge branch 'master' of 10.7.100.160:/job/safesite 2019-09-17 14:35:35 +08:00
caoqianming dfeedbd5f8 login 2019-09-17 14:35:19 +08:00
shilixia af25ad4095 Merge branch 'master' of 10.7.100.160:/job/safesite 2019-09-11 18:16:34 +08:00
shilixia 30520ea494 zxjy 2019-09-11 18:16:15 +08:00
caoqianming 5ce542b6f1 企业信息ajaxsubmit 2019-09-11 17:20:42 +08:00
wcharles c4bbbbfef4 first companyinfo 2019-09-10 09:54:48 +08:00
caoqianming a6f8ccb384 登陆设置 2019-09-09 16:45:13 +08:00
caoqianming 14310e31a3 lastcommit 2019-09-09 12:07:26 +08:00