Merge remote-tracking branch 'origin/dev_20230808_OTA' into dev_20230808_OTA

This commit is contained in:
高嵩
2023-08-24 10:36:24 +08:00
3 changed files with 6 additions and 6 deletions
@@ -77,7 +77,7 @@
<div style='display:flex'> <div style='display:flex'>
<div> <div>
<span style='font-weight: 900;font-size: 20px'>{{ $route.query.plannedBpLaunchBatch }}</span> <span style='font-weight: 900;font-size: 20px'>{{ $route.query.plannedBpLaunchBatch }}</span>
<span style='margin-left:5px'>{{ $t('softwarereleasetime') }}:{{$route.query.releaseName}}</span> <span style='margin-left:5px'>{{ $t('softwarereleasetime') }}:{{$route.query.releaseDate}}</span>
</div> </div>
<div style='margin-left: 10px;width: 300px;'> <div style='margin-left: 10px;width: 300px;'>
<a-select :placeholder="$t('PleaseSelect')" <a-select :placeholder="$t('PleaseSelect')"
@@ -112,7 +112,7 @@
class="box-input" class="box-input"
@change="onChange" @change="onChange"
style='margin-left: -1px' style='margin-left: -1px'
v-model="queryParam.releaseName" v-model="queryParam.releaseDate"
:disabled="false"/> :disabled="false"/>
</div> </div>
</a-col> </a-col>
@@ -239,7 +239,7 @@ export default {
align: 'left', align: 'left',
width: 170, width: 170,
ellipsis: true, ellipsis: true,
dataIndex: 'releaseName' dataIndex: 'releaseDate'
}, },
{ {
title: this.$t('operation'), title: this.$t('operation'),
@@ -354,13 +354,13 @@ export default {
}) })
}, },
onChange(value, dateString) { onChange(value, dateString) {
if (this.queryParam.releaseName && this.queryParam.releaseName.length > 0) { if (this.queryParam.releaseDate && this.queryParam.releaseDate.length > 0) {
let dateOne = moment(dateString[0]).format('YYYY-MM-DD') let dateOne = moment(dateString[0]).format('YYYY-MM-DD')
let dateTwo = moment(dateString[1]).format('YYYY-MM-DD') let dateTwo = moment(dateString[1]).format('YYYY-MM-DD')
this.queryParam.softwareIssueTimeStart = dateOne this.queryParam.softwareIssueTimeStart = dateOne
this.queryParam.softwareIssueTimeEnd = dateTwo this.queryParam.softwareIssueTimeEnd = dateTwo
} else { } else {
this.queryParam.releaseName = [] this.queryParam.releaseDate = []
// this.queryParamOne[item + '_name'] = [] // this.queryParamOne[item + '_name'] = []
} }
}, },
@@ -392,7 +392,7 @@
query:{ query:{
vehicleTypeCode:this.vehicleTypeCode, vehicleTypeCode:this.vehicleTypeCode,
plannedBpLaunchBatch:this.softwareversion, plannedBpLaunchBatch:this.softwareversion,
releaseName:this.releaseName releaseDate:this.releaseName
}, },
}) })
window.open(newUrl.href, '_blank') window.open(newUrl.href, '_blank')