diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java index d369bb8fc..6e92fa0dd 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java @@ -170,6 +170,13 @@ public class CommonController { // bizPath = ""; // } } + if(file.getOriginalFilename().length()>70){ + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + throw new JeroBootException("文件名长度不能超过70位,请检查!"); + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + throw new JeroBootException("File name length cannot exceed 70 characters, please check!"); + } + } // OSSFile oSSFile = ossFileService.uploadLocal(file, bizPath,state,cut); OSSFile oSSFile = ossFileService.uploadLocalOfCos(file, bizPath,state,cut); // 切换cos if (oConvertUtils.isNotEmpty(oSSFile)) { @@ -186,6 +193,10 @@ public class CommonController { return result; } + public static void main(String[] args) { + + } + /** * 查看已上传的文件 * @param id diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/utils/TranslationDocumentUtils.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/utils/TranslationDocumentUtils.java index 4ea483db6..8e4aa43a5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/utils/TranslationDocumentUtils.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/utils/TranslationDocumentUtils.java @@ -88,11 +88,15 @@ public class TranslationDocumentUtils { if(i == 0){ translateFrontTextSplit = translateFrontText.substring(0,splitLength); }else { + //每一次截取开始的下标 + int startSplitLength = i*(splitLength) + 1; //如果长度不够根据splitLength再截取一次。 - if(translateFrontText.length() < i*splitLength+(splitLength+1)){ - translateFrontTextSplit = translateFrontText.substring(i*(splitLength + 1),translateFrontText.length()); + if(translateFrontText.length() < i*splitLength+(splitLength)){ + if(startSplitLength < translateFrontText.length()){ + translateFrontTextSplit = translateFrontText.substring(startSplitLength,translateFrontText.length()); + } }else { - translateFrontTextSplit = translateFrontText.substring(i*(splitLength + 1),i*splitLength+(splitLength+1)); + translateFrontTextSplit = translateFrontText.substring(startSplitLength,i*splitLength+(splitLength)); } } diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue index 7c54837f7..5666202f0 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue @@ -25,7 +25,7 @@ -
+
{{$t('engineer')+item.createBy+$t('feedbackResults')}}
@@ -110,7 +110,7 @@ } }, mounted() { - document.title = this.$route.query.serialNumber +' '+this.$t('regulatoryTechnicalEvaluationResults') + document.title = this.$route.query.serialNumber + ' ' + this.$t('regulatoryTechnicalEvaluationResults') this.getList() }, methods: { @@ -118,10 +118,10 @@ let query = { firstInitiation: '2', whetherTobring: '2', - processBackground:this.$route.query.processBackground || '', - remark:this.$route.query.remark || '', - standId:this.$route.query.standId, - lawsTechnologyEvaluationId:this.$route.query.lawsTechnologyEvaluationId + processBackground: this.$route.query.processBackground || '', + remark: this.$route.query.remark || '', + standId: this.$route.query.standId, + lawsTechnologyEvaluationId: this.$route.query.lawsTechnologyEvaluationId } let newUrl = this.$router.resolve({ path: '/evaluationInitiationProcess', @@ -146,6 +146,11 @@ getAction(this.url.list, query).then((res) => { if (res.success) { this.dataSource = res.result || [] + if (this.dataSource.length == 0) { + this.dataSource.push({ + name: '' + }) + } this.loading = false } else { this.dataSource = [] diff --git a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue index 6ee645982..3446e276d 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue +++ b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue @@ -118,9 +118,9 @@ @cancel="visible = false" >