FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
hanshaozhuang
2022-07-20 17:56:43 +08:00
parent b36058d011 d908398499
commit 0e51692c54
3 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/localTool/standContrast/pages/comparisonClauses.vue
+19 -4
View File
@@ -57,7 +57,9 @@
</el-row>
</div>
<!-- <div v-html="leftString" v-if="comparisonFlag === '2'"></div>-->
<div v-for="(item,index) in leftString" v-html="item" :key="index" v-if="comparisonFlag === '2'"></div>
<div v-if="comparisonFlag === '2'">
<span v-for="(item,index) in leftString" v-html="item" :key="index"></span>
</div>
</div>
</div>
</div>
@@ -110,7 +112,9 @@
</el-col>
</el-row>
</div>
<div v-for="(item,index) in rightString" v-html="item" :key="index" v-if="comparisonFlag === '2'"></div>
<div v-if="comparisonFlag === '2'">
<span v-for="(item,index) in rightString" v-html="item" :key="index"></span>
</div>
<!-- <div v-html="rightString" v-if="comparisonFlag === '2'"></div>-->
</div>
</div>
@@ -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 = '不相似'
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+1 -1
View File
@@ -546,7 +546,7 @@
class="add-form-item"
>
<template slot="label">标准体系</template>
<el-input v-model="sarStandardsInfoEO.standSystem" placeholder="选择标准体系"
<el-input v-model="sarStandardsInfoEO.standSystem" placeholder="选择标准体系" readonly
@click.native="choiceZRR1('standSystem', '标准体系', sarStandardsInfoEO.standSystem)"></el-input>
</el-form-item>
</template>
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+11 -2
View File
@@ -1030,7 +1030,7 @@
class="add-form-item"
>
<template slot="label">标准体系</template>
<el-input v-model="sarStandardsInfoEO.standSystem" placeholder="选择标准体系"
<el-input v-model="sarStandardsInfoEO.standSystem" placeholder="选择标准体系" readonly
@click.native="choiceZRR1('standSystem', '标准体系', sarStandardsInfoEO.standSystem)"></el-input>
</el-form-item>
</template>
@@ -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 !== '') {