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

Merge branch 'dev_2nd_LCYH' of http://git.hzwlsoft.com/laws-nio/laws-weilai into dev_2nd_LCYH

Browse Source
This commit is contained in:
yuekuo
2023-03-29 15:46:59 +08:00
parent ec879f53b5 8dc4c26f2c
commit 8486e45717
5 changed files with 266 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/components/CollectionType/index.vue
+13 -13
View File
@@ -30,7 +30,7 @@
<a-input class="box-input inputWid"
:disabled="itemval.isLock == '1' ? true: false"
:placeholder="$t('pleaseEnter')+$t('chinese')"
@input="onInput"
@input="onInput(itemval.dataValue,item,index1)"
:maxLength="1000"
onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))"
v-model="itemval.dataValue"/>
@@ -283,7 +283,7 @@
:maxLength="1000"
:disabled="itemval.isLock == '1' ? true: false"
:placeholder="$t('pleaseEnter')+$t('chinese')"
@input="onInput"
@input="onInput(itemval.dataValue,item,index1)"
onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))"
v-model="itemval.dataValue"/>
</div>
@@ -405,7 +405,7 @@
<div v-else-if="itemval.controlVerify == '2'">
<a-input class="box-input inputWid"
:maxLength="1000"
@input="onInput"
@input="onInput(itemval.dataValue,item,index1)"
onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))"
:disabled="itemval.isLock == '1' ? true: false"
:placeholder="$t('pleaseEnter')+$t('chinese')"
@@ -516,7 +516,7 @@
<a-input class="box-input inputWid"
:maxLength="1000"
:disabled="itemval.isLock == '1' ? true: false"
@input="onInput"
@input="onInput(itemval.dataValue,item,index1)"
onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))"
:placeholder="$t('pleaseEnter')+$t('chinese')"
v-model="itemval.dataValue"/>
@@ -730,7 +730,7 @@
:disabled="itemval.isLock == '1' ? true: false"
:maxLength="1000"
:placeholder="$t('pleaseEnter')+$t('chinese')"
@input="onInput"
@input="onInput(itemval.dataValue,item,index1)"
onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))"
v-model="itemval.dataValue"/>
</div>
@@ -917,14 +917,14 @@
}
})
},
onInput(r) {
let value = r.target.value
r.target.value = value.replace(/[^\u4e00-\u9fa5]/g, '')
this.detailDateList.forEach((item) => {
if (item.controlVerify == '2') {
item.dataValue = r.target.value
}
})
onInput(r, item, index) {
let value = r.replace(/[^\u4e00-\u9fa5]/g, '')
this.detailDate.paramsConfigData[item][index].dataValue = value
// this.detailDateList.forEach((item) => {
// if (item.controlVerify == '2') {
// item.dataValue = value
// }
// })
},
uploadSuccess(data) {
let attIdList = []
jero-web/src/views/otamanagement/upgradeactivity/index.vue
+2 -2
View File
@@ -149,9 +149,9 @@
@click="maintenanceClick(record)">{{$t('maintenance')}}</a>
<a class="text-operation"
@click="endUpgrade(record , '0')" v-if="record.sjzt==0 && record.bazt=='4'">{{$t('endUpgrade')}}</a>
@click="endUpgrade(record , '0')" v-if="record.sjzt == '0' && record.bazt=='4'">{{$t('endUpgrade')}}</a>
<a class="text-operation"
@click="endUpgrade(record , '1')" v-if="record.sjzt==1">{{$t('upgradecompletion')}}</a>
@click="endUpgrade(record , '1')" v-if="record.sjzt == '1'">{{$t('upgradecompletion')}}</a>
<a class="text-operation"
@click="handleExport(record)">{{$t('export')}}</a>
<a class="text-operation"
jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue
+7 -7
View File
@@ -49,8 +49,8 @@
<span class='text-text' style='height: 450px;line-height: 450px' :title="$t('positioningandnavigationsystem')">
&nbsp;&nbsp;{{$t('positioningandnavigationsystem')}}
</span>
<span style="padding: 5px" class='text-text-three' :title="$t('vehiclesatellitepositioningequipment')">
&nbsp;&nbsp;{{$t('vehiclesatellitepositioningequipment')}}
<span style="padding: 10px" class='text-text-three' :title="$t('vehiclesatellitepositioningequipment')">
{{$t('vehiclesatellitepositioningequipment')}}
</span>
<span class='text-text-three' :title="$t('inertialnavigationsystem')">
&nbsp;&nbsp;{{$t('inertialnavigationsystem')}}
@@ -70,19 +70,19 @@
</span>
<span class='text-box-four'>
<span style="padding: 10px" class='four-text-text' :title="$t('signalingdevices')">
&nbsp;&nbsp;{{$t('signalingdevices')}}
{{$t('signalingdevices')}}
</span>
<span class='four-text' :title="$t('driverassistancefunctioncontrols')">
&nbsp;&nbsp;{{$t('driverassistancefunctioncontrols')}}
{{$t('driverassistancefunctioncontrols')}}
</span>
<span class='four-text' :title="$t('drivingassistancefunctionindicatorsignaldevice')">
&nbsp;&nbsp;{{$t('drivingassistancefunctionindicatorsignaldevice')}}
{{$t('drivingassistancefunctionindicatorsignaldevice')}}
</span>
<span class='four-text' :title="$t('steerinwheelreleaseindicatorsignaldevice')">
&nbsp;&nbsp;{{$t('steerinwheelreleaseindicatorsignaldevice')}}
{{$t('steerinwheelreleaseindicatorsignaldevice')}}
</span>
<span class='four-text' :title="$t('driverattentionindicatorsignaldevice')">
&nbsp;&nbsp;{{$t('driverattentionindicatorsignaldevice')}}
{{$t('driverattentionindicatorsignaldevice')}}
</span>
</span>
<span class='text-box-five' :title="$t('automaticDrivingDataRecordingSystem')">