From 2c829d2860c8cd793f8238ce0e06c4c52072f450 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 28 Sep 2022 16:52:31 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9?= 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 | 3 + .../components/modules/defaultTemplate.vue | 135 +++++++++--------- .../components/TermInformation.vue | 10 +- .../components/documentDataComparison.vue | 50 ++++++- 5 files changed, 129 insertions(+), 72 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index bd059005d..446ed7756 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1312,4 +1312,7 @@ module.exports = { firstLevelDirectory:'First level directory', deselectAll:'Deselect All', classification:'Classification', + consistentAssessment:'Consistent assessment', + viewConsistentAssessment:'View Consistent Assessment', + viewAll:'View All', } \ 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 fa7a71a7c..c587adabc 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1413,4 +1413,7 @@ module.exports = { firstLevelDirectory:'一级目录', deselectAll:'取消全选', classification:'分类', + consistentAssessment:'一致评估', + viewConsistentAssessment:'查看一致评估', + viewAll:'查看全部', } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue index ace3619da..d989005a2 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue @@ -53,72 +53,6 @@ - -
-
- {{$t('vehicleType')}} -
- - - -
- - - - -
-
- {{$t('scopeOfApplication')}} -
- - - -
- - -
-
- {{$t('status')}} -
- - - -
- - - - -
-
- {{$t('usage')}} -
- - - -
-
@@ -133,6 +67,72 @@
+ + + + + + + + + + + + + + + + + + +
+
+ {{$t('scopeOfApplication')}} +
+ + + +
+ + + + +
+
+ {{$t('status')}} +
+ + + +
+ + + + +
+
+ {{$t('usage')}} +
+ + + +
+ @@ -516,4 +516,7 @@ margin-bottom: 40px; } + .itemModel-multi-one { + border: 1px solid #d9d9d9; + } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue index 2a792a313..0b3afea18 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue @@ -262,21 +262,21 @@ itemNum: res.items_num, itemName: res.items_name, itemContent: res.iterms_conditions, - zhan3_shi4_shun4_xu4: res.zhan3_shi4_shun4_xu4 || '' + display_seq: res.display_seq || '' }) }) } this.dataList = this.ImportFileData.concat(this.dataListData) - this.dataList.sort((a, b) => { - a.zhan3_shi4_shun4_xu4 - b.zhan3_shi4_shun4_xu4 + this.dataList = this.dataList.sort((a, b) => { + return a.display_seq - b.display_seq }) this.dataList = [...this.dataList] }, getPersonnelList(res) { this.ImportFileData = this.ImportFileData.concat(res) this.dataList = this.dataListData.concat(this.ImportFileData) - this.dataList.sort((a, b) => { - a.zhan3_shi4_shun4_xu4 - b.zhan3_shi4_shun4_xu4 + this.dataList = this.dataList.sort((a, b) => { + return a.display_seq - b.display_seq }) this.dataList = [...this.dataList] }, diff --git a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue index 6a5255d8c..4d0b38763 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue +++ b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue @@ -105,7 +105,10 @@
- {{$t('preservation')}} + {{$t('consistentAssessment')}} + + {{$t('preservation')}}
@@ -194,6 +197,51 @@ path: '/documentComparison' }) }, + consistentAssessmentClick() { + if (!this.dataLeft.id && !this.dataRight.id) { + this.$message.warning(this.$t('pleaseSelectTheDataCompared')) + return + } + let query = { + itemsIdLeft: this.dataLeft.id, + itemsIdRight: this.dataRight.id, + infoId: this.$route.query.id, + comment: '一致' + } + this.dataLoadingText = this.$t('pleaseWaitWhileRunning') + this.loading = true + postAction('/compare/sarFileCompareItemComment/add', query).then((res) => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.loading = false + this.formInline = {} + this.resultData.textRight.forEach(val => { + if (val.id == this.dataRight.id) { + val.reviewed = 1 + } + }) + this.resultData.textLeft.forEach(val => { + if (val.id == this.dataLeft.id) { + val.reviewed = 1 + } + }) + this.resultData = { ...this.resultData } + let detailLeftColor = document.getElementsByClassName('detail-content-content-right-data-color') + if (detailLeftColor && detailLeftColor.length > 0) { + detailLeftColor[0].classList.remove('detail-content-content-right-data-color') + } + let detailRightColor = document.getElementsByClassName('detail-content-content-right-data-color-right') + if (detailRightColor && detailRightColor.length > 0) { + detailRightColor[0].classList.remove('detail-content-content-right-data-color-right') + } + this.dataLeft = {} + this.dataRight = {} + } else { + this.$message.warning(this.$t('operationFailed')) + this.loading = false + } + }) + }, submit() { if (!this.dataLeft.id && !this.dataRight.id) { this.$message.warning(this.$t('pleaseSelectTheDataCompared')) From 6e08cd43fe2555a05736e01821666a012027b5cc Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Wed, 28 Sep 2022 16:56:57 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarFileCompareItemCommentController.java | 5 +++-- .../service/ISarFileCompareItemCommentService.java | 2 +- .../impl/SarFileCompareItemCommentServiceImpl.java | 10 +++++++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemCommentController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemCommentController.java index 1db0758fb..eea6df830 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemCommentController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemCommentController.java @@ -166,8 +166,9 @@ public class SarFileCompareItemCommentController extends JeroController queryCompareResult(@RequestParam(name = "infoId", required = true) String infoId) { - SarFileCompareResultVO res = sarFileCompareItemCommentService.queryCompareResult(infoId); + public Result queryCompareResult(@RequestParam(name = "infoId", required = true) String infoId, + @RequestParam(name = "comment", required = false) String comment) { + SarFileCompareResultVO res = sarFileCompareItemCommentService.queryCompareResult(infoId,comment); return Result.OK(res); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareItemCommentService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareItemCommentService.java index b9f86323e..bdbb7e97a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareItemCommentService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareItemCommentService.java @@ -65,7 +65,7 @@ public interface ISarFileCompareItemCommentService extends IService queryList(); - SarFileCompareResultVO queryCompareResult(String infoId); + SarFileCompareResultVO queryCompareResult(String infoId,String comment); void exportResXls(HttpServletRequest request,HttpServletResponse response, String infoId, String selectIds, boolean includeComments, String cut); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java index f695abd12..4872fd1ba 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java @@ -11,6 +11,7 @@ import com.jero.modules.compare.service.ISarFileCompareInfoService; import com.jero.modules.compare.service.ISarFileCompareItemCommentService; import com.jero.modules.compare.service.ISarFileCompareItemService; import com.jero.modules.system.util.StringUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.poi.hssf.usermodel.HSSFClientAnchor; import org.apache.poi.hssf.usermodel.HSSFPatriarch; import org.apache.poi.hssf.usermodel.HSSFWorkbook; @@ -134,7 +135,7 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl list = queryListByInfoId(infoId); + List list = queryListByInfoId(infoId,comment); Map sfcItemMap = SarFileCompareItemServiceImpl.queryMapByInfoId(infoId); for (SarFileCompareItemComment sfcItemCom : list) { SarFileCompareItemComVO itemComVO = new SarFileCompareItemComVO(); @@ -174,8 +175,11 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl queryListByInfoId(String infoId) { + public List queryListByInfoId(String infoId,String comment) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (ObjectUtils.isNotEmpty(comment)) { + queryWrapper.eq(SarFileCompareItemComment::getComment, comment); + } queryWrapper.eq(SarFileCompareItemComment::getInfoId, infoId); queryWrapper.orderBy(true, true, SarFileCompareItemComment::getCreateTime); List list = this.list(queryWrapper); From 270e9d330aadd8a5a82348fc1bd1cbba4532c480 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 28 Sep 2022 17:02:39 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/comparisonResults.vue | 36 +++++++++++++++---- 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue b/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue index 9c66155a9..d90985d0b 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue +++ b/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue @@ -9,6 +9,16 @@ {{$t('comparisonResults')}}
+
+ + {{$t('viewConsistentAssessment')}} +
+
+ + {{$t('viewAll')}} +
@@ -65,7 +75,8 @@
-
+
@@ -176,6 +187,7 @@ isDisplay: false, fullCheckbox: false, resultData: {}, + comment: '', language: '', url: { exportData: '/compare/sarFileCompareItemComment/exportResXls' @@ -207,7 +219,8 @@ let query = { selectIds: checkboxList.join(','), includeComments: fullCheckbox, - infoId: this.$route.query.id + infoId: this.$route.query.id, + comment: this.comment } downloadFile(this.url.exportData, this.resultData.serialNumberLeft + ' - ' + this.resultData.serialNumberRight + this.$t('comparisonResults') + '.xls', query, this.Deselect) }, @@ -217,10 +230,19 @@ this.indeterminate = false this.checkAll = false }, + viewConsistentAssessmentClick() { + this.comment = '一致' + this.getData() + }, + viewAllClick() { + this.comment = '' + this.getData() + }, getData() { let query = { id: this.$route.query.id, - infoId: this.$route.query.id + infoId: this.$route.query.id, + comment: this.comment } this.loading = true getAction('/compare/sarFileCompareItemComment/queryCompareResult', query).then((res) => { @@ -536,7 +558,7 @@ .detail-content-content-text-color { border: 1px solid #00B3BE; - background: rgba(0,179,190,0.0300); + background: rgba(0, 179, 190, 0.0300); } .detail-content-left { @@ -577,9 +599,11 @@ border-radius: 4px; float: left; } - .detail-content-bottom-color{ - background: rgba(0,179,190,0.0300); + + .detail-content-bottom-color { + background: rgba(0, 179, 190, 0.0300); } + .detail-content-bottom-left { width: 115px; font-size: 14px; From f0d8fd0e59d409346cd228e3c4b6605f6af1f9f6 Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Wed, 28 Sep 2022 17:05:25 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8A=A0=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarFileCompareItemCommentController.java | 5 +++-- .../compare/service/ISarFileCompareItemCommentService.java | 2 +- .../service/impl/SarFileCompareItemCommentServiceImpl.java | 5 ++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemCommentController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemCommentController.java index eea6df830..f1cebbb13 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemCommentController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemCommentController.java @@ -179,8 +179,9 @@ public class SarFileCompareItemCommentController extends JeroController list = null; if (includeComments && StringUtils.isEmpty(selectIds)) { //只导出全文评论的情况 @@ -198,6 +198,9 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl Date: Wed, 28 Sep 2022 17:08:53 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/countryCardView.vue | 32 +++++++++++++++++-- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue index dbf4c5fd1..703474c0d 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue @@ -52,10 +52,14 @@ - - {{$t('viewFile')}} + + + + + + {{$t('viewFile')}} + \ No newline at end of file From e0b606e943db31fabf9bf85043484dcb7f3b7fab Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 28 Sep 2022 17:24:15 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E5=AF=BC=E5=87=BA--?= =?UTF-8?q?=E8=A1=8C=E9=97=B4=E8=B7=9D(=E6=B3=A8=E9=87=8A=E6=8E=89)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsMonthlyReportWriteEOServiceImpl.java | 60 ++++++++++++------- .../jero/modules/report/util/WordUtil.java | 18 +++++- 2 files changed, 55 insertions(+), 23 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index 789ae882b..fa42b801f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -648,7 +648,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl lawsMonthlyReportWriteEOS, + private void coverCn(List lawsMonthlyReportWriteEOS, String titleCN, XWPFDocument document) { + //封面标识 + String flag = "cover"; String moth = lawsMonthlyReportWriteEOS.get(0).getMonth().replaceAll("-", "年") + "月"; titleCN = "\r\n\r\n" + titleCN + "\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n"; WordUtil.exportWord(document, titleCN, null, ParagraphAlignment.CENTER, 0, 18, - false, false, "Blue Sky Noto Regular",null,null); - WordUtil.exportWord(document, moth, null, ParagraphAlignment.CENTER, 0, 12, - false, true, "Blue Sky Noto Regular",null,null); + false, false, "Blue Sky Noto Regular",null,null,flag); + WordUtil.exportWord(document, moth+"\r\n", null, ParagraphAlignment.CENTER, 0, 12, + false, true, "Blue Sky Noto Regular",null,null,flag); + } + //封面 + private void coverEn(List lawsMonthlyReportWriteEOS, + String titleCN, + XWPFDocument document) { + //封面标识 + String flag = "cover"; + String moth = lawsMonthlyReportWriteEOS.get(0).getMonth().replaceAll("-", "年") + "月"; + + titleCN = "\r\n\r\n" + titleCN + "\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n"; + WordUtil.exportWord(document, titleCN, null, ParagraphAlignment.CENTER, 0, 18, + false, false, "Blue Sky Noto Regular",null,null,flag); + WordUtil.exportWord(document, moth+"\r\n", null, ParagraphAlignment.CENTER, 0, 12, + false, true, "Blue Sky Noto Regular",null,null,flag); } private void wordContent(List lawsMonthlyReportWriteEOS, List lawsMonthlyReportTitleTemplateEOS, @@ -904,8 +920,8 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl新征求意见清单模板, 新发布标准清单模板 @@ -960,13 +976,13 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl Date: Wed, 28 Sep 2022 17:29:03 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/modules/defaultTemplate.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue index d989005a2..9a91fe34f 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue @@ -107,7 +107,7 @@ {{$t('status')}}
- + {{$t('usage')}}
- + \ No newline at end of file From 4624187856647149077db5197b192f7ceabce4ab Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 28 Sep 2022 17:34:49 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/problemKnowledgeBaseListView.vue | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue index a26329b79..292227312 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue @@ -470,15 +470,15 @@ font-size: 14px; font-weight: 400; color: #040B29; - display: -webkit-box; - text-overflow: ellipsis; - /*! autoprefixer: off */ - -webkit-box-orient: vertical; - -webkit-line-clamp: 2; - /*! autoprefixer: on;*/ - text-justify: inter-ideograph; + /*display: -webkit-box;*/ + /*text-overflow: ellipsis;*/ + /*!*! autoprefixer: off *!*/ + /*-webkit-box-orient: vertical;*/ + /*-webkit-line-clamp: 2;*/ + /*!*! autoprefixer: on;*!*/ + /*text-justify: inter-ideograph;*/ + /*overflow: hidden;*/ word-break: break-all; - overflow: hidden; } .content-box-content-botton { From 4d3f94e712f48ba4bb92c427ac8f5636dd758aa9 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 28 Sep 2022 17:37:22 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/problemKnowledgeBaseListView.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue index 292227312..81b22a7d4 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue @@ -102,7 +102,7 @@
- + {{val.createBy}} {{val.createTime}}
From 9b9660fa9ba2b4295568257c65323ab810f4b8c1 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 28 Sep 2022 17:53:59 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tabComponents/processCenter/index.vue | 67 ++++++++++++------- 1 file changed, 43 insertions(+), 24 deletions(-) diff --git a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue index 0a37d733a..fed2e4cf3 100644 --- a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue +++ b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue @@ -23,25 +23,25 @@
- - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + {{$t('query')}} @@ -73,6 +73,22 @@ {{$t('Processing')}} + + + {{record.serialNumber}} + + + {{record.prcNum}} + + + + + {{record.title}} + + + {{record.prcName}} + +
0) { let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) @@ -241,8 +260,8 @@ }) for (let i = 0; i < content.length; i++) { if (content[i].taskDefinitionKey != content[0].taskDefinitionKey) { - this.$message.warning(this.$t('processNodesAreInconsistentPleaseSelectConsistentData')) - return + this.$message.warning(this.$t('processNodesAreInconsistentPleaseSelectConsistentData')) + return } } this.$refs.batchProcessingRef.getData(JSON.parse(JSON.stringify(content)))