diff --git a/src/api/dashboard.js b/src/api/dashboard.js index 22bc179..4119649 100644 --- a/src/api/dashboard.js +++ b/src/api/dashboard.js @@ -1,4 +1,4 @@ -import { downFile, getAction, postAction } from './manage' +import { downFile, getAction, postAction, postDownFile } from './manage' // 获取检索历史数据 const getSearchHistoryData = (params) => getAction('/home/lawsHomeNormalSearchHistory/page', params) // 根据id删除检索历史 @@ -44,7 +44,8 @@ const exportGeneralSearch = (params) => downFile('/home/lawsHomeSearch/normalSea const getAdvancedSearchAll = (params) => postAction('/home/lawsHomeSearch/getAdvancedSearchAll', params) // 高级检索-条款 const getAdvancedSearchClause = (params) => postAction('/home/lawsHomeSearch/getAdvancedSearchClause', params) - +// 高级检索-导出 +const exportAdvancedSearch = (params) => postDownFile('/home/lawsHomeSearch/advancedSearchExportExcel', params) export { getSearchHistoryData, deleteSearchHistoryById, @@ -65,5 +66,6 @@ export { getTodoList, exportGeneralSearch, getAdvancedSearchAll, - getAdvancedSearchClause + getAdvancedSearchClause, + exportAdvancedSearch } diff --git a/src/assets/image/dashboard/browsing-history.png b/src/assets/image/dashboard/browsing-history.png deleted file mode 100644 index 2644f52..0000000 Binary files a/src/assets/image/dashboard/browsing-history.png and /dev/null differ diff --git a/src/assets/image/dashboard/contact-management.png b/src/assets/image/dashboard/contact-management.png deleted file mode 100644 index 8212662..0000000 Binary files a/src/assets/image/dashboard/contact-management.png and /dev/null differ diff --git a/src/assets/image/dashboard/custom-comparison.png b/src/assets/image/dashboard/custom-comparison.png deleted file mode 100644 index fd65cbf..0000000 Binary files a/src/assets/image/dashboard/custom-comparison.png and /dev/null differ diff --git a/src/assets/image/dashboard/data-dictionary.png b/src/assets/image/dashboard/data-dictionary.png deleted file mode 100644 index 66dba90..0000000 Binary files a/src/assets/image/dashboard/data-dictionary.png and /dev/null differ diff --git a/src/assets/image/dashboard/department-management.png b/src/assets/image/dashboard/department-management.png deleted file mode 100644 index 04cfc06..0000000 Binary files a/src/assets/image/dashboard/department-management.png and /dev/null differ diff --git a/src/assets/image/dashboard/document-dynamics.png b/src/assets/image/dashboard/document-dynamics.png deleted file mode 100644 index fc04e65..0000000 Binary files a/src/assets/image/dashboard/document-dynamics.png and /dev/null differ diff --git a/src/assets/image/dashboard/document-splitting.png b/src/assets/image/dashboard/document-splitting.png deleted file mode 100644 index 7ba85df..0000000 Binary files a/src/assets/image/dashboard/document-splitting.png and /dev/null differ diff --git a/src/assets/image/dashboard/domestic-standards.png b/src/assets/image/dashboard/domestic-standards.png deleted file mode 100644 index ea21674..0000000 Binary files a/src/assets/image/dashboard/domestic-standards.png and /dev/null differ diff --git a/src/assets/image/dashboard/dynamic-message.png b/src/assets/image/dashboard/dynamic-message.png deleted file mode 100644 index cdaca82..0000000 Binary files a/src/assets/image/dashboard/dynamic-message.png and /dev/null differ diff --git a/src/assets/image/dashboard/enterprise-standard.png b/src/assets/image/dashboard/enterprise-standard.png deleted file mode 100644 index 742127f..0000000 Binary files a/src/assets/image/dashboard/enterprise-standard.png and /dev/null differ diff --git a/src/assets/image/dashboard/friend-link-management.png b/src/assets/image/dashboard/friend-link-management.png deleted file mode 100644 index 0e966da..0000000 Binary files a/src/assets/image/dashboard/friend-link-management.png and /dev/null differ diff --git a/src/assets/image/dashboard/friendship-link.png b/src/assets/image/dashboard/friendship-link.png new file mode 100644 index 0000000..38295a7 Binary files /dev/null and b/src/assets/image/dashboard/friendship-link.png differ diff --git a/src/assets/image/dashboard/internal-working-group.png b/src/assets/image/dashboard/internal-working-group.png deleted file mode 100644 index e32f791..0000000 Binary files a/src/assets/image/dashboard/internal-working-group.png and /dev/null differ diff --git a/src/assets/image/dashboard/my-favorites.png b/src/assets/image/dashboard/my-favorites.png deleted file mode 100644 index 041c6df..0000000 Binary files a/src/assets/image/dashboard/my-favorites.png and /dev/null differ diff --git a/src/assets/image/dashboard/my-messages.png b/src/assets/image/dashboard/my-messages.png deleted file mode 100644 index 64ae0ac..0000000 Binary files a/src/assets/image/dashboard/my-messages.png and /dev/null differ diff --git a/src/assets/image/dashboard/new-old-split-comparison.png b/src/assets/image/dashboard/new-old-split-comparison.png deleted file mode 100644 index 6dfb65d..0000000 Binary files a/src/assets/image/dashboard/new-old-split-comparison.png and /dev/null differ diff --git a/src/assets/image/dashboard/new-process.png b/src/assets/image/dashboard/new-process.png deleted file mode 100644 index 74472d7..0000000 Binary files a/src/assets/image/dashboard/new-process.png and /dev/null differ diff --git a/src/assets/image/dashboard/non-compliance-items.png b/src/assets/image/dashboard/non-compliance-items.png deleted file mode 100644 index a877857..0000000 Binary files a/src/assets/image/dashboard/non-compliance-items.png and /dev/null differ diff --git a/src/assets/image/dashboard/overseas-standards.png b/src/assets/image/dashboard/overseas-standards.png deleted file mode 100644 index a128d0e..0000000 Binary files a/src/assets/image/dashboard/overseas-standards.png and /dev/null differ diff --git a/src/assets/image/dashboard/process-center.png b/src/assets/image/dashboard/process-center.png deleted file mode 100644 index 0821f06..0000000 Binary files a/src/assets/image/dashboard/process-center.png and /dev/null differ diff --git a/src/assets/image/dashboard/process-configuration.png b/src/assets/image/dashboard/process-configuration.png deleted file mode 100644 index 90c823e..0000000 Binary files a/src/assets/image/dashboard/process-configuration.png and /dev/null differ diff --git a/src/assets/image/dashboard/project-library.png b/src/assets/image/dashboard/project-library.png deleted file mode 100644 index 2d2ed02..0000000 Binary files a/src/assets/image/dashboard/project-library.png and /dev/null differ diff --git a/src/assets/image/dashboard/questions-answers-library.png b/src/assets/image/dashboard/questions-answers-library.png deleted file mode 100644 index 5f7e828..0000000 Binary files a/src/assets/image/dashboard/questions-answers-library.png and /dev/null differ diff --git a/src/assets/image/dashboard/quickEnter/new-process.png b/src/assets/image/dashboard/quickEnter/new-process.png new file mode 100644 index 0000000..2fd084b Binary files /dev/null and b/src/assets/image/dashboard/quickEnter/new-process.png differ diff --git a/src/assets/image/dashboard/quickEnter/plus.png b/src/assets/image/dashboard/quickEnter/plus.png new file mode 100644 index 0000000..27d09f8 Binary files /dev/null and b/src/assets/image/dashboard/quickEnter/plus.png differ diff --git a/src/assets/image/dashboard/received-shares.png b/src/assets/image/dashboard/received-shares.png deleted file mode 100644 index d306bef..0000000 Binary files a/src/assets/image/dashboard/received-shares.png and /dev/null differ diff --git a/src/assets/image/dashboard/resource-center.png b/src/assets/image/dashboard/resource-center.png deleted file mode 100644 index e20daed..0000000 Binary files a/src/assets/image/dashboard/resource-center.png and /dev/null differ diff --git a/src/assets/image/dashboard/role-center.png b/src/assets/image/dashboard/role-center.png deleted file mode 100644 index f787cc1..0000000 Binary files a/src/assets/image/dashboard/role-center.png and /dev/null differ diff --git a/src/assets/image/dashboard/shared-items.png b/src/assets/image/dashboard/shared-items.png deleted file mode 100644 index 11a0208..0000000 Binary files a/src/assets/image/dashboard/shared-items.png and /dev/null differ diff --git a/src/assets/image/dashboard/soliciting-opinions.png b/src/assets/image/dashboard/soliciting-opinions.png deleted file mode 100644 index d858090..0000000 Binary files a/src/assets/image/dashboard/soliciting-opinions.png and /dev/null differ diff --git a/src/assets/image/dashboard/standard-audit.png b/src/assets/image/dashboard/standard-audit.png deleted file mode 100644 index 24d04ec..0000000 Binary files a/src/assets/image/dashboard/standard-audit.png and /dev/null differ diff --git a/src/assets/image/dashboard/standard-level-mapping.png b/src/assets/image/dashboard/standard-level-mapping.png deleted file mode 100644 index b804454..0000000 Binary files a/src/assets/image/dashboard/standard-level-mapping.png and /dev/null differ diff --git a/src/assets/image/dashboard/standard-plan.png b/src/assets/image/dashboard/standard-plan.png deleted file mode 100644 index b8b16d7..0000000 Binary files a/src/assets/image/dashboard/standard-plan.png and /dev/null differ diff --git a/src/assets/image/dashboard/standard-promotion.png b/src/assets/image/dashboard/standard-promotion.png deleted file mode 100644 index 5499048..0000000 Binary files a/src/assets/image/dashboard/standard-promotion.png and /dev/null differ diff --git a/src/assets/image/dashboard/standard-review-minutes.png b/src/assets/image/dashboard/standard-review-minutes.png deleted file mode 100644 index 86a3d0e..0000000 Binary files a/src/assets/image/dashboard/standard-review-minutes.png and /dev/null differ diff --git a/src/assets/image/dashboard/standard-review-plan.png b/src/assets/image/dashboard/standard-review-plan.png deleted file mode 100644 index 8158dac..0000000 Binary files a/src/assets/image/dashboard/standard-review-plan.png and /dev/null differ diff --git a/src/assets/image/dashboard/standard-warning.png b/src/assets/image/dashboard/standard-warning.png deleted file mode 100644 index 676bdf5..0000000 Binary files a/src/assets/image/dashboard/standard-warning.png and /dev/null differ diff --git a/src/assets/image/dashboard/standardization-activities.png b/src/assets/image/dashboard/standardization-activities.png deleted file mode 100644 index 9d97777..0000000 Binary files a/src/assets/image/dashboard/standardization-activities.png and /dev/null differ diff --git a/src/assets/image/dashboard/tag-management.png b/src/assets/image/dashboard/tag-management.png deleted file mode 100644 index 515d540..0000000 Binary files a/src/assets/image/dashboard/tag-management.png and /dev/null differ diff --git a/src/assets/image/dashboard/task-transfer.png b/src/assets/image/dashboard/task-transfer.png deleted file mode 100644 index 35d8598..0000000 Binary files a/src/assets/image/dashboard/task-transfer.png and /dev/null differ diff --git a/src/assets/image/dashboard/user-center.png b/src/assets/image/dashboard/user-center.png deleted file mode 100644 index abee813..0000000 Binary files a/src/assets/image/dashboard/user-center.png and /dev/null differ diff --git a/src/assets/image/dashboard/vehicle-project-library.png b/src/assets/image/dashboard/vehicle-project-library.png deleted file mode 100644 index 8bd32a0..0000000 Binary files a/src/assets/image/dashboard/vehicle-project-library.png and /dev/null differ diff --git a/src/assets/image/icon/super-search.png b/src/assets/image/icon/super-search.png new file mode 100644 index 0000000..929f50d Binary files /dev/null and b/src/assets/image/icon/super-search.png differ diff --git a/src/assets/image/icon/todo.png b/src/assets/image/icon/todo.png new file mode 100644 index 0000000..8d01c06 Binary files /dev/null and b/src/assets/image/icon/todo.png differ diff --git a/src/common/lang/dashboard/en.js b/src/common/lang/dashboard/en.js index 0a8a6ca..e7f3232 100644 --- a/src/common/lang/dashboard/en.js +++ b/src/common/lang/dashboard/en.js @@ -2,9 +2,10 @@ module.exports = { // 一般检索 generalSearch: { + generalSearch: 'General search', advancedSearch: 'Advanced Search', homePage: 'Home', - searchHistory: '检索历史', + searchHistory: 'Search History', queryCondition: 'Query Condition', retrievalMode: 'Retrieval Mode', resourceType: 'Resource Type', @@ -17,32 +18,80 @@ module.exports = { standardState: 'Standard State', standardGradeClassification: 'Standard Grade Classification', all: 'All', - implementationDate: 'Release Date' + implementationDate: 'Release Date', + standardStatusSet: 'Standard state settings', + viewText: 'View Text', + exportName: 'General retrieval export', + fullSearch: 'full-text searching', + foreignStandard: 'Foreign standards and regulations', + enterpriseStandard: 'Enterprise standards', + notIncludeAbolishedStandard: 'Excluding abolishment standards', + includeAbolishedStandard: 'Including abolishment standards' }, // 高级搜索 advancedSearch: { - standardNum: '标准号', - standardName: '标准名称', - releaseDate: '发布日期', - materialDate: '实施日期', - standardStatus: '标准状态' + standardNum: 'Standard number', + standardName: 'Standard Name', + releaseDate: 'Release Date', + materialDate: 'Implementation Date', + standardStatus: 'Standard State', + newProduceMaterialDate: 'Implementation date of new production vehicles', + newAttestationMaterialDate: 'Implementation date of new certified vehicle', + storageConditions: 'Storage conditions', + unfoldConditions: 'Unfold conditions', + retrieveCategories: 'Retrieve categories', + standardType: 'STANDARD', + all: 'whole', + foreignStandards: 'Foreign standards and regulations', + enterpriseStandards: 'Enterprise standards', + term: 'term', + termNo: 'Clause number', + termTitle: 'Clause Title', + termContent: 'Clause content', + applicableComponents: 'Applicable components', + newProduceVehiclesImplementationDate: 'Implementation date of new production vehicles', + newAuthVehiclesImplementationDate: 'Implementation date of new certified vehicle', + registrationDate: 'Registration date', + keywords: 'keywords', + responsibleDepartment: 'Responsible department', + responsibleDepartmentModule: 'Responsible department professional module', + relatedDepartments: 'Related departments', + relatedDepartmentModule: 'Related department professional module', + applications: 'Applications', + powerType: 'Power Type', + professionalField: 'Professional field', + configurationRequirements: 'Configuration requirements', + exportName: 'Advanced retrieval export', + standard: 'standard' }, // 快捷入口 quickEnter: { - quickEnter: '快捷入口', - menuManage: '菜单管理', - custom: '自定义', - optionModules: '可选模块', - personalDisplayModule: '个人展示模块', - itemUnit: '项', - itemsUnit: '项', - listEmpty: '列表为空', - pleaseEnterSearchContent: '请输入搜索内容', - maxSelectedNine: '最多选择9个模块' + quickEnter: 'Quick entrance', + menuManage: 'Menu management', + custom: 'custom', + optionModules: 'Option Modules', + personalDisplayModule: 'Personal Display Module', + itemUnit: 'term', + itemsUnit: 'term', + listEmpty: 'List is empty', + pleaseEnterSearchContent: 'Please enter search content', + maxSelected: 'Select up to 14 modules', + newFunction: 'New features' }, // 待办任务 todoTask: { - todoTask: '待办任务', - more: '更多' + todoTask: 'To Do Tasks', + more: 'more' + }, + // 友情链接 + friendLink: { + friendLink: 'Friendship link', + more: 'more' + }, + // 检索 + retrieval: { + titleSearch: 'Title search', + fullSearch: 'full-text searching', + advancedSearch: 'Advanced Search' } } diff --git a/src/common/lang/dashboard/zh.js b/src/common/lang/dashboard/zh.js index 28f6b1c..c55e4d8 100644 --- a/src/common/lang/dashboard/zh.js +++ b/src/common/lang/dashboard/zh.js @@ -2,7 +2,8 @@ module.exports = { // 一般检索 generalSearch: { - advancedSearch: '高级搜索', + generalSearch: '一般检索', + advancedSearch: '高级检索', homePage: '首页', searchHistory: '检索历史', queryCondition: '查询条件', @@ -20,7 +21,12 @@ module.exports = { implementationDate: '实施日期', standardStatusSet: '标准状态设置', viewText: '查看文本', - exportName: '一般检索导出' + exportName: '一般检索导出', + fullSearch: '全文检索', + foreignStandard: '外来标准法规', + enterpriseStandard: '企业标准', + notIncludeAbolishedStandard: '不包含废止标准', + includeAbolishedStandard: '包含废止标准' }, // 高级搜索 advancedSearch: { @@ -28,7 +34,35 @@ module.exports = { standardName: '标准名称', releaseDate: '发布日期', materialDate: '实施日期', - standardStatus: '标准状态' + standardStatus: '标准状态', + newProduceMaterialDate: '新生产车实施日期', + newAttestationMaterialDate: '新认证车实施日期', + storageConditions: '收起条件', + unfoldConditions: '展开条件', + retrieveCategories: '检索类别', + standardType: '标准类型', + all: '全部', + foreignStandards: '外来标准法规', + enterpriseStandards: '企业标准', + term: '条款', + termNo: '条款号', + termTitle: '条款标题', + termContent: '条款内容', + applicableComponents: '适用零部件', + newProduceVehiclesImplementationDate: '新生产车实施日期', + newAuthVehiclesImplementationDate: '新认证车实施日期', + registrationDate: '注册日期', + keywords: '关键字', + responsibleDepartment: '责任部门', + responsibleDepartmentModule: '责任部门专业模块', + relatedDepartments: '关联部门', + relatedDepartmentModule: '关联部门专业模块', + applications: '适用车型', + powerType: '动力类型', + professionalField: '专业领域', + configurationRequirements: '配置需求', + exportName: '高级检索导出', + standard: '标准' }, // 快捷入口 quickEnter: { @@ -48,5 +82,16 @@ module.exports = { todoTask: { todoTask: '待办任务', more: '更多' + }, + // 友情链接 + friendLink: { + friendLink: '友情链接', + more: '更多' + }, + // 检索 + retrieval: { + titleSearch: '标题检索', + fullSearch: '全文检索', + advancedSearch: '高级检索' } } diff --git a/src/common/lang/standardRegulationLibrary/en-us.js b/src/common/lang/standardRegulationLibrary/en-us.js index 64fedec..7fdf918 100644 --- a/src/common/lang/standardRegulationLibrary/en-us.js +++ b/src/common/lang/standardRegulationLibrary/en-us.js @@ -89,27 +89,27 @@ module.exports = { }, // 标准主计划 standardMasterPlan: { - standardNumber: '标准编号', - standardName: '标准名称', - standardStatus: '标准状态', - applicableMarket: '适用市场', - informationInput: '信息输入', - textStorage: '文本入库', - importNotification: '导入通知', - interpretationOfRegulations: '法规解读', - regulatoryPromotion: '法规宣贯', - marketRegulationListUpdate: '市场法规清单更新', - regulatoryComplianceInvestigation: '法规符合性排查', - generalDocumentRectificationPlan: '通用文件整改计划', - vehicleModelRectification: '车型整改', - isItRelatedTo: '是否涉及', - responsiblePerson: '责任人', - plannedCompletionDate: '计划完成日期', - actualFinishingDate: '实际完成日期', - deliverables: '交付物', - pcrNumber: 'PCR编号', - rectifyFinishingDate: '整改完成日期', - viewMarketList: '查看市场清单', - viewTroubleshootingResults: '查看排查结果' + standardNumber: 'standard number', + standardName: 'Standard Name', + standardStatus: 'Standard State', + applicableMarket: 'Applicable markets', + informationInput: 'Information input', + textStorage: 'Text storage', + importNotification: 'Import Notification', + interpretationOfRegulations: 'Interpretation of regulations', + regulatoryPromotion: 'Regulatory promotion', + marketRegulationListUpdate: 'Market Regulation List Update', + regulatoryComplianceInvestigation: 'Regulatory compliance investigation', + generalDocumentRectificationPlan: 'General Document Rectification Plan', + vehicleModelRectification: 'Vehicle model rectification', + isItRelatedTo: 'Is it related to', + responsiblePerson: 'person responsible', + plannedCompletionDate: 'Planned completion date', + actualFinishingDate: 'actual finishing date', + deliverables: 'Deliverables', + pcrNumber: 'PCR number', + rectifyFinishingDate: 'Completion date of rectification', + viewMarketList: 'View market list', + viewTroubleshootingResults: 'View troubleshooting results' } } diff --git a/src/common/lang/standardRegulationLibrary/zh-cn.js b/src/common/lang/standardRegulationLibrary/zh-cn.js index 182ff54..9184aac 100644 --- a/src/common/lang/standardRegulationLibrary/zh-cn.js +++ b/src/common/lang/standardRegulationLibrary/zh-cn.js @@ -10,6 +10,7 @@ module.exports = { submitQuestion: '提交问题', standardCatalogue: '标准目录', clauseLabel: '条文标签', + translation: '译文', clauseNumber: '条文号', clauseTitle: '条文标题', regulatoryRequirementsType: '法规要求类型', // 法规要求类型 diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue index 2473641..2b89429 100644 --- a/src/views/dashboard/Analysis.vue +++ b/src/views/dashboard/Analysis.vue @@ -3,14 +3,26 @@
- - - - - - - - + + + + + + + + + + + + + + + + + + + +
@@ -20,10 +32,11 @@ import SearchAndWarningCard from './modules/SearchAndWarningCard' import QuickEnterCard from './modules/QuickEnterCard' import FriendLinkCard from './modules/FriendLinkCard' import ToDoTaskCard from './modules/ToDoTaskCard' +import RetrievalCard from '@views/dashboard/modules/RetrievalCard' export default { name: 'Analysis', - components: { ToDoTaskCard, FriendLinkCard, QuickEnterCard, SearchAndWarningCard }, + components: { RetrievalCard, ToDoTaskCard, FriendLinkCard, QuickEnterCard, SearchAndWarningCard }, // components: { FirstStageCard }, methods: {} } @@ -33,36 +46,14 @@ export default { @import '~@assets/less/common.less'; .all-wrapper { - display: flex; - flex-direction: column; - height: calc(100vh - 83px); - flex-wrap: wrap; + padding-top: 20px; } .flex-item { margin: 10px; } -// 检索和预警 -.search-warning-wrapper { - width: calc(70% - 20px); - height: calc(100% - 20px - 162px); +.mb-20 { + margin-bottom: 20px; } -// 快捷入口 -.quick-enter-wrapper { - width: calc(30% - 20px); - height: 306px; -} -// 友情链接 -.friend-link-wrapper { - width: calc(70% - 20px); - height: 142px; -} -// 待办任务 -.to-do-task-wrapper { - //grid-area: ToDoTask; - width: calc(30% - 20px); - height: calc(100% - 346px); -} - /deep/ .top-wrapper { display: flex; align-items: center; diff --git a/src/views/dashboard/modules/FriendLinkCard.vue b/src/views/dashboard/modules/FriendLinkCard.vue index a9eaa6a..2599844 100644 --- a/src/views/dashboard/modules/FriendLinkCard.vue +++ b/src/views/dashboard/modules/FriendLinkCard.vue @@ -2,12 +2,16 @@
- 友情链接 - 链接管理 + {{$t('dashboard.friendLink.friendLink')}} + {{$t('dashboard.friendLink.more')}}
- {{ item.name }} + + + +

{{ item.name }}

+
@@ -21,8 +25,16 @@ export default { name: 'FriendLinkCard', data () { return { - loading: true, - dataSource: [], + defaultLogo: require('@/assets/image/dashboard/friendship-link.png'), + loading: false, + dataSource: [ + { name: '奇瑞官网' }, + { name: '奇瑞官网' }, + { name: '奇瑞官网' }, + { name: '奇瑞官网' }, + { name: '奇瑞官网' }, + { name: '奇瑞官网' } + ], url: { list: '/sys/lawsFriendlyLinks/list' } @@ -64,24 +76,33 @@ export default { .content-wrapper { display: grid; - grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr; - grid-gap: 20px; + grid-template-columns: repeat(6, 1fr); margin-top: 12px; } .content-div { - height: 62px; - padding: 16px; - line-height: 30px; - box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.1); - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - font-size: 16px; - font-family: PingFang SC-Regular, PingFang SC, sans-serif; - font-weight: 400; - color: @primary-color; - text-align: center; - background-image: url('../../../assets/image/dashboardLinkBack.png'); cursor: pointer; + text-align: center; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + margin: auto; + + .icon-img { + border-radius: 8px; + width: 64px; + height: 64px; + margin-bottom: 2px; + } + p { + height: 28px; + line-height: 28px; + margin: 0; + color: #333333; + text-align: center; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } } diff --git a/src/views/dashboard/modules/MenuManageModal.vue b/src/views/dashboard/modules/MenuManageModal.vue index 9533b06..8bb588c 100644 --- a/src/views/dashboard/modules/MenuManageModal.vue +++ b/src/views/dashboard/modules/MenuManageModal.vue @@ -103,9 +103,9 @@ export default { }, // 确定 handleOk () { - // 最多选择9个模块 - if (this.targetKeys.length > 9) { - this.$message.warning(this.$t('dashboard.quickEnter.maxSelectedNine')) + // 最多选择14个模块 + if (this.targetKeys.length > 14) { + this.$message.warning(this.$t('dashboard.quickEnter.maxSelected')) return } // 如果进来的值和提交的值一样不提示操作成功 diff --git a/src/views/dashboard/modules/QuickEnterCard.vue b/src/views/dashboard/modules/QuickEnterCard.vue index e13273c..a32dc39 100644 --- a/src/views/dashboard/modules/QuickEnterCard.vue +++ b/src/views/dashboard/modules/QuickEnterCard.vue @@ -3,7 +3,7 @@

{{ this.$t('dashboard.quickEnter.quickEnter') }}

-

{{ this.$t('dashboard.quickEnter.menuManage') }}

+

@@ -14,8 +14,12 @@

{{ item.name }}

-
- +
+ + + +

{{ $t('dashboard.quickEnter.newFunction') }}

+
@@ -84,7 +88,7 @@ export default { // { iconName: 'a-fagui1', name: '国内法规' }, // { iconName: 'a-moxingkuaisuchaifen1', name: '征求意见' }, // { iconName: 'jiaoseguanli', name: '角色管理' }, - // { iconName: 'wenda1', name: '我的问答' } + { src: require(`@/assets/image/dashboard/quickEnter/new-process.png`), name: '新建流程' } ] } }, @@ -102,7 +106,7 @@ export default { // 如果能找到菜单名，就用对应图标 const findMap = map.find(m => m.id === item.id || m.name === item.name) if (findMap) { - item.src = require(`@/assets/image/dashboard/${findMap.srcName}.png`) + item.src = require(`@/assets/image/dashboard/quickEnter/${findMap.srcName}.png`) } return item }) @@ -135,73 +139,39 @@ export default { diff --git a/src/views/dashboard/modules/RetrievalCard.vue b/src/views/dashboard/modules/RetrievalCard.vue new file mode 100644 index 0000000..22847d6 --- /dev/null +++ b/src/views/dashboard/modules/RetrievalCard.vue @@ -0,0 +1,142 @@ + + + + + diff --git a/src/views/dashboard/modules/SearchAndWarningCard.vue b/src/views/dashboard/modules/SearchAndWarningCard.vue index cc8bfeb..533ec5c 100644 --- a/src/views/dashboard/modules/SearchAndWarningCard.vue +++ b/src/views/dashboard/modules/SearchAndWarningCard.vue @@ -1,35 +1,19 @@ diff --git a/src/views/dashboard/search/AdvancedSearch.vue b/src/views/dashboard/search/AdvancedSearch.vue index 3d47f86..97c803f 100644 --- a/src/views/dashboard/search/AdvancedSearch.vue +++ b/src/views/dashboard/search/AdvancedSearch.vue @@ -3,14 +3,16 @@
- 一般检索 - 高级检索 - {{ toggleSearchStatus ? '收起条件' : '展开条件' }} + + {{ $t('dashboard.generalSearch.generalSearch') }} + + {{ $t('dashboard.generalSearch.advancedSearch') }} + {{ toggleSearchStatus ? $t('dashboard.advancedSearch.storageConditions') : $t('dashboard.advancedSearch.unfoldConditions') }}
- 检索类别 + {{ $t('dashboard.advancedSearch.retrieveCategories') }}
- 标准类型 + {{ $t('dashboard.advancedSearch.standardType') }}
{{ item.label }} @@ -60,9 +62,12 @@ @@ -163,7 +207,7 @@ import { getEnterStandardList, getDomesticStandardQuery, getOverseasStandardQuery, - getEnterStandardQuery + getEnterStandardQuery, getAdvancedSearchAll, getAdvancedSearchClause, exportAdvancedSearch } from '@/api/dashboard' import JTable from '@/components/jero/JTable' import { @@ -177,10 +221,11 @@ import Vue from 'vue' import { ACCESS_TOKEN } from '../../../store/mutation-types' import { previewPdf } from '../../../utils/previewPdf' import { kkFilePreview } from '../../../utils/kkFilePreview' +import JRangePicker from '@comp/JDatePicker' export default { name: 'AdvancedSearch', - components: { JTable }, + components: { JRangePicker, JTable }, data () { return { FieldType, @@ -188,10 +233,14 @@ export default { toggleSearchStatus: true, // 检索条件的展开和收起，false收缩状态 currStandardType: '1', standardTypeOptions: [ - { label: '外来标准', value: StandardSource.FOREIGN.value }, - // { label: '国内标准法规', value: StandardSource.DOMESTIC.value }, - // { label: '海外标准法规', value: StandardSource.OVERSEAS.value }, - { label: '企业标准', value: StandardSource.ENTERPRISE.value } + // 全部 + { label: this.$t('dashboard.advancedSearch.all'), value: 'all' }, + // 外来标准法规 + { label: this.$t('dashboard.advancedSearch.foreignStandards'), value: StandardSource.FOREIGN.value }, + // 企业标准 + { label: this.$t('dashboard.advancedSearch.enterpriseStandards'), value: StandardSource.ENTERPRISE.value }, + // 条款 + { label: this.$t('dashboard.advancedSearch.term'), value: '4' } ], labelCol: { xl: 8, @@ -208,6 +257,16 @@ export default { categoryTreeList: [], // 组织机构下拉框数据 queryParam: {}, columns: [ + { // 序号 + title: this.$t('serialNumber'), + dataIndex: '', + key: 'rowIndex', + align: 'center', + width: 80, + customRender: function (t, r, index) { + return parseInt(index) + 1 + } + }, { // 标准号 title: this.$t('dashboard.advancedSearch.standardNum'), align: 'center', @@ -222,13 +281,13 @@ export default { dataIndex: 'standard_name', scopedSlots: { customRender: 'toDetail' } }, - { // 发布日期 - title: this.$t('dashboard.advancedSearch.releaseDate'), - align: 'center', - width: 180, - dataIndex: 'release_date', - scopedSlots: { customRender: 'text' } - }, + // { // 发布日期 + // title: this.$t('dashboard.advancedSearch.releaseDate'), + // align: 'center', + // width: 180, + // dataIndex: 'release_date', + // scopedSlots: { customRender: 'text' } + // }, { // 实施日期 title: this.$t('dashboard.advancedSearch.materialDate'), align: 'center', @@ -236,6 +295,20 @@ export default { dataIndex: 'implementation_date', scopedSlots: { customRender: 'text' } }, + { // 新生产车实施日期 + title: this.$t('dashboard.advancedSearch.newProduceMaterialDate'), + align: 'center', + width: 180, + dataIndex: 'new_product_impl_date', + scopedSlots: { customRender: 'text' } + }, + { // 新认证车实施日期 + title: this.$t('dashboard.advancedSearch.newAttestationMaterialDate'), + align: 'center', + width: 180, + dataIndex: 'new_auth_impl_date', + scopedSlots: { customRender: 'text' } + }, { // 标准状态 title: this.$t('dashboard.advancedSearch.standardStatus'), align: 'center', @@ -244,6 +317,135 @@ export default { scopedSlots: { customRender: 'text' } } ], + // 条款表格 + clauseColumns: [ + { // 序号 + title: this.$t('serialNumber'), + dataIndex: '', + key: 'rowIndex', + align: 'center', + width: 80, + customRender: function (t, r, index) { + return parseInt(index) + 1 + } + }, + { // 条款号 + title: this.$t('dashboard.advancedSearch.termNo'), + align: 'center', + width: 180, + dataIndex: 'item_num', + scopedSlots: { customRender: 'text' } + }, + { // 条款标题 + title: this.$t('dashboard.advancedSearch.termTitle'), + align: 'center', + width: 180, + dataIndex: 'item_title', + scopedSlots: { customRender: 'text' } + }, + { // 条款内容 + title: this.$t('dashboard.advancedSearch.termContent'), + align: 'center', + width: 180, + dataIndex: 'item_content', + scopedSlots: { customRender: 'text' } + }, + { // 适用零部件 + title: this.$t('dashboard.advancedSearch.applicableComponents'), + align: 'center', + width: 180, + dataIndex: 'applicable_components', + scopedSlots: { customRender: 'text' } + }, + { // 新生产车实施日期 + title: this.$t('dashboard.advancedSearch.newProduceVehiclesImplementationDate'), + align: 'center', + width: 180, + dataIndex: 'new_production_implementation', + scopedSlots: { customRender: 'text' } + }, + { // 新认证车实施日期 + title: this.$t('dashboard.advancedSearch.newAuthVehiclesImplementationDate'), + align: 'center', + width: 180, + dataIndex: 'new_cer_implement_date', + scopedSlots: { customRender: 'text' } + }, + { // 注册日期 + title: this.$t('dashboard.advancedSearch.registrationDate'), + align: 'center', + width: 180, + dataIndex: 'registration_date', + scopedSlots: { customRender: 'text' } + }, + { // 关键字 + title: this.$t('dashboard.advancedSearch.keywords'), + align: 'center', + width: 180, + dataIndex: 'keywords', + scopedSlots: { customRender: 'text' } + }, + { // 责任部门 + title: this.$t('dashboard.advancedSearch.responsibleDepartment'), + align: 'center', + width: 180, + dataIndex: 'responsible_department', + scopedSlots: { customRender: 'text' } + }, + { // 责任部门专业模块 + title: this.$t('dashboard.advancedSearch.responsibleDepartmentModule'), + align: 'center', + width: 180, + dataIndex: 'responsible_module', + scopedSlots: { customRender: 'text' } + }, + { // 关联部门 + title: this.$t('dashboard.advancedSearch.relatedDepartments'), + align: 'center', + width: 180, + dataIndex: 'related_department', + scopedSlots: { customRender: 'text' } + }, + { // 关联部门专业模块 + title: this.$t('dashboard.advancedSearch.relatedDepartmentModule'), + align: 'center', + width: 180, + dataIndex: 'related_module', + scopedSlots: { customRender: 'text' } + }, + { // 适用车型 + title: this.$t('dashboard.advancedSearch.applications'), + align: 'center', + width: 180, + dataIndex: 'applications', + scopedSlots: { customRender: 'text' } + }, + { // 动力类型 + title: this.$t('dashboard.advancedSearch.powerType'), + align: 'center', + width: 180, + dataIndex: 'power_type', + scopedSlots: { customRender: 'text' } + }, + { // 专业领域 + title: this.$t('dashboard.advancedSearch.professionalField'), + align: 'center', + width: 180, + dataIndex: 'domain_area', + scopedSlots: { customRender: 'text' } + }, + { // 配置需求 + title: this.$t('dashboard.advancedSearch.configurationRequirements'), + align: 'center', + width: 180, + dataIndex: 'configuration_requirements', + scopedSlots: { customRender: 'text' } + } + ], + // 条款数据 + clauseDataSource: [], + // 条款中当前选择标准 + currStandardId: '', dataSource: [], /* 分页参数 */ ipagination: { @@ -284,6 +486,16 @@ export default { this.getDataListFunc = getEnterStandardList this.getFormFunc = getEnterpriseStandardAddForm this.getDocumentInfoFunc = getEnterpriseStandardInfoById + } else if (val === 'all') { + this.getQueryConditionFunc = getDomesticStandardQuery + this.getDataListFunc = getAdvancedSearchAll + this.getFormFunc = getEnterpriseStandardAddForm + this.getDocumentInfoFunc = getEnterpriseStandardInfoById + } else if (val === '4') { + this.getQueryConditionFunc = getDomesticStandardQuery + this.getDataListFunc = getAdvancedSearchClause + this.getFormFunc = getEnterpriseStandardAddForm + this.getDocumentInfoFunc = getEnterpriseStandardInfoById } this.getSearch() // this.loadData(1) @@ -297,6 +509,55 @@ export default { this.queryParam.standard_state = this.defaultStandardStatus }, methods: { + // 导出 + handleExportXls (fileName, fileSuffix = '.xls') { + if (!fileName || typeof fileName !== 'string') { + fileName = '导出文件' + } + const param = this.getQueryParams() + param.standardType = this.currStandardType + if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { + param.selections = this.selectedRowKeys.join(',') + } + // 加一个大的提示 + const modalLoading = this.$info({ + title: this.$t('tips'), + content: {this.$t('exportTip')} + , + keyboard: false + }) + // 把知道了这个按钮去掉 + this.$nextTick(() => { + document.getElementsByClassName('ant-modal-confirm-btns')[0].style = 'display:none' + }) + exportAdvancedSearch(param).then((data) => { + if (!data) { + this.$message.warning(this.$t('fileDownloadFail')) + return + } + if (typeof window.navigator.msSaveBlob !== 'undefined') { + window.navigator.msSaveBlob(new Blob([data], { type: 'application/vnd.ms-excel' }), fileName + fileSuffix) + } else { + const url = window.URL.createObjectURL(new Blob([data], { type: 'application/vnd.ms-excel' })) + const link = document.createElement('a') + link.style.display = 'none' + link.href = url + link.setAttribute('download', fileName + fileSuffix) + document.body.appendChild(link) + link.click() + document.body.removeChild(link) // 下载完成移除元素 + window.URL.revokeObjectURL(url) // 释放掉blob对象 + } + }).finally(() => { + // 销毁这个提示 + modalLoading.destroy() + }) + }, + // 条款中点击标准，替换列表数据 + handleClickStandar (standard) { + this.currStandardId = standard.standardId + this.clauseDataSource = standard.clauseList + }, // 点击一般检索 clickGeneralSearch () { this.$router.push({ @@ -362,6 +623,10 @@ export default { let manuscriptName = '' // 记录找到哪个稿件就找到文件了 // 按照过程稿件顺序寻找文件 for (const formItem of processManuscript) { + // 只查看发布稿的文件 + if (formItem.dbFieldName !== 'publish_of_original') { + continue + } const keyId = formItem.dbFieldName const keyName = formItem.dbFieldName + '_dictText' if (!detailData[keyId]) continue @@ -486,8 +751,12 @@ export default { if (!this.getQueryConditionFunc || typeof this.getQueryConditionFunc !== 'function') { return } - const params = { - module: this.currStandardType + const params = {} + // 获取查询条件列表,全部、外部、条款就传moduleValue，企标module + if (this.getQueryConditionFunc === getDomesticStandardQuery) { + params.moduleValue = this.currStandardType + } else { + params.module = this.currStandardType } this.loading = true this.getQueryConditionFunc(params).then((res) => { @@ -495,7 +764,9 @@ export default { this.searchList = res.result // 标准状态特殊处理成多选 const standardStateIndex = this.searchList.findIndex(item => item.dbFieldName === 'standard_state') - this.searchList[standardStateIndex].fieldShowType = FieldType.OPTION_MORE.value + if (standardStateIndex !== -1) { + this.searchList[standardStateIndex].fieldShowType = FieldType.OPTION_MORE.value + } this.getOptionsData() // 获取下拉数据 } }).finally(() => { @@ -552,6 +823,10 @@ export default { this.getDataListFunc(params).then((res) => { if (res.success) { this.dataSource = res.result.records || res.result + // 标准类型是条款时，默认回显第一个标准的条款 + if (this.dataSource.length && this.currStandardType === '4') { + this.handleClickStandar(this.dataSource[0]) + } if (res.result.total) { this.ipagination.total = res.result.total } else { @@ -596,6 +871,8 @@ export default { this.queryParam.standard_state = this.defaultStandardStatus } this.dataSource = [] + this.clauseDataSource = [] + this.currStandardId = '' this.ipagination.total = 0 } } @@ -676,6 +953,47 @@ export default { } .table-wrapper { - margin-top: 20px; + //margin-top: 20px; +} + +// 条款 +.term-wrapper { + display: flex; + + .left-wrapper { + width: 200px; + + .left-header { + margin-bottom: 4px; + background-color: rgba(0, 100, 250, 0.08); + height: 40px; + padding: 10px 20px; + border-radius: 8px 8px 0 0; + font-size: 16px; + font-weight: bold; + } + + .left-body { + //max-height: 300px; + //overflow-y: auto; + + .left-child { + cursor: pointer; + padding: 10px 20px; + border-bottom: 1px solid rgba(0, 100, 250, 0.08); + transition: all .3s; + + &:hover, + &.active { + background-color: rgba(0, 100, 250, 0.08); + } + } + } + } + .table-wrapper { + margin-left: 20px; + flex: auto; + width: calc(100% - 220px); + } } diff --git a/src/views/dashboard/search/GeneralSearch.vue b/src/views/dashboard/search/GeneralSearch.vue index 551114b..5c58f7d 100644 --- a/src/views/dashboard/search/GeneralSearch.vue +++ b/src/views/dashboard/search/GeneralSearch.vue @@ -19,7 +19,7 @@ {{ $t('dashboard.generalSearch.homePage') }} - {{ $t('dashboard.generalSearch.searchHistory') }} +
@@ -35,7 +35,7 @@
- + {{ $t('export') }}
@@ -178,21 +178,21 @@ export default { toggleSearchStatus: false, // 检索条件收缩还是展开， false收缩状态 // 检索方式可选择项 retrievalModeOptions: [ - { key: '1', label: '全文检索' }, - { key: '2', label: '标题检索' } + { key: '1', label: this.$t('dashboard.retrieval.fullSearch') }, + { key: '2', label: this.$t('dashboard.retrieval.titleSearch') } ], retrievalModeCurrent: '1', // 检索方式当前选中项 // 资源类型可选择项 resourceTypeOptions: [ - { key: 'all', label: '全部' }, - { key: '1', label: '外来标准法规' }, - { key: '3', label: '企业标准' } + { key: 'all', label: this.$t('dashboard.generalSearch.all') }, + { key: '1', label: this.$t('dashboard.generalSearch.foreignStandard') }, + { key: '3', label: this.$t('dashboard.generalSearch.enterpriseStandard') } ], resourceTypeCurrent: 'all', // 资源类型当前选中项 // 标准状态设置可选择项 standardStatusSetOptions: [ - { key: '1', label: '不包含废止标准' }, - { key: '2', label: '包含废止标准' } + { key: '1', label: this.$t('dashboard.generalSearch.notIncludeAbolishedStandard') }, + { key: '2', label: this.$t('dashboard.generalSearch.includeAbolishedStandard') } ], standardStatusSetCurrent: '1', // 标准状态设置当前选中项 selectOptions: {}, // 其他筛选条件 @@ -632,6 +632,10 @@ export default { let manuscriptName = '' // 记录找到哪个稿件就找到文件了 // 按照过程稿件顺序寻找文件 for (const formItem of processManuscript) { + // 只查看发布稿的文件 + if (formItem.dbFieldName !== 'publish_of_original') { + continue + } const keyId = formItem.dbFieldName const keyName = formItem.dbFieldName + '_dictText' if (!detailData[keyId]) continue