WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix_20230830'

Browse Source
This commit is contained in:
高嵩
2023-09-01 17:34:08 +08:00
parent 316e90f342 5978653c9a
commit 81f60dbbc2
7 changed files with 172 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/otamanagement/otaAuthentication/components/vdrDetial.vue
+20 -12
View File
@@ -14,7 +14,7 @@
<a-row :gutter="24">
<a-col :span="24">
<div class='detail-box'>
<span class='detail-text'>{{'VDR'}}</span>
<span class='detail-text' :title="'VDR'">{{'VDR'}}</span>
<span class="title-text-text" :title="form.vdr">
{{form.vdr}}</span>
</div>
@@ -24,7 +24,7 @@
<a-row :gutter="24">
<a-col :span="24">
<div class='detail-box'>
<span class='detail-text'>{{$t('theme')}}</span>
<span class='detail-text' :title="$t('theme')">{{$t('theme')}}</span>
<span class="title-text-text" :title="form.summary">
{{form.summary}}</span>
</div>
@@ -34,7 +34,7 @@
<a-row :gutter="24">
<a-col :span="24">
<div class='detail-box'>
<span class='detail-text' style='width:300px'>{{$t('authenticationimpact')}}</span>
<span class='detail-text' :title="$t('authenticationimpact')">{{$t('authenticationimpact')}}</span>
<span class="title-text-text" :title="form.homologationImpact">
{{form.homologationImpact}}</span>
</div>
@@ -44,7 +44,7 @@
<a-row :gutter="24">
<a-col :span="24">
<div class='detail-box'>
<span class='detail-text'>{{$t('influencestatute') + '-CN'}}</span>
<span class='detail-text' :title="$t('influencestatute') + '-CN'">{{$t('influencestatute') + '-CN'}}</span>
<span class="title-text-text" :title="form.impactCnHomo">
{{form.impactCnHomo}}</span>
</div>
@@ -54,33 +54,33 @@
<a-row :gutter="24">
<a-col :span="24">
<div class='detail-box'>
<span class='detail-text'>{{$t('influencestatute') + '-EU'}}</span>
<span class='detail-text' :title="$t('influencestatute') + '-EU'">{{$t('influencestatute') + '-EU'}}</span>
<span class="title-text-text" :title="form.impactEuHomo">
{{form.impactEuHomo}}</span>
</div>
</a-col>
</a-row>
<div style='margin-bottom: 10px;font-weight: bold;'>{{$t('applicationprojectversion')}}</div>
<div style='margin-bottom: 20px;font-weight: bold;' :title="$t('applicationprojectversion')">{{$t('applicationprojectversion')}}</div>
<div v-for='(item,index) in vdrList' :key='index'>
<a-row :gutter="24">
<a-col :span="24">
<div class='detail-box'>
<span class='detail-text' style="width: 300px">{{item.versionName}}</span>
<span class='detail-text' style="width: 300px" :title="item.versionName">{{item.versionName}}</span>
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
<div class='detail-box'>
<span class='detail-text'>{{$t('certificationStartOne')}}</span>
<span class='detail-text' :title="$t('certificationStartOne')">{{$t('certificationStartOne')}}</span>
<span class="title-text-text" :title="item.attestationStartTime?item.attestationStartTime:'--'">
{{item.attestationStartTime?item.attestationStartTime:'--'}}</span>
</div>
</a-col>
<a-col :span="12">
<div class='detail-box'>
<span class='detail-text'>{{$t('certificationdeclaration')}}</span>
<span class='detail-text' :title="$t('certificationdeclaration')">{{$t('certificationdeclaration')}}</span>
<span class="title-text-text" :title="item.certificationSubmission?item.certificationSubmission:'--'">
{{item.certificationSubmission?item.certificationSubmission:'--'}}</span>
</div>
@@ -89,14 +89,14 @@
<a-row :gutter="24">
<a-col :span="12">
<div class='detail-box'>
<span class='detail-text'>{{$t('certificationEnd')}}</span>
<span class='detail-text' :title="$t('certificationEnd')">{{$t('certificationEnd')}}</span>
<span class="title-text-text" :title="item.attestationEndTime?item.attestationEndTime:'--'">
{{item.attestationEndTime?item.attestationEndTime:'--'}}</span>
</div>
</a-col>
<a-col :span="12">
<div class='detail-box'>
<span class='detail-text'>{{$t('CertificationProgress')}}</span>
<span class='detail-text' :title="$t('CertificationProgress')">{{$t('CertificationProgress')}}</span>
<span class="title-text-text" :title="item.attestationSchedule?item.attestationSchedule:'--'">
{{item.attestationSchedule?item.attestationSchedule:'--'}}</span>
</div>
@@ -198,11 +198,19 @@ export default {
.detail-box{
width: 100%;
margin-bottom: 20px;
position: relative;
}
.detail-text{
display: inline-block;
width: 95px;
width: 153px;
font-weight: bold;
overflow: hidden; /*超出部分隐藏*/
text-overflow: ellipsis; /*超出部分省略号表示*/
white-space: nowrap; /*强制单行显示*/
display: inline-block; /*转换为行内块元素*/
}
.title-text-text{
position: absolute;
}
.title-text {
width: 250px;
jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
+1
View File
@@ -295,6 +295,7 @@
let _this = this
// 先调取接口判断是否有配置信息
if (item.isHistory == '1'){
item.projectName = this.$route.query.projectName
let newUrl = _this.$router.resolve({
path: '/ParameterItemCollection',
query: {it: item.id,
jero-web/src/views/projectManagement/components/otastatus.vue
+3 -4
View File
@@ -146,9 +146,6 @@
},
methods: {
vdrcheckClick(){
},
getData() {
let query = {
...this.queryParam,
@@ -175,7 +172,9 @@
getAction('ota/otaManageApplyEO/getVdrListByProject', { projectId: id }).then((res) => {
if (res.success) {
this.options = res.result
this.queryParam.plannedBpLaunchBatch = this.options[0].plannedBpLaunchBatch
if(this.options.length != 0 ){
this.queryParam.plannedBpLaunchBatch = this.options[0].plannedBpLaunchBatch
}
this.getData()
// this.getData(this.queryParam.ctype)
} else {