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

• 428663af5c feat: 按键事件处理 zhouxiaoan 2024-04-14 18:16:02 +0800
• 99545f481a Merge pull request 'fix/suspiciousSort' (#189) from fix/suspiciousSort into test 李忠 2024-04-14 14:24:15 +0800
• f1b3364018 feat: 修改加载bug raofuzi 2024-04-14 14:23:03 +0800
• 1166daa7b6 feat: 修改加载bug raofuzi 2024-04-14 14:14:44 +0800
• dd28d3f238 Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/suspiciousSort raofuzi 2024-04-14 13:59:16 +0800
• d9e2702936 feat: 修改加载bug raofuzi 2024-04-14 13:58:25 +0800
• bdd40db2b3 Merge pull request 'fix: 修复用户设置点击报错bug' (#188) from fix/userClickBug into test 刘释隆 2024-04-14 11:22:42 +0800
• 6042b2a350 fix: 修复用户设置点击报错bug 刘释隆 2024-04-14 11:21:54 +0800
• 21ff0cfca4 Merge pull request 'fix: 删除无效代码' (#187) from fix/20240412bug into test 刘释隆 2024-04-14 11:17:47 +0800
• 5f65940c1b fix: 删除无效代码 zhouxiaoan 2024-04-14 10:44:16 +0800
• 8edc6d14ea feat: 修改bug zhouxiaoan 2024-04-13 23:35:14 +0800
• 03e67e6cfc fix: error LiZhong 2024-04-13 21:54:45 +0800
• 0ead08acb1 chore: merge LiZhong 2024-04-13 19:13:11 +0800
• 34119160fd chore: remove log and fix eslint error LiZhong 2024-04-13 19:12:36 +0800
• 9d6d0b2de8 Merge pull request 'fix/suspiciousSort' (#185) from fix/suspiciousSort into test raoyongjun 2024-04-13 18:29:00 +0800
• 2aaa96fbcd feat: 修改滚动bug raofuzi 2024-04-13 18:26:57 +0800
• d40509e294 feat: 修改滚动bug raofuzi 2024-04-13 18:25:25 +0800
• 3b2f46e984 feat: 修改bug raofuzi 2024-04-13 17:27:32 +0800
• a0e7b1fe5d chore: merge LiZhong 2024-04-13 16:58:01 +0800
• ef3ce4d5bc fix: fix eslint error LiZhong 2024-04-13 16:50:02 +0800
• 7fa2dc76b9 Merge pull request 'feat: 适配登录接口修改' (#184) from feat/changeLogin into test 刘释隆 2024-04-13 16:31:12 +0800
• d722e6fc1d feat: 适配登录接口修改 刘释隆 2024-04-13 16:30:41 +0800
• 197b6cc288 Merge pull request 'fix: 修复全局搜索后页面数据多次获取问题' (#183) from fix/fetch_bug into test 刘释隆 2024-04-13 15:46:43 +0800
• 6caa3d46bf fix: 修复全局搜索后页面数据多次获取问题 刘释隆 2024-04-13 15:45:59 +0800
• 572903f4dc Merge pull request 'fix: 修复终审页面无法跳转首页问题' (#182) from fix/jumpHome_error into test 刘释隆 2024-04-13 11:20:28 +0800
• 5156b9ccae fix: 修复终审页面无法跳转首页问题 刘释隆 2024-04-13 11:18:58 +0800
• 5e52a9a191 Merge pull request 'chore: eslint报错规则修改' (#181) from chore/eslintChange into test 刘释隆 2024-04-13 10:21:33 +0800
• 122a38c381 chore: eslint报错规则修改 刘释隆 2024-04-13 10:21:08 +0800
• 6400ab613a Merge pull request 'fix: 冲突修复' (#180) from fix/merge into test 刘释隆 2024-04-13 10:00:41 +0800
• 8ab2376871 fix: 冲突修复 刘释隆 2024-04-13 09:59:37 +0800
• 6abd4859fe Merge pull request 'feat:超出添加提示' (#179) from fix/change_task into test 赵辉 2024-04-12 23:58:29 +0800
• e1ef8e35e7 feat:超出添加提示 lihui_ocr 2024-04-12 23:57:57 +0800
• 02c81d0b41 Merge pull request 'chore: 提交git统一代码风格' (#178) from chore/husky into test 刘释隆 2024-04-12 23:41:06 +0800
• d401a2ce6a Merge pull request 'fix/suspiciousSort' (#177) from fix/suspiciousSort into test raoyongjun 2024-04-12 23:34:33 +0800
• e4e3d251e0 feat: 修改bug raofuzi 2024-04-12 23:34:02 +0800
• d4d6be6e25 feat: git提交前操作 刘释隆 2024-04-12 23:32:37 +0800
• d4042d234e Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/suspiciousSort raofuzi 2024-04-12 23:32:18 +0800
• ce25698eb8 feat: 修改bug raofuzi 2024-04-12 23:32:07 +0800
• 3f811759e3 feat: eslint配置save 刘释隆 2024-04-12 23:31:51 +0800
• 08d0c2dea6 feat: eslint配置 刘释隆 2024-04-12 23:30:57 +0800
• 356e897bce Merge branch 'fix/20240412bug' into test zhouxiaoan 2024-04-12 23:15:25 +0800
• 93ffdeed71 Merge pull request 'feat: 修改bug' (#175) from fix/suspiciousSort into test raoyongjun 2024-04-12 23:13:15 +0800
• 6be68c72a5 Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/suspiciousSort raofuzi 2024-04-12 23:12:43 +0800
• 3e0158679f feat: 修改bug raofuzi 2024-04-12 23:12:25 +0800
• 037f5d30d0 fix: 合并test分支处理冲突 zhouxiaoan 2024-04-12 23:11:17 +0800
• 2256b416ac Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into test 贾博轩 2024-04-12 23:03:54 +0800
• 40ca137203 feat: 解决逻辑冲突问题 贾博轩 2024-04-12 23:03:22 +0800
• cd42a5bc40 fix: 合并test分支处理冲突 zhouxiaoan 2024-04-12 22:28:46 +0800
• 75e1c098b7 Merge pull request 'fix: 回滚样式并调整字段取值' (#174) from fix/error_ui into test 刘释隆 2024-04-12 22:28:27 +0800
• 257ebca62b fix: 回滚样式并调整字段取值 刘释隆 2024-04-12 22:28:02 +0800
• 878a81a355 fix: 处理图鉴管理布局样式 zhouxiaoan 2024-04-12 22:14:49 +0800
• 5a0d4e8b0a Merge pull request 'fix/suspiciousSort' (#173) from fix/suspiciousSort into test raoyongjun 2024-04-12 21:49:05 +0800
• f5cc60e423 feat: 修改bug raofuzi 2024-04-12 21:48:12 +0800
• 39e4d383fe feat: 修改bug raofuzi 2024-04-12 21:00:07 +0800
• 6ce50b5d33 feat: 修改bug raofuzi 2024-04-12 20:57:49 +0800
• 68eee1a809 Merge pull request 'fix:箭头的选中状态' (#172) from fix/change_task into test 赵辉 2024-04-12 19:32:35 +0800
• 732d41db11 fix:箭头的选中状态 lihui_ocr 2024-04-12 19:31:52 +0800
• 9dc782de7f Merge pull request 'fix:修改沉浸模式样式' (#171) from fix/change_task into test 赵辉 2024-04-12 19:14:41 +0800
• eec8ad7573 fix:修改沉浸模式样式 lihui_ocr 2024-04-12 19:13:48 +0800
• 43d15cfdcf feat: 新增最后审批查找功能 贾博轩 2024-04-12 19:12:15 +0800
• cc6f0ce4c1 Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into test 贾博轩 2024-04-12 16:25:54 +0800
• 995dad8723 feat: 修改消息列表审批通知等功能 贾博轩 2024-04-12 16:24:15 +0800
• ca6fb53d08 Merge pull request 'feat/select_change' (#170) from feat/select_change into test 刘释隆 2024-04-12 16:21:55 +0800
• 79596247f1 Merge branch 'test' into feat/select_change 刘释隆 2024-04-12 16:21:34 +0800
• acd661ffd2 feat: 任务审批逻辑修改及图审主图展示适配 刘释隆 2024-04-12 16:19:49 +0800
• fe50821c30 Merge pull request 'fix/suspiciousSort' (#168) from fix/suspiciousSort into test raoyongjun 2024-04-12 16:16:26 +0800
• 00ec4dd402 feat: 修改bug raofuzi 2024-04-12 16:15:45 +0800
• 663afdaf5e feat: 修改bug raofuzi 2024-04-12 16:14:15 +0800
• 1304f3365d Merge pull request 'feat:位置信息加标签' (#167) from fix/change_task into test 赵辉 2024-04-12 15:57:38 +0800
• ff103fe611 位置信息加标签 lihui_ocr 2024-04-12 15:56:58 +0800
• 303a8b0f90 Merge pull request 'FIX:第四次审批样式修改' (#166) from fix/change_task into test 赵辉 2024-04-12 15:48:43 +0800
• 1e041144b8 FIX:第四次审批样式修改 lihui_ocr 2024-04-12 15:44:55 +0800
• f50f8ac87b Merge pull request 'feat: 任务审批自定义字段逻辑修改及图审主图ui修改' (#165) from feat/ui_task_update into test 刘释隆 2024-04-12 14:46:58 +0800
• 6ad5e1f158 feat: 任务审批自定义字段逻辑修改及图审主图ui修改 刘释隆 2024-04-12 14:46:05 +0800
• afa388f6eb feat: 合并test分支内容到jia 贾博轩 2024-04-12 13:37:04 +0800
• 8aa1090229 Merge pull request 'fix: 处理图鉴管理布局错误' (#164) from fix/20240412bug into test zhouxiaoan 2024-04-12 13:02:53 +0800
• b80d9edef4 fix: 处理图鉴管理布局错误 zhouxiaoan 2024-04-12 13:01:19 +0800
• 28dde2bfa4 Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/suspiciousSort raofuzi 2024-04-12 11:49:58 +0800
• 7e34bf0440 Merge pull request 'fix: 修复打包时报错问题' (#163) from fix/import_error into test 刘释隆 2024-04-12 11:48:57 +0800
• bb68446e6a fix: 修复打包时报错问题 刘释隆 2024-04-12 11:48:35 +0800
• 52e92a391c Merge pull request 'feat: 高级筛选样式修改' (#162) from feat/ui_error_superSearch into test 刘释隆 2024-04-12 11:29:22 +0800
• 128ed694cf feat: 高级筛选样式修改 刘释隆 2024-04-12 11:28:57 +0800
• 9ff0959153 fix: 合并代码处理冲突 zhouxiaoan 2024-04-12 11:22:30 +0800
• daf79405c1 Merge pull request 'fix:20240410bug修复' (#154) from fix/modifyStyle into test zhouxiaoan 2024-04-12 11:10:22 +0800
• 38a43bed83 fix: 合并代码处理冲突 fix/modifyStyle zhouxiaoan 2024-04-12 11:08:28 +0800
• 939a7344c8 Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/suspiciousSort raofuzi 2024-04-12 09:42:41 +0800
• ab88ad3e68 feat: 修改bug raofuzi 2024-04-12 09:41:39 +0800
• 6c734d297c fix: 优化图鉴管理页面样式 zhouxiaoan 2024-04-12 01:59:07 +0800
• 6586b20488 Merge pull request 'feat:动态的' (#160) from fix/change_task into test 赵辉 2024-04-12 00:49:59 +0800
• 8fa20480f1 feat:动态的 lihui_ocr 2024-04-12 00:49:13 +0800
• 926c09d83f Merge pull request 'fix:排序功能修改完成' (#159) from fix/change_task into test 赵辉 2024-04-11 22:27:23 +0800
• b861266987 fix:排序功能修改完成 lihui_ocr 2024-04-11 22:26:12 +0800
• cf7386b337 Merge pull request 'fix:沉浸模式布局及不同状态优化' (#158) from fix/change_task into test 赵辉 2024-04-11 20:51:05 +0800
• 0b860955ef fix:沉浸模式布局及不同状态优化 lihui_ocr 2024-04-11 20:49:31 +0800
• f91f028cf7 Merge pull request 'feat: 适配后端字段' (#156) from fix/task_modules_error into test 刘释隆 2024-04-11 18:46:12 +0800
• 06296781db feat: 适配后端字段 刘释隆 2024-04-11 18:45:56 +0800
• dd072b58c5 Merge pull request 'feat: 修改样式缺陷并完善图审页面适配后端字段变动' (#155) from fix/home_ui_erro into test 刘释隆 2024-04-11 18:44:13 +0800
• a45ba04d32 feat: 修改样式缺陷并完善图审页面适配后端字段变动 刘释隆 2024-04-11 18:43:41 +0800
• d2a5c4d125 fix:沉浸模式下图片列表滚动问题调整主图放大 lihui_ocr 2024-04-11 17:33:18 +0800
• 622ff84521 Merge pull request 'feat: 修改样式' (#153) from fix/ui_error into test 刘释隆 2024-04-11 15:50:35 +0800