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 |
|
raofuzi
|
da468db98b
|
feat: 修改bug
|
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 |
|
刘释隆
|
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 |
|
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 |
|
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 |
|
lizijiee
|
487e83a199
|
feat: 修改AI工单前端显示文字
|
1 year ago |
|
lizijiee
|
cdf5145a32
|
Merge branch 'test' into jie
|
1 year ago |
|
lizijiee
|
8238d4258e
|
fix: 2857 【图审审批管理--解散任务包】
|
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 |
|
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 |
|
raofuzi
|
0412fb2fdd
|
feat: 修改冲突
|
1 year ago |
|
raofuzi
|
1154bcf325
|
feat: 修改冲突
|
1 year ago |
|
lizijiee
|
35cb522488
|
feat: 优化放大镜图标布局
|
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 |
|
Dragon
|
be9badc045
|
Merge branch 'test' into shen
# Conflicts:
# src/views/task/content/Content.vue
|
1 year ago |
|
Dragon
|
852b9aad2c
|
bug
|
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 |
|
刘释隆
|
340e11ac6f
|
Merge branch 'test' into al
# Conflicts:
# src/views/task/content/Content.vue
|
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 |
|
刘释隆
|
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 |
|
lizijiee
|
cd26cebeb6
|
feat: 沉浸模式
|
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 |
|
Dragon
|
ed48e7d6f4
|
bug
|
1 year ago |
|
yaoshuli
|
8d48cd92b4
|
Merge pull request 'jie' (#8) from jie into test
Reviewed-on: #8
|
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 |
|
刘释隆
|
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 |
|
刘释隆
|
8b175cadf3
|
fix: 登录后进入有权限的页面,调整菜单图标样式
|
1 year ago |
|
Dragon
|
19a53076c0
|
不通过弹窗
|
1 year ago |
|
刘释隆
|
37441ceec6
|
feat: 综合搜索模板去除
|
1 year ago |
|
lizijiee
|
4941fd7092
|
feat: 沉浸模式，相似增加补充条件
|
1 year ago |
|
刘释隆
|
91c1ab823f
|
Merge branch 'al'
|
1 year ago |
|
刘释隆
|
31cf269a0d
|
feat: 菜单权限对接
|
1 year ago |
|
Dragon
|
e35f601f93
|
暂存审批
|
1 year ago |
|
Dragon
|
f9dd003074
|
Merge branch 'main' of https://git.mcnetmart.com/guoxiangbin/ocr-web
# Conflicts:
# src/views/task/aside/ListItem.vue
|
1 year ago |
|
Dragon
|
87f7deb7d4
|
审批
|
1 year ago |
|
刘释隆
|
d28605b0b9
|
feat: 登录修改逻辑，修改弹窗样式
|
1 year ago |
|
lizijiee
|
2a6de4222b
|
Merge branch 'jie' into main
|
1 year ago |
|
lizijiee
|
3ea601deda
|
feat: 审核同意和不同意接口对接
|
1 year ago |
|
刘释隆
|
f7d91196e8
|
Merge branch 'al'
# Conflicts:
# src/views/task/content/Content.vue
|
1 year ago |
|
刘释隆
|
94a6398b28
|
feat: 【任务审批--自定义任务弹窗】点击全选勾选全部数据后，取消列表任意一个数据勾选，此时上面全选按钮状态未切换为部分选中状态仍为全部选中状态bug修复
|
1 year ago |
|
lizijiee
|
848f25bd84
|
feat: 增加生成时间
|
1 year ago |
|
lizijiee
|
951d9a9e46
|
feat: ai工单优化显示字段，不使用search中返回内容
|
1 year ago |
|
刘释隆
|
56579989dd
|
feat: 切换公司icon添加
|
1 year ago |
|
刘释隆
|
613d46c78e
|
Merge branch 'al'
|
1 year ago |
|
刘释隆
|
8b5433bc6e
|
feat: 监听键盘事件页面添加
|
1 year ago |
|
lizijiee
|
b79c6e3ed7
|
feat: 更改遮罩层颜色
|
1 year ago |
|
lizijiee
|
e434b4155e
|
Merge branch 'main' of https://git.mcnetmart.com/guoxiangbin/ocr-web into main
|
1 year ago |
|
lizijiee
|
ab0bf50ca1
|
Merge branch 'jie' into main
|
1 year ago |
|
lizijiee
|
3c0666e066
|
feat: 排序按钮
|
1 year ago |
|
Dragon
|
381f174250
|
Merge branch 'main' into shen
|
1 year ago |
|
Dragon
|
c269c1cbe8
|
审核
|
1 year ago |
|
lizijiee
|
d66d87731e
|
feat: 日期格式
|
1 year ago |
|
lizijiee
|
b91bc192d1
|
Merge branch 'main' of https://git.mcnetmart.com/guoxiangbin/ocr-web into main
|
1 year ago |
|
lizijiee
|
9ae197211e
|
feat: 修复时间string类型报错 转成number
|
1 year ago |
|
Dragon
|
aa2d30f306
|
Merge branch 'main' into shen
|
1 year ago |
|
Dragon
|
58c27ac9d6
|
审核
|
1 year ago |
|
lizijiee
|
3388029176
|
feat: 页面重绘
|
1 year ago |
|
lizijiee
|
e31ff5a985
|
Merge branch 'main' into jie
|
1 year ago |
