Commit Graph

723 Commits (17dc01afa74011b494043ad409b664ce000ed2df)

Author SHA1 Message Date
raofuzi 114d5e9527 feat: 修改冲突
1 year ago
raofuzi 5df5e47fc1 Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/suspiciousSort
1 year ago
赵辉 82150a6042 Merge pull request 'fix:位置信息修改' (#118) from fix/changeimgback into test
1 year ago
lihui_ocr e6283656de fix:位置信息修改
1 year ago
刘释隆 e8ede46d05 Merge branch 'test' into feat/ui_change
1 year ago
刘释隆 1fd657dba7 feat: 修改样式问题
1 year ago
raofuzi 57ceccc5e1 Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/suspiciousSort
1 year ago
raofuzi e2e5e6dec3 feat: 修改bug
1 year ago
raofuzi 390a9e0a21 feat: 修改bug
1 year ago
Dragon f21579e774 Merge branch 'test' into fix/highSearch
1 year ago
Dragon 4356e499ea 左侧检索-高级检索功能-显示全部任务数据
1 year ago
lihui_ocr 22fb56564d fix:图片时间区域加蒙层
1 year ago
lihui_ocr cda699acf8 Merge pull request 'fix:图片中文字及阈值拖拽问题处理' (#111) from fix/changecontent into test
1 year ago
lihui_ocr 831484af02 fix:图片文字区域或阈值可拖拽
1 year ago
shenhailong 337d1bc73c Merge pull request 'feat:任务详情开启关闭规则' (#110) from fix/approvelDetail into test
1 year ago
Dragon c1581d69a0 任务详情开启关闭规则
1 year ago
lihui_ocr cb53ffcc2b 提交信息
1 year ago
raoyongjun e6a00eab6b Merge pull request 'feat: 修改bug' (#109) from fix/suspiciousSort into test
1 year ago
raofuzi 11185901c6 Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/suspiciousSort
1 year ago
raofuzi c4ef80c082 feat: 修改bug
1 year ago
lihui_ocr afcf3f538e Revert "fix: 图片增加蒙层,图片文字阈值可拖拽"
1 year ago
赵辉 1cca2fc1d0 fix: 图片增加蒙层,图片文字阈值可拖拽
1 year ago
Dragon 4bfd0e8928 终审右侧列表动态列问题
1 year ago
raofuzi 030216cb3a feat: 修改可疑排序规则
1 year ago
raofuzi 0df2265e1f feat: 修改可疑排序规则
1 year ago
刘释隆 7c6e5b9c45 feat: 修改ui样式
1 year ago
刘释隆 0ee2ea778e feat: 任务审批页面调整为1440*1100
1 year ago
刘释隆 74e6119eb3 Merge pull request 'feat: 任务审批模块左侧筛选条件联动' (#104) from feat/header_data into test
1 year ago
刘释隆 53d3062faa feat: 任务审批模块左侧筛选条件联动
1 year ago
刘释隆 b2d0714264 Merge pull request 'feat: 终审页面卡片列表切换功能添加' (#103) from feat/header_data into test
1 year ago
刘释隆 868b24c023 feat: 终审页面卡片列表切换功能添加
1 year ago
刘释隆 e64c6ad7ee Merge pull request 'feat: 按RP添加头部信息栏' (#102) from feat/header_data into test
1 year ago
刘释隆 087a43ad7e feat: 按RP添加头部信息栏
1 year ago
lizijiee 869095f192 feat: 一键查重增加提报人upUserName
1 year ago
Dragon bad0992510 时间线样式
1 year ago
刘释隆 409528f0c5 fix: 创建筛选条件时,切换筛选项后面的条件内容要清空
1 year ago
刘释隆 04b0ae258b Merge branch 'test' into bak
1 year ago
刘释隆 d13f61e972 feat: 高级筛选弹窗列表与数据联动
1 year ago
shenhailong 8302e0c8b0 Merge pull request 'fix:终审排序和页面样式' (#97) from fix/shenpi into test
1 year ago
Dragon ce2973235b 终审排序
1 year ago
lizijiee c77349eeab fix: 找回丢失代码
1 year ago
lizijiee 295f4b3ddf Merge branch 'test' into jie
1 year ago
刘释隆 eeded59b52 fix: 下载高清图
1 year ago
wendong551 49c2fe1b8e Merge branch 'test' into fix/styleProblem
1 year ago
lizijiee b8658578d8 Merge branch 'test' into jie
1 year ago
wendong551 0741bc71f6 Merge branch 'test' into fix/newStyleProblem
1 year ago
wendong551 6ff6fe4bbe fix: 一键查重临时问题处理
1 year ago
刘释隆 0077860210 fix: 修复高级筛选搜索点击后报错bug
1 year ago
刘释隆 00b8a712a6 fix: 展示字段修改,接口搜索字段对接
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
Dragon b2192bbd5c 小结查重全部不通过
1 year ago
shenhailong 218c56c5d3 Merge pull request 'bug:审批列表相似度展示模式和终审问题' (#87) from fix/shenpi into test
1 year ago
Dragon 9fa25d4614 终审审批之后刷新
1 year ago
lizijie 63b19a5e16 Merge pull request 'feat: 主图审核后状态不刷新bug修复' (#86) from jie into test
1 year ago
lizijiee f2555cbdf9 feat: 主图审核后状态不刷新bug修复
1 year ago
刘释隆 dae736abe4 Merge pull request 'feat: 图审弹窗操作后刷新数据功能添加,去掉选框' (#85) from feat/changeTitle into test
1 year ago
刘释隆 4a1e137707 feat: 图审弹窗操作后刷新数据功能添加,去掉选框
1 year ago
Dragon b281600df6 相似图展示
1 year ago
lizijie fa79657575 Merge pull request 'feat: 任务包图片点击' (#84) from jie into test
1 year ago
lizijiee c0aa814aec feat: 任务包图片点击
1 year ago
lizijie 0b210eb045 Merge pull request 'feat: 调整taskId为taskchildpictureid' (#83) from jie into test
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
1 year ago
lizijiee 84fea70b5b feat: 修复主图流程
1 year ago
刘释隆 6d1b319acf feat: 图审审批改为图检审批
1 year ago
刘释隆 ab9e50ff0c fix: 首页高级筛选搜索功能与右侧数据联动问题修复
1 year ago
lizijie 9ae9be0272 Merge pull request 'feat: 不通过状态' (#79) from jie into test
1 year ago
刘释隆 7507c16dd1 Merge pull request 'fix:修复终审自定义列表排序及修改综合搜索titile' (#78) from fix/sort_error into test
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
1 year ago
lizijiee 73ad5f8f64 feat: 增加照片墙组件,修复可疑文件夹多选删除id错误失败问题
1 year ago
刘释隆 6ec415481e fix: 终审列表columns排序问题修复
1 year ago
lizijiee 4266ab4f74 feat: 调整日期顺序
1 year ago
刘释隆 cad7cea19f feat: 逻辑补全,登录首页样式调整
1 year ago
刘释隆 45c074009a Merge pull request 'feat: 高级筛选新增点击遮罩无关闭' (#75) from feat/final into test
1 year ago
刘释隆 fad5db4022 feat: 高级筛选新增点击遮罩无关闭
1 year ago
shenhailong 680f27d12a Merge pull request 'shen' (#74) from shen into test
1 year ago
Dragon a8b02071df 1、终审样式
1 year ago
Dragon 43b3ebd078 1、终审样式
1 year ago
刘释隆 e304a3b1e0 Merge pull request 'fix:接口报错修复' (#73) from fix/api_error into test
1 year ago
刘释隆 b0a67b9ac3 feat: 高级筛选阈值回显
1 year ago
yaoshuli 52b1215759 Merge pull request 'feat: 尧勇刚 一件查重bug修改' (#72) from fix/updatecontent into test
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
1 year ago
lizijiee ef187f2285 feat: 审核和排序后重新layout 调整布局
1 year ago
lizijiee 2b63e8577a feat: 可疑文件夹增加批量审批审核
1 year ago
raofuzi ca78247917 feat: 修改bug
1 year ago
刘释隆 f3433010de Merge pull request 'feat: 审批状态展示添加,任务审批审批状态字段变更,完善逻辑' (#69) from feat/task_select into test
1 year ago
刘释隆 9d433b2e32 feat: 审批状态展示添加,任务审批审批状态字段变更,完善逻辑
1 year ago
lizijie 22af7a3d27 Merge pull request 'fix: 修复可疑文件夹,图审审批批量选择问题' (#67) from jie into test
1 year ago
lizijiee 406a6a2205 fix: 修复可疑文件夹,图审审批批量选择问题
1 year ago
刘释隆 469f4d378f Merge pull request 'feat: 一键查重高级筛选逻辑补全,修复左侧操作栏隐藏后svg展示问题' (#66) from al into test
1 year ago
刘释隆 0533b7faa3 feat: 一键查重高级筛选逻辑补全,修复左侧操作栏隐藏后svg展示问题
1 year ago
Dragon e174903ebb Merge branch 'test' into shen
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
1 year ago
lizijiee 68ebf8f311 feat: 增加右侧图片信息
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
1 year ago
刘释隆 ef1bfb679c feat: 自定义筛选列逻辑优化,图审弹窗逻辑补全
1 year ago
lizijie 8481df3a82 Merge pull request 'feat: 移除文件夹增加确认功能' (#60) from jie into test
1 year ago
lizijiee 088e5629bb feat: 移除文件夹增加确认功能
1 year ago
刘释隆 4b38c24bd6 Merge branch 'test' into al_bak
1 year ago
刘释隆 747b1f10c0 feat: 终审列表数据筛选。图审弹窗bug修复
1 year ago
shenhailong d430e612a8 Merge pull request 'bug' (#56) from shen into test
1 year ago
Dragon 641d63704c bug
1 year ago
lizijie 26d4bc5b70 Merge pull request 'feat: 修复点击白图报错' (#55) from jie into test
1 year ago
lizijiee 98464ea4bc feat: 修复点击白图报错
1 year ago
刘释隆 03163892ac feat: 高级筛选逻辑修复,任务审批模块高级筛选type错误修复
1 year ago
刘释隆 6085997eb5 Merge pull request 'feat: 统计弹窗字段变更展示' (#53) from al into test
1 year ago
lizijie 74793497cc Merge pull request 'feat: 可疑文件夹' (#52) from jie into test
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
1 year ago
lizijiee 2ccfcca958 feat: 批量审核
1 year ago
yaoshuli d38b169c5e Merge pull request 'fix:尧勇军 一件查重功能修复' (#50) from fix/updatecontent into test
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
1 year ago
lizijiee ae974ae436 feat: 框选移除文件夹
1 year ago
shenhailong 64b1d37190 Merge pull request 'bug' (#48) from shen into test
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
1 year ago
刘释隆 dd547dbd05 Merge pull request 'feat: 1440分辨率图审审批管理弹窗样式调整' (#46) from al into test
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
1 year ago
刘释隆 14f203c0ea feat: 高级筛选交互补全及逻辑优化
1 year ago
shenhailong 70cc7e1a06 Merge pull request '终审bug' (#44) from shen into test
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
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
1 year ago
刘释隆 93972ea9a5 feat: 任务审批高级筛选补全
1 year ago
shenhailong 6710622480 Merge pull request 'shen' (#39) from shen into test
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
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
1 year ago
Dragon 8507763b45 小结
1 year ago
lizijie c9b6954c7c Merge pull request 'fix: 2872 【图审审批管理】自定义任务包显示字段后,左侧数据未展示对应的字段' (#34) from jie into test
1 year ago
lizijiee afc7b81d99 fix: 2872 【图审审批管理】自定义任务包显示字段后,左侧数据未展示对应的字段
1 year ago
lizijie d1bd1a5979 Merge pull request 'fix: 文字太长显示增加popver' (#33) from jie into test
1 year ago
lizijiee 6af37bf71d fix: 文字太长显示增加popver
1 year ago
yaoshuli 3e5b6c43fb Merge pull request 'fix: 尧勇军,一件查重相关bug修复' (#32) from fix/updatecontent into test
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
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
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