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:
zhuangxinwei
2022-09-30 15:03:43 +08:00
parent fbe18d1bed 6787fc42fc
commit 31b00f1c1f
5 changed files with 52 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/CustomFormComponents/InputForStandardsForForeign.vue
+21 -8
View File
@@ -335,14 +335,27 @@ export default {
}, },
// 点击查看 // 点击查看
handlePreview (item) { handlePreview (item) {
let routeUrl = this.$router.resolve({ console.log(item)
name: 'OtherBussStandardDetails', if (item.standType !== 'FOREIGN') {
params: { let routeUrl = this.$router.resolve({
id: item.id, name: 'OtherBussStandardDetails',
pageType: 'BUSINESS_STAND' params: {
} id: item.id,
}) pageType: 'BUSINESS_STAND'
window.open(routeUrl.href, '_blank') }
})
window.open(routeUrl.href, '_blank')
}else {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.id,
pageType: 'FOREIGN_STAND'
}
})
window.open(routeUrl.href, '_blank')
}
}, },
getResetLawsNumRow() { getResetLawsNumRow() {
this.replacePage = 1 this.replacePage = 1
src/pages/processCenter/pages/phone/bzjd/step4.vue
+2 -1
View File
@@ -245,7 +245,8 @@
<el-dialog <el-dialog
title="查看比对内容" title="查看比对内容"
:visible.sync="BDmodel" :visible.sync="BDmodel"
size="1100px"> size="1100px"
width="100%">
<div>比对条款: {{ itemsNum }}</div> <div>比对条款: {{ itemsNum }}</div>
<div>相似度:{{ similarityDegree }}</div> <div>相似度:{{ similarityDegree }}</div>
<div style="height: 600px;overflow: auto;display: flex;"> <div style="height: 600px;overflow: auto;display: flex;">
src/pages/processCenter/pages/phone/bzjd/step5.vue
+2 -1
View File
@@ -223,7 +223,8 @@
<el-dialog <el-dialog
title="查看比对内容" title="查看比对内容"
:visible.sync="BDmodel" :visible.sync="BDmodel"
size="1100px"> size="1100px"
width="100%">
<div>比对条款: {{ itemsNum }}</div> <div>比对条款: {{ itemsNum }}</div>
<div>相似度:{{ similarityDegree }}</div> <div>相似度:{{ similarityDegree }}</div>
<div style="height: 600px;overflow: auto;display: flex;"> <div style="height: 600px;overflow: auto;display: flex;">
src/pages/processCenter/pages/phone/bzjd/step6.vue
+2 -1
View File
@@ -241,7 +241,8 @@
<el-dialog <el-dialog
title="查看比对内容" title="查看比对内容"
:visible.sync="BDmodel" :visible.sync="BDmodel"
size="1100px"> size="1100px"
width="100%">
<div>比对条款: {{ itemsNum }}</div> <div>比对条款: {{ itemsNum }}</div>
<div>相似度:{{ similarityDegree }}</div> <div>相似度:{{ similarityDegree }}</div>
<div style="height: 600px;overflow: auto;display: flex;"> <div style="height: 600px;overflow: auto;display: flex;">
src/pages/searchCenter/pages/standardSearch.vue
+25 -8
View File
@@ -987,9 +987,13 @@
resultdata['NYLXCLASS'] = NYLXCLASS resultdata['NYLXCLASS'] = NYLXCLASS
for (let i = 0; i < seniortype.length; i++) { for (let i = 0; i < seniortype.length; i++) {
let nowdata = [{}] let nowdata = [{}]
if (typeof this.searchOptions[seniortype[i]] !== 'undefined') { if (typeof this.searchOptions[seniortype[i]] !== 'undefined') {
nowdata = this.searchOptions[seniortype[i]].options nowdata = this.searchOptions[seniortype[i]].options
} }
if (typeof this.searchOptions['NYLXCLASS'] !== 'undefined' && seniortype[i] === 'NYLX') {
nowdata = this.searchOptions['NYLXCLASS'].options
}
let renameType let renameType
if (seniortype[i] === 'selectIndex') { if (seniortype[i] === 'selectIndex') {
for (let j = 0; j < nowdata.length; j++) { for (let j = 0; j < nowdata.length; j++) {
@@ -1007,19 +1011,32 @@
renameType = seniortype[i] renameType = seniortype[i]
} }
let resultsubdata = resultdata[renameType] || {} let resultsubdata = resultdata[renameType] || {}
console.log(resultsubdata) console.log('sssss',resultsubdata)
let countAll = 0 let countAll = 0
if (nowdata) { if (nowdata) {
console.log(nowdata) if (renameType === 'NYLX'){
for (let ji = 0; ji < nowdata.length; ji++) { for (let ji = 0; ji < nowdata.length; ji++) {
if (resultsubdata[nowdata[ji].value] === undefined) { if (resultsubdata[nowdata[ji].label] === undefined) {
nowdata[ji].number = 0 nowdata[ji].number = 0
} else { } else {
nowdata[ji].number = resultsubdata[nowdata[ji].value] nowdata[ji].number = resultsubdata[nowdata[ji].label]
countAll += Number(resultsubdata[nowdata[ji].value]) countAll += Number(resultsubdata[nowdata[ji].label])
}
console.log('alllllllllllllllllllllllll' + countAll)
}
}else {
for (let ji = 0; ji < nowdata.length; ji++) {
if (resultsubdata[nowdata[ji].label] === undefined) {
nowdata[ji].number = 0
} else {
nowdata[ji].number = resultsubdata[nowdata[ji].value]
countAll += Number(resultsubdata[nowdata[ji].value])
}
} }
} }
nowdata[0].number = countAll nowdata[0].number = countAll
console.log('aaaaa',nowdata)
} }
} }
} }