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

ota跳转修改

Browse Source
This commit is contained in:
zyx.net
2023-05-17 09:29:06 +08:00
parent c090ce607d
commit e16f94cd39
6 changed files with 415 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/common/lang/en-us.js
+1
View File
@@ -1834,4 +1834,5 @@ module.exports = {
deliveryTime:'Delivery Time', deliveryTime:'Delivery Time',
expectedDeliveryTime:'Expected Delivery Time', expectedDeliveryTime:'Expected Delivery Time',
changeAuthor:'Change Author', changeAuthor:'Change Author',
requireddataisnull:'Required data is null',
} }
jero-web/src/common/lang/zh-cn.js
+1
View File
@@ -1935,4 +1935,5 @@ module.exports = {
deliveryTime:'交付时间', deliveryTime:'交付时间',
expectedDeliveryTime:'预计交付时间', expectedDeliveryTime:'预计交付时间',
changeAuthor:'更改作者', changeAuthor:'更改作者',
requireddataisnull:'必填数据为空',
} }
jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
+4
View File
@@ -296,6 +296,10 @@ export default {
} }
}) })
}else{
// let otaflag = 3
this.$message.warning(this.$t('requireddataisnull'))
// localStorage.setItem('otaflag',otaflag)
} }
// else { // else {
// this.form.bapc = undefined // this.form.bapc = undefined
jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue
+9
View File
@@ -228,7 +228,16 @@ export default {
} else if(this.oldName == this.$t('informationaboutotherupgradetasks')){ } else if(this.oldName == this.$t('informationaboutotherupgradetasks')){
this.$refs.otherRef.save() this.$refs.otherRef.save()
} }
setTimeout(()=>{
let otaflag = localStorage.getItem('otaflag')
if(otaflag){
console.log(otaflag)
this.tabActive = this.$t('upgradetargetmodel')
this.oldName = this.$t('upgradetargetmodel')
}
this.oldName = tab this.oldName = tab
},1000)
localStorage.removeItem('otaflag')
}, },
handleToggleSearch() { handleToggleSearch() {
this.toggleSearchStatus = !this.toggleSearchStatus this.toggleSearchStatus = !this.toggleSearchStatus
jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
+56 -51
View File
@@ -158,13 +158,13 @@
<a-form-model-item class="itemModel"> <a-form-model-item class="itemModel">
<div style="display:flex;flex-wrap: nowrap;width: 100%;"> <div style="display:flex;flex-wrap: nowrap;width: 100%;">
<div style="width: 90%;margin-right: 20px;"> <div style="width: 90%;margin-right: 20px;">
<!-- <a-select class="box-input" style="width: 100%;" v-model="form.dllx1" allowClear :disabled="disabled" :placeholder="$t('PleaseSelect')" @change="changeSelect($event,target)">--> <!-- <a-select class="box-input" style="width: 100%;" v-model="form.dllx1" allowClear :disabled="disabled" :placeholder="$t('PleaseSelect')" @change="changeSelect($event,target)">-->
<!-- <a-select-option v-for="(item, key) in projectNameList1"--> <!-- <a-select-option v-for="(item, key) in projectNameList1"-->
<!-- :key="key"--> <!-- :key="key"-->
<!-- :value="item">--> <!-- :value="item">-->
<!-- {{ item }}--> <!-- {{ item }}-->
<!-- </a-select-option>--> <!-- </a-select-option>-->
<!-- </a-select>--> <!-- </a-select>-->
<j-dict-select-tag class="box-input" <j-dict-select-tag class="box-input"
:disabled="disabled" :disabled="disabled"
:dictCode="'vehicle_dynamic_type'" :dictCode="'vehicle_dynamic_type'"
@@ -183,13 +183,13 @@
</a-select-option> </a-select-option>
</a-select> </a-select>
<!-- <j-dict-select-tag class="box-input"--> <!-- <j-dict-select-tag class="box-input"-->
<!-- :disabled="disabled"--> <!-- :disabled="disabled"-->
<!-- :dictCode="dictCodedllx"--> <!-- :dictCode="dictCodedllx"-->
<!-- :placeholder="$t('PleaseSelect')"--> <!-- :placeholder="$t('PleaseSelect')"-->
<!-- :type="'select'"--> <!-- :type="'select'"-->
<!-- :triggerChange="false"--> <!-- :triggerChange="false"-->
<!-- v-model="form.dllx2"/>--> <!-- v-model="form.dllx2"/>-->
</div> </div>
</div> </div>
</a-form-model-item> </a-form-model-item>
@@ -237,11 +237,11 @@
</template> </template>
<script> <script>
import { getAction, postAction, deleteAction,downloadFile } from '@/api/manage' import { getAction, postAction, deleteAction,downloadFile } from '@/api/manage'
import ImportFile from '@/components/ImportFileData/index' import ImportFile from '@/components/ImportFileData/index'
import { message } from 'ant-design-vue' import { message } from 'ant-design-vue'
export default { export default {
name: 'basicInformation', name: 'basicInformation',
components:{ components:{
ImportFile ImportFile
@@ -412,8 +412,13 @@ import { message } from 'ant-design-vue'
}else{ }else{
this.$message.warning(res.message) this.$message.warning(res.message)
this.flag = 1 this.flag = 1
localStorage.setItem('otaflag',this.flag)
} }
}) })
}else{
// let otaflag = 3
this.$message.warning(this.$t('requireddataisnull'))
// localStorage.setItem('otaflag',otaflag)
} }
}) })
}, },
@@ -457,23 +462,23 @@ import { message } from 'ant-design-vue'
this.$forceUpdate() this.$forceUpdate()
} }
} }
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@import'~@assets/less/common.less'; @import'~@assets/less/common.less';
.box { .box {
padding: 0 24px 24px 24px; padding: 0 24px 24px 24px;
box-sizing: border-box; box-sizing: border-box;
} }
.box-title-text-add { .box-title-text-add {
line-height: 1.4; line-height: 1.4;
display: flex; display: flex;
align-items: center; align-items: center;
} }
.title-text-add { .title-text-add {
width: 114px; width: 114px;
text-align: right; text-align: right;
display: inline-block; display: inline-block;
@@ -486,9 +491,9 @@ import { message } from 'ant-design-vue'
height: 42px; height: 42px;
//line-height: 42px; //line-height: 42px;
margin-top: 3px; margin-top: 3px;
} }
.title-text-add-input { .title-text-add-input {
width: 80%; width: 80%;
display: inline-block; display: inline-block;
font-weight: 500; font-weight: 500;
@@ -501,54 +506,54 @@ import { message } from 'ant-design-vue'
//line-height: 42px; //line-height: 42px;
margin-top: 3px; margin-top: 3px;
margin-bottom: 20px; margin-bottom: 20px;
} }
.title-text-text { .title-text-text {
margin-top: 9px; margin-top: 9px;
} }
.itemModel { .itemModel {
width: calc(100% - 130px); width: calc(100% - 130px);
display: inline-block; display: inline-block;
margin-top: 2px; margin-top: 2px;
} }
// .itemModel-input{ // .itemModel-input{
// width: calc(100% + 10px); // width: calc(100% + 10px);
// display: inline-block; // display: inline-block;
// margin-top: 2px; // margin-top: 2px;
// } // }
.box-input { .box-input {
display: inline-block; display: inline-block;
width: 100%; width: 100%;
height: 38px; height: 38px;
margin-top: 2px; margin-top: 2px;
} }
.formAdd { .formAdd {
margin: 0 auto; margin: 0 auto;
width: 670px; width: 670px;
} }
.bootom-button{ .bootom-button{
text-align: center!important; text-align: center!important;
} }
// /deep/ .ant-input{ // /deep/ .ant-input{
// width: calc(100%+20px); // width: calc(100%+20px);
// } // }
.Required { .Required {
color: red; color: red;
margin-right: 3px; margin-right: 3px;
} }
.plus{ .plus{
margin-top: 5px; margin-top: 5px;
line-height: 1.2; line-height: 1.2;
} }
.plus2{ .plus2{
width: 134px; width: 134px;
margin-top: 5px; margin-top: 5px;
line-height: 1.2; line-height: 1.2;
} }
.plus3{ .plus3{
word-break: break-word; word-break: break-word;
} }
</style> </style>
jero-web/src/views/otamanagement/vehicleinformation/index.vue
+17 -5
View File
@@ -7,11 +7,11 @@
<a-icon type="form"/> <a-icon type="form"/>
{{$t('fillintherecord')}} {{$t('fillintherecord')}}
</div> </div>
<!-- <div @click="historicalrecordClick"--> <!-- <div @click="historicalrecordClick"-->
<!-- class="operator-text">--> <!-- class="operator-text">-->
<!-- <a-icon type="copy"/>--> <!-- <a-icon type="copy"/>-->
<!-- {{$t('historicalrecord')}}--> <!-- {{$t('historicalrecord')}}-->
<!-- </div>--> <!-- </div>-->
</div> </div>
<a-tabs class="tabs" v-model="tabActive" @change="callback" @tabClick="tabClick"> <a-tabs class="tabs" v-model="tabActive" @change="callback" @tabClick="tabClick">
<a-tab-pane :key="$t('basicinformationofvehicletype')" :tab="$t('basicinformationofvehicletype')"> <a-tab-pane :key="$t('basicinformationofvehicletype')" :tab="$t('basicinformationofvehicletype')">
@@ -216,7 +216,9 @@ export default {
tabClick(tab,event){ tabClick(tab,event){
this.tabActive=tab this.tabActive=tab
if(this.oldName == this.$t('basicinformationofvehicletype')){ if(this.oldName == this.$t('basicinformationofvehicletype')){
this.$refs.dealtWithRef.save() this.$refs.dealtWithRef.save()
} else if(this.oldName == this.$t('onlineupgraderequirements')){ } else if(this.oldName == this.$t('onlineupgraderequirements')){
this.$refs.doneListRef.save() this.$refs.doneListRef.save()
} else if(this.oldName == this.$t('safetymeasure')){ } else if(this.oldName == this.$t('safetymeasure')){
@@ -230,7 +232,17 @@ export default {
} else if(this.oldName == this.$t('other')){ } else if(this.oldName == this.$t('other')){
this.$refs.otherRef.save() this.$refs.otherRef.save()
} }
setTimeout(()=>{
let otaflag = localStorage.getItem('otaflag')
if(otaflag){
console.log(otaflag)
this.tabActive = this.$t('basicinformationofvehicletype')
this.oldName = this.$t('basicinformationofvehicletype')
}
this.oldName = tab this.oldName = tab
},1000)
localStorage.removeItem('otaflag')
}, },
handleToggleSearch() { handleToggleSearch() {
this.toggleSearchStatus = !this.toggleSearchStatus this.toggleSearchStatus = !this.toggleSearchStatus