From 85ee9fba771b8627b635659362e63e804c37ef28 Mon Sep 17 00:00:00 2001 From: Teo <2642673902@qq.com> Date: Thu, 17 Apr 2025 18:07:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E5=B7=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/quality/qualityInspection/types.ts | 2 + src/api/system/oss/index.ts | 4 +- src/components/FileUpload/index.vue | 63 ++++++++++-------- .../cpmponent/qualityConstructionDetail.vue | 7 +- .../quality/qualityConstructionLog/index.vue | 66 ++++++++++++++----- .../component/qualityInspectionDetail.vue | 30 +++++---- src/views/quality/qualityInspection/index.vue | 55 +++++++++------- src/views/safety/questionUserAnswer/index.vue | 2 +- .../SafetyInspectionDetailDialog.vue | 8 ++- src/views/safety/safetyInspection/index.vue | 13 +++- src/views/safety/safetyWeeklyReport/index.vue | 2 +- 11 files changed, 161 insertions(+), 91 deletions(-) diff --git a/src/api/quality/qualityInspection/types.ts b/src/api/quality/qualityInspection/types.ts index 39bb563..a7cb8e7 100644 --- a/src/api/quality/qualityInspection/types.ts +++ b/src/api/quality/qualityInspection/types.ts @@ -1,4 +1,6 @@ export interface QualityInspectionVO { + verificationType: string; + measure: string; /** * 巡检类型 */ diff --git a/src/api/system/oss/index.ts b/src/api/system/oss/index.ts index 3a145d4..9980610 100644 --- a/src/api/system/oss/index.ts +++ b/src/api/system/oss/index.ts @@ -28,6 +28,6 @@ export function delOss(ossId: string | number | Array) { } // 下载OSS对象存储 -export function downLoadOss(ossId: string | number | Array) { - return download('/safety/questionUserAnswer/exportFile', { idList: ossId }, '安全考试.zip'); +export function downLoadOss(ossId: { id?: string | number; idList?: string | number | Array }, url: string, fileName: string) { + return download(url, ossId, fileName); } diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue index 7a2692d..9748d8b 100644 --- a/src/components/FileUpload/index.vue +++ b/src/components/FileUpload/index.vue @@ -19,36 +19,39 @@ :data="data" > - - 选取文件 - 导入员工资料 - -
- 请上传 - - - 的文件 +
+ + 选取文件 + 导入员工资料 + +
+ 请上传 + + + 的文件 +
+ + +
  • + + {{ getFileName(file.name) }} + +
    + 删除 +
    +
  • +
    - - -
  • - - {{ getFileName(file.name) }} - -
    - 删除 -
    -
  • -
    @@ -214,6 +217,8 @@ const handleUploadSuccess = (res: any, file: UploadFile) => { // 删除文件 const handleDelete = async (index: string | number, type?: string) => { + console.log('🚀 ~ handleDelete ~ index:', index); + await proxy?.$modal.confirm('是否确认删除此文件?').finally(); if (type === 'ossId') { delOss(index); diff --git a/src/views/quality/qualityConstructionLog/cpmponent/qualityConstructionDetail.vue b/src/views/quality/qualityConstructionLog/cpmponent/qualityConstructionDetail.vue index 10a7ea3..e843dc7 100644 --- a/src/views/quality/qualityConstructionLog/cpmponent/qualityConstructionDetail.vue +++ b/src/views/quality/qualityConstructionLog/cpmponent/qualityConstructionDetail.vue @@ -113,7 +113,7 @@