From 3b3bdd0baeb18a02caaf08191f3c9a3b82cfb581 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Wed, 20 Jul 2022 16:19:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=205668?= =?UTF-8?q?9=20=20=E6=A0=87=E5=87=86=E6=AF=94=E5=AF=B9-=E6=9D=A1=E6=AC=BE?= =?UTF-8?q?=E6=AF=94=E5=AF=B9=20=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=9C=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standContrast/pages/comparisonClauses.vue | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/src/pages/localTool/standContrast/pages/comparisonClauses.vue b/src/pages/localTool/standContrast/pages/comparisonClauses.vue index d43bfe37b..605f9eb58 100644 --- a/src/pages/localTool/standContrast/pages/comparisonClauses.vue +++ b/src/pages/localTool/standContrast/pages/comparisonClauses.vue @@ -57,7 +57,9 @@ -
+
+ +
@@ -110,7 +112,9 @@ -
+
+ +
@@ -206,6 +210,7 @@ export default { }) } this.spinShow = true + let itemsEoPage = { oldItemId: this.saveItemId, newItemId: this.saveItemIdRight, @@ -215,8 +220,18 @@ export default { _this: this }, res => { this.comparisonFlag = '2' - this.leftString = res.data.leftString - this.rightString = res.data.rightString + this.leftString = [] + if((typeof res.data.leftString) === "string"){ + this.leftString.push(res.data.leftString) + }else { + this.leftString = res.data.leftString + } + this.rightString = [] + if((typeof res.data.rightString) === "string"){ + this.rightString.push(res.data.rightString) + }else { + this.rightString = res.data.rightString + } this.text = res.data.similarityDegree if (parseFloat(res.data.similarityDegree) < parseFloat('75%')) { this.textcontent = '不相似' From b41e050da257d0e0907db048ca2e94b55640bb63 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Wed, 20 Jul 2022 16:55:45 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E3=80=900719=E3=80=91=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=85=A5=E5=BA=93=20=E5=85=A5=E5=BA=93=E5=90=8E=20=E6=B5=B7?= =?UTF-8?q?=E5=A4=96=E6=B3=95=E8=A7=84=E5=BA=93=20=E5=9B=BD=E5=AE=B6?= =?UTF-8?q?=E5=9C=B0=E5=8C=BA=E4=B9=B1=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foreignStandardsAndRegulations/index.vue | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 94d17a0fe..0795743b0 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -3045,7 +3045,16 @@ export default { this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item)) this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem]; if (item.country !== undefined && item.country !== null && item.country !== '') { - this.sarStandardsInfoEO.country = item.country.split(","); + if((typeof item.country) === 'string' && item.country.indexOf("[") !== -1 && item.country.indexOf("]") !== -1){ + const str = JSON.parse(item.country); + if((typeof str) === 'string'){ + this.sarStandardsInfoEO.country = str.split(","); + }else { + this.sarStandardsInfoEO.country = str + } + }else{ + this.sarStandardsInfoEO.country = item.country.split(","); + } } this.sarStandardsInfoEO.standSort = item.standSort if (this.sarStandardsInfoEO.putTime != null && this.sarStandardsInfoEO.putTime !== '') { From d9083984997fc051d336a2547edaaabcb5a259b7 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Wed, 20 Jul 2022 17:39:44 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=205661?= =?UTF-8?q?7=20=E5=9B=BD=E5=86=85=E6=A0=87=E5=87=86=E5=92=8C=E5=9B=BD?= =?UTF-8?q?=E5=A4=96=E6=A0=87=E5=87=86=EF=BC=8C=E6=A0=87=E5=87=86=E4=BD=93?= =?UTF-8?q?=E7=B3=BB=E5=BA=94=E8=AF=A5=E4=B8=8D=E8=83=BD=E8=BE=93=E5=85=A5?= =?UTF-8?q?=EF=BC=8C=E5=8F=AA=E8=83=BD=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 2 +- .../foreignStandardsAndRegulations/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 42aac9d03..623c3b029 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -546,7 +546,7 @@ class="add-form-item" > - diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 0795743b0..6f0635a76 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -1030,7 +1030,7 @@ class="add-form-item" > -