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

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

Browse Source
This commit is contained in:
zyx.net
2023-03-30 09:15:49 +08:00
parent c1d0d85681 67650edb5b
commit 4064c50c35
41 changed files with 1976 additions and 511 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
+22 -22
View File
@@ -10,7 +10,7 @@
{{$t('templateDownload')}}
</div>
</div>
<a-spin :spinning="confirmLoading">
<a-form-model class="formAdd" ref="ruleForm" :model="form" :rules="rules">
<a-row :gutter="24">
@@ -20,7 +20,7 @@
<span class="title-text-text" :title="$t('selectTheVehicleTemplate')">{{$t('selectTheVehicleTemplate')}}</span>
</div>
<a-form-model-item class="itemModel" prop="dutyTerritory">
<a-select :disabled="disabled" class="box-input" v-model="form.cxmb" allowClear :placeholder="$t('PleaseSelect')" @change="update">
<a-select :disabled="disabled" class="box-input" v-model="form.cxmb" allowClear :placeholder="$t('PleaseSelect')" @change="update">
<a-select-option v-for="(item , key ) in selectListMb" :key="key" :value="item.id" >
{{ item.cpdjbh }}
</a-select-option>
@@ -59,7 +59,7 @@
</div>
</div>
</a-col>
<a-col :span="24">
<div class="box-title-text-add">
<div class="title-text-add plus">
@@ -82,7 +82,7 @@
</div>
<a-form-model-item class="itemModel">
<a-input disabled class="box-input" :placeholder="$t('pleaseEnter')" :title='form.cpsb' v-model="form.cpsb" :max-length="50"></a-input>
</a-form-model-item>
</div>
</a-col>
@@ -93,7 +93,7 @@
</div>
<a-form-model-item class="itemModel">
<a-input disabled class="box-input" :placeholder="$t('pleaseEnter')" :title='form.cpmc' v-model="form.cpmc" :max-length="50"></a-input>
</a-form-model-item>
</div>
</a-col>
@@ -104,7 +104,7 @@
</div>
<a-form-model-item class="itemModel">
<a-input disabled class="box-input" :placeholder="$t('pleaseEnter')" :title='form.cpxh' v-model="form.cpxh" :max-length="50"></a-input>
</a-form-model-item>
</div>
</a-col>
@@ -143,7 +143,7 @@
</a-form-model-item>
</div>
</a-col>
</a-row>
</a-form-model>
</a-spin>
@@ -192,7 +192,7 @@ import ImportFile from '@/components/ImportFileData/index'
this.getSelect()
this.getData()
},
methods: {
// 模板下载
handleModule() {
@@ -220,7 +220,7 @@ import ImportFile from '@/components/ImportFileData/index'
this.form=res.result
if(res.result.dllx1==null){
this.form.dllx1=undefined
}
if(res.result.dllx2==null){
this.form.dllx2=undefined
@@ -233,7 +233,7 @@ import ImportFile from '@/components/ImportFileData/index'
}
this.$forceUpdate()
}
}
})
},
@@ -258,7 +258,7 @@ import ImportFile from '@/components/ImportFileData/index'
})
}
})
},
next(){
this.save()
@@ -266,8 +266,8 @@ import ImportFile from '@/components/ImportFileData/index'
if(valid){
this.$emit('basicInformationForm')
}})
},
getSelect(){
getAction('/ota/otaBaCxList/list').then(res=>{
@@ -279,7 +279,7 @@ import ImportFile from '@/components/ImportFileData/index'
obj=item
this.selectListPc.push(obj)
}
})
}
})
@@ -306,12 +306,12 @@ import ImportFile from '@/components/ImportFileData/index'
}else{
this. projectNameList2=['其他']
}
},
changeId(value,option){
this.selectListPc.map(item=>{
if(item.id==value){
this.form.cpsb = item.cpsb
this.form.cpsb = item.cpsb
this.form.cpmc = item.cpmc
this.form.cpxh = item.cpxh
getAction('/ota/otaBaCxJbxx/queryByOtaId',{otaIdT:'',otaId:item.id}).then(res=>{
@@ -338,9 +338,9 @@ import ImportFile from '@/components/ImportFileData/index'
}
.box-title-text-add {
line-height: 1.4;
//line-height: 1.4;
display: flex;
align-items: center;
}
.title-text-add {
@@ -354,7 +354,7 @@ import ImportFile from '@/components/ImportFileData/index'
// text-overflow: ellipsis;
// white-space: nowrap;
height: 42px;
line-height: 42px;
//line-height: 20px;
margin-top: 3px;
}
@@ -368,7 +368,7 @@ import ImportFile from '@/components/ImportFileData/index'
text-overflow: ellipsis;
white-space: nowrap;
height: 42px;
line-height: 42px;
//line-height: 42px;
margin-top: 3px;
margin-bottom: 20px;
}
@@ -400,11 +400,11 @@ import ImportFile from '@/components/ImportFileData/index'
}
.plus{
margin-top: 5px;
line-height: 1.4 !important;
line-height: 1.2;
}
.plus2{
word-break: break-all;
line-height: 1.3;
line-height: 1.2;
}
.Required {
color: red;
jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue
+14 -10
View File
@@ -145,7 +145,7 @@
</div>
</a-col>
<a-col :span="24">
<div class="box-title-text-add">
<div class="plus">
<div class="title-text-add">
<span class="title-text-text" :title="$t('usernotificationmode')">{{$t('usernotificationmode')}}</span>
</div>
@@ -160,7 +160,7 @@
</div>
</a-col>
<a-col :span="24">
<div class="box-title-text-add">
<div class="plus">
<div class="title-text-add">
<span class="title-text-text" :title="$t('userinformstherelevantfile')">{{$t('userinformstherelevantfile')}}</span>
</div>
@@ -246,7 +246,7 @@ export default {
})
},
getData(){
let otaIdT=localStorage.getItem('otaIdT')
if(otaIdT==null){
otaIdT=''
@@ -257,11 +257,11 @@ export default {
}
getAction('/ota/otaBaSjGgnrfs/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{
if(res.code == 200){
this.formInline= res.result ==null ? {
sjky:'车辆解闭锁功能可用，但不可驾驶',
sjbkygn:'除解闭锁均不可用'
} :res.result
} :res.result
this.formInline.id=res.result.id
this.$forceUpdate()
}
@@ -305,9 +305,9 @@ export default {
}
.box-title-text-add {
line-height: 1.4;
//line-height: 1.4;
display: flex;
align-items: center;
}
h1{
font-weight: 700;
@@ -322,9 +322,9 @@ h1{
margin-right: 16px;
//overflow: hidden;
//text-overflow: ellipsis;
white-space: nowrap;
//white-space: nowrap;
height: 42px;
line-height: 42px;
//line-height: 42px;
margin-top: 3px;
}
@@ -338,7 +338,7 @@ h1{
text-overflow: ellipsis;
white-space: nowrap;
height: 42px;
line-height: 42px;
//line-height: 42px;
margin-top: 3px;
margin-bottom: 20px;
}
@@ -371,4 +371,8 @@ h1{
left: 40%;
text-align: center!important;
}
.plus{
display: flex;
}
</style>
jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
+28 -25
View File
@@ -19,7 +19,7 @@
<span class="title-text-text" :title="$t('selectTheVehicleTemplate')">{{$t('selectTheVehicleTemplate')}}</span>
</div>
<a-form-model-item class="itemModel" prop="dutyTerritory">
<a-select :disabled="disabled" class="box-input" v-model="form.cxmb" allowClear :placeholder="$t('PleaseSelect')" @change="changeId">
<a-select-option v-for="(item , key ) in selectList" :key="key" :value="item.id" >
{{ item.value }}
@@ -34,7 +34,7 @@
<span class="title-text-text" :title="$t('theNameOfFirm')">{{$t('theNameOfFirm')}}</span>
</div>
<a-form-model-item class="itemModel">
<a-input
<a-input
:max-length="50"
:disabled="disabled"
class="box-input"
@@ -52,12 +52,12 @@
<span class="title-text-text" :title="$t('registrationnumber')">{{$t('registrationnumber')}}</span>
</div>
<a-form-model-item class="itemModel" prop="djbh">
<a-input
<a-input
:max-length="50"
:disabled="disabled"
:title='form.djbh'
class="box-input"
class="box-input"
:placeholder="$t('pleaseEnter')"
v-model.trim="form.djbh">
</a-input>
@@ -87,7 +87,7 @@
<span class="title-text-text" :title="$t('noticebatch')">{{$t('noticebatch')}}</span>
</div>
<a-form-model-item class="itemModel" prop="dutyTerritory">
<a-input
<a-input
:max-length="500"
:disabled="disabled"
:title='form.ggpc'
@@ -104,7 +104,7 @@
<span class="title-text-text" :title="$t('producttrademark')">{{$t('producttrademark')}}</span>
</div>
<a-form-model-item class="itemModel">
<a-input
<a-input
:max-length="50"
:disabled="disabled"
:title='form.cpsb'
@@ -121,7 +121,7 @@
<span class="title-text-text" :title="$t('productname')">{{$t('productname')}}</span>
</div>
<a-form-model-item class="itemModel">
<a-input
<a-input
:max-length="50"
:disabled="disabled"
:title='form.cpmc'
@@ -130,7 +130,7 @@
v-model="form.cpmc">
</a-input>
</a-form-model-item>
</div>
</a-col>
<a-col :span="24">
@@ -139,7 +139,7 @@
<span class="title-text-text" :title="$t('productModel')">{{$t('productModel')}}</span>
</div>
<a-form-model-item class="itemModel">
<a-input
<a-input
:max-length="50"
:disabled="disabled"
:title='form.cpxh'
@@ -153,7 +153,7 @@
<a-col :span="24">
<div class="box-title-text-add">
<div class="title-text-add">
<span class="title-text-text" :title="$t('Vehicledynamictype')">{{$t('Vehicledynamictype')}}</span>
<span class="title-text-text plus3" :title="$t('Vehicledynamictype')">{{$t('Vehicledynamictype')}}</span>
</div>
<a-form-model-item class="itemModel" style="width: 38%">
<a-select class="box-input" v-model="form.dllx1" :disabled="disabled" :placeholder="$t('PleaseSelect')" @change="changeSelect($event,target)">
@@ -179,7 +179,7 @@
</div>
</a-col>
<a-col :span="24">
<div class="box-title-text-add">
<div>
<div class="title-text-add plus">
<span class="title-text-text " :title="$t('communicationTerminal')">{{$t('communicationTerminal')}}</span>
</div>
@@ -195,7 +195,7 @@
</div>
</a-col>
<a-col :span="24">
<div class="box-title-text-add">
<div>
<div class="title-text-add plus">
<span class="title-text-text" :title="$t('otaUpgradeManagementSystem')">{{$t('otaUpgradeManagementSystem')}}</span>
</div>
@@ -261,7 +261,7 @@ import { message } from 'ant-design-vue'
otaId:'',
rules:{
djbh:[
{
{
required: true,
message:this.$t('registrationnumber')+this.$t('cannotEmpty'),
trigger:'blur'
@@ -280,7 +280,7 @@ import { message } from 'ant-design-vue'
localStorage.removeItem('otaId')
localStorage.removeItem('otaIdT')
localStorage.setItem('otaIdT',value)
this.getData()
},
// 模板下载
@@ -344,8 +344,8 @@ import { message } from 'ant-design-vue'
this.$forceUpdate()
}
})
},
next(){
this.$refs.ruleForm.validate(valid=>{
@@ -354,10 +354,10 @@ import { message } from 'ant-design-vue'
setTimeout(()=>{
this.$emit('basicInformationForm')
},1000)
}
})
},
save(){
this.$refs.ruleForm.validate(valid=>{
@@ -387,7 +387,7 @@ import { message } from 'ant-design-vue'
}else{
this. projectNameList2=['其他']
}
},
update(){
this.$forceUpdate()
@@ -406,7 +406,7 @@ import { message } from 'ant-design-vue'
.box-title-text-add {
line-height: 1.4;
display: flex;
align-items: center;
}
.title-text-add {
@@ -420,7 +420,7 @@ import { message } from 'ant-design-vue'
// text-overflow: ellipsis;
// white-space: nowrap;
height: 42px;
line-height: 42px;
//line-height: 42px;
margin-top: 3px;
}
@@ -434,7 +434,7 @@ import { message } from 'ant-design-vue'
text-overflow: ellipsis;
white-space: nowrap;
height: 42px;
line-height: 42px;
//line-height: 42px;
margin-top: 3px;
margin-bottom: 20px;
}
@@ -477,11 +477,14 @@ import { message } from 'ant-design-vue'
}
.plus{
margin-top: 5px;
line-height: 1.4 !important;
line-height: 1.2;
}
.plus2{
width: 134px;
margin-top: 5px;
line-height: 1.4 !important;
line-height: 1.2;
}
.plus3{
word-break: break-word;
}
</style>