From ae305b642781165f9a76ad3269e6531d4cc5de78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= Date: Mon, 11 Sep 2023 13:54:12 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=A0=87=E5=87=86=E5=88=86=E8=A7=A3?= =?UTF-8?q?=E5=8D=95=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/api.js | 2 +- .../lang/standardRegulationLibrary/en-us.js | 14 + .../lang/standardRegulationLibrary/zh-cn.js | 14 + src/components/StandardResolutionSheet.vue | 250 +++++++++++++++++- .../commonPage/StandardDetailPage.vue | 46 ++-- .../domesticStandard/DomesticStandardList.vue | 2 +- .../modules/DomesticStandardModal.vue | 22 +- .../system/tags/modules/StandardDrawer.vue | 4 +- 8 files changed, 298 insertions(+), 56 deletions(-) diff --git a/src/api/api.js b/src/api/api.js index e2c3be78..13322342 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -69,7 +69,7 @@ const getDictTreeList = (params) => getAction('/sys/dictItem/treeList', params) export const ajaxGetDictItems = (code, params) => getAction(`/sys/dict/getDictItems/${code}`, params) // 从缓存中获取字典配置 function getDictItemsFromCache (dictCode) { - if (Vue.ls.get(UI_CACHE_DB_DICT_DATA) && Vue.ls.get(UI_CACHE_DB_DICT_DATA)[dictCode]) { + if (Vue.ls.get(UI_CACHE_DB_DICT_DATA) && Vue.ls.get(UI_CACHE_DB_DICT_DATA)[dictCode] && Vue.ls.get(UI_CACHE_DB_DICT_DATA)[dictCode].length > 0) { return Vue.ls.get(UI_CACHE_DB_DICT_DATA)[dictCode] } } diff --git a/src/common/lang/standardRegulationLibrary/en-us.js b/src/common/lang/standardRegulationLibrary/en-us.js index d71995c5..2bf986f1 100644 --- a/src/common/lang/standardRegulationLibrary/en-us.js +++ b/src/common/lang/standardRegulationLibrary/en-us.js @@ -7,6 +7,20 @@ module.exports = { standardResolutionSheet: 'Standard resolution sheet', // 标准分解单 updateRecord: 'Update record', // 更新记录 submitQuestion: 'Submit a question', // 提交问题 + standardCatalogue: 'Standard catalogue', // 标准目录 + clauseLabel: 'Clause label', // 条文标签 + clauseNumber: 'Article number', // 条文号 + clauseTitle: 'Title of article', // 条文标题 + regulatoryRequirementsType: 'Types of regulatory requirements', // 法规要求类型 + functionalClassification: 'Functional classification', // 功能分类 + functionalSpecialty: 'Functional specialty', // 功能专业 + blockCoding: 'Block coding', // 分组编码 + groupName: 'Group name', // 分组名称 + newCertificationImplementationTime: 'New certification implementation time', // 新认证实施时间 + certifiedImplementationTime: 'Certified implementation time', // 已认证实施时间 + newRegistrationImplementationTime: 'New registration implementation time', // 新注册实施时间 + applicableVehicleType: 'Applicable vehicle type', // 适用车型 + dynamicType: 'Dynamic type', // 动力类型 // 国内标准 domesticStandard: { treeSearchPlaceholder: 'Please enter the tree system', // 请输入树状图体系 diff --git a/src/common/lang/standardRegulationLibrary/zh-cn.js b/src/common/lang/standardRegulationLibrary/zh-cn.js index 61a8e452..7b8da59e 100644 --- a/src/common/lang/standardRegulationLibrary/zh-cn.js +++ b/src/common/lang/standardRegulationLibrary/zh-cn.js @@ -7,6 +7,20 @@ module.exports = { standardResolutionSheet: '标准分解单', updateRecord: '更新记录', submitQuestion: '提交问题', + standardCatalogue: '标准目录', + clauseLabel: '条文标签', + clauseNumber: '条文号', + clauseTitle: '条文标题', + regulatoryRequirementsType: '法规要求类型', // 法规要求类型 + functionalClassification: '功能分类', // 功能分类 + functionalSpecialty: '功能专业', // 功能专业 + blockCoding: '分组编码', // 分组编码 + groupName: '分组名称', // 分组名称 + newCertificationImplementationTime: '新认证实施时间', // 新认证实施时间 + certifiedImplementationTime: '已认证实施时间', // 已认证实施时间 + newRegistrationImplementationTime: '新注册实施时间', // 新注册实施时间 + applicableVehicleType: '适用车型', // 适用车型 + dynamicType: '动力类型', // 动力类型 // 国内标准 domesticStandard: { treeSearchPlaceholder: '请输入树状图体系', diff --git a/src/components/StandardResolutionSheet.vue b/src/components/StandardResolutionSheet.vue index a5f54fcc..634547dc 100644 --- a/src/components/StandardResolutionSheet.vue +++ b/src/components/StandardResolutionSheet.vue @@ -1,21 +1,163 @@ @@ -39,6 +181,12 @@ export default { .standard-catalogue { height: 100%; width: 15%; + min-width: 280px; + + /deep/ .ant-tree li .ant-tree-node-content-wrapper.ant-tree-node-selected { + background-color: transparent !important; + color: @primary-color; + } } .sheet-container { @@ -49,18 +197,62 @@ export default { .clause-label { width: 25%; + min-width: 400px; height: 100%; + + .clause-item { + display: flex; + margin-bottom: 20px; + + label { + width: 12rem; + font-size: 14px; + font-family: PingFang SC-Regular, PingFang SC, sans-serif; + color: #86909C; + margin-right: 20px; + } + + span { + white-space: pre-wrap; + word-break: break-all; + font-size: 14px; + font-family: PingFang SC-Regular, PingFang SC, sans-serif; + color: #1D2129; + } + } } .clause-label-change { width: 6%; + min-width: 130px; height: 100%; + padding-top: 56px; + + &-item { + height: 56px; + display: flex; + align-items: center; + padding: 0 16px; + font-size: 16px; + font-family: PingFang SC-Semibold, PingFang SC, sans-serif; + font-weight: 600; + color: #1D2129; + cursor: pointer; + + span { + margin-left: 8px; + } + } + + &-item-selected { + background: #FAE6E5; + } } .part-title { height: 56px; background: rgba(213, 44, 38, 0.12); - border-radius: 8px 8px 0px 0px; + border-radius: 8px 8px 0 0; line-height: 56px; padding: 0 24px; font-size: 16px; @@ -68,4 +260,42 @@ export default { font-weight: 600; color: #1D2129; } + +.has-title-part-content { + height: calc(100% - 56px); + overflow: auto; + padding: 24px; +} + +.standard-name { + height: 56px; + background: #FFFFFF; + border-radius: 8px; + display: flex; + align-items: center; + justify-content: space-between; + padding: 0 24px; + margin-bottom: 16px; +} + +.standard-name > span { + font-size: 16px; + font-family: PingFang SC-Semibold, PingFang SC, sans-serif; + font-weight: 600; + color: #1D2129; + flex: 1; + width: 0; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + cursor: pointer; +} + +.standard-content { + height: calc(100% - 72px); + background: #FFFFFF; + border-radius: 8px; + overflow: auto; + padding: 24px; +} diff --git a/src/views/standardRegulationLibrary/commonPage/StandardDetailPage.vue b/src/views/standardRegulationLibrary/commonPage/StandardDetailPage.vue index 0985fa23..3cb9aa34 100644 --- a/src/views/standardRegulationLibrary/commonPage/StandardDetailPage.vue +++ b/src/views/standardRegulationLibrary/commonPage/StandardDetailPage.vue @@ -85,38 +85,19 @@ export default { loading: false, partList: [], // 页面模块列表 form: {}, // 页面字段 + // 页面数据 detailData: { - modification_list: [ - { - id: 1, - fileName: '国内文字占位符段落标题标准.pdf' - }, - { - id: 2, - fileName: '国内标准国内文字占位符段落标题标准.pdf' - }, - { - id: 3, - fileName: '国内标准国内标准.pdf' - } - ], - draft_for_review: [{ - id: 11, - fileName: '国内文字占位符段落标题标准.pdf' - }], - draft_for_approval: [{ - id: 21, - fileName: '国内标准国内文字占位符段落标题标准.pdf' - }], - draft_for_comment: [{ - id: 31, - fileName: '国内标准国内标准.pdf' - }], - draft: [{ - id: 311, - fileName: '国内标准国内标准.pdf' - }] - } // 页面数据 + // 修改单 + modification_list: [], + // 报批稿 + draft_for_review: [], + // 送审稿 + draft_for_approval: [], + // 征求意见稿 + draft_for_comment: [], + // 草案 + draft: [] + } } }, computed: { @@ -128,6 +109,9 @@ export default { this.initForm() }, methods: { + /** + * 获取页面字段 + */ initForm () { getDomesticStandardFormModal().then(res => { if (res.success) { diff --git a/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue b/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue index 03f4ed49..667d5507 100644 --- a/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue +++ b/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue @@ -5,7 +5,7 @@ - + diff --git a/src/views/system/tags/modules/StandardDrawer.vue b/src/views/system/tags/modules/StandardDrawer.vue index 1cbe0cfc..1380c624 100644 --- a/src/views/system/tags/modules/StandardDrawer.vue +++ b/src/views/system/tags/modules/StandardDrawer.vue @@ -175,8 +175,8 @@
- {{ $t('close') }} - + {{ $t('close') }} + {{ $t('preservation') }}