diff --git a/src/components/DrawInitForm/index.jsx b/src/components/DrawInitForm/index.jsx index a74e9c57f00a0947e7b81f2fe49e66dd05953841..5ee81409877d0b8ed3dbabc3d36711fb3a3f4dcf 100644 --- a/src/components/DrawInitForm/index.jsx +++ b/src/components/DrawInitForm/index.jsx @@ -48,9 +48,10 @@ function DrawInitForm(props) { closable={true} getContainer={false} style={{ position: "absolute", transform: "translateX(0)",maxWidth:"100%" }} - width={props.val == "detail" ? 1000 : props.width} {...props} + width={props.val == "detail" ? "80vw" : props.width} destroyOnClose={true} + > {props.val == "only" && props.children} {props.val == "only" ? null : props.val == "detail" ? <Details {...detailprops}></Details> : <InitForm {...newProps}></InitForm>} diff --git a/src/components/Footer/index.jsx b/src/components/Footer/index.jsx index 7ae517896a9d1b5cc48292b03281e0893cfcbcec..1f1ebccdd28d8942e714e256381d9fb25229fcd9 100644 --- a/src/components/Footer/index.jsx +++ b/src/components/Footer/index.jsx @@ -9,12 +9,12 @@ const Footer = () => { <DefaultFooter copyright={`${currentYear} 江è‹å—高智能装备创新ä¸å¿ƒå‡ºå“`} links={[ - { - key: "download", - title: "æ’件下载", - blankTarget: true, - href: '/staticfile/download/CLodop_Setup_for_Win32NT.exe', - }, + // { + // key: "download", + // title: "æ’件下载", + // blankTarget: true, + // href: '/staticfile/download/CLodop_Setup_for_Win32NT.exe', + // }, // { // key: "github", // title: <GithubOutlined />, diff --git a/src/utils/printHandle.js b/src/utils/printHandle.js index 04ca5a2152ac44ea2a44282ca7000cd80b8ab82c..3ee2f1943ab03f579ecb7ee7004182353b474c40 100644 --- a/src/utils/printHandle.js +++ b/src/utils/printHandle.js @@ -1,5 +1,8 @@ import { str } from "@/utils/mymodelhtml.js"; import { doFetch } from "./doFetch"; +import { Button, Modal, Space } from "antd"; + +const { confirm } = Modal; export async function start(url, params) { try { var LODOP = window.getLodop(); @@ -39,6 +42,31 @@ export async function start(url, params) { ); } } catch (err) { - alert("系统检测当å‰çŽ¯å¢ƒæœªå®‰è£…ç›¸å…³æ’件,请先安装C-Lodopæ’ä»¶ï¼"); + // alert("系统检测当å‰çŽ¯å¢ƒæœªå®‰è£…ç›¸å…³æ’件,请先安装C-Lodopæ’ä»¶ï¼"); + // var message = + // '系统检测当å‰çŽ¯å¢ƒæœªå®‰è£…ç›¸å…³æ’件,请先安装C-Lodopæ’ä»¶ï¼<a href="/staticfile/download/CLodop_Setup_for_Win32NT.exe">点击æ¤å¤„下载æ’ä»¶</a>'; + // var tempElement = document.createElement("div"); + // tempElement.innerHTML = message; + // var alertText = tempElement.textContent || tempElement.innerText || ""; + + const showDeleteConfirm = () => { + confirm({ + title: "æç¤º", + content: ( + <div> + 系统检测当å‰çŽ¯å¢ƒæœªå®‰è£…C-Lodop相关æ’ä»¶ï¼ + {/* <br /> */} + {/* <a href="/staticfile/download/CLodop_Setup_for_Win32NT.exe"> + 点击æ¤å¤„下载æ’ä»¶ + </a> */} + </div> + ), + okText: "下载æ’ä»¶", + onOk() { + location.href = "/staticfile/download/CLodop_Setup_for_Win32NT.exe"; + }, + }); + }; + showDeleteConfirm(); } }