Commit Graph

828 Commits

Author SHA1 Message Date
潘鸿锋 4023edecf9 提交移交 2024-07-24 14:58:03 +08:00
潘鸿锋 5b87e8e258 Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN 2024-07-24 14:54:26 +08:00
潘鸿锋 a0aca61750 修改移交 2024-07-24 14:54:22 +08:00
李云虎 1e4464ca5e 1212 2024-07-24 14:53:46 +08:00
高飞 6f82435bd2 提交代码 2024-07-24 11:36:38 +08:00
高飞 2551f96820 Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN 2024-07-23 10:23:42 +08:00
高飞 f568af1eac 提交代码 2024-07-23 10:23:32 +08:00
潘鸿锋 b29d14ef34 修改黑名单使用 2024-07-17 17:08:36 +08:00
潘鸿锋 eeded7f163 Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN 2024-07-17 16:36:22 +08:00
潘鸿锋 876afe129c 修改增强HSE检查的功能 2024-07-17 16:36:15 +08:00
高飞 91eb8f4b50 Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN 2024-07-17 14:44:26 +08:00
高飞 1cb6714d67 提交代码 2024-07-17 14:44:18 +08:00
潘鸿锋 b503c6f706 增强HSE检查的功能 2024-07-17 14:35:47 +08:00
高飞 e3286e45d8 Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN 2024-07-16 09:04:07 +08:00
高飞 d529f66c2a 提交代码 2024-07-16 09:03:54 +08:00
汪青 8cbc218584 Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN 2024-07-15 22:38:49 +08:00
汪青 20d7c09645 1 2024-07-15 22:36:48 +08:00
潘鸿锋 d2daed8a91 修改特种设备菜单,和人员资质互通 2024-07-15 16:51:17 +08:00
潘鸿锋 1a2eca2e8e 修改特种设备菜单,和人员资质互通 2024-07-15 16:49:33 +08:00
高飞 23c5d4ecda Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN 2024-07-15 15:11:59 +08:00
高飞 81afc4684a 提交代码 2024-07-15 15:11:50 +08:00
毕文静 2fed6b84af 20240715 修改各项目巡检 2024-07-15 15:06:42 +08:00
高飞 0a8a11e445 Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN 2024-07-10 16:54:30 +08:00
高飞 3ce8cfca6a 提交代码 2024-07-10 16:54:22 +08:00
毕文静 1bc384f0cc 20240710 博晟人员信息同步修改 2024-07-10 16:52:44 +08:00
高飞 d002292e7f Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN 2024-07-10 09:57:53 +08:00
高飞 5da904933b 提交代码 2024-07-10 09:51:09 +08:00
毕文静 2d0b999f82 20240710 修改资料收发文导入 2024-07-10 09:46:40 +08:00
高飞 3852f86332 Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN 2024-07-09 09:15:17 +08:00
高飞 550e142e88 提交代码 2024-07-09 09:15:08 +08:00
潘鸿锋 d281b1d9c1 HSE费用菜单简化及功能优化 2024-07-05 14:11:35 +08:00
潘鸿锋 e1010bbbfa 统一人员资质上传功能,优化风险分级动态管控功能,优化安全管理页面看板 2024-07-04 14:02:05 +08:00
潘鸿锋 cc3b5d045d 统一人员资质上传功能,优化风险分级动态管控功能,优化安全管理页面看板 2024-07-04 14:01:20 +08:00
高飞 62a274ff1f Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN 2024-07-01 14:20:55 +08:00
高飞 bc8e10e38a 提交代码 2024-07-01 14:20:46 +08:00
毕文静 b75907e2e9 20240701 2024-07-01 14:13:22 +08:00
潘鸿锋 b1b3bd291c Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN 2024-07-01 14:10:28 +08:00
潘鸿锋 2ed4cdfee4 1 2024-07-01 14:10:25 +08:00
毕文静 188c6bf3c3 20240701 修改NCR 2024-07-01 14:09:40 +08:00
高飞 7be6e05637 提交代码 2024-06-27 15:47:42 +08:00
高飞 ce331d9d15 Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN 2024-06-27 15:35:47 +08:00
高飞 b09d7f3f70 提交代码 2024-06-27 15:35:38 +08:00
毕文静 4b4f52d903 Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN 2024-06-27 15:32:34 +08:00
毕文静 1904362678 20240627 质量月报 2024-06-27 15:32:24 +08:00
高飞 d0f94051b7 提交代码 2024-06-26 09:14:56 +08:00
高飞 b5ede0cda8 Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN 2024-06-26 09:08:38 +08:00
高飞 744f1293ed 提交代码 2024-06-26 09:08:28 +08:00
汪青 3e595343bf Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN 2024-06-26 01:26:26 +08:00
汪青 2a18ecf8b1 1 2024-06-26 01:26:20 +08:00
汪青 a032064afc 1 2024-06-26 01:24:42 +08:00
毕文静 15252bd16e 20240625 质量月报 2024-06-25 22:54:12 +08:00
高飞 197b55e6bd 提交代码 2024-06-21 16:23:38 +08:00
高飞 c8a1a089ae 提交代码 2024-06-21 15:20:38 +08:00
高飞 b3badb81c3 Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN 2024-06-17 16:38:31 +08:00
高飞 b51431f3eb 提交代码 2024-06-17 16:38:25 +08:00
毕文静 540010b3f0 Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN 2024-06-17 11:22:02 +08:00
毕文静 5a17f5f83c 20240617 工作总结报告导出 2024-06-17 11:21:50 +08:00
高飞 b10ed9acf4 Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN 2024-06-14 16:52:44 +08:00
高飞 2a16ec833a 提交代码 2024-06-14 16:52:37 +08:00
毕文静 c3a6231320 20240614 菜单调整 2024-06-14 15:46:10 +08:00
高飞 0860e6b9b1 提交代码 2024-06-11 09:42:02 +08:00
高飞 65b1104ed7 提交代码 2024-06-11 09:41:32 +08:00
毕文静 1770d114ef 20240607 修改组织机构图 2024-06-07 22:07:03 +08:00
高飞 75689bb431 提交代码 2024-06-06 16:02:33 +08:00
高飞 9bd89a7160 Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN 2024-06-06 16:01:02 +08:00
高飞 1739e39d5b 提交代码 2024-06-06 16:00:57 +08:00
毕文静 e9a982b150 20240606 修改组织机构图 2024-06-06 15:54:03 +08:00
毕文静 5584aee9f6 20240606 修改组织机构图 2024-06-06 15:50:31 +08:00
毕文静 35c2b0350e 20240606 修改组织机构图 2024-06-06 15:48:52 +08:00
毕文静 0c28c16c1d 20240604 各项目巡查汇总 2024-06-04 16:10:14 +08:00
高飞 dd3f0cfafe 提交代码 2024-06-04 15:57:22 +08:00
高飞 35ce598d8c 提交代码 2024-06-04 15:56:34 +08:00
毕文静 efc90ca4d6 20240604 修改各项目巡查汇总 2024-06-04 15:53:02 +08:00
毕文静 d340e503ac 20240604 修改各项目巡查汇总 2024-06-04 15:52:03 +08:00
高飞 363445f49a 提交代码 2024-05-31 16:35:45 +08:00
高飞 c99de0bba7 提交代码 2024-05-31 16:35:01 +08:00
毕文静 864ba2551b 20240531 质量策划 2024-05-31 16:17:04 +08:00
毕文静 7be591cb7c 20240528 质量月报修改 2024-05-28 18:42:12 +08:00
高飞 f36bf41692 Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN 2024-05-24 14:46:52 +08:00
高飞 755e02fc2e 提交代码 2024-05-24 14:46:43 +08:00
毕文静 eacc0a4856 20240524 修改共检通知单 2024-05-24 10:13:35 +08:00
汪青 e56b108443 3 2024-05-24 00:37:21 +08:00
汪青 d9df147da2 提交修改页面 2024-05-24 00:32:52 +08:00
毕文静 57e6dccba7 20240523 质量月报周报样式调整 2024-05-23 16:37:33 +08:00
汪青 d1a6bb49da Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN 2024-05-23 16:02:14 +08:00
汪青 b3c86d48a5 tj 2024-05-23 16:01:18 +08:00
高飞 e79d7d1bf1 提交代码 2024-05-23 10:48:31 +08:00
高飞 54298dd883 提交代码 2024-05-23 10:43:57 +08:00
毕文静 75e3b980cb Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN 2024-05-23 09:41:56 +08:00
毕文静 e1517d9238 20240523 菜单精简 2024-05-23 09:41:47 +08:00
汪青 d851ddcda6 Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN 2024-05-22 17:56:51 +08:00
汪青 73d4798722 3 2024-05-22 17:54:38 +08:00
汪青 ede8dcdb11 1 2024-05-22 17:00:58 +08:00
潘鸿锋 076ea3cbf5 修改月报导出单位居左对齐 2024-05-22 10:26:11 +08:00
毕文静 3de388f25d 20240520 质量月报调整 2024-05-20 16:41:20 +08:00
高飞 8e03a1cff8 Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN 2024-05-20 09:01:12 +08:00
高飞 28d69ef947 提交代码 2024-05-20 09:01:04 +08:00
汪青 46efe986a8 页面提交 2024-05-20 02:22:12 +08:00
毕文静 ccab4e7401 20240517 修改控制点检查检测统计 2024-05-17 15:37:53 +08:00
高飞 5cb44297cb Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN 2024-05-16 17:03:14 +08:00
高飞 ac1f1693e4 提交代码 2024-05-16 17:03:04 +08:00
毕文静 322f23bb3a 20240516 质量月报导出表格调整 2024-05-16 16:23:25 +08:00
高飞 42f0783efa 提交代码 2024-05-15 16:01:09 +08:00
高飞 283b550335 提交代码 2024-05-15 09:16:53 +08:00
高飞 b3f95bfee0 提交代码 2024-05-15 09:04:57 +08:00
高飞 4bf0e3ed0a 提交代码 2024-05-15 09:03:19 +08:00
汪青 eb224b4fbb vs2017版本 2024-05-14 23:36:51 +08:00
汪青 d039fc4960 3 2024-05-14 23:36:11 +08:00
汪青 6772ede7b5 3 2024-05-14 23:35:36 +08:00
汪青 aaa563448c 1 2024-05-14 23:34:27 +08:00
汪青 d49e6ba2a5 1 2024-05-14 23:31:55 +08:00
汪青 2cf45527a1 Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN
# Conflicts:
#	SGGL/FineUIPro.Web/Web.config
#	SGGL/FineUIPro.Web/common/Menu_JDGL.xml
2024-05-14 23:28:44 +08:00
汪青 8c6b348597 1 2024-05-14 23:26:27 +08:00
毕文静 1dde5b74dc 20240514 修改质量月报 2024-05-14 18:09:50 +08:00
毕文静 8fac345874 20240514 修改月报 2024-05-14 18:07:37 +08:00
高飞 9d070167c9 Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN 2024-05-14 09:03:42 +08:00
高飞 3c73800853 提交代码 2024-05-14 09:03:31 +08:00
高飞 c57b03d665 提交代码 2024-05-27 16:39:11 +08:00
毕文静 8b3c544f40 Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN 2024-05-13 22:58:25 +08:00
毕文静 b25a98ad43 20240513 修改控制点检查检测 2024-05-13 22:58:13 +08:00
高飞 7e60bcc85f Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN 2024-05-10 15:47:03 +08:00
高飞 563d401af6 提交代码 2024-05-10 15:46:52 +08:00
毕文静 c4e495aacb 20240509 综合管理标志号修改 2024-05-09 15:18:08 +08:00
高飞 1c23ce814d Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN 2024-05-09 08:45:15 +08:00
高飞 def6fc4422 提交代码 2024-05-09 08:45:07 +08:00
毕文静 6935bffa76 Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN 2024-05-08 21:51:51 +08:00
毕文静 a433d38b6f 20240508 共检通知单复制功能 2024-05-08 21:51:39 +08:00
高飞 0db4b1fe58 Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN 2024-05-07 17:24:46 +08:00
高飞 7d49af5373 提交代码 2024-05-07 17:24:39 +08:00
潘鸿锋 6f2900d546 修改五环月报 2024-05-07 16:55:42 +08:00
潘鸿锋 95cd7d1f2a 修改五环质量月报周报加载速度 2024-05-07 12:39:09 +08:00
高飞 eb718c8146 Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN 2024-05-07 09:45:19 +08:00
高飞 fcca8c7a20 提交代码 2024-05-07 09:45:10 +08:00
汪青 cb28d1b7b7 1 2024-05-07 01:58:42 +08:00
高飞 90f61fc20d 提交代码 2024-05-06 15:57:32 +08:00
高飞 ea6bbd39f8 Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN 2024-05-05 17:12:25 +08:00
高飞 b096b54df5 提交代码 2024-05-05 17:12:18 +08:00
毕文静 3243a2ee9e 20240505 质量导出 2024-05-05 17:08:38 +08:00
高飞 ae9728039b Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN 2024-05-05 09:46:06 +08:00
高飞 2d439f25f0 提交代码 2024-05-05 09:45:56 +08:00
汪青 9a7c5aae14 运行日志调整提交 2024-05-04 00:43:11 +08:00
毕文静 02ee4be036 20240430 质量综合管理导入导出 2024-04-30 23:55:13 +08:00
毕文静 bf4ef2ae67 20240430 质量综合管理导入导出 2024-04-30 23:40:42 +08:00
毕文静 5a47e8145b 20240430 质量综合管理导入导出 2024-04-30 23:33:49 +08:00
高飞 32b733b1ba 提交代码 2024-04-30 13:13:22 +08:00
毕文静 475d273bc5 20240430 修改附件上传条件 2024-04-30 09:29:36 +08:00
毕文静 3b39bf3074 Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN 2024-04-29 19:14:06 +08:00
毕文静 a3e123957d 20240429 修改综合管理导入导出 2024-04-29 19:13:54 +08:00
高飞 7a51a9642f Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN 2024-04-29 09:50:19 +08:00
高飞 dc62762f10 提交代码 2024-04-29 09:50:13 +08:00