From daf079fe0bbb67ad30af40ad063518d77c12470e Mon Sep 17 00:00:00 2001 From: caoyang Date: Thu, 24 Mar 2022 17:50:44 +0800 Subject: [PATCH] =?UTF-8?q?ocr=E4=B8=8B=E8=BD=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/OcrAddForm/index.vue | 94 ++++++++++++++++--- jero-web/src/components/OcrTable/index.vue | 8 +- .../src/views/documentManage/ocr/index.vue | 13 ++- .../documentManage/tags/dialog/DicList.vue | 5 +- .../documentManage/tags/dialog/ListTable.vue | 2 +- .../documentManage/tags/dialog/TreeTable.vue | 4 +- .../documentManage/tags/tabs/TagContent.vue | 4 +- .../documentManage/tags/tabs/TagItem.vue | 2 +- 8 files changed, 100 insertions(+), 32 deletions(-) diff --git a/jero-web/src/components/OcrAddForm/index.vue b/jero-web/src/components/OcrAddForm/index.vue index 960a697ab..ead6d354b 100644 --- a/jero-web/src/components/OcrAddForm/index.vue +++ b/jero-web/src/components/OcrAddForm/index.vue @@ -301,20 +301,84 @@ }, methods: { handleChange(info) { - if (info.file.status !== 'uploading') { - // console.log(info.file, info.fileList) - } - if (info.file.status === 'done') { - console.log('info', info) - this.fileList = [] - this.myfileList = info.fileList - this.formInline.attId = info.file.response.result.id - this.$message.success(`${info.file.name}上传成功`) - }else if (info.file.status === 'error') { - this.$message.error(`${info.file.name}上传失败`) - } else if (info.file.status === 'uploading') { - this.myfileList = info.fileList - // console.log(info.file, info.fileList) + let { file } = info; + const status = info.file.status; + info.fileList.forEach((val,index)=>{ + if(val.response && !val.response.result){ + this.$message.error(val.response.message); + info.fileList.splice(index,1) + } + }) + if (this.fileTypeSatus) { + if (file.size > 100000000) { + this.$message.error(this.errorMessage) + return + }else { + if (status === 'error') { + // this.$emit('uploadSuccess', this.fileList) + this.$message.destroy() + this.$message.error(`${info.file.name} 文件上传失败。`); + } else if (status === 'removed') { + this.myfileList = info.fileList; + this.fileList = [] + this.myfileList.forEach((res) => { + if (res.response) { + this.fileList.push(res.response.result) + } else { + this.fileList.push(res) + } + }) + // console.log('remove',this.fileList) + // this.$emit('uploadSuccess', this.fileList) + this.$message.destroy() + this.$message.success(`${info.file.name} 删除成功。`); + } else if (status === 'done') { + this.fileList = [] + this.myfileList = info.fileList; + // console.log('file3333',info.fileList) + if (info.fileList.length > 1) { + info.fileList.splice(1) + // this.myfileList = info.fileList; + + this.myfileList.forEach((res) => { + if (res.response) { + this.fileList.push(res.response.result) + } else { + this.fileList.push(res) + } + }) + // console.log('file1111',this.fileList) + // this.$emit('uploadSuccess', this.fileList) + + this.$message.destroy() + this.$message.error('最多只能上传一个文件'); + return + } + // console.log('my222',this.myfileList) + this.myfileList.forEach((res) => { + if (res.response) { + this.fileList.push(res.response.result) + // console.log('flist',res.response) + } else { + this.fileList.push(res) + } + }) + + if(this.myfileList.length > 0){ + // this.$emit('uploadSuccess', this.fileList) + // console.log('fileList111',this.fileList) + this.formInline.attId=this.myfileList[0].response.result.id + this.$message.destroy() + this.$message.success(`${info.file.name} 文件上传成功。`); + } + } else if (status === 'uploading') { + this.myfileList = info.fileList; + // this.$emit('uploadSuccess') + // this.$message.success(`${info.file.name} 文件上传成功。`); + } + } + }else{ + this.$message.warning('不支持上传该类型的文件!') } }, @@ -404,7 +468,7 @@ rule.push({ required: true, message: res.db_field_txt + '不能为空', - trigger: 'blur' + trigger: 'change' }) if (res.db_field_name == 'standNumber') { rule.push( diff --git a/jero-web/src/components/OcrTable/index.vue b/jero-web/src/components/OcrTable/index.vue index d25438b7c..ca674aa12 100644 --- a/jero-web/src/components/OcrTable/index.vue +++ b/jero-web/src/components/OcrTable/index.vue @@ -15,16 +15,16 @@ - + {{record.resultContent=='转换成功'&&record.syncState=='未同步'&&record.fileSource=='1'?ol.text:''}} - + {{record.resultContent=='转换成功'&&record.syncState=='未同步'?ol.text:''}} - + {{record.resultContent=='转换成功'?ol.text:''}} - + {{ol.text}} diff --git a/jero-web/src/views/documentManage/ocr/index.vue b/jero-web/src/views/documentManage/ocr/index.vue index 1613afee7..1682581a7 100644 --- a/jero-web/src/views/documentManage/ocr/index.vue +++ b/jero-web/src/views/documentManage/ocr/index.vue @@ -5,15 +5,15 @@
-
+
{{ $t('upload1') }}
-
+
{{ $t('RetrieveFiles') }}
-
+
{{ $t('BatchDelete') }}
@@ -311,8 +311,11 @@ }, //下载 actionDown(val){ - let fileName=val.docRealName.split('_') - fileName=fileName[fileName.length-1] + let fileNames=val.docRealName.split('_') + let name = fileNames.shift() + let fileName=fileNames.join('_') + // let fileName=val.fileName.split('.')[0] + downloadFile('ocr/OcrRestful/downFile', fileName, { fileName: val.docRealName }) }, //删除 diff --git a/jero-web/src/views/documentManage/tags/dialog/DicList.vue b/jero-web/src/views/documentManage/tags/dialog/DicList.vue index 045f85495..aa6a5fae6 100644 --- a/jero-web/src/views/documentManage/tags/dialog/DicList.vue +++ b/jero-web/src/views/documentManage/tags/dialog/DicList.vue @@ -17,7 +17,7 @@ {{$t('add')}}
-
+
{{$t('BatchDelete')}}
@@ -245,6 +245,7 @@ }else if(this.dictVal='tree'){ this.parentVisible=true + this.editPId='' } }, //保存 @@ -401,7 +402,7 @@ //树形选中行 selectedKeys(val){ this.selectedIds=val - console.log('seleVal',val) + // console.log('seleVal',val) }, //批量删除 batDelete(){ diff --git a/jero-web/src/views/documentManage/tags/dialog/ListTable.vue b/jero-web/src/views/documentManage/tags/dialog/ListTable.vue index 5b9775ab6..4c128ead2 100644 --- a/jero-web/src/views/documentManage/tags/dialog/ListTable.vue +++ b/jero-web/src/views/documentManage/tags/dialog/ListTable.vue @@ -4,7 +4,7 @@
diff --git a/jero-web/src/views/documentManage/tags/dialog/TreeTable.vue b/jero-web/src/views/documentManage/tags/dialog/TreeTable.vue index a1bce13c0..c6d7c5cd5 100644 --- a/jero-web/src/views/documentManage/tags/dialog/TreeTable.vue +++ b/jero-web/src/views/documentManage/tags/dialog/TreeTable.vue @@ -13,7 +13,7 @@ >
@@ -39,7 +39,7 @@ props:{ tabletreeData:Array, record:Object, - total:String, + total:Number, queryParams:Object }, data(){ diff --git a/jero-web/src/views/documentManage/tags/tabs/TagContent.vue b/jero-web/src/views/documentManage/tags/tabs/TagContent.vue index f9dae3fd9..9e5fdc5a1 100644 --- a/jero-web/src/views/documentManage/tags/tabs/TagContent.vue +++ b/jero-web/src/views/documentManage/tags/tabs/TagContent.vue @@ -18,11 +18,11 @@
-
+
{{$t('add')}}
-
+
{{$t('BatchDelete')}}
diff --git a/jero-web/src/views/documentManage/tags/tabs/TagItem.vue b/jero-web/src/views/documentManage/tags/tabs/TagItem.vue index f9510f598..f405635d1 100644 --- a/jero-web/src/views/documentManage/tags/tabs/TagItem.vue +++ b/jero-web/src/views/documentManage/tags/tabs/TagItem.vue @@ -33,7 +33,7 @@ {{$t('ExhibitionAreaManagement')}}
-
+
{{$t('BatchDelete')}}