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

996 Commits

Author SHA1 Message Date
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