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

Merge branch 'dev_third_stage'

Browse Source
This commit is contained in:
lixuetao
2022-07-05 19:49:26 +08:00
parent 4b092fc07c ad8ea8a7f1
commit af9bd856a3
9 changed files with 139 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/components/CollectionType/index.vue
+6 -16
View File
@@ -28,10 +28,8 @@
<a-input class="box-input inputWid"
:disabled="item.isLock == '1' ? true: false"
:placeholder="$t('pleaseEnter')+$t('chinese')"
event.returnValue="false"
ondragenter="return false"
onblur="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
onkeyup="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))"
v-model="item.dataValue"/>
</div>
<!-- 正整数 -->
@@ -182,12 +180,10 @@
<div v-else-if="item.controlVerify == '2'">
<a-input class="box-input inputWid"
:maxLength="1000"
event.returnValue="false"
:disabled="item.isLock == '1' ? true: false"
ondragenter="return false"
:placeholder="$t('pleaseEnter')+$t('chinese')"
onblur="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
onkeyup="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))"
v-model="item.dataValue"/>
</div>
<!-- 正整数 -->
@@ -280,10 +276,8 @@
<div v-else-if="item.controlVerify == '2'">
<a-input class="box-input inputWid"
:maxLength="1000"
event.returnValue="false"
ondragenter="return false"
onblur="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
onkeyup="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))"
:disabled="item.isLock == '1' ? true: false"
:placeholder="$t('pleaseEnter')+$t('chinese')"
v-model="item.dataValue"/>
@@ -390,12 +384,10 @@
<div v-else-if="item.controlVerify == '2'">
<a-input class="box-input inputWid"
:maxLength="1000"
event.returnValue="false"
ondragenter="return false"
:disabled="item.isLock == '1' ? true: false"
onblur="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
:placeholder="$t('pleaseEnter')+$t('chinese')"
onkeyup="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))"
:placeholder="$t('pleaseEnter')+$t('chinese')"
v-model="item.dataValue"/>
</div>
<!-- 正整数 -->
@@ -556,11 +548,9 @@
<a-input class="box-input inputWid"
:disabled="item.isLock == '1' ? true: false"
:maxLength="1000"
event.returnValue="false"
ondragenter="return false"
:placeholder="$t('pleaseEnter')+$t('chinese')"
onblur="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
onkeyup="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))"
v-model="item.dataValue"/>
</div>
<!-- 正整数 -->
jero-web/src/components/exporthistory/index.vue
+4 -1
View File
@@ -202,7 +202,10 @@ export default {
this.loadData()
},
dowloadfile(item){
downloadFile('/sys/common/downLoadFile', item.exportFileName, {id:item.exportFileId})
let query = {
id: item.exportFileId
}
downloadFile('/sys/common/downLoadFile', item.exportFileName, query, this.Deselect)
},
loadData() {
let _this = this
jero-web/src/components/tableCollection/index.vue
+5 -4
View File
@@ -101,30 +101,31 @@
<div class="text-field">
<span class="text-field-left" :title="$t('configurationName')">{{$t('configurationName')}}:</span>
<span class="text-field-right"
:title="configDetail.configName"
>{{configDetail.configName}}</span>
</div>
</div>
<div class="content-text">
<div class="text-field">
<span class="text-field-left" :title="$t('Model')">{{$t('Model')}}:</span>
<span class="text-field-right"
<span class="text-field-right" :title="configDetail.carType"
>{{configDetail.carType}}</span>
</div>
<div class="text-field">
<span class="text-field-left" :title="$t('electricMachinery')">{{$t('electricMachinery')}}:</span>
<span class="text-field-right"
<span class="text-field-right" :title="configDetail.motor"
>{{configDetail.motor}}</span>
</div>
</div>
<div class="content-text">
<div class="text-field">
<span class="text-field-left" :title="$t('Version')">{{$t('Version')}}:</span>
<span class="text-field-right"
<span class="text-field-right" :title="configDetail.version"
>{{configDetail.version}}</span>
</div>
<div class="text-field">
<span class="text-field-left" :title="$t('Battery')">{{$t('Battery')}}:</span>
<span class="text-field-right"
<span class="text-field-right" :title="configDetail.battery"
>{{configDetail.battery}}</span>
</div>
</div>