From 30f9260fff507544b7f28e5d259330c29f50b7e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= Date: Mon, 11 Sep 2023 17:34:05 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E8=BD=A6=E5=9E=8B=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=BA=93=EF=BC=9A=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/projectLibraryApi.js | 11 + src/assets/less/common.less | 1 - src/common/lang/en-us.js | 5 +- src/common/lang/projectLibrary/en.js | 15 ++ src/common/lang/projectLibrary/zh.js | 14 ++ src/common/lang/zh-cn.js | 5 +- src/components/StandardResolutionSheet.vue | 8 +- src/enums/commonEnums.js | 6 + src/mixins/JeroListMixin.js | 7 +- .../vehicleItemLibrary/VehicleItemLibrary.vue | 200 ++++++++++++++++++ .../modules/VehicleItemLibraryModal.vue | 175 +++++++++++++++ 11 files changed, 439 insertions(+), 8 deletions(-) create mode 100644 src/api/projectLibraryApi.js create mode 100644 src/common/lang/projectLibrary/en.js create mode 100644 src/common/lang/projectLibrary/zh.js create mode 100644 src/views/projectLibrary/vehicleItemLibrary/VehicleItemLibrary.vue create mode 100644 src/views/projectLibrary/vehicleItemLibrary/modules/VehicleItemLibraryModal.vue diff --git a/src/api/projectLibraryApi.js b/src/api/projectLibraryApi.js new file mode 100644 index 00000000..a8b6bb44 --- /dev/null +++ b/src/api/projectLibraryApi.js @@ -0,0 +1,11 @@ +import { postAction } from './manage.js' + +// 车型项目库-新增 +const addVehicleItemLibrary = (params) => postAction('/projectLibrary/lawsProjectLibrary/add', params) +// 车型项目库-编辑 +const editVehicleItemLibrary = (params) => postAction('/projectLibrary/lawsProjectLibrary/edit', params) + +export { + addVehicleItemLibrary, + editVehicleItemLibrary +} diff --git a/src/assets/less/common.less b/src/assets/less/common.less index d292f5af..0bb5aa28 100644 --- a/src/assets/less/common.less +++ b/src/assets/less/common.less @@ -93,7 +93,6 @@ .operate-btn { display: flex; align-items: center; - font-size: 16px; font-family: PingFang SC-Regular, PingFang SC, sans-serif; color: #1D2129; diff --git a/src/common/lang/en-us.js b/src/common/lang/en-us.js index c89e2ba9..ffc6de4f 100644 --- a/src/common/lang/en-us.js +++ b/src/common/lang/en-us.js @@ -3,6 +3,7 @@ const personalCenter = require('./personalCenter/en.js') const standardRegulationLibrary = require('./standardRegulationLibrary/en-us') const enterpriseStandardLibrary = require('./enterpriseStandardLibrary/en.js') const businessSupport = require('./businessSupport/en') +const projectLibrary = require('./projectLibrary/en.js') module.exports = { // 共用 @@ -526,5 +527,7 @@ module.exports = { // 企标库 enterpriseStandardLibrary, // 业务支持 - businessSupport + businessSupport, + // 项目库 + projectLibrary } diff --git a/src/common/lang/projectLibrary/en.js b/src/common/lang/projectLibrary/en.js new file mode 100644 index 00000000..53a25f03 --- /dev/null +++ b/src/common/lang/projectLibrary/en.js @@ -0,0 +1,15 @@ +module.exports = { + projectName: 'Project name', // 项目名称 + workOrderNumber: 'Work order number', // 工作令编号 + projectHealthStatus: 'Project health status', // 项目健康状态 + + // 车型项目库 + vehicleItemLibrary: { + vehicleItemLibrary: 'Vehicle item library', // 车型项目库 + PMSInfoSynchronization: 'PMS information synchronization', // PMS信息同步 + projectSource: 'Project source', // 项目来源 + projectName: 'Project name', // 项目名称 + projectLeader: 'Project leader', // 项目负责人, + PMSDetails: 'PMS Details' // PMS详情 + } +} diff --git a/src/common/lang/projectLibrary/zh.js b/src/common/lang/projectLibrary/zh.js new file mode 100644 index 00000000..53ae53a4 --- /dev/null +++ b/src/common/lang/projectLibrary/zh.js @@ -0,0 +1,14 @@ +module.exports = { + projectName: '项目名称', + workOrderNumber: '工作令编号', + projectHealthStatus: '项目健康度', + + // 车型项目库 + vehicleItemLibrary: { + vehicleItemLibrary: '车型项目库', + PMSInfoSynchronization: 'PMS信息同步', + projectSource: '项目来源', + projectLeader: '项目负责人', + PMSDetails: 'PMS详情' + } +} diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js index a51fb5cd..94a86134 100644 --- a/src/common/lang/zh-cn.js +++ b/src/common/lang/zh-cn.js @@ -3,6 +3,7 @@ const personalCenter = require('./personalCenter/zh.js') const standardRegulationLibrary = require('./standardRegulationLibrary/zh-cn') const enterpriseStandardLibrary = require('./enterpriseStandardLibrary/zh.js') const businessSupport = require('./businessSupport/zh') +const projectLibrary = require('./projectLibrary/zh.js') module.exports = { // 共用 @@ -526,5 +527,7 @@ module.exports = { // 企标库 enterpriseStandardLibrary, // 业务支持 - businessSupport + businessSupport, + // 项目库 + projectLibrary } diff --git a/src/components/StandardResolutionSheet.vue b/src/components/StandardResolutionSheet.vue index 634547dc..060ddef9 100644 --- a/src/components/StandardResolutionSheet.vue +++ b/src/components/StandardResolutionSheet.vue @@ -39,12 +39,12 @@
- + 条文
- + 条文标签
@@ -239,6 +239,10 @@ export default { color: #1D2129; cursor: pointer; + .iconfont { + color: @primary-color; + } + span { margin-left: 8px; } diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js index 8203fbc9..5a9355be 100644 --- a/src/enums/commonEnums.js +++ b/src/enums/commonEnums.js @@ -41,3 +41,9 @@ export const StandardSystemTreeNodeType = { ROOT_NODE: { text: '根节点', value: '1' }, CHILD_NODE: { text: '子节点', value: '2' } } + +// 车型项目库-项目来源 +export const ProjectSource = { + ADD: { text: '本地新增', value: '1' }, + PMS: { text: 'PMS', value: '2' } +} diff --git a/src/mixins/JeroListMixin.js b/src/mixins/JeroListMixin.js index 5655361d..64315a96 100644 --- a/src/mixins/JeroListMixin.js +++ b/src/mixins/JeroListMixin.js @@ -67,7 +67,8 @@ export const JeroListMixin = { mounted () { // 过滤表格操作列没有权限的按钮 if (this.needFilterTableBtn) { - this.operationList = this.operationList.filter(item => isHasPermission(item.has)) + this.operationList = this.operationList.filter(item => !item.has || isHasPermission(item.has)) + console.log(this.operationList) } }, computed: { @@ -309,13 +310,13 @@ export const JeroListMixin = { return } if (typeof window.navigator.msSaveBlob !== 'undefined') { - window.navigator.msSaveBlob(new Blob([data], { type: 'application/vnd.ms-excel' }), fileName + '.xls') + window.navigator.msSaveBlob(new Blob([data], { type: 'application/vnd.ms-excel' }), fileName + '.xlsx') } 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 + '.xls') + link.setAttribute('download', fileName + '.xlsx') document.body.appendChild(link) link.click() document.body.removeChild(link) // 下载完成移除元素 diff --git a/src/views/projectLibrary/vehicleItemLibrary/VehicleItemLibrary.vue b/src/views/projectLibrary/vehicleItemLibrary/VehicleItemLibrary.vue new file mode 100644 index 00000000..30554f31 --- /dev/null +++ b/src/views/projectLibrary/vehicleItemLibrary/VehicleItemLibrary.vue @@ -0,0 +1,200 @@ + + + + + diff --git a/src/views/projectLibrary/vehicleItemLibrary/modules/VehicleItemLibraryModal.vue b/src/views/projectLibrary/vehicleItemLibrary/modules/VehicleItemLibraryModal.vue new file mode 100644 index 00000000..59d978f8 --- /dev/null +++ b/src/views/projectLibrary/vehicleItemLibrary/modules/VehicleItemLibraryModal.vue @@ -0,0 +1,175 @@ + + + + +