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

717 Commits

Author SHA1 Message Date
曹前明 8ef71cf24e rpm vm 等模块的界面优化 2022-08-03 12:25:27 +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
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
2309368887@qq.com f9ba761143 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-06-25 17:22:20 +08:00
2309368887@qq.com 25f000b3e1 donghuozuoye 2022-06-25 17:22:11 +08:00
shijing 93aaa93ce0 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-06-25 10:08:24 +08:00
shijing d38bbd7cf0 map 2022-06-25 10:08:19 +08:00
2309368887@qq.com 5115e4023c Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-06-24 09:19:08 +08:00
2309368887@qq.com 25e9acae47 zuoye 2022-06-24 09:18:18 +08:00
shijing 4a2bb04356 map 2022-06-24 09:12:11 +08:00
shijing 7da24fa7d8 bigScreen 2022-06-23 11:09:09 +08:00
shijing 8efbd85b56 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-06-23 10:06:34 +08:00
shijing 8a716c7e9e bigScreen 2022-06-23 10:06:16 +08:00
2309368887@qq.com 2039b52b40 zuoyetijiao 2022-06-23 10:04:31 +08:00
2309368887@qq.com 3ae7648954 zuoye 2022-06-23 09:56:25 +08:00
2309368887@qq.com 46b34704d5 zuoye 2022-06-23 09:51:06 +08:00
shijing 1ac0d23016 06222 2022-06-22 16:02:49 +08:00
shijing a0c61a83da woekflow 2022-06-21 18:22:18 +08:00
曹前明 693ce35829 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-06-21 18:08:36 +08:00
2309368887@qq.com bda5bb2771 xiala 2022-06-21 15:41:19 +08:00
2309368887@qq.com c8b0f21069 xial 2022-06-21 15:38:34 +08:00
shijing 8c17ad4d8d logs 2022-06-21 13:32:36 +08:00
shijing ec6dec9089 dict 2022-06-21 13:04:18 +08:00
曹前明 64bb493494 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-06-20 18:22:07 +08:00
曹前明 df9a1f38f9 修改system.js 2022-06-20 18:21:58 +08:00
shijing 9269677410 0620 2022-06-20 17:04:38 +08:00
shijing 6182435ce5 0620 2022-06-20 17:03:16 +08:00
曹前明 2fbba87176 处理冲突 2022-06-20 16:44:03 +08:00
曹前明 0a03736775 事件列表页面 2022-06-20 16:34:11 +08:00
shijing 3067a62f00 0620 2022-06-20 09:41:36 +08:00
shijing 940782989b dept 2022-06-17 16:59:39 +08:00
曹前明 b3c99be0fa request修改 2022-06-17 11:07:15 +08:00
曹前明 f7a785e40f request 请求修改 2022-06-17 10:46:01 +08:00
曹前明 5586dea490 scTable resetQuery 2022-06-17 09:01:45 +08:00
曹前明 e0bf4eef82 关闭多标签业 2022-06-17 08:37:16 +08:00
曹前明 b9d06b9832 调整路由1 2022-06-16 17:36:16 +08:00
曹前明 c034317790 table.js 修改 2022-06-16 16:01:35 +08:00
曹前明 f8dee855bd 路由调整 2022-06-16 13:29:27 +08:00
曹前明 3430a6309c 建立views文件夹 2022-06-16 08:32:07 +08:00
曹前明 7b45cb6a9f modify some setting 2022-06-16 08:23:20 +08:00
曹前明 cda975cf8b config xiugai 2022-06-15 17:47:52 +08:00
曹前明 136d023e37 hrm employee index 2022-06-15 17:30:37 +08:00
曹前明 62874af83d ehs init 2022-06-15 14:55:29 +08:00
sakuya 4c60a5fbed UP iconSelect 图标选择器config 2022-06-05 11:07:55 +08:00
sakuya 730aaa1fa0 FIX scFileExport 文件导出列设置宽度溢出 2022-06-05 10:42:37 +08:00
sakuya 90a5e4f3ac 更新依赖 2022-06-05 10:39:07 +08:00
sakuya 95612c9a32 up scTable 滚动条加粗 2022-06-04 17:37:01 +08:00
sakuya 99c68592e0 更改版本号 1.6.3 2022-06-04 17:26:28 +08:00
sakuya ca76f70e9c Create db.js 2022-06-04 17:15:04 +08:00
sc f998982439 add scPasswordStrength 密码强度检测 2022-06-02 20:10:41 +08:00
sc d68df61fd1 删除 日本语 2022-06-02 15:18:25 +08:00
sc a2371261a0 UP 登录视图加强 增加注册，忘记密码，二维码登录，手机号登录 2022-06-02 15:15:11 +08:00
sc 6fe2a88903 删除无用console.log 2022-05-31 16:55:51 +08:00
sakuya a42905d69b 更改版本号 1.6.2 2022-05-30 23:21:15 +08:00
sakuya fee822d7bc UP 更新scVideo 组件的使用方式 2022-05-30 22:16:51 +08:00
sakuya ff578a8bdd FIX scContextmenu 右键菜单 在特定场景中无法关闭 2022-05-30 20:18:38 +08:00
sakuya b1cc2f9a7a FIX scUpload 未触发onSuccess钩子函数 2022-05-30 18:07:14 +08:00
sakuya f6b7f35faa 删除 菜单搜索console.log 2022-05-30 09:41:05 +08:00
sakuya 312d3883f0 ADD utils load 异步加载JS，CSS资源 2022-05-30 00:19:41 +08:00
sakuya d27543af1d FIX 菜单搜索不到子元素隐藏并且自己有组件，英文菜单搜索不到的问题 2022-05-29 18:43:19 +08:00
sakuya 0296c3feb0 重构 个人信息视图 2022-05-29 18:28:43 +08:00
sakuya 05568a5fc2 FIX scTable 点击分页后 滚动条未回到顶部 2022-05-28 20:25:25 +08:00
sakuya bb4cd23314 ADD scTableColumn 组件 2022-05-28 20:23:08 +08:00
sakuya 7bd5bdd735 移除统计列表模板，改为定宽列表模板 2022-05-27 20:22:16 +08:00
sakuya dd68239ce7 更改版本号 1.6.1 2022-05-27 16:51:36 +08:00
sakuya d1990e271c ADD 是否AES加密localStorage选项，默认明文 2022-05-27 16:36:36 +08:00
sakuya ff38fcc1d3 重构404页面 2022-05-27 15:51:59 +08:00
sakuya ce87554ea8 UP 导入增加失败演示 2022-05-27 13:34:05 +08:00
sakuya 3babe27e38 修复 黑夜模式下按钮样式错误 
重设el所有light1-9，dar1-9
 2022-05-27 11:10:53 +08:00
sakuya 8b805eb6cc ADD .env.development .env.production 调整本地环境和生产环境模式 2022-05-27 02:27:03 +08:00
sakuya b31ae9d8ea FIX request 错误处理 2022-05-27 02:22:16 +08:00
sakuya 63034d51af 回滚 恢复全局滚动条样式 2022-05-27 00:23:51 +08:00
sakuya e2505cbfb3 ADD scSelectFilter 分类筛选器 组件 2022-05-27 00:23:30 +08:00
sakuya 09ecd7fed7 FIX zindex引起的富文本编辑器样式错误 2022-05-27 00:22:50 +08:00
sakuya 22546a1e15 ADD 表单验证演示，并且关闭async-validator全局控制台警告 2022-05-26 15:07:23 +08:00
sakuya 7fa086f692 Update save.vue 2022-05-26 12:34:22 +08:00
sakuya 9c5441cfa7 FIX 模板CURD async表单验证报错 2022-05-26 11:59:38 +08:00
sakuya 917ca47339 调整 import scss of element-plus dark 2022-05-25 16:43:41 +08:00
sakuya 6cd7fda10f FIX 工作流组织接口读取错误 2022-05-25 15:47:26 +08:00
sakuya 1855407a86 FIX 登录页 暗黑模式状态错误 2022-05-25 13:24:00 +08:00
sakuya e0ba5e81dc ADD scFileImport scFileExport 文件导入导出组件 2022-05-25 13:16:50 +08:00
sakuya 2c2f36cdd7 增加 sc-upload 参数 name&data 2022-05-24 11:27:28 +08:00
sakuya 8c38fa22d4 FIX login.vue 2022-05-24 00:53:11 +08:00
sakuya 0ace9a1c0e TOKEN 从localStorage移至cookie 2022-05-24 00:42:41 +08:00
sakuya 8c6ad81219
!25 update src/utils/tool.js. 
Merge pull request !25 from 喜上眉梢/N/A
 2022-05-23 16:18:41 +00:00
sakuya 7dcb1f06e2 即将弃用移除scFileSelect资源库选择器组件 2022-05-23 18:56:36 +08:00
sakuya 92b34eb5b7 重构 scUpload 组件 
增加了scUploadFile 文件上传组件，取消了与资源库选择器的关联
 2022-05-23 18:51:42 +08:00
sakuya 6bd0df2cb6 FIX 手机端在 黑夜模式下的表现 2022-05-21 21:34:13 +08:00
sakuya e21fecbc80 ADD 模板 CRUD列表 2022-05-21 19:02:39 +08:00
sakuya 780f713856 UP scTable 若干个数据操作方法 2022-05-21 18:59:08 +08:00
sakuya 923465274e ADD scDataCard 代码编辑器组件 2022-05-20 22:45:48 +08:00
sakuya 4b2063ff6a UP 调整菜单 2022-05-20 10:35:54 +08:00
sakuya 54534fe235 add Editor media&templates&pagebreak 2022-05-19 12:26:14 +08:00
sakuya 87ef1e98ad FIX 自定义图表删除可能会导致样式错误的代码 2022-05-18 15:18:49 +08:00
sakuya f72c12bfa7 移除 原版本暗黑主题样式 2022-05-18 14:57:42 +08:00
青山 5d9a4eb929
fix:修复cron规则生成器Form表单回显问题 2022-05-17 13:54:16 +00:00
sakuya ec46584464 add Upload Download icon 2022-05-17 20:03:22 +08:00
sakuya 4f92f024b4 重构了用户权限体系 2022-05-16 23:36:50 +08:00