Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev

# Conflicts: # front/public/index.html
2022-07-13 18:15:37 +08:00 · 2022-07-13 18:15:37 +08:00 · 7f2f5e541b
parent 876676819b a1eb29974c
commit 7f2f5e541b
5 changed files with 42 additions and 25 deletions
--- a/.gitignore
+++ b/.gitignore
@ -4,3 +4,6 @@ back/dist-西海岸-后台管理-带配置文件.zip
 back/dist-市局-后台管理-带配置文件.zip
 back/dist-包头-后台管理.zip
 back/dist-市局-后台管理.zip
+back/dist-市局-后台管理-v0.8.2.1.zip
+front/public/index.html
+back/dist-西海岸-后台管理-v0.8.2.1.zip
--- a/front/public/index.html
+++ b/front/public/index.html
@ -2,7 +2,7 @@
 * @Author: hisense.wuhongjian
 * @Date: 2022-03-29 16:45:25
 * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-13 18:06:50
+ * @LastEditTime: 2022-07-13 18:15:32
 * @Description: 告诉大家这是什么
 -->
 <!DOCTYPE html>
@ -29,11 +29,11 @@
  <!-- 站点配置 -->
  <script>
    window.SITE_CONFIG = {};
-    // window.SITE_CONFIG['backUrl'] = 'http://15.72.183.90:8001';
-    // window.SITE_CONFIG['previewUrl'] = 'http://15.72.183.90:7008/';
-    // window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/document/#/devModelFile/';
-    // window.SITE_CONFIG['apiURL'] = 'http://15.72.183.90:8000/renren-admin';
-    // window.SITE_CONFIG['POI_URL'] = 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
+    window.SITE_CONFIG['backUrl'] = 'http://15.72.183.90:8001';
+    window.SITE_CONFIG['previewUrl'] = 'http://15.72.183.90:7008/';
+    window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/document/#/devModelFile/';
+    window.SITE_CONFIG['apiURL'] = 'http://15.72.183.90:8000/renren-admin';
+    window.SITE_CONFIG['POI_URL'] = 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
    // 包头
    // window.SITE_CONFIG['backUrl'] = 'http://10.110.205.1:8001';
    // window.SITE_CONFIG['previewUrl'] = 'http://10.110.205.1:8002/';
@ -46,11 +46,11 @@
    // window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/';
    // window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin';
    // 开发
-    window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
-    window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
-    window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/';
-    window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
-    window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
+    // window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
+    // window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
+    // window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/';
+    // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
+    // window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
    // 穿透版本
    // window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797';
    // window.SITE_CONFIG['previewUrl'] = 'http://124.222.94.39:9796/';
--- a/front/src/views/detailsAll/components/Algorithm/AlgorithmOnTrial.vue
+++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmOnTrial.vue
@ -2,7 +2,7 @@
 * @Author: hisense.liangjunhua
 * @Date: 2022-06-09 09:29:29
 * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-05 20:25:49
+ * @LastEditTime: 2022-07-13 16:34:26
 * @Description: 算法详情 算法试用
 -->
 <template>
@ -30,7 +30,8 @@
    if (!obj) {
      flag.value = false
    } else {
-      onTrial.value = obj.attrValue
+      // 修正数据传输导致的转义字符问题
+      onTrial.value = obj.attrValue.replace(/amp;/g, '')
    }
  }
  watch(
@ -41,7 +42,8 @@
        if (!obj) {
          flag.value = false
        } else {
-          onTrial.value = obj.attrValue
+          // 修正数据传输导致的转义字符问题
+          onTrial.value = obj.attrValue.replace(/amp;/g, '')
        }
      }
    }
--- a/front/src/views/detailsAll/components/Algorithm/PictureCharacterRecognition.vue
+++ b/front/src/views/detailsAll/components/Algorithm/PictureCharacterRecognition.vue
@ -14,7 +14,7 @@
              :headers="headers"
              :showUploadList="false"
              @change="handleChange"
-              maxCount="1"
+              maxCount="100"
            >
              <a-button>
                <upload-outlined></upload-outlined>
@ -73,8 +73,10 @@
 </template>
 <script setup>
  import { ref, onMounted } from 'vue'
-  import { paddleocr } from '@/api/file'
+  import { paddleocr,algo } from '@/api/file'
  import { message } from 'ant-design-vue'
+  import { useRouter } from 'vue-router'
+  const router = useRouter()
  const uploadUrl = window.SITE_CONFIG.apiURL + '/upload'
  let fileList = ref([])
  // const responseUrl = ref('')
@ -82,31 +84,41 @@
  const imageResult0 = ref('')
  const imageResult1 = ref('')
  const menuOpenKeys2 = ref(['全文还原'])
-  let responseUrl = ref('static/image/test.jpg')
+  // 图片初始化
+  let responseUrl = ref('static/image/' + router.currentRoute.value.query.exampleImg)
+  const imgType = router.currentRoute.value.query.exampleImg.split('.')[1]
  const handleChange = (info) => {
+    debugger;
    if (info.file.status !== 'uploading') {
      console.log(info.file, info.fileList)
    }
    if (info.file.status === 'done') {
      message.success(`${info.file.name} file uploaded successfully`)
+      debugger
      responseUrl.value = info.file.response.data
+      // imgType.value = info.file.response.data.split('.')[1]
+      if (responseUrl.value) {
        checkImage()
+      }
    } else if (info.file.status === 'error') {
      message.error(`${info.file.name} file upload failed.`)
    }
  }
  const checkImage = () => {
-    getUrlBase64(responseUrl.value, 'jpg', (base64) => {
+    getUrlBase64(responseUrl.value, imgType.value, (base64) => {
      console.log('1111111', base64)
      const param = {
-        img: base64.split('base64,')[1],
+        company: router.currentRoute.value.query.company,
+        algorithmName: router.currentRoute.value.query.algorithmName,
+        data: base64.split('base64,')[1],
+        type: router.currentRoute.value.query.type
      }
-      paddleocr(param).then((res) => {
+      algo(param).then((res) => {
        // wordValue.value = res.data
        console.log('1111', res.data)
-        imageResult.value = res.data.output
-        imageResult0.value = res.data.output
-        imageResult1.value = res.data.output
+        imageResult.value = res.data.data.text_data
+        imageResult0.value = res.data.data.text_data
+        imageResult1.value = res.data.data.text_data
      })
    })
  }
--- a/front/src/views/detailsAll/components/Algorithm/TestOfWords.vue
+++ b/front/src/views/detailsAll/components/Algorithm/TestOfWords.vue
@ -73,7 +73,7 @@
    //   })
    // })
    algo(param).then(res=>{
-      errorWord.value = res.data.text_data
+      errorWord.value = res.data.data.text_data
    })
  }
 </script>