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

282 Commits

Author SHA1 Message Date
shijing b871efc464 fix:计量设备 2023-09-06 15:48:15 +08:00
shijing 67aa47adb8 添加手机登录方式密码重置添加提醒 2023-08-24 10:27:17 +08:00
shijing e1cadf9a74 密码强度设置 2023-08-24 08:58:27 +08:00
shijing 285703dbad fixed:首页调整 2023-08-18 17:15:53 +08:00
shijing 6078fb329f 工段菜单 2023-07-24 11:30:08 +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 8bc055bf06 提醒配置文案更改，访客选项更改、添加拉送货车辆图片 2023-06-30 16:10:01 +08:00
shijing 12e533fac9 设备、测点、测点集、班组页面 2023-06-30 08:56:51 +08:00
shijing 2e1411ce04 feat: 能管接口等 2023-06-21 17:52:07 +08:00
shijing aea01b7df0 config&配置&原料磨 2023-06-16 16:55:41 +08:00
caoqianming f2e1f450ef feat: 测试报表功能 2023-05-31 15:36:18 +08:00
shijing 5a910c67d1 feat:添加触发人部门，添加事件删除添和关联的作业票详情 2023-05-25 13:53:40 +08:00
caoqianming a80a1ab83e Merge branch 'ehs' into v2 2023-05-11 14:40:39 +08:00
caoqianming b8d49dd356 feat: 人员列表导出 2023-04-20 10:22:52 +08:00
caoqianming 4a48e69248 feat: 增加相关方黑名单功能 2023-04-07 15:07:06 +08:00
shijing 1cfd216468 项目人员变动 2023-03-24 17:11:36 +08:00
shijing 60d6e00f2b 账户管理添加重置密码 2023-03-16 09:43:04 +08:00
shijing 3fb7918c2e 时间添加默认时间放开作业编辑 2023-03-15 09:12:21 +08:00
shijing 3b2482e492 Merge branch 'master' of https://gitee.com/lolicode/scui into v2 2023-03-09 12:27:05 +08:00
caoqianming b14b57a3b8 事件记录导出 2023-02-08 23:19:57 +08:00
caoqianming 51ea19a0f1 rfile pagination 2022-12-22 17:02:07 +08:00
caoqianming db68c140ca ops增加数据库列表 2022-11-14 13:34:01 +08:00
曹前明 cdf60807fa 导出excel 2022-10-20 09:32:57 +08:00
shijing a0d2ca4068 track&line 2022-09-23 17:12:19 +08:00
shijing 2daa22557b 0907 2022-09-08 10:50:50 +07:00
曹前明 f9868d0494 首页修改 2022-09-06 15:51:06 +08:00
shijing 2d3b9fa8fe weizhibiaoji 2022-08-26 17:21:29 +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
曹前明 f27fe96fb2 algo修改 2022-08-18 18:10:48 +08:00
曹前明 8e18267da6 增加打卡记录页 2022-08-11 09:44:02 +08:00
曹前明 f79b37eae7 apk上传 2022-08-08 08:50:12 +08:00
曹前明 8ef71cf24e rpm vm 等模块的界面优化 2022-08-03 12:25:27 +08:00
曹前明 50f025455a fix conflict 2022-07-22 14:24:25 +08:00
曹前明 48e83cc4fa 事件页面美化调整 2022-07-22 14:22:42 +08:00
shijing 243e29568e 动火作业工作流测试 2022-07-22 14:02:33 +08:00
shijing ca5084d20a d3&workflow 2022-07-21 16:01:01 +08:00
2309368887@qq.com b3c432c35d 员工岗位修改 2022-07-18 09:59:46 +08:00
曹前明 5d492ff497 页面效果调整 2022-07-18 01:19:44 +08:00
曹前明 0e1c21710a sctable 修改 外加样式调整 2022-07-16 02:07:10 +08:00
shijing af4a575139 workflowstate&rpj 2022-07-15 12:44:01 +08:00
shijing e80dcecc39 rparty 2022-07-15 08:46:01 +08:00
shijing 490c0e489d ticket&component 2022-07-14 09:02:15 +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 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 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 f026024b5f jibenxinxi 2022-07-08 16:30:51 +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
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 a2204bb4c4 chuliren 2022-07-04 17:18:53 +08:00
2309368887@qq.com 3eaeef63b4 shijian 2022-07-04 13:44:00 +08:00
2309368887@qq.com 960e42f359 ququanxian 2022-07-01 15:44:48 +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 9d72def8f1 quyu 2022-07-01 09:09:28 +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 bd2cf50cfa conftotxt 2022-06-28 13:12:00 +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 25f000b3e1 donghuozuoye 2022-06-25 17:22:11 +08:00
2309368887@qq.com 25e9acae47 zuoye 2022-06-24 09:18:18 +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
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 ec6dec9089 dict 2022-06-21 13:04:18 +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 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
曹前明 c034317790 table.js 修改 2022-06-16 16:01:35 +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
sc 6760f7b4ba ADD 系统任务中心 2022-06-13 17:11:43 +08:00
sakuya ce87554ea8 UP 导入增加失败演示 2022-05-27 13:34:05 +08:00
sakuya 22546a1e15 ADD 表单验证演示，并且关闭async-validator全局控制台警告 2022-05-26 15:07:23 +08:00
sakuya e0ba5e81dc ADD scFileImport scFileExport 文件导入导出组件 2022-05-25 13:16:50 +08:00
sakuya 92b34eb5b7 重构 scUpload 组件 
增加了scUploadFile 文件上传组件，取消了与资源库选择器的关联
 2022-05-23 18:51:42 +08:00
sakuya 4b2063ff6a UP 调整菜单 2022-05-20 10:35:54 +08:00
sakuya 4f92f024b4 重构了用户权限体系 2022-05-16 23:36:50 +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 f1e289488e 增加 Cron生成器组件演示 2022-02-23 10:49:10 +08:00
sc 7b47e710e3 🎉 新增 scWaterMark 水印组件 2021-12-18 13:02:40 +08:00
sc b374691a8b ✨ 新增分步表单模板 2021-11-22 16:13:03 +08:00
sc 85a6eac5dd 变更版本号 1.4.0 2021-11-16 17:14:10 +08:00
sc 9fe2a1e521 ✨ 原子组件 状态指示器 趋势标记 2021-11-11 14:27:53 +08:00
sc c7bd84d23f FIX 经典布局使用sc-icon图标与el-icon错位 2021-10-29 14:17:19 +08:00
sc feeb7f67d8 Update system.js 2021-10-21 09:43:26 +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 6a88eff958 up 2021-10-09 10:08:54 +08:00
sc 591847e299 add 表格列管理 2021-09-18 15:08:32 +08:00
sc 0c28eb2648 Squashed commit of the following: 
commit 70b72fd2d6739ea06e29abc9caa56e4140dce1a4
Author: sc <shencheng@heronshn.com>
Date:   Thu Sep 16 10:55:11 2021 +0800

    UP ver 1.2.5

commit 09244727f56c27f2a0c76b059e45d67047de7dd2
Author: sakuya <81883387@qq.com>
Date:   Wed Sep 15 22:56:36 2021 +0800

    up

commit 3368c197b787500f47923107600bf38ca880dbcb
Author: sc <shencheng@heronshn.com>
Date:   Wed Sep 15 17:06:07 2021 +0800

    scWorkflow

commit 53c5d6b4b11d3b3da329974e17b7f671962ec32a
Author: sc <shencheng@heronshn.com>
Date:   Tue Sep 14 16:59:34 2021 +0800

    add scWorkflow

commit cadb084e378e5157ec8fda5e015c2e3def3c60cf
Author: sakuya <81883387@qq.com>
Date:   Mon Sep 13 23:06:24 2021 +0800

    add Dingding workflow

commit 2f2aefef10e59467ad5c897d5c520c1edbe179cf
Author: sc <shencheng@heronshn.com>
Date:   Mon Sep 13 15:51:31 2021 +0800

    scTable 增加自定义列的 保存 读取和重置钩子

commit 161a5dbf9868d0d98d802a051fdf34c884f8bbf0
Author: sc <shencheng@heronshn.com>
Date:   Fri Sep 10 14:05:33 2021 +0800

    ADD 标签操作类

commit 7b45fd1cf522e1d1e262326ae66a0054007d5dc9
Author: sc <shencheng@heronshn.com>
Date:   Thu Sep 9 17:08:24 2021 +0800

    ad 标签操作类

commit b75860732f44ffe047547d704861c58e1e3fc419
Author: sc <shencheng@heronshn.com>
Date:   Thu Sep 9 13:06:14 2021 +0800

    Update index.js

commit 57fe306f4136b77f4a72663ea9b06777c83f2d3e
Author: sc <shencheng@heronshn.com>
Date:   Wed Sep 8 16:30:03 2021 +0800

    Update index.vue

    - 继承所有属性至el-table
    - 删除1对1转发原装方法&事件

commit 4f9c632122e03b849c1766bd4b584cc8b5b949d0
Author: sc <shencheng@heronshn.com>
Date:   Wed Sep 8 15:07:18 2021 +0800

    scFormTable add dragSort prop 是否开启拖拽排序

commit d6938fecb6de8c138d96a4c9f3858dcac68a525f
Author: sc <shencheng@heronshn.com>
Date:   Sat Sep 4 11:57:03 2021 +0800

    模板-日历计划 使用 $TOOL.dateFormat 错误

commit cda7f97bd6480359813c1c9e2fbbcc3708df3f5f
Author: sc <shencheng@heronshn.com>
Date:   Sat Sep 4 10:55:44 2021 +0800

    版本信息部件增加最新版本请求，FIX 版本信息部件命名错误

commit ece9c74f8cf5c039b4dcfe962ced1298d59085d6
Author: sc <shencheng@heronshn.com>
Date:   Sat Sep 4 10:33:05 2021 +0800

    add v-copy directive

commit 1af7241b9f26916b33d7a9952ee12dfd8ee6855f
Author: sc <shencheng@heronshn.com>
Date:   Thu Sep 2 10:48:33 2021 +0800

    FIX scTable 因为返回数据格式错误导致parseData报错
 2021-09-16 12:59:06 +08:00
sc a2d6b50975 Squashed commit of the following: 
commit fab0c5019d90974760c49aaa36af8361658b4b21
Author: sc <shencheng@heronshn.com>
Date:   Tue Aug 24 14:54:53 2021 +0800

    更改版本号 1.2.2

commit 8c47aad10f7c0e9b61ed87bb68cf512134afc29b
Author: sc <shencheng@heronshn.com>
Date:   Mon Aug 23 16:05:10 2021 +0800

    更改SVGMAP模板

commit 9acfb2ebd2454e864ec76640bbc301675bf9b48b
Author: sc <shencheng@heronshn.com>
Date:   Mon Aug 23 13:24:52 2021 +0800

    Update fix.scss

commit b6367361ab5e2061d6a747b7d9342202f6c75be2
Author: sakuya <81883387@qq.com>
Date:   Mon Aug 23 00:21:48 2021 +0800

    UP

commit e8bef8834f37161a80aad82d49fa02949b603f30
Author: sakuya <81883387@qq.com>
Date:   Sun Aug 22 20:24:28 2021 +0800

    UP

commit 280eb183979fc2b898ce5dd3f7ec172f72dbff5d
Author: sakuya <81883387@qq.com>
Date:   Sat Aug 21 20:44:41 2021 +0800

    Update demo.js

commit be40b82d8fd85fab60dadbab1fbe57c0076f2b71
Author: sc <shencheng@heronshn.com>
Date:   Sat Aug 21 16:17:08 2021 +0800

    UP

commit 364225c94324c95169fad52c5482003002140773
Author: sc <shencheng@heronshn.com>
Date:   Sat Aug 21 10:24:33 2021 +0800

    UP

commit bc02766d5d075771f44c4dc633b1fd5916a7c05a
Author: sakuya <81883387@qq.com>
Date:   Fri Aug 20 23:35:00 2021 +0800

    up

commit 7f8d67941b11a66f22ab5dbad469a27de0db12d8
Author: sc <shencheng@heronshn.com>
Date:   Fri Aug 20 17:08:39 2021 +0800

    UP
 2021-08-25 08:42:05 +08:00
sc 117008902e UPD API优化 
1：增加封装put|patch|delete
2：分离api统一管理
3：$HTTP 增加第3个参数config
 2021-08-13 10:06:57 +08:00
sc 4d5764cbb8 add scSelect 2021-08-04 13:44:50 +08:00
sc 7653a1b573 UP 2021-08-03 17:04:34 +08:00
sc 5e58639a0d up login MD5 encrypt 2021-07-20 11:06:03 +08:00
sc 5b78760ccb add proxy 
1：增加开发模式的代理服务器
2：删除 MOCK_URL 配置
 2021-07-15 14:11:21 +08:00
sakuya 231c90ad9b ADD TableSelect 2021-06-11 23:56:24 +08:00
sc fc1210ff1f UP 2021-06-10 16:59:12 +08:00
sakuya 0a1cc1a69b UP 2021-06-09 22:27:49 +08:00
sakuya 742b734580 UP 2021-05-28 22:00:56 +08:00
sakuya de17d02655 上传组件和富文本图片上传全部调用API.JS 2021-05-25 21:30:23 +08:00
sakuya be880650e2 UP 1.0.9 2021-05-16 23:05:19 +08:00
sakuya cbbd57511b UP 2021-05-15 23:35:24 +08:00
sc 4004b81827 UP 2021-05-15 16:24:20 +08:00
sc 741a54b6a5 UP 2021-05-14 15:57:58 +08:00
sakuya 530dbea2bd UP 2021-05-14 00:09:21 +08:00
sakuya 2366eb4868 up 2021-05-06 22:39:16 +08:00
sc 9d50fca203 UP 2021-04-30 16:06:28 +08:00
sc be74adb9f4 UP 2021-04-29 14:54:17 +08:00
sc f315950d78 UP 2021-04-28 16:44:41 +08:00
sc 834b9b0756 init 2021-04-20 16:27:22 +08:00