From e9c11c8161d0c809baebcb675d3b5eefa529cedf Mon Sep 17 00:00:00 2001 From: baoyu <102349094+Bytq@users.noreply.github.com> Date: Wed, 12 Jun 2024 10:13:07 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=A0=87=E5=87=86?= =?UTF-8?q?=E8=A7=A3=E8=AF=BB=E6=B5=81=E7=A8=8B=20=E5=A4=84=E7=90=86?= =?UTF-8?q?=E6=9D=A1=E6=AC=BE=E5=AF=B9=E6=AF=94=E5=86=85=E5=AE=B9=E6=96=B0?= =?UTF-8?q?/=E6=97=A7=E6=95=B0=E6=8D=AE=20=E4=B8=BA=E6=95=B0=E7=BB=84?= =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue | 6 +++--- src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue | 6 +++--- src/pages/processCenter/pages/creatProcess/bzjd/step1.vue | 6 +++--- src/pages/processCenter/pages/creatProcess/bzjd/step3.vue | 2 +- src/pages/processCenter/pages/creatProcess/bzjd/step4.vue | 6 +++--- src/pages/processCenter/pages/creatProcess/bzjd/step5.vue | 6 +++--- src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue | 6 +++--- src/pages/processCenter/pages/creatProcess/bzjd/step6.vue | 6 +++--- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index d0cf3d48e..a9dfa2d5b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -742,12 +742,12 @@ this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { _this: this }, res => { - if (res.data.leftString === '' && res.data.rightString === '') { + if ((res.data.leftString === '' && res.data.rightString === '') || (res.data.leftString === [] && res.data.rightString === [])) { this.$message.warning('暂无找到相似的文本') } else { this.itemsNum = itemsNum - this.leftData = res.data.leftString - this.rightData = res.data.rightString + this.leftData = Array.isArray(res.data.leftString) ? res.data.leftString.join('') : res.data.leftString + this.rightData = Array.isArray(res.data.rightString) ? res.data.rightString.join('') : res.data.rightString this.BDmodel = true this.similarityDegree = res.data.similarityDegree } diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue index 143e65866..d5b13c99f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue @@ -460,12 +460,12 @@ export default { this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { _this: this }, res => { - if (res.data.leftString === '' && res.data.rightString === '') { + if ((res.data.leftString === '' && res.data.rightString === '') || (res.data.leftString === [] && res.data.rightString === [])) { this.$message.warning('暂无找到相似的文本') } else { this.itemsNum = itemsNum - this.leftData = res.data.leftString - this.rightData = res.data.rightString + this.leftData = Array.isArray(res.data.leftString) ? res.data.leftString.join('') : res.data.leftString + this.rightData = Array.isArray(res.data.rightString) ? res.data.rightString.join('') : res.data.rightString this.BDmodel = true this.similarityDegree = res.data.similarityDegree } diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index 454d8fe42..50712824e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -761,12 +761,12 @@ this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { _this: this }, res => { - if (res.data.leftString === '' && res.data.rightString === '') { + if ((res.data.leftString === '' && res.data.rightString === '') || (res.data.leftString === [] && res.data.rightString === [])) { this.$message.warning('暂无找到相似的文本') } else { this.itemsNum = itemsNum - this.leftData = res.data.leftString - this.rightData = res.data.rightString + this.leftData = Array.isArray(res.data.leftString) ? res.data.leftString.join('') : res.data.leftString + this.rightData = Array.isArray(res.data.rightString) ? res.data.rightString.join('') : res.data.rightString this.BDmodel = true this.similarityDegree = res.data.similarityDegree } diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index b1d76daab..dcdf67d2e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -645,7 +645,7 @@ this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { _this: this }, res => { - if (res.data.leftString === '' && res.data.rightString === '') { + if ((res.data.leftString === '' && res.data.rightString === '') || (res.data.leftString === [] && res.data.rightString === [])) { this.$message.warning('暂无找到相似的文本') } else { this.itemsNum = itemsNum diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue index 5681162f3..9434e297e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue @@ -386,12 +386,12 @@ this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { _this: this }, res => { - if (res.data.leftString === '' && res.data.rightString === '') { + if ((res.data.leftString === '' && res.data.rightString === '') || (res.data.leftString === [] && res.data.rightString === [])) { this.$message.warning('暂无找到相似的文本') } else { this.itemsNum = itemsNum - this.leftData = res.data.leftString - this.rightData = res.data.rightString + this.leftData = Array.isArray(res.data.leftString) ? res.data.leftString.join('') : res.data.leftString + this.rightData = Array.isArray(res.data.rightString) ? res.data.rightString.join('') : res.data.rightString this.BDmodel = true this.similarityDegree = res.data.similarityDegree } diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue index 047ab7133..0bec88450 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue @@ -386,12 +386,12 @@ this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { _this: this }, res => { - if (res.data.leftString === '' && res.data.rightString === '') { + if ((res.data.leftString === '' && res.data.rightString === '') || (res.data.leftString === [] && res.data.rightString === [])) { this.$message.warning('暂无找到相似的文本') } else { this.itemsNum = itemsNum - this.leftData = res.data.leftString - this.rightData = res.data.rightString + this.leftData = Array.isArray(res.data.leftString) ? res.data.leftString.join('') : res.data.leftString + this.rightData = Array.isArray(res.data.rightString) ? res.data.rightString.join('') : res.data.rightString this.BDmodel = true this.similarityDegree = res.data.similarityDegree } diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue index 9ade242ef..70ada2be0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue @@ -389,12 +389,12 @@ this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { _this: this }, res => { - if (res.data.leftString === '' && res.data.rightString === '') { + if ((res.data.leftString === '' && res.data.rightString === '') || (res.data.leftString === [] && res.data.rightString === [])) { this.$message.warning('暂无找到相似的文本') } else { this.itemsNum = itemsNum - this.leftData = res.data.leftString - this.rightData = res.data.rightString + this.leftData = Array.isArray(res.data.leftString) ? res.data.leftString.join('') : res.data.leftString + this.rightData = Array.isArray(res.data.rightString) ? res.data.rightString.join('') : res.data.rightString this.BDmodel = true this.similarityDegree = res.data.similarityDegree } diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue index 902561212..3b7446bb8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue @@ -388,12 +388,12 @@ this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { _this: this }, res => { - if (res.data.leftString === '' && res.data.rightString === '') { + if ((res.data.leftString === '' && res.data.rightString === '') || (res.data.leftString === [] && res.data.rightString === [])) { this.$message.warning('暂无找到相似的文本') } else { this.itemsNum = itemsNum - this.leftData = res.data.leftString - this.rightData = res.data.rightString + this.leftData = Array.isArray(res.data.leftString) ? res.data.leftString.join('') : res.data.leftString + this.rightData = Array.isArray(res.data.rightString) ? res.data.rightString.join('') : res.data.rightString this.BDmodel = true this.similarityDegree = res.data.similarityDegree } From b31a7eb4a301d56e0ed379fb784994892a58d665 Mon Sep 17 00:00:00 2001 From: baoyu <102349094+Bytq@users.noreply.github.com> Date: Wed, 12 Jun 2024 10:40:39 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=A4=84=E7=90=86?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=20=E5=8F=8D=E9=A6=88=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index 47a565dc2..e4de9e6cf 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -754,7 +754,7 @@ this.acceptShow = false this.submitShow = true } - this.commentForm.commentText3 = data.commentText3 || '' + this.$set(this.commentForm, 'commentText3', data.commentText3 || '') this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.form.fjList = data.form ? data.form.fjList : (data.fjList ? data.fjList : [] ) From 01c05765694957ba18bd2ea9e522f47bbaa70541 Mon Sep 17 00:00:00 2001 From: baoyu <102349094+Bytq@users.noreply.github.com> Date: Wed, 12 Jun 2024 11:07:46 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=A0=87=E5=87=86?= =?UTF-8?q?=E8=A7=A3=E8=AF=BB=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue | 6 +++--- src/pages/processCenter/pages/creatProcess/bzjd/step1.vue | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index a9dfa2d5b..577c352dd 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -766,14 +766,14 @@ this.PLmodalType = type this.PLmodalIndex = index this.PLmodalTitle = '编辑' - if (res.data.leftString === '' && res.data.rightString === '') { + if ((res.data.leftString === '' && res.data.rightString === '') || (res.data.leftString === [] && res.data.rightString === [])) { this.BDtext = true } else if (!row.itemsId || !row.itemsId2) { this.BDtext = true } else { this.BDtext = false - this.leftData = res.data.leftString - this.rightData = res.data.rightString + this.leftData = Array.isArray(res.data.leftString) ? res.data.leftString.join('') : res.data.leftString + this.rightData = Array.isArray(res.data.rightString) ? res.data.rightString.join('') : res.data.rightString this.similarityDegree = res.data.similarityDegree } this.plForm = { diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index 50712824e..ba75d80b8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -787,14 +787,14 @@ this.PLmodalType = type this.PLmodalIndex = index this.PLmodalTitle = '编辑' - if (res.data.leftString === '' && res.data.rightString === '') { + if ((res.data.leftString === '' && res.data.rightString === '') || (res.data.leftString === [] && res.data.rightString === [])) { this.BDtext = true } else if (!row.itemsId || !row.itemsId2) { this.BDtext = true } else { this.BDtext = false - this.leftData = res.data.leftString - this.rightData = res.data.rightString + this.leftData = Array.isArray(res.data.leftString) ? res.data.leftString.join('') : res.data.leftString + this.rightData = Array.isArray(res.data.rightString) ? res.data.rightString.join('') : res.data.rightString this.similarityDegree = res.data.similarityDegree } this.plForm = { From 9ee1e9652640b283a3e6b33b0b9a2ddda54ee789 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Wed, 12 Jun 2024 11:25:24 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=A0=87=E5=87=86?= =?UTF-8?q?=E8=A7=A3=E8=AF=BB=E6=B5=81=E7=A8=8B=E5=A4=84=E7=90=86=E6=9D=A1?= =?UTF-8?q?=E6=AC=BE=E5=AF=B9=E6=AF=94=E5=86=85=E5=AE=B9=E6=96=B0=E6=97=A7?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=BA=E6=95=B0=E7=BB=84=E7=9A=84=E6=83=85?= =?UTF-8?q?=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzjd/step3.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index dcdf67d2e..54f5082f6 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -689,12 +689,14 @@ }else { this.leftData = res.data.leftString } + this.leftData = this.leftData.join('') this.rightData = [] if((typeof res.data.rightString) === "string"){ this.rightData.push(res.data.rightString) }else { this.rightData = res.data.rightString } + this.rightData = this.rightData.join('') this.similarityDegree = res.data.similarityDegree } this.itemId = row.id