diff --git a/src/api/projectLibraryApi.js b/src/api/projectLibraryApi.js
index c5042047..82b0eee6 100644
--- a/src/api/projectLibraryApi.js
+++ b/src/api/projectLibraryApi.js
@@ -8,10 +8,35 @@ const editVehicleItemLibrary = (params) => postAction('/projectLibrary/lawsProje
const queryByIdVehicleItemLibrary = (params) => getAction('/projectLibrary/lawsProjectLibrary/queryById', params)
// 车型项目下拉数据
const getCarTypeProjectList = (params) => getAction('/projectLibrary/lawsProjectLibrary/queryList', params)
+// 车型项目库-详情-项目风险性总览
+const queryProjectRiskOverview = (params) => getAction('/projectLibrary/lawsProjectLibrary/riskOverview', params)
+// 车型项目库-详情-法规清单-调取
+const transferRegulationList = (params) => postAction('/projectLibrary/lawsAssess/retrieval', params)
+// 车型项目库-详情-法规清单-复制
+const copyProject = (params) => postAction('/projectLibrary/lawsAssess/copy', params)
+
+// 未符合项-新增
+const addInconformityItem = (params) => postAction('/projectLibrary/lawsEvaluationNotMet/add', params)
+// 未符合项-编辑
+const editInconformityItem = (params) => postAction('/projectLibrary/lawsEvaluationNotMet/edit', params)
+// 未符合项-批量关闭
+const batchCloseInconformityItem = (params) => postAction('/projectLibrary/lawsEvaluationNotMet/batchClose', params)
+
+// 专项项目库-编辑
+const editSpecialProjectLibrary = (params) => postAction('', params)
export {
addVehicleItemLibrary,
editVehicleItemLibrary,
queryByIdVehicleItemLibrary,
- getCarTypeProjectList
+ getCarTypeProjectList,
+ queryProjectRiskOverview,
+ transferRegulationList,
+ copyProject,
+
+ addInconformityItem,
+ editInconformityItem,
+ batchCloseInconformityItem,
+
+ editSpecialProjectLibrary
}
diff --git a/src/assets/less/common.less b/src/assets/less/common.less
index 82cb096a..78bcb427 100644
--- a/src/assets/less/common.less
+++ b/src/assets/less/common.less
@@ -672,23 +672,23 @@
width: calc((100% - 32px) / 3);
display: flex;
margin: 0 16px 16px 0;
+}
- label {
- width: 7.5em;
- font-size: 16px;
- font-family: PingFang SC-Regular, PingFang SC, sans-serif;
- font-weight: 400;
- color: #86909C;
- }
+.detail-page-part-form-item > label {
+ width: 7.5em;
+ font-size: 16px;
+ font-family: PingFang SC-Regular, PingFang SC, sans-serif;
+ font-weight: 400;
+ color: #86909C;
+}
- span {
- word-break: break-all;
- font-size: 16px;
- font-family: PingFang SC-Regular, PingFang SC, sans-serif;
- color: #1D2129;
- flex: 1;
- width: 0;
- }
+.detail-page-part-form-item > span {
+ word-break: break-all;
+ font-size: 16px;
+ font-family: PingFang SC-Regular, PingFang SC, sans-serif;
+ color: #1D2129;
+ flex: 1;
+ width: 0;
}
.detail-page-part-form-item:nth-child(3n) {
diff --git a/src/common/lang/projectLibrary/zh.js b/src/common/lang/projectLibrary/zh.js
index c6bd3426..81d50ff8 100644
--- a/src/common/lang/projectLibrary/zh.js
+++ b/src/common/lang/projectLibrary/zh.js
@@ -30,6 +30,36 @@ module.exports = {
processState: '流程状态',
evaluationResult: '评估结果',
responsibleDepartment: '责任部门',
- evaluationResultHistory: '评估结果历史'
+ evaluationResultHistory: '评估结果历史',
+ evaluationProcessDetail: '评估流程详情',
+ standardNumberClauseNumber: '标准编号/条款号',
+ projectNumber: '项目编号',
+ evaluator: '评估人',
+ dateOfEvaluation: '评估日期',
+ nonConformanceTerm: '不符合项',
+ solutions: '应对措施',
+ riskPoint: '风险点',
+ verificationScheme: '验证方案',
+ estimateTheChangeCycle: '预估更改周期',
+ estimatedDateOfCompletionOfRectification:'预计整改完成日期'
+ },
+ noncoincidenceItem: {
+ noncoincidenceItem: '未符合项',
+ batchClose: '批量关闭',
+ actualRectificationCompletionDate: '实际整改完成日期',
+ projectSelection: '项目选择',
+ relevantProject: '相关项目',
+ relatedProcess: '相关流程',
+ viewNonMatchItemEvaluationResult: '查看未符合项评估结果',
+ involvedItem: '涉及项目'
+ },
+ specialProjectLibrary: {
+ specialProjectLibrary: '专项项目库',
+ vehicleSeries: '车型系列',
+ complianceAssessmentResults: '合规评估结果',
+ basisDescription: '依据描述',
+ whetherToApproveAProjectOrNot: '是否立项',
+ vehicleModel: '车型',
+ supportingMaterial: '佐证材料'
}
}
diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js
index 396eb917..c84afdcc 100644
--- a/src/common/lang/zh-cn.js
+++ b/src/common/lang/zh-cn.js
@@ -511,7 +511,8 @@ module.exports = {
specialty: '特点',
comparisonItem: '比对项',
relatedAccessory: '相关附件',
- reserveAnItem: '至少需要保留一项'
+ reserveAnItem: '至少需要保留一项',
+ enterTheListNameFirst: '请先输入清单名称,选择标准后将保存数据'
},
// 标准预警
standardWarning: {
diff --git a/src/components/FileEcho.vue b/src/components/FileEcho.vue
index 83b40f43..91dfb316 100644
--- a/src/components/FileEcho.vue
+++ b/src/components/FileEcho.vue
@@ -32,7 +32,7 @@ import { Base64 } from 'js-base64'
// 支持预览的文件类型
const CAN_PREVIEW_FILE_TYPE = ['pdf', 'image']
// 支持预览的文件后缀
-const CAN_PREVIEW_FILE_SUFFIX = ['jpg', 'jpeg', 'png', 'raw', 'pdf', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'txt', 'mp3', 'mp4', 'flv']
+const CAN_PREVIEW_FILE_SUFFIX = ['jpg', 'jpeg', 'png', 'pdf', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx']
const FILE_TYPE_IMGS = ['jpg', 'jpeg', 'png', 'raw']
const FILE_TYPE_PDF = 'pdf'
diff --git a/src/components/ProcessDetailList.vue b/src/components/ProcessDetailList.vue
index 7fa67349..ba7ec34d 100644
--- a/src/components/ProcessDetailList.vue
+++ b/src/components/ProcessDetailList.vue
@@ -101,7 +101,7 @@ import FlowChartModal from './FlowChartModal.vue'
import UploadFile from './UploadFile'
// 支持预览的文件后缀
-const CAN_PREVIEW_FILE_SUFFIX = ['jpg', 'jpeg', 'png', 'raw', 'pdf', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'txt', 'mp3', 'mp4', 'flv']
+const CAN_PREVIEW_FILE_SUFFIX = ['jpg', 'jpeg', 'png', 'pdf', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx']
const FILE_TYPE_IMGS = ['jpg', 'jpeg', 'png', 'raw']
const FILE_TYPE_PDF = 'pdf'
diff --git a/src/components/selection/VehicleProjectSelection.vue b/src/components/selection/VehicleProjectSelection.vue
new file mode 100644
index 00000000..113e4883
--- /dev/null
+++ b/src/components/selection/VehicleProjectSelection.vue
@@ -0,0 +1,116 @@
+
+
+
+
event.target.value = event.target.value.trim()"
+ :placeholder="placeholder" />
+
+ {{ $t('projectLibrary.noncoincidenceItem.projectSelection') }}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/selection/VehicleProjectSelectionDrawer.vue b/src/components/selection/VehicleProjectSelectionDrawer.vue
index becbde38..beedb4ed 100644
--- a/src/components/selection/VehicleProjectSelectionDrawer.vue
+++ b/src/components/selection/VehicleProjectSelectionDrawer.vue
@@ -7,17 +7,81 @@
@close="onClose"
:visible="visible"
:maskClosable="false"
+ destroyOnClose
class="custom-drawer-style">
+
+
+
{{ $t('close') }}
+
+ {{ $t('preservation') }}
+
+
+
\ No newline at end of file
diff --git a/src/views/projectLibrary/inconformityItem/modules/InconformityItemDetailModal.vue b/src/views/projectLibrary/inconformityItem/modules/InconformityItemDetailModal.vue
new file mode 100644
index 00000000..98780a4a
--- /dev/null
+++ b/src/views/projectLibrary/inconformityItem/modules/InconformityItemDetailModal.vue
@@ -0,0 +1,179 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/projectLibrary/inconformityItem/modules/InconformityItemModal.vue b/src/views/projectLibrary/inconformityItem/modules/InconformityItemModal.vue
new file mode 100644
index 00000000..a69d7fc5
--- /dev/null
+++ b/src/views/projectLibrary/inconformityItem/modules/InconformityItemModal.vue
@@ -0,0 +1,257 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/projectLibrary/specialProjectLibrary/SpecialProjectLibrary.vue b/src/views/projectLibrary/specialProjectLibrary/SpecialProjectLibrary.vue
new file mode 100644
index 00000000..661da2a6
--- /dev/null
+++ b/src/views/projectLibrary/specialProjectLibrary/SpecialProjectLibrary.vue
@@ -0,0 +1,328 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('batchDelete') }}
+
+
+
+ {{ $t('export') }}
+
+
+
+
+
+
+
+
+
+ {{ text || text === 0 ? text : global.emptyLine }}
+ {{ text }}
+ {{ global.emptyLine }}
+
+
+
+
+
+
+ {{ text || text === 0 ? text : global.emptyLine }}
+ {{ text }}
+ {{ global.emptyLine }}
+
+
+
+
+
+
+ {{ text || text === 0 ? text : global.emptyLine }}
+ {{ text }}
+ {{ global.emptyLine }}
+
+
+
+
+
+
+ {{ text || text === 0 ? text : global.emptyLine }}
+ {{ text }}
+ {{ global.emptyLine }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/projectLibrary/specialProjectLibrary/modules/BasisDescriptionModal.vue b/src/views/projectLibrary/specialProjectLibrary/modules/BasisDescriptionModal.vue
new file mode 100644
index 00000000..d4ec3a60
--- /dev/null
+++ b/src/views/projectLibrary/specialProjectLibrary/modules/BasisDescriptionModal.vue
@@ -0,0 +1,239 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('reset') }}
+
+ {{ $t('query') }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ text }}
+
+
+
+
+ {{ text || text === 0 ? text : global.emptyLine }}
+ {{ text }}
+ {{ global.emptyLine }}
+
+
+
+
+
+
+
+
![]()
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/projectLibrary/specialProjectLibrary/modules/SpecialProjectLibraryModal.vue b/src/views/projectLibrary/specialProjectLibrary/modules/SpecialProjectLibraryModal.vue
new file mode 100644
index 00000000..b9e0f577
--- /dev/null
+++ b/src/views/projectLibrary/specialProjectLibrary/modules/SpecialProjectLibraryModal.vue
@@ -0,0 +1,95 @@
+
+
+
+
+
+
+ event.target.value = event.target.value.trim()"
+ :maxLength="50"
+ v-decorator="['projectName']" />
+
+
+
+ event.target.value = event.target.value.trim()"
+ :maxLength="50"
+ v-decorator="['workNumber']" />
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/projectLibrary/vehicleItemLibrary/EvaluationResultHistoryPage.vue b/src/views/projectLibrary/vehicleItemLibrary/EvaluationResultHistoryPage.vue
index 8806f97d..e2fbcdb5 100644
--- a/src/views/projectLibrary/vehicleItemLibrary/EvaluationResultHistoryPage.vue
+++ b/src/views/projectLibrary/vehicleItemLibrary/EvaluationResultHistoryPage.vue
@@ -1,13 +1,205 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('query') }}
+
+ {{ $t('reset') }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ text || text === 0 ? text : global.emptyLine }}
+ {{ text }}
+ {{ global.emptyLine }}
+
+
+
+
+
+
+ {{ text || text === 0 ? text : global.emptyLine }}
+ {{ text }}
+ {{ global.emptyLine }}
+
+
+
+
+
+
+
diff --git a/src/views/projectLibrary/vehicleItemLibrary/EvaluationResultPage.vue b/src/views/projectLibrary/vehicleItemLibrary/EvaluationResultPage.vue
new file mode 100644
index 00000000..b833225e
--- /dev/null
+++ b/src/views/projectLibrary/vehicleItemLibrary/EvaluationResultPage.vue
@@ -0,0 +1,207 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/projectLibrary/vehicleItemLibrary/VehicleItemLibrary.vue b/src/views/projectLibrary/vehicleItemLibrary/VehicleItemLibrary.vue
index bcf3a7d5..ec171830 100644
--- a/src/views/projectLibrary/vehicleItemLibrary/VehicleItemLibrary.vue
+++ b/src/views/projectLibrary/vehicleItemLibrary/VehicleItemLibrary.vue
@@ -22,7 +22,7 @@
diff --git a/src/views/projectLibrary/vehicleItemLibrary/VehicleItemLibraryDetail.vue b/src/views/projectLibrary/vehicleItemLibrary/VehicleItemLibraryDetail.vue
index 1ae4778d..7ed51718 100644
--- a/src/views/projectLibrary/vehicleItemLibrary/VehicleItemLibraryDetail.vue
+++ b/src/views/projectLibrary/vehicleItemLibrary/VehicleItemLibraryDetail.vue
@@ -1,7 +1,10 @@
-
+
- {{ $t('projectLibrary.vehicleItemLibrary.noMatchItemDetails') }}
+
+
+ {{ $t('projectLibrary.vehicleItemLibrary.noMatchItemDetails') }}
+
@@ -32,7 +35,13 @@
-
+
+
{{ $t('projectLibrary.vehicleItemLibrary.regulationsList') }}
@@ -44,22 +53,26 @@
+ v-model="queryParam.standardNumber">
+ v-model="queryParam.standardName">
- {{ $t('reset') }}
-
+
{{ $t('query') }}
+ {{ $t('reset') }}
@@ -67,16 +80,17 @@
-
{{ $t('projectLibrary.vehicleItemLibrary.transfer') }}
+
+ {{ $t('projectLibrary.vehicleItemLibrary.transfer') }}
- {{ $t('copy') }}
+ {{ $t('copy') }}
+ v-has="'vehicleItemLibrary:detail:export'"
+ @click="handleExportXls($t('projectLibrary.vehicleItemLibrary.regulationsList'))">
{{ $t('export') }}
@@ -89,10 +103,13 @@
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
:pagination="ipagination"
:scroll="{x: '100%'}"
+ :loading="loading"
+ :operation-list="operationList"
+ @operationClick="operationClick"
@change="handleTableChange">
-
-
+
+
{{ text || text === 0 ? text : global.emptyLine }}
{{ text }}
@@ -100,49 +117,50 @@
-
-
+
+
{{ text || text === 0 ? text : global.emptyLine }}
- {{ text }}
+ {{ text }}
{{ global.emptyLine }}
-
- {{ $t('projectLibrary.vehicleItemLibrary.evaluationResultHistory') }}
-
-
-
-
- {{ $t('delete') }}
-
-
-
-
+
+
+