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

792 Commits

Author SHA1 Message Date
shijing d2e76f4220 print打印许可证 2023-03-10 17:24:17 +08:00
shijing d07962189d Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2023-03-10 08:50:10 +08:00
shijing d4730d0b3d 简单导出 2023-03-10 08:50:01 +08:00
caoqianming 73a5a8483f Merge branch 'ehs' into v2 2023-03-09 15:45:49 +08:00
caoqianming 4561c9a577 打卡统计记录导出增加时间 2023-03-09 15:45:12 +08:00
shijing 3b2482e492 Merge branch 'master' of https://gitee.com/lolicode/scui into v2 2023-03-09 12:27:05 +08:00
shijing 82795ee36e 首页图标链接 2023-03-08 12:43:52 +08:00
shijing 4f48e9c03a 导出页部门筛选更改 2023-03-08 12:19:49 +08:00
shijing f674e8e3e8 导出页部门筛选更改 2023-03-08 12:17:48 +08:00
shijing cb4854d0f5 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2023-03-03 14:31:08 +08:00
shijing f9b779a237 更改导出打卡时间取值 2023-03-03 14:31:01 +08:00
caoqianming 1255c38d1b 优化显示 2023-03-02 23:53:14 +08:00
caoqianming dc1ac15649 hrm employee 门禁权限显示优化 2023-03-02 22:34:30 +08:00
shijing c68b834b98 0302导出周几问题 2023-03-02 09:36:20 +08:00
shijing 6adc906c06 zuoyeshipin 2023-02-20 09:27:16 +08:00
shijing f8ea630f61 zuoyeshipin 2023-02-20 09:24:29 +08:00
sc c31958d0b7 UP scFormTable 1.3 增加外部新增删除方法 2023-02-17 10:43:41 +08:00
shijing de9dfdf3a9 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2023-02-13 13:29:16 +08:00
shijing 7e54d59bd1 0213bigScreenShowopl 2023-02-13 13:29:07 +08:00
caoqianming dd614cd68a opl detail增加监控状态 2023-02-11 10:32:08 +08:00
caoqianming b14b57a3b8 事件记录导出 2023-02-08 23:19:57 +08:00
sc a28750dc52 UP scFilterBar 2.6 
1：修复下拉选项丢失
2：增加自定义日期过滤类型
3：增加是否重复过滤
 2023-02-07 14:11:35 +08:00
shijing 723e2db9c5 shouyedaibanyangshitioazheng 2023-02-06 12:22:39 +08:00
shijing 317b75fd79 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2023-02-03 09:01:43 +08:00
shijing e287df2393 xinbiaoqian 2023-02-03 09:01:23 +08:00
caoqianming fadcc97f3e 考勤记录导出需选部门和月份 2023-02-02 19:03:14 +08:00
caoqianming 1c625e08d5 作业详情时可看到监控设备 2023-02-02 18:56:50 +08:00
shijing c2c9f32908 jiankongfangda 2023-01-11 13:08:22 +08:00
shijing 34e968f849 0109 2023-01-09 13:51:35 +08:00
shijing fbfc4e7522 0109出勤导出 2023-01-09 11:06:05 +08:00
shijing 9c3ceb1ca9 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-12-27 22:09:09 +08:00
shijing 31e875dce3 1227访客信息去除防疫信息 2022-12-27 22:09:03 +08:00
caoqianming 51ea19a0f1 rfile pagination 2022-12-22 17:02:07 +08:00
sc 600e9cc7c3 FIX 菜单管理字典管理左侧树按钮样式 2022-12-02 13:52:22 +08:00
sc 70f7310dea FIX 菜单管理字典管理左侧树按钮样式 2022-12-02 13:48:50 +08:00
sakuya 16fdc73a92
!45 v-auth权限补充 
Merge pull request !45 from yoyo/yoyo/add-auths
 2022-12-02 04:59:37 +00:00
yoyo0926 880d386257 feat: add auth/auths/authsAll 2022-11-25 10:09:00 +08:00
shijing e44c04a2b5 eventhandleSubmit 2022-11-18 09:08:29 +08:00
shijing 5b1588f55c Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-11-15 09:42:52 +08:00
shijing 87f7652443 comeplace 2022-11-15 09:42:44 +08:00
caoqianming db68c140ca ops增加数据库列表 2022-11-14 13:34:01 +08:00
caoqianming 6f22533bd2 bigscreen voice 播放地址bug 2022-11-10 17:45:59 +08:00
caoqianming 011790c6fc 加载地图修改 2022-11-10 17:24:56 +08:00
sc d7cf9c59c7 UP 更新上游依赖 2022-11-10 15:37:05 +08:00
shijing 2def4938a1 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-11-10 14:07:56 +08:00
shijing db4087ec65 loading&ticketName 2022-11-10 14:06:42 +08:00
caoqianming 85f0e3b469 调整visit界面 2022-11-10 10:31:32 +08:00
caoqianming 67e4faf29d 项目工单创建时添加title 2022-11-10 08:53:12 +08:00
shijing 6ae0aca099 地图资源按需加载 2022-11-09 13:09:19 +08:00
shijing ccb7b2adaa 地图资源按需加载 2022-11-09 13:07:05 +08:00
shijing 3a870ed8e2 地图资源按需加载 2022-11-09 09:36:08 +08:00
sc 1908e5e9bf ADD 无操作自动登出 默认关闭 2022-11-09 09:35:00 +08:00
shijing 7e802739e7 监控视频打开地址 2022-11-08 14:56:21 +08:00
shijing 4263c8e149 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-11-08 14:26:29 +08:00
shijing c5b9718557 监控视频 2022-11-08 14:26:21 +08:00
caoqianming a844cb8635 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-11-04 09:23:33 +08:00
caoqianming 349a52b3a7 user 权限标识修改 2022-11-04 09:23:30 +08:00
曹前明 647a08476e 工单可处理人查看 2022-11-04 07:04:58 +08:00
sc 43219b8402 UP 登录页增加回车提交 2022-11-03 09:38:02 +08:00
caoqianming 8427ea66f1 添加普通作业许可 2022-11-01 16:27:15 +08:00
caoqianming 9c5b84b9e4 visit 界面修复 2022-11-01 14:44:28 +08:00
caoqianming 5ce1147080 visit 修改提交 2022-11-01 14:14:35 +08:00
caoqianming ee23a453d5 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-11-01 14:09:14 +08:00
caoqianming c5a5477f05 增加拉送货 其他 2022-11-01 14:09:10 +08:00
曹前明 2199a470cc visit,rpj创建页面优化 2022-10-30 22:33:06 +08:00
曹前明 8af1dd6480 rpj 项目状态前移动 2022-10-29 10:59:28 +08:00
曹前明 861226fae7 rpj 项目状态前移动 2022-10-29 10:58:38 +08:00
shijing 47a827e9df Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-10-28 16:57:06 +08:00
shijing 57d78b07a2 visitorInfo 2022-10-28 16:57:00 +08:00
caoqianming e2d628c4b0 页面文字修改 2022-10-28 16:37:33 +08:00
shijing 8d20056f4a Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-10-28 10:56:02 +08:00
shijing 1d5822000f visitorPcRequired 2022-10-28 10:55:46 +08:00
caoqianming 48fc7dcfed 首页访客项目数量异常 2022-10-27 18:19:52 +08:00
caoqianming 3a79888312 界面调整 2022-10-27 17:44:11 +08:00
caoqianming bdb1c3a014 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-10-27 16:48:51 +08:00
caoqianming d721ccb890 工作流filterable 2022-10-27 16:48:47 +08:00
shijing b86083b3de Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-10-27 16:34:52 +08:00
shijing ecddfefc0e eventTypeAll 2022-10-27 16:34:48 +08:00
sc c6c1aa7036 UP 控制台模块权限化后固定模块 2022-10-27 14:51:18 +08:00
caoqianming 97f58d2ee4 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-10-27 14:09:01 +08:00
caoqianming c7741143f6 人员信息页调整 2022-10-27 14:07:37 +08:00
sc f3b553c690 FIX 调整主题颜色时清空事件报错 2022-10-27 14:05:36 +08:00
shijing 65b267dbda videoView 2022-10-27 08:37:24 +08:00
shijing 346ccb5fe7 videoView 2022-10-27 08:34:39 +08:00
曹前明 4322fb1108 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-10-26 22:34:35 +08:00
曹前明 6de65e3d78 路由页面修改 2022-10-26 22:34:32 +08:00
caoqianming 8455524a18 user 部门列超过隐藏 2022-10-26 17:54:08 +08:00
sc 625a7303d0 UP 控制台模块权限化 2022-10-26 15:11:11 +08:00
caoqianming 7786b868c4 ep_form 增加loading效果 2022-10-26 14:58:04 +08:00
caoqianming f204cad865 界面优化 2022-10-26 14:46:56 +08:00
caoqianming b90ca4d830 sctable 数据格式错误bug 2022-10-26 14:44:19 +08:00
caoqianming eb56109e9d 事件处理后刷新列表 2022-10-26 14:21:35 +08:00
shijing f9766e1a80 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-10-26 13:43:57 +08:00
shijing 283c92053e bigScreen 2022-10-26 13:43:49 +08:00
caoqianming d38731c19c ep show 经纬度bug 2022-10-26 08:45:53 +08:00
caoqianming 6b9625a741 am blt 绑定优化 2022-10-25 17:42:39 +08:00
caoqianming 8f79d5fe3e Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-10-25 16:30:00 +08:00
caoqianming 5308e95142 工单详情页优化 2022-10-25 16:29:57 +08:00
caoqianming 7ee76ff1ea 访客项目展示人员详情 2022-10-25 16:11:17 +08:00
shijing 4a76430e26 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-10-25 16:04:32 +08:00
shijing bcfc7a671b bigScreenArea 2022-10-25 16:04:25 +08:00
caoqianming b62f16c80e 重试刷新列表 2022-10-25 13:55:53 +08:00
caoqianming 89078d94dc rpj_form required 2022-10-25 13:54:56 +08:00
caoqianming 8803ed22da ep_form显示最近定位 2022-10-25 13:54:33 +08:00
caoqianming bd5dcc1cfb ep显示在职状态 2022-10-25 13:54:09 +08:00
曹前明 61367639ff 工作流列表展示优化 2022-10-24 19:01:07 +08:00
曹前明 a4221224b8 rpm属地部门限定/分配账号可选已有的 2022-10-24 19:00:36 +08:00
曹前明 ee492a2159 证书创建/编辑后刷新列表 2022-10-24 18:59:36 +08:00
曹前明 a6be82e54e 打卡记录选择部门 2022-10-24 18:09:17 +08:00
曹前明 3d7e0d2b1d Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-10-20 09:33:08 +08:00
曹前明 cdf60807fa 导出excel 2022-10-20 09:32:57 +08:00
shijing dbe726cc6c bigScreen 2022-10-20 09:31:38 +08:00
shijing d9f95a8811 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-10-19 11:59:19 +08:00
shijing 5617114e1b vchannelSelect 2022-10-19 11:59:09 +08:00
caoqianming 9dba0cde27 pc页面修改 2022-10-13 16:29:34 +08:00
caoqianming 553e29de5c opl页面调整 2022-10-11 18:02:33 +08:00
caoqianming dc7b9e2f91 首页样式修改 2022-10-10 15:09:19 +08:00
caoqianming e216c800f9 协调员组件选择 2022-10-10 14:38:52 +08:00
曹前明 7516417f52 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-09-27 12:44:02 +08:00
曹前明 1e1f79b99c rpj增加已关闭选项/人员高度不固定 2022-09-27 12:43:58 +08:00
shijing 3696aa6725 bugFix 2022-09-27 12:12:21 +08:00
shijing 32ea2d42b7 bugFix 2022-09-24 10:35:03 +08:00
shijing 1fd16bfe08 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-09-23 20:28:03 +08:00
shijing 22cf3aedd8 eventHandle 2022-09-23 20:27:54 +08:00
曹前明 8ee216165d Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-09-23 19:59:14 +08:00
曹前明 05b4f53f0a area belong_dept bug 2022-09-23 19:59:10 +08:00
shijing 1fd8d1084e Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-09-23 17:12:27 +08:00
shijing a0d2ca4068 track&line 2022-09-23 17:12:19 +08:00
曹前明 7a36f1954f 最长停留/工单执行状态查询 2022-09-23 17:10:43 +08:00
shijing 72b5304b97 jiashicang 2022-09-21 09:38:49 +08:00
曹前明 0f73300cfa 许可证提交时跳转页面bug 2022-09-19 17:48:32 +08:00
曹前明 c5876a29fb 增加门禁时间范围 2022-09-19 16:09:36 +08:00
曹前明 ee38bd911d 事件查看页面修改 2022-09-19 09:42:35 +08:00
曹前明 a6e3ef1fb4 标记位置后刷新 2022-09-18 16:59:06 +08:00
曹前明 5f8cc08314 app下载url 2022-09-18 09:23:25 +08:00
shijing a0c03ac24d Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-09-15 16:50:47 +08:00
shijing ec11e30e41 requestUrl 2022-09-15 16:50:41 +08:00
曹前明 e865a3d45a 界面微调 2022-09-15 16:31:39 +08:00
shijing 13bca8732e Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-09-14 15:32:06 +08:00
shijing 2cf1412f79 littleChange 2022-09-14 15:31:47 +08:00
曹前明 be537d884f Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-09-13 20:18:32 +08:00
曹前明 ea7c1defe2 area最大最小人员数 2022-09-13 20:18:28 +08:00
shijing 051526c243 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-09-13 18:52:56 +08:00
shijing 541627b9b5 eventDetail 2022-09-13 18:52:50 +08:00
曹前明 5c540505fb 播放次数最小一次 2022-09-13 17:38:03 +08:00
曹前明 60a352aec8 event vue 修改 2022-09-13 11:17:37 +08:00
曹前明 84839deeb0 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-09-12 21:17:26 +08:00
曹前明 1e76b8ee46 修改event 2022-09-12 21:17:19 +08:00
shijing 849dee3e4a newMap 2022-09-12 14:33:27 +08:00
shijing 1ed6787310 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-09-08 10:50:57 +07:00
shijing 2daa22557b 0907 2022-09-08 10:50:50 +07:00
曹前明 cd07f46cb9 账户管理增加type编辑 2022-09-07 18:34:08 +08:00
曹前明 b29f3cc295 增加筛选条件 2022-09-07 16:46:08 +08:00
曹前明 d81a6c77c8 user 界面显示岗位 2022-09-07 14:48:12 +08:00
曹前明 986c09bc22 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-09-07 10:17:21 +08:00
曹前明 38a3d10117 增加回车检索 2022-09-07 10:17:12 +08:00
shijing 56154669b9 0906 2022-09-07 09:37:56 +08:00
曹前明 8fca5caaa8 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-09-06 17:19:25 +08:00
曹前明 e36c5b43e3 blt sync bug 2022-09-06 17:19:15 +08:00
shijing 3b96be33e2 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-09-06 17:07:08 +08:00
shijing 339f8033cd change 2022-09-06 17:07:01 +08:00
曹前明 f9868d0494 首页修改 2022-09-06 15:51:06 +08:00
曹前明 1a1d809fe3 wf state getusers 2022-09-06 10:18:44 +08:00
shijing a87f529fe8 route 2022-09-05 11:19:39 +08:00
shijing 729260cf37 bind 2022-09-05 10:50:43 +08:00
shijing 517a91a93b bind 2022-09-05 10:48:11 +08:00
曹前明 4aefa086e6 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-09-02 17:15:12 +08:00
曹前明 188f3ab2e7 fire页面采用选人组件 2022-09-02 17:14:55 +08:00
shijing b4664383fb Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-09-01 11:21:54 +07:00
shijing 1de0ea6f83 0831 2022-09-01 11:21:32 +07:00
曹前明 50a17fbd1d 同步设备后的刷新按钮 2022-09-01 11:04:36 +08:00
shijing 4c49964283 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-08-31 14:55:00 +07:00
shijing 9ea3cb58a9 change 2022-08-31 14:54:53 +07:00
曹前明 f81f1c17d3 工单界面修改包括工单日志等 2022-08-31 14:54:44 +08:00
shijing 8c8eeeda69 mapChange 2022-08-26 17:27:37 +07:00
shijing 2d3b9fa8fe weizhibiaoji 2022-08-26 17:21:29 +07:00
曹前明 ceb9365bc4 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-08-26 16:24:35 +08:00
曹前明 96bdd862c1 喇叭设备同步 2022-08-26 16:24:25 +08:00
shijing 92f92f7ab2 routerChange 2022-08-23 19:21:36 +07:00
shijing a96b91702f reSet 2022-08-23 19:09:50 +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
曹前明 55f821cc03 fix conflict 2022-08-18 18:12:10 +08:00
曹前明 f27fe96fb2 algo修改 2022-08-18 18:10:48 +08:00
shijing 413cad098a Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-08-18 17:28:15 +08:00
shijing 0c55e47cf7 关闭监控后停止资源加载 2022-08-18 17:28:06 +08:00
sc f367b3ad1a FIX Editor 上传图片自动转换相对路径，并且增加props options 2022-08-13 10:48:53 +08:00
曹前明 c57921f340 算法布设修改 2022-08-12 11:20:33 +08:00
shijing 4bc5a7733b Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-08-11 17:13:50 +08:00
shijing d846e8d6ef iconChange 2022-08-11 17:13:45 +08:00
曹前明 8e18267da6 增加打卡记录页 2022-08-11 09:44:02 +08:00
曹前明 c24f736937 首页安卓app下载地址 2022-08-08 13:23:17 +08:00
曹前明 fdbcd2c634 首页安卓app下载二维码 2022-08-08 11:16:20 +08:00
曹前明 f79b37eae7 apk上传 2022-08-08 08:50:12 +08:00
曹前明 8840084ce9 pc界面优化初步完成 2022-08-03 15:33:56 +08:00
曹前明 8ef71cf24e rpm vm 等模块的界面优化 2022-08-03 12:25:27 +08:00
sc 82020d8edc 移除异步加载JS轨迹演示 2022-07-29 10:23:22 +08:00
曹前明 f40bee35be 前端页面优化 2022-07-23 19:19:58 +08:00
曹前明 50f025455a fix conflict 2022-07-22 14:24:25 +08:00
曹前明 48e83cc4fa 事件页面美化调整 2022-07-22 14:22:42 +08:00
shijing 03842ca8e9 按钮调整 2022-07-22 14:12:44 +08:00
shijing 243e29568e 动火作业工作流测试 2022-07-22 14:02:33 +08:00
sc b6a882d664 ADD 菜单增加tag标签 2022-07-22 13:09:55 +08:00
shijing 8df5338155 zuoyepiaoguanbi&role 2022-07-22 10:55:15 +08:00
2309368887@qq.com 0d114bf349 tijiao 2022-07-21 16:40:28 +08:00
2309368887@qq.com 23ec1dfc38 anniuquanxain 2022-07-21 16:05:09 +08:00
shijing 70533ed872 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-21 16:01:09 +08:00
shijing ca5084d20a d3&workflow 2022-07-21 16:01:01 +08:00
曹前明 9f2f00f98e 首页样式调整 2022-07-21 00:33:21 +08:00
曹前明 d9d647af43 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-18 17:08:20 +08:00
曹前明 5b9b8b72dc 首页样式调整 2022-07-18 17:08:13 +08:00
shijing cbb1920724 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-18 16:50:04 +08:00
shijing 331de979f3 fireWorkTick 2022-07-18 16:49:58 +08:00
曹前明 eccf3892f9 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-18 16:11:21 +08:00
2309368887@qq.com ecb23db22e Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-18 14:51:28 +08:00
曹前明 a5dac1fff9 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-18 14:46:49 +08:00
曹前明 be62ebc37a 修改state 2022-07-18 14:46:44 +08:00
shijing 10d8beadcb Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-18 14:35:50 +08:00
shijing ed771eab5b ticketDetail 2022-07-18 14:35:44 +08:00
2309368887@qq.com 63eddd40fe Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-18 11:22:36 +08:00
2309368887@qq.com df0d48418f 按钮权限配置 2022-07-18 11:22:17 +08:00
曹前明 7a7e8d7066 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-18 11:16:39 +08:00
曹前明 21434b4ef8 v auth 2022-07-18 11:16:32 +08:00
2309368887@qq.com b3c432c35d 员工岗位修改 2022-07-18 09:59:46 +08:00
shijing 7d732d68c2 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-18 08:36:07 +08:00
shijing 973a92fd25 ticketDetail 2022-07-18 08:35:57 +08:00
曹前明 5d492ff497 页面效果调整 2022-07-18 01:19:44 +08:00
曹前明 759e87d621 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-16 02:07:19 +08:00
曹前明 0e1c21710a sctable 修改 外加样式调整 2022-07-16 02:07:10 +08:00
shijing 14ef127744 rpjdetail 2022-07-15 17:16:08 +08:00
shijing af4a575139 workflowstate&rpj 2022-07-15 12:44:01 +08:00
shijing 3f939338bd Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-15 08:46:11 +08:00
shijing e80dcecc39 rparty 2022-07-15 08:46:01 +08:00
2309368887@qq.com e2470b42e7 jiekou 2022-07-14 10:24:43 +08:00
2309368887@qq.com a1e652a8fe Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-14 09:06:59 +08:00
2309368887@qq.com d466be638a xiala 2022-07-14 09:06:44 +08:00
shijing aa44a69c4f ticket&component 2022-07-14 09:04:55 +08:00
shijing 490c0e489d ticket&component 2022-07-14 09:02:15 +08:00
曹前明 6e316c9fd2 perms存权限列表 2022-07-14 07:47:10 +08:00
2309368887@qq.com 90e1ffdbf3 shouye 2022-07-13 17:27:32 +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 67a9c88fa0 tijiao 2022-07-12 13:50:04 +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 d4b72069f2 clearConsolelogs 2022-07-11 14:13:48 +08:00
shijing cfd0f4df95 track&bindblt 2022-07-11 13:35:17 +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