From 12ed48f62908985f80c0e400d9fde1146db6f44d Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Mon, 22 Nov 2021 18:00:52 +0800 Subject: [PATCH] commit --- src/components/roleTree/index.vue | 2 + .../pages/creatProcess/bzdy/step5.vue | 1 - .../domesticStandardsAndRegulations/index.vue | 117 +++++++++++++++++- 3 files changed, 118 insertions(+), 2 deletions(-) diff --git a/src/components/roleTree/index.vue b/src/components/roleTree/index.vue index d630fa787..e88464d96 100644 --- a/src/components/roleTree/index.vue +++ b/src/components/roleTree/index.vue @@ -166,6 +166,7 @@ handleTreeDrawerCancel () { this.filterText = '' this.isVisible2 = false + this.open1 = true }, saveUserInfo () { if (this.checkBox) { @@ -195,6 +196,7 @@ this.$emit('checkedRole', this.roleList) } } + this.open1 = true }, drawerCheck (data) { if (this.checkBox) { diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue index 35eb5ca68..65ad60ebc 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue @@ -400,7 +400,6 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - console.log(data); this.form.title = data.title || data.form.title this.form.date = data.date || data.form.date this.json = data || data.form diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index f111f0532..876b4cc31 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -163,6 +163,14 @@ @click="deleteStandFromKind(2)" v-btn-permission="'5aedea192a77b14c364f19bdcee3513a'">移除标准 + OCR + + 拆分 + @@ -1749,6 +1757,46 @@ :nodeList="nodeListZRBM" @checkedRole="drawerCheckZRBM" /> + +
+
+
+
+ + + + + + +
+
+
+ 数据加载中…… +
+ 取消 + 转换 +
+
+ @@ -1803,6 +1851,12 @@ export default { }, data() { return { + OCRDatas: [], + OCRData: [], + OCRLoading: false, + OCRTitle: '', + OCRModel: false, + ocrList: [], nodeList: [], nodeListZRBM: [], modalshowflagRole: false, @@ -2493,6 +2547,64 @@ export default { } }, methods: { + selectOCRChange (val) { + this.OCRDatas = val + }, + OCRclose () { + this.OCRModel = false + }, + OCRsubmit () { + if (this.OCRDatas.length > 1) { + this.$message.warning('仅能选择一个文件') + } else if (this.OCRDatas.length === 0) { + this.$message.warning('请选择一个文件') + } else { + console.log(this.OCRDatas); + console.log(this.ocrList); + let json = { + standNumber: this.ocrList[0].standName, + standName: this.ocrList[0].standName, + attId: this.OCRDatas[0].attId, + fileName: this.OCRDatas[0].name, + fileType: this.ocrList[0].name, + } + console.log('这儿') + } + }, + OCRAdd (type) { + let text = '' + if (type === '0') { + text = 'OCR识别' + this.OCRTitle = '选择OCR实别文件' + } else { + text = '拆分' + this.OCRTitle = '选择拆分文件' + } + if (this.ocrList.length > 1) { + this.$message.warning('仅能选择一条数据进行' + text) + } else if (this.ocrList.length === 0) { + this.$message.warning('请选择一条数据进行' + text) + } else { + this.OCRModel = true + this.OCRLoading = false + this.$http.get('lawss/sarStandFile/queryFileInfoNew', { + type: type, + standId: this.selectedList[0] + },{ + _this: this + }, res => { + if (res.ok) { + if (res.data.length > 0) { + this.OCRData = res.data + this.OCRLoading = false + } else { + this.$message.warning('当前标准没有' + text + '文件') + this.OCRLoading = false + } + } + }) + } + }, // 左右拖动事件 dragControllerLR: function() { var resize = document.getElementById("resize"); @@ -3393,6 +3505,7 @@ export default { }, // 修改成表格样式后，选择项勾选改变 standSelectChange(data) { + this.ocrList = data this.selectedList = [] for (let i = 0; i < data.length; i++) { this.selectedList.push(data[i].id) @@ -5209,7 +5322,9 @@ export default { /deep/ .el-table--scrollable-x .el-table__body-wrapper { overflow-x: scroll; } - +.OCRstandardForComments { + height: 100%; +} #left{ width:calc(30% - 5px); height:100%;