Commit Graph

550 Commits

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