Browse Source

整改

master
Yanko 3 months ago
parent
commit
5b72f8f08f
19 changed files with 92 additions and 964 deletions
  1. +0
    -519
      frontend/dist/145.a0c468d9.async.js
  2. +0
    -1
      frontend/dist/222.4d9ce06a.async.js
  3. +0
    -1
      frontend/dist/542.69fe729a.async.js
  4. +0
    -82
      frontend/dist/838.52401534.async.js
  5. +2
    -2
      frontend/dist/index.html
  6. +0
    -2
      frontend/dist/p__deviceProductInfo__index.81a2949b.async.js
  7. +0
    -1
      frontend/dist/p__dict__index.791cc174.async.js
  8. +0
    -1
      frontend/dist/p__final__index.27cbb88d.async.js
  9. +0
    -1
      frontend/dist/p__plantModel__process.87fb00cb.async.js
  10. +0
    -1
      frontend/dist/p__productLine__line.551c18af.async.js
  11. +0
    -1
      frontend/dist/p__system__role__index.bd47a3c3.async.js
  12. +0
    -1
      frontend/dist/p__workInfo__index.66ab8ecd.async.js
  13. +0
    -1
      frontend/dist/p__workInfo__plan.ed92981f.async.js
  14. +0
    -1
      frontend/dist/preload_helper.dc318c67.js
  15. +0
    -304
      frontend/dist/umi.787e45ca.js
  16. +26
    -7
      frontend/src/pages/final/index.tsx
  17. +2
    -3
      frontend/src/pages/productLine/line.tsx
  18. +47
    -26
      frontend/src/pages/workInfo/index.tsx
  19. +15
    -9
      frontend/src/pages/workInfo/plan.tsx

+ 0
- 519
frontend/dist/145.a0c468d9.async.js
File diff suppressed because it is too large
View File


+ 0
- 1
frontend/dist/222.4d9ce06a.async.js
File diff suppressed because it is too large
View File


+ 0
- 1
frontend/dist/542.69fe729a.async.js
File diff suppressed because it is too large
View File


+ 0
- 82
frontend/dist/838.52401534.async.js
File diff suppressed because it is too large
View File


+ 2
- 2
frontend/dist/index.html View File

@@ -5,10 +5,10 @@
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<link rel="stylesheet" href="/umi.22bc53e6.css">
<script src="/preload_helper.dc318c67.js"></script>
<script src="/preload_helper.c8b83608.js"></script>
</head>
<body>
<div id="root"></div>
<script src="/umi.787e45ca.js"></script>
<script src="/umi.17801edc.js"></script>
</body>
</html>

+ 0
- 2
frontend/dist/p__deviceProductInfo__index.81a2949b.async.js
File diff suppressed because it is too large
View File


+ 0
- 1
frontend/dist/p__dict__index.791cc174.async.js
File diff suppressed because it is too large
View File


+ 0
- 1
frontend/dist/p__final__index.27cbb88d.async.js
File diff suppressed because it is too large
View File


+ 0
- 1
frontend/dist/p__plantModel__process.87fb00cb.async.js View File

@@ -1 +0,0 @@
"use strict";(self.webpackChunkant_design_pro=self.webpackChunkant_design_pro||[]).push([[988],{24493:function(R,f,e){var M=e(97857),o=e.n(M),a=e(56002);f.Z={Add:function(n){return(0,a.request)("/api/process/add",{method:"POST",data:o()({},n)})},Del:function(n){return(0,a.request)("/api/process/del",{method:"POST",data:o()({},n)})},Update:function(n){return(0,a.request)("/api/process/update",{method:"POST",data:o()({},n)})},Detail:function(n){return(0,a.request)("/api/process/detail?id=".concat(n),{method:"GET"})},List:function(n){return(0,a.request)("/api/process/list",{method:"POST",data:o()({},n)})},PagedList:function(n){return(0,a.request)("/api/process/pagedlist",{method:"POST",data:o()({},n)})},Selectlist:function(){return(0,a.request)("/api/process/selectlist",{method:"GET"})}}},60744:function(R,f,e){e.r(f);var M=e(15009),o=e.n(M),a=e(99289),u=e.n(a),n=e(5574),T=e.n(n),B=e(51042),L=e(83145),b=e(78957),h=e(14726),g=e(86738),m=e(45360),E=e(67294),S=e(27484),F=e.n(S),P=e(24493),_=e(85893);f.default=function(){var U=(0,E.useState)("table"),v=T()(U,2),D=v[0],c=v[1],p=(0,E.useRef)(),j=(0,E.useRef)(),x=(0,E.useState)(),I=T()(x,2),O=I[0],C=I[1],A=function(){var t,r;(t=p.current)===null||t===void 0||t.resetFields(),(r=j.current)===null||r===void 0||r.reload()},K=[{title:"\u4E3B\u952E",dataIndex:"id",hideInForm:!0,hideInSearch:!0},{title:"\u540D\u79F0",dataIndex:"name",ellipsis:!0,formItemProps:{rules:[{required:!0,message:"\u6B64\u9879\u4E3A\u5FC5\u586B\u9879!"}]}},{title:"\u7C7B\u578B",hideInDescriptions:!0,dataIndex:"processType",search:!1,valueEnum:{0:{text:"\u4EBA\u5DE5"},1:{text:"\u8BBE\u5907"}},formItemProps:{rules:[{required:!0,message:"\u6B64\u9879\u4E3A\u5FC5\u586B\u9879!"}]}},{title:"\u63CF\u8FF0",dataIndex:"des",search:!1},{title:"\u521B\u5EFA\u65F6\u95F4",dataIndex:"createTime",render:function(t,r){return(0,_.jsx)(_.Fragment,{children:F()(r.createTime).format("YYYY-MM-DD HH:mm:ss")})},search:!1,hideInForm:!0},{title:"\u64CD\u4F5C",valueType:"option",fixed:"right",render:function(t,r){return[(0,_.jsxs)(b.Z,{children:[(0,_.jsx)(h.ZP,{type:"primary",size:"small",onClick:function(){var s;c("form"),C(r),(s=p.current)===null||s===void 0||s.setFieldsValue(r)},target:"_blank",rel:"noopener noreferrer",children:"\u7F16\u8F91"},+new Date+Math.random()),(0,_.jsx)(g.Z,{title:"\u786E\u5B9A\u8981\u5220\u9664\u6B64\u6761\u6570\u636E\u5417\uFF1F",onConfirm:function(){P.Z.Del(r).then(function(s){s.statusCode===200?(m.ZP.info("\u5220\u9664\u6210\u529F!"),A()):m.ZP.error(s.errors)})},onCancel:function(){m.ZP.info("\u5DF2\u53D6\u6D88\u5220\u9664")},okText:"\u786E\u8BA4",cancelText:"\u5173\u95ED",children:(0,_.jsx)(h.ZP,{type:"primary",danger:!0,size:"small",children:"\u5220\u9664"})},"del")]},+new Date+Math.random())]}}];return(0,_.jsx)(_.Fragment,{children:(0,_.jsx)(L.Z,{columns:K,type:D,formRef:p,actionRef:j,cardBordered:!0,bordered:!0,scroll:{x:!0},rowClassName:function(t,r,i){return r%2===0?"":"even-row-background"},onSubmit:function(t){t.id=O==null?void 0:O.id,console.log(t),D==="form"&&(t.id?P.Z.Update(t).then(function(r){r.statusCode===200?(m.ZP.info("\u66F4\u65B0\u6210\u529F!"),c("table"),A()):m.ZP.error(r.errors)}):P.Z.Add(t).then(function(r){r.statusCode===200?(m.ZP.info("\u65B0\u589E\u6210\u529F!"),c("table"),A()):m.ZP.error(r.errors)}))},form:{ignoreRules:!0,submitter:{onReset:function(){var t;(t=p.current)===null||t===void 0||t.resetFields(),c("table")},searchConfig:{resetText:D==="form"?"\u8FD4\u56DE":"\u91CD\u7F6E",submitText:D==="form"?"\u63D0\u4EA4":"\u67E5\u8BE2"}}},request:u()(o()().mark(function d(){var t,r,i,s=arguments;return o()().wrap(function(l){for(;;)switch(l.prev=l.next){case 0:return t=s.length>0&&s[0]!==void 0?s[0]:{},r={pageIndex:t.current||1,pageSize:t.pageSize||10,name:t.name||""},l.next=4,P.Z.PagedList(r);case 4:if(i=l.sent,i.statusCode!==200){l.next=9;break}return l.abrupt("return",{data:i.data.items,success:!0,total:i.data.total});case 9:return l.abrupt("return",{data:[],success:!1,total:0});case 10:case"end":return l.stop()}},d)})),pagination:{pageSize:10,showSizeChanger:!1},rowKey:"id",dateFormatter:"string",headerTitle:"\u5217\u8868",toolBarRender:function(){return[(0,_.jsxs)(h.ZP,{type:"primary",onClick:function(){c("form"),C({id:"",createTime:new Date})},children:[(0,_.jsx)(B.Z,{}),"\u65B0\u5EFA"]},"3")]}})})}}}]);

+ 0
- 1
frontend/dist/p__productLine__line.551c18af.async.js
File diff suppressed because it is too large
View File


+ 0
- 1
frontend/dist/p__system__role__index.bd47a3c3.async.js
File diff suppressed because it is too large
View File


+ 0
- 1
frontend/dist/p__workInfo__index.66ab8ecd.async.js
File diff suppressed because it is too large
View File


+ 0
- 1
frontend/dist/p__workInfo__plan.ed92981f.async.js
File diff suppressed because it is too large
View File


+ 0
- 1
frontend/dist/preload_helper.dc318c67.js View File

@@ -1 +0,0 @@
!function(){"use strict";var t="/".replace(/([^/])$/,"$1/"),e=location.pathname,n=e.startsWith(t)&&decodeURI("/".concat(e.slice(t.length)));if(n){var a=document,c=a.head,r=a.createElement.bind(a),i=function(t,e,n){var a,c=e.r[t]||(null===(a=Object.entries(e.r).find((function(e){var n=e[0];return new RegExp("^".concat(n.replace(/\/:[^/]+/g,"/[^/]+").replace("/*","/.+"),"$")).test(t)})))||void 0===a?void 0:a[1]);return null==c?void 0:c.map((function(t){var a=e.f[t][1],c=e.f[t][0];return{type:c.split(".").pop(),url:"".concat(n.publicPath).concat(c),attrs:[["data-".concat(e.b),"".concat(e.p,":").concat(a)]]}}))}(n,{"p":"ant-design-pro","b":"webpack","f":[["p__system__role__index.bd47a3c3.async.js",24],["p__deviceInfo__index.8878b771.async.js",36],["p__user__login__index.26100c69.chunk.css",37],["p__user__login__index.b934e735.async.js",37],["p__workInfo__plan.ed92981f.async.js",43],["119.4e6a5656.async.js",119],["145.a0c468d9.async.js",145],["222.4d9ce06a.async.js",222],["p__system__module__index.ef46db37.chunk.css",257],["p__system__module__index.ed9bfb89.async.js",257],["p__materials__index.8b1d798e.async.js",262],["t__plugin-layout__Layout.5012e1ab.chunk.css",301],["t__plugin-layout__Layout.2c017a91.async.js",301],["390.c53868f3.async.js",390],["393.e127e60f.async.js",393],["p__deviceProductInfo__index.835c0c6c.chunk.css",402],["p__deviceProductInfo__index.81a2949b.async.js",402],["p__workInfo__index.66ab8ecd.async.js",420],["p__welcome__index.dde73410.async.js",446],["p__stock__index.3cc68eb4.async.js",450],["p__final__index.49759dc4.chunk.css",460],["p__final__index.27cbb88d.async.js",460],["p__system__user__index.695d982e.chunk.css",472],["p__system__user__index.60325376.async.js",472],["542.69fe729a.async.js",542],["t__plugin-maxtabs__Layout.b832af3b.async.js",558],["565.b1a57ede.async.js",565],["p__404.a52587bb.async.js",571],["635.973728c8.async.js",635],["821.b970c16a.async.js",821],["838.52401534.async.js",838],["p__dict__index.791cc174.async.js",918],["p__plantModel__process.87fb00cb.async.js",988],["p__productLine__line.551c18af.async.js",990]],"r":{"/*":[27,29],"/":[14,18,25,5,11,12,29,30],"/user/login":[2,3],"/system/user":[5,6,22,23,29,25,11,12,30],"/system/role":[0,5,6,29,25,11,12,30],"/system/module":[5,6,8,9,29,25,11,12,30],"/system/dict":[5,6,29,31,25,11,12,30],"/wmx/deviceProduct":[5,6,15,16,29,25,11,12,30],"/wmx/deviceinfo":[1,5,6,29,25,11,12,30],"/factory/process":[5,6,29,32,25,11,12,30],"/factory/line":[5,6,26,28,29,33,25,11,12,30],"/production/materials":[5,6,10,29,25,11,12,30],"/production/godown":[5,6,19,29,25,11,12,30],"/production/final":[5,6,14,20,21,24,28,29,25,11,12,30],"/work/workPlan":[4,5,6,29,25,11,12,30],"/work/workInfo":[5,6,7,14,17,29,25,11,12,30]}},{publicPath:"/"});null==i||i.forEach((function(t){var e,n=t.type,a=t.url;if("js"===n)(e=r("script")).src=a,e.async=!0;else{if("css"!==n)return;(e=r("link")).href=a,e.rel="preload",e.as="style"}t.attrs.forEach((function(t){e.setAttribute(t[0],t[1]||"")})),c.appendChild(e)}))}}();

+ 0
- 304
frontend/dist/umi.787e45ca.js
File diff suppressed because it is too large
View File


+ 26
- 7
frontend/src/pages/final/index.tsx View File

@@ -2,7 +2,7 @@

import type { ActionType, EditableFormInstance, ProColumns } from '@ant-design/pro-components';
import { BetaSchemaForm, CheckCard, DragSortTable, EditableProTable, ProCard, ProForm, ProTable } from '@ant-design/pro-components';
import { Button, Modal, Form, Input, message, Popconfirm, TreeSelect, Select, Tag, Dropdown, Space, MenuProps, Spin, Row, Col, Card, Divider, Radio, List, Badge, Empty } from 'antd';
import { Button, Modal, Form, Input, message, Popconfirm, TreeSelect, Select, Tag, Dropdown, Space, MenuProps, Spin, Row, Col, Card, Divider, Radio, List, Badge, Empty, Flex } from 'antd';
import { useEffect, useRef, useState } from 'react';
import finalInfoAPI from '@/api/finalService';
// 工艺服务
@@ -413,11 +413,13 @@ const final = () => {
{/* <Button type='primary' danger>取消配置</Button> */}
</Space>
}>
<CheckCard.Group onChange={() => {
<CheckCard.Group onChange={() => {

}} >
<div className={styles.gongyi_tag}>

<Flex wrap gap="small">
{lineProcessList.map((item, index) => (
<div className={styles.gongyi_tag_box} key={index} >
<div
@@ -449,7 +451,6 @@ const final = () => {
}} size='small' title={devicesItem.name} value={devicesItem.id} />
</Badge.Ribbon>
))}

</Space>
}
</Card>
@@ -457,14 +458,17 @@ const final = () => {
<Input aria-label='备注' />
</Card> */}

<Divider/>
</div>
))}
</Flex>
</div>
</CheckCard.Group>
</Card>
: <Empty />}
{/* <Card title={'设备列表'}>
<div className={styles.tag}>
{lineProcessDevList.map((item, index) => (
@@ -613,7 +617,22 @@ const final = () => {
deviceFunParams?.map((item: any, index: number) => {
Object.keys(deviceStepParms).forEach((citem, cindex) => {
if (item.paramCode == citem) {
newParms.push({ name: item.paramName + ':' + deviceStepParms[citem] + item.paramUnit })
if (item.paramType==1) {
let wl:string='';
deviceStepParms[citem]?.map(
(s:any)=>
{
if (wl=='') {
wl = materialParmList.find((x:any)=>x.value==s).label
}else{
wl = wl+','+materialParmList.find((x:any)=>x.value==s).label
}
}
)
newParms.push({ name: item.paramName + ':' + wl! })
}else{
newParms.push({ name: item.paramName + ':' + deviceStepParms[citem] + item.paramUnit })
}
}
});
})


+ 2
- 3
frontend/src/pages/productLine/line.tsx View File

@@ -60,7 +60,6 @@ export default () => {
{
title: '描述',
dataIndex: 'describe',

search: false,
},
{
@@ -533,12 +532,12 @@ export default () => {
</Modal >

<Modal open={deviceOpen} maskClosable={false} width={500} title='配置工艺所需设备'
<Modal open={deviceOpen} maskClosable={false} width={500} title='配置工艺所需设备'
footer={[
<Button
key="back"
onClick={() => {
setFlowItemOpen(false)
setDeviceOpen(false)
}}
>
返回


+ 47
- 26
frontend/src/pages/workInfo/index.tsx View File

@@ -4,8 +4,8 @@
* @returns
*/
import type { ActionType, ProColumns } from '@ant-design/pro-components';
import { ProTable } from '@ant-design/pro-components';
import { Button, Modal, Form, Input, message, Popconfirm, Tag, DatePicker as TDatePicker, Select, Steps, StepsProps, Popover, ConfigProvider, List, Space, Radio, Card } from 'antd';
import { FooterToolbar, ProForm, ProFormSelect, ProFormText, ProTable } from '@ant-design/pro-components';
import { Button, Modal, Form, Input, message, Popconfirm, Tag, DatePicker as TDatePicker, Select, Steps, StepsProps, Popover, ConfigProvider, List, Space, Radio, Card, Row, Col } from 'antd';
import { useEffect, useRef, useState } from 'react';
import WorkInfoAPI from '@/api/workService';
import FinalAPI from '@/api/finalService';
@@ -653,7 +653,7 @@ export default () => {
*表单提交
*/
const OnSubmit = async (values: any) => {
console.log(selectBatchItemRow);
console.log(values);
values.batchId = selectBatchItemRow?.id
if (values.id) {
const response = await WorkInfoAPI.Update(values);
@@ -750,7 +750,16 @@ export default () => {
<>
<ProTable<WorkInfoTypes.WorkInfoOutput>
key="myBatchTable"

cardBordered
bordered
scroll={{ x: true }}
rowClassName={(record: any, index: number, indent: number) => {
if (index % 2 === 0) {
return ''; // 偶数行的类名
} else {
return 'even-row-background'; // 奇数行的类名
}
}}
expandable={{
expandedRowRender, expandedRowKeys: expandedRowKeys, onExpand: (expanded: boolean, record: WorkInfoTypes.WorkInfoOutput) => {
// if (expanded) {
@@ -772,7 +781,7 @@ export default () => {

columns={batchColumns}
actionRef={batchActionRef}
cardBordered
request={async (params = {}) => {
const jsonData: WorkInfoTypes.Page = {
pageIndex: params.current || 1,
@@ -844,24 +853,33 @@ export default () => {
</Button>,
]}
>
<Form
<ProForm
form={typeForm}
name="basic"
id="workInfoForm"

submitter={{
render: (_, dom) => <FooterToolbar>{dom}</FooterToolbar>,
}}
onFinish={OnSubmit}
autoComplete="off"
>
<Form.Item label="id" name="id" hidden>
<Input />
</Form.Item>

<Form.Item
<ProFormText
width="md" label="id" name="id" hidden>
</ProFormText>
<ProFormSelect
colProps={{ xl: 8, md: 12 }}
label="生产计划"
name="name"
name="finalId"
options={finalPlan}
fieldProps={{
fieldNames:{
label:"name",
value:"id"
}
}}
rules={[{ required: true, message: '此项为必填项!' }]}
>
<Select onChange={(v) => {
onChange={(v)=>{
const finalId = finalPlan.find(x => x.id == v)?.finalId;
const name = finalData.find(x => x.key == finalId)?.value;
const quantity =finalPlan.find(x => x.id == v)?.quantity;
@@ -871,20 +889,23 @@ export default () => {
setLineData(res.data)
}
})
}}>
{finalPlan.map((item, index) => {
return <Select.Option value={item.id} key={item.id}>
<span>{item.name}</span>
</Select.Option>
})}
</Select>
</Form.Item>
<Form.Item label="成品" >
}}
>
</ProFormSelect>
<Row gutter={18}>
<Col xl={6} md={12} sm={24}>
<ProFormText
width="md" label="成品" >
<Input readOnly disabled value={selectfinal?.name}></Input>
</Form.Item>
</ProFormText>
</Col>
<Col xl={6} md={12} sm={24}>
<Form.Item label="数量" >
<Input readOnly disabled value={selectfinal?.quantity}></Input>
</Form.Item>
</Col>
</Row>
<Form.Item label="产线" name="lineId" rules={[{ required: true, message: '此项为必填项!' }]}>
<Select onChange={(e) => {
typeForm.setFieldValue("deviceId", "")
@@ -917,7 +938,7 @@ export default () => {
<Form.Item label="下料(锅)" name="number" rules={[{ required: true, message: '此项为必填项!' }]} >
<Input type='number' min={1} />
</Form.Item>
</Form>
</ProForm>
</Modal>
<Modal
maskClosable={false}


+ 15
- 9
frontend/src/pages/workInfo/plan.tsx View File

@@ -42,10 +42,8 @@ export default () => {
},
{
title: '成品',
hideInTable: true,
hideInDescriptions: true,
dataIndex: 'finalId',
search: false,
valueType:'select',
request:async ()=>{
const data: MyResponse.Content = await finalApi.SelectList()
@@ -85,16 +83,16 @@ export default () => {
{
title: '操作',
valueType: 'option',
dataIndex: 'id',
fixed:'right',
render: (text, row) => [
<Space key={+new Date() + Math.random()}>
<a onClick={() => {
<Button size='small' type='primary' onClick={() => {
setFromType('form')
setSelectRow(row)
ref.current?.setFieldsValue(row)
}} key={+new Date() + Math.random()} target="_blank" rel="noopener noreferrer">
编辑
</a>
</Button>
<Popconfirm
key="del"
title="确定要删除此条数据吗?"
@@ -115,9 +113,9 @@ export default () => {
okText="确认"
cancelText="关闭"
>
<a>
<Button size='small' type='primary' danger >
删除
</a>
</Button>
</Popconfirm>
</Space>
],
@@ -126,12 +124,21 @@ export default () => {

return (
<>
<ProCard>
<ProTable<workPlanTypes.output>
columns={columns}
type={fromType as 'table'}
formRef={ref}
actionRef={actionRef}
cardBordered
bordered
scroll={{ x: true }}
rowClassName={(record: any, index: number, indent: number) => {
if (index % 2 === 0) {
return ''; // 偶数行的类名
} else {
return 'even-row-background'; // 奇数行的类名
}
}}
onSubmit={(params: any) => {
if (fromType === 'form') {
@@ -211,7 +218,6 @@ export default () => {
</Button>,
]}
/>
</ProCard>
</>
);
};

Loading…
Cancel
Save