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

1326 Commits

Author SHA1 Message Date
shijing 2d6ad430a4 fixd:系统图标中单位更正 2023-08-16 10:57:55 +08:00
shijing fafe94dc91 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2023-08-15 14:13:03 +08:00
shijing 9c6fa00272 fixd:提交8.10问题修改（还差最后一条） 2023-08-15 14:12:59 +08:00
caoqianming 5ae4238b20 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2023-08-15 12:39:23 +08:00
caoqianming 5eeecdef14 feat: 添加大屏数据 2023-08-15 12:39:16 +08:00
shijing ce43a1165f fixd:工段图标 2023-08-11 17:15:19 +08:00
shijing 4119c93408 表格样式变动 2023-07-24 16:26:36 +08:00
shijing 6078fb329f 工段菜单 2023-07-24 11:30:08 +08:00
shijing c3a656fc5d 登陆后首页 2023-07-19 16:13:55 +08:00
shijing f95918bda3 feat:统计 2023-07-14 17:03:27 +08:00
shijing d195b260fa feat:能源统计 2023-07-10 15:00:46 +08:00
shijing f14ee6bb95 报表 2023-07-07 17:05:48 +08:00
shijing 89323113d6 fim 2023-07-05 15:23:01 +08:00
shijing d9181d1905 设备添加、产品添加 2023-06-30 17:25:14 +08:00
shijing 8bc055bf06 提醒配置文案更改，访客选项更改、添加拉送货车辆图片 2023-06-30 16:10:01 +08:00
shijing c8c14c8f1c Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2023-06-30 08:56:58 +08:00
shijing 12e533fac9 设备、测点、测点集、班组页面 2023-06-30 08:56:51 +08:00
caoqianming 87a107144b fix: filter recipient options 错误 2023-06-29 11:13:26 +08:00
caoqianming 3cab3db8cd fix: opl detail时二次打开不刷新 2023-06-29 11:12:59 +08:00
caoqianming 3e85e50a19 fix: dutywork下都可处理 2023-06-22 08:35:39 +08:00
caoqianming ec21622c42 fix: 工单处理相关bug解决 2023-06-22 01:50:19 +08:00
shijing 268c512273 feat:工单回退后编辑PC端 2023-06-21 17:52:50 +08:00
shijing 2e1411ce04 feat: 能管接口等 2023-06-21 17:52:07 +08:00
shijing c2435fed9e 作业统计更改及添加大屏中作业所在区域的监控设备 2023-06-20 15:21:07 +08:00
shijing 1d55dc3c19 权限控制及原料磨页面 2023-06-20 10:04:21 +08:00
shijing 94904bcff8 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2023-06-16 16:55:50 +08:00
shijing aea01b7df0 config&配置&原料磨 2023-06-16 16:55:41 +08:00
caoqianming f8e1524e8b fix: 批量布设时算法options不加入筛选条件 2023-06-16 08:56:32 +08:00
shijing 748fa2479a 许可证流程进度字体大小改动 2023-06-09 14:28:21 +08:00
shijing b6fd672062 许可证添加流程进度 2023-06-09 13:13:49 +08:00
shijing 49e8368eaf Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2023-06-09 10:13:11 +08:00
shijing fe48ad17dd 视频自动播放以及部门下监控设备的查看 2023-06-09 10:12:59 +08:00
caoqianming b23783f942 feat: operation delete_hard2 2023-06-07 10:08:06 +08:00
caoqianming 2f2ea5dbd4 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2023-06-07 09:26:07 +08:00
caoqianming 6cd695a5b3 feat: operation delete_hard 2023-06-07 09:26:02 +08:00
shijing f96cde3f00 打卡统计 2023-06-05 09:01:08 +08:00
shijing 3c718311db 打卡统计添加统计 2023-06-02 17:07:09 +08:00
caoqianming f2e1f450ef feat: 测试报表功能 2023-05-31 15:36:18 +08:00
caoqianming a7c2c7478c feat: 部门页面筛选 2023-05-29 15:21:33 +08:00
caoqianming a1196c3b2b fix: 拒绝颜色的属性 2023-05-29 15:20:48 +08:00
caoqianming 4380167d05 refector: 调整显示效果 2023-05-26 08:48:32 +08:00
caoqianming 7647378c0d Merge commit '41d1df3bc6b6d895fdf544ee1a15a299d0ddf350' into v2 2023-05-26 08:40:02 +08:00
caoqianming 6b6d5b1266 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2023-05-26 08:36:04 +08:00
caoqianming de68080dcd refactor: 修改菜单显示效果 2023-05-26 08:35:58 +08:00
shijing dc4764c6ff 1 2023-05-25 14:23:43 +08:00
shijing 61e4a0a42e feat:事件列表添加删除以及触发关联部门和作业票详情 2023-05-25 14:00:45 +08:00
shijing 4a9694c429 作业票模板改动，以及管理员权限变动 2023-05-25 13:57:22 +08:00
shijing 5a910c67d1 feat:添加触发人部门，添加事件删除添和关联的作业票详情 2023-05-25 13:53:40 +08:00
caoqianming 12f60e490b refector: 请求不携带时间戳，需要的时候自行携带 2023-05-25 10:02:29 +08:00
caoqianming c4b4e95ce5 fix: 权限auth 优化superuser 2023-05-22 16:40:21 +08:00
caoqianming a80a1ab83e Merge branch 'ehs' into v2 2023-05-11 14:40:39 +08:00
shijing 41d1df3bc6 首页在厂人员列表 2023-05-11 14:36:03 +08:00
shijing b028869736 许可证图片必填，首页添加在场人员列表 2023-05-09 10:59:47 +08:00
shijing fc908b1803 首页添加在厂人员 2023-05-08 09:53:55 +08:00
shijing ff4f5bcce4 pc端许可证添加图片、更改相关方地图头像、修改相关方项目人员 2023-04-27 16:03:04 +08:00
caoqianming 73d3724e8e fix: 导出excel时未导入config 2023-04-23 08:57:05 +08:00
caoqianming b8d49dd356 feat: 人员列表导出 2023-04-20 10:22:52 +08:00
caoqianming 2a109634e7 refector: 相关方人员证书可编辑 2023-04-14 00:33:12 +08:00
caoqianming 53ec05a036 fix: 大屏点击区域只显示正在进行的作业 2023-04-14 00:04:11 +08:00
caoqianming 376f40c124 fix: opl detail logsData显示bug 2023-04-13 23:46:52 +08:00
caoqianming 1460a6466a refector: opl和visit显示照片 2023-04-13 17:01:58 +08:00
caoqianming e63926cffb fix: 证书只能上传一张;opl detail显示 2023-04-13 16:26:44 +08:00
caoqianming bb1b867238 refector: ep.vue增加筛选条件 2023-04-12 16:40:40 +08:00
caoqianming de5746330a fix: 绑定解绑定位卡后刷新列表 2023-04-12 15:29:42 +08:00
caoqianming dc78d09542 fix: 许可证关于level的options修改 2023-04-12 15:26:49 +08:00
caoqianming 4a48e69248 feat: 增加相关方黑名单功能 2023-04-07 15:07:06 +08:00
caoqianming bdad640645 refector: rpj 证书显示的修改 2023-04-05 18:37:19 +08:00
caoqianming 3bc21a1adc fix: opl未提交前可编辑 2023-04-05 18:36:43 +08:00
shijing a6a0fcdc5a 添加人员筛选以及被退回的相应处理 2023-03-31 14:22:22 +08:00
caoqianming ec38844851 refector: 导出作业pdf样式优化 2023-03-27 14:21:08 +08:00
caoqianming 3e85c7771c refector: 文字调整 2023-03-27 12:39:52 +08:00
caoqianming 1177af5088 refector: 界面字段优化 2023-03-24 17:54:54 +08:00
shijing 1cfd216468 项目人员变动 2023-03-24 17:11:36 +08:00
shijing f3bffa50ca 普通作业作业前照片测试 2023-03-23 17:14:35 +08:00
shijing fda36d30aa tinyChange 2023-03-23 11:13:25 +08:00
shijing ffdb17596f 导出添加tips 2023-03-23 10:15:49 +08:00
shijing dcb843a554 jjj 2023-03-21 11:26:45 +08:00
shijing 9b6f1d0995 作业证导出调整 2023-03-20 10:45:17 +08:00
shijing 1bf3a44513 自定义防抖指令 2023-03-17 17:13:18 +08:00
shijing 0d2250d417 账号信息添加打卡记录 2023-03-16 16:16:54 +08:00
shijing 0b4a4cdd92 系统多岗部门人员查询 2023-03-16 10:08:12 +08:00
shijing 60d6e00f2b 账户管理添加重置密码 2023-03-16 09:43:04 +08:00
caoqianming c6c6a8d321 fix: 上下班打卡颜色 2023-03-15 18:38:29 +08:00
shijing ab88bc38ee 打卡记录导出excel带颜色 2023-03-15 16:58:26 +08:00
shijing 717bff01c8 作业编辑可更改业务部门及属地部门 2023-03-15 09:31:33 +08:00
shijing 3fb7918c2e 时间添加默认时间放开作业编辑 2023-03-15 09:12:21 +08:00
caoqianming 22b3a8cf02 增加考勤推测列 2023-03-12 21:17:10 +08:00
caoqianming 52476e76c1 从ticketdetail中打开查看作业详情 2023-03-12 10:27:29 +08:00
caoqianming 578f4a5e7c 作业创建时属地部门和业务部门需要选择为本部 2023-03-12 08:38:08 +08:00
caoqianming 7d58c27074 employee 优化 2023-03-10 18:10:31 +08:00
caoqianming aa36560521 opm 显示优化 2023-03-10 17:55:10 +08:00
caoqianming 21c35bae31 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2023-03-10 17:44:25 +08:00
caoqianming 0e67678458 算法配置页面修改 2023-03-10 17:44:17 +08:00
shijing a1076de9af print打印许可证 2023-03-10 17:26:53 +08:00
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
sc 348a007851 UP 更新部分依赖，更新版本号1.6.9 2023-02-28 14:12:15 +08:00
sc d358dfa7a2 DEL 删除多余属性 2023-02-28 14:11:47 +08:00
sc 9ee2d62243 UP scSelect 1.1 支持值类型为对象 2023-02-24 09:45:09 +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
sc 1c8869c476 UP scFormTable 1.2 增加隐藏新增，隐藏删除 2023-02-17 10:13:44 +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
sc 3dca03187c 更新版本号 1.6.8 2023-02-09 13:11:49 +08:00
sc 5275981469 UP 样式调整 全局禁用el-tag动画 2023-02-09 13:06:24 +08:00
sc 74581d8d33 UP scFormTable 1.1 2023-02-09 12:42:54 +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
sakuya 30469c0504
!51 [fix] 过滤器未显示声明emits导致输出警告 
Merge pull request !51 from Kyour/N/A
 2023-02-07 01:54:32 +00:00
Kyour e5936f0bb9
[fix] 过滤器未显示声明emits导致输出警告 
Signed-off-by: Kyour <kyour@vip.qq.com>
 2023-02-06 14:17:43 +00:00
Kyour b6255cb72f
[fix] 过滤器select固定选项选择后被清空 
Signed-off-by: Kyour <kyour@vip.qq.com>
 2023-02-06 13:40:39 +00:00
shijing 723e2db9c5 shouyedaibanyangshitioazheng 2023-02-06 12:22:39 +08:00
shijing 61f533ef9b 0206 2023-02-06 09:16:01 +08:00
shijing 26e5672543 0203 2023-02-03 16:07:13 +08:00
shijing 7d7b8aa76f 0203 2023-02-03 15:33:35 +08:00
shijing 0d533ea8fb 0203 2023-02-03 14:51:54 +08:00
shijing e28f557d45 0203 2023-02-03 14:20:44 +08:00
shijing facd1c081c 0203 2023-02-03 11:36:28 +08:00
shijing 8fc3563a45 0203 2023-02-03 11:14:15 +08:00
shijing 6b28a6c2c5 0203 2023-02-03 10:52:04 +08:00
shijing 1c616d3b3d xinbiaoqian 2023-02-03 10:25:07 +08:00
shijing c3954c8f8a xinbiaoqian 2023-02-03 09:56:26 +08:00
shijing 00e7b1464f xinbiaoqian 2023-02-03 09:19:36 +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
sakuya f651c80faf
!47 [style] request.js 优化请求参数注解，增强ide提示 
Merge pull request !47 from Kyour/N/A
 2023-01-30 06:14:48 +00:00
Kyour 550c620e63
[style] request.js 优化请求参数注解，增强ide提示 
Signed-off-by: Kyour <kyour@vip.qq.com>
 2023-01-20 08:20:19 +00:00
Kyour 31dbe2c280
update src/main.js. 
import顺序调整，vue应在el-plus之前，否则在新版wl-plus中可能报错

Signed-off-by: Kyour <kyour@vip.qq.com>
 2023-01-20 04:54:06 +00: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 5b751801b8
!44 update src/components/scTable/index.vue. 
Merge pull request !44 from YaChengMu/N/A
 2022-12-02 05:00:38 +00: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
sc 711e8cb570 FIX Contextmenu 多级菜单disabled后继续执行 2022-11-23 10:11:11 +08:00
shijing e44c04a2b5 eventhandleSubmit 2022-11-18 09:08:29 +08:00
sc c8ac9d5f93 UP 更新版本号 2022-11-17 09:07:47 +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
sc d062cc803a FIX 黑夜模式下功能坞菜单颜色 2022-11-09 09:53:34 +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
YaChengMu 398430e8da
update src/components/scTable/index.vue. 
增加column参数监听。
修改原因：动态修改表头信息后，表头没有修改。

Signed-off-by: YaChengMu <1140049363@qq.com>
 2022-11-05 02:13:30 +00: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
sc b66f9a46da FIX 全局滚动条样式在黑夜模式下能见度太低 2022-10-27 14:28:25 +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 d8771f4a42 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-10-26 08:45:55 +08:00
caoqianming d38731c19c ep show 经纬度bug 2022-10-26 08:45:53 +08:00
曹前明 7e8643ea4a userselect选择 ,checkStrictly: true 2022-10-25 21:48:01 +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
caoqianming ad026ef8d5 获取未绑卡信息优化 2022-10-25 16:10:38 +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 8ffd379964 增加手册下载链接 2022-10-10 14:48:14 +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 9be3a5c384 waiwangdizhi 2022-09-16 10:34:09 +08:00
shijing 7753602409 waiwangdizhi 2022-09-16 10:32:49 +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 4f05f6f460 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-08-31 14:58:46 +07: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
曹前明 44d836cc79 router修改 2022-08-31 14:55:43 +08: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
sc 530390f9d4 FIX API同时返回401时多次执行confirm弹窗 2022-08-26 14:58:10 +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
YangFong 774a5f32f8 perf: 去除临时变量 _this 
根据箭头函数特点，直接使用 this，无需创建临时变量
 2022-08-10 13:30:07 +08:00
sc 392ae673f3 更新部分依赖以及更新版本号1.6.6 2022-08-09 13:50:52 +08:00
sc cff0dd9b1f FIX 国际化切换不能及时应用 2022-08-09 10:57:17 +08:00
sc 31ecae89e4 FIX 编辑器在el-drawer中，编辑器的弹框无法获得焦点 2022-08-08 17:45:52 +08:00
曹前明 c24f736937 首页安卓app下载地址 2022-08-08 13:23:17 +08:00
曹前明 fdbcd2c634 首页安卓app下载二维码 2022-08-08 11:16:20 +08:00
曹前明 708a3e42a5 取消上传限制 2022-08-08 10:03:10 +08:00
曹前明 f79b37eae7 apk上传 2022-08-08 08:50:12 +08:00
sc c0e8d7d35a FIX scUploadFile & scUploadMultiple fileList没有双向绑定的的问题 2022-08-05 14:56:04 +08:00
曹前明 d66242d7de 路由bug 2022-08-05 09:23:41 +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
sc e3c760614a FIX 单文件上传剪裁后多次请求的问题 2022-07-26 15:23:51 +08:00
曹前明 f40bee35be 前端页面优化 2022-07-23 19:19:58 +08:00
sc a5e4edf357 UP 调整标签过多的提示形式 2022-07-23 09:12:31 +08:00
sc 9b654611ba 更新版本号 1.6.5 2022-07-22 15:37:28 +08:00
sc 8e90839184 UP scVideo loading大小样式 2022-07-22 15:37:17 +08:00
sc cd152eb6fd UP 调整标签的创建和移除顺序 2022-07-22 15:27:19 +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
sc 4f660c5e9b FIX 经典布局下菜单卡顿 2022-07-22 12:45:15 +08:00
sc 7c9b87d753 FIX 经典布局下菜单卡顿 
https://gitee.com/lolicode/scui/issues/I4IX9Y
 2022-07-22 12:20:07 +08:00
shijing 8df5338155 zuoyepiaoguanbi&role 2022-07-22 10:55:15 +08:00
2309368887@qq.com 117617a026 anniuquanxian 2022-07-22 09:00:37 +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
2309368887@qq.com 4e3da40fdb caidanquanxian 2022-07-18 09:24:05 +08:00
2309368887@qq.com 72b64fcddd caidanpeiquan 2022-07-18 08:57:58 +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 90f9fcc2ca Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-15 17:16:14 +08:00
shijing 14ef127744 rpjdetail 2022-07-15 17:16:08 +08:00
曹前明 ea1cffeff6 route 修改 2022-07-15 17:01:57 +08:00
曹前明 5d89acd012 路由配置解决 2022-07-15 16:37:53 +08:00
2309368887@qq.com dc9b3aaa08 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-15 14:27:38 +08:00
2309368887@qq.com 940f5da05a tubiaojicaidan 2022-07-15 14:27:30 +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
shijing 54ea10290c personmove 2022-07-08 17:11:45 +08:00
2309368887@qq.com e54616b53a jibenxinix 2022-07-08 17:03:09 +08:00
2309368887@qq.com 4349b634dd Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-08 16:31:00 +08:00
2309368887@qq.com f026024b5f jibenxinxi 2022-07-08 16:30:51 +08:00
shijing 25e0cb4b13 0707 2022-07-07 18:56:48 +08:00
shijing 459636e5b0 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-07 16:14:43 +08:00
shijing 6e154680b2 locationBind 2022-07-07 16:14:35 +08:00
2309368887@qq.com aacd5be780 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-07 15:35:45 +08:00
2309368887@qq.com 980e05edc7 xiala 2022-07-07 15:35:23 +08:00
曹前明 cf35dad763 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-07 15:32:48 +08:00
曹前明 01e243fb23 工单demo 2022-07-07 15:32:40 +08:00
2309368887@qq.com 65cadaeb54 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-07 14:26:50 +08:00
2309368887@qq.com 6865c67dc5 xiala 2022-07-07 14:26:19 +08:00
曹前明 9ca408daf1 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-07 14:24:19 +08:00
曹前明 a66e64cf7f 工作流配置基本ok 2022-07-07 14:24:11 +08:00
shijing dec05c1907 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-07 14:07:40 +08:00
shijing 773eeaa0dd mapcontroller&userdetail 2022-07-07 14:07:32 +08:00
曹前明 21854cd744 stash 2022-07-07 12:19:13 +08:00
曹前明 a9cde33315 stash 2022-07-07 12:17:24 +08:00
2309368887@qq.com ebcd31833a wodeshijian 2022-07-05 14:13:57 +08:00
2309368887@qq.com 6de230462d xialashijian 2022-07-05 09:14:57 +08:00
shijing 9c88f3f5fb ecm.js 2022-07-04 17:22:12 +08:00
2309368887@qq.com cf9f738a3d Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-04 17:19:10 +08:00
2309368887@qq.com a2204bb4c4 chuliren 2022-07-04 17:18:53 +08:00
shijing b607c75a18 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-04 17:17:18 +08:00
shijing d0fa208280 jsmapChange&bigScreen 2022-07-04 17:17:12 +08:00
2309368887@qq.com 3eaeef63b4 shijian 2022-07-04 13:44:00 +08:00
2309368887@qq.com 3e35f22abc Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-01 15:44:59 +08:00
2309368887@qq.com 960e42f359 ququanxian 2022-07-01 15:44:48 +08:00
shijing 57f192e39b video 2022-07-01 09:20:10 +08:00
shijing b33043b230 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-01 09:10:43 +08:00
shijing ca895ffa52 audio 2022-07-01 09:10:35 +08:00
2309368887@qq.com 91d3e47202 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-01 09:09:50 +08:00
2309368887@qq.com 9d72def8f1 quyu 2022-07-01 09:09:28 +08:00
shijing 623551ceae Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-06-29 14:26:03 +08:00
shijing fd86f4d520 bigScreen 2022-06-29 14:25:56 +08:00
2309368887@qq.com 8c5306dc09 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-06-29 10:46:31 +08:00
2309368887@qq.com b86626de20 login 2022-06-29 10:46:22 +08:00
shijing 20546f91cb conf 2022-06-28 14:18:13 +08:00
shijing c3ad6cbac9 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-06-28 13:12:17 +08:00
shijing bd2cf50cfa conftotxt 2022-06-28 13:12:00 +08:00
2309368887@qq.com 862deb2ee3 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-06-27 10:41:08 +08:00
2309368887@qq.com 839c5c0a02 youxiankongjian 2022-06-27 10:40:55 +08:00
shijing d55a6c1070 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-06-25 17:23:07 +08:00
shijing 68bffb0d14 area 2022-06-25 17:23:00 +08:00