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

440 Commits

Author SHA1 Message Date
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
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
曹前明 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 90a5e4f3ac 更新依赖 2022-06-05 10:39:07 +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
sakuya fee822d7bc UP 更新scVideo 组件的使用方式 2022-05-30 22:16:51 +08:00
sakuya b1cc2f9a7a FIX scUpload 未触发onSuccess钩子函数 2022-05-30 18:07:14 +08:00
sakuya 312d3883f0 ADD utils load 异步加载JS，CSS资源 2022-05-30 00:19:41 +08:00
sakuya 0296c3feb0 重构 个人信息视图 2022-05-29 18:28:43 +08:00
sakuya 7bd5bdd735 移除统计列表模板，改为定宽列表模板 2022-05-27 20:22:16 +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 e2505cbfb3 ADD scSelectFilter 分类筛选器 组件 2022-05-27 00:23:30 +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 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 7dcb1f06e2 即将弃用移除scFileSelect资源库选择器组件 2022-05-23 18:56:36 +08:00
sakuya 92b34eb5b7 重构 scUpload 组件 
增加了scUploadFile 文件上传组件，取消了与资源库选择器的关联
 2022-05-23 18:51:42 +08:00
sakuya e21fecbc80 ADD 模板 CRUD列表 2022-05-21 19:02:39 +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 4f92f024b4 重构了用户权限体系 2022-05-16 23:36:50 +08:00
sakuya e572eb6593 FIX 编辑器演示页面 控制台警告 2022-05-16 15:08:09 +08:00
sakuya 42d857443b FIX 弹窗扩展演示页面 控制台报错 2022-05-15 21:40:30 +08:00
sakuya 054da924e7 FIX 路由过滤button 2022-05-15 17:55:24 +08:00
sakuya 02d8e1bfdc 更新element-plus 2.2.0 
1：更新element-plus 2.2.0和依赖
2：更换@element-plus/icons-vue
3：重构黑夜模式
4：富文本编辑器升级至tinymce6
5：sc-dialog 移除自定义拖拽，使用内置的draggable
6：模拟错误增加API错误模拟
7：scTable 增加全功能分页
8：ElementPlus size 移至config-provider
 2022-05-15 14:37:41 +08:00
sc 361922029f scTableSelect 增加change事件 2022-02-28 09:45:40 +08:00
sc f1e289488e 增加 Cron生成器组件演示 2022-02-23 10:49:10 +08:00
sc e2ae7eb8d1 FIX 部分页面错位 2022-02-10 14:56:59 +08:00
sc 808e9a983a 🆙 更新上游依赖，同步element-plus2 2022-02-10 14:01:02 +08:00
sc 9e13cd58c3 Update video.vue 2022-02-08 12:14:21 +08:00
sc 48f047ba7d Update video.vue 2022-02-08 11:10:43 +08:00
sc df982af13e 🎉 新增组件 cron规则生成器 2022-01-20 16:36:09 +08:00
sc a6456e3b55 🎉 新增 scQrCode 二维码组件 2021-12-21 14:26:59 +08:00
sc 7b47e710e3 🎉 新增 scWaterMark 水印组件 2021-12-18 13:02:40 +08:00
sc f6f5b8cd2e Update chartlist.vue 2021-12-01 12:28:41 +08:00
sakuya 29a9afffbf 🚩 scTable增加动态样式控制块 2021-12-01 12:12:52 +08:00
sakuya 4dd61edc99 🎉 新增视频播放器组件 scVideo 2021-11-29 19:24:05 +08:00
贾二小 c3fb3bb5eb 开关 去掉v-if 2021-11-28 08:25:22 +00:00
sc b374691a8b ✨ 新增分步表单模板 2021-11-22 16:13:03 +08:00
sc 62bef6098c 完善原子组件 2021-11-16 17:14:10 +08:00
sc 9c09553b9b 💥 适配element-plus 1.2.0 
1.全局iconfont改为SVG组件
2.更新图标选择器组件
 2021-11-16 17:14:08 +08:00
sc 9fe2a1e521 ✨ 原子组件 状态指示器 趋势标记 2021-11-11 14:27:53 +08:00
sc 408d3ea49c scFilterBar 增加 tags 类型 2021-11-05 09:34:12 +08:00
sc 8ff3f6b0ff UPD scTable 增加自定义查询插糟 2021-11-04 16:13:38 +08:00
sc ba9539ce0f ADD 控制台部件增加可选择布局 2021-11-04 14:18:08 +08:00
sc 0744c65252 优化 默认布局和通栏布局一级菜单的访问形式 2021-11-02 12:36:07 +08:00
sc 575dff66c6 scFilterBar 增加插糟，增加showOperator参数 2021-10-29 14:15:33 +08:00
sc 8318e4e06c 完善审批工作流设计器 
完善审批工作流设计器
 2021-10-29 10:06:02 +08:00
sc 2ed0f5cd70 路由配置 增加 fullpage 整页路由配置 2021-10-18 10:45:30 +08:00
sc f7c89bc669 系统视图移位 
empty、404从views移动至layout
删除cmd无用路由
 2021-10-18 09:47:51 +08:00
sc 984fb1bb08 路由模块扁平化 
UP
 2021-10-18 08:41:08 +08:00
sc 1ee7f009e1 add 组件 资源库选择器 
add 组件 资源库选择器
scUpload 集成 资源库选择器
 2021-10-15 10:32:35 +08:00
sc 1c45eba3d4 up login 
UP

UP
 2021-10-15 10:32:35 +08:00
sc df1ce6dbe8 Update form.vue 2021-10-11 10:54:13 +08:00