From 1bc02c53f2f54ca3985dd5ae6078e33294a9f7cc Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 3 Aug 2022 11:09:42 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=94=B6=E9=9B=86?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8D=A2=E8=A1=8C=E6=A0=B7=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectManagement/components/ParameterCollectionEchart.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue b/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue index 57d5c035c..4786177ce 100644 --- a/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue +++ b/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue @@ -219,6 +219,8 @@ html += params[i].marker + params[i].seriesName + ":" + params[i].value; if (_this.queryParam.value == 1) { html += "%" + "
"; + }else{ + html +="
"; } } return html; From 25801c7483e4ac81fcb8cff5f09706f08234ecea Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 3 Aug 2022 11:56:10 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E5=B8=83=E5=B1=80=E7=9F=A5=E8=AF=86?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 4 + jero-web/src/common/lang/zh-cn.js | 4 + .../classificationMaintenanceAdd.vue | 172 ++++++++++++ .../classificationMaintenanceModel.vue | 206 ++++++++++++++ .../components/problemKnowledgeBaseList.vue | 19 +- .../components/problemKnowledgeBaseView.vue | 263 +++++++++++++++++- .../components/documentDataComparison.vue | 2 +- .../components/initiateComparison.vue | 1 + .../documentComparison/index.vue | 17 +- 9 files changed, 662 insertions(+), 26 deletions(-) create mode 100644 jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceAdd.vue create mode 100644 jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 8b51e9e80..deb708f55 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1221,4 +1221,8 @@ module.exports = { dre:'dre', applicableInstructionsMarketList:'Applicable instructions of market list', pleaseSelectTheDataCompared:'Please select the data to be compared', + problemLabel:'Problem label', + personCharge:'Person in charge', + addLabel:'Add Label', + editLabel:'Edit Label', } \ 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 472fcb015..e3ce4ee27 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1324,4 +1324,8 @@ module.exports = { dre:'填写人', applicableInstructionsMarketList:'市场清单适用说明', pleaseSelectTheDataCompared:'请选择需要对比的数据', + problemLabel:'问题标签', + personCharge:'负责人', + addLabel:'新增标签', + editLabel:'编辑标签', } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceAdd.vue new file mode 100644 index 000000000..e86ce4846 --- /dev/null +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceAdd.vue @@ -0,0 +1,172 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue new file mode 100644 index 000000000..de9f3dcc3 --- /dev/null +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue @@ -0,0 +1,206 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index 73fe2200f..6036c6576 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -76,14 +76,19 @@ @showSizeChange="SizeChange" /> + @@ -85,4 +218,132 @@ } } } + + .box-text { + display: flex; + justify-content: space-between; + height: 60px; + line-height: 40px; + + .header-text { + font-size: 16px; + font-weight: 400; + color: #000F16; + } + } + + .content-text { + width: 100%; + display: flex; + flex-wrap: wrap; + + .text-field { + width: 33%; + margin-bottom: 8px; + + .text-field-left { + width: 124px; + display: inline-block; + font-size: 14px; + font-weight: 400; + color: #6F7385; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + margin-right: 24px; + } + + .text-field-right { + width: calc(100% - 200px); + display: inline-block; + font-size: 16px; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + color: #040B29; + font-weight: 400; + } + + .text-field-right-url { + color: #00B3BE !important; + cursor: pointer; + margin-top: 10px; + } + } + } + + .content { + font-size: 16px; + color: #040B29; + font-weight: 400; + } + + .content-icon { + height: 40px; + line-height: 40px; + font-size: 16px; + color: #040B29; + font-weight: 400; + text-align: right; + margin-top: 20px; + } + + .content-icon-text { + display: inline-block; + padding: 0 20px; + cursor: pointer; + line-height: 40px; + } + + .content-icon-text .icon { + font-size: 24px; + color: #3b4249 !important; + } + + .content-icon-text span { + display: inline-block; + margin-left: 4px; + } + + .box-title-text { + line-height: 1.4; + display: flex; + /*align-items: center;*/ + } + + .title-text { + width: 88px; + text-align: right; + display: inline-block; + font-weight: 500; + font-size: 14px; + margin-right: 16px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + height: 42px; + line-height: 48px; + color: #000F16; + } + + .box-input { + display: inline-block; + height: 38px; + width: 100%; + } + + .itemModel { + width: 100%; + display: inline-block; + margin-top: 2px; + margin-bottom: 12px; + } + + .content-button { + text-align: right; + } + + .header-btn { + height: 38px; + } \ No newline at end of file diff --git a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue index cdf207ef6..c229dafa3 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue +++ b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue @@ -27,7 +27,7 @@
-
+
diff --git a/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue b/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue index c12ecab81..bdcd92593 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue +++ b/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue @@ -324,6 +324,7 @@ if (res.success) { this.loading = false this.$message.success(this.$t('OperationSuccessful')) + } else { this.loading = false this.$message.warning(this.$t('operationFailed')) diff --git a/jero-web/src/views/documentTools/documentComparison/index.vue b/jero-web/src/views/documentTools/documentComparison/index.vue index 246dcc425..392dad7b4 100644 --- a/jero-web/src/views/documentTools/documentComparison/index.vue +++ b/jero-web/src/views/documentTools/documentComparison/index.vue @@ -26,19 +26,10 @@
{{$t('releaseSituation')}}
- - - - {{ item.name }} - - - +
From c18bff110bf30317afc635ece4f259d21a6bbb48 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 3 Aug 2022 14:18:37 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E5=B8=83=E5=B1=80=E7=9F=A5=E8=AF=86?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + jero-web/src/components/layouts/TabLayout.vue | 2 + jero-web/src/config/router.config.js | 10 + .../components/countryCardList.vue | 234 +++++++++++++++++- .../components/countryCardRelease.vue | 87 +++++++ .../components/countryCardView.vue | 87 +++++++ 7 files changed, 420 insertions(+), 2 deletions(-) create mode 100644 jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue create mode 100644 jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index deb708f55..708ff3cea 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1225,4 +1225,5 @@ module.exports = { personCharge:'Person in charge', addLabel:'Add Label', editLabel:'Edit Label', + applicableMarket:'Applicable market', } \ 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 e3ce4ee27..e537f5564 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1328,4 +1328,5 @@ module.exports = { personCharge:'负责人', addLabel:'新增标签', editLabel:'编辑标签', + applicableMarket:'适用市场', } \ No newline at end of file diff --git a/jero-web/src/components/layouts/TabLayout.vue b/jero-web/src/components/layouts/TabLayout.vue index eab0ee130..33deedcc6 100644 --- a/jero-web/src/components/layouts/TabLayout.vue +++ b/jero-web/src/components/layouts/TabLayout.vue @@ -92,6 +92,8 @@ this.$route.path == '/virtualListDetails' || this.$route.path == '/taskListProcess' || this.$route.path == '/ProjectDetails' || + this.$route.path == '/countryCardRelease' || + this.$route.path == '/countryCardView' || this.$route.path == '/problemKnowledgeBaseAdd' || this.$route.path == '/problemKnowledgeBaseRelease' || this.$route.path == '/problemKnowledgeBaseView' || diff --git a/jero-web/src/config/router.config.js b/jero-web/src/config/router.config.js index 0ddd91599..e425791de 100644 --- a/jero-web/src/config/router.config.js +++ b/jero-web/src/config/router.config.js @@ -367,6 +367,16 @@ export const constantRouterMap = [ name: 'problemKnowledgeBaseRelease', component: () => import(/* webpackChunkName: "user" */ '@/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease') }, + { + path: '/countryCardView', + name: 'countryCardView', + component: () => import(/* webpackChunkName: "user" */ '@/views/businessSupport/problemKnowledgeBase/components/countryCardView') + }, + { + path: '/countryCardRelease', + name: 'countryCardRelease', + component: () => import(/* webpackChunkName: "user" */ '@/views/businessSupport/problemKnowledgeBase/components/countryCardRelease') + }, { path: '/problemKnowledgeBaseView', name: 'problemKnowledgeBaseView', diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue index af3faab72..cd7fc3755 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue @@ -1,13 +1,243 @@ \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue new file mode 100644 index 000000000..a4c3a577c --- /dev/null +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue @@ -0,0 +1,87 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue new file mode 100644 index 000000000..746eecdc3 --- /dev/null +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue @@ -0,0 +1,87 @@ + + + + + \ No newline at end of file From feb2c9137b22ebe9f85bf194f8c48529e0707b25 Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 3 Aug 2022 14:53:51 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=A1=B9-nio=E7=BC=96=E5=8F=B7=E6=A0=BC=E5=BC=8F=E9=99=90?= =?UTF-8?q?=E5=88=B6=E4=BF=AE=E6=94=B9-=E5=8F=96=E6=B6=88=E5=B0=8F?= =?UTF-8?q?=E6=95=B0=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ParamsInfoEOServiceImpl.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java index eca22b3fb..8648bb5b7 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java @@ -98,12 +98,12 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl Date: Wed, 3 Aug 2022 14:59:56 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=BA=93-=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=B8=8B=E6=8B=89=E9=80=89-=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=90=AF=E7=94=A8=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/service/impl/ParamsReportDetailEOServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java index 7810e4dd3..2ca1a4003 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java @@ -20,6 +20,7 @@ import com.jero.modules.cert.collect.enums.CollectManifestStateEnum; import com.jero.modules.cert.collect.enums.ConfigDataTypeEnum; import com.jero.modules.cert.collect.vo.ParamsConfigDataVO; import com.jero.modules.cert.report.entity.*; +import com.jero.modules.cert.report.enums.ExportTemplateStateEnum; import com.jero.modules.cert.report.enums.ExportTypeEnum; import com.jero.modules.cert.report.mapper.ParamsReportDetailEOMapper; import com.jero.modules.cert.report.service.*; @@ -674,7 +675,8 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl> getTemplateLabelList() { // 查询所有导出模板 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.orderByDesc(ParamsExportTemplateEO::getCreateTime); + queryWrapper.eq(ParamsExportTemplateEO::getState, ExportTemplateStateEnum.ENABLE.getValue()) + .orderByDesc(ParamsExportTemplateEO::getCreateTime); List paramsExportTemplateEOList = paramsExportTemplateEOService.list(queryWrapper); List> templateLabelList = new ArrayList<>(); From 7ae3d108dc3c697533eaae3794110407c46daacf Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 3 Aug 2022 15:34:28 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E5=B8=83=E5=B1=80=E7=9F=A5=E8=AF=86?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 4 + jero-web/src/common/lang/zh-cn.js | 4 + .../classificationMaintenanceAdd.vue | 2 +- .../components/countryCardRelease.vue | 293 +++++++++++++++++- .../components/countryCardReleaseModel.vue | 210 +++++++++++++ .../components/countryCardReleaseModelAdd.vue | 256 +++++++++++++++ .../components/countryCardView.vue | 1 + .../components/problemKnowledgeBaseView.vue | 1 + 8 files changed, 768 insertions(+), 3 deletions(-) create mode 100644 jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModel.vue create mode 100644 jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModelAdd.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 708ff3cea..935e965bb 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1226,4 +1226,8 @@ module.exports = { addLabel:'Add Label', editLabel:'Edit Label', applicableMarket:'Applicable market', + templateMaintenance:'Template maintenance', + associatedWebsite:'Associated website', + dropDownOptions:'Drop down options', + dropDownOptionMaintenance:'Drop down option maintenance', } \ 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 e537f5564..132493ef4 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1329,4 +1329,8 @@ module.exports = { addLabel:'新增标签', editLabel:'编辑标签', applicableMarket:'适用市场', + templateMaintenance:'模板维护', + associatedWebsite:'关联网址', + dropDownOptions:'下拉选项', + dropDownOptionMaintenance:'下拉选项维护', } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceAdd.vue index e86ce4846..5efb6b6bd 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceAdd.vue @@ -48,7 +48,7 @@ @@ -84,4 +310,67 @@ } } } + + .page { + text-align: right; + margin-top: 20px; + } + + .box-title-text { + line-height: 1.4; + display: flex; + align-items: center; + margin-bottom: 10px; + } + + .title-text { + width: 20%; + min-width: 110px; + color: #000F16; + display: inline-block; + font-weight: 500; + font-size: 14px; + margin-right: 16px; + margin-top: 3px; + text-align: right; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + + .box-input { + display: inline-block; + width: 70%; + height: 38px; + margin-top: 2px; + } + + .box-button { + height: 38px; + /*margin-top: 2px;*/ + } + + .box-content-right { + width: 100%; + text-align: right; + margin-top: 20px; + margin-bottom: 20px; + } + + .operator-text { + cursor: pointer; + margin-right: 53px; + font-size: 14px; + font-weight: 400; + color: #040B29; + display: inline-block; + } + + .operator-text:last-child { + margin-right: 13px; + } + + .text-operation { + margin-right: 8px; + } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModel.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModel.vue new file mode 100644 index 000000000..986380fcd --- /dev/null +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModel.vue @@ -0,0 +1,210 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModelAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModelAdd.vue new file mode 100644 index 000000000..a4e39ccb8 --- /dev/null +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModelAdd.vue @@ -0,0 +1,256 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue index 746eecdc3..75be6e28d 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue @@ -18,6 +18,7 @@ + + diff --git a/jero-web/src/components/exporthistory/index.vue b/jero-web/src/components/exporthistory/index.vue index 1b353803e..cd59122b3 100644 --- a/jero-web/src/components/exporthistory/index.vue +++ b/jero-web/src/components/exporthistory/index.vue @@ -1,36 +1,36 @@ @@ -159,6 +165,7 @@ export default { columns:[], selectedRowKeys: [], formInline: {}, + textLoading:false, url: { tableHeader: 'report/detail/getHeader', tableList: 'report/detail/list', @@ -286,6 +293,58 @@ export default { this.formInline[value] = id this.formInline = { ...this.formInline } }, + // 保存 + handlePreservation(num) { + let _this = this + let postDate = [] + let data = JSON.parse(JSON.stringify(this.dataSource)) + let selectedRowKeysValue = [] + data.forEach(res => { + selectedRowKeysValue.push(res) + }) + console.log(selectedRowKeysValue) + for (let i = 0; i < selectedRowKeysValue.length; i++) { + let postDateobj = {} + let itemIn = Object.keys(selectedRowKeysValue[i]) + console.log(itemIn) + for (let j = 0; j < itemIn.length; j++) { + if (itemIn[j] !== 'sdt' && selectedRowKeysValue[i][itemIn[j]].list) { + if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) { + postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]] + // for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) { + // if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more') { + // console.log(selectedRowKeysValue[i][itemIn[j]].list[k].dataValue) + // selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',') + // } + // if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'text' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) { + // selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.toString() + // } + // } + } + } + } + postDateobj.id = selectedRowKeysValue[i].id + postDate.push(postDateobj) + } + let configDataList = { configDataList: postDate } + if (selectedRowKeysValue && selectedRowKeysValue.length > 0) { + this.textLoading = true + let query = { + ...configDataList, + paramsManifestId: this.$route.query.id + } + postAction('/report/detail/save', query).then((res) => { + if (res.success) { + _this.$message.success(_this.$t('OperationSuccessful')) + this.textLoading = false + } else { + _this.$message.warning(_this.$t('operationFailed')) + this.textLoading = false + } + }) + } else { + } + }, getTableList() { // console.log('this.searchParmestable',this.searchParmes) let pageNo = JSON.parse(JSON.stringify(this.pageNo)) @@ -319,70 +378,6 @@ export default { getDataSource(data) { this.dataSource = data }, - handlePreservation(num) { - let _this = this - let postDate = [] - let data = JSON.parse(JSON.stringify(this.dataSource)) - let selectedRowKeysValue = [] - data.forEach(res => { - if (res.state == 'Wait Fill' || res.state == '待填写') { - selectedRowKeysValue.push(res) - } - }) - for (let i = 0; i < selectedRowKeysValue.length; i++) { - let postDateobj = {} - let itemIn = Object.keys(selectedRowKeysValue[i]) - for (let j = 0; j < itemIn.length; j++) { - if (itemIn[j] !== 'sdt') { - if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) { - postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]] - for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) { - if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more') { - selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',') - } - if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'text' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) { - selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.toString() - } - } - } - } - } - postDateobj.id = selectedRowKeysValue[i].id - postDate.push(postDateobj) - } - let configDataList = { configDataList: postDate } - if (selectedRowKeysValue && selectedRowKeysValue.length > 0) { - if (num && num == 1) { - this.textLoading = true - } - let query = { - ...configDataList, - paramsManifestId: this.paramsManifest.id - } - postAction('/params/collectManifest/save', query).then((res) => { - if (res.success) { - if (num && num == 1) { - _this.$message.success(_this.$t('OperationSuccessful')) - this.textLoading = false - } - setTimeout(() => { - if (this.currentPersonRole == 'dre') { - this.handlePreservation() - } - }, 10000) - } else { - if (num && num == 1) { - _this.$message.warning(_this.$t('operationFailed')) - this.textLoading = false - } - } - }) - } else { - if (num && num == 1) { - this.$message.warning(this.$t('theCurrentListSaved')) - } - } - }, LoginUserType(val, currentPersonRole, userType) { this.RoleType = [] if (this.currentPersonRole == '') { diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index c3bf52f65..046e8655d 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -376,7 +376,7 @@ export default { { required: true, message: this.$t('PleaseEnter')+this.$t('NiONumber'), trigger: 'blur' }, { min:1, max: 15, message: this.$t('cantExeed')+'15'+this.$t('characters'), trigger: 'blur' }, { - pattern: /^[0-9a-zA-Z-/. ]{1,}$/, + pattern: /^[0-9a-zA-Z-/ ]{1,}$/, message: this.$t('onlyThree'), trigger: 'blur' } From 67c3b9d28a31c82df080e8ee4bb260e77074e97c Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 3 Aug 2022 16:46:57 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=BA=93-=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E9=A1=B9=E6=9F=A5=E7=9C=8B-=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../parameter/managementdetails/index.vue | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue index a74fec733..7ca198da3 100644 --- a/jero-web/src/views/parameter/managementdetails/index.vue +++ b/jero-web/src/views/parameter/managementdetails/index.vue @@ -311,15 +311,15 @@ export default { if (itemIn[j] !== 'sdt' && selectedRowKeysValue[i][itemIn[j]].list) { if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) { postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]] - // for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) { - // if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more') { - // console.log(selectedRowKeysValue[i][itemIn[j]].list[k].dataValue) - // selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',') - // } - // if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'text' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) { - // selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.toString() - // } - // } + for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) { + console.log(selectedRowKeysValue[i][itemIn[j]].list[k].dataValue) + if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) { + selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',') + } + if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'text' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) { + selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.toString() + } + } } } } @@ -336,6 +336,7 @@ export default { postAction('/report/detail/save', query).then((res) => { if (res.success) { _this.$message.success(_this.$t('OperationSuccessful')) + this.$refs.CollectionTabel.getTableList() this.textLoading = false } else { _this.$message.warning(_this.$t('operationFailed')) From e047e254f0568ef6f95dce740ff4ee22ad0f3556 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 3 Aug 2022 17:27:43 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=BA=93-=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E9=A1=B9=E6=9F=A5=E7=9C=8B-=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/CollectionTypeDisabled/index.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/jero-web/src/components/CollectionTypeDisabled/index.vue b/jero-web/src/components/CollectionTypeDisabled/index.vue index 4e30ff1bf..4e000b0f8 100644 --- a/jero-web/src/components/CollectionTypeDisabled/index.vue +++ b/jero-web/src/components/CollectionTypeDisabled/index.vue @@ -634,12 +634,12 @@ uploadFileChangeDown }, mounted() { - this.detailDate.list.forEach((item) => { - if (item.type === 'pull_more') { - item.dataValue = [] - } - // this.detailDatetransformation.push(item) - }) + // this.detailDate.list.forEach((item) => { + // if (item.type === 'pull_more') { + // item.dataValue = [] + // } + // // this.detailDatetransformation.push(item) + // }) }, methods: { onInput(r) { From 40fae067e307233cbb72a4d1e14e6755df416009 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 3 Aug 2022 17:44:38 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E9=80=89=E6=A0=BC=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/CollectionTypeDisabled/index.vue | 12 ++++++------ .../src/views/parameter/managementdetails/index.vue | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/jero-web/src/components/CollectionTypeDisabled/index.vue b/jero-web/src/components/CollectionTypeDisabled/index.vue index 4e000b0f8..2404a2e38 100644 --- a/jero-web/src/components/CollectionTypeDisabled/index.vue +++ b/jero-web/src/components/CollectionTypeDisabled/index.vue @@ -634,12 +634,12 @@ uploadFileChangeDown }, mounted() { - // this.detailDate.list.forEach((item) => { - // if (item.type === 'pull_more') { - // item.dataValue = [] - // } - // // this.detailDatetransformation.push(item) - // }) + this.detailDate.list.forEach((item) => { + if (item.type === 'pull_more') { + console.log(item.dataValue) + } + // this.detailDatetransformation.push(item) + }) }, methods: { onInput(r) { diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue index 7ca198da3..d178b43be 100644 --- a/jero-web/src/views/parameter/managementdetails/index.vue +++ b/jero-web/src/views/parameter/managementdetails/index.vue @@ -313,7 +313,7 @@ export default { postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]] for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) { console.log(selectedRowKeysValue[i][itemIn[j]].list[k].dataValue) - if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) { + if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue instanceof Array) { selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',') } if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'text' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) { From a3916b6bd091eb27c9db65e7f3f6d1799f03c560 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 3 Aug 2022 17:52:11 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=A1=B9=E5=88=97?= =?UTF-8?q?=E8=A1=A8NIO=E7=BC=96=E5=8F=B7=E9=99=90=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 +- jero-web/src/common/lang/zh-cn.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 935e965bb..1aa99f303 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -788,7 +788,7 @@ module.exports = { copyParamDetailList: 'Copy Parameter List', collectionCompletionTime: 'Collection Completion Time', parameterTemplateName: 'Parameter Template Name', - onlyThree: 'Only letters, numbers, dashes (-), and decimal points (.) can be entered. , left slash, space six kinds of content ', + onlyThree: 'enter only letters, numbers, hyphens (-), left slashes, and Spaces', templateName: 'Template Name', pleaseSelectData: 'Please Select Data', templateCopy: 'Template Copy', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 132493ef4..bee340923 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -804,7 +804,7 @@ module.exports = { copyParamDetailList: '复制参数清单', collectionCompletionTime: '收集完成时间', parameterTemplateName: '参数模板名称', - onlyThree: '只能输入字母，数字，横杠（-），小数点（.），左斜杠，空格六种内容', + onlyThree: '只能输入字母，数字，横杠（-），左斜杠，空格五种内容', templateName: '模板名称', pleaseSelectData: '请选择数据', templateCopy: '模板复制', From cbb193e36219228e0ff1a6796e98bba136cb8cd5 Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 3 Aug 2022 18:01:30 +0800 Subject: [PATCH 14/15] =?UTF-8?q?people-=E5=90=8C=E6=AD=A5=E7=94=A8?= =?UTF-8?q?=E6=88=B7-=E6=9B=B4=E6=96=B0=E6=97=B6=E4=B8=8D=E5=A4=84?= =?UTF-8?q?=E7=90=86del=5Fflag=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/system/service/impl/SysUserServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java index 04d975382..304aa6215 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java @@ -534,7 +534,7 @@ public class SysUserServiceImpl extends ServiceImpl impl sysUser.setUsername(ppEmployee.getWorker_user_id()); sysUser.setRealname(ppEmployee.getFormatted_name()); sysUser.setStatus("Active".equals(ppEmployee.getEmployee_status())? CommonConstant.USER_UNFREEZE : CommonConstant.USER_FREEZE); - sysUser.setDelFlag("1".equals(ppEmployee.getDelete_flag())? CommonConstant.DEL_FLAG_0 : CommonConstant.DEL_FLAG_1); +// sysUser.setDelFlag("1".equals(ppEmployee.getDelete_flag())? CommonConstant.DEL_FLAG_0 : CommonConstant.DEL_FLAG_1); sysUser.setThirdId(ppEmployee.getWorker_user_id()); sysUser.setWorkNo(ppEmployee.getEmployee_id()); sysUser.setWorkerType("Employee".equals(ppEmployee.getWorker_type())? CommonConstant.WORKER_TYPE_1 : CommonConstant.WORKER_TYPE_2); From bb25d4775fe5cc7cb5ff7372ee064eb49248e9be Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 3 Aug 2022 18:12:32 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E5=B8=83=E5=B1=80=E7=9F=A5=E8=AF=86?= =?UTF-8?q?=E5=BA=93?= 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/countryCardRelease.vue | 6 +- .../components/countryCardView.vue | 191 +++++++++++++++++- .../components/displayInformationModel.vue | 156 ++++++++++++++ 5 files changed, 350 insertions(+), 9 deletions(-) create mode 100644 jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 1aa99f303..cddee045e 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1230,4 +1230,7 @@ module.exports = { associatedWebsite:'Associated website', dropDownOptions:'Drop down options', dropDownOptionMaintenance:'Drop down option maintenance', + displayInformation:'Display information', + addComparison:'Add comparison', + showOrNot:'Show or not', } \ 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 bee340923..2b024825c 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1333,4 +1333,7 @@ module.exports = { associatedWebsite:'关联网址', dropDownOptions:'下拉选项', dropDownOptionMaintenance:'下拉选项维护', + displayInformation:'展示信息', + addComparison:'添加对比', + showOrNot:'是否展示', } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue index 3ccdc4ab9..16f764ed2 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue @@ -227,7 +227,11 @@ }, viewClick() { - + let newUrl = this.$router.resolve({ + path: '/countryCardView', + query: {} + }) + window.open(newUrl.href, '_blank') }, deleteData(val) { let _this = this diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue index 75be6e28d..e2d651aea 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue @@ -6,21 +6,95 @@ - {{$t('applicableInstructionsMarketList')}} + {{$t('See')}}
-
+
+
+
+ + {{$t('displayInformation')}} +
+
+ + {{$t('addComparison')}} +
+
+
+
+
+ hadhasdasdhadashdjk +
+
+ hadhasdasdhadashdjk +
+
+ hadhasdasdhadashdjk +
+
+ hadhasdasdhadashdjk +
+
+ hadhasdasdhadashdjk +
+
+ hadhasdasdhadashdjk +
+
+ hadhasdasdhadashdjk +
+
+ hadhasdasdhadashdjk +
+
+ hadhasdasdhadashdjk +
+
+
+
+ + + 中国 + +
+
+ + + 中国 + +
+
+
+
@@ -66,11 +140,6 @@ } } - .content-box { - padding: 0 32px; - box-sizing: border-box; - } - .header-text { font-size: 16px; font-weight: 400; @@ -85,4 +154,110 @@ } } } + + .box-content-right { + width: 100%; + text-align: right; + margin-bottom: 20px; + } + + .operator-text { + cursor: pointer; + margin-right: 53px; + font-size: 14px; + font-weight: 400; + color: #040B29; + display: inline-block; + } + + .operator-text:last-child { + margin-right: 13px; + } + + .content-box { + overflow: auto; + white-space: nowrap; + position: relative; + } + + .content-box-left { + width: 200px; + background: #fff; + z-index: 111; + display: inline-block; + position: sticky; + left: 0; + border-top: 1px #d9d9d9 solid; + border-left: 1px #d9d9d9 solid; + border-bottom: 1px #d9d9d9 solid; + border-right: 1px #d9d9d9 solid; + } + + .content-box-left-text { + font-size: 16px; + color: #040B29; + font-weight: 400; + text-align: center; + border-bottom: 1px #d9d9d9 solid; + height: 80px; + line-height: 80px; + } + + .content-box-left-text:last-child { + border-bottom: none; + } + + .content-box-box-top { + width: 340px; + height: 160px; + display: inline-block; + cursor: pointer; + border-left: 1px #d9d9d9 solid; + border-top: 1px #d9d9d9 solid; + border-right: 1px #d9d9d9 solid; + border-bottom: 1px #d9d9d9 solid; + position: sticky; + top: 0; + z-index: 111; + background: #fff; + } + + .content-box-right { + width: 339px; + position: relative; + display: inline-block; + border-top: 1px #d9d9d9 solid; + border-right: 1px #d9d9d9 solid; + border-bottom: 1px #d9d9d9 solid; + } + + .content-box-right:last-child { + border-right: 1px #d9d9d9 solid; + } + + .content-box-box-img { + width: 70%; + height: 100%; + } + + .content-box-box-text { + display: inline-block; + width: 30%; + text-align: center; + font-size: 18px; + font-weight: 500; + color: #040B29; + } + + .content-box-box { + width: 100%; + height: 80px; + border-bottom: 1px #d9d9d9 solid; + cursor: pointer; + } + + .content-box-box:last-child { + border-bottom: none; + } + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue new file mode 100644 index 000000000..baae325aa --- /dev/null +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue @@ -0,0 +1,156 @@ + + + + + \ No newline at end of file