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; } 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 diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue index b962c934a..356914731 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue @@ -35,42 +35,6 @@ clearable > - - - - - - -
-
- {{ item.name }} - -
-
-
- - 点击上传 - -
- + + +
+
+ {{ item.name }} + +
+
+
+ + 点击上传 + +
+ + + + + @@ -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..5c455b952 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 }} - -
-
+ + + 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 = [] 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() {