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

Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

Browse Source
This commit is contained in:
zyx.net
2022-07-05 17:33:35 +08:00
parent 508da80794 58f07de7bd
commit 84a1825fe9
12 changed files with 53 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java
+1 -1
View File
@@ -111,7 +111,7 @@ public class ParamsInfoEO implements Serializable {
private String controlType; private String controlType;
/**控件校验*/ /**控件校验*/
@Excel(name = "控件校验", width = 15, replace = {"无_1","中文_2","正整数_3","正浮点数_4","整数或小数_5","一位小数_6","两位小数_7","三位小数_8","四位小数_9"}) @Excel(name = "控件校验", width = 15, replace = {"无_1","中文_2","整数_3","正浮点数_4","整数或小数_5","一位小数_6","两位小数_7","三位小数_8","四位小数_9"})
@ApiModelProperty(value = "控件校验") @ApiModelProperty(value = "控件校验")
private String controlVerify; private String controlVerify;
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlVerifyEnum.java
+1 -1
View File
@@ -13,7 +13,7 @@ import java.util.Map;
public enum ControlVerifyEnum { public enum ControlVerifyEnum {
NULL("无","Null","1"), NULL("无","Null","1"),
CHINESE("中文","Chinese","2"), CHINESE("中文","Chinese","2"),
POSITIVE_INTEGER("正整数","Positive integer","3"), POSITIVE_INTEGER("整数","Integer","3"),
POSITIVE_FLOAT("正浮点数","Positive float","4"), POSITIVE_FLOAT("正浮点数","Positive float","4"),
INTEGER_DECIMAL("整数或小数","Integer decimal","5"), INTEGER_DECIMAL("整数或小数","Integer decimal","5"),
DECIMAL_ONE("一位小数","Decimal one","6"), DECIMAL_ONE("一位小数","Decimal one","6"),
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
+6 -2
View File
@@ -1409,7 +1409,9 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
if (ccDtoAfterDistinct.size() < ccDtoList.size()) { if (ccDtoAfterDistinct.size() < ccDtoList.size()) {
// 取差集 // 取差集
String reduceOne = ccDtoList.stream() String reduceOne = ccDtoList.stream()
.filter(e->!ccDtoAfterDistinct.contains(e)).map(CertCategoryParamsInfoCnImport::getNioNumber).collect(Collectors.joining(",")); .filter(e->!ccDtoAfterDistinct.contains(e))
.map(CertCategoryParamsInfoCnImport::getNioNumber).distinct()
.collect(Collectors.joining(","));
if (StringUtils.isNotBlank(reduceOne)) { if (StringUtils.isNotBlank(reduceOne)) {
if (CutEnum.CN.getValue().equals(cut)) { if (CutEnum.CN.getValue().equals(cut)) {
stringMessage.add("导入数据中NIO编号：" + reduceOne + "下存在重复认证类别；"); stringMessage.add("导入数据中NIO编号：" + reduceOne + "下存在重复认证类别；");
@@ -1428,7 +1430,9 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
if (ccDtoAfterDistinctTwo.size() < certCategoryParamsInfoEOList.size()) { if (ccDtoAfterDistinctTwo.size() < certCategoryParamsInfoEOList.size()) {
// 取差集 // 取差集
String reduceTwo = certCategoryParamsInfoEOList.stream() String reduceTwo = certCategoryParamsInfoEOList.stream()
.filter(e->!ccDtoAfterDistinctTwo.contains(e)).map(CertCategoryParamsInfoCnImport::getNioNumber).collect(Collectors.joining(",")); .filter(e->!ccDtoAfterDistinctTwo.contains(e))
.map(CertCategoryParamsInfoCnImport::getNioNumber).distinct()
.collect(Collectors.joining(","));
if (StringUtils.isNotBlank(reduceTwo)) { if (StringUtils.isNotBlank(reduceTwo)) {
if (CutEnum.CN.getValue().equals(cut)) { if (CutEnum.CN.getValue().equals(cut)) {
stringMessage.add("导入数据中NIO编号：" + reduceTwo + "下存在重复认证编号；"); stringMessage.add("导入数据中NIO编号：" + reduceTwo + "下存在重复认证编号；");
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java
+1 -1
View File
@@ -94,7 +94,7 @@ public class ParamsInfoEnExport {
private String controlType; private String controlType;
/**控件校验*/ /**控件校验*/
@Excel(name = "Control Verify", width = 15, replace = {"Null_1","Chinese_2","Positive integer_3","Positive float_4","Integer decimal_5","Decimal one_6","Decimal two_7","Decimal three_8","Decimal four_9"}) @Excel(name = "Control Verify", width = 15, replace = {"Null_1","Chinese_2","Integer_3","Positive float_4","Integer decimal_5","Decimal one_6","Decimal two_7","Decimal three_8","Decimal four_9"})
@ApiModelProperty(value = "控件校验") @ApiModelProperty(value = "控件校验")
private String controlVerify; private String controlVerify;
jero-web/src/common/lang/en-us.js
+1 -1
View File
@@ -1065,7 +1065,7 @@ module.exports = {
Ftext: 'Text+Pull single+File', Ftext: 'Text+Pull single+File',
Nnothing: 'Null', Nnothing: 'Null',
Nchinese: 'Chinese', Nchinese: 'Chinese',
NpositiveInteger: 'Positive integer', NpositiveInteger: 'Integer',
NPositivefloatingpointnumber: 'Positive float', NPositivefloatingpointnumber: 'Positive float',
NintegerOrDecimal: 'Integer decimal', NintegerOrDecimal: 'Integer decimal',
NOneDecimalPlace: 'Decimal one', NOneDecimalPlace: 'Decimal one',
jero-web/src/common/lang/zh-cn.js
+1 -1
View File
@@ -1074,7 +1074,7 @@ module.exports = {
Ftext: '文本+下拉单选+附件', Ftext: '文本+下拉单选+附件',
Nnothing: '无', Nnothing: '无',
Nchinese: '中文', Nchinese: '中文',
NpositiveInteger: '正整数', NpositiveInteger: '整数',
NPositivefloatingpointnumber: '正浮点数', NPositivefloatingpointnumber: '正浮点数',
NintegerOrDecimal: '整数或小数', NintegerOrDecimal: '整数或小数',
NOneDecimalPlace: '一位小数', NOneDecimalPlace: '一位小数',
jero-web/src/components/CollectionType/index.vue
+10 -25
View File
@@ -28,10 +28,8 @@
<a-input class="box-input inputWid" <a-input class="box-input inputWid"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:placeholder="$t('pleaseEnter')+$t('chinese')" :placeholder="$t('pleaseEnter')+$t('chinese')"
event.returnValue="false" oninput="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
ondragenter="return false" onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))"
onblur="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
onkeyup="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 正整数 --> <!-- 正整数 -->
@@ -40,7 +38,6 @@
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:max="99999" :max="99999"
:precision="0" :precision="0"
:min="1"
:placeholder="$t('enterPositiveInteger')" :placeholder="$t('enterPositiveInteger')"
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
@@ -183,12 +180,10 @@
<div v-else-if="item.controlVerify == '2'"> <div v-else-if="item.controlVerify == '2'">
<a-input class="box-input inputWid" <a-input class="box-input inputWid"
:maxLength="1000" :maxLength="1000"
event.returnValue="false"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
ondragenter="return false"
:placeholder="$t('pleaseEnter')+$t('chinese')" :placeholder="$t('pleaseEnter')+$t('chinese')"
onblur="value=value.replace(/[^\u4E00-\u9FA5]/g,'')" oninput="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"/> v-model="item.dataValue"/>
</div> </div>
<!-- 正整数 --> <!-- 正整数 -->
@@ -196,7 +191,6 @@
<a-input-number class="box-input inputWid add--number" <a-input-number class="box-input inputWid add--number"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:max="99999" :max="99999"
:min="1"
:precision="0" :precision="0"
:placeholder="$t('enterPositiveInteger')" :placeholder="$t('enterPositiveInteger')"
v-model="item.dataValue"/> v-model="item.dataValue"/>
@@ -282,10 +276,8 @@
<div v-else-if="item.controlVerify == '2'"> <div v-else-if="item.controlVerify == '2'">
<a-input class="box-input inputWid" <a-input class="box-input inputWid"
:maxLength="1000" :maxLength="1000"
event.returnValue="false" oninput="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
ondragenter="return false" onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))"
onblur="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
onkeyup="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:placeholder="$t('pleaseEnter')+$t('chinese')" :placeholder="$t('pleaseEnter')+$t('chinese')"
v-model="item.dataValue"/> v-model="item.dataValue"/>
@@ -296,7 +288,6 @@
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:max="99999" :max="99999"
:precision="0" :precision="0"
:min="1"
:placeholder="$t('enterPositiveInteger')" :placeholder="$t('enterPositiveInteger')"
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
@@ -393,12 +384,10 @@
<div v-else-if="item.controlVerify == '2'"> <div v-else-if="item.controlVerify == '2'">
<a-input class="box-input inputWid" <a-input class="box-input inputWid"
:maxLength="1000" :maxLength="1000"
event.returnValue="false"
ondragenter="return false"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
onblur="value=value.replace(/[^\u4E00-\u9FA5]/g,'')" oninput="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))"
:placeholder="$t('pleaseEnter')+$t('chinese')" :placeholder="$t('pleaseEnter')+$t('chinese')"
onkeyup="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 正整数 --> <!-- 正整数 -->
@@ -407,7 +396,6 @@
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:max="99999" :max="99999"
:precision="0" :precision="0"
:min="1"
:placeholder="$t('enterPositiveInteger')" :placeholder="$t('enterPositiveInteger')"
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
@@ -560,11 +548,9 @@
<a-input class="box-input inputWid" <a-input class="box-input inputWid"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:maxLength="1000" :maxLength="1000"
event.returnValue="false"
ondragenter="return false"
:placeholder="$t('pleaseEnter')+$t('chinese')" :placeholder="$t('pleaseEnter')+$t('chinese')"
onblur="value=value.replace(/[^\u4E00-\u9FA5]/g,'')" oninput="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"/> v-model="item.dataValue"/>
</div> </div>
<!-- 正整数 --> <!-- 正整数 -->
@@ -573,7 +559,6 @@
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:max="99999" :max="99999"
:precision="0" :precision="0"
:min="1"
:placeholder="$t('enterPositiveInteger')" :placeholder="$t('enterPositiveInteger')"
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
jero-web/src/components/ParameterLibraryAdd/index.vue
+4 -1
View File
@@ -98,7 +98,7 @@
:dataSource='areaTable' :dataSource='areaTable'
:pagination='false' :pagination='false'
:loading='loading' :loading='loading'
:scroll='{x: 600}' :scroll='{x: 760,y:400}'
:rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}' :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
@change='handleTableChange'> @change='handleTableChange'>
<a slot='name' slot-scope='text'>{{ text }}</a> <a slot='name' slot-scope='text'>{{ text }}</a>
@@ -133,18 +133,21 @@ export default {
title: this.$t('NiONumber'), title: this.$t('NiONumber'),
dataIndex: 'nioNumber', dataIndex: 'nioNumber',
align: 'center', align: 'center',
width:200,
ellipsis: true ellipsis: true
}, },
{ {
title: this.$t('ParameterName'), title: this.$t('ParameterName'),
align: 'center', align: 'center',
dataIndex: 'paramsName', dataIndex: 'paramsName',
width:200,
ellipsis: true ellipsis: true
}, },
{ {
title: this.$t('areaOfResponsibility'), title: this.$t('areaOfResponsibility'),
dataIndex: 'dutyTerritory_dictText', dataIndex: 'dutyTerritory_dictText',
align: 'center', align: 'center',
width:200,
ellipsis: true ellipsis: true
} }
], ],
jero-web/src/components/jero/JLoading.vue
+1 -1
View File
@@ -54,7 +54,7 @@
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
z-index: 111999; z-index: 1009;
width: 100%; width: 100%;
height: 100%; height: 100%;
background-color: rgba(255, 255, 255, 0.9); background-color: rgba(255, 255, 255, 0.9);
jero-web/src/components/tableCollection/index.vue
+5 -4
View File
@@ -101,30 +101,31 @@
<div class="text-field"> <div class="text-field">
<span class="text-field-left" :title="$t('configurationName')">{{$t('configurationName')}}:</span> <span class="text-field-left" :title="$t('configurationName')">{{$t('configurationName')}}:</span>
<span class="text-field-right" <span class="text-field-right"
:title="configDetail.configName"
>{{configDetail.configName}}</span> >{{configDetail.configName}}</span>
</div> </div>
</div> </div>
<div class="content-text"> <div class="content-text">
<div class="text-field"> <div class="text-field">
<span class="text-field-left" :title="$t('Model')">{{$t('Model')}}:</span> <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> >{{configDetail.carType}}</span>
</div> </div>
<div class="text-field"> <div class="text-field">
<span class="text-field-left" :title="$t('electricMachinery')">{{$t('electricMachinery')}}:</span> <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> >{{configDetail.motor}}</span>
</div> </div>
</div> </div>
<div class="content-text"> <div class="content-text">
<div class="text-field"> <div class="text-field">
<span class="text-field-left" :title="$t('Version')">{{$t('Version')}}:</span> <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> >{{configDetail.version}}</span>
</div> </div>
<div class="text-field"> <div class="text-field">
<span class="text-field-left" :title="$t('Battery')">{{$t('Battery')}}:</span> <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> >{{configDetail.battery}}</span>
</div> </div>
</div> </div>
jero-web/src/views/parameter/ParameterTemplate/index.vue
+13 -7
View File
@@ -52,7 +52,7 @@
size="middle" size="middle"
:loading="loading" :loading="loading"
:pagination="false" :pagination="false"
:scroll="{x: true}" :scroll="{x: '100%',y:'calc(100vh - 130px)'}"
rowKey="id" rowKey="id"
:data-source="dataSource" :data-source="dataSource"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
@@ -60,7 +60,7 @@
> >
<span slot="projectName" slot-scope="text,record" :title="text"> <span slot="projectName" slot-scope="text,record" :title="text">
<a @click="entryNameClick(record)"> <a @click="entryNameClick(record)">
{{ text && text.length > 30 ? text.slice(0, 29) + '...' : text }} {{ text }}
</a> </a>
</span> </span>
<span slot="titleName" slot-scope="text,record" :title="text"> <span slot="titleName" slot-scope="text,record" :title="text">
@@ -157,31 +157,37 @@ export default {
{ {
title: this.$t('zoneOfApplication'), title: this.$t('zoneOfApplication'),
align: 'center', align: 'center',
width: '10%', width: 160,
ellipsis: true,
dataIndex: 'region_dictText', dataIndex: 'region_dictText',
}, },
{ {
title: this.$t('parameterTemplate'), title: this.$t('parameterTemplate'),
align: 'center', align: 'center',
width: 180,
ellipsis: true,
dataIndex: 'paramsTemplateName', dataIndex: 'paramsTemplateName',
scopedSlots: { customRender: 'projectName' } scopedSlots: { customRender: 'projectName' }
}, },
{ {
title: this.$t('contentDescription'), title: this.$t('contentDescription'),
align: 'center', align: 'center',
ellipsis: true,
dataIndex: 'description', dataIndex: 'description',
scopedSlots: { customRender: 'titleName' } // scopedSlots: { customRender: 'titleName' }
}, },
{ {
title: this.$t('createTime'), title: this.$t('createTime'),
align: 'center', align: 'center',
width: '10%', dataIndex: 'createTime',
dataIndex: 'createTime' width: 160,
ellipsis: true,
}, },
{ {
title: this.$t('updateTime'), title: this.$t('updateTime'),
align: 'center', align: 'center',
width: '10%', width: 160,
ellipsis: true,
dataIndex: 'updateTime' dataIndex: 'updateTime'
}, },
{ {
jero-web/src/views/parameter/parameterlist/index.vue
+9 -4
View File
@@ -72,7 +72,7 @@
size="middle" size="middle"
:loading="loading" :loading="loading"
:pagination="false" :pagination="false"
:scroll="{x: '100%'}" :scroll="{x: '100%',y:'calc(100vh - 130px)'}"
rowKey="id" rowKey="id"
:data-source="dataSource" :data-source="dataSource"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
@@ -155,20 +155,23 @@ export default {
{ {
title: this.$t('NiONumber'), title: this.$t('NiONumber'),
align: 'center', align: 'center',
width: 100, width: 130,
dataIndex: 'nioNumber', dataIndex: 'nioNumber',
sorter: true sorter: true,
ellipsis: true,
}, },
{ {
title: this.$t('ParameterName'), title: this.$t('ParameterName'),
align: 'center', align: 'center',
dataIndex: 'paramsName', dataIndex: 'paramsName',
width: 160, width: 160,
ellipsis: true,
}, },
{ {
title: this.$t('ParameterDescription'), title: this.$t('ParameterDescription'),
align: 'center', align: 'center',
dataIndex: 'description', dataIndex: 'description',
ellipsis: true,
// scopedSlots: { customRender: 'titleName' } // scopedSlots: { customRender: 'titleName' }
}, },
{ {
@@ -176,12 +179,14 @@ export default {
align: 'center', align: 'center',
dataIndex: 'dutyTerritory_dictText', dataIndex: 'dutyTerritory_dictText',
width: 150, width: 150,
ellipsis: true,
}, },
{ {
title: this.$t('createTime'), title: this.$t('createTime'),
align: 'center', align: 'center',
dataIndex: 'createTime', dataIndex: 'createTime',
width: 110, width: 180,
ellipsis: true,
}, },
{ {
title: this.$t('operation'), title: this.$t('operation'),