diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue index 692e6053e..007798e90 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue @@ -45,6 +45,7 @@ :placeholder="$t('PleaseSelect')" :type="'select'" :triggerChange="false" + :dictCode="record.dictCode" v-model="record.jszdhjb"/> @@ -124,31 +125,31 @@ import ImportFile from '@/components/ImportFileData/index' }, dataSource: [ { - gnmc:'前向碰撞预警(FCW)' + gnmc:'前向碰撞预警(FCW)', }, { - gnmc:'车道偏离预警(LDW)' + gnmc:'车道偏离预警(LDW)', }, { - gnmc:'百区监测(BSD)' + gnmc:'百区监测(BSD)', }, { - gnmc:'驻员疲劳篮澳CDFM)' + gnmc:'驻员疲劳篮澳CDFM)', }, { - gnmc:'自动紧急制动(AEB)' + gnmc:'自动紧急制动(AEB)', }, { - gnmc:'自适应巡航控制(ACC)' + gnmc:'自适应巡航控制(ACC)', }, { - gnmc:'自适应巡航控制(ACC)' + gnmc:'车道保持辅助(LKA)', }, { - gnmc:'智能泊车辅助(IPA)' + gnmc:'智能泊车辅助(IPA)', }, { - gnmc:'交通拥堵辅助(TJA)' + gnmc:'交通拥堵辅助(TJA)', }, ], loading: false, @@ -341,44 +342,43 @@ import ImportFile from '@/components/ImportFileData/index' } getAction('/ota/otaBaCxKsjjsmccs/queryByOtaId',{otaIdT:otaIdT,otaId:localStorage.getItem('otaId')}).then(res=>{ if(res.code==200){ - if(res.result.length==0){ - this.dataSource=[ - { - gnmc:'前向碰撞预警(FCW)' - }, - { - gnmc:'车道偏离预警(LDW)' - }, - { - gnmc:'百区监测(BSD)' - }, - { - gnmc:'驻员疲劳篮澳CDFM)' - }, - { - gnmc:'自动紧急制动(AEB)' - }, - { - gnmc:'自适应巡航控制(ACC)' - }, - { - gnmc:'自适应巡航控制(ACC)' - }, - { - gnmc:'智能泊车辅助(IPA)' - }, - { - gnmc:'交通拥堵辅助(TJA)' - }, - ] + if(res.result.list.length==0){ + this.dataSource=[ + { + gnmc:'前向碰撞预警(FCW)' + }, + { + gnmc:'车道偏离预警(LDW)' + }, + { + gnmc:'百区监测(BSD)' + }, + { + gnmc:'驻员疲劳篮澳CDFM)' + }, + { + gnmc:'自动紧急制动(AEB)' + }, + { + gnmc:'自适应巡航控制(ACC)' + }, + { + gnmc:'自适应巡航控制(ACC)' + }, + { + gnmc:'智能泊车辅助(IPA)' + }, + { + gnmc:'交通拥堵辅助(TJA)' + }, + ] }else{ - res.result.forEach(item =>{ + res.result.list.forEach(item =>{ item.pzqk =Number(item.pzqk) - }) - res.result.forEach(item =>{ item.sfksj =Number(item.sfksj) + item.jszdhjb=Number(item.jszdhjb)== 0?undefined:Number(item.jszdhjb) }) - this.dataSource=res.result + this.dataSource=res.result.list } } }) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue index c8d40b80f..3373a9158 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue @@ -887,7 +887,8 @@ export default { this.dataSource.forEach(item=>{ for(let key in res.result.bj){ - if(Number(res.result.bj[key])!=NaN &&Number(res.result.bj[key])!=0){ + if(Number(res.result.bj[key])!=NaN &&Number(res.result.bj[key])!=0 && key !=id){ + console.log(key); res.result.bj[key]=Number(res.result.bj[key]) } if(item.key==key){ diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue index 6b29fe8a2..a78535453 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue @@ -27,7 +27,7 @@ @change="update" :placeholder="$t('PleaseSelect')" :type="'select'" - :dictCode="record.dictCode" + dictCode="driving_automation_level" :triggerChange="false"/>