From 917943c6a191d4d00c9e351e31b8ad7aafcd62c1 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 24 Aug 2022 10:05:34 +0800 Subject: [PATCH 01/21] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E6=89=8B=E5=86=8C=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/tools/UserMenu.vue | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/jero-web/src/components/tools/UserMenu.vue b/jero-web/src/components/tools/UserMenu.vue index 959556614..7517a913e 100644 --- a/jero-web/src/components/tools/UserMenu.vue +++ b/jero-web/src/components/tools/UserMenu.vue @@ -31,6 +31,11 @@ +
+ + + +
@@ -207,6 +212,9 @@ hiddenClick() { this.shows = false }, + Jumpflybook(){ + window.open('https://eicgyqr5mc.feishu.cn/docx/doxcnY2GbQfMSMqLP0eIFzFlEcd', '_blank'); + }, /* update_end author:zhaoxin date:20191129 for: 做头部菜单栏导航*/ ...mapActions(['Logout']), ...mapGetters(['username', 'avatar', 'userInfo']), From 6c8decb9b36e6d6217271f2a47877c82bc7dae55 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 24 Aug 2022 10:58:07 +0800 Subject: [PATCH 02/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 3 ++ jero-web/src/common/lang/zh-cn.js | 4 +- .../components/listOfRegulationsView.vue | 40 +++++++++++++++++++ 3 files changed, 46 insertions(+), 1 deletion(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 7faa511ce..870cbb6fa 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1272,4 +1272,7 @@ module.exports = { BatchMaintenanceProgress:'Batch Maintenance Progress', BatchChangeStatus:'Batch Change Status', CollectinguthenticationParameters:'Collecting Authentication Parameters', + rejectedBy:'Rejected By', + rejectionTime:'Rejection Time', + rejectReason:'Reject Reason', } \ 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 736fedef2..5c3278427 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1374,5 +1374,7 @@ module.exports = { BatchMaintenanceProgress:'批量维护进度', BatchChangeStatus:'批量修改状态', CollectinguthenticationParameters:'认证参数收集', - + rejectedBy:'拒绝人', + rejectionTime:'拒绝时间', + rejectReason:'拒绝原因', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue b/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue index 8601a76be..89ae8dfa5 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue @@ -433,6 +433,46 @@
+
+ {{$t('reasonsForRejection')}} +
+ + +
+
+ {{$t('rejectedBy')}} +
+
+ {{formInline.verifyRemark ? formInline.verifyRemark : '--'}} +
+
+ + +
+
+ {{$t('rejectionTime')}} +
+
+ {{formInline.verifyRemark ? formInline.verifyRemark : '--'}} +
+
+ + + + +
+
+ {{$t('rejectReason')}} +
+
+ {{formInline.verifyRemark ? formInline.verifyRemark : '--'}} +
+
+ +
From 34aa0e1412818ee6b6fbe3ebbd8c2fceb8f3912b Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 24 Aug 2022 11:49:22 +0800 Subject: [PATCH 03/21] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=A8=A1=E6=9D=BF-=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E9=99=90=E5=88=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oss/service/impl/OSSFileServiceImpl.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java index a602b714c..94c8d84af 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java @@ -19,11 +19,9 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.util.FileCopyUtils; import org.springframework.web.multipart.MultipartFile; -import sun.misc.BASE64Encoder; import java.io.File; import java.io.IOException; -import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; import java.util.Date; @@ -230,14 +228,15 @@ public class OSSFileServiceImpl extends ServiceImpl impl throw new JeroBootException("Only upload pdf,word,excel type of file Please select the file again！"); } } - } else if ("2".equals(state)) { - String fileTypeStrTwo = ".doc,.DOC,.docx,.DOCX,.xls, .XLS,.xlsx,.XLSX"; + } else if ("2".equals(state)) { // 认证-参数导出模板上传 专用 + String fileTypeStrTwo = ".docx,.DOCX,.xlsx,.XLSX"; + List fileTypeStrTwoList = Arrays.asList(fileTypeStrTwo.split(",")); //固定文件 - if (!fileTypeStrTwo.contains(fileType)) { + if (!fileTypeStrTwoList.contains(fileType)) { if (cut.equals(CutEnum.CN.getValue())) { - throw new JeroBootException("只能够上传word,excel类型的文件。请重新选择文件！"); + throw new JeroBootException("只能够上传.docx,.DOCX,.xlsx,.XLSX后缀类型的文件。请重新选择文件！"); } else { - throw new JeroBootException("Only upload word,excel type of file Please select the file again！"); + throw new JeroBootException("Only upload .docx,.DOCX,.xlsx,.XLSX suffix type of file Please select the file again！"); } } } else { From 23fe9aa04a7edac7dc0d7b1f4bc500a4384925e6 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 24 Aug 2022 13:34:59 +0800 Subject: [PATCH 04/21] =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86=20=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E9=99=84=E4=BB=B6=E7=B1=BB=E5=9E=8B=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/tools/UserMenu.vue | 4 ++-- .../views/parameter/parameterexport/components/addModel.vue | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-web/src/components/tools/UserMenu.vue b/jero-web/src/components/tools/UserMenu.vue index 7517a913e..65ed8a73a 100644 --- a/jero-web/src/components/tools/UserMenu.vue +++ b/jero-web/src/components/tools/UserMenu.vue @@ -31,8 +31,8 @@ -
- +
+
diff --git a/jero-web/src/views/parameter/parameterexport/components/addModel.vue b/jero-web/src/views/parameter/parameterexport/components/addModel.vue index 46f282bea..c69c42ab4 100644 --- a/jero-web/src/views/parameter/parameterexport/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterexport/components/addModel.vue @@ -90,7 +90,7 @@ {{$t('submit')}}
- +
From f93c150dd0a2c34b74b631741e349c67a37331c6 Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 24 Aug 2022 14:02:58 +0800 Subject: [PATCH 05/21] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93-=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E8=AF=A6=E6=83=85-=E5=8F=82=E6=95=B0=E6=94=B6?= =?UTF-8?q?=E9=9B=86=E7=BB=9F=E8=AE=A1-bug58668?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ParamsManifestEOServiceImpl.java | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java index 66829d8f5..2ff7c916d 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java @@ -653,15 +653,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl> listAll = paramsCollectManifestEOMapper.listInfoForExport(paramsCollectManifestEO); // 循环责任领域，计算每个责任领域中的四种状态数据 - dutyTerritoryDictList.forEach(item->{ - - if (CutEnum.EN.getValue().equals(cut)) { - dutyTerritoryNameList.add(item.getTextEn()); - - } else { - dutyTerritoryNameList.add(item.getText()); - - } + for (DictModel item : dutyTerritoryDictList) { // 计算数量 double notStartNumber = listAll.stream().filter(e -> (CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.get("state")) @@ -689,12 +681,22 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl Date: Wed, 24 Aug 2022 14:29:25 +0800 Subject: [PATCH 06/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/tableCollection/index.vue | 1 + jero-web/src/components/tableCollection/index1.vue | 1 + .../components/evaluationResultsList.vue | 1 + .../businessSupport/collectionOfRegulatoryOpinions/index.vue | 1 + .../components/classificationMaintenanceModel.vue | 1 + .../problemKnowledgeBase/components/countryCardReleaseAdd.vue | 1 + .../problemKnowledgeBase/components/countryCardReleaseModel.vue | 1 + .../problemKnowledgeBase/components/displayInformationModel.vue | 1 + .../problemKnowledgeBase/components/optionMaintenance.vue | 1 + .../technologyAssessment/components/evaluationResultsClause.vue | 1 + .../src/views/businessSupport/technologyAssessment/index.vue | 1 + jero-web/src/views/documentTools/documentComparison/index.vue | 1 + .../documentTranslation/components/RetrieveFilesList.vue | 1 + jero-web/src/views/documentTools/documentTranslation/index.vue | 1 + .../documentTools/virtualList/components/virtualListDetails.vue | 1 + jero-web/src/views/externalReports/index.vue | 1 + jero-web/src/views/parameter/ParameterTemplate/index.vue | 1 + jero-web/src/views/parameter/escalationlibrary/index.vue | 1 + jero-web/src/views/parameter/parameterexport/index.vue | 1 + jero-web/src/views/parameter/parameterlist/index.vue | 1 + .../projectManagement/components/TaskParameterCollection.vue | 1 + .../src/views/projectManagement/components/listOfRegulations.vue | 1 + .../projectStatusBoard/components/projectStatusAndProgress.vue | 1 + jero-web/src/views/regulationsKanban/index.vue | 1 + jero-web/src/views/regulatoryEarlyWarning/index.vue | 1 + 25 files changed, 25 insertions(+) diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 027c52073..cb12e77dc 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -915,6 +915,7 @@ } ::v-deep .ant-table-row:first-child { background: #fff!important; + opacity: 0.9; } ::v-deep .ant-table-body { diff --git a/jero-web/src/components/tableCollection/index1.vue b/jero-web/src/components/tableCollection/index1.vue index 28058a3d1..fb916b256 100644 --- a/jero-web/src/components/tableCollection/index1.vue +++ b/jero-web/src/components/tableCollection/index1.vue @@ -730,6 +730,7 @@ } ::v-deep .ant-table-row:first-child { background: #fff!important; + opacity: 0.9; } ::v-deep .ant-table-body { diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue index e15d6bdf2..84f19760a 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue @@ -265,6 +265,7 @@ } ::v-deep .ant-table-row:first-child { background: #fff!important; + opacity: 0.9; } ::v-deep .ant-table-body { diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue index ae56be4b7..d24754c0c 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue @@ -349,6 +349,7 @@ } ::v-deep .ant-table-row:first-child { background: #fff!important; + opacity: 0.9; } ::v-deep .ant-table-body { diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue index 3ff31c40d..b3616ccb1 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue @@ -209,6 +209,7 @@ } ::v-deep .ant-table-row:first-child { background: #fff!important; + opacity: 0.9; } ::v-deep .ant-table-body { diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue index b6da4ce20..01723bdfa 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue @@ -359,6 +359,7 @@ } ::v-deep .ant-table-row:first-child { background: #fff!important; + opacity: 0.9; } ::v-deep .ant-table-body { diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModel.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModel.vue index e3c65af86..f21f47d46 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModel.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModel.vue @@ -217,6 +217,7 @@ } ::v-deep .ant-table-row:first-child { background: #fff!important; + opacity: 0.9; } ::v-deep .ant-table-body { diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue index 2ccb9cd8b..ec2a01540 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue @@ -188,6 +188,7 @@ } ::v-deep .ant-table-row:first-child { background: #fff!important; + opacity: 0.9; } ::v-deep .ant-table-body { diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/optionMaintenance.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/optionMaintenance.vue index b9bd3d0fe..efb36c7bd 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/optionMaintenance.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/optionMaintenance.vue @@ -211,6 +211,7 @@ } ::v-deep .ant-table-row:first-child { background: #fff!important; + opacity: 0.9; } ::v-deep .ant-table-body { diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue index 73673f51d..8dd8ec28a 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue @@ -425,6 +425,7 @@ } ::v-deep .ant-table-row:first-child { background: #fff!important; + opacity: 0.9; } ::v-deep .ant-table-body { diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue index 44692db24..8e83798ae 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue @@ -464,6 +464,7 @@ } ::v-deep .ant-table-row:first-child { background: #fff!important; + opacity: 0.9; } ::v-deep .ant-table-body { diff --git a/jero-web/src/views/documentTools/documentComparison/index.vue b/jero-web/src/views/documentTools/documentComparison/index.vue index ada3a0888..15534f18c 100644 --- a/jero-web/src/views/documentTools/documentComparison/index.vue +++ b/jero-web/src/views/documentTools/documentComparison/index.vue @@ -492,6 +492,7 @@ ::v-deep .ant-table-row:first-child { background: #fff!important; + opacity: 0.9; } ::v-deep .ant-table-body { diff --git a/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue b/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue index 87b913116..4f8a942ee 100644 --- a/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue +++ b/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue @@ -384,6 +384,7 @@ } ::v-deep .ant-table-row:first-child { background: #fff!important; + opacity: 0.9; } ::v-deep .ant-table-body { diff --git a/jero-web/src/views/documentTools/documentTranslation/index.vue b/jero-web/src/views/documentTools/documentTranslation/index.vue index 76c32b2a4..5b1458226 100644 --- a/jero-web/src/views/documentTools/documentTranslation/index.vue +++ b/jero-web/src/views/documentTools/documentTranslation/index.vue @@ -452,6 +452,7 @@ } ::v-deep .ant-table-row:first-child { background: #fff!important; + opacity: 0.9; } ::v-deep .ant-table-body { diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index 9e596a401..480997186 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -1024,6 +1024,7 @@ } ::v-deep .ant-table-row:first-child { background: #fff!important; + opacity: 0.9; } ::v-deep .ant-table-body { diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue index 4b363ba93..601ecb279 100644 --- a/jero-web/src/views/externalReports/index.vue +++ b/jero-web/src/views/externalReports/index.vue @@ -1079,6 +1079,7 @@ export default { @import '~@assets/less/common.less'; ::v-deep .ant-table-row:first-child { background: #fff!important; + opacity: 0.9; } ::v-deep .ant-table-body { diff --git a/jero-web/src/views/parameter/ParameterTemplate/index.vue b/jero-web/src/views/parameter/ParameterTemplate/index.vue index aee0d3cc1..1d08acb9a 100644 --- a/jero-web/src/views/parameter/ParameterTemplate/index.vue +++ b/jero-web/src/views/parameter/ParameterTemplate/index.vue @@ -491,6 +491,7 @@ export default { } ::v-deep .ant-table-row:first-child { background: #fff!important; + opacity: 0.9; } ::v-deep .ant-table-body { diff --git a/jero-web/src/views/parameter/escalationlibrary/index.vue b/jero-web/src/views/parameter/escalationlibrary/index.vue index d446b4851..e039f52ea 100644 --- a/jero-web/src/views/parameter/escalationlibrary/index.vue +++ b/jero-web/src/views/parameter/escalationlibrary/index.vue @@ -366,6 +366,7 @@ } ::v-deep .ant-table-row:first-child { background: #fff!important; + opacity: 0.9; } ::v-deep .ant-table-body { diff --git a/jero-web/src/views/parameter/parameterexport/index.vue b/jero-web/src/views/parameter/parameterexport/index.vue index 0b7eaad78..da66a2fcd 100644 --- a/jero-web/src/views/parameter/parameterexport/index.vue +++ b/jero-web/src/views/parameter/parameterexport/index.vue @@ -466,6 +466,7 @@ export default { } ::v-deep .ant-table-row:first-child { background: #fff!important; + opacity: 0.9; } ::v-deep .ant-table-body { diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue index e256d1914..61397d9ca 100644 --- a/jero-web/src/views/parameter/parameterlist/index.vue +++ b/jero-web/src/views/parameter/parameterlist/index.vue @@ -512,6 +512,7 @@ export default { } ::v-deep .ant-table-row:first-child { background: #fff!important; + opacity: 0.9; } ::v-deep .ant-table-body { diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index 55622d51d..26b867eb0 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -563,6 +563,7 @@ } ::v-deep .ant-table-row:first-child { background: #fff!important; + opacity: 0.95; } ::v-deep .ant-table-body { diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 93db90bb2..a1c78ba84 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -2308,6 +2308,7 @@ } ::v-deep .ant-table-row:first-child { background: #fff!important; + opacity: 0.9; } ::v-deep .ant-table-body { diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/components/projectStatusAndProgress.vue b/jero-web/src/views/projectManagement/projectStatusBoard/components/projectStatusAndProgress.vue index 2c406700f..e24ca3362 100644 --- a/jero-web/src/views/projectManagement/projectStatusBoard/components/projectStatusAndProgress.vue +++ b/jero-web/src/views/projectManagement/projectStatusBoard/components/projectStatusAndProgress.vue @@ -223,6 +223,7 @@ } ::v-deep .ant-table-row:first-child { background: #fff!important; + opacity: 0.9; } ::v-deep .ant-table-body { diff --git a/jero-web/src/views/regulationsKanban/index.vue b/jero-web/src/views/regulationsKanban/index.vue index 66a343b24..5112ee0ac 100644 --- a/jero-web/src/views/regulationsKanban/index.vue +++ b/jero-web/src/views/regulationsKanban/index.vue @@ -489,6 +489,7 @@ export default { } ::v-deep .ant-table-row:first-child { background: #fff!important; + opacity: 0.9; } ::v-deep .ant-table-body { diff --git a/jero-web/src/views/regulatoryEarlyWarning/index.vue b/jero-web/src/views/regulatoryEarlyWarning/index.vue index 9406d3be9..fcb5b468c 100644 --- a/jero-web/src/views/regulatoryEarlyWarning/index.vue +++ b/jero-web/src/views/regulatoryEarlyWarning/index.vue @@ -342,6 +342,7 @@ } ::v-deep .ant-table-row:first-child { background: #fff!important; + opacity: 0.9; } ::v-deep .ant-table-body { From e5ca6d6ddc37243494be79df9be92afd666c9140 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 24 Aug 2022 14:38:32 +0800 Subject: [PATCH 07/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/PersonnelSelection/index.vue | 62 ++++++++++--------- 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/jero-web/src/components/PersonnelSelection/index.vue b/jero-web/src/components/PersonnelSelection/index.vue index 476db1404..223a07302 100644 --- a/jero-web/src/components/PersonnelSelection/index.vue +++ b/jero-web/src/components/PersonnelSelection/index.vue @@ -89,7 +89,7 @@ this.searchModel = '' this.userIds = [] this.userName = [] - this.queryDepartUserTreeList() + this.queryDepartUserTreeList(1) this.visible = true }, standardDelete() { @@ -146,7 +146,7 @@ }) }) } - if (this.userName.length > 0){ + if (this.userName.length > 0) { for (let i = 0; i < this.userName.length; i++) { for (let j = i + 1; j < this.userName.length; j++) { if (this.userName[i] == this.userName[j]) { @@ -171,7 +171,6 @@ } let userIds = JSON.parse(JSON.stringify(this.userIds)) let userName = JSON.parse(JSON.stringify(this.userName)) - console.log(userName) this.$emit('input', userName.join(',')) this.$emit('change', this.query.db_field_name, userIds.join(','), this.query.subscript) this.visible = false @@ -195,7 +194,8 @@ if (e) { this.getUserAndDepart() } else { - this.queryDepartUserTreeList() + this.treeVisible = false + this.queryDepartUserTreeList(2) } }, getUserAndDepart() { @@ -214,12 +214,12 @@ if (this.departId == val.node.value) { } else { this.departId = val.node.value - this.queryDepartUserTreeList() + this.queryDepartUserTreeList(2) } } } }, - queryDepartUserTreeList() { + queryDepartUserTreeList(num) { let gData = JSON.parse(JSON.stringify(this.gData)) if (gData && gData.length > 0) { gData = JSON.stringify(gData) @@ -236,32 +236,34 @@ if (res.success) { this.gData = res.result this.defaultExpandedKeys = [this.departId] - if (this.userName && this.userName.length == 0) { - if (this.personneQuery[this.query.db_field_name + 'Name']) { - this.userName = this.personneQuery[this.query.db_field_name + 'Name'].split(',') - } else if (this.personneQuery[this.query.db_field_name]) { - this.userName = this.personneQuery[this.query.db_field_name].split(',') - } else { - this.userName = [] + if (num == 1) { + if (this.userName && this.userName.length == 0) { + if (this.personneQuery[this.query.db_field_name + 'Name']) { + this.userName = this.personneQuery[this.query.db_field_name + 'Name'].split(',') + } else if (this.personneQuery[this.query.db_field_name]) { + this.userName = this.personneQuery[this.query.db_field_name].split(',') + } else { + this.userName = [] + } } - } - if (this.userIds && this.userIds.length == 0) { - if (this.personneQuery[this.query.db_field_name + '_id']) { - this.userIds = this.personneQuery[this.query.db_field_name + '_id'].split(',') - } else if (this.personneQuery[this.query.db_field_name]) { - this.userIds = this.personneQuery[this.query.db_field_name].split(',') - } else { - this.userIds = [] + if (this.userIds && this.userIds.length == 0) { + if (this.personneQuery[this.query.db_field_name + '_id']) { + this.userIds = this.personneQuery[this.query.db_field_name + '_id'].split(',') + } else if (this.personneQuery[this.query.db_field_name]) { + this.userIds = this.personneQuery[this.query.db_field_name].split(',') + } else { + this.userIds = [] + } } - } - this.defaultCheckedKeys = this.userIds - this.defaultCheckedKeysName = [] - if (this.defaultCheckedKeys.length > 0) { - for (let i = 0; i < this.defaultCheckedKeys.length; i++) { - this.defaultCheckedKeysName.push({ - id: this.defaultCheckedKeys[i], - name: this.userName[i] - }) + this.defaultCheckedKeys = this.userIds + this.defaultCheckedKeysName = [] + if (this.defaultCheckedKeys.length > 0) { + for (let i = 0; i < this.defaultCheckedKeys.length; i++) { + this.defaultCheckedKeysName.push({ + id: this.defaultCheckedKeys[i], + name: this.userName[i] + }) + } } } this.treeVisible = true From 9b60e5ce36c9d52f9e5f1532bcee0c4e38735f21 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 24 Aug 2022 14:51:28 +0800 Subject: [PATCH 08/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/viewFileModel/index.vue | 4 ++-- .../components/RegulationMonthlyManagement.vue | 2 +- .../views/dashboard/components/monthlyReportRegulations.vue | 2 +- .../src/views/documentManage/library/docDetail/index.vue | 4 ++-- .../src/views/documentTools/documentComparison/index.vue | 4 ++-- .../searchCenter/components/DocumentLibrary.vue | 2 +- .../searchCenter/components/monthlyReportRegulations.vue | 4 ++-- .../searchCenter/components/problemKnowledgeBase.vue | 2 +- .../views/documentTools/searchCenter/components/whole.vue | 4 ++-- .../virtualList/components/virtualListDetails.vue | 6 +++--- .../views/processCenter/components/standardContentList.vue | 6 +++--- .../projectManagement/components/listOfRegulations.vue | 6 +++--- .../projectManagement/components/resultReportedUpload.vue | 2 +- .../src/views/projectManagement/historicalVersion/index.vue | 6 +++--- 14 files changed, 27 insertions(+), 27 deletions(-) diff --git a/jero-web/src/components/viewFileModel/index.vue b/jero-web/src/components/viewFileModel/index.vue index 6dafa860e..49531a79d 100644 --- a/jero-web/src/components/viewFileModel/index.vue +++ b/jero-web/src/components/viewFileModel/index.vue @@ -22,7 +22,7 @@ > {{$t('See')}} @@ -74,7 +74,7 @@ let fileSuffix = fileName.substring(index1, index2) if (fileSuffix == '.pdf') { window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id+'&userName='+this.userInfo().username)) - } else if (fileSuffix == '.docx') { + } else if (fileSuffix == '.docx' || fileSuffix == '.doc') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) window.open(url, '_blank') } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') { diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue index 2b7ab0079..ed6094a76 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue @@ -213,7 +213,7 @@ let fileSuffix = fileName.substring(index1, index2) if (fileSuffix === '.pdf') { window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + item.fileId + '&userName=' + this.userInfo().username)) - } else if (fileSuffix === '.docx') { + } else if (fileSuffix === '.docx' || fileSuffix === '.doc') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.fileId + fileSuffix) window.open(url, '_blank') } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls') { diff --git a/jero-web/src/views/dashboard/components/monthlyReportRegulations.vue b/jero-web/src/views/dashboard/components/monthlyReportRegulations.vue index b70c93ce8..122ace1cd 100644 --- a/jero-web/src/views/dashboard/components/monthlyReportRegulations.vue +++ b/jero-web/src/views/dashboard/components/monthlyReportRegulations.vue @@ -71,7 +71,7 @@ let fileSuffix = fileName.substring(index1, index2) if (fileSuffix === '.pdf') { window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + item.fileId + '&userName=' + this.userInfo().username)) - } else if (fileSuffix === '.docx') { + } else if (fileSuffix === '.docx' || fileSuffix === '.doc') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.fileId + fileSuffix) window.open(url, '_blank') } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls') { diff --git a/jero-web/src/views/documentManage/library/docDetail/index.vue b/jero-web/src/views/documentManage/library/docDetail/index.vue index 50a6d18c9..d7ff597ec 100644 --- a/jero-web/src/views/documentManage/library/docDetail/index.vue +++ b/jero-web/src/views/documentManage/library/docDetail/index.vue @@ -247,7 +247,7 @@ > {{$t('See')}} @@ -406,7 +406,7 @@ let fileSuffix = fileName.substring(index1, index2) if (fileSuffix == '.pdf') { window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id + '&userName=' + this.userInfo().username)) - } else if (fileSuffix == '.docx') { + } else if (fileSuffix == '.docx' || fileSuffix == '.doc') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) window.open(url, '_blank') } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') { diff --git a/jero-web/src/views/documentTools/documentComparison/index.vue b/jero-web/src/views/documentTools/documentComparison/index.vue index 15534f18c..64eaaeb48 100644 --- a/jero-web/src/views/documentTools/documentComparison/index.vue +++ b/jero-web/src/views/documentTools/documentComparison/index.vue @@ -403,7 +403,7 @@ let fileSuffix = fileName.substring(index1, index2) if (fileSuffix === '.pdf') { window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + row.fileIdLeft + '&userName=' + this.userInfo().username)) - } else if (fileSuffix === '.docx') { + } else if (fileSuffix === '.docx' || fileSuffix === '.doc') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + row.fileIdLeft + fileSuffix) window.open(url, '_blank') } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls') { @@ -420,7 +420,7 @@ let fileSuffix = fileName.substring(index1, index2) if (fileSuffix === '.pdf') { window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + row.fileIdRight + '&userName=' + this.userInfo().username)) - } else if (fileSuffix === '.docx') { + } else if (fileSuffix === '.docx' || fileSuffix === '.doc') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + row.fileIdRight + fileSuffix) window.open(url, '_blank') } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls') { diff --git a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue index 237828bc4..362d5d49d 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue @@ -693,7 +693,7 @@ let fileSuffix = fileName.substring(index1, index2) if (fileSuffix == '.pdf') { window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id + '&userName=' + this.userInfo().username)) - } else if (fileSuffix == '.docx') { + } else if (fileSuffix == '.docx' || fileSuffix == '.doc') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) window.open(url, '_blank') } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') { diff --git a/jero-web/src/views/documentTools/searchCenter/components/monthlyReportRegulations.vue b/jero-web/src/views/documentTools/searchCenter/components/monthlyReportRegulations.vue index fd51c2a98..e37b68e92 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/monthlyReportRegulations.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/monthlyReportRegulations.vue @@ -126,7 +126,7 @@ let fileSuffix = fileName.substring(index1, index2) if (fileSuffix == '.pdf') { window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + item.file_id + '&userName=' + this.userInfo().username)) - } else if (fileSuffix == '.docx') { + } else if (fileSuffix == '.docx' || fileSuffix == '.doc') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.file_id + fileSuffix) window.open(url, '_blank') } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') { @@ -147,7 +147,7 @@ let fileSuffix = fileName.substring(index1, index2) if (fileSuffix == '.pdf') { window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id.slice(0, 32) + '&userName=' + this.userInfo().username)) - } else if (fileSuffix == '.docx') { + } else if (fileSuffix == '.docx' || fileSuffix == '.doc') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id.slice(0, 32) + fileSuffix) window.open(url, '_blank') } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') { diff --git a/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue b/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue index 474298ff7..256fb82cb 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue @@ -262,7 +262,7 @@ let fileSuffix = fileName.substring(index1, index2) if (fileSuffix == '.pdf') { window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id + '&userName=' + this.userInfo().username)) - } else if (fileSuffix == '.docx') { + } else if (fileSuffix == '.docx' || fileSuffix == '.doc') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) window.open(url, '_blank') } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') { diff --git a/jero-web/src/views/documentTools/searchCenter/components/whole.vue b/jero-web/src/views/documentTools/searchCenter/components/whole.vue index 493f8d71c..70660ed12 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/whole.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/whole.vue @@ -167,7 +167,7 @@ let fileSuffix = fileName.substring(index1, index2) if (fileSuffix == '.pdf') { window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id.slice(0, 32) + '&userName=' + this.userInfo().username)) - } else if (fileSuffix == '.docx') { + } else if (fileSuffix == '.docx' || fileSuffix == '.doc') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id.slice(0, 32) + fileSuffix) window.open(url, '_blank') } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') { @@ -235,7 +235,7 @@ let fileSuffix = fileName.substring(index1, index2) if (fileSuffix == '.pdf') { window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + item.file_id + '&userName=' + this.userInfo().username)) - } else if (fileSuffix == '.docx') { + } else if (fileSuffix == '.docx' || fileSuffix == '.doc') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.file_id + fileSuffix) window.open(url, '_blank') } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') { diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index 480997186..31e0b904d 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -238,7 +238,7 @@ > + || record.fileSuffix == '.doc' || record.fileSuffix == '.xlsx' || record.fileSuffix == '.xls' ? false : true"> {{$t('See')}} @@ -803,7 +803,7 @@ let fileSuffix = fileName.substring(index1, index2) if (fileSuffix == '.pdf') { window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id + '&userName=' + this.userInfo().username)) - } else if (fileSuffix == '.docx') { + } else if (fileSuffix == '.docx' || fileSuffix == '.doc') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) window.open(url, '_blank') } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') { @@ -820,7 +820,7 @@ let fileSuffix = fileName.substring(index1, index2) if (fileSuffix == '.pdf') { window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + id + '&userName=' + this.userInfo().username)) - } else if (fileSuffix == '.docx') { + } else if (fileSuffix == '.docx' || fileSuffix == '.doc') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + id + fileSuffix) window.open(url, '_blank') } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') { diff --git a/jero-web/src/views/processCenter/components/standardContentList.vue b/jero-web/src/views/processCenter/components/standardContentList.vue index 6408371cf..44174cff2 100644 --- a/jero-web/src/views/processCenter/components/standardContentList.vue +++ b/jero-web/src/views/processCenter/components/standardContentList.vue @@ -40,7 +40,7 @@ > {{$t('See')}} @@ -183,7 +183,7 @@ let fileSuffix = fileName.substring(index1, index2) if (fileSuffix == '.pdf') { window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id+'&userName='+this.userInfo().username)) - } else if (fileSuffix == '.docx') { + } else if (fileSuffix == '.docx' || fileSuffix == '.doc') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) window.open(url, '_blank') } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') { @@ -200,7 +200,7 @@ let fileSuffix = fileName.substring(index1, index2) if (fileSuffix == '.pdf') { window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + id+'&userName='+this.userInfo().username)) - } else if (fileSuffix == '.docx') { + } else if (fileSuffix == '.docx' || fileSuffix == '.doc') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + id + fileSuffix) window.open(url, '_blank') } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') { diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index a1c78ba84..f4a5a16c5 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -356,7 +356,7 @@ > {{$t('See')}} @@ -2009,7 +2009,7 @@ let fileSuffix = fileName.substring(index1, index2) if (fileSuffix == '.pdf') { window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id + '&userName=' + this.userInfo().username)) - } else if (fileSuffix == '.docx') { + } else if (fileSuffix == '.docx' || fileSuffix == '.doc') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) window.open(url, '_blank') } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') { @@ -2027,7 +2027,7 @@ let fileSuffix = fileName.substring(index1, index2) if (fileSuffix == '.pdf') { window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + id + '&userName=' + this.userInfo().username)) - } else if (fileSuffix == '.docx') { + } else if (fileSuffix == '.docx' || fileSuffix == '.doc') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + id + fileSuffix) window.open(url, '_blank') } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') { diff --git a/jero-web/src/views/projectManagement/components/resultReportedUpload.vue b/jero-web/src/views/projectManagement/components/resultReportedUpload.vue index 5a2e491ef..7c45ecef5 100644 --- a/jero-web/src/views/projectManagement/components/resultReportedUpload.vue +++ b/jero-web/src/views/projectManagement/components/resultReportedUpload.vue @@ -211,7 +211,7 @@ let fileSuffix = fileName.substring(index1, index2) if (fileSuffix === '.pdf') { window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id+'&userName='+this.userInfo().username)) - } else if (fileSuffix === '.docx') { + } else if (fileSuffix === '.docx' || fileSuffix === '.doc') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) window.open(url, '_blank') } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls') { diff --git a/jero-web/src/views/projectManagement/historicalVersion/index.vue b/jero-web/src/views/projectManagement/historicalVersion/index.vue index 5eb6307b2..cd1d9a207 100644 --- a/jero-web/src/views/projectManagement/historicalVersion/index.vue +++ b/jero-web/src/views/projectManagement/historicalVersion/index.vue @@ -114,7 +114,7 @@ > {{$t('See')}} @@ -464,7 +464,7 @@ let fileSuffix = fileName.substring(index1, index2) if (fileSuffix == '.pdf') { window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id+'&userName='+this.userInfo().username)) - } else if (fileSuffix == '.docx') { + } else if (fileSuffix == '.docx' || fileSuffix == '.doc') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) window.open(url, '_blank') } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') { @@ -481,7 +481,7 @@ let fileSuffix = fileName.substring(index1, index2) if (fileSuffix == '.pdf') { window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + id+'&userName='+this.userInfo().username)) - } else if (fileSuffix == '.docx') { + } else if (fileSuffix == '.docx' || fileSuffix == '.doc') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + id + fileSuffix) window.open(url, '_blank') } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') { From 27d8ea82d4747c5f9005fd7302a9d4772c901a42 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 24 Aug 2022 15:17:40 +0800 Subject: [PATCH 09/21] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/searchcenter/enums/ModuleTypeFlagEnum.java | 1 + 1 file changed, 1 insertion(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/enums/ModuleTypeFlagEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/enums/ModuleTypeFlagEnum.java index 3fe0a4b21..dd0b61d4b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/enums/ModuleTypeFlagEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/enums/ModuleTypeFlagEnum.java @@ -1,6 +1,7 @@ package com.jero.modules.searchcenter.enums; public enum ModuleTypeFlagEnum { + DOCUMENT_LIBRARY("文档库","WDK"), LAWS_MONTHLY_REPORT("法规月报","FGYB"), PROBLEM_KNOWLEDGE_BASE_CLASSIFY("问题知识库","WTZSK"); From d08fd4c27f5ded18a7923939cfa693fc149b2a43 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 24 Aug 2022 15:23:56 +0800 Subject: [PATCH 10/21] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E7=B4=A2=E5=BC=95=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=9F=A5=E8=AF=86=E5=BA=93=E6=A3=80=E7=B4=A2?= =?UTF-8?q?=E5=8A=A0=E6=9D=83=E9=99=90=E3=80=82=E4=B8=8E=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93=E6=9D=83=E9=99=90=E4=B8=80=E6=A0=B7?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DocumentSearchServiceImpl.java | 40 +++++++++++++++++-- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java index 079061e34..47125c158 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java @@ -25,6 +25,7 @@ import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseUserEO; import com.jero.modules.problemKnowledgeBase.enums.ShowPermissionsEnum; import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseUserEOService; +import com.jero.modules.searchcenter.enums.ModuleTypeFlagEnum; import com.jero.modules.searchcenter.vo.SearchVO; import com.jero.modules.subscribe.entity.OnlCgformSubscribe; import com.jero.modules.subscribe.service.IOnlCgformSubscribeService; @@ -434,6 +435,16 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { JSONArray queryMapJsonThree = new JSONArray(); JSONArray queryMapJsonAll = new JSONArray(); + //基础查询权限，展示权限为公开的，所有人都能查看，展示权限为私密的，只有配置了权限的用户可以查看。 + if("base".equals("base")){ + JSONArray queryMapJsonBase = new JSONArray(); + + this.createQueryWhere(ShowPermissionsEnum.OPEN.getValue(),"show_permissions",queryMapJsonBase,SearchEnum.FULL_TEXT_SEARCH.getValue()); + + JSONObject jsonObject = jeroElasticsearchTemplate.buildBoolQuery(null, null, queryMapJsonBase); + queryMapJsonAll.add(jsonObject); + } + Map mapHighlight = new HashMap<>(); Map mapHighlight1 = new HashMap<>(); //封装首次的条件 @@ -1125,7 +1136,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { if("base".equals("base")){ JSONArray queryMapJsonBase = new JSONArray(); - this.createQueryWhere(ShowPermissionsEnum.OPEN.getValue(),"show_permissions",queryMapJsonBase); + this.createQueryWhere(ShowPermissionsEnum.OPEN.getValue(),"show_permissions",queryMapJsonBase,SearchEnum.INDEX_PROBLEM_KNOWLEDGE_BASE.getValue()); JSONObject jsonObject = jeroElasticsearchTemplate.buildBoolQuery(null, null, queryMapJsonBase); queryMapJsonAll.add(jsonObject); @@ -1169,12 +1180,12 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { //封装问题类型选择框查询条件。 if (StringUtils.isNotBlank(problem_type)) { - this.createQueryWhere(problem_type,"problem_type",queryMapJson); + this.createQueryWhere(problem_type,"problem_type",queryMapJson,SearchEnum.INDEX_PROBLEM_KNOWLEDGE_BASE.getValue()); } //封装市场选择框查询条件。 if (StringUtils.isNotBlank(target_market)) { - this.createQueryWhere(target_market,"target_market",queryMapJson); + this.createQueryWhere(target_market,"target_market",queryMapJson,SearchEnum.INDEX_PROBLEM_KNOWLEDGE_BASE.getValue()); } if(CollectionUtils.isNotEmpty(queryMapJson)){ @@ -1324,7 +1335,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { * @param fieldKey 查询的字段 * @param jsonArray */ - public void createQueryWhere (String queryValue,String fieldKey,JSONArray jsonArray){ + public void createQueryWhere (String queryValue,String fieldKey,JSONArray jsonArray,String indexName){ /** * fieldKeyMap：字段keyMap，用于存 需要查询的字段 以及字段中的条件 "queryMap" * queryMap：存放查询条件map @@ -1368,6 +1379,27 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { } jsonArray.add(matchMap); + + //筛选出 文档库、法规月报在搜索中心 全部索引的数据。 + if(StringUtils.equals(indexName,SearchEnum.FULL_TEXT_SEARCH.getValue())){ + Map fieldKeyMapWdk = new HashMap<>(); + Map queryMapWdk = new HashMap<>(); + Map matchMapWdk = new HashMap<>(); + + queryMapWdk.put("query", ModuleTypeFlagEnum.DOCUMENT_LIBRARY.getValue()); + fieldKeyMapWdk.put("module_type_flag", queryMapWdk); + matchMapWdk.put("match",fieldKeyMapWdk); + jsonArray.add(matchMapWdk); + + Map fieldKeyMapFgyb = new HashMap<>(); + Map queryMapFgyb = new HashMap<>(); + Map matchMapFgyb = new HashMap<>(); + + queryMapFgyb.put("query", ModuleTypeFlagEnum.LAWS_MONTHLY_REPORT.getValue()); + fieldKeyMapFgyb.put("module_type_flag", queryMapFgyb); + matchMapFgyb.put("match",fieldKeyMapFgyb); + jsonArray.add(matchMapFgyb); + } } } From f2f985e7a84c55df87f90cd244fac5ea9dbd0012 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 24 Aug 2022 15:44:53 +0800 Subject: [PATCH 11/21] 58586 --- .../impl/DocumentSearchServiceImpl.java | 27 ++++++++++++++++--- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java index 47125c158..46dfc4de6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java @@ -1152,10 +1152,10 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { Map map4 = new HashMap<>(); if("title".equals(field)){ map3.put("boost",1); - }else if("file_text".equals(field)){ - map3.put("boost",0.01); }else if("content".equals(field)){ map3.put("boost",0.01); + }else if("file_text".equals(field)){ + map3.put("boost",0.01); } //特殊处理标题字段 if (field.equals("title")){ @@ -1172,7 +1172,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { //高亮 if(!"flag".equals(field)){ - highlight(mapHighlight, field); + problemKnowledgeBaseHighlight(mapHighlight, field); } } mapHighlight1.put("fields",mapHighlight); @@ -1219,7 +1219,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { queryMapJsonTwo.add(queryMap); //高亮 if(!"flag".equals(field)){ - highlight(mapHighlight, field); + problemKnowledgeBaseHighlight(mapHighlight, field); } } mapHighlight1.put("fields",mapHighlight); @@ -1402,6 +1402,25 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { } } + /** + * 问题知识库高亮设置 + * @param mapHighlight + * @param key + */ + private void problemKnowledgeBaseHighlight(Map mapHighlight, String key) { + Map mapTemp = new HashMap<>(); + List list = new ArrayList<>(); + list.add(""); + List list1 = new ArrayList<>(); + list1.add(""); + mapTemp.put("pre_tags", list); + mapTemp.put("post_tags", list1); + mapTemp.put("fragment_size", 2000);//高亮字段内容长度，去除html样式标签，统计字数，设置为200 + mapTemp.put("number_of_fragments", 1);//高亮内容默认分为5段, 此处设置为一段 + mapTemp.put("type", "plain"); + mapHighlight.put(key, mapTemp); + } + } From bb2e3f8840b1a3799cf2f27a80cf1e0a15fe611d Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 24 Aug 2022 16:25:09 +0800 Subject: [PATCH 12/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../searchCenter/components/problemKnowledgeBase.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue b/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue index 256fb82cb..0df134b63 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue @@ -7,6 +7,7 @@ {{$t('problemClassification')}} Date: Wed, 24 Aug 2022 16:28:08 +0800 Subject: [PATCH 13/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../documentTools/searchCenter/components/DocumentLibrary.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue index 362d5d49d..a5ce32332 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue @@ -769,7 +769,8 @@ } .text-select { - flex: 1; + width: calc(100% - 126px); + height: 38px; } } } From 3342aea1f4fd21cc6354382451a7661749c08ab3 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 24 Aug 2022 16:28:46 +0800 Subject: [PATCH 14/21] update --- .../searchcenter/service/impl/DocumentSearchServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java index 46dfc4de6..f0c6c56ad 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java @@ -1415,7 +1415,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { list1.add(""); mapTemp.put("pre_tags", list); mapTemp.put("post_tags", list1); - mapTemp.put("fragment_size", 2000);//高亮字段内容长度，去除html样式标签，统计字数，设置为200 + mapTemp.put("fragment_size", 550);//高亮字段内容长度，去除html样式标签，统计字数，设置为200 mapTemp.put("number_of_fragments", 1);//高亮内容默认分为5段, 此处设置为一段 mapTemp.put("type", "plain"); mapHighlight.put(key, mapTemp); From 69eb85eccce5817089ff4e96e6371f445cbe77e1 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 24 Aug 2022 16:39:10 +0800 Subject: [PATCH 15/21] =?UTF-8?q?58555=20=E6=90=9C=E7=B4=A2=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=EF=BC=8C=E5=85=A8=E9=83=A8=E7=B4=A2=E5=BC=95=E3=80=81?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=9F=A5=E8=AF=86=E5=BA=93=E7=B4=A2=E5=BC=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8C=89=E7=85=A7=E5=88=9B=E5=BB=BA=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=80=92=E5=BA=8F=E6=8E=92=E5=BA=8F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProblemKnowledgeBaseEOServiceImpl.java | 2 +- .../impl/DocumentSearchServiceImpl.java | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java index aeeb5b137..5820e9634 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java @@ -380,7 +380,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl score = new HashMap<>(); +// Map score1 = new HashMap<>(); +// score.put("order","desc"); +// score1.put("_score",score); +// sort.putAll(score1); JSONObject sort = new JSONObject(); - Map score = new HashMap<>(); - Map score1 = new HashMap<>(); - score.put("order","desc"); - score1.put("_score",score); - sort.putAll(score1); + Map createTime = new HashMap<>(); + Map createTime1 = new HashMap<>(); + createTime.put("order","desc"); + createTime1.put("create_time",createTime); + sort.putAll(createTime1); // Map mapSort = new HashMap<>(); // Map mapSortTemp = new HashMap<>(); @@ -1247,7 +1253,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { Map createTime = new HashMap<>(); Map createTime1 = new HashMap<>(); createTime.put("order","desc"); - createTime1.put("createTime",createTime); + createTime1.put("create_time",createTime); sort.putAll(createTime1); Integer pageNo = Integer.parseInt(map.get("pageNo").toString()); From ec3f4204e10c77b17852e5cfda2293d1f189691d Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 24 Aug 2022 16:52:05 +0800 Subject: [PATCH 16/21] 58577 --- .../impl/DocumentSearchServiceImpl.java | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java index 27e30c886..a86912723 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java @@ -554,11 +554,13 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { // score1.put("_score",score); // sort.putAll(score1); JSONObject sort = new JSONObject(); - Map createTime = new HashMap<>(); - Map createTime1 = new HashMap<>(); - createTime.put("order","desc"); - createTime1.put("create_time",createTime); - sort.putAll(createTime1); + if(StringUtils.isEmpty(selectValue)){ + Map createTime = new HashMap<>(); + Map createTime1 = new HashMap<>(); + createTime.put("order","desc"); + createTime1.put("create_time",createTime); + sort.putAll(createTime1); + } // Map mapSort = new HashMap<>(); // Map mapSortTemp = new HashMap<>(); @@ -1250,11 +1252,13 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { queryMapJsonAll.add(jsonObjectThree); } JSONObject sort = new JSONObject(); - Map createTime = new HashMap<>(); - Map createTime1 = new HashMap<>(); - createTime.put("order","desc"); - createTime1.put("create_time",createTime); - sort.putAll(createTime1); + if(StringUtils.isEmpty(selectValue)){ + Map createTime = new HashMap<>(); + Map createTime1 = new HashMap<>(); + createTime.put("order","desc"); + createTime1.put("create_time",createTime); + sort.putAll(createTime1); + } Integer pageNo = Integer.parseInt(map.get("pageNo").toString()); Integer pageSize = Integer.parseInt(map.get("pageSize").toString()); From a905e773fc26065ac881ae5c7f9ead95a0c1d3b7 Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 24 Aug 2022 17:05:34 +0800 Subject: [PATCH 17/21] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5-bug58586?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LawsMonthlyReportManageEOServiceImpl.java | 6 +++--- .../service/impl/LawsMonthlyReportSearchServiceImpl.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java index c9f25752b..c96a1553d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java @@ -163,7 +163,7 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl issueTime = new HashMap<>(); Map issueTime1 = new HashMap<>(); issueTime.put("order","desc"); - issueTime1.put("issue_time",issueTime); + issueTime1.put("create_time",issueTime); sort.putAll(issueTime1); // Map mapSort = new HashMap<>(); @@ -258,7 +258,7 @@ public class LawsMonthlyReportSearchServiceImpl implements ILawsMonthlyReportSea list1.add(""); mapTemp.put("pre_tags", list); mapTemp.put("post_tags", list1); - mapTemp.put("fragment_size", 200);//高亮字段内容长度，去除html样式标签，统计字数，设置为200 + mapTemp.put("fragment_size", 550);//高亮字段内容长度，去除html样式标签，统计字数，设置为200 mapTemp.put("number_of_fragments", 1);//高亮内容默认分为5段, 此处设置为一段 mapTemp.put("type", "plain"); mapHighlight.put(key, mapTemp); From b670d46a80b35ed7eb3e4b86c316bf52f9a4f9c5 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 24 Aug 2022 17:45:17 +0800 Subject: [PATCH 18/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/listOfRegulationsView.vue | 80 +++++++++---------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue b/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue index 89ae8dfa5..1642cae03 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue @@ -433,46 +433,46 @@ -
- {{$t('reasonsForRejection')}} -
- - -
-
- {{$t('rejectedBy')}} -
-
- {{formInline.verifyRemark ? formInline.verifyRemark : '--'}} -
-
- - -
-
- {{$t('rejectionTime')}} -
-
- {{formInline.verifyRemark ? formInline.verifyRemark : '--'}} -
-
- - - - -
-
- {{$t('rejectReason')}} -
-
- {{formInline.verifyRemark ? formInline.verifyRemark : '--'}} -
-
- - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
From b05f1bcdf98d9dfd87d6f51dd14131c1351922d1 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 24 Aug 2022 18:09:12 +0800 Subject: [PATCH 19/21] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/documentTools/searchCenter/index.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/documentTools/searchCenter/index.vue b/jero-web/src/views/documentTools/searchCenter/index.vue index 8270a0c4b..7e7cd2b69 100644 --- a/jero-web/src/views/documentTools/searchCenter/index.vue +++ b/jero-web/src/views/documentTools/searchCenter/index.vue @@ -65,10 +65,10 @@ - - - - + + + +
From 5831e4e320d1dc5c367fc20b3f3073fec040313e Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 24 Aug 2022 18:11:48 +0800 Subject: [PATCH 20/21] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5-=E6=9A=82=E6=97=B6?= =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LawsMonthlyReportManageEOServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java index c96a1553d..b8d67b793 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java @@ -146,7 +146,7 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl Date: Wed, 24 Aug 2022 19:34:38 +0800 Subject: [PATCH 21/21] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93=E5=90=91es=E6=8F=92=E5=85=A5?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProblemKnowledgeBaseEOServiceImpl.java | 10 +++++----- .../impl/DocumentSearchServiceImpl.java | 18 +++++++++--------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java index 5820e9634..9927927d7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java @@ -92,7 +92,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl mapHighlight = new HashMap<>(); Map mapHighlight1 = new HashMap<>(); @@ -547,20 +547,20 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { JSONObject jsonObjectThree = jeroElasticsearchTemplate.buildBoolQuery(null, null, queryMapJsonThree); queryMapJsonAll.add(jsonObjectThree); } -// JSONObject sort = new JSONObject(); -// Map score = new HashMap<>(); -// Map score1 = new HashMap<>(); -// score.put("order","desc"); -// score1.put("_score",score); -// sort.putAll(score1); JSONObject sort = new JSONObject(); + Map score = new HashMap<>(); + Map score1 = new HashMap<>(); + score.put("order","desc"); + score1.put("_score",score); + sort.putAll(score1); + /*JSONObject sort = new JSONObject(); if(StringUtils.isEmpty(selectValue)){ Map createTime = new HashMap<>(); Map createTime1 = new HashMap<>(); createTime.put("order","desc"); createTime1.put("create_time",createTime); sort.putAll(createTime1); - } + }*/ // Map mapSort = new HashMap<>(); // Map mapSortTemp = new HashMap<>();