Home Explore Help
Register Sign In
Others
/
DocumentAIKit
4
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

[web_demo] 支持图像增强demo，更新ocr语言支持列表

yanxin 2 years ago
parent
60c319bf4c
commit
e02bda60b2
6 changed files with 41 additions and 35 deletions
Split View Show Diff Stats
  1. 18 14
      src/api/api.ts
  2. 1 1
      src/dist/assets/index-54fa8909.js
  3. 1 1
      src/dist/assets/index-8736bcf2.css
  4. 2 2
      src/dist/index.html
  5. 13 13
      src/pages/main/views/ImageProcess/magicColor.vue
  6. 6 4
      src/pages/main/views/Recognize/ocr.vue

+ 18 - 14
src/api/api.ts
View File 

@@ -4,24 +4,25 @@ interface InputData<T> {
 
   image: File;
 
 }
 
 
-interface PredictRes<T>{
 
-  code: number
 
+interface PredictRes<T> {
 
+  code: number;
 
   response_id: number;
 
-  data: T
 
+  data: T;
 
 }
 
 
 interface OcrInput {
 
-  FormData: FormData
 
+  FormData: FormData;
 
 }
 
 
 interface MagciColorRes {
 
-  image: string;
 
+  out_image: string;
 
+  cost: number;
 
 }
 
 
 interface OcrRecRes {
 
-  code: number,
 
-  response_id: string,
 
-  data:any,
 
+  code: number;
 
+  response_id: string;
 
+  data: any;
 
 }
 
 
 interface TableRecRes {
 
@@ -29,16 +30,19 @@ interface TableRecRes {
 
   json: string;
 
 }
 
 
-export const IMMagicColor = (data: InputData<OcrInput>): Promise<PredictRes<MagciColorRes>> =>
 
-  server.post("/magicColor", data);
 
+export const IMMagicColor = (
 
+  data: FormData
 
+): Promise<PredictRes<MagciColorRes>> =>
 
+  server.post("/v1/image_process/magic_color", data);
 
 
-export const OcrRec = (data: FormData): Promise<OcrRecRes> => 
+export const OcrRec = (data: FormData): Promise<OcrRecRes> =>
 
   server.post("/v1/ocr", data);
 
 
-export const TableRec = (data: InputData<OcrInput>): Promise<PredictRes<TableRecRes>> =>
 
-  server.post("/TableRec", data);
 
+export const TableRec = (
 
+  data: InputData<OcrInput>
 
+): Promise<PredictRes<TableRecRes>> => server.post("/TableRec", data);
 
 
-  export const SubmitBug = (data: any): Promise<OcrRecRes> =>
 
+export const SubmitBug = (data: any): Promise<OcrRecRes> =>
 
   server.get("/submitBug", data);
 
 
 export {};

File diff suppressed because it is too large
+ 1 - 1
src/dist/assets/index-54fa8909.js


File diff suppressed because it is too large
+ 1 - 1
src/dist/assets/index-8736bcf2.css


+ 2 - 2
src/dist/index.html
View File 

@@ -4,8 +4,8 @@
 
     <meta charset="UTF-8" />
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
     <title>DocumentAI Web Demo</title>
 
-    <script type="module" crossorigin src="./assets/index-54fa8909.js"></script>
 
-    <link rel="stylesheet" href="./assets/index-8736bcf2.css">
 
+    <script type="module" crossorigin src="./assets/index-1255d4a2.js"></script>
 
+    <link rel="stylesheet" href="./assets/index-1c3510f0.css">
 
   </head>
 
   <body>
 
     <div id="app"></div>

+ 13 - 13
src/pages/main/views/ImageProcess/magicColor.vue
View File 

@@ -11,13 +11,15 @@
 
         <el-row style="color: gray; font-size: small;">
 
           <h4>上传原图</h4>
 
         </el-row>
 
-        <el-row>
 
-          <el-input type="file" v-model="fileName" @change="uploadImg"></el-input>
 
-        </el-row>
 
+        <div class="common-layout">
 
+          <el-container>
 
+            <el-input type="file" v-model="fileName" @change="uploadImg"></el-input>
 
+            <el-button type="primary" @click="predict">Predict</el-button>
 
+          </el-container>
 
+        </div>
 
         <el-row>
 
           <!-- 用于展示图片 -->
 
           <img id="show-img" class="show-area" />
 
-          <el-button type="primary" @click="predict">Predict</el-button>
 
           <!-- 用于存放真实图片 -->
 
           <img id="raw-img" style="display: none" />
 
         </el-row>
 
@@ -29,13 +31,11 @@
 
           <h2>推理结果展示</h2>
 
         </el-row>
 
         <el-row v-loading="loading" class="small-title">
 
-          <h2 v-if="loading">处理中</h2>
 
+          <!-- <h2 v-if="loading">处理中</h2> -->
 
         </el-row>
 
         <el-row>
 
-          <section v-show="!loading"> 耗时：{{ predictTime }} s</section>
 
-        </el-row>
 
-        <el-row v-show="!loading">
 
           <img id="predict-img" class="show-area" />
 
+          <section> 耗时：{{ predictTime }} ms</section>
 
         </el-row>
 
       </el-col>
 
     </div>
 
@@ -92,13 +92,13 @@ const predict = () => {
 
   // console.log(file)
 
 
   loading.value = !loading.value
 
+  var data = new FormData();
 
+  data.append('images', file);
 
 
-  IMMagicColor({
 
-    image: file,
 
-  }).then(res => {
 
+  IMMagicColor(data).then(res => {
 
     // console.log(res.code)
 
-    predictImg.src = res.data.image
 
-    // predictTime.value = res.data.cost
 
+    predictImg.src = "http://192.168.10.11:8000" + res.data.out_image
 
+    predictTime.value = res.data.cost
 
 
     loading.value = !loading.value
 
   })

+ 6 - 4
src/pages/main/views/Recognize/ocr.vue
View File 

@@ -110,12 +110,14 @@ const createFilter = (queryString: string) => {
 
 const loadAll = () => {
 
   return [
 
     { value: 'chinese' },
 
-    { value: 'chinese-tra' },
 
+    { value: 'chinese_cht' },
 
     { value: 'english' },
 
-    { value: 'korea' },
 
+    { value: 'korean' },
 
     { value: 'japan' },
 
-    { value: 'ladin' },
 
-    { value: 'hindi' },
 
+    { value: 'latin' },
 
+    // { value: 'cyrillic' },
 
+    { value: 'devanagari' },
 
+    // { value: 'arabic' },
 
   ]
 
 }