diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml index 002a6acae..ba76e12e3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml @@ -99,7 +99,8 @@ pti.verify_person_charge_feedback as "verifyPersonChargeFeedback", plb.studio_engineer as "studioEngineer", plb.target_market as "targetMarket", - pti.id as "projectTaskInventoryId" + pti.id as "projectTaskInventoryId", + plb.project_version as projectVersion FROM project_laws_inventory pli LEFT JOIN project_task_inventory pti ON ( pli.id = pti.project_laws_inventory_id ) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsComplianceBoardServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsComplianceBoardServiceImpl.java index 671006907..a137c5f57 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsComplianceBoardServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsComplianceBoardServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.constant.enums.CutEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.system.query.QueryRuleEnum; +import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.LoginUser; import com.jero.modules.document.enums.FieldTypeEnum; import com.jero.modules.document.service.IBussDocumentLibraryEOService; @@ -24,7 +25,9 @@ import com.jero.modules.project.mapper.ProjectTaskInventoryDetailEOMapper; import com.jero.modules.project.service.ILawsComplianceBoardService; import com.jero.modules.system.entity.SysCategory; import com.jero.modules.system.entity.SysDictItem; +import com.jero.modules.system.enums.DicCodeEnum; import com.jero.modules.system.service.ISysDictItemService; +import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.service.impl.SysCategoryServiceImpl; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; @@ -72,6 +75,9 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi @Autowired private ISysUserService sysUserService; + @Autowired + private ISysDictService sysDictService; + @Override public IPage queryPageList(Map params) { int pageNo = Integer.parseInt(params.get("pageNo").toString()); @@ -181,6 +187,20 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi String cut = (String) params.get("cut"); List> complianceResultList = this.lawsComplianceBoardMapper.queryComplianceResultList(params); if(CollectionUtils.isNotEmpty(complianceResultList)){ + for (Map map : complianceResultList) { + //处理相关项目名称 + String projectName = String.valueOf(map.get("projectName")); + String yearName = String.valueOf(map.get("yearName")); + String targetMarket = String.valueOf(map.get("targetMarket")); + String projectVersion = String.valueOf(map.get("projectVersion")); + List regionList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); + targetMarket = getTargetMarket(cut, regionList, targetMarket); + if(ObjectUtils.isEmpty(map.get("projectVersion"))){ + map.put("projectName",projectName+"-"+yearName+"-"+targetMarket); + }else{ + map.put("projectName",projectName+"-"+yearName+"-"+targetMarket+"-"+projectVersion); + } + } List projectLawsInventoryIdList = complianceResultList.stream().map(map-> (String) map.get("id")).collect(Collectors.toList()); QueryWrapper taskDetailQueryWrapper = new QueryWrapper<>(); taskDetailQueryWrapper.lambda().in(ProjectTaskInventoryDetailEO::getProjectTaskInventoryId,projectLawsInventoryIdList); @@ -215,6 +235,34 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi return result; } + private String getTargetMarket(String cut, List regionList, String targetMarket) { + //适用地区 + List dictModelList = new ArrayList<>(); + String region = ""; + if(com.jero.modules.system.util.StringUtils.isNotBlank(targetMarket)){ + for (String s : targetMarket.split(",")) { + List dictModelListTemp = regionList.stream() + .filter(e -> s.equals(e.getValue())).collect(Collectors.toList()); + dictModelList.addAll(dictModelListTemp); + } + + if(dictModelList.size() != 0){ + StringBuilder sb = new StringBuilder(); + for (DictModel dictModel : dictModelList) { + if(CutEnum.CN.getValue().equals(cut)){ + sb.append(dictModel.getText()+","); + }else{ + sb.append(dictModel.getTextEn()+","); + } + } + if(com.jero.modules.system.util.StringUtils.isNotBlank(sb)){ + region = sb.substring(0,sb.length()-1); + } + } + } + return region; + } + /** * 创建任务清单列表数据 * @param complianceResultList diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index 1a97e88b3..d456e24ec 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -747,9 +747,11 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl userIdList = new ArrayList<>(); datas.forEach(data -> { + String standardInfo = data.getStandardInfo(); + if(StringUtils.isNotBlank(standardInfo)){ + String standardInfoTemp = standardInfo.replaceAll("、", " "); + data.setStandardInfo(standardInfoTemp); + } //设置上一个操作人。 for (Map.Entry> detailMap : lastAssigneeDetailMap.entrySet()) { if(StringUtils.equals(data.getId(),detailMap.getKey())){ diff --git a/jero-web/src/App.vue b/jero-web/src/App.vue index f9b8dce0d..30f960492 100644 --- a/jero-web/src/App.vue +++ b/jero-web/src/App.vue @@ -185,10 +185,12 @@ .ant-table-thead > tr > th { background: #f3f6f6!important; - padding: 12px 8px!important; + padding-top: 12px!important; + padding-bottom: 12px!important; } .ant-table-tbody > tr > td { - padding: 12px 8px!important; + padding-top: 12px!important; + padding-bottom: 12px!important; } \ No newline at end of file diff --git a/jero-web/src/assets/less/common.less b/jero-web/src/assets/less/common.less index fb64ebded..0804540e0 100644 --- a/jero-web/src/assets/less/common.less +++ b/jero-web/src/assets/less/common.less @@ -129,11 +129,13 @@ .ant-table-thead > tr > th { background: #f3f6f6!important; - padding: 12px 8px!important; + padding-top: 12px!important; + padding-bottom: 12px!important; } .ant-table-tbody > tr > td { - padding: 12px 8px!important; + padding-top: 12px!important; + padding-bottom: 12px!important; } .ant-tooltip-inner { diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue index 0430379dd..da604f3ea 100644 --- a/jero-web/src/components/CollectionType/index.vue +++ b/jero-web/src/components/CollectionType/index.vue @@ -829,6 +829,7 @@ .selectWid { min-width: 150px; + width: 100%; } .inputWid { diff --git a/jero-web/src/components/CollectionTypeDisabled/index.vue b/jero-web/src/components/CollectionTypeDisabled/index.vue index 7711a94c6..f0317ce15 100644 --- a/jero-web/src/components/CollectionTypeDisabled/index.vue +++ b/jero-web/src/components/CollectionTypeDisabled/index.vue @@ -760,6 +760,7 @@ .selectWid { min-width: 150px; + width: 100%; } .inputWid { diff --git a/jero-web/src/components/OcrTable/DocTable.vue b/jero-web/src/components/OcrTable/DocTable.vue index 7448e00be..f716702b6 100644 --- a/jero-web/src/components/OcrTable/DocTable.vue +++ b/jero-web/src/components/OcrTable/DocTable.vue @@ -1,12 +1,13 @@ @@ -138,6 +140,7 @@ import RetrieveFilesList from './components/RetrieveFilesList' import eventBUs from '../../../common/event' import { mapGetters } from 'vuex' + import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' export default { name: 'index', @@ -145,8 +148,10 @@ addModel, RetrieveFilesList }, + mixins:[ResizeHeader, ResizeColumnProvide], data() { return { + isTrue: true, //url传参严格按照当前命名 url: { list: '/docTranslation/docTranslationEO/page', @@ -249,6 +254,9 @@ }, methods: { ...mapGetters(['userInfo']), + sVisible(){ + this.getDataAdmin() + }, addModelForm() { this.pageNo = 1 this.getList() @@ -360,6 +368,12 @@ RetrieveFilesClick() { this.$refs.RetrieveFilesListRef.addModel() }, + getDataAdmin(){ + this.isTrue = false + setTimeout(()=>{ + this.isTrue = true + },100) + }, BatchDelete() { if (this.selectedRowKeys.length > 0) { let _this = this @@ -482,4 +496,8 @@ ::v-deep .ant-table-body { background: transparent !important; } + + ::v-deep .ant-table-placeholder{ + margin-top: 8px !important; + } \ No newline at end of file diff --git a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue index 775dc9048..08775da87 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue @@ -88,6 +88,7 @@ ref="table" size="middle" @change="tableOnChange" + :components="drag(columns,'columns')" :loading="loading" :pagination="false" :scroll="{x: '100%'}" @@ -239,12 +240,14 @@ import moment from 'moment' import { Base64 } from 'js-base64' import { mapGetters } from 'vuex' + import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' export default { name: 'DocumentLibrary', components: { libraryPush }, + mixins:[ResizeHeader, ResizeColumnProvide], data() { return { searchOption: [], diff --git a/jero-web/src/views/documentTools/virtualList/components/addModel.vue b/jero-web/src/views/documentTools/virtualList/components/addModel.vue index c946cdf25..95e9b29d8 100644 --- a/jero-web/src/views/documentTools/virtualList/components/addModel.vue +++ b/jero-web/src/views/documentTools/virtualList/components/addModel.vue @@ -62,6 +62,7 @@
import { getAction, postAction } from '@/api/manage' import globalAdvancedQuery from '@/components/globalAdvancedQuery/index' + import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' export default { name: 'addModel', @@ -108,6 +110,7 @@ default: {} } }, + mixins:[ResizeHeader, ResizeColumnProvide], data() { return { toggleSearchStatus: false, @@ -120,19 +123,22 @@ title: this.$t('standard'), dataIndex: 'serial_number', align: 'left', - ellipsis: true + ellipsis: true, + width: 228 }, { title: this.$t('title'), dataIndex: 'title', align: 'left', - ellipsis: true + ellipsis: true, + width: 228 }, { title: this.$t('zoneOfApplication'), dataIndex: 'region', align: 'left', - ellipsis: true + ellipsis: true, + width: 228 }, // { // title: this.$t('status'), @@ -150,13 +156,15 @@ title: this.$t('ImplementationDate'), dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1', align: 'left', - ellipsis: true + ellipsis: true, + width: 228 }, { title: this.$t('vehicleInProductionDate'), dataIndex: 'implement_time', align: 'left', - ellipsis: true + ellipsis: true, + width: 228 } // { // title: this.$t('correspondingStandard'), @@ -250,6 +258,7 @@ }, handleCancel() { this.visible = false + this.$emit('visible') }, handleSubmit() { if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { diff --git a/jero-web/src/views/documentTools/virtualList/components/editModel.vue b/jero-web/src/views/documentTools/virtualList/components/editModel.vue index fa979df36..0fea84383 100644 --- a/jero-web/src/views/documentTools/virtualList/components/editModel.vue +++ b/jero-web/src/views/documentTools/virtualList/components/editModel.vue @@ -737,6 +737,7 @@ }, handleCancel() { this.visible = false + this.$emit('visible') }, handleSubmit() { this.$refs.ruleForm.validate(valid => { diff --git a/jero-web/src/views/documentTools/virtualList/components/transferList.vue b/jero-web/src/views/documentTools/virtualList/components/transferList.vue index 62b60efdf..3198cb9d6 100644 --- a/jero-web/src/views/documentTools/virtualList/components/transferList.vue +++ b/jero-web/src/views/documentTools/virtualList/components/transferList.vue @@ -31,6 +31,7 @@
import { getAction, postAction } from '@/api/manage' + import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' export default { name: 'transferList', components: {}, props: ['url'], + mixins:[ResizeHeader, ResizeColumnProvide], data() { return { visible: false, @@ -78,26 +81,30 @@ { title: this.$t('VirtualListName'), dataIndex: 'name', - align: 'center', - ellipsis: true + align: 'left', + ellipsis: true, + width: 223 }, { title: this.$t('instructionForUse'), dataIndex: 'useExplain', - align: 'center', - ellipsis: true + align: 'left', + ellipsis: true, + width: 223 }, { title: this.$t('updateTime'), dataIndex: 'updateTime', - align: 'center', - ellipsis: true + align: 'left', + ellipsis: true, + width: 223 }, { title: this.$t('creater'), dataIndex: 'createBy', - align: 'center', - ellipsis: true + align: 'left', + ellipsis: true, + width: 223 } ], dataList: [], @@ -161,6 +168,7 @@ }, handleCancel() { this.visible = false + this.$emit('visible') }, handleSubmit(flag) { if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index 8865201e3..40287f283 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -178,7 +178,7 @@ {{$t('BatchDelete')}} -
+
- - - - + + + + { + this.isTruee = true + }) return columnResult } }, methods: { ...mapGetters(['userInfo']), + sVisible(){ + this.getDataAdmin() + }, handleSuperQuery(params, matchType) { let sqp = {} if (!params || (params && params.length == 0)) { @@ -1368,6 +1378,12 @@ transferClick() { this.$refs.transferListRef.transferModel() }, + getDataAdmin(){ + this.isTrue = false + setTimeout(()=>{ + this.isTrue = true + },100) + }, //导出 handleExport() { let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) @@ -1729,7 +1745,7 @@ \ No newline at end of file diff --git a/jero-web/src/views/parameter/escalationlibrary/index.vue b/jero-web/src/views/parameter/escalationlibrary/index.vue index 319f305d4..b7aa496dd 100644 --- a/jero-web/src/views/parameter/escalationlibrary/index.vue +++ b/jero-web/src/views/parameter/escalationlibrary/index.vue @@ -34,6 +34,7 @@ - - {{ text && text.length > 20 ? text.slice(0, 19) + '...' : text }} - + + + {{$t('Exporthistory')}} {{$t('See')}} @@ -110,12 +111,14 @@ import { ACCESS_TOKEN } from '@/store/mutation-types' import eventBUs from '../../../common/event' import Vue from 'vue' + import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' export default { name: 'index', components: { ExportHistory }, + mixins:[ResizeHeader, ResizeColumnProvide], data() { return { token: Vue.ls.get(ACCESS_TOKEN), @@ -157,7 +160,7 @@ { title: this.$t('entryName'), align: 'left', - width: '17%', + width: 210, dataIndex: 'projectName', sorter:true, scopedSlots: { customRender: 'projectName' } @@ -165,11 +168,13 @@ { title: this.$t('ListTitle'), align: 'left', - dataIndex: 'title' + width: 380, + dataIndex: 'title', }, { title: this.$t('Version'), align: 'left', + width: 382, dataIndex: 'version' }, { @@ -483,4 +488,14 @@ ::v-deep .ant-table-body { background: transparent!important; } + + ::v-deep .ant-table-row-cell-break-word{ + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + + ::v-deep .ant-table-placeholder{ + margin-top: 8px !important + } \ No newline at end of file diff --git a/jero-web/src/views/parameter/parameterexport/index.vue b/jero-web/src/views/parameter/parameterexport/index.vue index 279c5835e..9a806dbcd 100644 --- a/jero-web/src/views/parameter/parameterexport/index.vue +++ b/jero-web/src/views/parameter/parameterexport/index.vue @@ -46,6 +46,7 @@ \ No newline at end of file diff --git a/jero-web/src/views/processCenter/components/circulationHistory.vue b/jero-web/src/views/processCenter/components/circulationHistory.vue index b2ddeb1c6..285a5462e 100644 --- a/jero-web/src/views/processCenter/components/circulationHistory.vue +++ b/jero-web/src/views/processCenter/components/circulationHistory.vue @@ -7,6 +7,7 @@
@@ -234,6 +234,7 @@ import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage' import { mapGetters } from 'vuex' import store from '@/store/' + import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' export default { name: 'TaskList', @@ -246,6 +247,7 @@ taskBatSetting }, props: ['isDisplayNum', 'areaOfResponsibility'], + mixins:[ResizeHeader, ResizeColumnProvide], data() { return { toggleSearchStatus: false, @@ -936,6 +938,10 @@ /deep/ .ant-table-tbody > tr > td { padding: 16px 16px!important; } + + ::v-deep .ant-table-placeholder { + margin-top: 8px !important; + } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/nonConformance.vue b/jero-web/src/views/projectManagement/components/nonConformance.vue index 816157e79..190bd4bd9 100644 --- a/jero-web/src/views/projectManagement/components/nonConformance.vue +++ b/jero-web/src/views/projectManagement/components/nonConformance.vue @@ -51,6 +51,7 @@ import { getAction, postAction, downloadFile, deleteAction,downloadFilePost } from '@/api/manage' import store from '@/store/' + import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' export default { name: 'nonConformance', + mixins:[ResizeHeader, ResizeColumnProvide], data() { return { queryParam: {}, @@ -101,7 +104,6 @@ title: this.$t('standard'), align: 'left', dataIndex: 'serialNumber', - scopedSlots: { customRender: 'standard' }, ellipsis: true, sorter:true, width: 180 @@ -111,13 +113,13 @@ align: 'left', dataIndex: 'title', ellipsis: true, - width: 180, - scopedSlots: { customRender: 'standard' } + width: 180 }, { title: this.$t('ProcessType'), align: 'left', dataIndex: 'flowType', + scopedSlots: { customRender: 'standard' }, ellipsis: true, sorter:true, width: 180 diff --git a/jero-web/src/views/projectManagement/components/responsibilityList.vue b/jero-web/src/views/projectManagement/components/responsibilityList.vue index 45f070eb9..c756dfcfa 100644 --- a/jero-web/src/views/projectManagement/components/responsibilityList.vue +++ b/jero-web/src/views/projectManagement/components/responsibilityList.vue @@ -20,6 +20,7 @@
import { getAction, postAction, downloadFile } from '@/api/manage' import moment from 'moment' + import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' export default { name: 'responsibilityList', + mixins:[ResizeHeader, ResizeColumnProvide], data() { return { visible: false, @@ -55,7 +58,7 @@ { title: this.$t('areaOfResponsibility'), dataIndex: 'dutyTerritoryName', - align: 'center', + align: 'left', width: 400, ellipsis: true, scopedSlots: { customRender: 'areaOfResponsibility' } @@ -63,7 +66,7 @@ { title: this.$t('Quantity'), dataIndex: 'amount', - align: 'center', + align: 'left', ellipsis: true, width: 300 } diff --git a/jero-web/src/views/projectManagement/components/settingList.vue b/jero-web/src/views/projectManagement/components/settingList.vue index 27189de6d..0161134a8 100644 --- a/jero-web/src/views/projectManagement/components/settingList.vue +++ b/jero-web/src/views/projectManagement/components/settingList.vue @@ -13,7 +13,7 @@
- * + {{$t('confirmationOfRegulationsList')}}
@@ -32,7 +32,7 @@
- * + {{$t('regulatoryTaskConfirmation')}}
@@ -51,7 +51,7 @@
- * + {{$t('confirmationOfDesignConformity')}}
@@ -70,7 +70,7 @@
- * + {{$t('preHomoCompletion')}}
@@ -89,7 +89,7 @@
- * + {{$t('certificationStart')}}
@@ -109,7 +109,7 @@
- * + {{$t('certificationEnd')}}
@@ -129,7 +129,7 @@
- * + {{$t('verificationAndConformityconfirmation')}}
@@ -163,55 +163,55 @@ confirmLoading: false, formInline: {}, rules: { - listConfirmation: [ - { - required: true, - message: this.$t('confirmationOfRegulationsList') + this.$t('cannotEmpty'), - trigger: 'change' - } - ], - legalTaskConfirmation: [ - { - required: true, - message: this.$t('regulatoryTaskConfirmation') + this.$t('cannotEmpty'), - trigger: 'change' - } - ], - designDeadline: [ - { - required: true, - message: this.$t('confirmationOfDesignConformity') + this.$t('cannotEmpty'), - trigger: 'change' - } - ], - prehomoDeadline: [ - { - required: true, - message: this.$t('preHomoCompletion') + this.$t('cannotEmpty'), - trigger: 'change' - } - ], - attestationStartTime: [ - { - required: true, - message: this.$t('certificationStart') + this.$t('cannotEmpty'), - trigger: 'change' - } - ], - attestationEndTime: [ - { - required: true, - message: this.$t('certificationEnd') + this.$t('cannotEmpty'), - trigger: 'change' - } - ], - verifyDeadline: [ - { - required: true, - message: this.$t('verificationConfirmationDeadline') + this.$t('cannotEmpty'), - trigger: 'change' - } - ] + // listConfirmation: [ + // { + // required: true, + // message: this.$t('confirmationOfRegulationsList') + this.$t('cannotEmpty'), + // trigger: 'change' + // } + // ], + // legalTaskConfirmation: [ + // { + // required: true, + // message: this.$t('regulatoryTaskConfirmation') + this.$t('cannotEmpty'), + // trigger: 'change' + // } + // ], + // designDeadline: [ + // { + // required: true, + // message: this.$t('confirmationOfDesignConformity') + this.$t('cannotEmpty'), + // trigger: 'change' + // } + // ], + // prehomoDeadline: [ + // { + // required: true, + // message: this.$t('preHomoCompletion') + this.$t('cannotEmpty'), + // trigger: 'change' + // } + // ], + // attestationStartTime: [ + // { + // required: true, + // message: this.$t('certificationStart') + this.$t('cannotEmpty'), + // trigger: 'change' + // } + // ], + // attestationEndTime: [ + // { + // required: true, + // message: this.$t('certificationEnd') + this.$t('cannotEmpty'), + // trigger: 'change' + // } + // ], + // verifyDeadline: [ + // { + // required: true, + // message: this.$t('verificationConfirmationDeadline') + this.$t('cannotEmpty'), + // trigger: 'change' + // } + // ] }, ids: [] } diff --git a/jero-web/src/views/projectManagement/components/transferList.vue b/jero-web/src/views/projectManagement/components/transferList.vue index ab5aa0d11..232174545 100644 --- a/jero-web/src/views/projectManagement/components/transferList.vue +++ b/jero-web/src/views/projectManagement/components/transferList.vue @@ -31,6 +31,7 @@
import { getAction, postAction } from '@/api/manage' + import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' export default { name: 'transferList', components: {}, props: ['url'], + mixins: [ResizeHeader, ResizeColumnProvide], data() { return { visible: false, @@ -79,25 +82,29 @@ title: this.$t('VirtualListName'), dataIndex: 'name', align: 'left', - ellipsis: true + ellipsis: true, + width: 235 }, { title: this.$t('instructionForUse'), dataIndex: 'useExplain', align: 'left', - ellipsis: true + ellipsis: true, + width: 235 }, { title: this.$t('updateTime'), dataIndex: 'updateTime', align: 'left', - ellipsis: true + ellipsis: true, + width: 235 }, { title: this.$t('creater'), dataIndex: 'createBy', align: 'left', - ellipsis: true + ellipsis: true, + width: 235 } ], dataList: [], diff --git a/jero-web/src/views/projectManagement/components/versionStatistics.vue b/jero-web/src/views/projectManagement/components/versionStatistics.vue index 7adb84e0f..5827159d0 100644 --- a/jero-web/src/views/projectManagement/components/versionStatistics.vue +++ b/jero-web/src/views/projectManagement/components/versionStatistics.vue @@ -31,6 +31,7 @@ import { getAction, postAction } from '@/api/manage' + import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' export default { name: 'versionStatistics', + mixins:[ResizeHeader, ResizeColumnProvide], data() { return { visible: false, diff --git a/jero-web/src/views/projectManagement/dialog/ParameterTemplate.vue b/jero-web/src/views/projectManagement/dialog/ParameterTemplate.vue index 8dc0595a1..556ddceeb 100644 --- a/jero-web/src/views/projectManagement/dialog/ParameterTemplate.vue +++ b/jero-web/src/views/projectManagement/dialog/ParameterTemplate.vue @@ -39,6 +39,7 @@ ref='table' size='middle' rowKey='id' + :components="drag(columns,'columns')" :columns='columns' :dataSource='areaTable' :pagination='false' @@ -72,12 +73,14 @@ import axios from 'axios' import Vue from 'vue' import ParameterTemplate from '../dialog/ParameterTemplate' import { ACCESS_TOKEN } from '@/store/mutation-types' +import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' export default { name: 'diolagArea', components: { ParameterTemplate }, + mixins:[ResizeHeader, ResizeColumnProvide], data() { return { token:Vue.ls.get(ACCESS_TOKEN), @@ -91,13 +94,15 @@ export default { title: this.$t('zoneOfApplication'), dataIndex: 'region_dictText', align: 'left', - ellipsis: true + ellipsis: true, + width: 296 }, { title: this.$t('parameterTemplate'), align: 'left', dataIndex: 'paramsTemplateName', - ellipsis: true + ellipsis: true, + width: 296 } ], newVisible: false, diff --git a/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue b/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue index f6abb5557..486fe5b67 100644 --- a/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue +++ b/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue @@ -148,6 +148,7 @@ ref='table' size='middle' rowKey='id' + :components="drag(columns,'columns')" :columns='columns' :dataSource='areaTable' :pagination='false' @@ -178,10 +179,12 @@ \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue index 763ab0ba8..41b6745b5 100644 --- a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue +++ b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue @@ -119,6 +119,7 @@ \ No newline at end of file diff --git a/jero-web/src/views/regulationsKanban/components/addModel.vue b/jero-web/src/views/regulationsKanban/components/addModel.vue index 585528cb1..46500f82b 100644 --- a/jero-web/src/views/regulationsKanban/components/addModel.vue +++ b/jero-web/src/views/regulationsKanban/components/addModel.vue @@ -68,6 +68,7 @@ ref='table' size='middle' rowKey='id' + :components="drag(columns,'columns')" :columns='columns' :dataSource='areaTable' :pagination='false' @@ -161,10 +162,12 @@ import axios from 'axios' import Vue from 'vue' import { ACCESS_TOKEN } from '@/store/mutation-types' + import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' export default { name: 'diolagArea', components: {}, + mixins:[ResizeHeader, ResizeColumnProvide], data() { return { token: Vue.ls.get(ACCESS_TOKEN), diff --git a/jero-web/src/views/regulationsKanban/index.vue b/jero-web/src/views/regulationsKanban/index.vue index 1ce4af1f4..7bce34131 100644 --- a/jero-web/src/views/regulationsKanban/index.vue +++ b/jero-web/src/views/regulationsKanban/index.vue @@ -84,6 +84,7 @@ \ No newline at end of file diff --git a/jero-web/src/views/system/DictItemList.vue b/jero-web/src/views/system/DictItemList.vue index b3a89d3c2..1f169ea72 100644 --- a/jero-web/src/views/system/DictItemList.vue +++ b/jero-web/src/views/system/DictItemList.vue @@ -53,6 +53,7 @@ ref="table" rowKey="id" size="middle" + :components="drag(columns,'columns')" :scroll="{x: '100%'}" :columns="columns" :dataSource="dataSource" @@ -83,10 +84,11 @@ import {filterObj} from '@/utils/util'; import DictItemModal from './modules/DictItemModal' import {JeroListMixin} from '@/mixins/JeroListMixin' + import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' export default { name: "DictItemList", - mixins: [JeroListMixin], + mixins: [JeroListMixin, ResizeHeader, ResizeColumnProvide], components: {DictItemModal}, data() { return { diff --git a/jero-web/src/views/system/DictList.vue b/jero-web/src/views/system/DictList.vue index 2c5587474..91503bbb7 100644 --- a/jero-web/src/views/system/DictList.vue +++ b/jero-web/src/views/system/DictList.vue @@ -63,6 +63,7 @@ ref="table" rowKey="id" size="middle" + :components="drag(columns,'columns')" :scroll="{x: '100%'}" :columns="columns" :dataSource="dataSource" @@ -98,10 +99,11 @@ import { getAction } from '@/api/manage' import { UI_CACHE_DB_DICT_DATA } from '@/store/mutation-types' import Vue from 'vue' + import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' export default { name: 'DictList', - mixins: [JeroListMixin], + mixins: [JeroListMixin, ResizeHeader, ResizeColumnProvide], components: { DictModal, DictItemList, DictDeleteList }, data() { return { @@ -128,7 +130,7 @@ title: this.$t('DictionaryName'), align: 'left', dataIndex: 'dictName', - width: '25%', + width: 160, ellipsis: true }, // { @@ -148,14 +150,14 @@ title: this.$t('DictionaryNumber'), align: 'left', dataIndex: 'dictCode', - width: '25%', + width: 160, ellipsis: true }, { title: this.$t('describe'), align: 'left', dataIndex: 'description', - width: '25%', + width: 160, ellipsis: true }, { diff --git a/jero-web/src/views/system/LogList.vue b/jero-web/src/views/system/LogList.vue index eb44eb1b1..1af8ea7fe 100644 --- a/jero-web/src/views/system/LogList.vue +++ b/jero-web/src/views/system/LogList.vue @@ -53,6 +53,7 @@ ref="table" size="middle" rowKey="id" + :components="drag(columns,'columns')" :columns="columns" :dataSource="dataSource" :pagination="ipagination" @@ -76,10 +77,11 @@ import { filterObj } from '@/utils/util'; import { JeroListMixin } from '@/mixins/JeroListMixin' import JEllipsis from '@/components/jero/JEllipsis' + import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' export default { name: "LogList", - mixins:[JeroListMixin], + mixins:[JeroListMixin, ResizeHeader, ResizeColumnProvide], components: { JEllipsis }, @@ -103,38 +105,44 @@ align:"left", customRender:function (t,r,index) { return parseInt(index)+1; - } + }, + width: 40 }, { title: this.$t('LogContent'), align:"left", dataIndex: 'logContent', scopedSlots: { customRender: 'logContent' }, - sorter: true + sorter: true, + width: 270 }, { title: this.$t('OperatorID'), dataIndex: 'userid', align:"left", - sorter: true + sorter: true, + width: 121 }, { title: this.$t('OperatorName'), dataIndex: 'username', align:"left", - sorter: true + sorter: true, + width: 141 }, { title: 'IP', dataIndex: 'ip', align:"left", - sorter: true + sorter: true, + width: 93 }, { title: this.$t('ElapsedTime'), dataIndex: 'costTime', align:"left", - sorter: true + sorter: true, + width: 136 }, { title: this.$t('LogType'), @@ -149,12 +157,14 @@ } },*/ align:"left", + width: 95 }, { title: this.$t('createTime'), dataIndex: 'createTime', align:"left", - sorter: true + sorter: true, + width: 199 } ], operateColumn: @@ -162,6 +172,7 @@ title: this.$t('OperationType'), dataIndex: 'operateType_dictText', align:"left", + width: 95 }, labelCol: { xs: { span: 1 }, diff --git a/jero-web/src/views/system/PermissionDataRuleList.vue b/jero-web/src/views/system/PermissionDataRuleList.vue index ecf71f0c5..977280d81 100644 --- a/jero-web/src/views/system/PermissionDataRuleList.vue +++ b/jero-web/src/views/system/PermissionDataRuleList.vue @@ -43,6 +43,7 @@ ref="table" rowKey="id" size="middle" + :components="drag(columns,'columns')" :columns="columns" :dataSource="dataSource" :loading="loading" @@ -67,10 +68,11 @@ import {getPermissionRuleList, queryPermissionRule} from '@/api/api' import {JeroListMixin} from '@/mixins/JeroListMixin' import PermissionDataRuleModal from './modules/PermissionDataRuleModal' + import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' export default { name: 'PermissionDataRuleList', - mixins: [JeroListMixin], + mixins: [JeroListMixin, ResizeHeader, ResizeColumnProvide], components: { PermissionDataRuleModal }, @@ -82,23 +84,27 @@ { title: this.$t('RuleName'), dataIndex: 'ruleName', - key: 'ruleName' + key: 'ruleName', + width: 170 }, { title: this.$t('RuleField'), dataIndex: 'ruleColumn', - key: 'ruleColumn' + key: 'ruleColumn', + width: 170 }, { title: this.$t('RuleValue'), dataIndex: 'ruleValue', - key: 'ruleValue' + key: 'ruleValue', + width: 137 }, { title: this.$t('operation'), dataIndex: 'action', scopedSlots: {customRender: 'action'}, - align: 'center' + align: 'left', + width: 130 } ], permId: '', diff --git a/jero-web/src/views/system/PermissionList.vue b/jero-web/src/views/system/PermissionList.vue index 715d0ba98..7a00593c8 100644 --- a/jero-web/src/views/system/PermissionList.vue +++ b/jero-web/src/views/system/PermissionList.vue @@ -30,6 +30,7 @@ :columns="columns" :scroll="{x: '100%'}" size="middle" + :components="drag(columns,'columns')" :pagination="false" :dataSource="dataSource" :loading="loading" @@ -89,11 +90,12 @@ import { JeroListMixin } from '@/mixins/JeroListMixin' import PermissionDataRuleList from './PermissionDataRuleList' import JEllipsis from '@/components/jero/JEllipsis' + import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' export default { name: 'PermissionList', - mixins: [JeroListMixin], + mixins: [JeroListMixin, ResizeHeader, ResizeColumnProvide], components: { PermissionDataRuleList, PermissionModal, diff --git a/jero-web/src/views/system/QuartzJobList.vue b/jero-web/src/views/system/QuartzJobList.vue index 60e047a36..010420b9b 100644 --- a/jero-web/src/views/system/QuartzJobList.vue +++ b/jero-web/src/views/system/QuartzJobList.vue @@ -59,6 +59,7 @@ size="middle" bordered rowKey="id" + :components="drag(columns,'columns')" :columns="columns" :dataSource="dataSource" :pagination="ipagination" @@ -113,10 +114,11 @@ import { getAction } from '@/api/manage' import { JeroListMixin } from '@/mixins/JeroListMixin' import JEllipsis from "@/components/jero/JEllipsis"; + import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' export default { name: "QuartzJobList", - mixins:[JeroListMixin], + mixins:[JeroListMixin, ResizeHeader, ResizeColumnProvide], components: { QuartzJobModal, JEllipsis @@ -153,11 +155,13 @@ /* customRender:function (text) { return "*"+text.substring(9,text.length); }*/ + width: 612 }, { title: 'cron表达式', align:"left", - dataIndex: 'cronExpression' + dataIndex: 'cronExpression', + width: 47 }, { title: '参数', @@ -182,7 +186,8 @@ filters: [ { text: '已启动', value: '0' }, { text: '已暂停', value: '-1' }, - ] + ], + width: 76 }, { title: '操作', diff --git a/jero-web/src/views/system/RoleUserList.vue b/jero-web/src/views/system/RoleUserList.vue index b6bd94ec3..55514965f 100644 --- a/jero-web/src/views/system/RoleUserList.vue +++ b/jero-web/src/views/system/RoleUserList.vue @@ -46,10 +46,12 @@