修改bug
This commit is contained in:
@@ -255,6 +255,7 @@
|
|||||||
pageNo: this.pageNo,
|
pageNo: this.pageNo,
|
||||||
pageSize: this.pageSize,
|
pageSize: this.pageSize,
|
||||||
serialNumber: this.$route.query.serialNumber ? this.$route.query.serialNumber : '',
|
serialNumber: this.$route.query.serialNumber ? this.$route.query.serialNumber : '',
|
||||||
|
gatherResult: this.$route.query.gatherResult ? this.$route.query.gatherResult : '',
|
||||||
...queryParam
|
...queryParam
|
||||||
}
|
}
|
||||||
this.loading = true
|
this.loading = true
|
||||||
|
|||||||
@@ -324,6 +324,7 @@
|
|||||||
pageNo: this.pageNo,
|
pageNo: this.pageNo,
|
||||||
pageSize: this.pageSize,
|
pageSize: this.pageSize,
|
||||||
serialNumber: this.$route.query.serialNumber ? this.$route.query.serialNumber : '',
|
serialNumber: this.$route.query.serialNumber ? this.$route.query.serialNumber : '',
|
||||||
|
flowStatus: this.$route.query.flowStatus ? this.$route.query.flowStatus : '',
|
||||||
...queryParam
|
...queryParam
|
||||||
}
|
}
|
||||||
this.loading = true
|
this.loading = true
|
||||||
|
|||||||
@@ -675,7 +675,9 @@
|
|||||||
this.handlePreservation()
|
this.handlePreservation()
|
||||||
}
|
}
|
||||||
}, 10000)
|
}, 10000)
|
||||||
this.paramsManifest = JSON.parse(localStorage.getItem('paramsManifest'))
|
// this.paramsManifest = JSON.parse(localStorage.getItem('paramsManifest'))
|
||||||
|
this.paramsManifest = this.$route.query
|
||||||
|
// document.title = `${this.paramsManifest.title}-` + this.$t('ParameteItemCollectionList')
|
||||||
document.title = `${this.paramsManifest.title}-` + this.$t('ParameteItemCollectionList')
|
document.title = `${this.paramsManifest.title}-` + this.$t('ParameteItemCollectionList')
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
|||||||
@@ -252,12 +252,11 @@
|
|||||||
// 先调取接口判断是否有配置信息
|
// 先调取接口判断是否有配置信息
|
||||||
getAction(this.url.verifyConfig, { paramsManifestId: item.id }).then((res) => {
|
getAction(this.url.verifyConfig, { paramsManifestId: item.id }).then((res) => {
|
||||||
if (res.result) {
|
if (res.result) {
|
||||||
localStorage.setItem('paramsManifest', JSON.stringify(item))
|
// localStorage.setItem('paramsManifest', JSON.stringify(item))
|
||||||
let newUrl = _this.$router.resolve({
|
let newUrl = _this.$router.resolve({
|
||||||
path: '/ParameterItemCollection',
|
path: '/ParameterItemCollection',
|
||||||
query: item
|
query: item
|
||||||
// projectName:this.$route.query.projectName
|
// projectName:this.$route.query.projectName
|
||||||
|
|
||||||
})
|
})
|
||||||
window.open(newUrl.href, '_blank')
|
window.open(newUrl.href, '_blank')
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -211,7 +211,8 @@ export default {
|
|||||||
this.$router.push({
|
this.$router.push({
|
||||||
path: '/collectionOfRegulatoryOpinions',
|
path: '/collectionOfRegulatoryOpinions',
|
||||||
query:{
|
query:{
|
||||||
serialNumber:this.item.serialNumber
|
serialNumber:this.item.serialNumber,
|
||||||
|
gatherResult:'Completed'
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
@@ -228,7 +229,8 @@ export default {
|
|||||||
this.$router.push({
|
this.$router.push({
|
||||||
path: '/technologyAssessment',
|
path: '/technologyAssessment',
|
||||||
query:{
|
query:{
|
||||||
serialNumber:this.item.serialNumber
|
serialNumber:this.item.serialNumber,
|
||||||
|
flowStatus:'Completed'
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
@@ -257,7 +259,7 @@ export default {
|
|||||||
id:this.paramsManifestId,
|
id:this.paramsManifestId,
|
||||||
...this.formData
|
...this.formData
|
||||||
}
|
}
|
||||||
downloadFile('/project/lawsComplianceBoard/exportComplianceResultDetail', this.$t('complianceResults')+'.xls', query, this.Deselect)
|
downloadFile('/project/lawsComplianceBoard/exportComplianceResultDetail', this.item.serialNumber +'.xls', query, this.Deselect)
|
||||||
},
|
},
|
||||||
searchQuery() {
|
searchQuery() {
|
||||||
this.loadData()
|
this.loadData()
|
||||||
|
|||||||
@@ -72,22 +72,29 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
|
<!-- calc(100vh - 130px)-->
|
||||||
<a-table
|
<a-table
|
||||||
ref="table"
|
class="table"
|
||||||
size="middle"
|
|
||||||
:loading="loading"
|
|
||||||
:pagination="false"
|
|
||||||
:scroll="{x: '100%',y:'calc(100vh - 130px)'}"
|
|
||||||
rowKey="id"
|
rowKey="id"
|
||||||
:data-source="dataSource"
|
|
||||||
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
|
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
|
||||||
|
:pagination="false"
|
||||||
|
:scroll="{x: '100%',y:'calc(100vh - 155px)'}"
|
||||||
|
:data-source="dataSource"
|
||||||
|
:loading="loading"
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
|
@change="tableOnChange"
|
||||||
>
|
>
|
||||||
<span slot="technicalField" slot-scope="text,record" :title="text">
|
<span slot="technicalField" slot-scope="text,record" :title="text">
|
||||||
<a @click="entryNameClick(record)">
|
<a @click="entryNameClick(record)">
|
||||||
{{ text && text.length > 23 ? text.slice(0, 22) + '...' : text }}
|
{{ text && text.length > 23 ? text.slice(0, 22) + '...' : text }}
|
||||||
</a>
|
</a>
|
||||||
</span>
|
</span>
|
||||||
|
<span slot="standard" slot-scope="text,record" :title="text">
|
||||||
|
{{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }}
|
||||||
|
</span>
|
||||||
|
<!-- <span slot="serialNumber" slot-scope="text,record" :title="text">-->
|
||||||
|
<!-- {{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }}-->
|
||||||
|
<!-- </span>-->
|
||||||
<span slot="operation" slot-scope="text,record">
|
<span slot="operation" slot-scope="text,record">
|
||||||
<a class="text-operation" @click="handlecody(record)">{{$t('ViewConformanceResults')}}</a>
|
<a class="text-operation" @click="handlecody(record)">{{$t('ViewConformanceResults')}}</a>
|
||||||
</span>
|
</span>
|
||||||
@@ -161,13 +168,15 @@ export default {
|
|||||||
title: this.$t('standard'),
|
title: this.$t('standard'),
|
||||||
align: 'center',
|
align: 'center',
|
||||||
dataIndex: 'serialNumber',
|
dataIndex: 'serialNumber',
|
||||||
width: 180
|
width: 180,
|
||||||
|
scopedSlots: { customRender: 'standard' }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: this.$t('title'),
|
title: this.$t('title'),
|
||||||
align: 'center',
|
align: 'center',
|
||||||
dataIndex: 'title',
|
dataIndex: 'title',
|
||||||
width: 180
|
width: 180,
|
||||||
|
scopedSlots: { customRender: 'standard' }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: this.$t('status'),
|
title: this.$t('status'),
|
||||||
@@ -256,7 +265,11 @@ export default {
|
|||||||
this.toggleSearchStatus = !this.toggleSearchStatus
|
this.toggleSearchStatus = !this.toggleSearchStatus
|
||||||
},
|
},
|
||||||
onSelectChange(value) {
|
onSelectChange(value) {
|
||||||
|
this.selectedRowKeys = value
|
||||||
this.selectedRowKeysArray = this.selectedRowKeys.join(',')
|
this.selectedRowKeysArray = this.selectedRowKeys.join(',')
|
||||||
|
console.log(this.selectedRowKeysArray)
|
||||||
|
},
|
||||||
|
tableOnChange(val) {
|
||||||
},
|
},
|
||||||
deriveconformanceresults(){
|
deriveconformanceresults(){
|
||||||
let query = {
|
let query = {
|
||||||
|
|||||||
Reference in New Issue
Block a user