From d624af2a48f1dd5d7ed769f6cc800f11a7979aa2 Mon Sep 17 00:00:00 2001 From: 陈鑫涛 <10125295+chen-xintao97@user.noreply.gitee.com> Date: Mon, 19 May 2025 17:20:13 +0800 Subject: [PATCH] 报价单和报表页面 --- package.json | 8 +++++++- src/components/Charts/Gauge/index.js | 247 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- src/components/Common/BoxDesignCompontent/index.js | 2 +- src/components/Common/BoxShowImgMaterial/index.css | 7 +++++++ src/components/Common/BoxShowImgMaterial/index.js | 350 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/components/Common/BoxShowImgMaterial/index.less | 8 ++++++++ src/components/Common/CommonViewTable/index.js | 2 +- src/components/Common/ShowImgMaterial/index.css | 160 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/components/Common/ShowImgMaterial/index.js | 817 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/components/Common/ShowImgMaterial/index.less | 175 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/components/Common/ShowImgPQty/index.js | 639 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/components/Common/ShowImgPQty/index.less | 143 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/components/Common/Typesetting/index.css | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/components/Common/Typesetting/index.less | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/components/Common/Typesetting/typesetting.js | 1203 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/components/QuickQuote/i.json | 0 src/components/QuickQuote/index.css | 206 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/components/QuickQuote/index.jsx | 2035 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/components/QuickQuote/index.less | 369 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/components/QuoQuotation/Quotation/Quotation.js | 4425 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/components/QuoQuotation/Quotation/SplitPasteQuotation.js | 326 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/components/QuoQuotation/QuotationPack/QuotationPack.js | 6570 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/components/QuoQuotation/QuotationPackTableTree/QuotationPackTableTree.js | 10074 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/components/QuoQuotation/index.less | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/routes/quoQuotation/quotation/quotation.js | 26 ++++++++++++++++++++++++++ src/routes/quoQuotation/quotationPack/quotationPack.js | 26 ++++++++++++++++++++++++++ src/routes/quoQuotation/quotationPackTableTree/quotationPackTableTree.js | 26 ++++++++++++++++++++++++++ src/routes/tab/tab.js | 6 +++++- 28 files changed, 27865 insertions(+), 193 deletions(-) create mode 100644 src/components/Common/BoxShowImgMaterial/index.css create mode 100644 src/components/Common/BoxShowImgMaterial/index.js create mode 100644 src/components/Common/BoxShowImgMaterial/index.less create mode 100644 src/components/Common/ShowImgMaterial/index.css create mode 100644 src/components/Common/ShowImgMaterial/index.js create mode 100644 src/components/Common/ShowImgMaterial/index.less create mode 100644 src/components/Common/ShowImgPQty/index.js create mode 100644 src/components/Common/ShowImgPQty/index.less create mode 100644 src/components/Common/Typesetting/index.css create mode 100644 src/components/Common/Typesetting/index.less create mode 100644 src/components/Common/Typesetting/typesetting.js create mode 100644 src/components/QuickQuote/i.json create mode 100644 src/components/QuickQuote/index.css create mode 100644 src/components/QuickQuote/index.jsx create mode 100644 src/components/QuickQuote/index.less create mode 100644 src/components/QuoQuotation/Quotation/Quotation.js create mode 100644 src/components/QuoQuotation/Quotation/SplitPasteQuotation.js create mode 100644 src/components/QuoQuotation/QuotationPack/QuotationPack.js create mode 100644 src/components/QuoQuotation/QuotationPackTableTree/QuotationPackTableTree.js create mode 100644 src/components/QuoQuotation/index.less create mode 100644 src/routes/quoQuotation/quotation/quotation.js create mode 100644 src/routes/quoQuotation/quotationPack/quotationPack.js create mode 100644 src/routes/quoQuotation/quotationPackTableTree/quotationPackTableTree.js diff --git a/package.json b/package.json index 1d5f087..d3f01c7 100644 --- a/package.json +++ b/package.json @@ -11,20 +11,26 @@ "dependencies": { "@ant-design/compatible": "^1.1.2", "@ant-design/icons": "^5.6.1", - "@antv/g2": "^5.2.12", + "@antv/data-set": "^0.11.8", + "@antv/g2": "^4.1.24", "@js-preview/docx": "^1.6.4", "@js-preview/excel": "^1.7.14", "antd": "^5.24.3", "antd-mobile": "2.3.4", "antd-v4": "npm:antd@4.24.16", "braft-editor": "^2.3.9", + "classnames": "^2.5.1", "dhtmlx-gantt": "^9.0.6", + "g2": "^2.3.13", + "g2-plugin-slider": "^1.2.1", "immutability-helper": "^3.1.1", "lodash": "^4.17.21", "lodash-decorators": "^6.0.1", "moment": "^2.30.1", + "numeral": "^2.0.6", "react-dnd": "^14.0.5", "react-dnd-html5-backend": "^14.1.0", + "react-fittext": "1.0.0", "react-flow-renderer": "^10.3.17", "react-grid-layout": "^1.3.4", "react-highlight-words": "^0.21.0", diff --git a/src/components/Charts/Gauge/index.js b/src/components/Charts/Gauge/index.js index 56bd634..aa01906 100644 --- a/src/components/Charts/Gauge/index.js +++ b/src/components/Charts/Gauge/index.js @@ -1,235 +1,104 @@ import React, { PureComponent } from 'react'; -import G2 from '@antv/g2'; -import Bind from 'lodash-decorators/bind'; -import Debounce from 'lodash-decorators/debounce'; -import equal from '../equal'; - -const { Shape } = G2; +import { Chart } from '@antv/g2'; +import debounce from 'lodash/debounce'; const primaryColor = '#2F9CFF'; const backgroundColor = '#F0F2F5'; -/* eslint no-underscore-dangle: 0 */ class Gauge extends PureComponent { componentDidMount() { - setTimeout(() => { - this.renderChart(); - }, 10); + this.renderChart(); window.addEventListener('resize', this.resize); } componentWillReceiveProps(nextProps) { - if (!equal(this.props, nextProps)) { - setTimeout(() => { - this.renderChart(nextProps); - }, 10); + if (!this.isEqual(this.props, nextProps)) { + this.renderChart(nextProps); } } componentWillUnmount() { window.removeEventListener('resize', this.resize); - // if (this.chart) { - // console.log('data', this.chart); - // this.chart.destroy(); - // } this.resize.cancel(); + if (this.chart) { + this.chart.destroy(); + } } - @Bind() - @Debounce(200) - resize() { - if (!this.node) { - return; + resize = debounce(() => { + if (this.chart) { + this.chart.render(); } - this.renderChart([]); - } + }, 200); - handleRef = (n) => { - this.node = n; + isEqual = (prevProps, nextProps) => { + // Implement your own equality check logic + return prevProps.data === nextProps.data && prevProps.color === nextProps.color; }; - initChart(nextProps) { - const { xUnit, color = primaryColor } = nextProps || this.props; - - Shape.registShape('point', 'dashBoard', { - drawShape(cfg, group) { - const originPoint = cfg.points[0]; - const point = this.parsePoint({ x: originPoint.x, y: 0.4 }); - - const center = this.parsePoint({ - x: 0, - y: 0, - }); - - const shape = group.addShape('polygon', { - attrs: { - points: [ - [center.x, center.y], - [point.x + 8, point.y], - [point.x + 8, point.y - 2], - [center.x, center.y - 2], - ], - radius: 2, - lineWidth: 2, - arrow: false, - fill: color, - }, - }); - - group.addShape('Marker', { - attrs: { - symbol: 'circle', - lineWidth: 2, - fill: color, - radius: 8, - x: center.x, - y: center.y, - }, - }); - group.addShape('Marker', { - attrs: { - symbol: 'circle', - lineWidth: 2, - fill: '#fff', - radius: 5, - x: center.x, - y: center.y, - }, - }); - - const { origin } = cfg; - group.addShape('text', { - attrs: { - x: center.x, - y: center.y + 80, - text: `${origin._origin.value}%`, - textAlign: 'center', - fontSize: 24, - fill: 'rgba(0, 0, 0, 0.85)', - }, - }); - group.addShape('text', { - attrs: { - x: center.x, - y: center.y + 45, - text: xUnit, - textAlign: 'center', - fontSize: 14, - fill: 'rgba(0, 0, 0, 0.43)', - }, - }); - - return shape; - }, - }); - } - - renderChart(nextProps) { - if (this.node.offsetWidth === 0) { - return; - } - const { - height, color = primaryColor, bgColor = backgroundColor, xUnit, - } = nextProps || this.props; - const data = [{ name: xUnit, value: this.props.data }]; + renderChart = (props = this.props) => { + const { data, color = primaryColor, bgColor = backgroundColor } = props; + const value = Math.min(Math.max(data, 0), 100); // Ensure value is between 0 and 100 if (this.chart) { - this.chart.clear(); - } - if (this.chart) { this.chart.destroy(); } - if (this.node) { - this.node.innerHTML = ''; - } - this.initChart(nextProps); - const chart = new G2.Chart({ + const chart = new Chart({ container: this.node, - forceFit: true, - height, - animate: false, - plotCfg: { - margin: [10, 10, 30, 10], - }, + autoFit: true, + height: 200, + padding: [20, 20, 60, 20], }); - chart.source(data); - chart.tooltip(false); - chart.coord('gauge', { - startAngle: -1.2 * Math.PI, - endAngle: 0.20 * Math.PI, + chart.coordinate('polar', { + startAngle: -Math.PI / 2, + endAngle: Math.PI / 2, + radius: 0.9, }); - chart.col('value', { - type: 'linear', - nice: true, - min: 0, - max: 100, - tickCount: 6, + + chart.axis('value', false); + + // Draw background arc + chart.guide().arc({ + start: [0, 0.95], + end: [100, 0.95], + style: { + stroke: bgColor, + lineWidth: 12, + }, }); - chart.axis('value', { - subTick: false, - tickLine: { + + // Draw value arc + chart.guide().arc({ + start: [0, 0.95], + end: [value, 0.95], + style: { stroke: color, - lineWidth: 2, - value: -14, - }, - labelOffset: -12, - formatter: (val) => { - switch (parseInt(val, 10)) { - case 20: - return '差'; - case 40: - return '中'; - case 60: - return '良'; - case 80: - return '优'; - default: - return ''; - } + lineWidth: 12, }, }); - chart.point().position('value').shape('dashBoard'); - draw(data); - - /* eslint no-shadow: 0 */ - function draw(data) { - const val = data[0].value; - const lineWidth = 12; - chart.guide().clear(); - - chart.guide().arc(() => { - return [0, 0.95]; - }, () => { - return [val, 0.95]; - }, { - stroke: color, - lineWidth, - }); - - chart.guide().arc(() => { - return [val, 0.95]; - }, (arg) => { - return [arg.max, 0.95]; - }, { - stroke: bgColor, - lineWidth, - }); - chart.changeData(data); - } + // Draw center circle + chart.guide().html({ + position: [50, 0.95], + html: `
${value}%
`, + }); + + chart.render(); this.chart = chart; - } + }; + + handleRef = (node) => { + this.node = node; + }; render() { - return ( -
- ); + return
; } } -export default Gauge; +export default Gauge; \ No newline at end of file diff --git a/src/components/Common/BoxDesignCompontent/index.js b/src/components/Common/BoxDesignCompontent/index.js index 2528e45..19dd750 100644 --- a/src/components/Common/BoxDesignCompontent/index.js +++ b/src/components/Common/BoxDesignCompontent/index.js @@ -11,7 +11,7 @@ import AntdDraggableModal from "@/components/Common/AntdDraggableModal"; import CommonViewTable from "@/components/Common/CommonViewTable"; import StaticEditTable from "@/components/Common/CommonTable"; import jsPreviewPdf from "@js-preview/pdf"; -import * as commonConfig from "@/utils/config"; +import commonConfig from "@/utils/config"; import SvgBox from "./svg"; import styles from "./index.less"; const BoxDesignEvent = props => { diff --git a/src/components/Common/BoxShowImgMaterial/index.css b/src/components/Common/BoxShowImgMaterial/index.css new file mode 100644 index 0000000..14cc0c2 --- /dev/null +++ b/src/components/Common/BoxShowImgMaterial/index.css @@ -0,0 +1,7 @@ +.box { + position: relative; + background-color: #f3f3f3; +} +.box .materialBox { + background-color: '#b7e0ff'; +} diff --git a/src/components/Common/BoxShowImgMaterial/index.js b/src/components/Common/BoxShowImgMaterial/index.js new file mode 100644 index 0000000..2691a3c --- /dev/null +++ b/src/components/Common/BoxShowImgMaterial/index.js @@ -0,0 +1,350 @@ +/* eslint-disable */ +import React, { useEffect, useState, useRef } from "react"; +import { VerticalLeftOutlined, VerticalRightOutlined } from "@ant-design/icons"; +import styles from "./index.less"; +import { bottom } from "react-grid-layout/build/utils"; +const BoxShowImgMaterial = props => { + + const boxRef = useRef(null); + const textRef = useRef(null); + const textRefs = useRef(null); + const nTextRefs = useRef(null); + const nTextRef = useRef(null); + const [boxKey,setBoxKey] = useState(new Date().getTime()) + const clientWidth = 200; + const clientHeight = 300; + const boxScale = 300 / 400; + // 找出盒型信息 + const { slaveData, selectedNode } = props.state; + const { boxModel } = props; + const slaveDataDetail = slaveData?.find(item => item.sTreeNodeName === selectedNode.showName && item.sBoxModel === boxModel); + if (slaveDataDetail) { + // 最大上机长 上机宽 排版长 排版宽 材料长 材料宽 + var { dMaxLength, dMaxWidth, dMachineLength, dMachineWidth, dWlcd, dWlkd, dSBLB, dXBLB, dZBLB, dYBLB, scale } = slaveDataDetail; + } + // 计算可以放置的盒子数量 + const horizontalBoxes = Math.floor(dWlkd / dMachineWidth); + const verticalBoxes = Math.floor(dWlcd / dMachineLength); + const scaleX = (clientWidth - 50) / (dWlkd + 60); + const scaleY = (clientHeight - 25) / (dWlcd + 90); + // 动态生成多个 materialBox + const generateMaterialBoxes = () => { + const boxes = []; + for (let i = 0; i < horizontalBoxes * verticalBoxes; i++) { + boxes.push( +
+
+ +
+ + {dMachineWidth} + + +
+
+
+ +
+ + {dMachineLength} + + +
+
+
+ ); + } + return boxes; + }; + // 计算材料利用率 + const availability = ((((horizontalBoxes * verticalBoxes) * (Number(dMachineLength) * Number(dMachineWidth)) / (Number(dWlcd) * Number(dWlkd)))) * 100).toFixed(2); + useEffect(() => { + setBoxKey(new Date().getTime()); + setTimeout(() => { + if (boxRef.current && textRef.current && textRefs.current && nTextRef.current && nTextRefs.current) { + // 计算父元素的缩放因子 + const scaleX = (clientWidth - 50) / (dWlkd + 60); + const scaleY = (clientHeight - 25) / (dWlcd + 90); + + // 对父元素应用缩放 + boxRef.current.style.transform = `scale(${scaleX}, ${scaleY})`; + boxRef.current.style.transformOrigin = "top left"; + // // 对子元素应用逆缩放 + textRef.current.style.transform = `scale(${1 / scaleX}, ${1 / scaleY})`; + textRef.current.style.transformOrigin = "top left"; + textRefs.current.style.transform = `scale(${1 / scaleX}, ${1 / scaleY})`; + textRefs.current.style.transformOrigin = "top left"; + } + }, 0); +}, [slaveDataDetail]); +const isMax = slaveDataDetail?.dMaxWidth * slaveDataDetail?.dMaxLength > slaveDataDetail?.dMachineLength * slaveDataDetail?.dMachineWidth +const isDPartsLength = slaveDataDetail?.dPartsLength < slaveDataDetail?.dMaxLength && slaveDataDetail?.dPartsWidth < slaveDataDetail?.dMaxWidth + + +const isShow = isDPartsLength && slaveDataDetail && slaveDataDetail.dMachineLength && slaveDataDetail.dMaxWidth && slaveDataDetail.dMaxLength && isMax + return ( + <> + {isShow ? ( +
+
+ +
+ + + {dWlkd} + + + 材料利用率: + + + {availability}% + + + +
+
+
+ +
+ + {dWlcd} + + +
+
+ {generateMaterialBoxes()} +
+ ) : ( + "" + )} + + ); +}; +export default BoxShowImgMaterial; diff --git a/src/components/Common/BoxShowImgMaterial/index.less b/src/components/Common/BoxShowImgMaterial/index.less new file mode 100644 index 0000000..59b7ba2 --- /dev/null +++ b/src/components/Common/BoxShowImgMaterial/index.less @@ -0,0 +1,8 @@ +.box{ + position: relative; + background-color: rgb(243, 243, 243); + .materialBox{ + // position: absolute; + background-color: '#b7e0ff'; + } +} \ No newline at end of file diff --git a/src/components/Common/CommonViewTable/index.js b/src/components/Common/CommonViewTable/index.js index f751ebc..2713889 100644 --- a/src/components/Common/CommonViewTable/index.js +++ b/src/components/Common/CommonViewTable/index.js @@ -269,7 +269,7 @@ export default class CommonViewTable extends Component { { viewConfigs && viewConfigs.map((child) => { const iOrder = sMemo ? 100 : child.iOrder > 100 ? 100 : child.iOrder; /* 排序 */ - if (child.sControlName.indexOf('DividerArea') !== -1) { + if (child.sControlName && child.sControlName.indexOf('DividerArea') !== -1) { return ( { + var dMachineWidth = dMachineWidth; + var dMachineLength = dMachineLength; + //计算合版数量 + var iTemp = Math.floor(dMachineWidth / dPartsWidth) * Math.floor(dMachineLength / dPartsLength); + return iTemp; + }; + //横排（上机高、上机宽、部件高、部件宽、出血咬口） dPartsLength --》dMachineWidth，dPartsWidth--》dMachineLength + getHp = (dMachineLength, dMachineWidth, dPartsLength, dPartsWidth) => { + var dMachineWidth = dMachineWidth; + var dMachineLength = dMachineLength; + //计算合版数量 + var iTemp = Math.floor(dMachineWidth / dPartsLength) * Math.floor(dMachineLength / dPartsWidth); + return iTemp; + }; + //横竖取大 + getHSQD = (dMachineLength, dMachineWidth, dPartsLength, dPartsWidth) => { + var iTemp = this.getHp(dMachineLength, dMachineWidth, dPartsLength, dPartsWidth); + var iTemp2 = this.getSp(dMachineLength, dMachineWidth, dPartsLength, dPartsWidth); + if (iTemp2 > iTemp) { + iTemp = iTemp2; + // tag= 2;//竖排 + } + return iTemp; + }; + + getTag = (dMachineLength, dMachineWidth, dPartsLength, dPartsWidth) => { + let num = 1; + var iTemp = this.getHp(dMachineLength, dMachineWidth, dPartsLength, dPartsWidth); + var iTemp2 = this.getSp(dMachineLength, dMachineWidth, dPartsLength, dPartsWidth); + if (iTemp2 > iTemp) { + num = 2; //竖排 + } + return num; + }; + + //传入参数 宽、高、长、宽 + getHHP = (dMatLength, dMatWidth, dLength, dWidth) => { + var p_dMatLength = dMatLength; // + var p_dMatWidth = dMatWidth; // + var p_dLength = dLength; //长度*2+两个出血位 + var p_dWidth = dWidth; //高度+两个出血位 + var tr = Math.floor(p_dMatWidth / p_dWidth); + var td = Math.floor(p_dMatLength / p_dLength); + //计算合版数量 + var iTemp = Math.floor(p_dMatLength / p_dLength) * Math.floor(p_dMatWidth / p_dWidth); + var iTemp2 = 0; + var tmp = true; + if (dLength >= dWidth) { + //竖向调用进来的 竖+横 + tmp = dMatWidth > p_dLength; + } else { + tmp = dMatLength > dWidth; + } + var tr2 = 0; + var td2 = 0; + //横排 + if (dLength >= dWidth) { + if (p_dMatLength - td * p_dLength >= p_dWidth && tmp) { + if (dLength >= dWidth) { + //横+竖 才会左边 + // floats=" style='float:left';"; + } + tr2 = Math.floor(p_dMatWidth / p_dLength); + td2 = Math.floor((p_dMatLength - td * p_dLength) / p_dWidth); + } + } else { + //竖排 + if (p_dMatWidth - tr * p_dWidth >= p_dLength && tmp) { + tr2 = Math.floor((p_dMatWidth - tr * p_dWidth) / p_dLength); + td2 = Math.floor(p_dMatLength / p_dWidth); + // dTableWidth2 = td2*p_dWidth; + // dTableHeight2 = tr2*p_dLength; + // dTrWidth2 = td2*p_dWidth; + // dTrHeight2 = p_dLength; + // dTdWidth2 = dLength; + // dTdHeight2 = dWidth; + } + } + iTemp2 = tr2 * td2; + iTemp = iTemp + iTemp2; + return iTemp; + }; + + //添加HTML + // + //