diff --git a/code/main.py b/code/main.py
index 52913ef..e04129b 100644
--- a/code/main.py
+++ b/code/main.py
@@ -1,4 +1,4 @@
-from flask import Flask,request,jsonify
+from flask import Flask,request
from flask_cors import CORS
from ultralytics import YOLO
import base64
@@ -61,10 +61,10 @@ def startOcr():
img = image
results = model.predict(image, device='cpu')
ocr=None
- # if ocrType=="complex":
- # ocr=ocrComplex
- # else:
- ocr=ocrSimple
+ if ocrType=="complex":
+ ocr=ocrComplex
+ else:
+ ocr=ocrSimple
for r in results:
boxes = r.boxes
@@ -91,7 +91,7 @@ def startOcr():
'target_2': [],
'target_3': []
}
- returnObj={"hasError":False,"resultsObj":{},"message":''}
+ returnObj={"resultsObj":{},"message":''}
resultAll={}
# 检查类别数量
if (len(target_0) == 2 and len(target_1) == 1 and (len(target_2) == 1 or len(target_2) == 2) and len(target_3) == 2):
@@ -183,10 +183,10 @@ def startOcr():
else:
returnObj["resultsObj"]={}
returnObj["message"]="图像不清晰或要素不全请重新拍摄或人工记录"
- returnObj["hasError"]=True
# endTime=time.time()
# print("运行时间：",endTime-startTime)
- return jsonify(returnObj)
+ print("运行时间：",returnObj)
+ return returnObj
if __name__ == "__main__":
app.run(host="0.0.0.0", port=7003)
diff --git a/code/ocr/simple/ch_PP-OCRv4_det_infer.tar b/code/ocr/simple/ch_PP-OCRv4_det_infer.tar
deleted file mode 100644
index 6d0a829..0000000
Binary files a/code/ocr/simple/ch_PP-OCRv4_det_infer.tar and /dev/null differ
diff --git a/code/ocr/simple/ch_PP-OCRv4_rec_infer.tar b/code/ocr/simple/ch_PP-OCRv4_rec_infer.tar
deleted file mode 100644
index a917ba9..0000000
Binary files a/code/ocr/simple/ch_PP-OCRv4_rec_infer.tar and /dev/null differ
diff --git a/front/src/renderer/src/views/user.vue b/front/src/renderer/src/views/user.vue
index 830c41d..5e246b6 100644
--- a/front/src/renderer/src/views/user.vue
+++ b/front/src/renderer/src/views/user.vue
@@ -20,7 +20,7 @@
清空
-
@@ -101,7 +101,8 @@ export default {
formHeader: [],
formData: {}
},
- fileOriData: []
+ fileOriData: [],
+ displayedMessages: [],//消息提示句柄
}
},
methods: {
@@ -120,16 +121,28 @@ export default {
}
return true
},
- //表格增加数据
+ //识别图片后续处理
async successSubmit(opts) {
+ if (!this.displayedMessages.includes("识别中...")) {
+ this.displayedMessages.push("识别中...")
+ ElMessage.info({
+ message: '识别中...',
+ duration: 0
+ })
+ } else {
+ this.displayedMessages.push("识别中...")
+ }
let that = this
let file = opts.file
this.fileDealData = []
let fileReader = new FileReader()
fileReader.onload = async function () {
let base64Data = fileReader.result;
- window.electron.ipcRenderer.send('ocrIdentify', { base64Str: base64Data })
- console.log(9999, base64Data)
+ let params = {
+ base64Str: base64Data,
+ ocrType: "complex",//识别类型:complex_复杂模型比较慢，simple_简单模型识别速度更快
+ }
+ window.electron.ipcRenderer.send('ocrIdentify', params)
}
fileReader.onerror = function (error) {
console.error('Error reading file:', error)
@@ -141,11 +154,16 @@ export default {
let that = this
window.electron.ipcRenderer.on('ocrResult', (eve, res) => {
console.log(97111, res)
+ if (that.displayedMessages.includes("识别中...")) {
+ that.displayedMessages.splice(that.displayedMessages.indexOf("识别中..."), 1)
+ } else {
+ ElMessage.closeAll()
+ }
})
},
//更新数据
async updateSeach(params = {}) {
- console.log(777, params)
+ // console.log(777, params)
},
//搜索数据
async searchData() {
diff --git a/front/地址.jpg b/front/地址.jpg
deleted file mode 100644
index 5e479a4..0000000
Binary files a/front/地址.jpg and /dev/null differ
diff --git a/front/姓名.jpg b/front/姓名.jpg
deleted file mode 100644
index 41bab73..0000000
Binary files a/front/姓名.jpg and /dev/null differ
diff --git a/front/封印1.jpg b/front/封印1.jpg
deleted file mode 100644
index fb92b58..0000000
Binary files a/front/封印1.jpg and /dev/null differ
diff --git a/front/封印2.jpg b/front/封印2.jpg
deleted file mode 100644
index 3935623..0000000
Binary files a/front/封印2.jpg and /dev/null differ
diff --git a/front/当前有功.jpg b/front/当前有功.jpg
deleted file mode 100644
index 7d36b41..0000000
Binary files a/front/当前有功.jpg and /dev/null differ
diff --git a/front/电表资产号.jpg b/front/电表资产号.jpg
deleted file mode 100644
index 9291d08..0000000
Binary files a/front/电表资产号.jpg and /dev/null differ
diff --git a/ppocr/mobile_v2.0_det_infer/inference.pdiparams b/ppocr/mobile_v2.0_det_infer/inference.pdiparams
deleted file mode 100644
index 089594a..0000000
Binary files a/ppocr/mobile_v2.0_det_infer/inference.pdiparams and /dev/null differ
diff --git a/ppocr/mobile_v2.0_det_infer/inference.pdiparams.info b/ppocr/mobile_v2.0_det_infer/inference.pdiparams.info
deleted file mode 100644
index 082c148..0000000
Binary files a/ppocr/mobile_v2.0_det_infer/inference.pdiparams.info and /dev/null differ
diff --git a/ppocr/mobile_v2.0_det_infer/inference.pdmodel b/ppocr/mobile_v2.0_det_infer/inference.pdmodel
deleted file mode 100644
index 223b861..0000000
Binary files a/ppocr/mobile_v2.0_det_infer/inference.pdmodel and /dev/null differ
diff --git a/地址.jpg b/地址.jpg
deleted file mode 100644
index 5e479a4..0000000
Binary files a/地址.jpg and /dev/null differ
diff --git a/姓名.jpg b/姓名.jpg
deleted file mode 100644
index 41bab73..0000000
Binary files a/姓名.jpg and /dev/null differ
diff --git a/封印1.jpg b/封印1.jpg
deleted file mode 100644
index fb92b58..0000000
Binary files a/封印1.jpg and /dev/null differ
diff --git a/封印2.jpg b/封印2.jpg
deleted file mode 100644
index 3935623..0000000
Binary files a/封印2.jpg and /dev/null differ
diff --git a/当前有功.jpg b/当前有功.jpg
deleted file mode 100644
index 7d36b41..0000000
Binary files a/当前有功.jpg and /dev/null differ
diff --git a/电表资产号.jpg b/电表资产号.jpg
deleted file mode 100644
index 9291d08..0000000
Binary files a/电表资产号.jpg and /dev/null differ