Commit Graph
6917 Commits
Author SHA1 Message Date
高嵩 37405db88f Merge branch 'fix_foton_20231213' into 'master'
Fix foton 20231213

See merge request laws-foton-slrs/foton-laws-system-front!134
2023-12-21 08:51:44 +00:00
zyn e7f1cf82b9 fix(产品标准-意见汇总修订): 修改单上传无法回显 2023-12-21 16:39:06 +08:00
zyn 84ab889b9a fix(手机端): 弹窗宽度70% 2023-12-21 13:59:38 +08:00
zyn b2861d491a fix: 杨卫利改为刘金英 2023-12-21 10:32:04 +08:00
zyn a0894d20fb feature(配置管理): 机构管理-配置部门绑定角色功能 2023-12-20 16:13:19 +08:00
zyn 756f38a7d1 fix: 产品标准-上传组件可拖宽 2023-12-20 11:32:03 +08:00
zyn b489f34a2d style: 格式化代码 2023-12-20 11:00:26 +08:00
高嵩 618347413c Merge branch 'fix_foton_20231213' into 'master'
Fix foton 20231213

See merge request laws-foton-slrs/foton-laws-system-front!133
2023-12-19 10:21:43 +00:00
zyn 0a0f737ad3 Merge remote-tracking branch 'origin/fix_foton_20231213' into fix_foton_20231213
# Conflicts:
#	src/pages/home2/components/release/index.vue
#	src/pages/home2/index.vue
2023-12-19 17:52:50 +08:00
zyn a074fdb84b feature: 首页三天内数据new标注 2023-12-19 17:51:02 +08:00
zyn c4079c7413 style: 格式化代码 2023-12-19 16:03:26 +08:00
zyn e079330f05 style: 格式化代码 2023-12-19 14:10:48 +08:00
zyn 8578a9cd87 feature: 配置eslint 2023-12-19 14:10:18 +08:00
zyn 2c1e9809b4 feature: 修改eslint 2023-12-19 13:57:27 +08:00
zyn 134a17c869 style: 格式化代碼 2023-12-18 17:16:37 +08:00
zyn d2dad52ffe fix(搜索中心): 带入首页填写的搜索条件 2023-12-18 16:31:54 +08:00
zyn 04877e3299 feature(企标制修订): 技术/产品标准-发布页-新增当前顺序号查询功能 2023-12-18 15:02:39 +08:00
zyn 7cf21ab52e feature: 配置eslint 2023-12-18 14:43:01 +08:00
高嵩 d0384ea4e0 Merge branch 'dev_20231218_PHONE' into 'master'
Dev 20231218 phone

See merge request laws-foton-slrs/foton-laws-system-front!132
2023-12-18 04:21:35 +00:00
高嵩 a1002e9586 Merge branch 'fix_foton_20231213' into 'master'
Fix foton 20231213

See merge request laws-foton-slrs/foton-laws-system-front!131
2023-12-18 04:20:28 +00:00
zyn 0072aa90e4 feature: 配置eslint 2023-12-18 12:20:00 +08:00
zyn 08bce5224f fix: 登录后添加uName字段 2023-12-18 12:19:36 +08:00
高嵩 c137b25ea7 Merge branch 'master' into 'fix_foton_20231213'
Master

See merge request laws-foton-slrs/foton-laws-system-front!130
2023-12-18 02:33:11 +00:00
zyn bf127dadfe style: 格式化代码 2023-12-18 10:09:10 +08:00
zyn bb5a905682 fix(手机端): 不支持手机端提交驳回操作 2023-12-18 10:08:30 +08:00
zyn 1d7cffc859 fix(手机端): 不支持手机端提交驳回操作 2023-12-18 09:58:49 +08:00
zyn 9eb96363ea style: 格式化代码 2023-12-18 09:58:18 +08:00
zyn fb2980b038 style: 格式化代码 2023-12-18 09:49:51 +08:00
zyn 31b7f87b72 fix(手机端-标准入库): 不支持手机端提交驳回操作 2023-12-18 09:49:17 +08:00
高嵩 e68bc03ee7 Merge branch 'dev_20231201_feizhi' into 'master'
Dev 20231201 feizhi

See merge request laws-foton-slrs/foton-laws-system-front!129
2023-12-15 09:54:12 +00:00
zyn 259ef7ad32 fix(手机端): 技术标准-驳回提示手机端处理 2023-12-15 17:52:08 +08:00
zyn 21521d49ed style: 修改eslint配置 2023-12-15 17:51:10 +08:00
zyn 1f85731376 fix(体系搜索): 监听窗口改变重新渲染 2023-12-15 17:38:26 +08:00
高嵩 31fe2ba3c8 Merge branch 'dev_20231201_feizhi' into 'master'
Dev 20231201 feizhi

See merge request laws-foton-slrs/foton-laws-system-front!128
2023-12-15 09:18:12 +00:00
高嵩 b98ab15162 Merge branch 'dev_20231208_搜索中心' into 'master'
refactor(搜索中心): 重构搜索中心

See merge request laws-foton-slrs/foton-laws-system-front!127
2023-12-15 09:17:45 +00:00
zyn 39e6823e36 feature: eslint增加配置项 2023-12-15 15:15:46 +08:00
zyn 91d25f107f chore(eslint): 使用babel-eslint解析 2023-12-15 11:56:48 +08:00
zyn 221e68134b style: 修改代码格式 2023-12-15 11:41:23 +08:00
zyn 19a18489a8 feature(eslint): 添加规则 2023-12-15 11:39:33 +08:00
zyn 230852b8f2 feature(eslint): 添加规则 2023-12-15 09:59:25 +08:00
zyn 78e7d08029 fix(手机端): 退出到welink待办页 2023-12-14 15:50:00 +08:00
zyn 26d1af11ce feature: 配置eslint 2023-12-14 14:51:54 +08:00
zyn 01bee9fcc8 refactor(登录): 重写登录模块,接入oauth2.0(pc)、welink(mobile) 2023-12-14 10:19:29 +08:00
高嵩 8e41ee7577 Merge branch 'dev_20231201_feizhi' into 'master'
Dev 20231201 feizhi

See merge request laws-foton-slrs/foton-laws-system-front!126
2023-12-13 10:36:19 +00:00
wxyclub ea5e6093ab bug: 企标入库,修改企标计划时参数字段修改 2023-12-13 17:41:25 +08:00
zyn 039abb5565 feature: 加载文件接口添加loading 2023-12-13 17:18:23 +08:00
zhoulingpo 9209131eaa 查看人员的表格高度修改 2023-12-13 17:04:55 +08:00
zhoulingpo 0b1ea2f609 增加问题项管控的历史数据的序号 2023-12-13 16:31:11 +08:00
zhoulingpo ee008393d4 增加历史数据的序号 2023-12-13 15:54:56 +08:00
zhoulingpo 8eee3063a7 修改企标计划的新增的代替其表编号的序号以及样式 2023-12-13 14:57:29 +08:00