Commit Graph

Select branches

Hide Pull Requests

20240420keydown

bak

feat/20240417similarite

fix/change_task

fix/finalHighSearch

fix/modifyStyle

fix/similarity_value

fix/updatesyspic

jia

main

refactor/project

test

#1

#10

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#111

#112

#113

#114

#115

#116

#117

#118

#119

#12

#120

#121

#122

#123

#124

#125

#126

#127

#128

#129

#13

#130

#131

#132

#133

#134

#135

#136

#137

#138

#139

#14

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#154

#155

#156

#157

#158

#159

#16

#160

#161

#162

#163

#164

#165

#166

#167

#168

#169

#17

#170

#171

#172

#173

#174

#175

#176

#177

#178

#179

#18

#180

#181

#182

#183

#184

#185

#186

#187

#188

#189

#19

#190

#191

#192

#193

#194

#195

#196

#197

#198

#199

#2

#20

#200

#201

#202

#203

#204

#205

#206

#207

#208

#209

#21

#210

#211

#212

#213

#214

#215

#216

#217

#218

#219

#22

#220

#221

#222

#223

#224

#225

#226

#227

#228

#229

#23

#230

#231

#232

#233

#234

#235

#236

#237

#238

#239

#24

#240

#241

#242

#243

#244

#245

#246

#247

#248

#249

#25

#250

#251

#252

#253

#254

#255

#256

#257

#258

#259

#26

#260

#261

#262

#263

#264

#265

#266

#267

#268

#269

#27

#270

#271

#272

#273

#274

#275

#276

#277

#278

#279

#28

#280

#281

#282

#283

#284

#285

#286

#287

#288

#289

#29

#290

#291

#292

#293

#294

#295

#296

#297

#298

#299

#3

#30

#300

#301

#302

#303

#304

#305

#306

#307

#308

#309

#31

#310

#311

#312

#313

#314

#315

#316

#317

#318

#319

#32

#320

#321

#322

#323

#324

#325

#326

#327

#328

#329

#33

#330

#331

#332

#333

#334

#335

#336

#337

#338

#339

#34

#340

#341

#342

#343

#344

#345

#346

#347

#348

#349

#35

#350

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#93

#94

#95

#96

#97

#98

#99

Mono Color

• 3d52e75cca fix:location字段加限制 lihui_ocr 2024-04-19 10:03:30 +0800
• a9d0ba121f Merge pull request 'fix/updatesyspic' (#226) from fix/updatesyspic into test yaoshuli 2024-04-19 09:47:58 +0800
• af3ac1eb5e feat:修改图片 raofuzi 2024-04-19 09:45:21 +0800
• cb6b367186 Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/updatesyspic raofuzi 2024-04-19 09:42:48 +0800
• 25b99e95ba feat:修改图片 raofuzi 2024-04-19 09:42:32 +0800
• 03f5aa11dc Merge pull request 'fix:选中模糊查询后动态关联' (#225) from fix/change_task into test 赵辉 2024-04-18 22:02:35 +0800
• 4a3fba0b13 fix:选中模糊查询后动态关联 lihui_ocr 2024-04-18 21:59:45 +0800
• e9ac871339 Merge pull request 'fix:终审滚动展示问题修改' (#224) from fix/change_task into test 赵辉 2024-04-18 21:11:38 +0800
• b45a9df6b0 fix:终审滚动展示问题修改 lihui_ocr 2024-04-18 21:09:20 +0800
• e42b3fb7dd Merge pull request 'fix/updatesyspic' (#223) from fix/updatesyspic into test yaoshuli 2024-04-18 18:18:41 +0800
• 113091d460 feat:修改图片 raofuzi 2024-04-18 18:17:44 +0800
• c28e2ca125 Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/updatesyspic raofuzi 2024-04-18 18:09:12 +0800
• 586c66de5a Merge pull request 'feat: 审批选择增加taskindex条件' (#222) from feat/20240417similarite into test yaoshuli 2024-04-18 18:06:45 +0800
• 79c8fbe859 Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/updatesyspic raofuzi 2024-04-18 17:50:01 +0800
• 43bf9b414b feat:修改图片 raofuzi 2024-04-18 17:49:50 +0800
• b675eb3611 feat: 审批选择增加taskindex条件 zhouxiaoan 2024-04-18 17:45:32 +0800
• 628c4a44f1 feat: 审批选择增加taskindex条件 zhouxiaoan 2024-04-18 17:40:48 +0800
• 5513ed4657 Merge pull request 'feat:修改图片' (#221) from fix/updatesyspic into test yaoshuli 2024-04-18 16:09:08 +0800
• 9d21dcb1cd Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/updatesyspic raofuzi 2024-04-18 16:07:08 +0800
• 7e6da80846 feat:修改图片 raofuzi 2024-04-18 16:06:52 +0800
• 29bd07a654 Merge pull request 'feat: 主图获取接口增加taskindex字段' (#220) from feat/20240417similarite into test yaoshuli 2024-04-18 11:33:10 +0800
• 57849f1f15 feat: 主图获取接口增加taskindex字段 zhouxiaoan 2024-04-18 11:20:59 +0800
• d17304c9ff feat: 主图获取接口增加taskindex字段 zhouxiaoan 2024-04-18 11:19:51 +0800
• 68fdfecc5b Merge pull request 'fix/updatesyspic' (#217) from fix/updatesyspic into test yaoshuli 2024-04-18 11:03:05 +0800
• 7e2365a6ae feat:修改图片 raofuzi 2024-04-18 11:01:52 +0800
• 4f47a82f27 feat:修改图片 raofuzi 2024-04-18 08:14:28 +0800
• 00c94f858f Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/updatesyspic raofuzi 2024-04-17 23:09:21 +0800
• f94169ec20 feat:修改图片 raofuzi 2024-04-17 23:09:07 +0800
• c73ebe5e55 Merge pull request 'fix:修复样式问题' (#218) from fix/ui_error into test 刘释隆 2024-04-17 22:49:21 +0800
• 31b02e2c68 Merge branch 'test' into fix/ui_error 刘释隆 2024-04-17 22:48:54 +0800
• b43e9beb2e feat: 解决冲突 刘释隆 2024-04-17 22:40:30 +0800
• e0a4bc292a feat: 样式修复 刘释隆 2024-04-17 22:27:45 +0800
• 1e74d0ac80 feat: 距顶部180px，左右居中展示 刘释隆 2024-04-17 20:02:28 +0800
• 88f8b84c78 feat:修改冲突 raofuzi 2024-04-17 16:42:20 +0800
• f30d1960e5 feat: 前置符号与星号与文字等高 刘释隆 2024-04-17 16:37:33 +0800
• e693d15462 feat:修改冲突 raofuzi 2024-04-17 16:22:54 +0800
• 3b772d2ad8 feat: 相似度阈值样式 刘释隆 2024-04-17 16:04:37 +0800
• 8df512b429 Merge pull request 'feat: api请求数据处理及bug修复' (#216) from fix/allseach_bug into test 刘释隆 2024-04-17 16:00:08 +0800
• 2246792839 Merge pull request 'fix: 修复问题' (#215) from fix/bug into test 刘释隆 2024-04-17 15:59:29 +0800
• 45cf403746 Merge branch 'test' into fix/bug 刘释隆 2024-04-17 15:59:09 +0800
• 2ebbd52929 fix: 解决冲突 刘释隆 2024-04-17 15:56:51 +0800
• f9bd200593 feat: api请求数据处理及bug修复 刘释隆 2024-04-17 15:55:37 +0800
• 417ece83b9 feat: bug修复 刘释隆 2024-04-17 15:22:10 +0800
• 3b0b8c5579 Merge pull request 'feat:任务审批图片相似度接口增加参数' (#213) from feat/20240417similarite into test 刘释隆 2024-04-17 14:18:40 +0800
• 6d676b1ea3 feat:任务审批图片相似度接口增加参数 zhouxiaoan 2024-04-17 14:11:28 +0800
• 17dc01afa7 Merge pull request 'feat:修改冲突' (#211) from fix/updatesyspic into test 刘释隆 2024-04-17 13:17:02 +0800
• b1904b3236 Merge pull request 'feat:添加阈值标签，全部展示功能的联动' (#212) from fix/change_task into test 赵辉 2024-04-17 12:57:02 +0800
• 9783d5f0ab feat:添加阈值标签，全部展示功能的联动 lihui_ocr 2024-04-17 12:56:05 +0800
• 72d9431235 Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/updatesyspic raofuzi 2024-04-17 12:29:57 +0800
• 259d846d86 feat:修改冲突 raofuzi 2024-04-17 12:29:44 +0800
• bc5e4137a5 feat: 异步弹窗调整 刘释隆 2024-04-17 11:38:49 +0800
• c9282047ec Merge pull request 'fix/updatesyspic' (#208) from fix/updatesyspic into test 刘释隆 2024-04-17 11:38:17 +0800
• e8c7b3cfeb feat:修改冲突 raofuzi 2024-04-17 11:06:56 +0800
• e73a59932b feat:修改冲突 raofuzi 2024-04-17 10:50:38 +0800
• b9b292289e feat: 基本信息蒙版距离任务包名称16，任务包名称距离输入框8， 刘释隆 2024-04-17 10:35:33 +0800
• 91480ef28e feat: 顶部当前位置图标应与下方高级筛选图标对齐 刘释隆 2024-04-17 10:30:42 +0800
• 4eea9f79d7 feat: 左侧高级筛选模块距离左侧模块边框16像素，距离底部16px， 刘释隆 2024-04-17 10:26:54 +0800
• 7d01f2f255 Merge pull request 'feat:卡片模式及表格模式连动，卡片模式及高级筛选联动' (#210) from fix/change_task into test 赵辉 2024-04-17 09:57:36 +0800
• 3e26b67957 feat:卡片模式及表格模式连动，卡片模式及高级筛选联动 lihui_ocr 2024-04-17 09:56:41 +0800
• a1e5ee2dd5 Merge pull request 'feat:添加三种排序方式' (#209) from fix/change_task into test 赵辉 2024-04-16 23:16:04 +0800
• bb7b9c3954 feat:添加三种排序方式 lihui_ocr 2024-04-16 23:14:50 +0800
• 9a5700ae00 feat: 修改图片相关bug raofuzi 2024-04-16 22:53:03 +0800
• 2c3d200d75 feat: 修改图片相关bug raofuzi 2024-04-16 22:41:58 +0800
• 2eccbba7d2 Merge pull request 'feat: 样式补全及逻辑优化' (#207) from feat/allSearch_style into test 刘释隆 2024-04-16 21:24:46 +0800
• bf836818d3 feat: 必填标识调整 刘释隆 2024-04-16 21:23:45 +0800
• e1ff1bef0e feat: 修复逻辑问题及样式缺陷 刘释隆 2024-04-16 21:11:08 +0800
• 62e90716bf Merge pull request 'fix:整体样式调整' (#206) from fix/change_task into test 赵辉 2024-04-16 19:40:37 +0800
• eb80c0fc25 fix:整体样式调整 lihui_ocr 2024-04-16 19:39:14 +0800
• dc249d2e52 Merge pull request 'fix: 修复所有模块全局搜索后不重置条件问题' (#205) from fix/allSearch into test 刘释隆 2024-04-16 17:05:58 +0800
• d1b59974c7 fix: 修复所有模块全局搜索后不重置条件问题 刘释隆 2024-04-16 17:05:00 +0800
• 71541e579f Merge pull request 'fix: 修复一键查重默认字段不生效问题' (#204) from fix/home_nodefault into test 刘释隆 2024-04-16 15:31:30 +0800
• 22d655c4d1 fix: 修复一键查重默认字段不生效问题 刘释隆 2024-04-16 15:29:31 +0800
• 0187c85944 Merge pull request 'fix: rule提示图标补全' (#202) from fix/url_error into test 刘释隆 2024-04-16 14:03:00 +0800
• e4cff7e758 fix: rule提示图标补全 刘释隆 2024-04-16 14:02:13 +0800
• 3b42457c9d Merge pull request 'fix:根据ui调整卡片样式' (#201) from fix/change_task into test 赵辉 2024-04-16 14:01:36 +0800
• 3dea84c958 fix:根据ui调整卡片样式 lihui_ocr 2024-04-16 14:00:46 +0800
• 13d32c2072 Merge pull request 'feat:终审批量通过批量不通过' (#200) from fix/change_task into test 赵辉 2024-04-16 12:31:52 +0800
• 9cb6d0f454 feat:终审批量通过批量不通过 lihui_ocr 2024-04-16 12:31:01 +0800
• 2e82f3fe14 Merge pull request 'feat:处理xx键执行异常' (#199) from fix/bug-20240416 into test 刘释隆 2024-04-16 11:24:30 +0800
• 78d5f11abe feat:处理xx键执行异常 zhouxiaoan 2024-04-16 11:03:24 +0800
• 4beede5e22 feat:处理xx键执行异常 zhouxiaoan 2024-04-16 10:56:09 +0800
• f8265a2d26 Merge pull request 'feat: 头部数据对接接口' (#198) from feat/data_header into test 刘释隆 2024-04-15 21:08:33 +0800
• ed94b40c36 feat: 头部数据对接接口 刘释隆 2024-04-15 21:07:33 +0800
• 7eafe1f938 Merge pull request 'fix: 修复公司名称展示及菜单权限限制' (#197) from fix/menus_error into test 刘释隆 2024-04-15 16:41:00 +0800
• 0816abc9c7 fix: 修复公司名称展示及菜单权限限制 刘释隆 2024-04-15 16:40:24 +0800
• 4f17d6b808 Merge pull request 'feat:卡片页滚动与通过后状态修改' (#196) from fix/change_task into test 赵辉 2024-04-15 15:43:08 +0800
• 9bcc0a6425 feat:卡片页滚动与通过后状态修改 lihui_ocr 2024-04-15 15:41:47 +0800
• cb5da29223 Merge pull request 'fix: 修复全局搜索任务审批模块报错问题' (#195) from fix/allSearch_task_error into test 刘释隆 2024-04-15 14:47:03 +0800
• b319a18072 fix: 修复全局搜索任务审批模块报错问题 刘释隆 2024-04-15 14:45:20 +0800
• 08973c8225 Merge pull request 'fix: 加入可疑文件夹增加消息提示' (#194) from fix/confirmTips into test 李忠 2024-04-15 13:58:19 +0800
• 64d9d2f01a fix: 加入可疑文件夹增加消息提示 zhouxiaoan 2024-04-15 13:14:45 +0800
• 632fc96cdb Merge pull request 'feat: 去除任务审批字段全选功能' (#193) from feat/fieldModal into test 刘释隆 2024-04-15 10:00:59 +0800
• da37a816bb feat: 去除任务审批字段全选功能 刘释隆 2024-04-15 10:00:10 +0800
• 2d53182446 Merge pull request 'feat: 自定义任务包字段清空搜索条件' (#192) from fix/modalClear into test zhouxiaoan 2024-04-15 09:48:50 +0800
• 8c13e8bf0d feat: 自定义任务包字段清空搜索条件 zhouxiaoan 2024-04-15 09:46:50 +0800
• bbfcc03d56 Merge pull request 'feat:新增终审卡片效果' (#191) from fix/change_task into test 赵辉 2024-04-15 09:46:13 +0800
• ebef733996 feat:新增终审卡片样式 lihui_ocr 2024-04-15 09:45:06 +0800
• 848ecd9838 Merge pull request 'feat: 按键事件处理' (#190) from fix/keyhandler into test 李忠 2024-04-14 19:12:43 +0800
• 98f1fda6db feat: 处理类型报错 zhouxiaoan 2024-04-14 19:08:20 +0800
• f584d2fa42 chore: config refactor/project Brian 2024-04-14 18:20:39 +0800