 lizijiee
|
afc7b81d99
|
fix: 2872 【图审审批管理】自定义任务包显示字段后，左侧数据未展示对应的字段
|
2 years ago |
|
lizijie
|
d1bd1a5979
|
Merge pull request 'fix: 文字太长显示增加popver' (#33) from jie into test
Reviewed-on: #33
|
2 years ago |
|
lizijiee
|
6af37bf71d
|
fix: 文字太长显示增加popver
|
2 years ago |
 yaoshuli
|
3e5b6c43fb
|
Merge pull request 'fix: 尧勇军，一件查重相关bug修复' (#32) from fix/updatecontent into test
Reviewed-on: #32
|
2 years ago |
 raofuzi
|
e9c6426473
|
Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/updatecontent
|
2 years ago |
|
raofuzi
|
e1ce077f55
|
feat: 修改bug
|
2 years ago |
|
raofuzi
|
6c729a6aab
|
feat: 修改bug
|
2 years ago |
|
lizijiee
|
db4104bfc0
|
feat: 修改审核状态判断historyStates
|
2 years ago |
|
raofuzi
|
fb49867713
|
Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/updatecontent
|
2 years ago |
|
raofuzi
|
84349062d4
|
feat: 修改bug
|
2 years ago |
|
lizijiee
|
cdf5145a32
|
Merge branch 'test' into jie
|
2 years ago |
|
lizijiee
|
8238d4258e
|
fix: 2857 【图审审批管理--解散任务包】
|
2 years ago |
 刘释隆
|
bc51e033ee
|
fix: 高级筛选添加条件保存报错修复
|
2 years ago |
|
刘释隆
|
22cff29a53
|
Merge pull request 'fix:登录报错问题修复' (#27) from al into test
Reviewed-on: #27
|
2 years ago |
|
raofuzi
|
57a699f422
|
feat: 修改bug
|
2 years ago |
|
lizijiee
|
bb087d9204
|
feat: conflict 以test为准 保存 content文件
|
2 years ago |
|
lizijiee
|
a5ab9710a9
|
fix: 2707 【图审审批管理】输入数据，点击叉号关闭搜索框，再次打开后依然显示上次输入数据。预期：再次打开后应该显示为空
|
2 years ago |
|
刘释隆
|
74f0fa26b3
|
feat: 修改弹窗展示条件
|
2 years ago |
|
lizijiee
|
e2a94f5857
|
feat: 暂存
|
2 years ago |
|
lizijiee
|
0023764a99
|
fix: 暂存
|
2 years ago |
|
刘释隆
|
7f377fd9df
|
feat: 2851bug修复
|
2 years ago |
|
raofuzi
|
0412fb2fdd
|
feat: 修改冲突
|
2 years ago |
|
raofuzi
|
1154bcf325
|
feat: 修改冲突
|
2 years ago |
|
lizijiee
|
35cb522488
|
feat: 优化放大镜图标布局
|
2 years ago |
|
lizijiee
|
b7284f3c6c
|
fix: 2798 【图审审批管理】点击批量审批按钮出现复选框后再点一次应该关闭复选框
|
2 years ago |
|
lizijiee
|
72bc0cde7e
|
Merge branch 'test' into jie
|
2 years ago |
|
lizijiee
|
ef6acbbafc
|
fix: 2613 主页图片墙展示排序条件调整
|
2 years ago |
Dragon
|
be9badc045
|
Merge branch 'test' into shen
# Conflicts:
# src/views/task/content/Content.vue
|
2 years ago |
|
Dragon
|
852b9aad2c
|
bug
|
2 years ago |
|
lizijiee
|
53b98dc6a6
|
feat: 更改查询条件倒序正序
|
2 years ago |
|
lizijiee
|
70e1ac6df0
|
feat: 不通过更改为红色
|
2 years ago |
|
Dragon
|
938e53ed44
|
暂存终审
|
2 years ago |
|
lizijiee
|
5454c7e3f6
|
Merge branch 'test' into jie
|
2 years ago |
|
lizijiee
|
331b75636b
|
feat: 解散任务包
|
2 years ago |
|
lizijiee
|
1fa07621a5
|
fix: 修改提报人提报时间
|
2 years ago |
|
lizijiee
|
f3e7bd4c4b
|
feat: 移除多余任务包名称
|
2 years ago |
|
lizijiee
|
d4ee5d73b7
|
fix: 文字超出长度增加popver
|
2 years ago |
|
raofuzi
|
cc544282be
|
feat: 修改bug
|
2 years ago |
|
刘释隆
|
340e11ac6f
|
Merge branch 'test' into al
# Conflicts:
# src/views/task/content/Content.vue
|
2 years ago |
|
Dragon
|
1b61fcabb9
|
bug
|
2 years ago |
|
刘释隆
|
0837afc545
|
feat: 任务终审界面和一键查重界面的新建过滤条件新增规则，弹窗24小时展示
|
2 years ago |
|
刘释隆
|
ac5aeb5c05
|
feat: bug修复，审批右侧表格高亮展示
|
2 years ago |
 shenhailong
|
fd1b5805a5
|
Merge pull request 'shen' (#17) from shen into test
Reviewed-on: #17
|
2 years ago |
|
Dragon
|
8f499e6343
|
bug
|
2 years ago |
|
lizijie
|
c781738525
|
Merge pull request 'fix: 接口字段调整，前端时间格式化错误，阻塞页面' (#16) from jie into test
Reviewed-on: #16
|
2 years ago |
|
lizijiee
|
a45916ebd0
|
fix: 接口字段调整，前端时间格式化错误，阻塞页面
|
2 years ago |
|
lizijie
|
f029d2bb99
|
Merge pull request 'feat: 批量审批删除刷新页面' (#15) from jie into test
Reviewed-on: #15
|
2 years ago |
|
刘释隆
|
05c518ec67
|
feat: 筛选条件列表排序及表头样式调整
|
2 years ago |
|
lizijiee
|
161be236bc
|
feat: 批量审批删除刷新页面
|
2 years ago |
|
刘释隆
|
8e0211f801
|
Merge pull request 'feat: 高级筛选样式及交互调整，搜索限制调整' (#13) from al into test
Reviewed-on: #13
|
2 years ago |
|
刘释隆
|
8370576e21
|
feat: 高级筛选样式及交互调整，搜索限制调整
|
2 years ago |
|
lizijiee
|
cd26cebeb6
|
feat: 沉浸模式
|
2 years ago |
|
lizijiee
|
de6e957668
|
feat: 审批接口
|
2 years ago |
|
Dragon
|
2fcde4358f
|
bug
|
2 years ago |
|
lizijiee
|
55533ff3f9
|
feat: 生成时间空值判断
|
2 years ago |
|
lizijiee
|
682694a050
|
Merge branch 'test' into jie
|
2 years ago |
|
lizijiee
|
de6505bfb9
|
feat: 主图状态为通过或不通过后，禁止点击审批
|
2 years ago |
|
lizijiee
|
26481b68e8
|
fix: 修复状态显示错误
|
2 years ago |
|
Dragon
|
ed48e7d6f4
|
bug
|
2 years ago |
|
yaoshuli
|
8d48cd92b4
|
Merge pull request 'jie' (#8) from jie into test
Reviewed-on: #8
|
2 years ago |
|
shuliYao
|
bdf4ac31c6
|
fix: 解决首页新图片，显示-1相似度问题
|
2 years ago |
|
lizijiee
|
800d898e87
|
feat: 流程接口联调
|
2 years ago |
|
刘释隆
|
fb20812bba
|
Merge pull request 'feat: 适配相关需求' (#7) from al into test
Reviewed-on: #7
|
2 years ago |
|
刘释隆
|
63356a7179
|
feat: 弹窗样式及交互规则调整
|
2 years ago |
|
刘释隆
|
38aa8118c6
|
feat: 对列表数据进行勾选后，界面的状态切换与RP要求不符
|
2 years ago |
|
shenhailong
|
814839f092
|
Merge pull request 'shen' (#6) from shen into test
Reviewed-on: #6
|
2 years ago |
|
刘释隆
|
6eb9a6e4c9
|
fix: 打开高级筛选列表后，始终处于Loading状态bug修复
|
2 years ago |
|
Dragon
|
6286f6b272
|
审批
|
2 years ago |
|
Dragon
|
e616e186b8
|
任务审批bug
|
2 years ago |
|
刘释隆
|
9c137112f2
|
feat: 【消息通知】点击查看更多按钮，即加载所有数据，滚动显示。此时查看更多按钮隐藏，无需再次点击
|
2 years ago |
|
刘释隆
|
34937aeabf
|
fix: 所有字段都输入数据后，下一步按钮应该取消置灰装填
|
2 years ago |
|
刘释隆
|
03925fc0c3
|
Merge pull request 'fix：修复登录问题' (#5) from al into test
Reviewed-on: #5
|
2 years ago |
|
刘释隆
|
ab4adcb70f
|
fix: 2785、2786修
|
2 years ago |
|
刘释隆
|
656ea3b2b4
|
feat: bug2786修复
|
2 years ago |
|
刘释隆
|
2588f4deb9
|
Merge pull request 'feat: 所有分页跳转添加功能' (#4) from al into test
Reviewed-on: #4
|
2 years ago |
|
刘释隆
|
f6aefd96fa
|
feat: 所有分页跳转添加功能
|
2 years ago |
|
lizijiee
|
4718a96318
|
Merge branch 'test' into jie
|
2 years ago |
|
lizijiee
|
83dcc8400e
|
feat: 增加相似图片总数
|
2 years ago |
|
刘释隆
|
b27c4e6e32
|
Merge branch 'test' into al
|
2 years ago |
|
刘释隆
|
b5a5357e6e
|
feat:菜单权限及综合搜索蒙版
1. 修改n-modal库 新增showMask的props
2. 修复登录后用户没有首页的菜单权限仍可跳转到首页的问题
|
2 years ago |
|
刘释隆
|
6b61f93599
|
feat: 登录与菜单权限联调问题修复
|
2 years ago |
|
刘释隆
|
8b175cadf3
|
fix: 登录后进入有权限的页面,调整菜单图标样式
|
2 years ago |
|
Dragon
|
19a53076c0
|
不通过弹窗
|
2 years ago |
|
lizijiee
|
4941fd7092
|
feat: 沉浸模式，相似增加补充条件
|
2 years ago |
|
刘释隆
|
91c1ab823f
|
Merge branch 'al'
|
2 years ago |
|
刘释隆
|
31cf269a0d
|
feat: 菜单权限对接
|
2 years ago |
|
Dragon
|
e35f601f93
|
暂存审批
|
2 years ago |
|
Dragon
|
f9dd003074
|
Merge branch 'main' of https://git.mcnetmart.com/guoxiangbin/ocr-web
# Conflicts:
# src/views/task/aside/ListItem.vue
|
2 years ago |
|
Dragon
|
87f7deb7d4
|
审批
|
2 years ago |
|
刘释隆
|
d28605b0b9
|
feat: 登录修改逻辑，修改弹窗样式
|
2 years ago |
|
lizijiee
|
2a6de4222b
|
Merge branch 'jie' into main
|
2 years ago |
|
lizijiee
|
3ea601deda
|
feat: 审核同意和不同意接口对接
|
2 years ago |
|
刘释隆
|
f7d91196e8
|
Merge branch 'al'
# Conflicts:
# src/views/task/content/Content.vue
|
2 years ago |
|
刘释隆
|
94a6398b28
|
feat: 【任务审批--自定义任务弹窗】点击全选勾选全部数据后，取消列表任意一个数据勾选，此时上面全选按钮状态未切换为部分选中状态仍为全部选中状态bug修复
|
2 years ago |
|
lizijiee
|
848f25bd84
|
feat: 增加生成时间
|
2 years ago |
|
lizijiee
|
951d9a9e46
|
feat: ai工单优化显示字段，不使用search中返回内容
|
2 years ago |
|
刘释隆
|
613d46c78e
|
Merge branch 'al'
|
2 years ago |
|
刘释隆
|
8b5433bc6e
|
feat: 监听键盘事件页面添加
|
2 years ago |
|
lizijiee
|
b79c6e3ed7
|
feat: 更改遮罩层颜色
|
2 years ago |
|
lizijiee
|
e434b4155e
|
Merge branch 'main' of https://git.mcnetmart.com/guoxiangbin/ocr-web into main
|
2 years ago |
|
lizijiee
|
ab0bf50ca1
|
Merge branch 'jie' into main
|
2 years ago |
|
lizijiee
|
3c0666e066
|
feat: 排序按钮
|
2 years ago |
|
Dragon
|
381f174250
|
Merge branch 'main' into shen
|
2 years ago |
|
Dragon
|
c269c1cbe8
|
审核
|
2 years ago |
|
lizijiee
|
d66d87731e
|
feat: 日期格式
|
2 years ago |
|
lizijiee
|
b91bc192d1
|
Merge branch 'main' of https://git.mcnetmart.com/guoxiangbin/ocr-web into main
|
2 years ago |
|
lizijiee
|
9ae197211e
|
feat: 修复时间string类型报错 转成number
|
2 years ago |
|
Dragon
|
aa2d30f306
|
Merge branch 'main' into shen
|
2 years ago |
|
Dragon
|
58c27ac9d6
|
审核
|
2 years ago |
|
lizijiee
|
3388029176
|
feat: 页面重绘
|
2 years ago |
|
lizijiee
|
e31ff5a985
|
Merge branch 'main' into jie
|
2 years ago |
|
lizijiee
|
d29f6c9a27
|
feat: 增加状态
|
2 years ago |
|
刘释隆
|
b74c5c4dfe
|
Merge branch 'al'
|
2 years ago |
|
刘释隆
|
062b2b1647
|
feat: 任务审批筛选弹窗搜索功能完成
|
2 years ago |
|
刘释隆
|
cfad79edd0
|
feat: 【任务审批】打开自定义任务包字段弹窗后，鼠标点击空白处不应该关闭弹窗，点击确定或取消按钮才能关闭弹窗
|
2 years ago |
|
刘释隆
|
e659049ff0
|
Merge branch 'al'
|
2 years ago |
|
刘释隆
|
41cba3c591
|
feat: 任务审批弹窗样式调整
|
2 years ago |
|
刘释隆
|
dd721bd436
|
feat: 首页图片样式调整
|
2 years ago |
|
刘释隆
|
ccea48bea7
|
Merge branch 'al'
|
2 years ago |
|
刘释隆
|
934dd58401
|
feat: 全选样式修改
|
2 years ago |
|
Dragon
|
b3610000b0
|
Merge branch 'main' into shen
|
2 years ago |
|
Dragon
|
82f57d3837
|
审批bug
|
2 years ago |
|
刘释隆
|
cdb96899d0
|
Merge branch 'al'
|
2 years ago |
|
刘释隆
|
30a278f186
|
feat: 修复自定义列表展示字段问题
|
2 years ago |
|
lizijiee
|
69e0b08013
|
Merge branch 'jie' into main
|
2 years ago |
|
lizijiee
|
12a8dd5878
|
feat: 相似度图片适配，调整每行显示数量
|
2 years ago |
|
lizijiee
|
b63abd93f4
|
feat: 缩略图 最大相似值
|
2 years ago |
|
lizijiee
|
d02ba50429
|
feat: 图片字段
|
2 years ago |
|
shuliYao
|
b09b2481d7
|
feat: 解决一键查重流程错误，图片类型查询错误问题
1.图片类型查询错误问题
2.解决一键查重流程错误
|
2 years ago |
|
Dragon
|
e3693937df
|
Merge branch 'main' into shen
|
2 years ago |
|
Dragon
|
e4c3738d22
|
原来任务接口
|
2 years ago |
|
刘释隆
|
fa5884f68e
|
Merge branch 'al'
|
2 years ago |
|
刘释隆
|
966abfa0bb
|
feat: 修复问题
|
2 years ago |
|
Dragon
|
a80a2f4055
|
Merge branch 'main' into shen
|
2 years ago |
|
Dragon
|
adcf807782
|
相似图片
|
2 years ago |
|
lizijiee
|
dc00420cac
|
Merge branch 'jie' into main
|
2 years ago |
|
lizijiee
|
a0af7173ac
|
feat: 工单功能
|
2 years ago |
|
lizijiee
|
a35a1b8ff7
|
feat: 所有任务包
|
2 years ago |
|
刘释隆
|
36fe5f172d
|
feat: 所有列表新增展示数据总数
|
2 years ago |
|
刘释隆
|
aca010ccd1
|
feat: 弹框样式调整及细节调整
|
2 years ago |
|
刘释隆
|
31f04b7ee1
|
feat: 导入样式调整
|
2 years ago |
|
Dragon
|
4f0584dec3
|
重复弹窗样式
|
2 years ago |
|
刘释隆
|
c751e6baa7
|
feat: 错误码提示更改，首页样式交互更改
|
2 years ago |
|
刘释隆
|
a15f3a9b60
|
Merge branch 'al'
|
2 years ago |
|
刘释隆
|
e5696d8ec0
|
feat: 登录表单元素缺失
|
2 years ago |
|
lizijiee
|
a68b6f5a5e
|
Merge branch 'jie' into main
|
2 years ago |
|
lizijiee
|
8aa8d92176
|
feat: 增加状态判断
|
2 years ago |
|
lizijiee
|
09159ac1a3
|
feat: 查重任务增加弹框
|
2 years ago |
|
Dragon
|
a3f9507700
|
审核UI
|
2 years ago |
|
lizijiee
|
96d85f4684
|
Merge branch 'jie' into main
|
2 years ago |
|
lizijiee
|
7d2a41657e
|
feat: 增加弹框关闭按钮
|
2 years ago |
|
Dragon
|
b0b80ec70a
|
任务审批UII
|
2 years ago |
|
刘释隆
|
a2ff6c65dd
|
Merge branch 'main' of https://git.mcnetmart.com/guoxiangbin/ocr-web
|
2 years ago |
|
刘释隆
|
01481a3f87
|
feat: 优化登录rule校验
|
2 years ago |
|
lizijiee
|
4b6feec32b
|
Merge branch 'jie' into main
|
2 years ago |
|
lizijiee
|
2834912841
|
feat: 增加任务包创建完成弹框功能
|
2 years ago |
|
lizijiee
|
c2a42343a9
|
Merge branch 'jie' into main
|
2 years ago |
|
lizijiee
|
931571cf9f
|
feat: 增加创建查重任务loading
|
2 years ago |
|
Dragon
|
25e5f5f898
|
Merge branch 'main' into shen
|
2 years ago |
|
Dragon
|
b8b9db8294
|
ui
|
2 years ago |
|
lizijiee
|
3d146eb543
|
feat: 完善任务包和查重任务创建逻辑
|
2 years ago |
|
lizijiee
|
e54b709692
|
Merge branch 'jie' into main
|
2 years ago |
|
lizijiee
|
26ebe5e797
|
feat: 任务包逻辑接口联调
|
2 years ago |
|
刘释隆
|
fdf6501a01
|
Merge branch 'al'
|
2 years ago |
|
刘释隆
|
729d290199
|
feat: 修复样式bug,优化formRule,调整样式
|
2 years ago |
|
Dragon
|
638720caaa
|
Merge branch 'shen'
|
2 years ago |
|
Dragon
|
e27b8239e9
|
UI
|
2 years ago |
|
刘释隆
|
e417bd6251
|
feat: 修改axios实例bug,调整登录Input的maxlength
|
2 years ago |
|
刘释隆
|
b4a7552917
|
feat: 记住账号功能调整
|
2 years ago |
|
刘释隆
|
dfac1833cb
|
feat: 调整input组件clearIcon样式
|
2 years ago |
|
刘释隆
|
adb11244a8
|
feat: 首页登录相关模块自适应
|
2 years ago |
|
lizijiee
|
c29cbf0875
|
Merge branch 'jie' into main
|
2 years ago |
|
Dragon
|
7061efe2ec
|
UI
|
2 years ago |
|
lizijiee
|
01dcb4319f
|
fix: 1440 图片墙尺寸不对问题
|
2 years ago |
|
lizijiee
|
81ca2dbc90
|
feat: 首页增加排序功能
|
2 years ago |
|
lizijiee
|
0ab300fd47
|
feat: 1441 一键查重左侧时间检索条件，默认为三个月（加一个默认值就行，区间是3个月）
|
2 years ago |
|
lizijiee
|
1b1f288eb1
|
feat: 照片墙移除分类
|
2 years ago |
|
lizijiee
|
ca26150f3b
|
feat: 移除分类模块
|
2 years ago |
|
lizijiee
|
b56f982092
|
fix: 2598 【AI一键查重--高级筛选】点击高级筛选弹出下拉框后，在搜索模块输入正确模糊数据实时搜索并于下方显示相关数据后，关闭弹窗再次打开后上次搜索结果还会存在一秒钟才会消失
|
2 years ago |
|
lizijiee
|
6390bd01fa
|
fix: 2596 【AI一键查重--高级筛选】下拉高级筛选数据与RP设计图中字体颜色不一致，RP中对星号要求#666666，对文字要求#333333
|
2 years ago |
|
lizijiee
|
6c0cc9e6f0
|
fix: 2595 【AI一键查重--高级筛选】下拉显示与RP设计图不符，每个条件前缺少符号
|
2 years ago |
|
lizijiee
|
3e25a756e2
|
feat: 未完成 暂时按照创建时间排序 2594 【AI一键查重--高级筛选】有多条收藏条件时，排序按照收藏时间从早到晚排列。
|
2 years ago |
|
lizijiee
|
c92b34554c
|
fix: 2590 【AI一键查重--高级筛选】点击高级筛选下拉后选择某一个高级筛选条件后，顶部名称同样进行切换对应选择的名称
|
2 years ago |
|
lizijiee
|
53277ec183
|
fix: 2582 【AI一键查重】高级筛选下拉框加个滚动条
|
2 years ago |
|
Dragon
|
fd41813169
|
Merge branch 'main' into shen
|
2 years ago |
|
Dragon
|
febface968
|
暂存
|
2 years ago |
|
lizijiee
|
0c2a2b350f
|
fix: 2579 【AI一键查重--自定义筛选】查询图标颜色应该是#999999
|
2 years ago |
|
lizijiee
|
0066010257
|
fix: 高级筛选 自定义筛选 右侧选中项***更改为可以拖拽效果***
|
2 years ago |
|
lizijiee
|
0bbf434d22
|
fix: 2578 【AI一键查重--自定义筛选】提示内容应该是搜索关键词，不是关键字
|
2 years ago |
|
lizijiee
|
53ab122715
|
fix: 2568 【AI一键查重--自定义筛选】右侧添加筛选条件后，对其进行拖动，拖动一次后无法再次拖动
|
2 years ago |
|
lizijiee
|
f01d063e73
|
fix: 2568 【AI一键查重--自定义筛选】右侧添加筛选条件后，对其进行拖动，拖动一次后无法再次拖动
|
2 years ago |
|
lizijiee
|
87e56a1346
|
fix: 2564 【AI一键查重】当前系统列表排序内容与RP设计图不符
|
2 years ago |
|
lizijiee
|
c80b122273
|
fix: 2600 【AI一键查重--高级筛选】进入全部过滤条件设置界面，底部确定取消按钮样式有误
|
2 years ago |
|
lizijiee
|
eefb5a64eb
|
fix: 2592 【AI一键查重--高级筛选】鼠标滑至条件上面时，鼠标指针是以小手形式展现，而不是输入符号
|
2 years ago |
|
lizijiee
|
fe0cabe352
|
feat: 弹框关闭清空变量
|
2 years ago |
|
lizijiee
|
a1822a104c
|
fix: 2574 【AI一键查重--自定义筛选】右侧筛选条件模块点击清空按钮后，点击取消按钮关闭弹窗，再次打开后右侧筛选条件已被清空
|
2 years ago |
|
lizijiee
|
ba1934bcc8
|
fix: 2591 【AI一键查重--高级筛选】未收藏筛选条件鼠标悬停时可拖曳更换位置，仅限未收藏范围内，不可拖动至收藏条件上方
|
2 years ago |
|
lizijiee
|
4bb1d50621
|
Merge branch 'jie' into main
|
2 years ago |
|
lizijiee
|
e3c2e3e20a
|
fix: 2577 【AI一键查重--自定义筛选】字体颜色不对，要求#333333；蒙版颜色不对，要求#F8F8F8。而且蒙版最右侧未与右侧筛选条件边框对齐
|
2 years ago |
|
lizijiee
|
d027ee6d8d
|
refactor: 移除注释
|
2 years ago |
