 lizijie
|
300a625884
|
Merge pull request 'feat: 一键查重增加提报人upUserName' (#101) from fix/One_CheckAdds_the_search_criteria_upUserName into test
Reviewed-on: #101
|
1 year ago |
|
lizijiee
|
869095f192
|
feat: 一键查重增加提报人upUserName
|
1 year ago |
 shenhailong
|
8390ca3c4e
|
Merge pull request 'fix:时间线样式' (#100) from fix/shenhe into test
Reviewed-on: #100
|
1 year ago |
Dragon
|
bad0992510
|
时间线样式
|
1 year ago |
 刘释隆
|
89e7cc83c4
|
Merge pull request 'fix: 创建筛选条件时，切换筛选项后面的条件内容要清空' (#99) from fix/filter_select into test
Reviewed-on: #99
|
1 year ago |
|
刘释隆
|
409528f0c5
|
fix: 创建筛选条件时，切换筛选项后面的条件内容要清空
|
1 year ago |
|
刘释隆
|
756ae89ff2
|
Merge pull request 'feat: 高级筛选弹窗列表与数据联动' (#98) from feat/super_filter into test
Reviewed-on: #98
|
1 year ago |
|
刘释隆
|
04b0ae258b
|
Merge branch 'test' into bak
# Conflicts:
# src/views/worksheet/aside/Aside.vue
|
1 year ago |
|
刘释隆
|
d13f61e972
|
feat: 高级筛选弹窗列表与数据联动
|
1 year ago |
|
shenhailong
|
8302e0c8b0
|
Merge pull request 'fix:终审排序和页面样式' (#97) from fix/shenpi into test
Reviewed-on: #97
|
1 year ago |
|
Dragon
|
ce2973235b
|
终审排序
|
1 year ago |
|
lizijie
|
cdd50c48f2
|
Merge pull request 'fix: 找回丢失代码' (#96) from fix/retrieveLostCode into test
Reviewed-on: #96
|
1 year ago |
|
lizijiee
|
c77349eeab
|
fix: 找回丢失代码
|
1 year ago |
|
lizijiee
|
295f4b3ddf
|
Merge branch 'test' into jie
|
1 year ago |
|
刘释隆
|
5dfe0eefe0
|
Merge pull request 'fix: 下载高清图' (#95) from fix/img_error into test
Reviewed-on: #95
|
1 year ago |
|
刘释隆
|
eeded59b52
|
fix: 下载高清图
|
1 year ago |
 wangyanjun
|
2e477c9bcf
|
Merge pull request 'fix: 样式bug处理' (#90) from fix/styleProblem into test
Reviewed-on: #90
|
1 year ago |
wendong551
|
49c2fe1b8e
|
Merge branch 'test' into fix/styleProblem
|
1 year ago |
|
lizijiee
|
b8658578d8
|
Merge branch 'test' into jie
|
1 year ago |
|
wangyanjun
|
057ebb8db6
|
Merge pull request 'fix/newStyleProblem' (#94) from fix/newStyleProblem into test
Reviewed-on: #94
|
1 year ago |
|
wendong551
|
0741bc71f6
|
Merge branch 'test' into fix/newStyleProblem
|
1 year ago |
|
wendong551
|
6ff6fe4bbe
|
fix: 一键查重临时问题处理
|
1 year ago |
|
刘释隆
|
4efff23f9a
|
Merge pull request 'fix: 修复高级筛选搜索点击后报错bug' (#93) from fix/search_bug into test
Reviewed-on: #93
|
1 year ago |
|
刘释隆
|
0077860210
|
fix: 修复高级筛选搜索点击后报错bug
|
1 year ago |
|
刘释隆
|
78bc0787d5
|
Merge pull request 'fix: 展示字段修改，接口搜索字段对接' (#92) from fix/final_table_error into test
Reviewed-on: #92
|
1 year ago |
|
刘释隆
|
00b8a712a6
|
fix: 展示字段修改，接口搜索字段对接
|
1 year ago |
|
shenhailong
|
76100d3f14
|
Merge pull request 'fix:终审列表任务id 修改' (#91) from fix/shenpi into test
Reviewed-on: #91
|
1 year ago |
|
Dragon
|
7c6ba84325
|
任务id
|
1 year ago |
|
wendong551
|
098c277914
|
fix: 冲突解决
|
1 year ago |
|
wendong551
|
1968b771e0
|
fix: 样式bug处理
|
1 year ago |
|
lizijiee
|
354e91e0f6
|
feat: 照片墙组件封装完成
|
1 year ago |
|
shenhailong
|
516133f52a
|
Merge pull request 'bug:小结查重全部不通过' (#88) from fix/final into test
Reviewed-on: #88
|
1 year ago |
|
Dragon
|
b2192bbd5c
|
小结查重全部不通过
|
1 year ago |
|
shenhailong
|
218c56c5d3
|
Merge pull request 'bug:审批列表相似度展示模式和终审问题' (#87) from fix/shenpi into test
Reviewed-on: #87
|
1 year ago |
|
Dragon
|
9fa25d4614
|
终审审批之后刷新
|
1 year ago |
|
lizijie
|
63b19a5e16
|
Merge pull request 'feat: 主图审核后状态不刷新bug修复' (#86) from jie into test
Reviewed-on: #86
|
1 year ago |
|
lizijiee
|
f2555cbdf9
|
feat: 主图审核后状态不刷新bug修复
|
1 year ago |
|
刘释隆
|
dae736abe4
|
Merge pull request 'feat: 图审弹窗操作后刷新数据功能添加，去掉选框' (#85) from feat/changeTitle into test
Reviewed-on: #85
|
1 year ago |
|
刘释隆
|
4a1e137707
|
feat: 图审弹窗操作后刷新数据功能添加，去掉选框
|
1 year ago |
|
Dragon
|
b281600df6
|
相似图展示
|
1 year ago |
|
lizijie
|
fa79657575
|
Merge pull request 'feat: 任务包图片点击' (#84) from jie into test
Reviewed-on: #84
|
1 year ago |
|
lizijiee
|
c0aa814aec
|
feat: 任务包图片点击
|
1 year ago |
|
lizijie
|
0b210eb045
|
Merge pull request 'feat: 调整taskId为taskchildpictureid' (#83) from jie into test
Reviewed-on: #83
|
1 year ago |
|
lizijiee
|
5638e1a416
|
feat: 调整taskId为taskchildpictureid
|
1 year ago |
|
lizijiee
|
8237e77973
|
feat: 100百分号颜色改成红色
|
1 year ago |
|
lizijie
|
a7bbe50357
|
Merge pull request 'feat: 修复主图流程' (#82) from jie into test
Reviewed-on: #82
|
1 year ago |
|
lizijiee
|
84fea70b5b
|
feat: 修复主图流程
|
1 year ago |
|
刘释隆
|
ae578c1e7e
|
Merge pull request 'feat: 图审审批改为图检审批' (#81) from feat/changeTitle into test
Reviewed-on: #81
|
1 year ago |
|
刘释隆
|
6d1b319acf
|
feat: 图审审批改为图检审批
|
1 year ago |
|
刘释隆
|
6584f8f1fe
|
Merge pull request 'fix: 首页高级筛选搜索功能与右侧数据联动问题修复' (#80) from fix/homeData_error into test
Reviewed-on: #80
|
1 year ago |
|
刘释隆
|
ab9e50ff0c
|
fix: 首页高级筛选搜索功能与右侧数据联动问题修复
|
1 year ago |
|
lizijie
|
9ae9be0272
|
Merge pull request 'feat: 不通过状态' (#79) from jie into test
Reviewed-on: #79
|
1 year ago |
|
刘释隆
|
7507c16dd1
|
Merge pull request 'fix:修复终审自定义列表排序及修改综合搜索titile' (#78) from fix/sort_error into test
Reviewed-on: #78
|
1 year ago |
|
lizijiee
|
08e74159c0
|
feat: 不通过状态
|
1 year ago |
|
刘释隆
|
94e6b79e87
|
feat: 更改综合搜索title及图审弹框icon
|
1 year ago |
|
lizijie
|
24f74982f4
|
Merge pull request 'feat: 增加照片墙组件，修复可疑文件夹多选删除id错误失败问题' (#77) from jie into test
Reviewed-on: #77
|
1 year ago |
|
lizijiee
|
73ad5f8f64
|
feat: 增加照片墙组件，修复可疑文件夹多选删除id错误失败问题
|
1 year ago |
|
刘释隆
|
6ec415481e
|
fix: 终审列表columns排序问题修复
|
1 year ago |
|
lizijiee
|
4266ab4f74
|
feat: 调整日期顺序
|
1 year ago |
|
刘释隆
|
0e684d6102
|
Merge pull request 'feat: 逻辑补全,登录首页样式调整' (#76) from feat/ui_error into test
Reviewed-on: #76
|
1 year ago |
|
刘释隆
|
cad7cea19f
|
feat: 逻辑补全,登录首页样式调整
|
1 year ago |
|
刘释隆
|
45c074009a
|
Merge pull request 'feat: 高级筛选新增点击遮罩无关闭' (#75) from feat/final into test
Reviewed-on: #75
|
1 year ago |
|
刘释隆
|
fad5db4022
|
feat: 高级筛选新增点击遮罩无关闭
|
1 year ago |
|
shenhailong
|
680f27d12a
|
Merge pull request 'shen' (#74) from shen into test
Reviewed-on: #74
|
1 year ago |
|
Dragon
|
a8b02071df
|
1、终审样式
2、相似图样式
3、终审列表样式
4、审核完成状态改变bug
5、相似图筛选问题
6、缩略图问题
7、小结查重重复任务问题
8、移入刷新问题
|
1 year ago |
|
Dragon
|
43b3ebd078
|
1、终审样式
2、相似图样式
3、终审列表样式
4、审核完成状态改变bug
5、相似图筛选问题
6、缩略图问题
7、小结查重重复任务问题
8、移入刷新问题
|
1 year ago |
|
刘释隆
|
e304a3b1e0
|
Merge pull request 'fix:接口报错修复' (#73) from fix/api_error into test
Reviewed-on: #73
|
1 year ago |
|
刘释隆
|
b0a67b9ac3
|
feat: 高级筛选阈值回显
|
1 year ago |
 yaoshuli
|
52b1215759
|
Merge pull request 'feat: 尧勇刚 一件查重bug修改' (#72) from fix/updatecontent into test
Reviewed-on: #72
|
1 year ago |
 raofuzi
|
51cf07f59a
|
feat: 修改bug
|
1 year ago |
|
刘释隆
|
dab66f78ee
|
fix: 废弃接口注释
|
1 year ago |
|
lizijie
|
3fe623dc3e
|
Merge pull request 'feat: 可疑文件夹增加批量审批审核' (#71) from jie into test
Reviewed-on: #71
|
1 year ago |
|
lizijiee
|
ef187f2285
|
feat: 审核和排序后重新layout 调整布局
|
1 year ago |
|
lizijiee
|
2b63e8577a
|
feat: 可疑文件夹增加批量审批审核
|
1 year ago |
|
yaoshuli
|
2d30d56ebf
|
Merge pull request 'fix: 尧永刚解决一键查重bug' (#70) from fix/updatecontent into test
Reviewed-on: #70
|
1 year ago |
|
raofuzi
|
ca78247917
|
feat: 修改bug
|
1 year ago |
|
刘释隆
|
f3433010de
|
Merge pull request 'feat: 审批状态展示添加，任务审批审批状态字段变更，完善逻辑' (#69) from feat/task_select into test
Reviewed-on: #69
|
1 year ago |
|
刘释隆
|
9d433b2e32
|
feat: 审批状态展示添加，任务审批审批状态字段变更，完善逻辑
|
1 year ago |
|
lizijie
|
22af7a3d27
|
Merge pull request 'fix: 修复可疑文件夹，图审审批批量选择问题' (#67) from jie into test
Reviewed-on: #67
|
1 year ago |
|
lizijiee
|
406a6a2205
|
fix: 修复可疑文件夹，图审审批批量选择问题
|
1 year ago |
|
刘释隆
|
469f4d378f
|
Merge pull request 'feat: 一键查重高级筛选逻辑补全，修复左侧操作栏隐藏后svg展示问题' (#66) from al into test
Reviewed-on: #66
|
1 year ago |
|
刘释隆
|
0533b7faa3
|
feat: 一键查重高级筛选逻辑补全，修复左侧操作栏隐藏后svg展示问题
|
1 year ago |
|
shenhailong
|
8518e70649
|
Merge pull request 'shen' (#65) from shen into test
Reviewed-on: #65
|
1 year ago |
|
Dragon
|
e174903ebb
|
Merge branch 'test' into shen
# Conflicts:
# src/views/final/content/Content.vue
|
1 year ago |
|
Dragon
|
fec125d72c
|
bug
|
1 year ago |
|
raofuzi
|
7424da1935
|
Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/updatecontent
|
1 year ago |
|
raofuzi
|
34724596c3
|
feat: 修改bug
|
1 year ago |
|
lizijie
|
0d26a9abb2
|
Merge pull request 'jie' (#63) from jie into test
Reviewed-on: #63
|
1 year ago |
|
lizijiee
|
68ebf8f311
|
feat: 增加右侧图片信息
|
1 year ago |
|
刘释隆
|
bb15ba824f
|
Merge pull request 'feat:图审弹窗展示逻辑修改' (#62) from al into test
Reviewed-on: #62
|
1 year ago |
|
刘释隆
|
1e175e2647
|
feat: 暂存
|
1 year ago |
|
Dragon
|
508eb09709
|
bug
|
1 year ago |
|
lizijiee
|
85ae4ead31
|
fix: 修改接口名称
|
1 year ago |
|
刘释隆
|
15dd6ce13b
|
feat: 修改图审弹窗展示逻辑
|
1 year ago |
|
lizijiee
|
ee6f52c186
|
feat: 列表返回前端增加 checkDuplicateId
|
1 year ago |
|
刘释隆
|
ec7a6c16ff
|
Merge pull request 'feat: 自定义筛选列逻辑优化，图审弹窗逻辑补全' (#61) from al into test
Reviewed-on: #61
|
1 year ago |
|
刘释隆
|
ef1bfb679c
|
feat: 自定义筛选列逻辑优化，图审弹窗逻辑补全
|
1 year ago |
|
lizijie
|
8481df3a82
|
Merge pull request 'feat: 移除文件夹增加确认功能' (#60) from jie into test
Reviewed-on: #60
|
1 year ago |
|
lizijiee
|
088e5629bb
|
feat: 移除文件夹增加确认功能
|
1 year ago |
|
刘释隆
|
9f9392ee67
|
Merge pull request 'feat:终审列表数据筛选功能添加' (#59) from al_bak into test
Reviewed-on: #59
|
1 year ago |
|
刘释隆
|
4b38c24bd6
|
Merge branch 'test' into al_bak
# Conflicts:
# src/views/final/content/Content.vue
|
1 year ago |
|
刘释隆
|
747b1f10c0
|
feat: 终审列表数据筛选。图审弹窗bug修复
|
1 year ago |
|
shenhailong
|
d430e612a8
|
Merge pull request 'bug' (#56) from shen into test
Reviewed-on: #56
|
1 year ago |
|
Dragon
|
641d63704c
|
bug
|
1 year ago |
|
lizijie
|
26d4bc5b70
|
Merge pull request 'feat: 修复点击白图报错' (#55) from jie into test
Reviewed-on: #55
|
1 year ago |
|
lizijiee
|
98464ea4bc
|
feat: 修复点击白图报错
|
1 year ago |
|
刘释隆
|
37685cdbcc
|
Merge pull request 'feat: 高级筛选逻辑修复，任务审批模块高级筛选type错误修复' (#54) from al into test
Reviewed-on: #54
|
1 year ago |
|
刘释隆
|
03163892ac
|
feat: 高级筛选逻辑修复，任务审批模块高级筛选type错误修复
|
1 year ago |
|
刘释隆
|
6085997eb5
|
Merge pull request 'feat: 统计弹窗字段变更展示' (#53) from al into test
Reviewed-on: #53
|
1 year ago |
|
lizijie
|
74793497cc
|
Merge pull request 'feat: 可疑文件夹' (#52) from jie into test
Reviewed-on: #52
|
1 year ago |
|
刘释隆
|
c65a96826b
|
feat: 统计弹窗字段变更展示
|
1 year ago |
|
lizijiee
|
088730eef1
|
feat: 可疑文件夹
|
1 year ago |
|
lizijie
|
97373fc1ee
|
Merge pull request 'jie' (#51) from jie into test
Reviewed-on: #51
|
1 year ago |
|
lizijiee
|
2ccfcca958
|
feat: 批量审核
|
1 year ago |
|
yaoshuli
|
d38b169c5e
|
Merge pull request 'fix:尧勇军 一件查重功能修复' (#50) from fix/updatecontent into test
Reviewed-on: #50
|
1 year ago |
|
lizijiee
|
cc7d6ba5ad
|
Merge branch 'test' into jie
|
1 year ago |
|
lizijiee
|
0e8e9df6d0
|
feat: 暂存可疑文件夹
|
1 year ago |
|
lizijie
|
86b5147295
|
Merge pull request 'feat: 框选移除文件夹' (#49) from jie into test
Reviewed-on: #49
|
1 year ago |
|
lizijiee
|
ae974ae436
|
feat: 框选移除文件夹
|
1 year ago |
|
shenhailong
|
64b1d37190
|
Merge pull request 'bug' (#48) from shen into test
Reviewed-on: #48
|
1 year ago |
|
Dragon
|
368942dafa
|
bug
|
1 year ago |
|
raofuzi
|
9adbf46067
|
Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/updatecontent
|
1 year ago |
|
raofuzi
|
846a97111b
|
feat: 修改bug
|
1 year ago |
|
lizijie
|
5fcbecc02e
|
Merge pull request 'feat: 修复单个审核' (#47) from jie into test
Reviewed-on: #47
|
1 year ago |
|
刘释隆
|
dd547dbd05
|
Merge pull request 'feat: 1440分辨率图审审批管理弹窗样式调整' (#46) from al into test
Reviewed-on: #46
|
1 year ago |
|
刘释隆
|
38cc5d9c32
|
feat: 1440分辨率图审审批管理弹窗样式调整
|
1 year ago |
|
lizijiee
|
f80f6ec4d4
|
feat: 修复单个审核
|
1 year ago |
|
刘释隆
|
8bac54a287
|
Merge pull request 'feat: 高级筛选逻辑及交互补全' (#45) from al into test
Reviewed-on: #45
|
1 year ago |
|
刘释隆
|
14f203c0ea
|
feat: 高级筛选交互补全及逻辑优化
|
1 year ago |
|
shenhailong
|
70cc7e1a06
|
Merge pull request '终审bug' (#44) from shen into test
Reviewed-on: #44
|
1 year ago |
|
Dragon
|
6bf748963e
|
终审bug
|
1 year ago |
|
刘释隆
|
d2d4e9cf90
|
feat: 工单审批弹窗逻辑修改暂存
|
1 year ago |
|
lizijie
|
5488ed4895
|
Merge pull request 'jie' (#43) from jie into test
Reviewed-on: #43
|
1 year ago |
|
yaoshuli
|
43ff3d4dec
|
Merge pull request 'fix: 尧勇军 一件查重bug修改' (#42) from fix/updatecontent into test
Reviewed-on: #42
|
1 year ago |
|
raofuzi
|
1c71955358
|
Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/updatecontent
|
1 year ago |
|
raofuzi
|
da468db98b
|
feat: 修改bug
|
1 year ago |
|
yaoshuli
|
d375045c40
|
Merge pull request 'fix: 尧勇军，一键查重bug修复' (#41) from fix/updatecontent into test
Reviewed-on: #41
|
1 year ago |
|
lizijiee
|
baab33cd31
|
feat: 已审批 通过
|
1 year ago |
|
lizijiee
|
75c4fcc396
|
fix: 修复排序功能
|
1 year ago |
|
lizijiee
|
1d2862c405
|
fix: 修改相似图片查询id为主图id
|
1 year ago |
|
raofuzi
|
f755c42976
|
feat: 修改bug
|
1 year ago |
|
raofuzi
|
a2d3a3acef
|
feat: 修改bug
|
1 year ago |
|
刘释隆
|
9bd21216df
|
Merge pull request 'feat: 任务审批高级筛选补全逻辑' (#40) from al into test
Reviewed-on: #40
|
1 year ago |
|
刘释隆
|
93972ea9a5
|
feat: 任务审批高级筛选补全
|
1 year ago |
|
shenhailong
|
6710622480
|
Merge pull request 'shen' (#39) from shen into test
Reviewed-on: #39
|
1 year ago |
|
刘释隆
|
cb4b00b198
|
feat: 同一手机号每天最多获取10次验证码，超出十次后弹出错误提示：获取验证码次数超限，请明天再试!
|
1 year ago |
|
Dragon
|
b297558329
|
bug
|
1 year ago |
|
刘释隆
|
1e8fc84403
|
fix: 自定义设置按钮无法点击，控制台报错
|
1 year ago |
|
刘释隆
|
c4e429f181
|
Merge pull request 'fix: 任务类型与项目类别冲突bug修复' (#38) from al into test
Reviewed-on: #38
|
1 year ago |
|
刘释隆
|
3135b2c4e5
|
fix: 任务类型与项目类别冲突bug修复
|
1 year ago |
|
刘释隆
|
4ad22908d0
|
Merge pull request 'feat: 高级筛选组件props调整，任务审批高级筛选筛选值赋值' (#37) from al into test
Reviewed-on: #37
|
1 year ago |
|
刘释隆
|
ceb024784b
|
feat: 高级筛选组件props调整，任务审批高级筛选筛选值赋值
|
1 year ago |
|
Dragon
|
3fc94c9164
|
Merge branch 'test' into shen
|
1 year ago |
|
Dragon
|
8281a4719d
|
终审
|
1 year ago |
|
lizijie
|
1449fa0f15
|
Merge pull request 'feat: 任务审批增加沉浸模式' (#36) from jie into test
Reviewed-on: #36
|
1 year ago |
|
lizijiee
|
712580631a
|
feat: 任务审批增加沉浸模式
|
1 year ago |
|
shenhailong
|
d70094ef41
|
Merge pull request '小结' (#35) from shen into test
Reviewed-on: #35
|
1 year ago |
|
Dragon
|
8507763b45
|
小结
|
1 year ago |
|
lizijie
|
c9b6954c7c
|
Merge pull request 'fix: 2872 【图审审批管理】自定义任务包显示字段后，左侧数据未展示对应的字段' (#34) from jie into test
Reviewed-on: #34
|
1 year ago |
|
lizijiee
|
afc7b81d99
|
fix: 2872 【图审审批管理】自定义任务包显示字段后，左侧数据未展示对应的字段
|
1 year ago |
|
lizijie
|
d1bd1a5979
|
Merge pull request 'fix: 文字太长显示增加popver' (#33) from jie into test
Reviewed-on: #33
|
1 year ago |
|
lizijiee
|
6af37bf71d
|
fix: 文字太长显示增加popver
|
1 year ago |
|
yaoshuli
|
3e5b6c43fb
|
Merge pull request 'fix: 尧勇军，一件查重相关bug修复' (#32) from fix/updatecontent into test
Reviewed-on: #32
|
1 year ago |
|
raofuzi
|
e9c6426473
|
Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/updatecontent
|
1 year ago |
|
raofuzi
|
e1ce077f55
|
feat: 修改bug
|
1 year ago |
|
raofuzi
|
6c729a6aab
|
feat: 修改bug
|
1 year ago |
|
lizijie
|
a88db14644
|
Merge pull request 'feat: 修改审核状态判断historyStates' (#31) from jie into test
Reviewed-on: #31
|
1 year ago |
|
lizijiee
|
db4104bfc0
|
feat: 修改审核状态判断historyStates
|
1 year ago |
|
raofuzi
|
fb49867713
|
Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/updatecontent
|
1 year ago |
|
raofuzi
|
84349062d4
|
feat: 修改bug
|
1 year ago |
|
lizijie
|
52a4159b1b
|
Merge pull request 'jie' (#30) from jie into test
Reviewed-on: #30
|
1 year ago |
|
lizijiee
|
c96c4ccf2e
|
Merge branch 'test' into jie
|
1 year ago |
|
lizijiee
|
487e83a199
|
feat: 修改AI工单前端显示文字
|
1 year ago |
|
lizijie
|
cd5d274a4b
|
Merge pull request 'jie' (#29) from jie into test
Reviewed-on: #29
|
1 year ago |
|
lizijiee
|
cdf5145a32
|
Merge branch 'test' into jie
|
1 year ago |
|
lizijiee
|
8238d4258e
|
fix: 2857 【图审审批管理--解散任务包】
|
1 year ago |
|
刘释隆
|
20a21e8ee5
|
Merge pull request 'fix: 高级筛选添加条件保存报错修复' (#28) from al into test
Reviewed-on: #28
|
1 year ago |
|
刘释隆
|
bc51e033ee
|
fix: 高级筛选添加条件保存报错修复
|
1 year ago |
|
刘释隆
|
22cff29a53
|
Merge pull request 'fix:登录报错问题修复' (#27) from al into test
Reviewed-on: #27
|
1 year ago |
|
raofuzi
|
57a699f422
|
feat: 修改bug
|
1 year ago |
|
lizijie
|
c3785c28d3
|
Merge pull request 'jie' (#26) from jie into test
Reviewed-on: #26
|
1 year ago |
|
lizijiee
|
bb087d9204
|
feat: conflict 以test为准 保存 content文件
|
1 year ago |
|
lizijiee
|
a5ab9710a9
|
fix: 2707 【图审审批管理】输入数据，点击叉号关闭搜索框，再次打开后依然显示上次输入数据。预期：再次打开后应该显示为空
|
1 year ago |
|
刘释隆
|
74f0fa26b3
|
feat: 修改弹窗展示条件
|
1 year ago |
|
lizijiee
|
e2a94f5857
|
feat: 暂存
|
1 year ago |
|
lizijiee
|
0023764a99
|
fix: 暂存
|
1 year ago |
|
刘释隆
|
7f377fd9df
|
feat: 2851bug修复
|
1 year ago |
|
yaoshuli
|
de25e827f8
|
Merge pull request 'fix: 饶勇军 外包人员修复前端一键查重相关问题bug' (#25) from rao into test
Reviewed-on: #25
|
1 year ago |
|
raofuzi
|
0412fb2fdd
|
feat: 修改冲突
|
1 year ago |
|
raofuzi
|
1154bcf325
|
feat: 修改冲突
|
1 year ago |
|
lizijiee
|
35cb522488
|
feat: 优化放大镜图标布局
|
1 year ago |
|
lizijie
|
94b98b31da
|
Merge pull request 'jie' (#24) from jie into test
Reviewed-on: #24
|
1 year ago |
|
lizijiee
|
b7284f3c6c
|
fix: 2798 【图审审批管理】点击批量审批按钮出现复选框后再点一次应该关闭复选框
|
1 year ago |
|
lizijiee
|
72bc0cde7e
|
Merge branch 'test' into jie
|
1 year ago |
|
lizijiee
|
ef6acbbafc
|
fix: 2613 主页图片墙展示排序条件调整
|
1 year ago |
|
shenhailong
|
be5d95f683
|
Merge pull request 'shen' (#23) from shen into test
Reviewed-on: #23
|
1 year ago |
|
Dragon
|
be9badc045
|
Merge branch 'test' into shen
# Conflicts:
# src/views/task/content/Content.vue
|
1 year ago |
|
Dragon
|
852b9aad2c
|
bug
|
1 year ago |
|
lizijie
|
f7ae058ec4
|
Merge pull request 'jie' (#21) from jie into test
Reviewed-on: #21
|
1 year ago |
|
lizijiee
|
53b98dc6a6
|
feat: 更改查询条件倒序正序
|
1 year ago |
|
lizijiee
|
70e1ac6df0
|
feat: 不通过更改为红色
|
1 year ago |
|
Dragon
|
938e53ed44
|
暂存终审
|
1 year ago |
|
lizijiee
|
5454c7e3f6
|
Merge branch 'test' into jie
|
1 year ago |
|
lizijiee
|
331b75636b
|
feat: 解散任务包
|
1 year ago |
|
lizijiee
|
1fa07621a5
|
fix: 修改提报人提报时间
|
1 year ago |
|
lizijiee
|
f3e7bd4c4b
|
feat: 移除多余任务包名称
|
1 year ago |
|
lizijiee
|
d4ee5d73b7
|
fix: 文字超出长度增加popver
|
1 year ago |
|
raofuzi
|
cc544282be
|
feat: 修改bug
|
1 year ago |
|
刘释隆
|
9b29239459
|
Merge pull request 'feat: 新增任务审批弹窗判断展示' (#19) from al into test
Reviewed-on: #19
|
1 year ago |
|
刘释隆
|
340e11ac6f
|
Merge branch 'test' into al
# Conflicts:
# src/views/task/content/Content.vue
|
1 year ago |
|
shenhailong
|
b4455d73ba
|
Merge pull request 'bug' (#18) from shen into test
Reviewed-on: #18
|
1 year ago |
|
Dragon
|
1b61fcabb9
|
bug
|
1 year ago |
|
刘释隆
|
0837afc545
|
feat: 任务终审界面和一键查重界面的新建过滤条件新增规则，弹窗24小时展示
|
1 year ago |
|
刘释隆
|
ac5aeb5c05
|
feat: bug修复，审批右侧表格高亮展示
|
1 year ago |
|
lizijiee
|
ff11552fc6
|
fix: 2819 【AI工单管理】名字改变，变成图审审批管理
|
1 year ago |
|
shenhailong
|
fd1b5805a5
|
Merge pull request 'shen' (#17) from shen into test
Reviewed-on: #17
|
1 year ago |
|
Dragon
|
8f499e6343
|
bug
|
1 year ago |
|
lizijie
|
c781738525
|
Merge pull request 'fix: 接口字段调整，前端时间格式化错误，阻塞页面' (#16) from jie into test
Reviewed-on: #16
|
1 year ago |
|
lizijiee
|
a45916ebd0
|
fix: 接口字段调整，前端时间格式化错误，阻塞页面
|
1 year ago |
|
lizijie
|
f029d2bb99
|
Merge pull request 'feat: 批量审批删除刷新页面' (#15) from jie into test
Reviewed-on: #15
|
1 year ago |
|
刘释隆
|
b4e9b1a209
|
Merge pull request 'feat: 筛选条件列表排序及表头样式调整' (#14) from al into test
Reviewed-on: #14
|
1 year ago |
|
刘释隆
|
05c518ec67
|
feat: 筛选条件列表排序及表头样式调整
|
1 year ago |
|
lizijiee
|
161be236bc
|
feat: 批量审批删除刷新页面
|
1 year ago |
|
刘释隆
|
8e0211f801
|
Merge pull request 'feat: 高级筛选样式及交互调整，搜索限制调整' (#13) from al into test
Reviewed-on: #13
|
1 year ago |
|
刘释隆
|
8370576e21
|
feat: 高级筛选样式及交互调整，搜索限制调整
|
1 year ago |
|
lizijie
|
da314d0979
|
Merge pull request 'feat: 沉浸模式' (#12) from jie into test
Reviewed-on: #12
|
1 year ago |
|
lizijiee
|
cd26cebeb6
|
feat: 沉浸模式
|
1 year ago |
|
lizijie
|
94065207b2
|
Merge pull request 'jie' (#11) from jie into test
Reviewed-on: #11
|
1 year ago |
|
lizijiee
|
de6e957668
|
feat: 审批接口
|
1 year ago |
|
Dragon
|
2fcde4358f
|
bug
|
1 year ago |
|
lizijiee
|
55533ff3f9
|
feat: 生成时间空值判断
|
1 year ago |
|
lizijiee
|
682694a050
|
Merge branch 'test' into jie
|
1 year ago |
|
lizijiee
|
de6505bfb9
|
feat: 主图状态为通过或不通过后，禁止点击审批
|
1 year ago |
|
lizijiee
|
26481b68e8
|
fix: 修复状态显示错误
|
1 year ago |
|
shenhailong
|
646f4202b4
|
Merge pull request 'bug' (#10) from shen into test
Reviewed-on: #10
|
1 year ago |
|
Dragon
|
ed48e7d6f4
|
bug
|
1 year ago |
|
yaoshuli
|
8d48cd92b4
|
Merge pull request 'jie' (#8) from jie into test
Reviewed-on: #8
|
1 year ago |
|
yaoshuli
|
992c84ea4d
|
Merge pull request 'fix: 解决首页新图片，显示-1相似度问题' (#9) from fix/pictureListSimilarityViewBug into test
Reviewed-on: #9
|
1 year ago |
|
shuliYao
|
bdf4ac31c6
|
fix: 解决首页新图片，显示-1相似度问题
|
1 year ago |
|
lizijiee
|
800d898e87
|
feat: 流程接口联调
|
1 year ago |
|
刘释隆
|
fb20812bba
|
Merge pull request 'feat: 适配相关需求' (#7) from al into test
Reviewed-on: #7
|
1 year ago |
|
刘释隆
|
63356a7179
|
feat: 弹窗样式及交互规则调整
|
1 year ago |
|
刘释隆
|
38aa8118c6
|
feat: 对列表数据进行勾选后，界面的状态切换与RP要求不符
|
1 year ago |
|
shenhailong
|
814839f092
|
Merge pull request 'shen' (#6) from shen into test
Reviewed-on: #6
|
1 year ago |
|
刘释隆
|
6eb9a6e4c9
|
fix: 打开高级筛选列表后，始终处于Loading状态bug修复
|
1 year ago |
|
Dragon
|
6286f6b272
|
审批
|
1 year ago |
|
Dragon
|
e616e186b8
|
任务审批bug
|
1 year ago |
|
刘释隆
|
9c137112f2
|
feat: 【消息通知】点击查看更多按钮，即加载所有数据，滚动显示。此时查看更多按钮隐藏，无需再次点击
|
1 year ago |
|
刘释隆
|
34937aeabf
|
fix: 所有字段都输入数据后，下一步按钮应该取消置灰装填
|
1 year ago |
|
刘释隆
|
03925fc0c3
|
Merge pull request 'fix：修复登录问题' (#5) from al into test
Reviewed-on: #5
|
1 year ago |
|
刘释隆
|
ab4adcb70f
|
fix: 2785、2786修
|
1 year ago |
|
刘释隆
|
656ea3b2b4
|
feat: bug2786修复
|
1 year ago |
|
刘释隆
|
2588f4deb9
|
Merge pull request 'feat: 所有分页跳转添加功能' (#4) from al into test
Reviewed-on: #4
|
1 year ago |
|
刘释隆
|
f6aefd96fa
|
feat: 所有分页跳转添加功能
|
1 year ago |
|
lizijiee
|
4718a96318
|
Merge branch 'test' into jie
|
1 year ago |
|
lizijiee
|
83dcc8400e
|
feat: 增加相似图片总数
|
1 year ago |
|
刘释隆
|
b853fca38c
|
feat: 菜单样式合并调整
1. 修改menus的svgsize
|
1 year ago |
|
刘释隆
|
b27c4e6e32
|
Merge branch 'test' into al
|
1 year ago |
|
刘释隆
|
b5a5357e6e
|
feat:菜单权限及综合搜索蒙版
1. 修改n-modal库 新增showMask的props
2. 修复登录后用户没有首页的菜单权限仍可跳转到首页的问题
|
1 year ago |
|
刘释隆
|
b07da2616c
|
feat: 菜单展示悬浮修改
|
1 year ago |
|
刘释隆
|
6b61f93599
|
feat: 登录与菜单权限联调问题修复
|
1 year ago |
|
shenhailong
|
5f36e4440b
|
Merge pull request '不通过弹窗' (#1) from shen into test
Reviewed-on: #1
|
1 year ago |
|
刘释隆
|
8b175cadf3
|
fix: 登录后进入有权限的页面,调整菜单图标样式
|
1 year ago |
|
Dragon
|
19a53076c0
|
不通过弹窗
|
1 year ago |
|
刘释隆
|
37441ceec6
|
feat: 综合搜索模板去除
|
1 year ago |
