Sfoglia il codice sorgente

Merge branch 'ETA_1.6.9'

hbchen 7 mesi fa
parent
commit
0efca1e785

+ 0 - 7
config/index.js

@@ -36,13 +36,6 @@ module.exports = {
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
     proxyTable:{
-    '/voice':{
-      target: "http://localhost:3003",
-      changeOrigin:true, // 如果接口跨域,需要进行这个参数配置
-      pathRewrite:{
-        '^/voice':'/voice'
-      }
-    },
 		'/adminapi': {
       target: "http://8.136.199.33:7778",
       // target: "http://192.168.77.7:8606",

+ 1 - 1
src/views/semantics_manage/asr/ASR.vue

@@ -976,7 +976,7 @@ export default {
               transferingNumber:res.Data?res.Data.filter(dat => dat.State==1).length:0,
               list:res.Data || []
             }
-            if(this.transferStatus && this.transferStatus.transferingNumber){
+            if(this.transferStatus.list && this.transferStatus.list.length>0){
               this.transferStatusShow=true
             }
           }

+ 11 - 4
src/views/semantics_manage/asr/components/transferStatus.vue

@@ -56,10 +56,17 @@ import { asrInterface } from '../../../../api/modules/semanticsApi'
         stateTextArr:['','转写中','转写完成','转写失败']
       }
     },
-    mounted(){
-      this.$nextTick(()=>{
-        this.dragDocument = $('#transfer-status-box')[0]
-      })
+    watch:{
+      windowShow:{
+        handler:function(value){
+          if(value){
+            this.$nextTick(()=>{
+              this.dragDocument = $('#transfer-status-box')[0]
+            })
+          }
+        },
+        immediate:true
+      }
     },
     methods: {
       deleteRow(item,index){