From 60f8ae47e0c6b6b9efcf7afa5efb3bceb4c9f61d Mon Sep 17 00:00:00 2001 From: sunhao <479527147@qq.com> Date: Mon, 22 Jul 2024 01:59:40 +0800 Subject: [PATCH] 1 --- .../src/pages/MainPage/dashBoard.tsx | 17 +++- .../pages/materialsSubstitution/YCTDWHNO.tsx | 85 +++++++++++++++++-- .../materialsSubstitution/confirmSmpNo.tsx | 11 ++- .../pages/slabSubstitution/inforStatisAll.tsx | 35 ++++++++ 4 files changed, 133 insertions(+), 15 deletions(-) diff --git a/前端程序/ipd-frontend/src/pages/MainPage/dashBoard.tsx b/前端程序/ipd-frontend/src/pages/MainPage/dashBoard.tsx index 463b3f6..d360e6e 100644 --- a/前端程序/ipd-frontend/src/pages/MainPage/dashBoard.tsx +++ b/前端程序/ipd-frontend/src/pages/MainPage/dashBoard.tsx @@ -179,7 +179,7 @@ export default function index() { }, grid: { left: '-0.1%', - right: '1.5%', + right: '3%', bottom: '1%', top: '15%', containLabel: true, @@ -190,6 +190,10 @@ export default function index() { color: '#fff', boundaryGap: false, data: xData, + axisLabel: { + showMaxLabel: true, //固定显示滚动条最后一条数据 + interval: 3, + }, axisLine: { //x轴线的颜色以及宽度 show: true, @@ -319,9 +323,16 @@ export default function index() { xAxis: { type: 'category', data: xData, + + axisLabel: { + showMaxLabel: true, //固定显示滚动条最后一条数据 + interval: 3, + }, axisLine: { //x轴线的颜色以及宽度 + show: true, + // interval: 5, lineStyle: { color: '#fff', width: 0, @@ -335,8 +346,8 @@ export default function index() { grid: { left: '-0.1%', right: '1.5%', - bottom: '-1%', - top: '14%', + bottom: '1%', + top: '10%', containLabel: true, }, yAxis: { diff --git a/前端程序/ipd-frontend/src/pages/materialsSubstitution/YCTDWHNO.tsx b/前端程序/ipd-frontend/src/pages/materialsSubstitution/YCTDWHNO.tsx index 9dec38d..3520288 100644 --- a/前端程序/ipd-frontend/src/pages/materialsSubstitution/YCTDWHNO.tsx +++ b/前端程序/ipd-frontend/src/pages/materialsSubstitution/YCTDWHNO.tsx @@ -127,7 +127,7 @@ const Main = () => { // 设置 sheet 的默认行高 worksheet.properties.defaultRowHeight = 20; // 解析 AntD Table 的 columns - const headers = generateHeaders(columns); + const headers = generateHeaders(columns2); console.log({ headers }); // 第一行表头 const names1: string[] = []; @@ -208,7 +208,7 @@ const Main = () => { }, { title: '板坯钢种', dataIndex: 'STEEL_GRD_DETAIL', key: 'STEEL_GRD_DETAIL', width: 150, ellipsis: true }, { title: '订单钢种', dataIndex: 'STLGRD', key: 'STLGRD', width: 150, ellipsis: true }, - { title: '是否异钢种', dataIndex: 'STD_FLG', key: 'STD_FLG', width: 80, ellipsis: true }, + { title: '是否异钢种', dataIndex: 'STD_FLG', key: 'STD_FLG', width: 120, ellipsis: true }, { title: '标准号', dataIndex: 'STANDARD_NO', key: 'STANDARD_NO', width: 150, ellipsis: true }, { title: '可替代标准号', dataIndex: 'TD_STANDARD_NO', key: 'TD_STANDARD_NO', width: 150, ellipsis: true }, @@ -217,8 +217,9 @@ const Main = () => { { title: '订单号', dataIndex: 'ORD_NO', key: 'ORD_NO', width: 150, ellipsis: true }, { title: '项次号', dataIndex: 'ORD_ITEM', key: 'ORD_ITEM', width: 80, ellipsis: true }, { title: '成材率', dataIndex: 'RATE', key: 'RATE', width: 80, ellipsis: true }, - - { title: '维护区分', dataIndex: 'TD_FL', key: 'TD_FL', width: 60, ellipsis: true }, + { title: '屈服', dataIndex: 'YP_RST', key: 'YP_RST', width: 80, ellipsis: true }, + { title: '抗拉', dataIndex: 'TS_RST', key: 'TS_RST', width: 80, ellipsis: true }, + { title: '维护区分', dataIndex: 'TD_FL', key: 'TD_FL', width: 120, ellipsis: true }, { title: '备注', dataIndex: 'REMARK', key: 'REMARK', width: 600, ellipsis: true }, // { title: '公差下限', dataIndex: 'THK_TOL_MIN', key: 'THK_TOL_MIN', width: 100, ellipsis: true }, // { title: '公差上限', dataIndex: 'THK_TOL_MAX', key: 'THK_TOL_MAX', width: 100, ellipsis: true }, @@ -228,6 +229,37 @@ const Main = () => { ]; + const columns2: ColumnsType = [ + { + title: '序号', + render: (text: any, record: any, index: any) =>
{index + 1}
, + width: 50, + fixed: 'left', + }, + { title: '板坯钢种', dataIndex: 'STEEL_GRD_DETAIL', key: 'STEEL_GRD_DETAIL', width: 80, ellipsis: true }, + { title: '订单钢种', dataIndex: 'STLGRD', key: 'STLGRD', width: 80, ellipsis: true }, + { title: '是否异钢种', dataIndex: 'STD_FLG', key: 'STD_FLG', width: 80, ellipsis: true }, + + { title: '标准号', dataIndex: 'STANDARD_NO', key: 'STANDARD_NO', width: 80, ellipsis: true }, + { title: '可替代标准号', dataIndex: 'TD_STANDARD_NO', key: 'TD_STANDARD_NO', width: 80, ellipsis: true }, + + { title: '钢板号', dataIndex: 'PLATE_NO', key: 'PLATE_NO', width: 80, ellipsis: true }, + { title: '订单号', dataIndex: 'ORD_NO', key: 'ORD_NO', width: 80, ellipsis: true }, + { title: '项次号', dataIndex: 'ORD_ITEM', key: 'ORD_ITEM', width: 80, ellipsis: true }, + { title: '成材率', dataIndex: 'RATE', key: 'RATE', width: 80, ellipsis: true }, + { title: '屈服', dataIndex: 'YP_RST', key: 'YP_RST', width: 80, ellipsis: true }, + { title: '抗拉', dataIndex: 'TS_RST', key: 'TS_RST', width: 80, ellipsis: true }, + { title: '维护区分', dataIndex: 'TD_FL', key: 'TD_FL', width: 80, ellipsis: true }, + { title: '备注', dataIndex: 'REMARK', key: 'REMARK', width: 80, ellipsis: true }, + // { title: '公差下限', dataIndex: 'THK_TOL_MIN', key: 'THK_TOL_MIN', width: 100, ellipsis: true }, + // { title: '公差上限', dataIndex: 'THK_TOL_MAX', key: 'THK_TOL_MAX', width: 100, ellipsis: true }, + { title: '录入时间', dataIndex: 'INS_DATE', key: 'INS_DATE', width: 80, ellipsis: true }, + //{ title: '修改时间', dataIndex: 'UPD_DATE', key: 'UPD_DATE', width: 100, ellipsis: true }, + + + ]; + + // 点击重置按钮 const handleRest = (): any => { form.resetFields(); @@ -339,7 +371,7 @@ const Main = () => { {/* */} - + } @@ -352,7 +384,7 @@ const Main = () => { {/* */} - + { */} {/* */} - + { /> - + + + + + + + + + + + + + + +