diff --git a/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue b/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue
index 5b62f98bc..116504a3c 100644
--- a/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue
+++ b/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue
@@ -145,11 +145,11 @@
{{ $t('submit') }}
-
+
+
+
+
+
@@ -194,9 +194,15 @@
-
+
{{$t('historicalrecord')}}
@@ -883,6 +889,8 @@ export default {
},
],
userInfoQuery: {},
+ orderBy: '1',
+ orderByField: '',
administrators: false
}
},
@@ -937,6 +945,11 @@ export default {
handleToggleSearch() {
this.toggleSearchStatus = !this.toggleSearchStatus
},
+ tableOnChange(pagination, filters, sorter) {
+ this.orderBy = sorter.order == 'ascend' ? '1' : '2'
+ this.orderByField = sorter.columnKey
+ this.getList()
+ },
searchQuery() {
this.pageNo = 1
this.getList()
@@ -969,6 +982,8 @@ export default {
let query = {
pageNo: this.pageNo,
pageSize: this.pageSize,
+ orderBy: this.orderBy,
+ orderByField: this.orderByField,
...queryParam
}
this.loading = true
diff --git a/jero-web/src/views/projectManagement/components/addModel.vue b/jero-web/src/views/projectManagement/components/addModel.vue
index e61d0533f..49671c5cc 100644
--- a/jero-web/src/views/projectManagement/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/components/addModel.vue
@@ -474,7 +474,7 @@
this.$message.success(this.$t('OperationSuccessful'))
this.visible = false
this.$emit('addModelList')
- this.vdrClick()
+ // this.vdrClick()
} else {
this.$message.warning(res.message)
this.confirmLoading = false
@@ -484,18 +484,18 @@
})
},
// 跳转vdr
- vdrClick(){
- let _this = this
- this.$confirm({
- content: _this.$t('Rematchornot') + 'VDR',
- onOk() {
- let newUrl = _this.$router.resolve({
- path:'otaAuthentication',
- })
- window.open(newUrl.href, '_blank')
- }
- })
- },
+ // vdrClick(){
+ // let _this = this
+ // this.$confirm({
+ // content: _this.$t('Rematchornot') + 'VDR',
+ // onOk() {
+ // let newUrl = _this.$router.resolve({
+ // path:'otaAuthentication',
+ // })
+ // window.open(newUrl.href, '_blank')
+ // }
+ // })
+ // },
handleInput(value) {
this.$nextTick(() => {
this.formInline = { ...this.formInline }
diff --git a/jero-web/src/views/projectManagement/components/otastatus.vue b/jero-web/src/views/projectManagement/components/otastatus.vue
index 078ab189c..895787cc6 100644
--- a/jero-web/src/views/projectManagement/components/otastatus.vue
+++ b/jero-web/src/views/projectManagement/components/otastatus.vue
@@ -47,11 +47,11 @@
{{$t('notInvolved')}} |
- | 111 |
- 111 |
- 111 |
- 111 |
- 111 |
+ {{matchForm.a}} |
+ {{matchForm.a}} |
+ {{matchForm.a}} |
+ {{matchForm.a}} |
+ {{matchForm.a}} |
@@ -72,13 +72,13 @@
{{$t('componentReportHasBeenStored')}} |
- | 111 |
- 111 |
- 111 |
- 111 |
- 111 |
- 111 |
- 111 |
+ {{authenticationForm.a}} |
+ {{authenticationForm.a}} |
+ {{authenticationForm.a}} |
+ {{authenticationForm.a}} |
+ {{authenticationForm.a}} |
+ {{authenticationForm.a}} |
+ {{authenticationForm.a}} |
@@ -133,6 +133,8 @@
vehicleTypeCode:'',
softwareversion:'',
releaseName:'',
+ matchForm:{},
+ authenticationForm:{},
url: {
getProjectDetailsStatistics: '/project/projectLibraryBase/getProjectDetailsStatistics'
},
@@ -158,10 +160,11 @@
if (res.success) {
if (res.result) {
let mainTopDataSource = res.result.taskToConfirmMap ? res.result.taskToConfirmMap.taskToConfirmMapList : []
- let mainLeftDataSource = res.result.designComplianceMap ? res.result.designComplianceMap.designComplianceMapList : []
- // let mainRightDataSource = res.result.verifyComplianceMap ? res.result.verifyComplianceMap.verifyComplianceMapList : []
+ let mainEndDataSource = res.result.designComplianceMap ? res.result.designComplianceMap.designComplianceMapList : []
+ this.matchForm = res.result.matchForm
+ this.authenticationForm = res.result.authenticationForm
this.mainTopEcharts(mainTopDataSource)
- this.mainEndEcharts(mainLeftDataSource)
+ this.mainEndEcharts(mainEndDataSource)
// this.mainRightEcharts(mainRightDataSource)
}
}
@@ -170,13 +173,8 @@
getoptions() {
let id = ''
- if (this.idList && this.idList.length > 0) {
- id = this.idList.join(',')
- } else {
- id = this.$route.query.parentId ? this.$route.query.parentId : this.$route.query.id
- // id = this.$route.query.id
- }
- getAction('project/projectLibraryBase/getProjectDetailsStatisticsCollectManifestLabel', { id: id }).then((res) => {
+ id = this.$route.query.id
+ getAction('ota/otaManageApplyEO/getVdrListByProject', { projectId: id }).then((res) => {
if (res.success) {
this.options = res.result
this.queryParam.ctype = this.options[0].value
diff --git a/jero-web/src/views/projectManagement/components/settingList.vue b/jero-web/src/views/projectManagement/components/settingList.vue
index fbb5776ab..6e08ddd65 100644
--- a/jero-web/src/views/projectManagement/components/settingList.vue
+++ b/jero-web/src/views/projectManagement/components/settingList.vue
@@ -515,6 +515,9 @@
this.visible = false
this.confirmLoading = false
this.$emit('settingListForm')
+ if(res.result.matchVdr == true){
+ this.vdrClick()
+ }
} else {
this.$message.warning(this.$t('operationFailed'))
this.confirmLoading = false
@@ -523,6 +526,19 @@
}
})
},
+ // 跳转vdr
+ vdrClick(){
+ let _this = this
+ this.$confirm({
+ content: _this.$t('Rematchornot') + 'VDR',
+ onOk() {
+ let newUrl = _this.$router.resolve({
+ path:'otaAuthentication',
+ })
+ window.open(newUrl.href, '_blank')
+ }
+ })
+ },
handleCancel() {
this.formInline = {}
this.visible = false