From aa778a985e2da55a8d4aaf6f100bcc6094266d94 Mon Sep 17 00:00:00 2001 From: xixi <123@qq.com> Date: Fri, 13 Sep 2024 16:45:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=8B=E8=BD=BDpdf?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/card/CardProj.tsx | 56 +++++++++++---- src/components/card/CardProjDownload.tsx | 44 ++++++++++-- src/components/card/card-proj.css | 24 ++++++- src/interfaces/card/ICardProj.ts | 1 + src/route/Correction/Correction.tsx | 92 ++++++++++++++++++------ src/route/proj/ProjEdit.tsx | 12 ++++ src/route/proj/ProjEditAll.tsx | 13 ++++ src/route/proj/ProjEditFree.tsx | 9 +++ 8 files changed, 211 insertions(+), 40 deletions(-) diff --git a/src/components/card/CardProj.tsx b/src/components/card/CardProj.tsx index 23b76d9..c609c44 100644 --- a/src/components/card/CardProj.tsx +++ b/src/components/card/CardProj.tsx @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-unused-vars */ import './card-proj.css'; -import { useDispatch } from 'react-redux' +import { useDispatch } from 'react-redux' import { CheckOutlined, ClockCircleOutlined, @@ -166,7 +166,7 @@ export default function CardProj(props: any) { }) dispath({ type: 'upProjStatus', - val: data.generate.generateStatus == GenerateStatus.SUCCESS ?'查看':'编辑' + val: data.generate.generateStatus == GenerateStatus.SUCCESS ? '查看' : '编辑' }) } else if (data.pay.chargeType == 'FREE') { nav(`/proj-efree/${data.projId}`); @@ -176,7 +176,7 @@ export default function CardProj(props: any) { }) dispath({ type: 'upProjStatus', - val: data.generate.generateStatus == GenerateStatus.SUCCESS ?'查看':'编辑' + val: data.generate.generateStatus == GenerateStatus.SUCCESS ? '查看' : '编辑' }) } else { nav(`/proj-edit/${data.projId}`); @@ -186,7 +186,7 @@ export default function CardProj(props: any) { }) dispath({ type: 'upProjStatus', - val: data.generate.generateStatus == GenerateStatus.SUCCESS ?'查看':'编辑' + val: data.generate.generateStatus == GenerateStatus.SUCCESS ? '查看' : '编辑' }) } } @@ -218,7 +218,7 @@ export default function CardProj(props: any) { // getTag() // console.log('查看数据', data); // console.log('查看状态', data.pay.payStatus); - + }, []) return ( @@ -349,7 +349,7 @@ export default function CardProj(props: any) { > {data.pay.payment / 100} -
(已优惠{data.pay.couponAmount/100}元)
+
(已优惠{data.pay.couponAmount / 100}元)
{/*
基础费用:{basicsValue}
*/} @@ -418,20 +418,52 @@ export default function CardProj(props: any) { - + }}> 操作手册 */} +
+
+ 操作手册 +
+
+ + +
+
{ - isShow && + }} + > 代码压缩包 } {/* */} - + }}> 源代码 */} +
+
+ 源代码 +
+
+ + +
+
) : <> } diff --git a/src/components/card/CardProjDownload.tsx b/src/components/card/CardProjDownload.tsx index f6c732a..a40c54d 100644 --- a/src/components/card/CardProjDownload.tsx +++ b/src/components/card/CardProjDownload.tsx @@ -11,14 +11,44 @@ export default function CardProjDownload(props: IProjDownload) {
{ props.canBtnClick ? ( - { - e.preventDefault(); - props.handleDownload(); - }}>下载 +
+
+ { + e.preventDefault(); + props.handleDownload(); + }}>下载 +
+
+ 下载 ： + { + e.preventDefault(); + props.handleDownload(); + }}>word + { + e.preventDefault(); + props.downPdf(); + }}>pdf +
+
) : ( - { - e.preventDefault(); - }}>下载 + // { + // e.preventDefault(); + // }}>下载 +
+
+ { + e.preventDefault(); + }}>下载 +
+
+ +
下载 ： { + e.preventDefault(); + }} >word { + e.preventDefault(); + }}>pdf
+
+
) } diff --git a/src/components/card/card-proj.css b/src/components/card/card-proj.css index b4063ce..f2047f5 100644 --- a/src/components/card/card-proj.css +++ b/src/components/card/card-proj.css @@ -1,4 +1,20 @@ @media (min-width: 1571px) { + .option{ + display: flex; + /* background-color: red; */ + align-items: flex-start; + } + .downloadBox{ + display: flex; + flex-direction: column; + align-items: center; + margin-left: 10px; + margin-top: 2px; + } + .zpibtn{margin-left: 10px;} + .down-pdf{ + margin-left: 5px; + } .card-proj { border-radius: 6px; background-color: var(--color-light); @@ -1091,7 +1107,13 @@ margin-bottom: 10px; } - + .downloadBox{ + display: flex; + + align-items: center; + /* justify-content: flex-start; */ + margin-left: 8px; + } diff --git a/src/interfaces/card/ICardProj.ts b/src/interfaces/card/ICardProj.ts index 64a2506..46ca8b5 100644 --- a/src/interfaces/card/ICardProj.ts +++ b/src/interfaces/card/ICardProj.ts @@ -39,6 +39,7 @@ export interface IProjDownload { canBtnClick?: boolean; handleDownload(): void; + downPdf():void } export interface IProjJump { diff --git a/src/route/Correction/Correction.tsx b/src/route/Correction/Correction.tsx index 6ef7e82..f6be43b 100644 --- a/src/route/Correction/Correction.tsx +++ b/src/route/Correction/Correction.tsx @@ -429,21 +429,47 @@ export default function Correction() { // window.open(`${Axios.defaults?.baseURL}/route/proj/download/manual/correction/${record.projId}`) // } // }}> 下载
-
-
{ +
+
下载代码： + { + e.preventDefault(); window.open(`${Axios.defaults?.baseURL}/route/proj/download/code/correction/${record.projId}`) - }}> 下载代码
-
{ - window.open(`${Axios.defaults?.baseURL}/route/proj/download/manual/correction/${record.projId}`) - }}> 下载手册
+ >word + { + e.preventDefault(); + window.open(`${Axios.defaults?.baseURL}/route/proj/download/code/correction/pdf/${record.projId}`) + }} + style={{ marginLeft: 5 }} + >pdf
+
{ + window.open(`${Axios.defaults?.baseURL}/route/proj/download/manual/correction/${record.projId}`) + }}> 下载手册： + { + e.preventDefault(); + window.open(`${Axios.defaults?.baseURL}/route/proj/download/manual/correction/${record.projId}`) + + }} + >word + { + e.preventDefault(); + window.open(`${Axios.defaults?.baseURL}/route/proj/download/manual/correction/pdf/${record.projId}`) + }} + style={{ marginLeft: 5 }} + >pdf +
+
), } @@ -546,20 +572,46 @@ export default function Correction() { render: (_, record) => ( // {record.applyStatus} record.applyStatus == 'APPROVED' ? ( -
-
+
{ - window.open(`${Axios.defaults?.baseURL}/route/proj/download/code/correction/${record.projId}`) - }}> 下载代码
-
下载代码： + { + e.preventDefault(); + window.open(`${Axios.defaults?.baseURL}/route/proj/download/code/correction/${record.projId}`) + }} + >word + { + e.preventDefault(); + window.open(`${Axios.defaults?.baseURL}/route/proj/download/code/correction/pdf/${record.projId}`) + }} + style={{ marginLeft: 5 }} + >pdf +
+
{ window.open(`${Axios.defaults?.baseURL}/route/proj/download/manual/correction/${record.projId}`) - }}> 下载手册
+ }}> 下载手册： + { + e.preventDefault(); + window.open(`${Axios.defaults?.baseURL}/route/proj/download/manual/correction/${record.projId}`) + + }} + >word + { + e.preventDefault(); + window.open(`${Axios.defaults?.baseURL}/route/proj/download/manual/correction/pdf/${record.projId}`) + }} + style={{ marginLeft: 5 }} + >pdf +
) : record.applyStatus == 'PENDING' ? (
{ // console.log(record); diff --git a/src/route/proj/ProjEdit.tsx b/src/route/proj/ProjEdit.tsx index 65ce840..8bedf88 100644 --- a/src/route/proj/ProjEdit.tsx +++ b/src/route/proj/ProjEdit.tsx @@ -577,6 +577,9 @@ export default function ProjEdit() { handleDownload={() => { window.open(`${Axios.defaults?.baseURL}/route/proj/download/apply/${pathParams.projId}`) }} + downPdf={() => { + // window.open(`${Axios.defaults?.baseURL}/route/proj/download/apply/pdf/${pathParams.projId}`) + }} /> { window.open(`${Axios.defaults?.baseURL}/route/proj/download/manual/${pathParams.projId}`) }} + downPdf={() => { + window.open(`${Axios.defaults?.baseURL}/route/proj/download/manual/pdf/${pathParams.projId}`) + }} /> {showZpi && ( { window.open(`${Axios.defaults?.baseURL}/route/proj/download/code-zip/${pathParams.projId}`) }} + downPdf={() => { + // window.open(`${Axios.defaults?.baseURL}/route/proj/download/code-zip/pdf/${pathParams.projId}`) + }} /> )} {/* { window.open(`${Axios.defaults?.baseURL}/route/proj/download/code/${pathParams.projId}`) }} + downPdf={() => { + window.open(`${Axios.defaults?.baseURL}/route/proj/download/code/pdf/${pathParams.projId}`) + }} /> {/* { window.open(`${Axios.defaults?.baseURL}/route/proj/download/apply/${pathParams.projId}`) }} + downPdf={() => { + }} /> { window.open(`${Axios.defaults?.baseURL}/route/proj/download/manual/${pathParams.projId}`) }} + downPdf={() => { + window.open(`${Axios.defaults?.baseURL}/route/proj/download/manual/pdf/${pathParams.projId}`) + }} /> {/* {showZpi && ( */} { window.open(`${Axios.defaults?.baseURL}/route/proj/download/code-zip/${pathParams.projId}`) }} + downPdf={() => { + // window.open(`${Axios.defaults?.baseURL}/route/proj/download/code-zip/pdf/${pathParams.projId}`) + }} /> {/* )} */} {/* { window.open(`${Axios.defaults?.baseURL}/route/proj/download/code/${pathParams.projId}`) }} + downPdf={() => { + window.open(`${Axios.defaults?.baseURL}/route/proj/download/code/pdf/${pathParams.projId}`) + }} /> { window.open(downloadUrl(certificate, false), '_blank') }} + downPdf={() => { + }} /> {/* { window.open(`${Axios.defaults?.baseURL}/route/proj/download/apply/${pathParams.projId}`) }} + downPdf={() => { + // window.open(`${Axios.defaults?.baseURL}/route/proj/download/apply/pdf/${pathParams.projId}`) + }} /> { window.open(`${Axios.defaults?.baseURL}/route/proj/download/manual/${pathParams.projId}`) }} + downPdf={() => { + window.open(`${Axios.defaults?.baseURL}/route/proj/download/manual/pdf/${pathParams.projId}`) + }} /> {/* { window.open(`${Axios.defaults?.baseURL}/route/proj/download/code/${pathParams.projId}`) }} + downPdf={() => { + window.open(`${Axios.defaults?.baseURL}/route/proj/download/code/pdf/${pathParams.projId}`) + }} /> {/*