From 7ce4ec10659ce055fabba0c95c92f8d87476985b Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Tue, 16 Aug 2022 16:19:32 +0800 Subject: [PATCH 1/6] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E2=80=8556966=20=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=8F=91=E8=B5=B7=E9=A1=B5=E9=9D=A2=EF=BC=8C=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E9=99=84=E4=BB=B6=E6=94=B9=E6=88=90=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8C=E7=BB=93=E6=9D=9F=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E6=94=BE=E4=B8=8B=E8=BE=B9=EF=BC=8C=E6=A0=87=E5=87=86=E9=99=84?= =?UTF-8?q?=E4=BB=B6=E6=94=B9=E6=88=90=E6=A0=87=E5=87=86=E6=96=87=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzzqyj/step1-1.vue | 78 +++++++++---------- .../pages/creatProcess/bzzqyj/step1.vue | 70 ++++++++--------- 2 files changed, 74 insertions(+), 74 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue index b962c934a..48d4595b7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue @@ -35,13 +35,35 @@ clearable > - - - + +
+ 选择文本 +
+ +
+
+ {{ item.fileName }} + +
+
+ + + + + + - - - - - - - -
- 选择文本 -
- -
-
- {{ item.fileName }} - -
-
+ + + @@ -158,14 +158,14 @@ -

标准法规部高级经理、责任部门高级经理

+

标准法规部高级经理

 diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index f24b691e7..e8f26a512 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -35,12 +35,35 @@ clearable /> - - - + +
+ 选择文本 +
+ +
+
+ {{ item.fileName }} + +
+
+ + + + + + - - - - - - - -
- 选择文本 -
- -
-
- {{ item.fileName }} - -
-
+ + + From 770565cc13e4a8f1a07d430f9068b62203c0daeb Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Wed, 17 Aug 2022 15:53:06 +0800 Subject: [PATCH 2/6] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E2=80=8556982=20=EF=BC=8C=E7=BA=BF=E4=B8=8A=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=20=E8=A7=A3=E8=AF=BB=E6=B5=81=E7=A8=8B=EF=BC=8C=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E6=AF=94=E5=AF=B9=E9=87=8C=E8=BE=B9=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzjd/step3.vue | 64 +++++++++++++++++-- 1 file changed, 57 insertions(+), 7 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index 475ccd070..5180f92ef 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -469,9 +469,13 @@ size="1100px">
比对条款: {{ itemsNum }}
相似度: {{ similarityDegree }}
-
-
-
+
+
+
+
+
+
+
@@ -625,8 +629,19 @@ this.$message.warning('暂无找到相似的文本') } else { this.itemsNum = itemsNum - this.leftData = res.data.leftString - this.rightData = res.data.rightString + + this.leftData = [] + if((typeof res.data.leftString) === "string"){ + this.leftData.push(res.data.leftString) + }else { + this.leftData = res.data.leftString + } + this.rightData = [] + if((typeof res.data.rightString) === "string"){ + this.rightData.push(res.data.rightString) + }else { + this.rightData = res.data.rightString + } this.BDmodel = true this.similarityDegree = res.data.similarityDegree } @@ -648,8 +663,18 @@ this.BDtext = true } else { this.BDtext = false - this.leftData = res.data.leftString - this.rightData = res.data.rightString + this.leftData = [] + if((typeof res.data.leftString) === "string"){ + this.leftData.push(res.data.leftString) + }else { + this.leftData = res.data.leftString + } + this.rightData = [] + if((typeof res.data.rightString) === "string"){ + this.rightData.push(res.data.rightString) + }else { + this.rightData = res.data.rightString + } this.similarityDegree = res.data.similarityDegree } this.itemId = row.id @@ -983,6 +1008,31 @@ padding: 0 20px 0; } } + .contentCom{ + border-top: 1px solid #EDEDED; + min-height: 349px; + max-height: 549px; + display: flex; + display: -ms-flex; + display: -moz-flex; + display: -webkit-flex; + font-size: 15px; + .content-left{ + border: 1px solid #EDEDED; + border-top-color: transparent; + flex: 0 0 50%; + line-height: 30px; + padding: 0 15px; + } + .content-right{ + flex: 0 0 50%; + line-height: 30px; + padding: 0 15px; + border: 1px solid #EDEDED; + border-left-color: transparent; + border-top-color: transparent; + } + } .myText { line-height: 20px; } From 4cb1df870c2a297f4b5a2eb8ca2809846f705049 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Wed, 17 Aug 2022 17:05:32 +0800 Subject: [PATCH 3/6] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E2=80=8556995=20=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=EF=BC=8C=E6=89=8B=E6=9C=BA=E7=AB=AF=EF=BC=8C=E4=BC=9A?= =?UTF-8?q?=E7=AD=BE=E8=8A=82=E7=82=B9=E5=AE=A1=E6=A0=B8=E4=BA=BA=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=B8=A6=E5=87=BA=E6=9D=A5=EF=BC=8C=E6=94=B9=E6=88=90?= =?UTF-8?q?=E5=92=8Cpc=E7=AB=AF=E4=B8=80=E6=A0=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/phone/bzzqyj/step6.vue | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step6.vue b/src/pages/processCenter/pages/phone/bzzqyj/step6.vue index 8679bc81e..5a8b7a75b 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step6.vue @@ -437,8 +437,19 @@ this.form.endTime = data.endTime || data.form.endTime; this.form.textType = data.textType || data.form.textType this.form.modelList = data.modelList || data.form.modelList - this.form.user7 = data.form ? data.form.user7 : (data.user7 ? data.user7 : '') - this.form.user7Name = data.form ? data.form.user7Name : (data.user7Name ? data.user7Name : '') + if(data.form){ + let user7Id = data.form.user7 + if(user7Id){ + this.form.user7 =user7Id + this.form.user7Name =data.form.user7Name + }else{ + this.form.user7 = data.user7 ? data.user7 : data.spId + this.form.user7Name = data.user7Name ? data.user7Name : data.spName + } + }else{ + this.form.user7 = data.user7 ? data.user7 : data.spId + this.form.user7Name = data.user7Name ? data.user7Name : data.spName + } let newArr = data.info ? data.info : data.form.data this.oldData = JSON.parse(JSON.stringify(newArr)) let arr = [] From 6395bb19e72fb6261fd677249641d7152046daab Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Thu, 18 Aug 2022 09:46:42 +0800 Subject: [PATCH 4/6] feat: There is no way the, --- .../pages/creatProcess/bzzqyj/step1-1.vue | 20 +++++++++---------- .../pages/creatProcess/bzzqyj/step1.vue | 20 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue index 48d4595b7..356914731 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue @@ -35,6 +35,16 @@ clearable > + + + + + +
选择文本 @@ -55,16 +65,6 @@
- - - - - - + + + + + +
选择文本 @@ -55,16 +65,6 @@
- - - - - - Date: Thu, 18 Aug 2022 13:30:36 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E8=B5=84=E6=96=99=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=A2=84=E8=A7=88=E4=BD=BF=E7=94=A8KKVIEW?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataCenter/dataCenterDetail.vue | 77 +------------------ 1 file changed, 2 insertions(+), 75 deletions(-) diff --git a/src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue b/src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue index 49c55a62f..b069b4da6 100644 --- a/src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue +++ b/src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue @@ -76,81 +76,8 @@ export default { if (fileSuffix === '.PNG' || fileSuffix === '.JPG' || fileSuffix === '.JPEG') { this.downloadFile(attId) return true - } - - // 缺少文件 - if (fileSuffix === '.PDG' || fileSuffix === '.pdg') { - this.getBusStandFileByAttId(attId) - .then(res => { - if (res) { - const editFileInfo = res - console.log(editFileInfo) - if (editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG') { - window.open('book://ssreader/e0?url=' + editFileInfo.downLoadUrl) - } else { - const nowTime = new Date().getTime() - // window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl))); - // window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName) - } - // window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id)) - } - // switch (res.convertState) { - // case 'ERROR': - // this.$message.warning('文档转换失败') - // break - // case 'LODING': - // this.$message.info('文档转换中，请稍后查看') - // break - // case 'SUCCESS': - // const { convertFileInfo } = res - // window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + convertFileInfo.id)) - // break - // } - }).catch(e => { - console.log(e) - this.$message.warning('文件不存在,预览失败') - }) - } else { - this.$http.get('lawss/sarStandFile/queryConvertAtt', { - attId: attId - }, { - _this: this - }, res => { - - console.log("res.data", res.data); - if (res.data) { - let fileObj = {} - fileObj.fileId = res.data.attId - fileObj.fileName = oldFileName - let fileList = [] - let repeatData = 0 - if (sessionStorage.getItem('fileInfo')) { - fileList = JSON.parse(sessionStorage.getItem('fileInfo')) - if (fileList != null && fileList.length > 0) { - for (let i = 0; i < fileList.length; i++) { - if (fileList[i].fileId === res.data.attId) { - repeatData = 1 - break - } - } - if (repeatData === 0) { - fileList.push(fileObj) - fileList = JSON.stringify(fileList) - sessionStorage.setItem('fileInfo', fileList) - } - } - } else { - fileList.push(fileObj) - fileList = JSON.stringify(fileList) - sessionStorage.setItem('fileInfo', fileList) - } - window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + res.data.attId)) - } else { - this.$message.error('文档未转换成功或本地读取不到该文档') - } - }, e => { - this.$message.error('文档未转换成功或本地读取不到该文档') - }) + }else{ + this.$preview(attId) } }, back() { From 350ece166fed5fc95b1c15b1b8d8e0864e6f8c84 Mon Sep 17 00:00:00 2001 From: zyd Date: Thu, 18 Aug 2022 21:52:54 +0800 Subject: [PATCH 6/6] =?UTF-8?q?fix:=20=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E5=A1=AB=E5=86=99=E6=84=8F=E8=A7=81=E9=A1=B5=E9=9D=A2=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=8C=89=E9=92=AE=E5=85=B3=E9=97=AD=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../creatProcess/bzzqyj/ZQYJAddFileDetails.vue | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue index 36e5a6310..69427df60 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue @@ -40,7 +40,10 @@
- + + 确定 + + 提交
@@ -143,6 +146,18 @@ } } }, + closePage(){ + window.opener = null; + window.open("about:blank", "_top").close() + if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) { + window.location.href = "about:blank"; + window.close(); + } else { + window.opener = null; + window.open("", "_self"); + window.close(); + } + } }, mounted() { const attId = this.$route.query.attId