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

• 8518e70649 Merge pull request 'shen' (#65) from shen into test shenhailong 2024-04-02 00:30:45 +0800
• e174903ebb Merge branch 'test' into shen Dragon 2024-04-02 00:29:57 +0800
• fec125d72c bug Dragon 2024-04-02 00:27:19 +0800
• 7424da1935 Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/updatecontent raofuzi 2024-04-01 23:41:56 +0800
• 34724596c3 feat: 修改bug raofuzi 2024-04-01 23:41:35 +0800
• 0d26a9abb2 Merge pull request 'jie' (#63) from jie into test lizijie 2024-04-01 23:32:07 +0800
• 68ebf8f311 feat: 增加右侧图片信息 lizijiee 2024-04-01 23:31:14 +0800
• bb15ba824f Merge pull request 'feat:图审弹窗展示逻辑修改' (#62) from al into test 刘释隆 2024-04-01 23:30:58 +0800
• 1e175e2647 feat: 暂存 刘释隆 2024-04-01 23:29:24 +0800
• 508eb09709 bug Dragon 2024-04-01 23:18:58 +0800
• 85ae4ead31 fix: 修改接口名称 lizijiee 2024-04-01 22:28:05 +0800
• 15dd6ce13b feat: 修改图审弹窗展示逻辑 刘释隆 2024-04-01 22:27:40 +0800
• ee6f52c186 feat: 列表返回前端增加 checkDuplicateId lizijiee 2024-04-01 22:25:39 +0800
• ec7a6c16ff Merge pull request 'feat: 自定义筛选列逻辑优化，图审弹窗逻辑补全' (#61) from al into test 刘释隆 2024-04-01 22:11:56 +0800
• ef1bfb679c feat: 自定义筛选列逻辑优化，图审弹窗逻辑补全 刘释隆 2024-04-01 22:11:07 +0800
• 8481df3a82 Merge pull request 'feat: 移除文件夹增加确认功能' (#60) from jie into test lizijie 2024-04-01 21:55:55 +0800
• 088e5629bb feat: 移除文件夹增加确认功能 lizijiee 2024-04-01 21:49:27 +0800
• 9f9392ee67 Merge pull request 'feat:终审列表数据筛选功能添加' (#59) from al_bak into test 刘释隆 2024-04-01 21:32:25 +0800
• 4b38c24bd6 Merge branch 'test' into al_bak 刘释隆 2024-04-01 21:30:25 +0800
• 747b1f10c0 feat: 终审列表数据筛选。图审弹窗bug修复 刘释隆 2024-04-01 21:27:58 +0800
• d430e612a8 Merge pull request 'bug' (#56) from shen into test shenhailong 2024-04-01 21:01:59 +0800
• 641d63704c bug Dragon 2024-04-01 21:00:40 +0800
• 26d4bc5b70 Merge pull request 'feat: 修复点击白图报错' (#55) from jie into test lizijie 2024-04-01 20:41:43 +0800
• 98464ea4bc feat: 修复点击白图报错 lizijiee 2024-04-01 20:41:09 +0800
• 37685cdbcc Merge pull request 'feat: 高级筛选逻辑修复，任务审批模块高级筛选type错误修复' (#54) from al into test 刘释隆 2024-04-01 20:40:44 +0800
• 03163892ac feat: 高级筛选逻辑修复，任务审批模块高级筛选type错误修复 刘释隆 2024-04-01 20:39:57 +0800
• 6085997eb5 Merge pull request 'feat: 统计弹窗字段变更展示' (#53) from al into test 刘释隆 2024-04-01 20:23:54 +0800
• 74793497cc Merge pull request 'feat: 可疑文件夹' (#52) from jie into test lizijie 2024-04-01 20:23:44 +0800
• c65a96826b feat: 统计弹窗字段变更展示 刘释隆 2024-04-01 20:23:28 +0800
• 088730eef1 feat: 可疑文件夹 lizijiee 2024-04-01 20:21:34 +0800
• 97373fc1ee Merge pull request 'jie' (#51) from jie into test lizijie 2024-04-01 18:31:13 +0800
• 2ccfcca958 feat: 批量审核 lizijiee 2024-04-01 18:30:31 +0800
• d38b169c5e Merge pull request 'fix:尧勇军 一件查重功能修复' (#50) from fix/updatecontent into test yaoshuli 2024-04-01 18:24:53 +0800
• cc7d6ba5ad Merge branch 'test' into jie lizijiee 2024-04-01 18:10:16 +0800
• 0e8e9df6d0 feat: 暂存可疑文件夹 lizijiee 2024-04-01 18:02:14 +0800
• 86b5147295 Merge pull request 'feat: 框选移除文件夹' (#49) from jie into test lizijie 2024-04-01 18:01:45 +0800
• ae974ae436 feat: 框选移除文件夹 lizijiee 2024-04-01 17:49:36 +0800
• 64b1d37190 Merge pull request 'bug' (#48) from shen into test shenhailong 2024-04-01 17:41:58 +0800
• 368942dafa bug Dragon 2024-04-01 17:41:01 +0800
• 9adbf46067 Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/updatecontent raofuzi 2024-04-01 17:35:52 +0800
• 846a97111b feat: 修改bug raofuzi 2024-04-01 17:35:26 +0800
• 5fcbecc02e Merge pull request 'feat: 修复单个审核' (#47) from jie into test lizijie 2024-04-01 17:27:00 +0800
• dd547dbd05 Merge pull request 'feat: 1440分辨率图审审批管理弹窗样式调整' (#46) from al into test 刘释隆 2024-04-01 17:18:54 +0800
• 38cc5d9c32 feat: 1440分辨率图审审批管理弹窗样式调整 刘释隆 2024-04-01 17:18:20 +0800
• f80f6ec4d4 feat: 修复单个审核 lizijiee 2024-04-01 17:15:29 +0800
• 8bac54a287 Merge pull request 'feat: 高级筛选逻辑及交互补全' (#45) from al into test 刘释隆 2024-04-01 16:18:47 +0800
• 14f203c0ea feat: 高级筛选交互补全及逻辑优化 刘释隆 2024-04-01 16:17:50 +0800
• 70cc7e1a06 Merge pull request '终审bug' (#44) from shen into test shenhailong 2024-04-01 16:07:58 +0800
• 6bf748963e 终审bug Dragon 2024-04-01 16:06:55 +0800
• d2d4e9cf90 feat: 工单审批弹窗逻辑修改暂存 刘释隆 2024-04-01 15:27:50 +0800
• 5488ed4895 Merge pull request 'jie' (#43) from jie into test lizijie 2024-04-01 12:34:42 +0800
• 43ff3d4dec Merge pull request 'fix: 尧勇军 一件查重bug修改' (#42) from fix/updatecontent into test yaoshuli 2024-04-01 10:44:03 +0800
• 1c71955358 Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/updatecontent raofuzi 2024-04-01 10:38:09 +0800
• da468db98b feat: 修改bug raofuzi 2024-04-01 10:37:18 +0800
• d375045c40 Merge pull request 'fix: 尧勇军，一键查重bug修复' (#41) from fix/updatecontent into test yaoshuli 2024-04-01 09:50:20 +0800
• baab33cd31 feat: 已审批 通过 lizijiee 2024-04-01 09:44:14 +0800
• 75c4fcc396 fix: 修复排序功能 lizijiee 2024-04-01 09:41:41 +0800
• 1d2862c405 fix: 修改相似图片查询id为主图id lizijiee 2024-04-01 09:36:48 +0800
• f755c42976 feat: 修改bug raofuzi 2024-04-01 00:03:33 +0800
• a2d3a3acef feat: 修改bug raofuzi 2024-03-31 23:58:50 +0800
• 9bd21216df Merge pull request 'feat: 任务审批高级筛选补全逻辑' (#40) from al into test 刘释隆 2024-03-31 23:53:15 +0800
• 93972ea9a5 feat: 任务审批高级筛选补全 刘释隆 2024-03-31 23:49:37 +0800
• 6710622480 Merge pull request 'shen' (#39) from shen into test shenhailong 2024-03-31 23:30:02 +0800
• cb4b00b198 feat: 同一手机号每天最多获取10次验证码，超出十次后弹出错误提示：获取验证码次数超限，请明天再试! 刘释隆 2024-03-31 23:29:31 +0800
• b297558329 bug Dragon 2024-03-31 23:29:09 +0800
• 1e8fc84403 fix: 自定义设置按钮无法点击，控制台报错 刘释隆 2024-03-31 23:19:57 +0800
• c4e429f181 Merge pull request 'fix: 任务类型与项目类别冲突bug修复' (#38) from al into test 刘释隆 2024-03-31 23:17:22 +0800
• 3135b2c4e5 fix: 任务类型与项目类别冲突bug修复 刘释隆 2024-03-31 23:16:50 +0800
• 4ad22908d0 Merge pull request 'feat: 高级筛选组件props调整，任务审批高级筛选筛选值赋值' (#37) from al into test 刘释隆 2024-03-31 23:14:04 +0800
• ceb024784b feat: 高级筛选组件props调整，任务审批高级筛选筛选值赋值 刘释隆 2024-03-31 23:12:11 +0800
• 3fc94c9164 Merge branch 'test' into shen Dragon 2024-03-31 22:42:53 +0800
• 8281a4719d 终审 Dragon 2024-03-31 22:42:23 +0800
• 1449fa0f15 Merge pull request 'feat: 任务审批增加沉浸模式' (#36) from jie into test lizijie 2024-03-31 18:55:32 +0800
• 712580631a feat: 任务审批增加沉浸模式 lizijiee 2024-03-31 18:54:27 +0800
• d70094ef41 Merge pull request '小结' (#35) from shen into test shenhailong 2024-03-31 18:33:47 +0800
• 8507763b45 小结 Dragon 2024-03-31 18:32:58 +0800
• c9b6954c7c Merge pull request 'fix: 2872 【图审审批管理】自定义任务包显示字段后，左侧数据未展示对应的字段' (#34) from jie into test lizijie 2024-03-31 18:31:14 +0800
• afc7b81d99 fix: 2872 【图审审批管理】自定义任务包显示字段后，左侧数据未展示对应的字段 lizijiee 2024-03-31 18:30:30 +0800
• d1bd1a5979 Merge pull request 'fix: 文字太长显示增加popver' (#33) from jie into test lizijie 2024-03-31 18:23:01 +0800
• 6af37bf71d fix: 文字太长显示增加popver lizijiee 2024-03-31 18:22:03 +0800
• 3e5b6c43fb Merge pull request 'fix: 尧勇军，一件查重相关bug修复' (#32) from fix/updatecontent into test yaoshuli 2024-03-31 18:15:11 +0800
• e9c6426473 Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/updatecontent raofuzi 2024-03-31 18:08:22 +0800
• e1ce077f55 feat: 修改bug raofuzi 2024-03-31 18:08:02 +0800
• 6c729a6aab feat: 修改bug raofuzi 2024-03-31 18:05:58 +0800
• a88db14644 Merge pull request 'feat: 修改审核状态判断historyStates' (#31) from jie into test lizijie 2024-03-31 17:57:48 +0800
• db4104bfc0 feat: 修改审核状态判断historyStates lizijiee 2024-03-31 17:56:02 +0800
• fb49867713 Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/updatecontent raofuzi 2024-03-31 17:36:13 +0800
• 84349062d4 feat: 修改bug raofuzi 2024-03-31 17:35:40 +0800
• 52a4159b1b Merge pull request 'jie' (#30) from jie into test lizijie 2024-03-31 15:25:48 +0800
• c96c4ccf2e Merge branch 'test' into jie lizijiee 2024-03-31 15:23:24 +0800
• 487e83a199 feat: 修改AI工单前端显示文字 lizijiee 2024-03-31 13:55:09 +0800
• cd5d274a4b Merge pull request 'jie' (#29) from jie into test lizijie 2024-03-31 13:36:48 +0800
• cdf5145a32 Merge branch 'test' into jie lizijiee 2024-03-31 13:35:44 +0800
• 8238d4258e fix: 2857 【图审审批管理--解散任务包】 lizijiee 2024-03-31 13:33:16 +0800
• 20a21e8ee5 Merge pull request 'fix: 高级筛选添加条件保存报错修复' (#28) from al into test 刘释隆 2024-03-31 12:27:22 +0800
• bc51e033ee fix: 高级筛选添加条件保存报错修复 刘释隆 2024-03-31 12:26:09 +0800
• 22cff29a53 Merge pull request 'fix:登录报错问题修复' (#27) from al into test 刘释隆 2024-03-31 12:02:46 +0800
• 57a699f422 feat: 修改bug raofuzi 2024-03-31 11:57:21 +0800
• c3785c28d3 Merge pull request 'jie' (#26) from jie into test lizijie 2024-03-31 11:18:30 +0800
• bb087d9204 feat: conflict 以test为准 保存 content文件 lizijiee 2024-03-31 11:17:23 +0800