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

修改

Browse Source
This commit is contained in:
yuekuo
2023-03-25 16:22:31 +08:00
parent b3271d6aae
commit a7ee02e97a
10 changed files with 96 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
+26 -14
View File
@@ -226,7 +226,7 @@
name: 'basicInformation', name: 'basicInformation',
components:{ components:{
}, },
props:['otaId'], // props:['otaId'],
data() { data() {
return { return {
confirmLoading: false, confirmLoading: false,
@@ -261,30 +261,42 @@
}) })
}, },
getData(){ getData(){
// if(this.otaId && this.otaId !=''){
console.log('otaId',this.otaId); if(localStorage.getItem('otaId') == null){
getAction('/ota/otaBaCxJbxx/queryByOtaId',this.otaId).then(res=>{ return
}else{
getAction('/ota/otaBaCxJbxx/queryByOtaId',{otaId:localStorage.getItem('otaId')}).then(res=>{
if(res.code == 200){ if(res.code == 200){
this.form=res.result
if(res.result.dllx1 == null ){
res.result.dllx1 = undefined
}
if(res.result.dllx2 == null){
res.result.dllx2 = undefined
}
this.changeSelect()
} }
}) })
// }
}
}, },
next(){ next(){
this.save() this.save()
this.$emit('basicInformationForm',this.otaId) setTimeout(()=>{
this.$emit('basicInformationForm')
},300)
}, },
save(){ async save(){
postAction('/ota/otaBaCxJbxx/add',{otaId:localStorage.getItem('otaId'),...this.form}).then( res => {
postAction('/ota/otaBaCxJbxx/add',{otaId:this.otaId,...this.form}).then( res => { if(res.code == 200){
if(res.code == 200){ localStorage.setItem('otaId', res.result.otaId)
this.otaId = res.result.otaId
} }
}) })
}, },
changeSelect(target){ changeSelect(target){
this.form.Vehicledynamictype2=undefined this.form.dllx2=undefined
if(target =='传统动力汽车'){ if(target =='传统动力汽车'){
this. projectNameList2=['汽油','柴油'] this. projectNameList2=['汽油','柴油']
}else if (target =='节能汽车'){ }else if (target =='节能汽车'){
jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
+4 -8
View File
@@ -111,7 +111,6 @@
components:{ components:{
uploadFile uploadFile
}, },
props:['otaId'],
data() { data() {
return { return {
dataSource: [ dataSource: [
@@ -311,25 +310,22 @@
}) })
}, },
getData(){ getData(){
if(this.otaId && this.otaId !=''){ getAction('/ota/otaBaCxKsjjsmccs/queryByOtaId',{otaId:localStorage.getItem('otaId')}).then(res=>{
getAction('/ota/otaBaCxKsjjsmccs/queryByOtaId',this.otaId).then(res=>{
console.log(res); console.log(res);
}) })
}
}, },
save(){ save(){
postAction('/ota/otaBaCxKsjjsmccs/add',{otaId:this.otaId,list:this.dataSource}).then(res =>{ postAction('/ota/otaBaCxKsjjsmccs/add',{otaId:localStorage.getItem('otaId'),list:this.dataSource}).then(res =>{
console.log(res); console.log(res);
}) })
}, },
last(){ last(){
this.save() this.save()
this.$emit('beupgradedonlineup',this.otaId) this.$emit('beupgradedonlineup')
}, },
next(){ next(){
this.save() this.save()
this.$emit('beupgradedonlinedown',this.otaId) this.$emit('beupgradedonlinedown')
}, },
uploadSuccess(data) { uploadSuccess(data) {
let attIdList = [] let attIdList = []
jero-web/src/views/otamanagement/vehicleinformation/components/other.vue
+4 -5
View File
@@ -51,8 +51,7 @@ export default {
}, },
methods: { methods: {
getData(){ getData(){
if(this.otaId && this.otaId !=''){ getAction('/ota/otaBaCxQt/queryByOtaId',{otaId:localStorage.getItem('otaId')}).then(res=>{
getAction('/ota/otaBaCxQt/queryByOtaId',this.otaId).then(res=>{
console.log(res); console.log(res);
}) })
} }
@@ -61,7 +60,7 @@ export default {
save(){ save(){
this.$refs.ruleForm.validate( valid =>{ this.$refs.ruleForm.validate( valid =>{
if (valid) { if (valid) {
postAction('/ota/otaBaCxQt/add',{otaId:this.otaId,...this.queryParam}).then(res=>{ postAction('/ota/otaBaCxQt/add',{otaId:localStorage.getItem('otaId'),...this.queryParam}).then(res=>{
console.log(res); console.log(res);
}) })
} else { } else {
@@ -71,13 +70,13 @@ export default {
}, },
last(){ last(){
this.save() this.save()
this.$emit('otherup',this.queryParam) this.$emit('otherup')
}, },
submit(){ submit(){
this.save() this.save()
}, },
} }
}
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue
+4 -6
View File
@@ -858,11 +858,9 @@ export default {
}, },
methods: { methods: {
getData(){ getData(){
if(this.otaId && this.otaId !=''){ getAction('/ota/otaBaCxJsfzbacs/queryByOtaId',{otaId:localStorage.getItem('otaId')}).then(res=>{
getAction('/ota/otaBaCxJsfzbacs/queryByOtaId',this.otaId).then(res=>{
console.log(res); console.log(res);
}) })
}
}, },
click(value){ click(value){
@@ -917,7 +915,7 @@ export default {
arr.push(kval) arr.push(kval)
}) })
postAction('/ota/otaBaCxJsfzbacs/add',{ postAction('/ota/otaBaCxJsfzbacs/add',{
otaId:this.otaId, otaId:localStorage.getItem('otaId'),
bj:this.query, bj:this.query,
cs:arr, cs:arr,
kzq:this.dataSourceList kzq:this.dataSourceList
@@ -928,11 +926,11 @@ export default {
}, },
last(){ last(){
this.save() this.save()
this.$emit('recordparametersup',this.otaId) this.$emit('recordparametersup')
}, },
next(){ next(){
this.save() this.save()
this.$emit('recordparametersdown',this.otaId) this.$emit('recordparametersdown')
}, },
// 合并单元格 // 合并单元格
mergeCellsSlot(record, rowIndex) { mergeCellsSlot(record, rowIndex) {
jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue
+12 -7
View File
@@ -167,11 +167,14 @@
}, },
methods: { methods: {
getData(){ getData(){
if(this.otaId && this.otaId !=''){ getAction('/ota/otaBaCxAqcs/queryByOtaId',{otaId:localStorage.getItem('otaId')}).then(res=>{
getAction('/ota/otaBaCxAqcs/queryByOtaId',this.otaId).then(res=>{ if(res.code == 200){
console.log(res); this.dataSource[0].info =res.result.bhjz
this.dataSource[1].info =res.result.fsxjz
this.dataSource[2].info= res.result.sjsbcs
this.dataSource[3].info=res.result.xxaqjz
}
}) })
}
}, },
click(value){ click(value){
@@ -225,7 +228,7 @@
}, },
save(){ save(){
let obj={} let obj={}
obj.otaId=this.otaId, obj.otaId=localStorage.getItem('otaId'),
obj.bhjz = this.dataSource[0].info obj.bhjz = this.dataSource[0].info
obj.fsxjz= this.dataSource[1].info obj.fsxjz= this.dataSource[1].info
obj.sjsbcs = this.dataSource[2].info obj.sjsbcs = this.dataSource[2].info
@@ -235,10 +238,12 @@
}) })
}, },
last(){ last(){
this.$emit('safetyPrecautionsup',this.otaId) this.save()
this.$emit('safetyPrecautionsup')
}, },
next(){ next(){
this.$emit('safetyPrecautionsdown',this.otaId) this.save()
this.$emit('safetyPrecautionsdown')
}, },
} }
} }
jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue
+16 -9
View File
@@ -41,7 +41,6 @@ export default {
components: { components: {
uploadFile uploadFile
}, },
props:['otaId'],
data() { data() {
return { return {
dataSource: [ dataSource: [
@@ -200,11 +199,20 @@ export default {
methods: { methods: {
getData(){ getData(){
// if(this.otaId && this.otaId !=''){ console.log(localStorage.getItem('otaId'));
getAction('/ota/otaBaCxZxsjyq/queryByOtaId',this.otaId).then(res=>{ getAction('/ota/otaBaCxZxsjyq/queryByOtaId',{otaId:localStorage.getItem('otaId')}).then(res=>{
console.log(res); this.dataSource[0].relevantverification =res.result.bhsjb
this.dataSource[1].relevantverification=res.result.bhclbb
this.dataSource[2].relevantverification=res.result.clgxnl
this.dataSource[3].relevantverification=res.result.clsjtj
this.dataSource[4].relevantverification=res.result.clsjdl
this.dataSource[5].relevantverification=res.result.sjbhaq
this.dataSource[6].relevantverification=res.result.sjantj
this.dataSource[7].relevantverification=res.result.sjsbaq
this.dataSource[8].relevantverification=res.result.sjgg
this.dataSource[9].relevantverification=res.result.sjzt
this.$forceUpdate()
}) })
// }
}, },
click(value) { click(value) {
@@ -252,8 +260,7 @@ export default {
}, },
save() { save() {
let obj = {} let obj = {}
obj.otaId=this.otaId obj.otaId=localStorage.getItem('otaId')
console.log(this.otaId);
obj.bhsjb = this.dataSource[0].relevantverification obj.bhsjb = this.dataSource[0].relevantverification
obj.bhclbb = this.dataSource[1].relevantverification obj.bhclbb = this.dataSource[1].relevantverification
obj.clgxnl = this.dataSource[2].relevantverification obj.clgxnl = this.dataSource[2].relevantverification
@@ -270,11 +277,11 @@ export default {
}, },
last() { last() {
this.save() this.save()
this.$emit('upgradeRequirementsup',this.otaId) this.$emit('upgradeRequirementsup')
}, },
next() { next() {
this.save() this.save()
this.$emit('upgradeRequirementsdown',this.otaId) this.$emit('upgradeRequirementsdown')
} }
} }
} }
jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue
+5 -7
View File
@@ -82,7 +82,7 @@
<div> <div>
<a-button @click="clickButtonToUpload" type="primary">{{$t('uploadattachment')}}</a-button> <a-button @click="clickButtonToUpload" type="primary">{{$t('uploadattachment')}}</a-button>
<p>注:附件包括测试项目清单、测试报告．测试标准或技术规范</p> <p>注:附件包括测试项目清单、测试报告．测试标准或技术规范</p>
<p>&nbsp;&nbsp;&nbsp;&nbsp;支持doc/docx/pdf格式,大小50M以内1</p> <p>&nbsp;&nbsp;&nbsp;&nbsp;支持doc/docx/pdf格式,大小50M以内</p>
</div> </div>
<div class="bootom-button"> <div class="bootom-button">
@@ -272,11 +272,9 @@
}, },
methods: { methods: {
getData(){ getData(){
if(this.otaId && this.otaId !=''){ getAction('/ota/otaBaCxKsjxtmccs/queryByOtaId',{otaId:localStorage.getItem('otaId')}).then(res=>{
getAction('/ota/otaBaCxKsjxtmccs/queryByOtaId',this.otaId).then(res=>{
console.log(res); console.log(res);
}) })
}
}, },
getList() { getList() {
// let queryParam = JSON.parse(JSON.stringify(this.queryParam)) // let queryParam = JSON.parse(JSON.stringify(this.queryParam))
@@ -308,11 +306,11 @@
}, },
last(){ last(){
this.save() this.save()
this.$emit('upgradedonlineup',this.otaId) this.$emit('upgradedonlineup')
}, },
next(){ next(){
this.save() this.save()
this.$emit('upgradedonlinedown',this.otaId) this.$emit('upgradedonlinedown')
}, },
uploadSuccess(data) { uploadSuccess(data) {
// let attIdList = [] // let attIdList = []
@@ -346,7 +344,7 @@
this.dataSource.splice(this.dataSource.indexOf(record),1) this.dataSource.splice(this.dataSource.indexOf(record),1)
}, },
save(){ save(){
postAction('/ota/otaBaCxKsjxtmccs/add',{otaId:this.otaId,list:this.dataSource}).then(res => { postAction('/ota/otaBaCxKsjxtmccs/add',{otaId:localStorage.getItem('otaId'),list:this.dataSource}).then(res => {
console.log(res); console.log(res);
}) })
} }
jero-web/src/views/otamanagement/vehicleinformation/index.vue
+23 -23
View File
@@ -15,25 +15,25 @@
</div> </div>
<a-tabs class="tabs" v-model="tabActive" @change="callback"> <a-tabs class="tabs" v-model="tabActive" @change="callback">
<a-tab-pane disabled :key="$t('basicinformationofvehicletype')" :tab="$t('basicinformationofvehicletype')"> <a-tab-pane disabled :key="$t('basicinformationofvehicletype')" :tab="$t('basicinformationofvehicletype')">
<basicInformation v-if="tabActive == $t('basicinformationofvehicletype')" @basicInformationForm='basicInformationForm' ref="dealtWithRef" :otaId="this.otaId"/> <basicInformation v-if="tabActive == $t('basicinformationofvehicletype')" @basicInformationForm='basicInformationForm' ref="dealtWithRef" />
</a-tab-pane> </a-tab-pane>
<a-tab-pane disabled :key="$t('onlineupgraderequirements')" :tab="$t('onlineupgraderequirements')"> <a-tab-pane disabled :key="$t('onlineupgraderequirements')" :tab="$t('onlineupgraderequirements')">
<upgradeRequirements v-if="tabActive == $t('onlineupgraderequirements')" @upgradeRequirementsup='upgradeRequirementsup' @upgradeRequirementsdown='upgradeRequirementsdown' ref="doneListRef" :otaId="this.otaId"/> <upgradeRequirements v-if="tabActive == $t('onlineupgraderequirements')" @upgradeRequirementsup='upgradeRequirementsup' @upgradeRequirementsdown='upgradeRequirementsdown' ref="doneListRef" />
</a-tab-pane> </a-tab-pane>
<a-tab-pane disabled :key="$t('safetymeasure')" :tab="$t('safetymeasure')"> <a-tab-pane disabled :key="$t('safetymeasure')" :tab="$t('safetymeasure')">
<safetyPrecautions v-if="tabActive == $t('safetymeasure')" @safetyPrecautionsup='safetyPrecautionsup' @safetyPrecautionsdown='safetyPrecautionsdown' ref="SentListRef" :otaId="this.otaId"/> <safetyPrecautions v-if="tabActive == $t('safetymeasure')" @safetyPrecautionsup='safetyPrecautionsup' @safetyPrecautionsdown='safetyPrecautionsdown' ref="SentListRef" />
</a-tab-pane> </a-tab-pane>
<a-tab-pane disabled :key="$t('upgradedonline')" :tab="$t('upgradedonline')"> <a-tab-pane disabled :key="$t('upgradedonline')" :tab="$t('upgradedonline')">
<upgradedonline v-if="tabActive == $t('upgradedonline')" @upgradedonlineup='upgradedonlineup' @upgradedonlinedown='upgradedonlinedown' ref="upgradedonlineRef" :otaId="this.otaId"/> <upgradedonline v-if="tabActive == $t('upgradedonline')" @upgradedonlineup='upgradedonlineup' @upgradedonlinedown='upgradedonlinedown' ref="upgradedonlineRef" />
</a-tab-pane> </a-tab-pane>
<a-tab-pane disabled :key="$t('beupgradedonline')" :tab="$t('beupgradedonline')"> <a-tab-pane disabled :key="$t('beupgradedonline')" :tab="$t('beupgradedonline')">
<beupgradedonline v-if="tabActive == $t('beupgradedonline')" @beupgradedonlineup='beupgradedonlineup' @beupgradedonlinedown='beupgradedonlinedown' ref="beupgradedonlineRef" :otaId="this.otaId"/> <beupgradedonline v-if="tabActive == $t('beupgradedonline')" @beupgradedonlineup='beupgradedonlineup' @beupgradedonlinedown='beupgradedonlinedown' ref="beupgradedonlineRef" />
</a-tab-pane> </a-tab-pane>
<a-tab-pane disabled :key="$t('recordparameters')" :tab="$t('recordparameters')"> <a-tab-pane disabled :key="$t('recordparameters')" :tab="$t('recordparameters')">
<recordparameters v-if="tabActive == $t('recordparameters')" @recordparametersup='recordparametersup' @recordparametersdown='recordparametersdown' ref="recordparametersRef" :otaId="this.otaId"/> <recordparameters v-if="tabActive == $t('recordparameters')" @recordparametersup='recordparametersup' @recordparametersdown='recordparametersdown' ref="recordparametersRef" />
</a-tab-pane> </a-tab-pane>
<a-tab-pane disabled :key="$t('other')" :tab="$t('other')"> <a-tab-pane disabled :key="$t('other')" :tab="$t('other')">
<other v-if="tabActive == $t('other')" @otherup='otherup' ref="otherRef" :otaId="this.otaId"/> <other v-if="tabActive == $t('other')" @otherup='otherup' ref="otherRef" />
</a-tab-pane> </a-tab-pane>
<a-tab-pane disabled :key="$t('historicalrecord')" :tab="$t('historicalrecord')"> <a-tab-pane disabled :key="$t('historicalrecord')" :tab="$t('historicalrecord')">
<historicalrecord v-if="tabActive == $t('historicalrecord')" ref="historicalrecordRef" @historicalrecordup='historicalrecordup'/> <historicalrecord v-if="tabActive == $t('historicalrecord')" ref="historicalrecordRef" @historicalrecordup='historicalrecordup'/>
@@ -215,46 +215,46 @@ export default {
historicalrecordClick(){ historicalrecordClick(){
this.tabActive = this.$t('historicalrecord') this.tabActive = this.$t('historicalrecord')
}, },
basicInformationForm(data){ basicInformationForm(){
this.tabActive = this.$t('onlineupgraderequirements') this.tabActive = this.$t('onlineupgraderequirements')
this.otaId = data
}, },
upgradeRequirementsup(data){ upgradeRequirementsup(){
this.tabActive = this.$t('basicinformationofvehicletype') this.tabActive = this.$t('basicinformationofvehicletype')
this.otaId = data
}, },
upgradeRequirementsdown(){ upgradeRequirementsdown(){
this.tabActive = this.$t('safetymeasure') this.tabActive = this.$t('safetymeasure')
}, },
safetyPrecautionsup(data){ safetyPrecautionsup(){
this.tabActive = this.$t('onlineupgraderequirements') this.tabActive = this.$t('onlineupgraderequirements')
this.otaId = data
}, },
safetyPrecautionsdown(){ safetyPrecautionsdown(){
this.tabActive = this.$t('upgradedonline') this.tabActive = this.$t('upgradedonline')
}, },
upgradedonlineup(data){ upgradedonlineup(){
this.tabActive = this.$t('safetymeasure') this.tabActive = this.$t('safetymeasure')
this.otaId = data
}, },
upgradedonlinedown(data){ upgradedonlinedown(){
this.tabActive = this.$t('beupgradedonline') this.tabActive = this.$t('beupgradedonline')
this.otaId = data
}, },
beupgradedonlineup(data){ beupgradedonlineup(){
this.tabActive = this.$t('upgradedonline') this.tabActive = this.$t('upgradedonline')
this.otaId = data
}, },
beupgradedonlinedown(data){ beupgradedonlinedown(){
this.tabActive = this.$t('recordparameters') this.tabActive = this.$t('recordparameters')
this.otaId = data
}, },
recordparametersup(){ recordparametersup(){
this.tabActive = this.$t('beupgradedonline') this.tabActive = this.$t('beupgradedonline')
}, },
recordparametersdown(data){ recordparametersdown(){
this.tabActive = this.$t('other') this.tabActive = this.$t('other')
this.otaId = data
}, },
otherup(){ otherup(){
this.tabActive = this.$t('recordparameters') this.tabActive = this.$t('recordparameters')
jero-web/src/views/otamanagement/vehicleregistration/index.vue
+1
View File
@@ -360,6 +360,7 @@ export default {
}, },
// 创建车型 // 创建车型
createvehicleandfunctionrecords() { createvehicleandfunctionrecords() {
localStorage.removeItem('otaId')
this.$router.push({ this.$router.push({
path: '/vehicleinformation', path: '/vehicleinformation',
query: {} query: {}
jero-web/vue.config.js
+1 -1
View File
@@ -93,7 +93,7 @@ module.exports = {
} }
}, */ }, */
'/jero-boot': { '/jero-boot': {
target: 'http://localhost:8080', //请求本地 jero-boot后台项目 target: 'http://10.0.3.22:8080', //请求本地 jero-boot后台项目
// target: 'http://10.10.10.46:8101', //请求本地 jero-boot后台项目 // target: 'http://10.10.10.46:8101', //请求本地 jero-boot后台项目
// target: 'http://10.0.1.25:8080', // target: 'http://10.0.1.25:8080',
// target: 'http://10.0.1.5:8080', // target: 'http://10.0.1.5:8080',