Commit Graph

449 Commits

Author SHA1 Message Date
shijing 01d41a5bf0 buttonControl 2022-04-26 15:08:16 +08:00
shijing 5aa0fed51b Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-04-25 13:58:52 +08:00
shijing dbed58cbf6 massageBig 2022-04-25 13:58:44 +08:00
caoqianming 268b23be3a 0.42-0.38 2022-04-24 12:38:49 +08:00
shijing a90cfc8077 0424 2022-04-24 09:24:06 +08:00
shijing 20654838fe 0422 2022-04-22 15:34:57 +08:00
shijing f74be9578a 0422 2022-04-22 13:43:23 +08:00
shijing 0a6a9ed729 0421 2022-04-21 15:23:10 +08:00
shijing 48d7ebb85c 0421 2022-04-21 14:54:43 +08:00
shijing adab213a45 0421 2022-04-21 14:11:55 +08:00
shijing 74a9b44660 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-04-21 14:08:34 +08:00
shijing a701296baa 0421 2022-04-21 14:08:25 +08:00
caoqianming f92af5df27 增加检验记录导出功能 2022-04-21 11:32:12 +08:00
shijing 72c97071fe pageToPDF 2022-04-07 16:26:41 +08:00
shijing 0e9624281f pageHeghtAdjust 2022-04-06 16:53:58 +08:00
shijing 755c0abb35 firstExport 2022-04-06 15:04:34 +08:00
shijing e5ee1481de refreshToken 2022-03-31 15:18:51 +08:00
shijing e9cdb49787 yemianduobankuaiyangshixiugai 2022-03-31 11:18:29 +08:00
shijing 8c75eeff09 PPT修改 2022-03-30 14:44:41 +08:00
shijing b288a95f3c 验证PPT1 2022-03-30 11:02:38 +08:00
shijing 6a284411e6 0329 2022-03-29 09:15:14 +08:00
shijing 8b7481fb43 0329 2022-03-29 09:02:12 +08:00
shijing ad16a963e4 0329 2022-03-29 08:45:12 +08:00
shijing 194b0f9731 0328 2022-03-28 09:03:38 +08:00
shijing 508803abcf coding入场检验 2022-03-25 17:00:11 +08:00
shijing db327376fc coding261 2022-03-25 10:20:35 +08:00
shijing 5af6787e30 coding280 2022-03-24 15:59:41 +08:00
shijing 886cba24dc 0324 2022-03-24 15:10:26 +08:00
shijing b02dc30eb3 cording0324 2022-03-24 14:01:21 +08:00
shijing c0d96cb735 warningchange 2022-03-23 11:01:45 +08:00
shijing b3e2dbc84f warningchange 2022-03-23 11:00:00 +08:00
caoqianming 48f0634ad4 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-03-17 13:57:07 +08:00
caoqianming cd889bd50c 修改router 权限标识 2022-03-17 13:56:42 +08:00
shilixia 0a83ad7d96 xiugai 2022-03-17 13:30:47 +08:00
shilixia 943e93f685 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-03-17 13:05:26 +08:00
shilixia 4267885e71 xigai 2022-03-17 13:05:15 +08:00
shijing e6b6144a72 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-03-17 10:52:37 +08:00
shijing 34377eef94 bigScreen 2022-03-17 10:52:27 +08:00
shilixia 289a7a2335 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-03-16 16:38:42 +08:00
shilixia f8fab96821 junjian 2022-03-16 16:38:24 +08:00
shijing 76fdd2eea6 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-03-15 10:29:30 +08:00
shijing 0851e0cc84 bigScreenData 2022-03-15 10:29:23 +08:00
shilixia 4e6312e3e0 ceshi 2022-03-15 09:27:38 +08:00
shilixia 9c8cfd4731 xiaoshouxingqing 2022-03-11 15:28:37 +08:00
shilixia 469e95594b tijiao 2022-03-11 15:12:46 +08:00
shilixia 34e31a762e Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-03-11 13:19:14 +08:00
shilixia caacd460dc tijiao 2022-03-11 13:19:03 +08:00
shijing d78e871233 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-03-10 09:15:21 +08:00
shijing a388a1ad3d firstTest 2022-03-10 09:15:13 +08:00
shilixia b787f1cb8a tijiaosdji 2022-03-10 09:11:12 +08:00
shilixia e3020c5ea3 xiugai 2022-03-10 09:09:30 +08:00
shijing 5dce8ae662 gantt 2022-03-09 16:27:18 +08:00
shijing 8643475e68 bigScreenAdjustandContractNumber 2022-03-09 15:09:47 +08:00
shijing 8272368813 dashbord 2022-03-03 14:39:18 +08:00
shijing 750e751513 yemianqunaxiananniutinajia 2022-03-02 14:40:42 +08:00
shijing 544478dc0b yemianqunaxiananniutinajia 2022-03-02 13:37:44 +08:00
shijing 8dcaec8003 yemianqunaxiananniutinajia 2022-03-02 11:04:24 +08:00
shijing 72ec880a45 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-03-02 09:54:02 +08:00
shijing 7bfc78bc07 yemianqunaxiananniutinajia 2022-03-02 09:53:54 +08:00
shilixia bf3dd8b083 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-03-01 15:08:28 +08:00
shilixia 2b576913ff tijiao 2022-03-01 15:08:21 +08:00
shijing 7a1a1111ff chengpinjinayan 2022-03-01 15:00:44 +08:00
shijing d6fcc6c88b jiacengbanchengpinjianyan 2022-03-01 14:46:13 +08:00
shijing 51030dc997 jiacengbanchengpinjianyan 2022-03-01 14:43:13 +08:00
shijing a9fac3f3d0 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-03-01 13:58:56 +08:00
shijing 94bfe4b47a bigScreenOpenBlank 2022-03-01 13:58:46 +08:00
shilixia 3b7c898ffc xiugai 2022-03-01 13:53:21 +08:00
shilixia c25bc213af tijiao 2022-03-01 09:31:39 +08:00
shijing 512549173b Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-02-28 15:45:04 +08:00
shijing 4c906f37c8 quanxianpeizhi 2022-02-28 15:44:58 +08:00
shilixia 07992d9a14 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-02-28 09:09:28 +08:00
shilixia d4730020a1 tijiao 2022-02-28 09:09:21 +08:00
shijing b7f0828225 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-02-25 16:51:15 +08:00
shijing 1de3b9d59c urlChange 2022-02-25 16:51:07 +08:00
shilixia 5443938dd7 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-02-25 16:21:24 +08:00
shilixia 381ce61e6c tijiao 2022-02-25 16:21:17 +08:00
shijing b9f39f4239 firstTestchange 2022-02-25 16:04:28 +08:00
shijing 1ff9dff340 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-02-25 15:43:47 +08:00
shijing 131379d676 textAdjust 2022-02-25 15:43:38 +08:00
shilixia 8a83e868b7 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-02-25 15:31:27 +08:00
shilixia 9344be2c29 xihai 2022-02-25 15:31:21 +08:00
shijing fc8c552a56 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-02-25 13:04:00 +08:00
shijing 680bf77ac3 logoHidden 2022-02-25 13:03:51 +08:00
shilixia a0595d4c22 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-02-25 10:12:14 +08:00
shilixia 5bfa72f716 xiaoshou 2022-02-25 10:12:06 +08:00
caoqianming 7c97455335 server reload sh 2022-02-25 09:31:36 +08:00
shijing c0869a0a82 urlChange 2022-02-24 11:09:12 +08:00
shijing d5d5799b92 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-02-24 08:36:35 +08:00
shijing 425ea54e73 commonData 2022-02-24 08:36:28 +08:00
shilixia 0e2cc60409 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-02-24 08:32:48 +08:00
shilixia b97c005b83 xiaoshoufahuo 2022-02-24 08:32:29 +08:00
shijing e00ecae3e7 firstTestreview 2022-02-23 10:52:21 +08:00
shijing 52b0f469d9 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-02-22 16:31:45 +08:00
shijing ba3f2cd7b9 fistTestAndFaceLoginChange 2022-02-22 16:31:39 +08:00
shilixia e8002ed7c5 zaigang 2022-02-22 15:42:20 +08:00
shilixia f552f995ab Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-02-21 13:51:00 +08:00
shilixia 01ecc2e30e xiugai 2022-02-21 13:50:53 +08:00
shijing 6b73a12840 cheeckTableChange 2022-02-21 10:23:22 +08:00
shijing 87e94c7b9f Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-02-21 09:29:12 +08:00
shijing aaee37fee2 statisticsStyleChange 2022-02-21 09:29:02 +08:00