diff --git a/jero-web/src/views/projectManagement/components/otastatus.vue b/jero-web/src/views/projectManagement/components/otastatus.vue
index 895787cc6..59bcc9d97 100644
--- a/jero-web/src/views/projectManagement/components/otastatus.vue
+++ b/jero-web/src/views/projectManagement/components/otastatus.vue
@@ -8,16 +8,16 @@
{{ $t('softwareversion') }}
-
-
-
- {{ d.label }}
+
+
+ {{ d.plannedBpLaunchBatch }}
@@ -44,14 +44,14 @@
{{$t('Pendingapproval')}} |
{{$t('lock')}} |
{{$t('sendBack')}} |
- {{$t('notInvolved')}} |
+
- | {{matchForm.a}} |
- {{matchForm.a}} |
- {{matchForm.a}} |
- {{matchForm.a}} |
- {{matchForm.a}} |
+ {{matchForm.to_be_matched}} |
+ {{matchForm.to_be_approved}} |
+ {{matchForm.locked}} |
+ {{matchForm.rejected}} |
+
@@ -72,13 +72,13 @@
{{$t('componentReportHasBeenStored')}} |
- | {{authenticationForm.a}} |
- {{authenticationForm.a}} |
- {{authenticationForm.a}} |
- {{authenticationForm.a}} |
- {{authenticationForm.a}} |
- {{authenticationForm.a}} |
- {{authenticationForm.a}} |
+ {{authenticationForm.Not_start}} |
+ {{authenticationForm.In_progress}} |
+ {{authenticationForm.Test_passed}} |
+ {{authenticationForm.Test_failed}} |
+ {{authenticationForm.Component_report_not_submitted}} |
+ {{authenticationForm.Component_report_submitted}} |
+ {{authenticationForm.Component_report_has_been_stored}} |
@@ -109,8 +109,7 @@
data() {
return {
queryParam: {
- value: 1,
- ctype: ''
+ plannedBpLaunchBatch: ''
},
options: [],
collecting: [],
@@ -142,7 +141,7 @@
},
mounted() {
this.getoptions()
- this.getData()
+ // this.getData()
},
methods: {
@@ -150,19 +149,17 @@
},
getData() {
- let id = ''
- if (this.idList && this.idList.length > 0) {
- id = this.idList.join(',')
- } else {
- id = this.$route.query.id
+ let query = {
+ ...this.queryParam,
+ projectId:this.$route.query.id
}
- getAction(this.url.getProjectDetailsStatistics, { id: id }).then((res) => {
+ getAction('ota/otaManageApplyEO/getStatisticalStatus', query).then((res) => {
if (res.success) {
if (res.result) {
- let mainTopDataSource = res.result.taskToConfirmMap ? res.result.taskToConfirmMap.taskToConfirmMapList : []
- let mainEndDataSource = res.result.designComplianceMap ? res.result.designComplianceMap.designComplianceMapList : []
- this.matchForm = res.result.matchForm
- this.authenticationForm = res.result.authenticationForm
+ let mainTopDataSource = res.result.matchStatusMapList ? res.result.matchStatusMapList : []
+ let mainEndDataSource = res.result.attestationScheduleMapList ? res.result.attestationScheduleMapList : []
+ this.matchForm = res.result.matchStatusMap
+ this.authenticationForm = res.result.attestationScheduleMap
this.mainTopEcharts(mainTopDataSource)
this.mainEndEcharts(mainEndDataSource)
// this.mainRightEcharts(mainRightDataSource)
@@ -177,7 +174,8 @@
getAction('ota/otaManageApplyEO/getVdrListByProject', { projectId: id }).then((res) => {
if (res.success) {
this.options = res.result
- this.queryParam.ctype = this.options[0].value
+ this.queryParam.plannedBpLaunchBatch = this.options[0].plannedBpLaunchBatch
+ this.getData()
// this.getData(this.queryParam.ctype)
} else {
}
@@ -268,40 +266,40 @@
if (dataSource && dataSource.length > 0) {
this.dataSource = [{}]
dataSource.forEach(res => {
- if (res.taskAffirmStatus == 'Not started') {
+ if (res.matchStatus == 'to_be_matched') {
data.push({
- value: res.taskAffirmStatusCount,
- name: this.$t('notLaunch'),
- color: '#00B3BE',
- status: res.taskAffirmStatus
+ value: res.matchStatusCount,
+ name: this.$t('tobematched'),
+ color: '#5087EC',
+ status: res.matchStatus
})
- color.push('#00B3BE')
- } else if (res.taskAffirmStatus == 'List to confirm') {
+ color.push('#5087EC')
+ } else if (res.matchStatus == 'to_be_approved') {
data.push({
- value: res.taskAffirmStatusCount,
- name: this.$t('listToConfirm'),
- color: '#FDA71C',
- status: res.taskAffirmStatus
+ value: res.matchStatusCount,
+ name: this.$t('Pendingapproval'),
+ color: '#68BBC4',
+ status: res.matchStatus
})
- color.push('#FDA71C')
- } else if (res.taskAffirmStatus == 'Accepted') {
+ color.push('#68BBC4')
+ } else if (res.matchStatus == 'locked') {
data.push({
- value: res.taskAffirmStatusCount,
- name: this.$t('accept'),
- color: '#26BC4B',
- status: res.taskAffirmStatus
+ value: res.matchStatusCount,
+ name: this.$t('lock'),
+ color: '#58A55C',
+ status: res.matchStatus
})
- color.push('#26BC4B')
- } else if (res.taskAffirmStatus == 'Rejected') {
+ color.push('#58A55C')
+ } else if (res.matchStatus == 'rejected') {
data.push({
- value: res.taskAffirmStatusCount,
- name: this.$t('refuse'),
- color: '#E83030',
- status: res.taskAffirmStatus
+ value: res.matchStatusCount,
+ name: this.$t('sendBack'),
+ color: '#F2BD42',
+ status: res.matchStatus
})
- color.push('#E83030')
+ color.push('#F2BD42')
}
- this.mainTopNum += res.taskAffirmStatusCount
+ this.mainTopNum += res.matchStatusCount
})
}
this.getEcharts('main-top-Collect', this.$t('Matchingstatestatistics'), color, data)
@@ -313,41 +311,66 @@
this.mainTopNum = 0
if (dataSource && dataSource.length > 0) {
this.dataSource = [{}]
+ console.log(dataSource)
dataSource.forEach(res => {
- if (res.designFlowTaskStatus == 'Not started') {
+ if (res.attestationSchedule == 'Not start') {
data.push({
- value: res.designFlowTaskStatusCount,
- name: this.$t('notLaunch'),
- color: '#00B3BE',
- status: res.designFlowTaskStatus
+ value: res.attestationScheduleCount,
+ name: this.$t('Notatthe'),
+ color: '#BBBBBB',
+ status: res.attestationSchedule
})
- color.push('#00B3BE')
- } else if (res.designFlowTaskStatus == 'List to confirm') {
+ color.push('#BBBBBB')
+ } else if (res.attestationSchedule == 'In progress') {
data.push({
- value: res.designFlowTaskStatusCount,
- name: this.$t('listToConfirm'),
- color: '#FDA71C',
- status: res.designFlowTaskStatus
+ value: res.attestationScheduleCount,
+ name: this.$t('inProgress'),
+ color: '#F2BD42',
+ status: res.attestationSchedule
})
- color.push('#FDA71C')
- } else if (res.designFlowTaskStatus == 'Accepted') {
+ color.push('#F2BD42')
+ } else if (res.attestationSchedule == 'Test failed') {
data.push({
- value: res.designFlowTaskStatusCount,
- name: this.$t('accept'),
- color: '#26BC4B',
- status: res.designFlowTaskStatus
+ value: res.attestationScheduleCount,
+ name: this.$t('experimentFailed'),
+ color: '#D95040',
+ status: res.attestationSchedule
})
- color.push('#26BC4B')
- } else if (res.designFlowTaskStatus == 'Rejected') {
+ color.push('#D95040')
+ } else if (res.attestationSchedule == 'Component report not submitted') {
data.push({
- value: res.designFlowTaskStatusCount,
- name: this.$t('refuse'),
- color: '#E83030',
- status: res.designFlowTaskStatus
+ value: res.attestationScheduleCount,
+ name: this.$t('componentReportNotSubmitted'),
+ color: '#BBBBBB',
+ status: res.attestationSchedule
})
- color.push('#E83030')
+ color.push('#BBBBBB')
+ } else if (res.attestationSchedule == 'Component report submitted') {
+ data.push({
+ value: res.attestationScheduleCount,
+ name: this.$t('componentReportSubmitted'),
+ color: '#68BBC4',
+ status: res.attestationSchedule
+ })
+ color.push('#68BBC4')
+ } else if (res.attestationSchedule == 'Component report has been stored') {
+ data.push({
+ value: res.attestationScheduleCount,
+ name: this.$t('componentReportHasBeenStored'),
+ color: '#58A55C',
+ status: res.attestationSchedule
+ })
+ color.push('#58A55C')
+ }else if (res.attestationSchedule == 'Test passed') {
+ data.push({
+ value: res.attestationScheduleCount,
+ name: this.$t('experimentPassed'),
+ color: '#68BBC4',
+ status: res.attestationSchedule
+ })
+ color.push('#68BBC4')
}
- this.mainTopNum += res.designFlowTaskStatusCount
+ this.mainTopNum += res.attestationScheduleCount
})
}
this.getEcharts('main-end-Collect', this.$t('OTaauthenticationprogressstatistics'), color, data)
@@ -355,7 +378,14 @@
responsibility(item) {
this.$emit('currentStatus', item)
},
- jump(){
+ vdrcheckClick(){
+ this.options.forEach(item => {
+ if(item.plannedBpLaunchBatch == this.queryParam.plannedBpLaunchBatch){
+ this.vehicleTypeCode = item.appliedVehicleProject
+ this.softwareversion = item.plannedBpLaunchBatch
+ this.releaseName = item.updateDate
+ }
+ })
let newUrl = this.$router.resolve({
path:'/components/detil',
query:{