From b940ae67c594a68fd59982a5fa72c3abb767c0bd Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 16 Jun 2022 12:04:06 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E7=9C=8B=E6=9D=BF\=20?= =?UTF-8?q?=20=E6=A0=87=E7=AD=BE=E7=AE=A1=E7=90=86=E5=92=8C=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E5=86=85=E5=AE=B9=E7=AE=A1=E7=90=86=E4=B8=AD=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=AD=97=E6=AE=B5=E6=88=96=E9=85=8D=E7=BD=AE=E5=AD=97?= =?UTF-8?q?=E5=85=B8=E6=97=B6=EF=BC=8C=E7=A6=81=E6=AD=A2=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E9=80=97=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 5 +- jero-web/src/common/lang/zh-cn.js | 1 + .../documentManage/tags/dialog/DicList.vue | 667 +++++++-------- .../documentManage/tags/dialog/TagForm.vue | 756 +++++++++--------- .../documentManage/tags/tabs/TagContent.vue | 22 +- .../components/TaskPlanList.vue | 8 +- 6 files changed, 759 insertions(+), 700 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 2a3c29268..6e6c6c764 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -554,8 +554,8 @@ module.exports = { newNode: 'New node', modifyNode: 'Modify Node', deleteNode: 'Delete Node', - ImplementationDate: 'New Type Execute Date', - vehicleInProductionDate: 'New Vehicle Execute Date', + ImplementationDate: 'New Type Execution Date', + vehicleInProductionDate: 'New Vehicle Execution Date', deleteNodes: 'If there are child nodes under this node, they will be deleted synchronously. Are you sure to delete this data?', leastTwo: 'Please Select at Least two pieces of data', mergeTerms: 'Determine Merger Terms', @@ -937,5 +937,6 @@ module.exports = { documentLibraryDetails: 'Document library details', question:'Question', ConfirmQuestion:'Confirm Question', + disableInput:'Disable input', OnlyOrTaskconfirmationOut:'Only when the list confirmation status or task confirmation status is to be confirmed can the reminder be carried out', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index a24d204cf..7ab56bbee 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -943,4 +943,5 @@ module.exports = { question: '催办', ConfirmQuestion: '确认催办？', OnlyOrTaskconfirmationOut:'只有清单确认状态或任务确认状态为待确认时才可以进行催办', + disableInput:'禁止输入', } \ No newline at end of file diff --git a/jero-web/src/views/documentManage/tags/dialog/DicList.vue b/jero-web/src/views/documentManage/tags/dialog/DicList.vue index 281bc9c3b..f06a6d344 100644 --- a/jero-web/src/views/documentManage/tags/dialog/DicList.vue +++ b/jero-web/src/views/documentManage/tags/dialog/DicList.vue @@ -1,73 +1,80 @@ \ No newline at end of file diff --git a/jero-web/src/views/documentManage/tags/tabs/TagContent.vue b/jero-web/src/views/documentManage/tags/tabs/TagContent.vue index 5c5a512da..0df58f3f4 100644 --- a/jero-web/src/views/documentManage/tags/tabs/TagContent.vue +++ b/jero-web/src/views/documentManage/tags/tabs/TagContent.vue @@ -53,7 +53,8 @@ :placeholder="$t('PleaseSelectLabelType')"/> - + - @@ -228,8 +229,8 @@ } contentRightText[0].style = 'display:none' contentRightXian[0].style = 'display:none' - let clientWidthOne = dataList[0].clientWidth * dataList.length - clientWidthOne = clientWidthOne / timeList.length + let clientWidthOne = dataList[0].clientWidth + clientWidthOne = clientWidthOne / length let num = Math.ceil(clientWidthOne / 31) * parseInt(this.handlingTime.slice(8, 10)) timeList.forEach((res, index) => { if (res.slice(0, 7) == this.handlingTime.slice(0, 7)) { @@ -389,7 +390,6 @@ border-bottom: 1px #EAEAEC solid; flex: 1; height: 36px; - padding-left: 10px; color: #54565A; font-weight: bold; font-size: 14px; From 989688d87fb5aa573b38648bba5ad47509eab482 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 16 Jun 2022 12:34:28 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E5=AF=BC?= =?UTF-8?q?=E5=85=A5,=E6=A8=A1=E6=9D=BF=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BussDocumentLibraryEOServiceImpl.java | 6 +++--- .../main/java/com/jero/modules/split/common/FileUnZip.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) 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 595f18294..851b075ba 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 @@ -4399,10 +4399,10 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl nowFileList = FileUnZip.readFileByFilename(zipEntryName, fileName,cut,errorMsg,null,key,key); if (nowFileList.size() == 0) { if(CutEnum.CN.getValue().equals(cut)){ - errorMsg += key + "压缩包中没有" + fileName + "文件, "; + errorMsg += key + " 压缩包中没有" + fileName + "文件, "; }else{ errorMsg += key + " Not in the zip package" + fileName + "file, "; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java index 9962c9ba9..c51c2c55a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java @@ -136,8 +136,8 @@ public class FileUnZip { String filenameOne = ""; String filenameTwo = ""; if(filename.contains("/")){ - filenameOne = filename.split("/")[0]; - filenameTwo = filename.split("/")[1]; + filenameOne = filename.split("/")[1]; + filenameTwo = filename.split("/")[2]; } List resultlist = new ArrayList<>(); if (StringUtil.isNotEmpty(path)){ From 676eaad0088bdf0eb33d737c9a57b96f45041b9c Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 16 Jun 2022 13:20:49 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=20=E6=A0=87=E7=AD=BE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=92=8C=E6=A0=87=E7=AD=BE=E5=86=85=E5=AE=B9=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=B8=AD=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=E6=88=96=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=AD=97=E5=85=B8=E6=97=B6=EF=BC=8C=E7=A6=81=E6=AD=A2?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E9=80=97=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/documentManage/tags/dialog/TagForm.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/documentManage/tags/dialog/TagForm.vue b/jero-web/src/views/documentManage/tags/dialog/TagForm.vue index 92a925ed7..8a6023040 100644 --- a/jero-web/src/views/documentManage/tags/dialog/TagForm.vue +++ b/jero-web/src/views/documentManage/tags/dialog/TagForm.vue @@ -222,7 +222,8 @@ ], dbFieldEnName: [ { required: true, message: this.$t('PleaseEnterYourEnglishName'), trigger: 'change' }, - { max: 50, message: this.$t('cantExeed') + '50' + this.$t('characters'), trigger: 'blur' } + { max: 50, message: this.$t('cantExeed') + '50' + this.$t('characters'), trigger: 'blur' }, + { validator: this.test } ], fieldShowType: [ { required: true, message: this.$t('PleaseSelectAttributeType'), trigger: 'change' }