From c0a34e16479290faaecb3890b0cba3d1ac8249e8 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Sun, 20 Aug 2023 11:36:55 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E8=B7=B3=E8=BD=ACvd?= =?UTF-8?q?r?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../otaAuthentication/components/detil.vue | 7 +-- .../projectManagement/components/addModel.vue | 14 ++++++ .../components/otastatus.vue | 50 ++++++++----------- 5 files changed, 42 insertions(+), 31 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 6328fd9e6..a043b7605 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1949,4 +1949,5 @@ module.exports = { Pendingapproval:'To be approved', lock:'lock', datacannotbeedited:'This data cannot be edited', + Rematchornot:'Rematch or not', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index bcff0bd3a..445fa392b 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -3905,4 +3905,5 @@ module.exports = { Pendingapproval:'待审批', lock:'锁定', datacannotbeedited:'该数据不能进行编辑', + Rematchornot:'是否重新匹配', } \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue b/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue index 673724913..899d339e8 100644 --- a/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue +++ b/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue @@ -899,6 +899,9 @@ export default { } }, mounted() { + if(this.$route.query.vehicleTypeCode){ + this.vehicleTypeCode = this.$route.query.vehicleTypeCode + } getAction('/ota/otaManageApplyEO/getCarList', {}).then((res) => { if (res.success) { this.typeList = res.result @@ -939,8 +942,6 @@ export default { }, searchReset() { this.queryParam = {} - this.$route.query.serialNumber = '' - this.$route.query.flowStatus = '' this.pageNo = 1 this.getList() }, @@ -1011,7 +1012,7 @@ export default { } let exportName = name + ' ' + dateName + '.xlsx' let query = { - exportName: this.$route.query.infoNumber + ' ' + dateName, + exportName: exportName, idList: this.selectedRowKeys.join(','), } diff --git a/jero-web/src/views/projectManagement/components/addModel.vue b/jero-web/src/views/projectManagement/components/addModel.vue index 080bbc79f..e61d0533f 100644 --- a/jero-web/src/views/projectManagement/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/addModel.vue @@ -474,6 +474,7 @@ this.$message.success(this.$t('OperationSuccessful')) this.visible = false this.$emit('addModelList') + this.vdrClick() } else { this.$message.warning(res.message) this.confirmLoading = false @@ -482,6 +483,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') + } + }) + }, 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 95ac9dfcb..078ab189c 100644 --- a/jero-web/src/views/projectManagement/components/otastatus.vue +++ b/jero-web/src/views/projectManagement/components/otastatus.vue @@ -36,7 +36,7 @@
-
+
@@ -59,7 +59,7 @@
-
+
@@ -130,6 +130,9 @@ submitquantity: [], syncReportpercentage: [], syncReportquantity: [], + vehicleTypeCode:'', + softwareversion:'', + releaseName:'', url: { getProjectDetailsStatistics: '/project/projectLibraryBase/getProjectDetailsStatistics' }, @@ -158,7 +161,7 @@ let mainLeftDataSource = res.result.designComplianceMap ? res.result.designComplianceMap.designComplianceMapList : [] // let mainRightDataSource = res.result.verifyComplianceMap ? res.result.verifyComplianceMap.verifyComplianceMapList : [] this.mainTopEcharts(mainTopDataSource) - this.mainLeftEcharts(mainLeftDataSource) + this.mainEndEcharts(mainLeftDataSource) // this.mainRightEcharts(mainRightDataSource) } } @@ -184,30 +187,10 @@ }, getonChange(value) { - this.collectingpercentage = [] - this.collectingquantity = [] - this.notStartpercentage = [] - this.notStartquantity = [] - this.submitpercentage = [] - this.submitquantity = [] - this.syncReportpercentage = [] - this.syncReportquantity = [] this.getData(value) }, - onChange(value) { - this.collectingpercentage = [] - this.collectingquantity = [] - this.notStartpercentage = [] - this.notStartquantity = [] - this.submitpercentage = [] - this.submitquantity = [] - this.syncReportpercentage = [] - this.syncReportquantity = [] - this.getEcharts() - }, getEcharts(chart, title, color, data) { - console.log(data) var myChart = echarts.init(document.getElementById(chart)) myChart.setOption({ title: { @@ -323,10 +306,10 @@ this.mainTopNum += res.taskAffirmStatusCount }) } - this.getEcharts('main-left-Collect', this.$t('Matchingstatestatistics'), color, data) + this.getEcharts('main-top-Collect', this.$t('Matchingstatestatistics'), color, data) }, - mainLeftEcharts(dataSource) { + mainEndEcharts(dataSource) { let data = [] let color = [] this.mainTopNum = 0 @@ -369,10 +352,21 @@ this.mainTopNum += res.designFlowTaskStatusCount }) } - this.getEcharts('main-top-Collect', this.$t('OTaauthenticationprogressstatistics'), color, data) + this.getEcharts('main-end-Collect', this.$t('OTaauthenticationprogressstatistics'), color, data) }, responsibility(item) { this.$emit('currentStatus', item) + }, + jump(){ + let newUrl = this.$router.resolve({ + path:'/components/detil', + query:{ + vehicleTypeCode:this.vehicleTypeCode, + plannedBpLaunchBatch:this.softwareversion, + releaseName:this.releaseName + }, + }) + window.open(newUrl.href, '_blank') } } } @@ -393,7 +387,7 @@ border-radius: 6px; display: flex; - #main-left-Collect { + #main-top-Collect { width: 60%; height: 100%; padding: 24px 20px; @@ -406,7 +400,7 @@ padding: 24px; box-sizing: border-box; } - #main-top-Collect { + #main-end-Collect { width: 60%; height: 100%; padding: 24px 20px;