2421 Commits

Author	SHA1	Message	Date
shijing	281db61506	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2024-02-28 13:16:19 +08:00
shijing	a1f1f8af63	3dtiles	2024-02-28 13:16:09 +08:00
caoqianming	908dab5634	fix: 不同项目切换的打包适配	2024-02-28 11:51:14 +08:00
shijing	3f1f78f625	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2024-02-28 10:43:34 +08:00
shijing	f5f7ec2e54	性能检验添加编辑	2024-02-28 10:43:32 +08:00
caoqianming	b5c5507564	fix: 多页面样式调整	2024-02-27 18:21:54 +08:00
caoqianming	7eff5872f6	fix: 智能治理结构优化	2024-02-27 16:04:11 +08:00
caoqianming	ce5562a20f	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2024-02-27 15:20:17 +08:00
caoqianming	f0b16b601c	fix: rpj_show选择证书不显示的bug	2024-02-27 15:20:15 +08:00
shijing	3e7cacb061	style	2024-02-27 14:32:20 +08:00
shijing	3c0b221c13	页面标题	2024-02-27 14:28:47 +08:00
shijing	33eb880002	pollutant2	2024-02-27 14:24:50 +08:00
shijing	dc74f69cc3	页面标题样式统一	2024-02-27 14:22:45 +08:00
shijing	762f648d23	页面标题样式统一	2024-02-27 14:20:08 +08:00
caoqianming	6e7b2a9f57	fix: 污染源界面样式调整	2024-02-27 14:04:37 +08:00
caoqianming	9715aace46	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2024-02-27 13:55:09 +08:00
caoqianming	051319c883	fix: 排口清单样式调整	2024-02-27 13:55:08 +08:00
shijing	dc7d7f1ec0	dapingshujutiaoshi	2024-02-27 13:49:19 +08:00
shijing	bc4b944272	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2024-02-27 13:48:39 +08:00
shijing	488e74ccf0	enp新增接口	2024-02-27 13:48:36 +08:00
caoqianming	2ae64eef2a	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2024-02-27 13:44:19 +08:00
caoqianming	dbdc20b42b	fix: 有组织排放内容调整	2024-02-27 13:44:17 +08:00
shijing	a914d61e8a	视频显示	2024-02-27 09:01:07 +08:00
caoqianming	8629e1bf61	fix: 根据项目code个性化定制的bug	2024-02-26 18:46:18 +08:00
caoqianming	4918d99218	fix: 登录后顶栏名称错误	2024-02-26 17:23:53 +08:00
shijing	b0452cfb96	菜单更改	2024-02-26 14:45:10 +08:00
shijing	a1f2c86055	页面更新	2024-02-23 17:01:02 +08:00
shijing	a7616c4d60	接口添加	2024-02-23 11:20:29 +08:00
shijing	f26cd3f2f6	洗车记录	2024-02-23 11:20:10 +08:00
shijing	1a3f77a6a9	小问题修改	2024-02-22 14:29:53 +08:00
shijing	a57fa2f750	工序合格数统计	2024-02-22 11:03:45 +08:00
shijing	fa87c5fdce	生产检验统计表加名称规格型号列	2024-02-22 10:05:21 +08:00
shijing	6c795c0127	任务进度添加规格和开工完工时间	2024-02-22 09:56:37 +08:00
shijing	78f9b40a1b	生产线表格中炉号变动	2024-02-22 09:49:19 +08:00
shijing	2a4fdf1573	滚动table中新增设备状态	2024-02-22 09:46:39 +08:00
shijing	6beafdc9f2	成品检验表格宽度修改	2024-02-22 09:40:06 +08:00
shijing	136eff089f	10车间车间看板全年生产统计柱状图标注更改颜色和位置	2024-02-22 09:11:10 +08:00
shijing	688b3b82fe	首页库存、生产进度更改	2024-02-22 09:10:00 +08:00
shijing	5401d07003	shouye	2024-02-21 09:46:54 +08:00
shijing	bbb096e67c	光子首件检验人员筛选	2024-02-21 09:13:44 +08:00
shijing	06f87adc45	添加事件批量删除按钮与前方的间隔	2024-02-20 10:02:55 +08:00
shijing	65a4795721	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2024-02-20 10:01:51 +08:00
shijing	bd0f46d7e9	事件相关接口的变动	2024-02-20 10:01:48 +08:00
caoqianming	2597e63aeb	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2024-02-20 10:01:29 +08:00
caoqianming	0f33197bb0	feat: 添加治理设备和监控设备界面	2024-02-20 10:01:27 +08:00
shijing	594a217af2	事件批量删除	2024-02-19 17:08:05 +08:00
shijing	a2e91fa968	报警事件批量删除	2024-02-19 16:57:42 +08:00
shijing	6244d0d49f	菜单变动	2024-02-19 10:58:47 +08:00
shijing	68416ae7a9	菜单变动	2024-02-19 10:55:51 +08:00
caoqianming	3240f66f8a	fix: 处理合并冲突	2024-02-19 10:52:17 +08:00
caoqianming	da3136ecc6	feat: 智能治理页面	2024-02-19 10:48:00 +08:00
shijing	e60973b274	运输页面	2024-02-05 17:02:41 +08:00
shijing	3cf1e45762	样式更改	2024-02-04 17:36:43 +08:00
caoqianming	e1817e611f	feat: cems2,cemsExport导出	2024-02-04 14:28:05 +08:00
caoqianming	26b055ab6f	feat: 调整cmes界面	2024-02-04 14:16:59 +08:00
caoqianming	4dc0136368	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2024-02-04 10:07:40 +08:00
caoqianming	08290605e2	feat: 新增pollutant页面	2024-02-04 10:07:38 +08:00
shijing	64bad78780	背景图片丢失修改	2024-02-04 09:03:57 +08:00
shijing	cf3cfeba90	pfkecharts	2024-02-01 18:13:50 +08:00
shijing	d51041cd20	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2024-02-01 17:59:29 +08:00
shijing	41137027c0	pfkecharts	2024-02-01 17:59:24 +08:00
caoqianming	b895165e99	merge: 合并更改	2024-02-01 17:57:52 +08:00
caoqianming	6e3e7c4e8e	feat: 新增污染源清单	2024-02-01 17:56:47 +08:00
caoqianming	72f7bc4a38	feat: 界面调整	2024-02-01 17:56:29 +08:00
shijing	5c87111b7c	zhutisexiala	2024-02-01 15:17:57 +08:00
shijing	d9e61258a3	zhutisexiala	2024-02-01 15:17:15 +08:00
shijing	807294d364	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2024-02-01 15:09:28 +08:00
shijing	17b9e166f0	pfk	2024-02-01 15:09:22 +08:00
caoqianming	eeeadd9b98	feat: cems导出接口完善	2024-02-01 14:15:59 +08:00
caoqianming	868a7e7f51	fix: cems.vue筛选条件	2024-02-01 14:02:29 +08:00
caoqianming	1873f17e4c	feat: 添加cems导出界面	2024-02-01 09:32:28 +08:00
shijing	1923d9ca2e	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2024-01-31 16:22:38 +08:00
shijing	755d02fa85	wry	2024-01-31 16:22:34 +08:00
caoqianming	24876dcf38	feat: cems2监测预警页面	2024-01-31 16:19:50 +08:00
shijing	187005d361	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2024-01-31 14:00:40 +08:00
shijing	55c36acaec	wry	2024-01-31 14:00:36 +08:00
caoqianming	99325eb5cf	fix: cems样式调整	2024-01-31 13:57:08 +08:00
caoqianming	721030420a	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2024-01-31 13:20:19 +08:00
caoqianming	60e6e154f7	feat: 添加cems监测清单页及相应的接口	2024-01-31 13:20:18 +08:00
shijing	58e7ea29ad	退火时车间库存的筛选	2024-01-31 13:19:14 +08:00
shijing	57daa1bc19	退火日志撤回	2024-01-31 10:07:25 +08:00
shijing	29b64b9a2a	退火提交	2024-01-31 09:29:55 +08:00
caoqianming	e2015236e7	feat: 调整scTable默认配置	2024-01-30 16:14:37 +08:00
shijing	d2f39536af	enpTable中hover状态背景色	2024-01-30 15:29:34 +08:00
shijing	dd4529bd3b	enpTable中hover状态背景色	2024-01-30 15:29:05 +08:00
shijing	27ed58bf5c	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2024-01-30 14:44:08 +08:00
shijing	6c20c1180a	超低排放	2024-01-30 14:43:54 +08:00
caoqianming	9afbeaa891	feat: 增加物料复制功能	2024-01-29 18:41:46 +08:00
caoqianming	5c7a61089b	feat: 简化mlogb逻辑	2024-01-28 00:21:32 +08:00
caoqianming	4855ab4028	fix: 10车间mlog编辑	2024-01-27 22:50:15 +08:00
caoqianming	6cb3e526aa	fix: 退火先去除不必要的表单项目	2024-01-25 13:23:24 +08:00
caoqianming	729dd9b38d	feat: 出入库记录增加执行车间	2024-01-25 10:17:27 +08:00
caoqianming	f855f65d25	fix: mioitem batch选择时可显示数量	2024-01-25 10:13:18 +08:00
caoqianming	0a12e323f9	fix: 性能检验列表展示用户名	2024-01-25 10:05:25 +08:00
caoqianming	5c5a0bafc0	fix: 出入库记录按物料类型筛选	2024-01-24 11:56:48 +08:00
caoqianming	9a9ddcfe5d	feat: 出入库记录按物料类型筛选	2024-01-24 11:26:37 +08:00
caoqianming	8458dc765e	feat: 隐去加工工具和辅助工装	2024-01-24 11:26:10 +08:00
caoqianming	72875e5b0b	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2024-01-24 09:32:00 +08:00
caoqianming	98581e7d51	fix: mioitem_form车间批次号获取	2024-01-24 09:31:57 +08:00
shijing	5ed9cd6d72	batch跟随mtask日期	2024-01-24 09:02:29 +08:00
shijing	0a273bbfca	获取项目code	2024-01-23 17:07:33 +08:00
shijing	ee580fdb27	托克逊大屏文案更改	2024-01-23 16:59:47 +08:00
shijing	376a0900e1	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2024-01-23 11:19:14 +08:00
shijing	fa600610d9	materialList展示	2024-01-23 11:19:09 +08:00
caoqianming	9ea6c53725	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2024-01-23 10:54:49 +08:00
caoqianming	47d11d82db	能管模拟数据	2024-01-23 10:54:47 +08:00
shijing	e0dcddfec6	数据看板今日任务改动	2024-01-23 09:08:08 +08:00
shijing	c2d09a0fe1	7车间数据	2024-01-22 17:54:35 +08:00
shijing	410a55b411	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2024-01-22 17:07:13 +08:00
caoqianming	29b073759d	fix: 7车间设备查询使用升降式退火炉	2024-01-22 17:07:11 +08:00
shijing	0f15a76945	6车间看板数据调整	2024-01-22 17:07:04 +08:00
caoqianming	7e5d95a0a3	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2024-01-22 17:05:26 +08:00
caoqianming	98f10a3182	fix: 交接单时保留2位数的bug	2024-01-22 17:05:24 +08:00
shijing	5538f8354c	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2024-01-22 13:45:17 +08:00
shijing	f916b09ec6	数据大屏多次请求问题	2024-01-22 13:45:09 +08:00
caoqianming	96921a938e	fix: material_form选择时使用full_name	2024-01-22 09:12:35 +08:00
shijing	940c1b6337	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2024-01-22 08:50:53 +08:00
shijing	348bd899d5	数据大屏为昨日周所在数据	2024-01-22 08:50:49 +08:00
caoqianming	1d896185a2	fix: 6车间炸纹未纳入count_ok统计	2024-01-20 22:50:02 +08:00
caoqianming	03698ba109	fix: count_n_w改为count_n_wq	2024-01-20 22:39:54 +08:00
caoqianming	d9cf2d8b72	fix: 路线选择返回item需要使用value-key	2024-01-20 22:31:36 +08:00
caoqianming	0a47b93517	feat: 退火显示完整物料名称	2024-01-20 22:30:48 +08:00
caoqianming	f1a65e94d0	feat: 混料显示完整物料名称	2024-01-20 22:29:52 +08:00
shijing	a85dca660f	生产检验统计	2024-01-19 17:40:06 +08:00
shijing	3162c5948a	统计分析-合格数统计	2024-01-19 16:52:54 +08:00
shijing	4b533d4e94	6车间看板昨日改为本周工序进度	2024-01-19 16:06:40 +08:00
shijing	8ba7a12c88	AVG日志记录	2024-01-19 15:12:28 +08:00
shijing	b2343d5438	gantt悬浮时间显示	2024-01-19 11:17:50 +08:00
shijing	3a3d89d127	成品检验&0119的问题	2024-01-19 11:11:07 +08:00
shijing	b3edf33de9	混料小数点&#117	2024-01-18 14:58:57 +08:00
shijing	1212162a7e	批次号自动生成10车间	2024-01-18 14:26:22 +08:00
shijing	f9d146240a	批次号自动生成	2024-01-18 14:22:05 +08:00
shijing	4e468abfd5	成品检验未完成	2024-01-18 14:13:07 +08:00
shijing	82c300d25c	首件检验	2024-01-17 17:48:46 +08:00
shijing	4fe31bb4c8	#116	2024-01-17 15:49:26 +08:00
shijing	6c73fda22e	#113&6车间合格率小数位问题	2024-01-17 15:04:37 +08:00
shijing	10376bbbdf	获取检验项查询条件	2024-01-16 18:15:16 +08:00
shijing	7ef9042a0d	#115	2024-01-16 17:47:43 +08:00
shijing	88fcbe4518	enp	2024-01-16 15:41:08 +08:00
shijing	5e1990c1a0	picture	2024-01-15 16:10:49 +08:00
shijing	2b148dbd91	mtask提交	2024-01-10 16:06:26 +08:00
shijing	6172ca5a80	交付参数更改	2024-01-10 14:25:12 +08:00
shijing	355159e49a	系统基本信息获取	2024-01-10 13:42:55 +08:00
shijing	ac79990bbf	生产入库、采购入库记录检验	2024-01-10 09:44:54 +08:00
shijing	5109a85764	物料统计	2024-01-09 17:02:38 +08:00
shijing	ef2612f2b7	销售统计查询条件更改	2024-01-09 09:35:10 +08:00
shijing	890d41dfa4	rukujianyan	2024-01-09 09:13:55 +08:00
shijing	b9e1fe491c	销售统计	2024-01-05 17:54:27 +08:00
shijing	6472e9adcb	性能检验	2024-01-05 17:50:20 +08:00
shijing	d741746c7f	生产统计数据调试	2024-01-04 19:09:24 +08:00
shijing	8e5fca3daf	utask终止	2024-01-04 13:27:19 +08:00
shijing	4b3e3bf1a4	mlog中shift问题	2024-01-03 16:42:35 +08:00
shijing	060c15c314	混料去除四舍五入	2024-01-02 16:37:25 +08:00
shijing	4d122d9ad7	报错更改error Handler.js#109	2024-01-02 10:28:39 +08:00
shijing	d4fb4ca081	rowclick冒泡	2023-12-28 17:55:24 +08:00
shijing	484618d842	BABYLON引用依赖本地化	2023-12-28 15:14:40 +08:00
shijing	6674e0e123	首页柱状图tip文案显示，进度条文案，以及GATT改动	2023-12-28 10:25:54 +08:00
shijing	cabb27a41d	首页柱状图tip文案显示，进度条文案，以及GATT改动	2023-12-28 10:23:37 +08:00
caoqianming	0e06b13501	fix: 大屏getDeptDetail错误	2023-12-27 18:32:16 +08:00
shijing	417a583c7a	#设备查询	2023-12-27 13:25:30 +08:00
shijing	4bd9b311cf	#986车间日志填写的不合格原因错误	2023-12-27 09:35:26 +08:00
shijing	598e461d0d	#	2023-12-26 18:01:45 +08:00
shijing	de3e9e6532	#10410车间车间看板累计合格	2023-12-26 17:46:44 +08:00
shijing	3904743f49	#106车间今日任务显示utask	2023-12-26 16:21:56 +08:00
shijing	9ddc0f2555	车间名称改成门牌名称&不合格统计自动切换	2023-12-26 16:06:45 +08:00
shijing	5e056b56a7	#105车间看板合格率小数位保留整数	2023-12-26 14:26:14 +08:00
shijing	6e99ddf001	#108混料每桶kg可以有两位小数	2023-12-26 14:07:57 +08:00
shijing	12b25518c3	出入库记录mioitem新增时选项限制	2023-12-26 14:03:33 +08:00
shijing	95d2b1ca42	#9210车间配粉料数编辑隐去	2023-12-26 09:42:11 +08:00
shijing	80c2676551	#90到岗记录第二次新建回携带数据有显示问题	2023-12-26 09:31:43 +08:00
shijing	e2b980a6d0	登录页logo大小调整	2023-12-26 09:20:53 +08:00
shijing	8c835fe715	数据大屏数据同步	2023-12-25 17:30:11 +08:00
shijing	b11e2aaeb4	数据大屏数据同步	2023-12-25 16:57:55 +08:00
shijing	d7d215fbd7	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2023-12-25 13:51:10 +08:00
shijing	64b6b7b3dc	6车间看板	2023-12-25 13:51:06 +08:00
caoqianming	02162eb83e	fix: 车间库存显示count__gte	2023-12-25 13:09:19 +08:00
caoqianming	eee2fb8372	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2023-12-25 12:48:10 +08:00
caoqianming	e355fcedc7	fix: 6车间任务执行筛选及相关调整	2023-12-25 12:48:09 +08:00
shijing	495955c495	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2023-12-25 11:03:21 +08:00
shijing	5e26baf75f	6车间看板	2023-12-25 11:03:15 +08:00
caoqianming	29bd6ac6a2	fix: 进入某些出入库记录时不用做限制以及部分优化	2023-12-25 10:46:48 +08:00
caoqianming	611255a2d0	fix: 仓库查看按钮先去除	2023-12-25 10:08:35 +08:00
caoqianming	6a212139d2	fix: 10车间日志展示调宽	2023-12-25 09:18:53 +08:00
caoqianming	b379532a9e	修改10车间显示物料全名及不合格数	2023-12-24 19:00:11 +08:00
caoqianming	99413a3fef	fix: 切换账号时菜单不变化	2023-12-24 18:49:12 +08:00
caoqianming	7591e3c34c	fix: 移动端logo和name从config获取	2023-12-24 18:35:27 +08:00
caoqianming	a24eece353	feat: 去除不必要的超管判断	2023-12-23 17:31:25 +08:00
caoqianming	e4658ea882	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2023-12-23 17:30:46 +08:00
caoqianming	795044c841	fix: worktask_form放出班次	2023-12-23 17:30:43 +08:00
shijing	0ecd78bf40	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2023-12-22 17:46:14 +08:00
shijing	e8ae54f706	车间看板	2023-12-22 17:46:09 +08:00
caoqianming	8f79680b21	fix: selectMaterialChange bug	2023-12-22 14:04:33 +08:00
caoqianming	222d766c11	fix: 出入库记录物料批次选择	2023-12-22 13:46:54 +08:00
caoqianming	517d10b572	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2023-12-22 13:46:22 +08:00
caoqianming	9182c99ba1	fix: 部分按钮添加v-auth	2023-12-22 13:46:19 +08:00
shijing	17dd67d1b4	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2023-12-22 11:11:39 +08:00
shijing	9669badae8	index_10dept	2023-12-22 11:11:36 +08:00
caoqianming	a9d0660617	fix: 型号规格用|隔开	2023-12-22 10:58:50 +08:00
caoqianming	a1b74f4639	fix: 班次选择，先这样处理	2023-12-22 10:38:09 +08:00
caoqianming	b207edccf5	fix: 任务分解按钮code错误	2023-12-22 09:40:58 +08:00
caoqianming	a8cd681e33	fix: 班组管理新增后刷新	2023-12-22 09:40:18 +08:00
caoqianming	ddfc2cb5b5	feat: 设备所属车间筛选条件	2023-12-22 09:39:50 +08:00
caoqianming	9ee05321e8	fix: 长白班和两倒	2023-12-21 21:25:10 +08:00
caoqianming	c691474254	fix: employee光子页面 update控权	2023-12-21 21:24:50 +08:00
caoqianming	8fdd0268ee	feat: mioitem 物料看full_name	2023-12-21 15:21:22 +08:00
caoqianming	b1eef89d87	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2023-12-21 15:11:32 +08:00
caoqianming	e0ba3ca6fb	fix: 7车间 10车间批次号手填	2023-12-21 15:10:48 +08:00
shijing	976c92cdec	加工路线中step居中	2023-12-21 14:44:24 +08:00
shijing	c95c7134d7	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2023-12-21 14:33:22 +08:00
shijing	f789550dfe	home	2023-12-21 14:33:19 +08:00
caoqianming	a3670056ae	fix: 到岗记录获取部门错误	2023-12-21 14:08:53 +08:00
caoqianming	d4094d3607	fix: team_photon去除硬编码2	2023-12-21 13:32:57 +08:00
caoqianming	a57b49316b	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2023-12-21 13:25:30 +08:00
caoqianming	01276e0a00	fix: team_photon去除硬编码	2023-12-21 13:25:28 +08:00
shijing	278e3c3648	role	2023-12-21 13:16:46 +08:00
shijing	a629a3cf2c	role	2023-12-21 13:13:09 +08:00
caoqianming	21c6b5177b	fix: 人员编辑bug	2023-12-21 13:05:56 +08:00
caoqianming	cbcde10f80	fix: role create update 没有刷新	2023-12-21 12:58:29 +08:00
caoqianming	e5edaf1b3c	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2023-12-21 10:40:50 +08:00
caoqianming	cffbecf330	feat: route增加筛选	2023-12-21 10:40:21 +08:00
caoqianming	f2afea91ed	feat: material添加是否隐藏选项	2023-12-21 10:39:43 +08:00
shijing	5b0ed75718	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2023-12-21 10:22:16 +08:00
shijing	115045b520	首页控制台数据	2023-12-21 10:22:10 +08:00
caoqianming	d8f49bb9c5	fix: 任务执行界面查询过滤	2023-12-21 01:26:59 +08:00
caoqianming	4b822b7b52	fix: worktask_form批次号限制及其他一些问题	2023-12-21 00:58:25 +08:00
caoqianming	4a8bae6c00	fix: 按钮样式错误	2023-12-20 23:51:42 +08:00
caoqianming	b1bd32cca0	fix: sysconfig修改	2023-12-20 21:56:44 +08:00
caoqianming	27282570e9	feat: 路线选择可筛选	2023-12-20 21:05:59 +08:00
caoqianming	82f11fe205	feat: 输入/输出物料添加筛选条件	2023-12-20 20:53:11 +08:00
caoqianming	5f2ab70e8c	feat: 车间库存处添加已到工序	2023-12-20 15:27:29 +08:00
caoqianming	56e180b46f	feat: 加工路线新建表单时返回物料full_name	2023-12-20 15:22:12 +08:00
caoqianming	5ff50b579c	feat: 路线编辑返回物料full_name2	2023-12-20 15:20:22 +08:00
caoqianming	606aef07c2	feat: 路线编辑返回物料full_name	2023-12-20 15:18:47 +08:00
shijing	cb2418fcf1	material&route中material展示加规格型号	2023-12-20 14:05:21 +08:00
shijing	90403e3577	#86物料创建或编辑时物料类型必选	2023-12-20 13:53:52 +08:00
shijing	ff2cb928c6	#73有甘特图的地方加时间范围搜索	2023-12-20 13:25:02 +08:00
shijing	76e50e36e2	页面权限设置	2023-12-20 10:05:09 +08:00
shijing	39f8a9fda6	部门提交更新	2023-12-19 17:18:51 +08:00
caoqianming	e1563f70bb	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2023-12-19 17:03:22 +08:00
caoqianming	94dbdc4d86	fix: 路由表完善	2023-12-19 17:03:20 +08:00
shijing	bd24a20f3b	菜单权限配置	2023-12-19 16:55:41 +08:00
shijing	1a45a24d7c	菜单更改	2023-12-19 15:23:24 +08:00
shijing	354343c882	#85	2023-12-19 09:04:16 +08:00
shijing	78e3647f46	#72	2023-12-19 08:59:27 +08:00
shijing	ce162d5f9a	#71生产管理-6车间mtask需要可编辑	2023-12-18 15:40:39 +08:00
shijing	f334f1c646	首页文案更改	2023-12-18 15:06:20 +08:00
shijing	7ce9f1d9f6	结石气线分开	2023-12-18 14:50:04 +08:00
caoqianming	4657a2591d	feat: 增加mtask合格数展示	2023-12-18 13:32:46 +08:00
caoqianming	5ef55f83a5	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2023-12-18 13:25:44 +08:00
caoqianming	2f2220c5c1	feat: 6车间mlog撤回	2023-12-18 13:25:42 +08:00
shijing	825364b137	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2023-12-18 13:14:34 +08:00
shijing	83ce1372ae	#82采购计划详情-没有新增	2023-12-18 13:14:31 +08:00
caoqianming	ae299a4194	feat: 10车间撤回	2023-12-18 13:03:02 +08:00
shijing	29330fe515	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2023-12-18 12:36:23 +08:00
shijing	1b191df783	绩效	2023-12-18 12:36:18 +08:00
caoqianming	965dfdb670	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2023-12-18 12:35:04 +08:00
caoqianming	6febb51cdb	feat: 日志撤回，目前只修改了7车间	2023-12-18 12:34:00 +08:00
shijing	1a1a838042	合格率格式更改	2023-12-18 10:19:16 +08:00
shijing	855d365394	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2023-12-18 09:49:59 +08:00
shijing	391e33bd0e	7车间完成率	2023-12-18 09:49:56 +08:00
caoqianming	b1e2871e03	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2023-12-17 20:35:18 +08:00
caoqianming	7a4e70626d	feat: mtask执行时添加配分料数	2023-12-17 20:35:15 +08:00
shijing	4424ce7030	绩效考核初始页面	2023-12-16 13:01:21 +08:00
shijing	d0b651745d	6、7、10mlog提交，退火新增交接记录	2023-12-16 12:32:48 +08:00
shijing	9f5aa25aca	成品组合件	2023-12-16 09:37:02 +08:00
shijing	3aa3bec7de	统计2	2023-12-15 15:15:32 +08:00
shijing	c07fd76ed5	统计2	2023-12-15 15:13:43 +08:00
shijing	b924fb5af6	统计	2023-12-13 11:27:33 +08:00
shijing	96bff20959	库存改动	2023-12-11 13:42:40 +08:00
shijing	ba2d621214	库存改动	2023-12-11 13:41:47 +08:00
shijing	700f04aa13	生产执行改动	2023-12-06 17:41:10 +08:00
shijing	c0ea8b80a9	混料新增修改	2023-12-05 10:23:46 +08:00
shijing	1f1d96528a	gantt修改	2023-12-05 08:49:20 +08:00
caoqianming	5ce7ce250f	feat: 添加很多新页面	2023-12-01 16:15:25 +08:00
caoqianming	ae4863529f	fix: 7车间大屏一些修改	2023-11-28 08:03:27 +08:00
caoqianming	2ddcb49616	fix: 一些修改	2023-11-28 08:03:13 +08:00
caoqianming	c62188eaa7	fix: mtask页面的bug修改	2023-11-28 00:40:28 +08:00
caoqianming	93a85eb192	fix: 一些bug调整	2023-11-27 18:14:35 +08:00
caoqianming	831d75bb4d	feat: 大屏样式的修改	2023-11-27 13:53:27 +08:00
caoqianming	98d2b3d20f	feat: wpm添加了其他日志用于录入avg	2023-11-27 13:52:27 +08:00
shijing	0316f42e11	异常修改（未完成）	2023-11-24 17:13:02 +08:00
shijing	a81eea91ca	gantt图问题修复	2023-11-24 11:38:23 +08:00
shijing	0f6ffb356b	el-tag	2023-11-24 10:39:36 +08:00
shijing	db3e181254	el-tag标签属性type没有primary修正	2023-11-24 10:33:13 +08:00
shijing	a79651d7b7	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2023-11-23 17:27:34 +08:00
shijing	e548bd52af	到岗单加人	2023-11-23 17:27:18 +08:00
caoqianming	7659d641ab	fix: 解决ResizeObserver loop 的问题	2023-11-23 16:24:11 +08:00
caoqianming	0a4b380668	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2023-11-23 16:07:54 +08:00
caoqianming	5d8621cac0	feat: mgroup增加排班规则字段	2023-11-23 16:07:48 +08:00
shijing	c073c25436	大屏看板头部字体	2023-11-23 16:05:53 +08:00
shijing	dd2fc9a455	更改菜单栏	2023-11-23 11:29:51 +08:00
shijing	924ed50ce8	dataset.delete	2023-11-23 11:29:11 +08:00
shijing	9682eadf4f	数据大屏	2023-11-23 11:25:33 +08:00
shijing	1e18828985	到岗记录	2023-11-23 11:24:58 +08:00
shijing	74c37d903d	性能检验tabs改动及记录查看	2023-11-23 11:23:45 +08:00
shijing	d137beb872	设备相关改动及设备巡检	2023-11-23 11:22:38 +08:00
shijing	ed835482a0	统计分析的四个统计模块	2023-11-23 11:20:23 +08:00
shijing	07bb1011da	抽取组件（table中的行自动循环）	2023-11-23 11:19:11 +08:00
shijing	5d125d0875	daogangjilu	2023-11-21 09:25:43 +08:00
shijing	36321f144d	tkx部分更改	2023-11-20 18:13:38 +08:00
shijing	0229338a5f	team	2023-11-20 16:50:23 +08:00
shijing	df9bdab0a6	新增查询规范	2023-11-20 13:46:29 +08:00
shijing	22cf49a6b3	到岗	2023-11-17 19:20:29 +08:00
shijing	21764716dd	大屏看板	2023-11-15 19:05:22 +08:00
shijing	bb40ee35e3	vue-json-edit	2023-11-14 11:18:57 +08:00
caoqianming	6eee28c91d	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2023-11-14 10:28:17 +08:00
caoqianming	5d5ea3e1c3	feat: bidataset修改数据	2023-11-14 10:26:36 +08:00
shijing	ae78d57720	ganttanddialog	2023-11-13 18:44:15 +08:00
shijing	821bf22e8c	1110笔记部分修改	2023-11-13 11:04:39 +08:00
caoqianming	283321f238	fix: 大屏及部分bug修复	2023-11-13 08:51:08 +08:00
shijing	155a4c7b7e	feat: 光子大屏页面调整	2023-11-10 08:29:49 +08:00
shijing	b85c654591	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2023-11-08 09:23:15 +08:00
shijing	ca3c430e75	shujukanbancolorsChange	2023-11-08 09:23:12 +08:00
caoqianming	bbb3d40b11	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2023-11-08 09:04:37 +08:00
caoqianming	707dbf6a19	feat: index_10dept界面修改	2023-11-08 09:04:35 +08:00
shijing	2249f5fc3e	shujukanbancolorsChange	2023-11-08 09:03:05 +08:00
shijing	dfc84e220b	shujukanban	2023-11-07 14:21:02 +08:00
caoqianming	d261ae7b7e	feat: 10dept界面优化	2023-11-07 13:03:15 +08:00
caoqianming	d3c47a12c3	feat: 安装了datavue3	2023-11-07 09:08:35 +08:00
caoqianming	024301c294	fix: 解决冲突	2023-11-06 19:19:07 +08:00
caoqianming	6c4b1f75d1	feat: 车间看板调整	2023-11-06 19:16:25 +08:00
shijing	d7c0fa0843	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2023-11-06 17:43:23 +08:00
shijing	f91ae2f5d2	jianyan	2023-11-06 17:43:19 +08:00
caoqianming	f3ece1dd0e	feat: 增加了车间看板	2023-11-06 15:53:22 +08:00
shijing	c5b6eb4f58	部分检验	2023-11-03 19:24:34 +08:00
shijing	329d30eecb	gantt图修改，生产执行修改	2023-11-01 10:28:16 +08:00
shijing	9fb27aa062	10.26日要修改内容以及检验页面	2023-10-27 17:15:36 +08:00
shijing	e246e6f33b	1026修改	2023-10-26 14:49:50 +08:00
shijing	0c8fd90feb	utask分车间创建工段控制显示	2023-10-26 08:52:42 +08:00
shijing	3249a6c29d	utask分车间创建	2023-10-25 18:51:52 +08:00
caoqianming	5a7b647692	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2023-10-25 18:32:24 +08:00
caoqianming	4b5c43ae36	feat: 页面修改	2023-10-25 18:32:22 +08:00
shijing	d6e15c1917	7车间	2023-10-25 18:29:36 +08:00
shijing	1bdd206573	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2023-10-25 17:44:55 +08:00
caoqianming	9557074627	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2023-10-25 17:44:46 +08:00
shijing	e7c4832ac0	1025	2023-10-25 17:44:12 +08:00
caoqianming	c456086901	feat: 出入库页面基本完成	2023-10-25 17:33:39 +08:00
shijing	8837579a5d	mtask日志提交	2023-10-25 14:02:08 +08:00
shijing	33343150bf	按钮图标更改	2023-10-25 13:17:04 +08:00
shijing	b902e59588	6车间utask详情	2023-10-25 13:09:25 +08:00
shijing	fbc7806a73	6车间日志编辑	2023-10-25 12:35:32 +08:00
shijing	d15cc32e7d	6车间日志提交	2023-10-25 10:27:10 +08:00
shijing	59d8c6f3df	设备检验记录新增	2023-10-24 14:58:57 +08:00
shijing	e5f3d24205	worktask	2023-10-24 14:55:11 +08:00
shijing	ce1e98df96	worktask	2023-10-20 18:03:04 +08:00
shijing	740c73ec1f	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2023-10-20 09:32:18 +08:00
shijing	7429dd3dce	更改样式	2023-10-20 09:30:52 +08:00
caoqianming	c4d06c06d0	fix: 展示可排产的订单明细	2023-10-20 09:07:57 +08:00
caoqianming	f41e7a8a67	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2023-10-19 14:16:45 +08:00
shijing	51570f408b	task2	2023-10-19 14:15:32 +08:00
caoqianming	84adac4680	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2023-10-19 14:12:53 +08:00
caoqianming	b65b83dc20	fix: 订单/采购订单相关页面修改	2023-10-19 14:08:31 +08:00
shijing	584b22fbbd	页面调整	2023-10-18 17:12:23 +08:00
caoqianming	848182e6a4	feat: 物料/工段/工艺路线页面及排产部分逻辑	2023-10-18 16:31:52 +08:00
shijing	355dfc5250	生产执行页面	2023-10-17 09:04:17 +08:00
shijing	6bae3795da	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2023-10-13 08:55:21 +08:00
shijing	19d1a3a847	1013	2023-10-13 08:55:15 +08:00
caoqianming	17a030bdbf	fix: visit purpose options	2023-10-10 12:25:27 +08:00
caoqianming	2f30d9c2ee	feat: 门禁权限完成	2023-10-10 12:12:39 +08:00
caoqianming	a090b463ee	fix: 取消多标签页展示	2023-10-09 17:31:15 +08:00
caoqianming	7fa43de6c7	feat: 门禁权限查看与删除	2023-10-09 15:51:25 +08:00
shijing	c40364a1f7	光子基础模块	2023-10-09 12:46:15 +08:00
shijing	d216b6df98	fix:打卡记录添加标注，全场电量统计添加趋势图	2023-09-18 13:57:04 +08:00
shijing	2d2e9c9f74	fix:0915会议123456	2023-09-15 17:07:16 +08:00
shijing	ed9698aeea	fix:大屏数据更新	2023-09-14 14:51:20 +08:00
shijing	b61ff39468	fix:tracking依赖文件	2023-09-14 09:25:28 +08:00
shijing	3db54ec1f3	fix:工段定位	2023-09-13 17:23:55 +08:00
shijing	7a8f2c0813	fix:工段标识及建筑高亮	2023-09-12 08:37:08 +08:00
shijing	b149cb59e7	fix:交接班日志报告报表填充数据并导出	2023-09-11 15:12:48 +08:00
shijing	7a7ad8c9ce	fix:能量报警放到首页，回转窑报表调整	2023-09-08 17:09:09 +08:00
shijing	984dc6d7b7	fix:曲阳更改文案	2023-09-07 09:45:53 +08:00
shijing	b871efc464	fix:计量设备	2023-09-06 15:48:15 +08:00
shijing	db8e04276e	计量器具台账	2023-09-05 17:05:54 +08:00
shijing	a932162058	echarts表格数据填充	2023-09-04 14:31:05 +08:00
shijing	f14a2c2682	账号信息中个人打卡记录的处理	2023-09-04 10:58:58 +08:00
caoqianming	ae7cf80c64	feat: 添加天空和地面	2023-08-30 10:29:57 +08:00
shijing	2b98daca58	设备单位产品电耗趋势图	2023-08-28 13:35:41 +08:00
shijing	9dd33d43b1	曲阳修改	2023-08-28 08:47:21 +08:00
shijing	5ba3ab8656	生产报告趋势图数据导入	2023-08-25 14:23:48 +08:00
shijing	00e3fde1d4	添加电量小时、日、月统计报表	2023-08-24 16:31:35 +08:00
shijing	67aa47adb8	添加手机登录方式密码重置添加提醒	2023-08-24 10:27:17 +08:00
shijing	e1cadf9a74	密码强度设置	2023-08-24 08:58:27 +08:00
shijing	fda89dde11	fixed:部分修改	2023-08-22 09:25:32 +08:00
shijing	62631a2490	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2023-08-18 17:15:58 +08:00
shijing	285703dbad	fixed:首页调整	2023-08-18 17:15:53 +08:00
caoqianming	e1c29c282a	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2023-08-18 16:33:50 +08:00
caoqianming	a2784a473e	feat: 大屏效果2	2023-08-18 16:33:47 +08:00
shijing	8beb8b143e	fixed:统一页面筛选框样式	2023-08-18 14:37:42 +08:00
shijing	f4bd009948	fixed:工段报表导出以及宽度变小时的表单拖动问题	2023-08-18 10:18:11 +08:00
shijing	9caf5a3690	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2023-08-17 09:36:54 +08:00
shijing	3cdee248c9	fixd:8.17	2023-08-17 09:36:51 +08:00
caoqianming	55beb660cb	fix: 修改route perm先	2023-08-17 09:33:30 +08:00
caoqianming	be7bd541fd	feat: 大屏优化	2023-08-17 09:16:26 +08:00
caoqianming	10656c643a	fix: enm screen css调整	2023-08-16 16:05:24 +08:00
caoqianming	4f4a0c85a9	feat: 大屏效果初步完成	2023-08-16 13:56:12 +08:00
shijing	2d6ad430a4	fixd:系统图标中单位更正	2023-08-16 10:57:55 +08:00
shijing	fafe94dc91	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2023-08-15 14:13:03 +08:00
shijing	9c6fa00272	fixd:提交8.10问题修改（还差最后一条）	2023-08-15 14:12:59 +08:00
caoqianming	5ae4238b20	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2023-08-15 12:39:23 +08:00
caoqianming	5eeecdef14	feat: 添加大屏数据	2023-08-15 12:39:16 +08:00
shijing	ce43a1165f	fixd:工段图标	2023-08-11 17:15:19 +08:00
shijing	4119c93408	表格样式变动	2023-07-24 16:26:36 +08:00
shijing	6078fb329f	工段菜单	2023-07-24 11:30:08 +08:00
shijing	c3a656fc5d	登陆后首页	2023-07-19 16:13:55 +08:00
shijing	f95918bda3	feat:统计	2023-07-14 17:03:27 +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	d9181d1905	设备添加、产品添加	2023-06-30 17:25:14 +08:00
shijing	8bc055bf06	提醒配置文案更改，访客选项更改、添加拉送货车辆图片	2023-06-30 16:10:01 +08:00
shijing	c8c14c8f1c	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2023-06-30 08:56:58 +08:00
shijing	12e533fac9	设备、测点、测点集、班组页面	2023-06-30 08:56:51 +08:00
caoqianming	87a107144b	fix: filter recipient options 错误	2023-06-29 11:13:26 +08:00
caoqianming	3cab3db8cd	fix: opl detail时二次打开不刷新	2023-06-29 11:12:59 +08:00
caoqianming	3e85e50a19	fix: dutywork下都可处理	2023-06-22 08:35:39 +08:00
caoqianming	ec21622c42	fix: 工单处理相关bug解决	2023-06-22 01:50:19 +08:00
shijing	268c512273	feat:工单回退后编辑PC端	2023-06-21 17:52:50 +08:00
shijing	2e1411ce04	feat: 能管接口等	2023-06-21 17:52:07 +08:00
shijing	c2435fed9e	作业统计更改及添加大屏中作业所在区域的监控设备	2023-06-20 15:21:07 +08:00
shijing	1d55dc3c19	权限控制及原料磨页面	2023-06-20 10:04:21 +08:00
shijing	94904bcff8	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2023-06-16 16:55:50 +08:00
shijing	aea01b7df0	config&配置&原料磨	2023-06-16 16:55:41 +08:00
caoqianming	f8e1524e8b	fix: 批量布设时算法options不加入筛选条件	2023-06-16 08:56:32 +08:00
shijing	748fa2479a	许可证流程进度字体大小改动	2023-06-09 14:28:21 +08:00
shijing	b6fd672062	许可证添加流程进度	2023-06-09 13:13:49 +08:00
shijing	49e8368eaf	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2023-06-09 10:13:11 +08:00
shijing	fe48ad17dd	视频自动播放以及部门下监控设备的查看	2023-06-09 10:12:59 +08:00
caoqianming	b23783f942	feat: operation delete_hard2	2023-06-07 10:08:06 +08:00
caoqianming	2f2ea5dbd4	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2023-06-07 09:26:07 +08:00
caoqianming	6cd695a5b3	feat: operation delete_hard	2023-06-07 09:26:02 +08:00
shijing	f96cde3f00	打卡统计	2023-06-05 09:01:08 +08:00
shijing	3c718311db	打卡统计添加统计	2023-06-02 17:07:09 +08:00
caoqianming	f2e1f450ef	feat: 测试报表功能	2023-05-31 15:36:18 +08:00
caoqianming	a7c2c7478c	feat: 部门页面筛选	2023-05-29 15:21:33 +08:00
caoqianming	a1196c3b2b	fix: 拒绝颜色的属性	2023-05-29 15:20:48 +08:00
caoqianming	4380167d05	refector: 调整显示效果	2023-05-26 08:48:32 +08:00
caoqianming	7647378c0d	Merge commit '41d1df3bc6b6d895fdf544ee1a15a299d0ddf350' into v2	2023-05-26 08:40:02 +08:00
caoqianming	6b6d5b1266	Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2	2023-05-26 08:36:04 +08:00
caoqianming	de68080dcd	refactor: 修改菜单显示效果	2023-05-26 08:35:58 +08:00
shijing	dc4764c6ff	1	2023-05-25 14:23:43 +08:00
shijing	61e4a0a42e	feat:事件列表添加删除以及触发关联部门和作业票详情	2023-05-25 14:00:45 +08:00
shijing	4a9694c429	作业票模板改动，以及管理员权限变动	2023-05-25 13:57:22 +08:00
shijing	5a910c67d1	feat:添加触发人部门，添加事件删除添和关联的作业票详情	2023-05-25 13:53:40 +08:00
caoqianming	12f60e490b	refector: 请求不携带时间戳，需要的时候自行携带	2023-05-25 10:02:29 +08:00
caoqianming	c4b4e95ce5	fix: 权限auth 优化superuser	2023-05-22 16:40:21 +08:00
caoqianming	a80a1ab83e	Merge branch 'ehs' into v2	2023-05-11 14:40:39 +08:00
shijing	41d1df3bc6	首页在厂人员列表	2023-05-11 14:36:03 +08:00
shijing	b028869736	许可证图片必填，首页添加在场人员列表	2023-05-09 10:59:47 +08:00
shijing	fc908b1803	首页添加在厂人员	2023-05-08 09:53:55 +08:00
shijing	ff4f5bcce4	pc端许可证添加图片、更改相关方地图头像、修改相关方项目人员	2023-04-27 16:03:04 +08:00
caoqianming	73d3724e8e	fix: 导出excel时未导入config	2023-04-23 08:57:05 +08:00
caoqianming	b8d49dd356	feat: 人员列表导出	2023-04-20 10:22:52 +08:00
caoqianming	2a109634e7	refector: 相关方人员证书可编辑	2023-04-14 00:33:12 +08:00
caoqianming	53ec05a036	fix: 大屏点击区域只显示正在进行的作业	2023-04-14 00:04:11 +08:00
caoqianming	376f40c124	fix: opl detail logsData显示bug	2023-04-13 23:46:52 +08:00
caoqianming	1460a6466a	refector: opl和visit显示照片	2023-04-13 17:01:58 +08:00
caoqianming	e63926cffb	fix: 证书只能上传一张;opl detail显示	2023-04-13 16:26:44 +08:00
caoqianming	bb1b867238	refector: ep.vue增加筛选条件	2023-04-12 16:40:40 +08:00
caoqianming	de5746330a	fix: 绑定解绑定位卡后刷新列表	2023-04-12 15:29:42 +08:00
caoqianming	dc78d09542	fix: 许可证关于level的options修改	2023-04-12 15:26:49 +08:00
caoqianming	4a48e69248	feat: 增加相关方黑名单功能	2023-04-07 15:07:06 +08:00
caoqianming	bdad640645	refector: rpj 证书显示的修改	2023-04-05 18:37:19 +08:00
caoqianming	3bc21a1adc	fix: opl未提交前可编辑	2023-04-05 18:36:43 +08:00
shijing	a6a0fcdc5a	添加人员筛选以及被退回的相应处理	2023-03-31 14:22:22 +08:00
caoqianming	ec38844851	refector: 导出作业pdf样式优化	2023-03-27 14:21:08 +08:00
caoqianming	3e85c7771c	refector: 文字调整	2023-03-27 12:39:52 +08:00
caoqianming	1177af5088	refector: 界面字段优化	2023-03-24 17:54:54 +08:00
shijing	1cfd216468	项目人员变动	2023-03-24 17:11:36 +08:00
shijing	f3bffa50ca	普通作业作业前照片测试	2023-03-23 17:14:35 +08:00
shijing	fda36d30aa	tinyChange	2023-03-23 11:13:25 +08:00
shijing	ffdb17596f	导出添加tips	2023-03-23 10:15:49 +08:00
shijing	dcb843a554	jjj	2023-03-21 11:26:45 +08:00
shijing	9b6f1d0995	作业证导出调整	2023-03-20 10:45:17 +08:00
shijing	1bf3a44513	自定义防抖指令	2023-03-17 17:13:18 +08:00
shijing	0d2250d417	账号信息添加打卡记录	2023-03-16 16:16:54 +08:00
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
shijing	2daa22557b	0907	2022-09-08 10:50:50 +07:00
曹前明	cd07f46cb9	账户管理增加type编辑	2022-09-07 18:34:08 +08:00
曹前明	b29f3cc295	增加筛选条件	2022-09-07 16:46:08 +08:00
曹前明	d81a6c77c8	user 界面显示岗位	2022-09-07 14:48:12 +08:00
曹前明	986c09bc22	Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs	2022-09-07 10:17:21 +08:00
曹前明	38a3d10117	增加回车检索	2022-09-07 10:17:12 +08:00
shijing	56154669b9	0906	2022-09-07 09:37:56 +08:00
曹前明	8fca5caaa8	Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs	2022-09-06 17:19:25 +08:00
曹前明	e36c5b43e3	blt sync bug	2022-09-06 17:19:15 +08:00
shijing	3b96be33e2	Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs	2022-09-06 17:07:08 +08:00
shijing	339f8033cd	change	2022-09-06 17:07:01 +08:00
曹前明	f9868d0494	首页修改	2022-09-06 15:51:06 +08:00
曹前明	1a1d809fe3	wf state getusers	2022-09-06 10:18:44 +08:00
shijing	a87f529fe8	route	2022-09-05 11:19:39 +08:00
shijing	729260cf37	bind	2022-09-05 10:50:43 +08:00
shijing	517a91a93b	bind	2022-09-05 10:48:11 +08:00
曹前明	4aefa086e6	Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs	2022-09-02 17:15:12 +08:00
曹前明	188f3ab2e7	fire页面采用选人组件	2022-09-02 17:14:55 +08:00
shijing	b4664383fb	Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs	2022-09-01 11:21:54 +07:00
shijing	1de0ea6f83	0831	2022-09-01 11:21:32 +07:00
曹前明	50a17fbd1d	同步设备后的刷新按钮	2022-09-01 11:04:36 +08:00
shijing	4f05f6f460	Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs	2022-08-31 14:58:46 +07:00
shijing	4c49964283	Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs	2022-08-31 14:55:00 +07:00
shijing	9ea3cb58a9	change	2022-08-31 14:54:53 +07:00
曹前明	44d836cc79	router修改	2022-08-31 14:55:43 +08:00
曹前明	f81f1c17d3	工单界面修改包括工单日志等	2022-08-31 14:54:44 +08:00
shijing	8c8eeeda69	mapChange	2022-08-26 17:27:37 +07:00
shijing	2d3b9fa8fe	weizhibiaoji	2022-08-26 17:21:29 +07:00
曹前明	ceb9365bc4	Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs	2022-08-26 16:24:35 +08:00
曹前明	96bdd862c1	喇叭设备同步	2022-08-26 16:24:25 +08:00
sc	530390f9d4	FIX API同时返回401时多次执行confirm弹窗	2022-08-26 14:58:10 +08:00
shijing	92f92f7ab2	routerChange	2022-08-23 19:21:36 +07:00
shijing	a96b91702f	reSet	2022-08-23 19:09:50 +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
曹前明	55f821cc03	fix conflict	2022-08-18 18:12:10 +08:00
曹前明	f27fe96fb2	algo修改	2022-08-18 18:10:48 +08:00
shijing	413cad098a	Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs	2022-08-18 17:28:15 +08:00
shijing	0c55e47cf7	关闭监控后停止资源加载	2022-08-18 17:28:06 +08:00
sc	f367b3ad1a	FIX Editor 上传图片自动转换相对路径，并且增加props options	2022-08-13 10:48:53 +08:00
曹前明	c57921f340	算法布设修改	2022-08-12 11:20:33 +08:00
shijing	4bc5a7733b	Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs	2022-08-11 17:13:50 +08:00
shijing	d846e8d6ef	iconChange	2022-08-11 17:13:45 +08:00
曹前明	8e18267da6	增加打卡记录页	2022-08-11 09:44:02 +08:00
YangFong	774a5f32f8	perf: 去除临时变量 _this ... 根据箭头函数特点，直接使用 this，无需创建临时变量	2022-08-10 13:30:07 +08:00
sc	392ae673f3	更新部分依赖以及更新版本号1.6.6	2022-08-09 13:50:52 +08:00
sc	cff0dd9b1f	FIX 国际化切换不能及时应用	2022-08-09 10:57:17 +08:00
sc	31ecae89e4	FIX 编辑器在el-drawer中，编辑器的弹框无法获得焦点	2022-08-08 17:45:52 +08:00
曹前明	c24f736937	首页安卓app下载地址	2022-08-08 13:23:17 +08:00
曹前明	fdbcd2c634	首页安卓app下载二维码	2022-08-08 11:16:20 +08:00
曹前明	708a3e42a5	取消上传限制	2022-08-08 10:03:10 +08:00
曹前明	f79b37eae7	apk上传	2022-08-08 08:50:12 +08:00
sc	c0e8d7d35a	FIX scUploadFile & scUploadMultiple fileList没有双向绑定的的问题	2022-08-05 14:56:04 +08:00
曹前明	d66242d7de	路由bug	2022-08-05 09:23:41 +08:00
曹前明	8840084ce9	pc界面优化初步完成	2022-08-03 15:33:56 +08:00
曹前明	8ef71cf24e	rpm vm 等模块的界面优化	2022-08-03 12:25:27 +08:00
sc	82020d8edc	移除异步加载JS轨迹演示	2022-07-29 10:23:22 +08:00
sc	e3c760614a	FIX 单文件上传剪裁后多次请求的问题	2022-07-26 15:23:51 +08:00
曹前明	f40bee35be	前端页面优化	2022-07-23 19:19:58 +08:00
sc	a5e4edf357	UP 调整标签过多的提示形式	2022-07-23 09:12:31 +08:00
sc	9b654611ba	更新版本号 1.6.5	2022-07-22 15:37:28 +08:00
sc	8e90839184	UP scVideo loading大小样式	2022-07-22 15:37:17 +08:00
sc	cd152eb6fd	UP 调整标签的创建和移除顺序	2022-07-22 15:27:19 +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
sc	b6a882d664	ADD 菜单增加tag标签	2022-07-22 13:09:55 +08:00
sc	4f660c5e9b	FIX 经典布局下菜单卡顿	2022-07-22 12:45:15 +08:00
sc	7c9b87d753	FIX 经典布局下菜单卡顿 ... https://gitee.com/lolicode/scui/issues/I4IX9Y	2022-07-22 12:20:07 +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
sakuya	8b5d351983	!35 分类筛选器和图标选择器的优化 ... Merge pull request !35 from orangeJ/fix/select	2022-06-24 06:34:55 +00: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
orangej	43ebbdb1b9	修复图标选择器未显示初始值的问题	2022-06-18 18:31:56 +08:00
orangej	8bba9fda23	修复选项为空时的异常	2022-06-18 18:28:00 +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
sc	d4b44c042d	ADD myConfig 业务配置	2022-06-16 08:44:32 +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
sc	98ad9c484b	UP sc-upload-file&sc-upload-multiple 支持对象数组的值	2022-06-15 15:09:15 +08:00
曹前明	62874af83d	ehs init	2022-06-15 14:55:29 +08:00
sc	2e958963ff	UP 替换任务中心表格为卡片	2022-06-14 16:24:05 +08:00
sc	7fbae1f6d1	更改 scFileExport 组件版本号	2022-06-13 17:33:09 +08:00
sc	b41fefb7fe	更新 版本号 1.6.4	2022-06-13 17:13:54 +08:00
sc	b523011860	UP scFileExport 增加异步导出 async	2022-06-13 17:12:11 +08:00
sc	6760f7b4ba	ADD 系统任务中心	2022-06-13 17:11:43 +08:00
sc	c45139f34f	UP scFileExport 文件导出 增加showData是否显示其他参数	2022-06-09 12:47:53 +08:00
sc	b010df5973	ADD 账户信息 增加密码修改模板	2022-06-09 12:36:51 +08:00
sakuya	1636abd48a	UP scTableSelect 增加属性参数 & FIX 分页滚动条至顶无效	2022-06-06 22:20:08 +08:00
sc	64bca66436	重构 scIconSelect 组件	2022-06-06 20:59:59 +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
sakuya	93ebbc6333	FIX v-time指令没有更新	2022-05-16 16:58:36 +08:00
sakuya	682ee54596	UP AES 加解密增加提示&iv，mode，padding可配置	2022-05-16 15:08:45 +08:00
sakuya	e572eb6593	FIX 编辑器演示页面 控制台警告	2022-05-16 15:08:09 +08:00
sakuya	4aec17ff2b	!22 layout el-icon 少了引号 ... Merge pull request !22 from 陈杰/master	2022-05-15 14:18:46 +00:00
sakuya	42d857443b	FIX 弹窗扩展演示页面 控制台报错	2022-05-15 21:40:30 +08:00
sakuya	ba6f1e64c8	add menu search	2022-05-15 21:10:14 +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
喜上眉梢	a3fdeee98e	update src/utils/tool.js. ... 增加可设置过期时间，单位秒，默认不过期。	2022-03-01 10:13:19 +00:00
sc	965e189618	优化 扩展坞布局调整	2022-02-28 11:07:24 +08:00
sc	2df913523b	FIX 移动端隐藏菜单失效	2022-02-28 09:46:05 +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	9f93d52ea4	标签过多时，显示提示	2022-02-10 15:32:00 +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	09d0cb2ec2	更改版本号1.4.2	2022-02-08 10:38:02 +08:00
陈杰	c8e053ff87	layout el-icon 少了引号	2022-01-26 15:45:01 +08:00
sc	df982af13e	🎉 新增组件 cron规则生成器	2022-01-20 16:36:09 +08:00
sc	ee8866107c	🐛 过滤器日期范围返回格式错误	2022-01-13 13:54:59 +08:00
sc	f983ffcaa4	增强 v-time 指令支持10位时间戳	2022-01-13 10:21:07 +08:00
sc	012e9f1166	🐛 scWaterMark 水印组件 未继承容器display样式	2022-01-05 10:04:44 +08:00
青苗	178b165f5d	update src/layout/index.vue. ... 优化代码	2022-01-02 11:38:57 +00:00
xwder	d899ba3529	修改sc-table-select可以主动触发显示和隐藏	2021-12-23 16:36:42 +08:00
sc	e5b8dcd10d	🚩 修复列设置样式错误	2021-12-21 16:02:47 +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	d7c3cdb52b	🐛 FIX scWorkflow 发起人数据改变不同步	2021-12-18 10:46:11 +08:00
sakuya	93fdbba688	💄 优化黑夜模式部分样式	2021-12-12 14:00:08 +08:00
sakuya	db7a537e30	更改版本号 1.4.1	2021-12-12 13:35:14 +08:00
sakuya	70480b9c4d	Update index.vue	2021-12-12 12:49:57 +08:00
sakuya	993208352f	scTable 动态列增加showOverflowTooltip 参数	2021-12-12 12:49:21 +08:00
sc	f9070da099	🚩 scTable 增加dataChange 数据变化事件	2021-12-07 12:55:13 +08:00
贾二小	c36ccb9e2b	update src/layout/index.vue. ... 菜单一级 对应的二级菜单为空时，理论上，是要直接打开一级菜单的。 这样修改后，后端就不用处理了。 因为我后端菜单递归处理时，没想好怎么修改。	2021-12-05 10:09:17 +00:00
sc	2105ab3da7	优化基础样式和黑夜模式样式	2021-12-02 16:47:19 +08:00
sc	f6f5b8cd2e	Update chartlist.vue	2021-12-01 12:28:41 +08:00
sc	2444ba492d	🔥 移除全局滚动条样式	2021-12-01 12:17:35 +08:00
sakuya	29a9afffbf	🚩 scTable增加动态样式控制块	2021-12-01 12:12:52 +08:00
sakuya	78587bfc2d	🐛 修复左侧菜单缩进时出现横向滚动条	2021-11-30 21:52:26 +08:00
sakuya	08c742f358	🚩 scTable增加props remoteSummary 支持显示远程合计行	2021-11-29 22:21:59 +08:00
sakuya	4dd61edc99	🎉 新增视频播放器组件 scVideo	2021-11-29 19:24:05 +08:00
贾二小	c3fb3bb5eb	开关 去掉v-if	2021-11-28 08:25:22 +00:00
sakuya	9e349f3e56	🐛 scContextmenu 右键菜单 arrow-right图标失效	2021-11-26 23:15:59 +08:00
sakuya	24e8a9474e	🚩 scTable增加props pageSize	2021-11-26 22:31:25 +08:00
sc	5bbe891149	💄 调整部分layout ... - 默认布局菜单增加logo - 菜单缩进操作按钮位置更改为菜单底部 - 通栏、经典、功能坞头部不再跟随主题颜色 - 面包屑导航增加显示路由图标	2021-11-26 22:22:38 +08:00
sc	90d3e30f8d	🐛 修改.el-main样式引起的移动端高度问题	2021-11-24 13:15:30 +08:00
sc	b374691a8b	✨ 新增分步表单模板	2021-11-22 16:13:03 +08:00
sakuya	c7c39aff03	🔨 重构了标签全屏的逻辑	2021-11-20 22:01:15 +08:00
sc	b7902f7b77	调整在默认和通栏布局中二级菜单显示判断	2021-11-17 10:11:39 +08:00
sakuya	9231a57e53	✨ 重构路由加载，支持静态路由角色权限	2021-11-17 09:45:38 +08:00
sc	85a6eac5dd	变更版本号 1.4.0	2021-11-16 17:14:10 +08:00
sc	62bef6098c	完善原子组件	2021-11-16 17:14:10 +08:00
sc	5a028a883b	🐛 修复.el-main在QQ游览器(谷歌70内核)下flex高度错误	2021-11-16 17:14:09 +08:00
sc	aac5817b0b	🐛 修复黑夜模式下el-switch内联样式	2021-11-16 17:14:09 +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	9ef3904c51	✨ 加入静态路由配置	2021-11-10 10:08:35 +08:00
sakuya	28be6aaa0b	FIX 标签关闭其他的函数逻辑错误	2021-11-07 18:48:45 +08:00
sakuya	50202ba1f1	ADD 配置 菜单是否启用手风琴效果	2021-11-07 16:11:12 +08:00
sc	b75ef57075	FIX 自定义主题色时 按钮禁用样式错误	2021-11-06 12:25:31 +08:00
sc	cf9e36ce46	更改版本号 1.3.2	2021-11-05 10:11:56 +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	c7bd84d23f	FIX 经典布局使用sc-icon图标与el-icon错位	2021-10-29 14:17:19 +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	feeb7f67d8	Update system.js	2021-10-21 09:43:26 +08:00
sc	34133e0c7b	更新版本号 1.3.0	2021-10-21 09:15:03 +08:00
sc	96b6368ab2	scTable 增加版本注释	2021-10-19 16:05:23 +08:00
sc	65eba03a45	scTable 重构高度计算逻辑，增加height参数	2021-10-19 15:02:25 +08:00
sc	5e7315814c	调整功能坞布局菜单位置	2021-10-18 15:31:38 +08:00
sc	34553fe598	FIX 移动端高亮样式 & 扁平化后移动端菜单错误	2021-10-18 12:45:57 +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	73716e43bc	Update NavMenu.vue	2021-10-15 12:26:14 +08:00
sc	5151cbd29f	FIX 菜单切换未高亮	2021-10-15 10:53:50 +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
neper	c985f77170	style: hasChildren代码精简	2021-10-14 17:52:19 +08:00
sc	775771198e	UP ver 1.2.7	2021-10-11 10:55:49 +08:00
sc	df1ce6dbe8	Update form.vue	2021-10-11 10:54:13 +08:00
sakuya	0b5e515e29	Update server.vue	2021-10-10 22:01:57 +08:00
sc	067ce88ed4	UP ver 1.2.6	2021-10-09 17:23:56 +08:00
sc	817cc11b37	add server template	2021-10-09 17:23:43 +08:00
sc	6a88eff958	up	2021-10-09 10:08:54 +08:00
sc	fb633de087	UP	2021-10-08 10:33:21 +08:00
sc	49a19aef5e	scForm 增加 tips 选项	2021-10-08 09:55:18 +08:00
sc	3e0e47003a	scTable，scUpload 增加自定义successCode	2021-10-08 09:32:46 +08:00
sc	22d98bfee9	scTableSelect add params	2021-10-08 09:09:31 +08:00
sakuya	17b75dcd5a	UP	2021-10-04 23:10:44 +08:00
sc	10c03fbeba	UP	2021-09-30 15:57:16 +08:00
sc	f5da1bbb32	UP	2021-09-30 10:47:13 +08:00
sc	231bbf3c82	UP	2021-09-29 16:59:52 +08:00
sakuya	44841f38e0	UP	2021-09-29 00:04:53 +08:00
sc	0ed0867862	add	2021-09-28 17:04:03 +08:00
sc	f3a99b441d	add scform demo	2021-09-24 17:01:05 +08:00
sakuya	3b99ab5399	FIX AES 加密无效	2021-09-21 10:16:14 +08:00
sc	591847e299	add 表格列管理	2021-09-18 15:08:32 +08:00
sc	4413dc17b2	FIX scFormTable 新增复杂结构行时数据混乱	2021-09-18 15:08:04 +08:00
sc	865e74f6aa	Merge branch 'scTableMethods'	2021-09-18 08:53:12 +08:00
sc	8672148eef	增加jsonp请求方式	2021-09-18 08:52:00 +08:00
sc	58a4b413be	Update index.vue	2021-09-16 13:33:14 +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	326898bb85	UP 1.2.4	2021-09-01 12:59:33 +08:00
sc	72bdbd865e	Squashed commit of the following: ... commit b39fec06efda601021c275acd670a93330921c9d Author: sc <shencheng@heronshn.com> Date: Wed Sep 1 12:14:11 2021 +0800 UP commit 87181232d789605fa1a4a11a93fd6a0737b4009c Author: sc <shencheng@heronshn.com> Date: Wed Sep 1 08:34:45 2021 +0800 Update login.vue commit 28154a7e19fc226399a64bd7e1e3a884c0900b61 Author: sakuya <81883387@qq.com> Date: Tue Aug 31 23:23:33 2021 +0800 UP commit 91c41d6de287b332e2270b3e73d63b36355dbacb Author: sakuya <81883387@qq.com> Date: Tue Aug 31 22:30:59 2021 +0800 up widgets commit d21b65f77ca1ab9e41fcf5e9075a4b0f110965fe Author: sc <shencheng@heronshn.com> Date: Tue Aug 31 17:26:51 2021 +0800 UP widgets commit 653c33359afb870516d979e9feeab1fdd3f62925 Author: sakuya <81883387@qq.com> Date: Sat Aug 28 21:14:05 2021 +0800 FIX scTable 在关闭多标签时自适应高度失效 commit 2abbf2d7fa6142d6f81e481dd9b4275e95db7511 Author: sakuya <81883387@qq.com> Date: Sat Aug 28 20:30:20 2021 +0800 Revert "UP" This reverts commit 4ac9af5c4fde0d98ecaca0841c78a0dffe28525a. commit 4ac9af5c4fde0d98ecaca0841c78a0dffe28525a Author: sc <shencheng@heronshn.com> Date: Sat Aug 28 14:03:13 2021 +0800 UP commit 52539ea6ed5524359a4fd35bffb71a78f045ab54 Author: sc <shencheng@heronshn.com> Date: Sat Aug 28 11:53:58 2021 +0800 更改版本号 1.2.3 commit 7e6f7e7b4f868a246538e0047e8c505e2f517f53 Author: sc <shencheng@heronshn.com> Date: Sat Aug 28 11:53:17 2021 +0800 ADD v-time directive commit e5184083cae022b656748334bab14fa9f40b54a1 Author: sc <shencheng@heronshn.com> Date: Sat Aug 28 09:32:25 2021 +0800 FIX commit 13fc2cce5371b099a7936f787e40a5696acfe7cd Author: sakuya <81883387@qq.com> Date: Sat Aug 28 00:21:18 2021 +0800 scDialog & i18n commit d722908dbccedcef6e4776d9a0a92298135f5ea3 Author: sc <shencheng@heronshn.com> Date: Fri Aug 27 16:49:43 2021 +0800 scDialog demo commit ec1bb4499070b7c0a92cc993fdb36a35c3aaf752 Author: sc <shencheng@heronshn.com> Date: Fri Aug 27 08:47:08 2021 +0800 Update package.json commit d2fc5a78bb44418b968a27430fc0c543a37a9fd1 Author: sc <shencheng@heronshn.com> Date: Thu Aug 26 14:13:30 2021 +0800 UPD 部分依赖 注意：这次 element-plus 1.1.0-beta 版本有很多破坏性更新 commit a2d45128f96d7df7d2f99249134d7fa5c1bb635d Author: sc <shencheng@heronshn.com> Date: Thu Aug 26 14:01:41 2021 +0800 FIX 图标选择器组件双向绑定失效	2021-09-01 12:15:20 +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	f1a9d076ef	更改版本号 1.2.1	2021-08-17 10:25:38 +08:00
sc	2b8fc92c2f	配置增加内核版本号	2021-08-17 10:21:49 +08:00
sc	f1ee94f6a5	sctable 补漏合计行show-summary	2021-08-17 09:41:11 +08:00
sc	a6c08c2c5a	Squashed commit of the following: ... commit 82e77d074363a6535066726773d66a99d1277946 Author: sakuya <81883387@qq.com> Date: Mon Aug 16 23:05:07 2021 +0800 FIX 默认值 commit 9052ee5554bec25e812820bf04efbc77f68f6f2a Author: sakuya <81883387@qq.com> Date: Mon Aug 16 23:00:43 2021 +0800 ADD 主题颜色设置	2021-08-17 09:18:46 +08:00
sc	117008902e	UPD API优化 ... 1：增加封装put|patch|delete 2：分离api统一管理 3：$HTTP 增加第3个参数config	2021-08-13 10:06:57 +08:00
sakuya	752a0c6130	菜单管理拖拽排序优化，修复菜单树过滤失效，增加TIPS，添加图标选择器	2021-08-12 21:16:44 +08:00
sakuya	907d75f8ad	UPD scFilterBar 常用过滤回显	2021-08-12 20:18:33 +08:00
sc	1d5b914c96	UP	2021-08-12 17:13:15 +08:00
sc	4a67bd7dbb	Squashed commit of the following: ... commit 7664eafb02dc21efe875b272e98d6355862bf933 Author: sc <shencheng@heronshn.com> Date: Thu Aug 12 15:49:17 2021 +0800 UP commit ec3da821dd866ff730492f12200e890cec7ef01d Author: sc <shencheng@heronshn.com> Date: Thu Aug 12 15:34:16 2021 +0800 UP commit 118a335cd7187ecf0d9cfad13ee71bbd1b6ccfb0 Author: sakuya <81883387@qq.com> Date: Wed Aug 11 23:16:30 2021 +0800 UP commit 606235450c26f3c38183ba74cc0c7336a9800c3a Author: sc <shencheng@heronshn.com> Date: Wed Aug 11 16:55:17 2021 +0800 UP commit e743599ea8da42bb34d2cfbbf5193d9a43e489f2 Author: sc <shencheng@heronshn.com> Date: Tue Aug 10 13:44:54 2021 +0800 up commit d57ef8e8bad8da65071c28324a4b534de4435c64 Author: sc <shencheng@heronshn.com> Date: Mon Aug 9 16:59:47 2021 +0800 Update dark.less commit 2d4e0c314b8fe1114406e7b7487e2b4eadbd3531 Author: sc <shencheng@heronshn.com> Date: Mon Aug 9 14:59:41 2021 +0800 UP commit bd7f3d67e6a79a7058265556fecfd11da6bc5d7e Author: sc <shencheng@heronshn.com> Date: Mon Aug 9 09:25:10 2021 +0800 Update dark.less commit 8fe2040d832900601885df87885e82713c10563b Author: sakuya <81883387@qq.com> Date: Sun Aug 8 21:07:57 2021 +0800 haha commit c7893075c26ac63726de99e7c6f98d915ded68c6 Author: sakuya <81883387@qq.com> Date: Fri Aug 6 19:09:54 2021 +0800 Update fix.less commit 0ab4885d4f8dfcd16eb1d39ad9e8f07a9acb1681 Author: sc <shencheng@heronshn.com> Date: Fri Aug 6 15:46:18 2021 +0800 UP	2021-08-12 15:52:21 +08:00
sc	b5067e9bab	get,post 增加第三个参数headers	2021-08-10 16:01:57 +08:00
sc	7b6add02d2	更改版本号 1.1.21	2021-08-06 08:30:04 +08:00
sc	4eb67533df	UPD scStatistic font style	2021-08-05 14:20:21 +08:00
sc	3b2ad9c5a7	DEL /template/report	2021-08-05 13:42:09 +08:00
sc	66dc337d02	scSelect 支持异步回显	2021-08-05 10:56:04 +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
sakuya	a1b2f5e091	UP	2021-08-02 22:53:21 +08:00
sakuya	c97dde5a73	Update scrollBehavior.js	2021-08-02 18:56:41 +08:00
sc	5c3bb39ff0	UP	2021-08-02 17:01:35 +08:00
sc	fb3e58ef11	UPD 调整reload方法	2021-08-02 13:01:51 +08:00
sakuya	26e8cccd67	更改版本号 1.1.20	2021-08-01 15:29:45 +08:00
sakuya	bf6a64ffea	Update systemRouter.js	2021-08-01 15:28:43 +08:00
sakuya	31d1034e06	增加指令 v-role	2021-07-31 23:57:25 +08:00
sakuya	7e7e7ed0b5	scFilterBar 字段支持全拼，首字搜索	2021-07-31 23:29:53 +08:00
sakuya	3add6861ba	UP	2021-07-31 22:25:30 +08:00
sc	31a1c69319	UP	2021-07-31 16:50:52 +08:00
sakuya	0a57f08fc2	Update filterbar2.vue	2021-07-31 00:06:59 +08:00
sc	b5ba3c41c2	UP	2021-07-30 16:00:45 +08:00
sc	f24b873e70	移除腾讯反馈平台链接	2021-07-30 12:31:14 +08:00
sc	84a255bb33	FIX	2021-07-30 12:16:03 +08:00
sc	64b942280e	FIX 路由query传参各类问题	2021-07-30 11:13:40 +08:00
sc	c56dd68548	UPD ... - FIX scTable rowClick - 重构 logs Page	2021-07-29 15:34:15 +08:00
sc	98321aabd4	FIX 移动端全局媒体查询覆盖样式	2021-07-28 16:08:17 +08:00
sakuya	6ed75b914c	Update sideM.vue	2021-07-27 23:49:34 +08:00
sakuya	0ecc75f925	FIX 移动端菜单,form,dialog,drawer的表现	2021-07-27 23:41:40 +08:00
sakuya	2a0353ebe5	FIX 上传组件accept设置错误导致移动端无法打开资源管理器	2021-07-27 20:37:01 +08:00
sc	757a0c401a	ADD scIconSelect	2021-07-27 16:14:36 +08:00
sc	6a8acdb45f	更改版本号 1.1.19	2021-07-26 14:00:49 +08:00
sc	4d28b12107	Create tabinfo.vue	2021-07-26 13:44:45 +08:00
sakuya	7f60c7bfa7	ADD work控制台我的常用	2021-07-25 23:02:44 +08:00
sakuya	6816f65f7e	Update index.vue	2021-07-24 23:18:31 +08:00
sakuya	bd4fd271c1	ADD component sc-cropper ... 1：增加组件 scCropper 2：scUpload内置scCropper	2021-07-24 22:32:41 +08:00
sakuya	0908c26d5d	FIX 路由菜单的递归错误	2021-07-23 23:18:43 +08:00
sakuya	e4380f6497	add scContextmenu	2021-07-23 20:53:10 +08:00
sc	03671cdfe4	UP	2021-07-23 16:48:08 +08:00
sakuya	06e5c03b05	Update contextmenu.vue	2021-07-22 23:30:52 +08:00
sc	e861fbd7db	Create contextmenu.vue	2021-07-22 17:00:21 +08:00
sc	80f399be74	UPD scTable 支持动态列、自定义列	2021-07-22 13:40:30 +08:00
sc	a60fea7d72	UP	2021-07-21 16:59:46 +08:00
sc	a6cdfde659	up 1.1.18	2021-07-20 12:22:07 +08:00
sc	5e58639a0d	up login MD5 encrypt	2021-07-20 11:06:03 +08:00
sc	34335676d4	add dependencies crypto-js	2021-07-20 10:55:14 +08:00
sc	e97549c5e4	add component scPageHeader	2021-07-20 10:50:28 +08:00
sakuya	77b37920af	临时提交	2021-07-19 22:40:17 +08:00
sc	13f716be0b	临时提交	2021-07-19 17:04:11 +08:00
sc	9f3f6ff0e5	scTable 增加remoteFilter 远程过滤	2021-07-16 12:50:00 +08:00
sc	50522a41df	scTable 增加remoteSort 远程排序	2021-07-16 10:21:32 +08:00
sc	8710311f1c	up 1.1.17	2021-07-15 14:24:23 +08:00
sc	5b78760ccb	add proxy ... 1：增加开发模式的代理服务器 2：删除 MOCK_URL 配置	2021-07-15 14:11:21 +08:00
sc	77bc119c35	add config TOKEN_PREFIX	2021-07-15 12:57:32 +08:00
sc	b21fdaebc2	add config REQUEST_CACHE	2021-07-15 09:24:56 +08:00
sc	b187e17bee	FIX Firefox 标签滚动事件&滚动顺序	2021-07-13 16:06:45 +08:00
sc	6694010b06	FIX 标签过多溢出&标签右键边缘位置	2021-07-13 15:46:23 +08:00
sc	d21077f581	up 1.1.16	2021-07-12 16:14:31 +08:00
sc	424d9e1199	优化字典管理弹窗逻辑	2021-07-12 15:48:04 +08:00
sc	72ffa8dce9	Update userbar.vue	2021-07-12 14:50:26 +08:00
sc	4dcdf097cd	消息中心表现形式重构	2021-07-12 13:14:39 +08:00
sakuya	d0a1b3d28e	调整样式&控制台模块名称	2021-07-10 23:30:37 +08:00
sakuya	9264130521	重构部分页面的弹窗逻辑	2021-07-10 21:01:25 +08:00
sakuya	1f246c6f9a	优化JWT token获取和请求	2021-07-10 13:18:11 +08:00
sc	6ffcec2150	FIX scTable 在勾选状态下刷新，选中状态依然存在	2021-07-09 14:39:48 +08:00
sc	4f547ab2f4	重构部分页面的弹窗逻辑	2021-07-09 14:35:15 +08:00
sakuya	7c575c01cf	UP	2021-07-08 23:13:51 +08:00
sc	f248b768ec	up 1.1.15	2021-07-07 13:33:06 +08:00
sc	47d40670ee	ADD 计划任务	2021-07-07 13:30:21 +08:00
sakuya	6cbd9ad726	ADD 布局增加Dock布局	2021-07-06 22:39:36 +08:00
sakuya	d024f448b0	ADD 布局增加经典布局	2021-07-06 18:53:50 +08:00
sc	68702a45a0	UP 丰富chart演示	2021-07-05 15:18:02 +08:00
sc	d966cf5f11	UP 退出系统确认框	2021-07-05 14:21:15 +08:00
sc	acfea2468f	ADD 动态标题	2021-07-05 13:53:34 +08:00
sc	ac7eafbaad	UP 标签 支持拖拽排序	2021-07-05 13:47:53 +08:00
sc	f81019fcd1	左侧菜单颜色小调整	2021-07-03 11:16:36 +08:00
sakuya	f07719ff14	Squashed commit of the following: ... commit 5a05146a178e761d747956eb8a56d77c493825ee Author: sakuya <81883387@qq.com> Date: Fri Jul 2 21:09:52 2021 +0800 up 1.1.14 更新大部分依赖，并且固化依赖版本 commit ee564cbfec9c164cbf0c45fe21b38eed0bca3184 Author: sakuya <81883387@qq.com> Date: Fri Jul 2 21:02:11 2021 +0800 up .gitignore commit ffcddf5317990497fd638fb868fc2208e7a3ce74 Author: sakuya <81883387@qq.com> Date: Fri Jul 2 20:57:58 2021 +0800 Update .gitignore commit 2a19b17aa0b1c7d83340295897539b4e734f2434 Author: sakuya <81883387@qq.com> Date: Fri Jul 2 20:57:09 2021 +0800 Update .gitignore commit de168b618fab0ee7d96d39b180a8c7d9969152ce Author: sc <shencheng@heronshn.com> Date: Fri Jul 2 15:38:56 2021 +0800 Update package-lock.json	2021-07-02 21:17:32 +08:00
sc	8bc3132b3f	UP 1.1.13	2021-07-02 14:38:48 +08:00
sc	f7c9df5eb2	up 1.1.12	2021-07-01 12:26:50 +08:00