sunhao
/
NG_Project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
main
sunhao 4 months ago
parent ed4bd8aadb
commit 60f8ae47e0
4 changed files with 133 additions and 15 deletions
Show Stats Download Patch File Download Diff File

17
前端程序/ipd-frontend/src/pages/MainPage/dashBoard.tsx
Unescape Escape View File

@ -179,7 +179,7 @@ export default function index() {
}, },
grid: { grid: {
left: '-0.1%', left: '-0.1%',
right: '1.5%', right: '3%',
bottom: '1%', bottom: '1%',
top: '15%', top: '15%',
containLabel: true, containLabel: true,
@ -190,6 +190,10 @@ export default function index() {
color: '#fff', color: '#fff',
boundaryGap: false, boundaryGap: false,
data: xData, data: xData,
axisLabel: {
showMaxLabel: true, //固定显示滚动条最后一条数据
interval: 3,
},
axisLine: { axisLine: {
//x轴线的颜色以及宽度 //x轴线的颜色以及宽度
show: true, show: true,
@ -319,9 +323,16 @@ export default function index() {
xAxis: { xAxis: {
type: 'category', type: 'category',
data: xData, data: xData,
axisLabel: {
showMaxLabel: true, //固定显示滚动条最后一条数据
interval: 3,
},
axisLine: { axisLine: {
//x轴线的颜色以及宽度 //x轴线的颜色以及宽度
show: true, show: true,
// interval: 5,
lineStyle: { lineStyle: {
color: '#fff', color: '#fff',
width: 0, width: 0,
@ -335,8 +346,8 @@ export default function index() {
grid: { grid: {
left: '-0.1%', left: '-0.1%',
right: '1.5%', right: '1.5%',
bottom: '-1%', bottom: '1%',
top: '14%', top: '10%',
containLabel: true, containLabel: true,
}, },
yAxis: { yAxis: {

85
前端程序/ipd-frontend/src/pages/materialsSubstitution/YCTDWHNO.tsx
Unescape Escape View File

@ -127,7 +127,7 @@ const Main = () => {
// 设置 sheet 的默认行高 // 设置 sheet 的默认行高
worksheet.properties.defaultRowHeight = 20; worksheet.properties.defaultRowHeight = 20;
// 解析 AntD Table 的 columns // 解析 AntD Table 的 columns
const headers = generateHeaders(columns); const headers = generateHeaders(columns2);
console.log({ headers }); console.log({ headers });
// 第一行表头 // 第一行表头
const names1: string[] = []; const names1: string[] = [];
@ -208,7 +208,7 @@ const Main = () => {
}, },
{ title: '板坯钢种', dataIndex: 'STEEL_GRD_DETAIL', key: 'STEEL_GRD_DETAIL', width: 150, ellipsis: true }, { title: '板坯钢种', dataIndex: 'STEEL_GRD_DETAIL', key: 'STEEL_GRD_DETAIL', width: 150, ellipsis: true },
{ title: '订单钢种', dataIndex: 'STLGRD', key: 'STLGRD', 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: 'STANDARD_NO', key: 'STANDARD_NO', width: 150, ellipsis: true },
{ title: '可替代标准号', dataIndex: 'TD_STANDARD_NO', key: 'TD_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_NO', key: 'ORD_NO', width: 150, ellipsis: true },
{ title: '项次号', dataIndex: 'ORD_ITEM', key: 'ORD_ITEM', 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: 'RATE', key: 'RATE', width: 80, ellipsis: true },
{ title: '屈服', dataIndex: 'YP_RST', key: 'YP_RST', width: 80, ellipsis: true },
{ title: '维护区分', dataIndex: 'TD_FL', key: 'TD_FL', width: 60, 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: 'REMARK', key: 'REMARK', width: 600, ellipsis: true },
// { title: '公差下限', dataIndex: 'THK_TOL_MIN', key: 'THK_TOL_MIN', width: 100, 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: 'THK_TOL_MAX', key: 'THK_TOL_MAX', width: 100, ellipsis: true },
@ -228,6 +229,37 @@ const Main = () => {
]; ];
const columns2: ColumnsType<any> = [
{
title: '序号',
render: (text: any, record: any, index: any) => <div>{index + 1}</div>,
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 => { const handleRest = (): any => {
form.resetFields(); form.resetFields();
@ -339,7 +371,7 @@ const Main = () => {
<Row gutter={[16, 8]} style={{ marginBottom: '-25px' }}> <Row gutter={[16, 8]} style={{ marginBottom: '-25px' }}>
{/* <Col xs={24} sm={12} md={8} lg={6} xl={4} > */} {/* <Col xs={24} sm={12} md={8} lg={6} xl={4} > */}
<Col span={4} style={{ marginLeft: '-5px' }}> <Col span={3} style={{ marginLeft: '-5px' }}>
<Item label="标准号" name="STANDARD_NO"> <Item label="标准号" name="STANDARD_NO">
<Input <Input
prefix={<SearchOutlined />} prefix={<SearchOutlined />}
@ -352,7 +384,7 @@ const Main = () => {
</Col> </Col>
{/* </Col> {/* </Col>
<Col xs={24} sm={12} md={8} lg={6} xl={4}> */} <Col xs={24} sm={12} md={8} lg={6} xl={4}> */}
<Col span={4} style={{ marginLeft: '-5px' }}> <Col span={3} style={{ marginLeft: '-5px' }}>
<Item <Item
label="可替标准" label="可替标准"
name="TD_STANDARD_NO" name="TD_STANDARD_NO"
@ -403,10 +435,11 @@ const Main = () => {
</Item> */} </Item> */}
{/* </Col> */} {/* </Col> */}
<Col span={4} style={{ marginLeft: '8px' }}> <Col span={3} style={{ marginLeft: '-5px' }}>
<Item <Item
label="维护区分" label="维护区分"
name="TD_FL" name="TD_FL"
labelCol={{ span: 8 }}
> >
<Dictionary <Dictionary
placeholder="请选择" placeholder="请选择"
@ -417,7 +450,43 @@ const Main = () => {
/> />
</Item> </Item>
</Col> </Col>
<Space style={{ position: 'absolute', right: 25 }} size={8}>
<Col span={2} style={{ marginLeft: '-5px' }}>
<Item label="屈服:" name="YP_RST" labelCol={{ span: 8 }}>
<Input style={{ marginLeft: '8px', width: 50 }} />
</Item>
<Input
className="site-input-split"
style={{
height: 32.44,
width: 30,
border: 'none',
backgroundColor: '#fff',
pointerEvents: 'none',
marginBottom: '-20px',
marginLeft: '-27px',
}}
/>
</Col>
<Col span={2} style={{ marginLeft: '-5px' }}>
<Item label="抗拉:" name="TS_RST" labelCol={{ span: 8 }}>
<Input style={{ marginLeft: '8px', width: 50 }} />
</Item>
<Input
className="site-input-split"
style={{
height: 32.44,
width: 30,
border: 'none',
backgroundColor: '#fff',
pointerEvents: 'none',
marginBottom: '-20px',
marginLeft: '-27px',
}}
/>
</Col>
<Space style={{ position: 'absolute', right: 25 }} size={8}>
<Item style={{ textAlign: 'center' }}> <Item style={{ textAlign: 'center' }}>
<Button <Button
htmlType="submit" htmlType="submit"

11
前端程序/ipd-frontend/src/pages/materialsSubstitution/confirmSmpNo.tsx
Unescape Escape View File

@ -209,18 +209,21 @@ const Main = () => {
//工厂，钢板号，订单号，序列号，订单厚度，订单标准，可并试样号，可并试样号标准，质保书类型 //工厂，钢板号，订单号，序列号，订单厚度，订单标准，可并试样号，可并试样号标准，质保书类型
{ title: '工厂', dataIndex: 'PLT', key: 'PLT', width: 50, ellipsis: true }, { title: '工厂', dataIndex: 'PLT', key: 'PLT', width: 50, ellipsis: true },
{ title: '钢板号', dataIndex: 'PLATE_NO', key: 'PLATE_NO', width: 100, ellipsis: true }, { title: '钢板号', dataIndex: 'PLATE_NO', key: 'PLATE_NO', width: 100, ellipsis: true },
{ title: '可并试样号', dataIndex: 'SMP_NO', key: 'SMP_NO', width: 100, ellipsis: true },
{ title: '标识', dataIndex: 'SMP_FLG', key: 'SMP_FLG', width: 100, ellipsis: true },
{ title: '母式样号', dataIndex: 'SMP_NO_M', key: 'SMP_NO_M', width: 100, ellipsis: true },
{ title: '电文', dataIndex: 'DATA', key: 'DATA', width: 300, ellipsis: true },
{ title: '标准', dataIndex: 'ORD_STDSPEC', key: 'ORD_STDSPEC', width: 100, ellipsis: true },
{ title: '可并试样号标准', dataIndex: 'SMP_STDSPEC', key: 'SMP_STDSPEC', width: 100, ellipsis: true },
{ title: '进程状态', dataIndex: 'PROC_CD', key: 'PROC_CD', width: 50, ellipsis: true }, { title: '进程状态', dataIndex: 'PROC_CD', key: 'PROC_CD', width: 50, ellipsis: true },
{ title: '当前剪切线', dataIndex: 'PRC_LINE_NOW', key: 'PRC_LINE_NOW', width: 100, ellipsis: true }, { title: '当前剪切线', dataIndex: 'PRC_LINE_NOW', key: 'PRC_LINE_NOW', width: 100, ellipsis: true },
{ title: '订单号', dataIndex: 'ORD_NO', key: 'ORD_NO', width: 100, ellipsis: true }, { title: '订单号', dataIndex: 'ORD_NO', key: 'ORD_NO', width: 100, ellipsis: true },
{ title: '序列号', dataIndex: 'ORD_ITEM', key: 'ORD_ITEM', width: 50, ellipsis: true }, { title: '序列号', dataIndex: 'ORD_ITEM', key: 'ORD_ITEM', width: 50, ellipsis: true },
{ title: '订单厚度', dataIndex: 'ORD_THK', key: 'ORD_THK', width: 50, ellipsis: true }, { title: '订单厚度', dataIndex: 'ORD_THK', key: 'ORD_THK', width: 50, ellipsis: true },
{ title: '标准', dataIndex: 'ORD_STDSPEC', key: 'ORD_STDSPEC', width: 100, ellipsis: true },
{ title: '可并试样号', dataIndex: 'SMP_NO', key: 'SMP_NO', width: 100, ellipsis: true },
{ title: '可并试样号标准', dataIndex: 'SMP_STDSPEC', key: 'SMP_STDSPEC', width: 100, ellipsis: true },
{ title: '质保书类型', dataIndex: 'CERT_TYPE', key: 'CERT_TYPE', width: 50, ellipsis: true }, { title: '质保书类型', dataIndex: 'CERT_TYPE', key: 'CERT_TYPE', width: 50, ellipsis: true },
{ title: '添加时间', dataIndex: 'INS_DATE', key: 'INS_DATE', width: 100, ellipsis: true }, { title: '添加时间', dataIndex: 'INS_DATE', key: 'INS_DATE', width: 100, ellipsis: true },
{ title: '是否并样', dataIndex: 'IS_BING', key: 'IS_BING', width: 50, ellipsis: true }, { title: '是否并样', dataIndex: 'IS_BING', key: 'IS_BING', width: 50, ellipsis: true },
{ title: '电文', dataIndex: 'DATA', key: 'DATA', width: 50, ellipsis: true },
]; ];
// 点击重置按钮 // 点击重置按钮

35
前端程序/ipd-frontend/src/pages/slabSubstitution/inforStatisAll.tsx
Unescape Escape View File

@ -380,6 +380,15 @@ const InforStatis = () => {
width: 80, width: 80,
ellipsis: true, ellipsis: true,
}, },
{
title: '系统吨数',
dataIndex: 'SYS_WGT_C1',
key: 'SYS_WGT_C1',
align: 'center',
width: 80,
ellipsis: true,
},
{ {
title: '系统成材率', title: '系统成材率',
dataIndex: 'SYS_YIELD_C1', dataIndex: 'SYS_YIELD_C1',
@ -446,6 +455,15 @@ const InforStatis = () => {
width: 80, width: 80,
ellipsis: true, ellipsis: true,
}, },
{
title: '系统吨数',
dataIndex: 'SYS_WGT_C2',
key: 'SYS_WGT_C2',
align: 'center',
width: 80,
ellipsis: true,
},
{ {
title: '系统成材率', title: '系统成材率',
dataIndex: 'SYS_YIELD_C2', dataIndex: 'SYS_YIELD_C2',
@ -499,6 +517,15 @@ const InforStatis = () => {
width: 80, width: 80,
ellipsis: true, ellipsis: true,
}, },
{
title: '系统吨数',
dataIndex: 'SYS_WGT_C3',
key: 'SYS_WGT_C3',
align: 'center',
width: 80,
ellipsis: true,
},
{ {
title: '系统成材率', title: '系统成材率',
dataIndex: 'SYS_YIELD_C3', dataIndex: 'SYS_YIELD_C3',
@ -550,6 +577,14 @@ const InforStatis = () => {
width: 80, width: 80,
ellipsis: true, ellipsis: true,
}, },
{
title: '系统吨数',
dataIndex: 'SYS_WGT_ALL',
key: 'SYS_WGT_ALL',
align: 'center',
width: 80,
ellipsis: true,
},
{ {
title: '系统成材率', title: '系统成材率',
dataIndex: 'SYS_YIELD_ALL', dataIndex: 'SYS_YIELD_ALL',

Write Preview
Loading…
Cancel
Save