Commit Graph

823 Commits (c8bd5c81e0d8f8adba73aaa38f330f2e86395efd)

Author SHA1 Message Date
raofuzi 6be68c72a5 Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/suspiciousSort
1 year ago
raofuzi 3e0158679f feat: 修改bug
1 year ago
zhouxiaoan 037f5d30d0 fix: 合并test分支处理冲突
1 year ago
贾博轩 2256b416ac Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into test
1 year ago
贾博轩 40ca137203 feat: 解决逻辑冲突问题
1 year ago
zhouxiaoan cd42a5bc40 fix: 合并test分支处理冲突
1 year ago
刘释隆 75e1c098b7 Merge pull request 'fix: 回滚样式并调整字段取值' (#174) from fix/error_ui into test
1 year ago
刘释隆 257ebca62b fix: 回滚样式并调整字段取值
1 year ago
zhouxiaoan 878a81a355 fix: 处理图鉴管理布局样式
1 year ago
raofuzi f5cc60e423 feat: 修改bug
1 year ago
raofuzi 39e4d383fe feat: 修改bug
1 year ago
raofuzi 6ce50b5d33 feat: 修改bug
1 year ago
lihui_ocr 732d41db11 fix:箭头的选中状态
1 year ago
lihui_ocr eec8ad7573 fix:修改沉浸模式样式
1 year ago
贾博轩 43d15cfdcf feat: 新增最后审批查找功能
1 year ago
贾博轩 cc6f0ce4c1 Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into test
1 year ago
贾博轩 995dad8723 feat: 修改消息列表审批通知等功能
1 year ago
刘释隆 79596247f1 Merge branch 'test' into feat/select_change
1 year ago
刘释隆 acd661ffd2 feat: 任务审批逻辑修改及图审主图展示适配
1 year ago
raofuzi 00ec4dd402 feat: 修改bug
1 year ago
raofuzi 663afdaf5e feat: 修改bug
1 year ago
lihui_ocr ff103fe611 位置信息加标签
1 year ago
lihui_ocr 1e041144b8 FIX:第四次审批样式修改
1 year ago
刘释隆 6ad5e1f158 feat: 任务审批自定义字段逻辑修改及图审主图ui修改
1 year ago
zhouxiaoan b80d9edef4 fix: 处理图鉴管理布局错误
1 year ago
raofuzi 28dde2bfa4 Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/suspiciousSort
1 year ago
刘释隆 bb68446e6a fix: 修复打包时报错问题
1 year ago
刘释隆 52e92a391c Merge pull request 'feat: 高级筛选样式修改' (#162) from feat/ui_error_superSearch into test
1 year ago
刘释隆 128ed694cf feat: 高级筛选样式修改
1 year ago
zhouxiaoan 9ff0959153 fix: 合并代码处理冲突
1 year ago
zhouxiaoan 38a43bed83 fix: 合并代码处理冲突
1 year ago
raofuzi 939a7344c8 Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/suspiciousSort
1 year ago
raofuzi ab88ad3e68 feat: 修改bug
1 year ago
zhouxiaoan 6c734d297c fix:
1 year ago
lihui_ocr 8fa20480f1 feat:动态的
1 year ago
lihui_ocr b861266987 fix:排序功能修改完成
1 year ago
lihui_ocr 0b860955ef fix:沉浸模式布局及不同状态优化
1 year ago
刘释隆 06296781db feat: 适配后端字段
1 year ago
刘释隆 a45ba04d32 feat: 修改样式缺陷并完善图审页面适配后端字段变动
1 year ago
刘释隆 622ff84521 Merge pull request 'feat: 修改样式' (#153) from fix/ui_error into test
1 year ago
刘释隆 5d898cb6be feat: 修改样式
1 year ago
raoyongjun e9b26e8334 Merge pull request 'fix/suspiciousSort' (#152) from fix/suspiciousSort into test
1 year ago
raofuzi 774a6677e1 Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/suspiciousSort
1 year ago
raofuzi ab5ffd320c feat: 修改bug
1 year ago
刘释隆 54e6a6386c Merge pull request 'fix: 终审页面无法跳转bug修复' (#151) from fix/home_ui_erro into test
1 year ago
刘释隆 fa59bd43c0 fix: 终审页面无法跳转bug修复
1 year ago
raoyongjun d63bb0eb2f Merge pull request 'feat: 修改bug' (#150) from fix/suspiciousSort into test
1 year ago
raofuzi 1ecfc7abcb Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/suspiciousSort
1 year ago
raofuzi 2ce03ead8f feat: 修改bug
1 year ago
Dragon 10df0d3250 终审table 滚动问题
1 year ago
zhouxiaoan dae1ebcffd fix:
1 year ago
lihui_ocr 79dde563fe fix:沉浸模式下小图片的审核功能及批量操作
1 year ago
lihui_ocr 06efeb904e fix:任务审批布局错乱修改
1 year ago
lihui_ocr 4a86c212b2 fix:通过不通过快捷键问题修改
1 year ago
raofuzi d602ede9e9 feat: 修改bug
1 year ago
raofuzi bc0721e2ec Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/suspiciousSort
1 year ago
raofuzi b683a3d774 feat: 修改bug
1 year ago
zhouxiaoan f59ac652db fix:
1 year ago
刘释隆 f6c442a7e5 Merge pull request 'fix: 层级问题修复及字段展示状态修复' (#144) from fix/ui_field_bug into test
1 year ago
刘释隆 ab76d6b1ea fix: 层级问题修复及字段展示状态修复
1 year ago
raoyongjun 00259a644e Merge pull request 'feat: 修改bug' (#143) from fix/suspiciousSort into test
1 year ago
raofuzi 655d567f3b Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/suspiciousSort
1 year ago
raofuzi fcdba31a05 feat: 修改bug
1 year ago
Dragon 6533af31b5 筛选背景色
1 year ago
shenhailong 543bb181c4 Merge pull request 'feat:终审动态列表' (#141) from fix/finalScroll into test
1 year ago
Dragon bc7fcf648d 终审动态列表
1 year ago
lihui_ocr b4ef13b319 feat:主图加入到可疑文件中
1 year ago
shenhailong 124ba1910c Merge pull request 'feat:显示全部任务数据默认值修改' (#139) from fix/final into test
1 year ago
Dragon af102caccd 显示全部任务数据默认值修改
1 year ago
刘释隆 7e4cb18698 Merge pull request 'feat: 所有页面新增右下角图标,修改登录弹窗,修改样式' (#138) from feat/add_robot into test
1 year ago
刘释隆 49a7e5c053 feat: 所有页面新增右下角图标,修改登录弹窗,修改样式
1 year ago
raofuzi ebc036b9ed feat: 修改bug
1 year ago
raofuzi 3b7a3f4b19 Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/suspiciousSort
1 year ago
raofuzi 92932f3903 feat: 修改bug
1 year ago
赵辉 1473d1efc2 Merge pull request 'fix:快捷键 pp xx问题修改' (#136) from fix/changeimgback into test
1 year ago
lihui_ocr f984c8888d fix:快捷键 pp xx问题修改
1 year ago
赵辉 2ca77daaec Merge pull request 'fix:图片样式修改' (#135) from fix/changeimgback into test
1 year ago
lihui_ocr aef13be82e fix:图片样式修改
1 year ago
赵辉 418f335d3c Merge pull request 'feat:添加可疑文件按钮' (#134) from fix/changeimgback into test
1 year ago
lihui_ocr a4fe861b64 feat:添加可疑文件按钮
1 year ago
刘释隆 adfba0701e Merge pull request 'fix: 高级筛选出血线,头部数据样式修改' (#133) from fix/header_ui_error into test
1 year ago
刘释隆 4085e0dd15 fix: 高级筛选出血线,头部数据样式修改
1 year ago
lihui_ocr 449cf461a7 feat:高级检索有信息展示第一个
1 year ago
赵辉 bb0b7c9df6 Merge pull request 'feat:快捷键' (#131) from fix/changeimgback into test
1 year ago
lihui_ocr 9b9db907bf feat:快捷键
1 year ago
赵辉 0d1e6d5e3f Merge pull request 'fix:布局平铺' (#130) from fix/changeimgback into test
1 year ago
lihui_ocr 7677963d3a fix:布局平铺
1 year ago
raoyongjun b343464bf7 Merge pull request 'feat: 修改bug' (#129) from fix/suspiciousSort into test
1 year ago
raofuzi b25e87f558 Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/suspiciousSort
1 year ago
刘释隆 4eba08b97d Merge pull request 'fix: 任务审批模块字段错误修复' (#128) from fix/task_flied_error into test
1 year ago
raofuzi 07c93b17fc feat: 修改bug
1 year ago
刘释隆 1b8c56ac49 fix: 任务审批模块字段错误修复
1 year ago
lihui_ocr a6e144b15c fix:放大相似图片不同视图效果修改
1 year ago
lihui_ocr e76211ed07 fix:相似图片放大时间蒙层
1 year ago
lihui_ocr 641bb3bba7 fix:蒙层高度优化,拖拽功能问题修复
1 year ago
lihui_ocr 232aad600f feat:点击位置名称创建腾讯地图坐标
1 year ago
刘释隆 bff4baa8fc feat: 头部数据样式修改
1 year ago
刘释隆 abdaa6c3fd feat: 修复提出样式问题
1 year ago
刘释隆 406b88e424 Merge pull request 'feat: 修改样式问题及交互逻辑' (#121) from feat/ui_error into test
1 year ago
刘释隆 c578e2e658 feat: 修改样式问题及交互逻辑
1 year ago
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