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-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 7b220a782..569e7bd31 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -3550,7 +3550,20 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl 0) ? 1 : 0); //总页数 + + // 分页计算 + int fromIndex = (pageNo-1) * subSize; + int toIndex = ((pageNo == subPageTotal) ? subCount : (pageNo * subSize)); + if( fromIndex <= subCount && toIndex <= subCount) { + records = records.subList(fromIndex, toIndex); + } else { + records = new ArrayList(); + } + //数据字典 List sysDictItems = sysDictItemServiceImpl.selectItemsAll(); @@ -3697,7 +3710,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl> mapList = queryCondition("1", cut, null); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java index 1eb348350..6e51bcfff 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java @@ -113,7 +113,7 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl + v-if='record.state == "待发起收集" || record.state == "工程接口人退回" || record.state == "变更" || record.state == "To be collected" || record.state == "Rejected by eng. interface" || record.state == "Modify"'> {{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue}} @@ -49,7 +49,7 @@ + v-if='record.state == "待发起收集" || record.state == "工程接口人退回" || record.state == "To be collected" || record.state == "Rejected by eng. interface"'> {{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue }} @@ -879,14 +879,14 @@ border: none !important; padding: 0 !important; } - ::v-deep .ant-table-row:first-child { - background: #fff!important; - /*opacity: 0.9;*/ - } - - ::v-deep .ant-table-body { - background: transparent!important; - } + //::v-deep .ant-table-row:first-child { + // background: #fff!important; + // /*opacity: 0.9;*/ + //} + // + //::v-deep .ant-table-body { + // background: transparent!important; + //} .content-text { width: 100%; display: flex; @@ -940,7 +940,7 @@ } .rowClassRed { - background: #f3d9de; + background: #f3d9de ; } .rowClassRedYellow { diff --git a/jero-web/src/store/modules/user.js b/jero-web/src/store/modules/user.js index c0ffe4931..51f28629b 100644 --- a/jero-web/src/store/modules/user.js +++ b/jero-web/src/store/modules/user.js @@ -136,7 +136,7 @@ const user = { window._CONFIG['domianPreviewURL'] = Vue.ls.get('domianPreviewURL') + '/jero-boot' window._CONFIG['domianWebSocketURL'] = Vue.ls.get('domianWebSocketURL') + '/jero-boot' window._CONFIG['onlinePreviewDomainURL'] = Vue.ls.get('onlinePreviewDomainURL') + '/onlinePreview' - window._CONFIG['httpsOnlinePreviewDomainURL'] = Vue.ls.get('httpsOnlinePreviewDomainURL') + '/preview/onlinePreview' + window._CONFIG['httpsOnlinePreviewDomainURL'] = Vue.ls.get('httpsOnlinePreviewDomainURL') + '/onlinePreview' //Vue.ls.set(USER_AUTH,authData); sessionStorage.setItem(USER_AUTH, JSON.stringify(authData)) sessionStorage.setItem(SYS_BUTTON_AUTH, JSON.stringify(allAuthData)) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue index 27d8c801e..43db4bdfb 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue @@ -234,6 +234,10 @@ placeholder: '', theme: 'snow', // or 'bubble' modules: { + clipboard: { + // 粘贴版，处理粘贴时候带图片 + matchers: [[Node.ELEMENT_NODE, this.handleCustomMatcher]], + }, toolbar: { container: toolbarOptions, // 工具栏 handlers: { @@ -338,6 +342,18 @@ quilleditorBlur() { this.$refs.ruleForm.validateField('content') }, + handleCustomMatcher(node, Delta) { + let ops = [] + Delta.ops.forEach(op => { + if (op.insert && typeof op.insert === 'string') {// 如果粘贴了图片，这里会是一个对象，如果是字符串则可以添加 + ops.push({ + insert: op.insert, + }) + } + }) + Delta.ops = ops + return Delta + }, getBase() { getAction('/problemKnowledgeBase/problemKnowledgeBaseClassifyEO/list', {}).then((res) => { if (res.success) { 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/documentManage/library/docDetail/index.vue b/jero-web/src/views/documentManage/library/docDetail/index.vue index d7ff597ec..45e0b58bf 100644 --- a/jero-web/src/views/documentManage/library/docDetail/index.vue +++ b/jero-web/src/views/documentManage/library/docDetail/index.vue @@ -21,20 +21,23 @@ {{$t('UpdateLog')}}
-
{{$t('DocumentSplitting')}}
-
+
{{$t('DocumentTranslation')}}
-
+
{{$t('DocumentComparison')}}
-
+
{{$t('KnowledgeDatabase')}}
@@ -357,6 +360,46 @@ }, methods: { ...mapGetters(['userInfo']), + DocumentTranslationClick() { + let serial_number = '' + if (this.detailList.length > 0) { + this.detailList[0][this.$t('essentialInformation')].forEach(res => { + if (res.db_field_name == 'serial_number') { + serial_number = res.value + } + }) + } + let newUrl = this.$router.resolve({ + path: '/documentTranslation', + query: { + serial_number: serial_number + } + }) + window.open(newUrl.href, '_blank') + }, + DocumentComparisonClick() { + let serial_number = '' + if (this.detailList.length > 0) { + this.detailList[0][this.$t('essentialInformation')].forEach(res => { + if (res.db_field_name == 'serial_number') { + serial_number = res.value + } + }) + } + let newUrl = this.$router.resolve({ + path: '/documentComparison', + query: { + serial_number: serial_number + } + }) + window.open(newUrl.href, '_blank') + }, + KnowledgeDatabaseClick() { + let newUrl = this.$router.resolve({ + path: '/problemknowledgeBase', + }) + window.open(newUrl.href, '_blank') + }, getTitle(callback) { let _id = this.$route.query.documentId === undefined ? this.$route.query.id : this.$route.query.documentId getAction(this.url.getTitle, { id: _id }).then((res) => { @@ -459,10 +502,18 @@ this.bussLogList() }, DocumentSplitting() { + let serial_number = '' + if (this.detailList.length > 0) { + this.detailList[0][this.$t('essentialInformation')].forEach(res => { + if (res.db_field_name == 'serial_number') { + serial_number = res.value + } + }) + } let newUrl = this.$router.resolve({ path: '/docManage/splite', query: { - serial_number: this.$route.query.serial_number + serial_number: serial_number } }) window.open(newUrl.href, '_blank') @@ -539,7 +590,7 @@ } .doc-detail-right { - width: 800px; + /*width: 800px;*/ line-height: 68px; display: flex; @@ -642,7 +693,7 @@ font-weight: 400; color: #040B29; display: inline-block; - width: 20%; + width: 100px; text-overflow: ellipsis; white-space: nowrap; overflow: hidden; diff --git a/jero-web/src/views/documentManage/splitting/index.vue b/jero-web/src/views/documentManage/splitting/index.vue index 938451ce0..1a861d333 100644 --- a/jero-web/src/views/documentManage/splitting/index.vue +++ b/jero-web/src/views/documentManage/splitting/index.vue @@ -137,7 +137,7 @@ }, mounted() { - if (this.$route.query.serial_number !== undefined) { + if (this.$route.query.serial_number) { this.serialnumber = this.$route.query.serial_number } }, 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" >