 lihui_ocr
|
641bb3bba7
|
fix:蒙层高度优化,拖拽功能问题修复
|
2 years ago |
|
lihui_ocr
|
232aad600f
|
feat:点击位置名称创建腾讯地图坐标
|
2 years ago |
 刘释隆
|
406b88e424
|
Merge pull request 'feat: 修改样式问题及交互逻辑' (#121) from feat/ui_error into test
Reviewed-on: #121
|
2 years ago |
|
刘释隆
|
c578e2e658
|
feat: 修改样式问题及交互逻辑
|
2 years ago |
 赵辉
|
82150a6042
|
Merge pull request 'fix:位置信息修改' (#118) from fix/changeimgback into test
Reviewed-on: #118
|
2 years ago |
|
lihui_ocr
|
e6283656de
|
fix:位置信息修改
|
2 years ago |
|
刘释隆
|
e8ede46d05
|
Merge branch 'test' into feat/ui_change
# Conflicts:
# src/views/task/content/Content.vue
|
2 years ago |
|
刘释隆
|
1fd657dba7
|
feat: 修改样式问题
|
2 years ago |
|
lihui_ocr
|
22fb56564d
|
fix:图片时间区域加蒙层
|
2 years ago |
|
lihui_ocr
|
cda699acf8
|
Merge pull request 'fix:图片中文字及阈值拖拽问题处理' (#111) from fix/changecontent into test
Reviewed-on: #111
|
2 years ago |
|
lihui_ocr
|
831484af02
|
fix:图片文字区域或阈值可拖拽
|
2 years ago |
Dragon
|
c1581d69a0
|
任务详情开启关闭规则
|
2 years ago |
|
lihui_ocr
|
afcf3f538e
|
Revert "fix: 图片增加蒙层，图片文字阈值可拖拽"
This reverts commit 1cca2fc1d0.
|
2 years ago |
|
赵辉
|
1cca2fc1d0
|
fix: 图片增加蒙层，图片文字阈值可拖拽
|
2 years ago |
|
刘释隆
|
7c6e5b9c45
|
feat: 修改ui样式
|
2 years ago |
|
刘释隆
|
0ee2ea778e
|
feat: 任务审批页面调整为1440*1100
|
2 years ago |
|
刘释隆
|
74e6119eb3
|
Merge pull request 'feat: 任务审批模块左侧筛选条件联动' (#104) from feat/header_data into test
Reviewed-on: #104
|
2 years ago |
|
刘释隆
|
53d3062faa
|
feat: 任务审批模块左侧筛选条件联动
|
2 years ago |
|
刘释隆
|
e64c6ad7ee
|
Merge pull request 'feat: 按RP添加头部信息栏' (#102) from feat/header_data into test
Reviewed-on: #102
|
2 years ago |
|
刘释隆
|
087a43ad7e
|
feat: 按RP添加头部信息栏
|
2 years ago |
|
Dragon
|
bad0992510
|
时间线样式
|
2 years ago |
|
刘释隆
|
409528f0c5
|
fix: 创建筛选条件时，切换筛选项后面的条件内容要清空
|
2 years ago |
|
刘释隆
|
d13f61e972
|
feat: 高级筛选弹窗列表与数据联动
|
2 years ago |
wendong551
|
098c277914
|
fix: 冲突解决
|
2 years ago |
|
wendong551
|
1968b771e0
|
fix: 样式bug处理
|
2 years ago |
|
Dragon
|
9fa25d4614
|
终审审批之后刷新
|
2 years ago |
|
Dragon
|
b281600df6
|
相似图展示
|
2 years ago |
 shenhailong
|
680f27d12a
|
Merge pull request 'shen' (#74) from shen into test
Reviewed-on: #74
|
2 years ago |
|
Dragon
|
a8b02071df
|
1、终审样式
2、相似图样式
3、终审列表样式
4、审核完成状态改变bug
5、相似图筛选问题
6、缩略图问题
7、小结查重重复任务问题
8、移入刷新问题
|
2 years ago |
|
Dragon
|
43b3ebd078
|
1、终审样式
2、相似图样式
3、终审列表样式
4、审核完成状态改变bug
5、相似图筛选问题
6、缩略图问题
7、小结查重重复任务问题
8、移入刷新问题
|
2 years ago |
|
刘释隆
|
9d433b2e32
|
feat: 审批状态展示添加，任务审批审批状态字段变更，完善逻辑
|
2 years ago |
|
刘释隆
|
469f4d378f
|
Merge pull request 'feat: 一键查重高级筛选逻辑补全，修复左侧操作栏隐藏后svg展示问题' (#66) from al into test
Reviewed-on: #66
|
2 years ago |
|
刘释隆
|
0533b7faa3
|
feat: 一键查重高级筛选逻辑补全，修复左侧操作栏隐藏后svg展示问题
|
2 years ago |
|
Dragon
|
e174903ebb
|
Merge branch 'test' into shen
# Conflicts:
# src/views/final/content/Content.vue
|
2 years ago |
|
Dragon
|
fec125d72c
|
bug
|
2 years ago |
|
Dragon
|
508eb09709
|
bug
|
2 years ago |
|
刘释隆
|
ef1bfb679c
|
feat: 自定义筛选列逻辑优化，图审弹窗逻辑补全
|
2 years ago |
|
刘释隆
|
03163892ac
|
feat: 高级筛选逻辑修复，任务审批模块高级筛选type错误修复
|
2 years ago |
 lizijiee
|
088730eef1
|
feat: 可疑文件夹
|
2 years ago |
|
Dragon
|
368942dafa
|
bug
|
2 years ago |
|
刘释隆
|
14f203c0ea
|
feat: 高级筛选交互补全及逻辑优化
|
2 years ago |
|
刘释隆
|
9bd21216df
|
Merge pull request 'feat: 任务审批高级筛选补全逻辑' (#40) from al into test
Reviewed-on: #40
|
2 years ago |
|
shenhailong
|
6710622480
|
Merge pull request 'shen' (#39) from shen into test
Reviewed-on: #39
|
2 years ago |
|
Dragon
|
b297558329
|
bug
|
2 years ago |
|
刘释隆
|
1e8fc84403
|
fix: 自定义设置按钮无法点击，控制台报错
|
2 years ago |
|
刘释隆
|
4ad22908d0
|
Merge pull request 'feat: 高级筛选组件props调整，任务审批高级筛选筛选值赋值' (#37) from al into test
Reviewed-on: #37
|
2 years ago |
|
刘释隆
|
ceb024784b
|
feat: 高级筛选组件props调整，任务审批高级筛选筛选值赋值
|
2 years ago |
|
lizijiee
|
712580631a
|
feat: 任务审批增加沉浸模式
|
2 years ago |
|
刘释隆
|
7f377fd9df
|
feat: 2851bug修复
|
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 |
|
Dragon
|
938e53ed44
|
暂存终审
|
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 |
|
刘释隆
|
ac5aeb5c05
|
feat: bug修复，审批右侧表格高亮展示
|
2 years ago |
|
Dragon
|
8f499e6343
|
bug
|
2 years ago |
|
Dragon
|
2fcde4358f
|
bug
|
2 years ago |
|
Dragon
|
ed48e7d6f4
|
bug
|
2 years ago |
|
Dragon
|
6286f6b272
|
审批
|
2 years ago |
|
Dragon
|
e616e186b8
|
任务审批bug
|
2 years ago |
|
Dragon
|
19a53076c0
|
不通过弹窗
|
2 years ago |
|
刘释隆
|
91c1ab823f
|
Merge branch 'al'
|
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 |
|
刘释隆
|
f7d91196e8
|
Merge branch 'al'
# Conflicts:
# src/views/task/content/Content.vue
|
2 years ago |
|
刘释隆
|
94a6398b28
|
feat: 【任务审批--自定义任务弹窗】点击全选勾选全部数据后，取消列表任意一个数据勾选，此时上面全选按钮状态未切换为部分选中状态仍为全部选中状态bug修复
|
2 years ago |
|
刘释隆
|
613d46c78e
|
Merge branch 'al'
|
2 years ago |
|
刘释隆
|
8b5433bc6e
|
feat: 监听键盘事件页面添加
|
2 years ago |
|
Dragon
|
c269c1cbe8
|
审核
|
2 years ago |
|
Dragon
|
aa2d30f306
|
Merge branch 'main' into shen
|
2 years ago |
|
Dragon
|
58c27ac9d6
|
审核
|
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 |
|
Dragon
|
82f57d3837
|
审批bug
|
2 years ago |
|
刘释隆
|
cdb96899d0
|
Merge branch 'al'
|
2 years ago |
|
刘释隆
|
30a278f186
|
feat: 修复自定义列表展示字段问题
|
2 years ago |
|
Dragon
|
e4c3738d22
|
原来任务接口
|
2 years ago |
|
Dragon
|
a80a2f4055
|
Merge branch 'main' into shen
|
2 years ago |
|
Dragon
|
adcf807782
|
相似图片
|
2 years ago |
|
刘释隆
|
aca010ccd1
|
feat: 弹框样式调整及细节调整
|
2 years ago |
|
Dragon
|
a3f9507700
|
审核UI
|
2 years ago |
|
Dragon
|
b0b80ec70a
|
任务审批UII
|
2 years ago |
|
Dragon
|
b8b9db8294
|
ui
|
2 years ago |
|
Dragon
|
e27b8239e9
|
UI
|
2 years ago |
|
Dragon
|
7061efe2ec
|
UI
|
2 years ago |
|
Dragon
|
1cdebc153a
|
不通过
|
2 years ago |
|
Dragon
|
ba7add68c0
|
Merge branch 'main' into shen
|
2 years ago |
|
Dragon
|
4bc95c1d64
|
消息
|
2 years ago |
|
刘释隆
|
97bd8a6fe2
|
feat: 全局筛选弹框样式适配，登录逻辑修补
|
2 years ago |
|
Dragon
|
30080d27f4
|
Merge branch 'main' into shen
|
2 years ago |
|
Dragon
|
f05a3fc78b
|
弹窗
|
2 years ago |
|
刘释隆
|
2d9bb1a802
|
feat: 悬浮逻辑修复，任务列表样式调整
|
2 years ago |
|
Dragon
|
c94c04c169
|
UI
|
2 years ago |
|
Dragon
|
f490843941
|
Merge branch 'main' into shen
|
2 years ago |
|
Dragon
|
6be8522085
|
详情
|
2 years ago |
|
刘释隆
|
21301dccc0
|
feat: 多选样式一致，修复高级筛选流程操作问题
|
2 years ago |
|
刘释隆
|
4b64a4c25f
|
feat: 样式调整新增悬浮后判断审批条件若已审批则不展示操作
|
2 years ago |
|
刘释隆
|
c490172e4e
|
feat: 所有下拉选项框新增搜索功能
|
2 years ago |
|
刘释隆
|
a93ed2c06a
|
feat: 高级筛选功能完善，任务审批页补全
|
2 years ago |
|
Dragon
|
5fe486d490
|
Merge branch 'main' into shen
|
2 years ago |
|
Dragon
|
66d118fc4e
|
审查历史
|
2 years ago |
|
刘释隆
|
37ed402f98
|
Merge branch 'al'
|
2 years ago |
|
刘释隆
|
30fc972eca
|
feat: 样式修改逻辑优化
|
2 years ago |
|
lizijiee
|
688bbc9f23
|
Merge branch 'main' of https://git.mcnetmart.com/guoxiangbin/ocr-web into main
|
2 years ago |
|
lizijiee
|
ca4c634664
|
fix: 修复虚拟滚动，异步请求数据，页面dom显示错乱
|
2 years ago |
|
Dragon
|
aac5e41e13
|
历史
|
2 years ago |
|
Dragon
|
0f9d9fd338
|
Merge branch 'main' into shen
|
2 years ago |
|
Dragon
|
fbed61bcbd
|
审查历史
|
2 years ago |
|
刘释隆
|
7ed436a454
|
feat: 所有自定义动态列对接完毕
|
2 years ago |
|
刘释隆
|
a89e109010
|
feat: 任务审批自定义列表完成
|
2 years ago |
|
刘释隆
|
d65e7abf42
|
feat: 任务审批自定义列表完成
|
2 years ago |
elseif
|
f7e46e1e0e
|
fix: 首页刷新失败
|
2 years ago |
|
elseif
|
20b8849db7
|
Merge branch 'main' of https://git.mcnetmart.com/guoxiangbin/ocr-web
|
2 years ago |
|
elseif
|
d03b8edda7
|
fix: 缩略图预览
|
2 years ago |
|
刘释隆
|
6692fe5b0a
|
feat: 代码优化，修复逻辑错误
|
2 years ago |
|
elseif
|
6d9da330c2
|
Merge branch 'main' of https://git.mcnetmart.com/guoxiangbin/ocr-web
# Conflicts:
# src/views/task/content/Content.vue
|
2 years ago |
|
刘释隆
|
557e09ad5b
|
feat: 审批状态展示样式修改
|
2 years ago |
|
刘释隆
|
7b4cf57329
|
Merge branch 'al'
|
2 years ago |
|
刘释隆
|
5022d82e56
|
feat: 合并冲突
|
2 years ago |
|
刘释隆
|
4e9ee6eaa6
|
feat: 修复刷新问题
|
2 years ago |
|
elseif
|
d87761a1b5
|
fix: update
|
2 years ago |
|
elseif
|
8979379156
|
Merge branch 'main' of https://git.mcnetmart.com/guoxiangbin/ocr-web
# Conflicts:
# src/views/task/content/Content.vue
|
2 years ago |
|
elseif
|
45c6071120
|
fix: update
|
2 years ago |
|
刘释隆
|
30dab26283
|
feat: 修改自定义列后刷新页面
|
2 years ago |
|
刘释隆
|
75d64e19ee
|
feat: 解决冲突并新增刷新逻辑
|
2 years ago |
|
刘释隆
|
bf7a1e7b54
|
Merge branch 'main' of https://git.mcnetmart.com/guoxiangbin/ocr-web
# Conflicts:
# src/views/task/content/Content.vue
|
2 years ago |
|
刘释隆
|
f138e7e26f
|
feat: 适配筛选条件回显
|
2 years ago |
|
elseif
|
67842d2fcc
|
fix: update
|
2 years ago |
|
elseif
|
dc611f304c
|
fix: update
|
2 years ago |
|
elseif
|
80a7151cbd
|
Merge branch 'main' of https://git.mcnetmart.com/guoxiangbin/ocr-web
|
2 years ago |
|
elseif
|
6f54f2d569
|
fix: some bug
|
2 years ago |
|
刘释隆
|
b185cbb134
|
feat: 回滚代码
|
2 years ago |
|
刘释隆
|
3043be633c
|
Merge branch 'main' of https://git.mcnetmart.com/guoxiangbin/ocr-web
|
2 years ago |
|
刘释隆
|
52744856ee
|
feat: 字段展示及表格判断
|
2 years ago |
|
elseif
|
f11fc716d8
|
Merge branch 'main' of https://git.mcnetmart.com/guoxiangbin/ocr-web
# Conflicts:
# src/views/task/content/Content.vue
|
2 years ago |
|
刘释隆
|
66b27a4dfa
|
Merge branch 'al'
# Conflicts:
# src/views/task/content/Content.vue
|
2 years ago |
|
刘释隆
|
09dd038d49
|
feat: 任务审批列表字段展示
|
2 years ago |
|
elseif
|
ceb473d4b2
|
feat: 工单拖动加载；更换缩略图
|
2 years ago |
|
刘释隆
|
3d1576745b
|
feat: 任务审批填报信息完成
|
2 years ago |
|
elseif
|
98e945193a
|
Merge branch 'main' of https://git.mcnetmart.com/guoxiangbin/ocr-web
|
2 years ago |
|
elseif
|
cc7e9715c4
|
refactor: 调整选择过滤时刷新逻辑
|
2 years ago |
|
刘释隆
|
5dfcde4f3a
|
Merge branch 'al'
# Conflicts:
# src/views/worksheet/aside/WorkSheetList.vue
|
2 years ago |
|
刘释隆
|
0f314483b6
|
feat: 列表展示字段修改
|
2 years ago |
|
elseif
|
feb57a65e8
|
refactor: 调整工单左侧列表滚动刷新逻辑
|
2 years ago |
|
elseif
|
98842219bb
|
refactor: 修改终审列表参数
|
2 years ago |
|
刘释隆
|
409f9e9c51
|
Merge branch 'al'
# Conflicts:
# src/views/task/aside/Aside.vue
|
2 years ago |
|
elseif
|
ec4bd86324
|
refactor: 调整审批
|
2 years ago |
|
刘释隆
|
44c3c50a0e
|
feat: 接口对接完善
|
2 years ago |
|
elseif
|
ba5cd29005
|
feat: 完善首页过滤
|
2 years ago |
|
刘释隆
|
0a8af82120
|
feat: 自定义列表对接完毕并调整代码结构
|
2 years ago |
|
elseif
|
06d7283f03
|
feat: 更新字典，调整过滤逻辑
|
2 years ago |
|
elseif
|
ff018504a4
|
refactor: 获取任务包列表错误逻辑处理
|
2 years ago |
|
刘释隆
|
edfb31fc6c
|
Merge branch 'al'
# Conflicts:
# src/views/home/content/Content.vue
# src/views/task/aside/Aside.vue
# src/views/task/content/Content.vue
|
2 years ago |
|
刘释隆
|
439fe5cb5a
|
feat: 交互完善,表单自定义设置弹窗
|
2 years ago |
|
elseif
|
995f994bf4
|
feat: 图片放大
|
2 years ago |
|
elseif
|
264a6282ee
|
feat: 沉浸模式
|
2 years ago |
|
elseif
|
f9335c4011
|
refactor: 刷新
|
2 years ago |
|
elseif
|
f1691d506c
|
refactor: 审批支持框选
|
2 years ago |
|
elseif
|
c3be5f3ca7
|
feat: 完善一审二审
|
2 years ago |
|
elseif
|
5c89970e3a
|
feat: 调整批量审批
|
2 years ago |
|
elseif
|
718b8566b6
|
审批
|
2 years ago |
|
elseif
|
6a50a92ed0
|
update
|
2 years ago |
|
elseif
|
8084dab1f9
|
first
|
2 years ago |
