BPA_MES
/
BPA.FINAL.MES
4
0
派生 0
代码 工单 0 合并请求 0 版本发布 0 百科 动态
浏览代码

产线整改

master
Yanko 4 个月前
父节点
2cd045a6da
当前提交
a2ee06963e
共有 12 个文件被更改，包括 100 次插入 和 17 次删除
分列视图
Diff 选项
显示统计 下载 Patch 文件 下载 Diff 文件
  1. +2
    -2
      frontend/dist/index.html
  2. +0
    -1
      frontend/dist/p__craftInfo__pot.925de306.async.js
  3. +1
    -0
      frontend/dist/p__craftInfo__pot.d395d8d9.async.js
  4. +1
    -0
      frontend/dist/p__final__index.0c5211d3.async.js
  5. +0
    -1
      frontend/dist/p__final__index.b1c7fb46.async.js
  6. +1
    -0
      frontend/dist/p__productLine__line.22ddcd1b.async.js
  7. +0
    -1
      frontend/dist/p__productLine__line.255fd01c.async.js
  8. +0
    -1
      frontend/dist/p__recipe__index.0f84fa24.async.js
  9. +1
    -0
      frontend/dist/p__recipe__index.101f5df6.async.js
  10. +1
    -1
      frontend/dist/preload_helper.2b894109.js
  11. +2
    -2
      frontend/dist/umi.c553e74a.js
  12. +91
    -8
      frontend/src/pages/productLine/line.tsx

+ 2
- 2
frontend/dist/index.html 查看文件

@@ -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.54f62417.css">
<script src="/preload_helper.7c13d836.js"></script>
<script src="/preload_helper.2b894109.js"></script>
</head>
<body>
<div id="root"></div>
<script src="/umi.bd1d8650.js"></script>
<script src="/umi.c553e74a.js"></script>
</body>
</html>

+ 0
- 1
frontend/dist/p__craftInfo__pot.925de306.async.js
文件差异内容过多而无法显示
查看文件


+ 1
- 0
frontend/dist/p__craftInfo__pot.d395d8d9.async.js
文件差异内容过多而无法显示
查看文件


+ 1
- 0
frontend/dist/p__final__index.0c5211d3.async.js
文件差异内容过多而无法显示
查看文件


+ 0
- 1
frontend/dist/p__final__index.b1c7fb46.async.js
文件差异内容过多而无法显示
查看文件


+ 1
- 0
frontend/dist/p__productLine__line.22ddcd1b.async.js
文件差异内容过多而无法显示
查看文件


+ 0
- 1
frontend/dist/p__productLine__line.255fd01c.async.js
文件差异内容过多而无法显示
查看文件


+ 0
- 1
frontend/dist/p__recipe__index.0f84fa24.async.js
文件差异内容过多而无法显示
查看文件


+ 1
- 0
frontend/dist/p__recipe__index.101f5df6.async.js
文件差异内容过多而无法显示
查看文件


frontend/dist/preload_helper.7c13d836.js → frontend/dist/preload_helper.2b894109.js 查看文件

@@ -1 +1 @@
!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.eede85e8.async.js",24],["p__deviceInfo__index.ff2808b7.async.js",36],["p__user__login__index.26100c69.chunk.css",37],["p__user__login__index.b934e735.async.js",37],["119.4e6a5656.async.js",119],["p__recipe__index.0f84fa24.async.js",187],["222.4d9ce06a.async.js",222],["p__system__module__index.ef46db37.chunk.css",257],["p__system__module__index.4ef32e9c.async.js",257],["p__materials__index.0233f7a0.async.js",262],["t__plugin-layout__Layout.5012e1ab.chunk.css",301],["t__plugin-layout__Layout.bb77edb1.async.js",301],["390.c53868f3.async.js",390],["393.e127e60f.async.js",393],["p__deviceProductInfo__index.835c0c6c.chunk.css",402],["p__deviceProductInfo__index.ab3fbfed.async.js",402],["p__workInfo__index.8432356b.async.js",420],["p__welcome__index.dde73410.async.js",446],["p__final__index.b1c7fb46.async.js",460],["p__system__user__index.695d982e.chunk.css",472],["p__system__user__index.f6e08770.async.js",472],["550.26374af7.async.js",550],["t__plugin-maxtabs__Layout.b832af3b.async.js",558],["563.9aeac478.async.js",563],["p__404.a52587bb.async.js",571],["635.dbb47eab.async.js",635],["715.8ca32649.async.js",715],["821.b970c16a.async.js",821],["865.5becc75b.async.js",865],["p__craftInfo__pot.b10f2cd8.chunk.css",869],["p__craftInfo__pot.925de306.async.js",869],["p__plantModel__process.ae647f4d.async.js",988],["p__productLine__line.255fd01c.async.js",990]],"r":{"/*":[24,27],"/":[13,17,22,4,10,11,27,28],"/work":[4,6,13,16,21,27,22,10,11,28],"/user/login":[2,3],"/system/user":[4,19,20,21,27,22,10,11,28],"/system/role":[0,4,21,27,22,10,11,28],"/system/module":[4,7,8,21,27,22,10,11,28],"/wmx/deviceProduct":[4,14,15,21,27,22,10,11,28],"/wmx/deviceinfo":[1,4,21,27,22,10,11,28],"/base/process":[4,21,27,31,22,10,11,28],"/base/materials":[4,9,21,27,22,10,11,28],"/base/final":[4,18,21,27,22,10,11,28],"/base/line":[4,21,25,26,27,32,22,10,11,28],"/recipeCraft/recipe":[4,5,21,23,27,22,10,11,28],"/recipeCraft/pot":[4,13,21,25,27,29,30,22,10,11,28]}},{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)}))}}();
!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.eede85e8.async.js",24],["p__deviceInfo__index.ff2808b7.async.js",36],["p__user__login__index.26100c69.chunk.css",37],["p__user__login__index.b934e735.async.js",37],["119.4e6a5656.async.js",119],["p__recipe__index.101f5df6.async.js",187],["222.4d9ce06a.async.js",222],["p__system__module__index.ef46db37.chunk.css",257],["p__system__module__index.4ef32e9c.async.js",257],["p__materials__index.0233f7a0.async.js",262],["t__plugin-layout__Layout.5012e1ab.chunk.css",301],["t__plugin-layout__Layout.bb77edb1.async.js",301],["390.c53868f3.async.js",390],["393.e127e60f.async.js",393],["p__deviceProductInfo__index.835c0c6c.chunk.css",402],["p__deviceProductInfo__index.ab3fbfed.async.js",402],["p__workInfo__index.8432356b.async.js",420],["p__welcome__index.dde73410.async.js",446],["p__final__index.0c5211d3.async.js",460],["p__system__user__index.695d982e.chunk.css",472],["p__system__user__index.f6e08770.async.js",472],["550.26374af7.async.js",550],["t__plugin-maxtabs__Layout.b832af3b.async.js",558],["563.9aeac478.async.js",563],["p__404.a52587bb.async.js",571],["635.dbb47eab.async.js",635],["715.8ca32649.async.js",715],["821.b970c16a.async.js",821],["865.5becc75b.async.js",865],["p__craftInfo__pot.b10f2cd8.chunk.css",869],["p__craftInfo__pot.d395d8d9.async.js",869],["p__plantModel__process.ae647f4d.async.js",988],["p__productLine__line.22ddcd1b.async.js",990]],"r":{"/*":[24,27],"/":[13,17,22,4,10,11,27,28],"/work":[4,6,13,16,21,27,22,10,11,28],"/user/login":[2,3],"/system/user":[4,19,20,21,27,22,10,11,28],"/system/role":[0,4,21,27,22,10,11,28],"/system/module":[4,7,8,21,27,22,10,11,28],"/wmx/deviceProduct":[4,14,15,21,27,22,10,11,28],"/wmx/deviceinfo":[1,4,21,27,22,10,11,28],"/base/process":[4,21,27,31,22,10,11,28],"/base/materials":[4,9,21,27,22,10,11,28],"/base/final":[4,18,21,23,27,22,10,11,28],"/base/line":[4,21,25,26,27,32,22,10,11,28],"/recipeCraft/recipe":[4,5,21,23,27,22,10,11,28],"/recipeCraft/pot":[4,13,21,25,27,29,30,22,10,11,28]}},{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)}))}}();

frontend/dist/umi.c553e74a.js
文件差异内容过多而无法显示
查看文件


+ 91
- 8
frontend/src/pages/productLine/line.tsx 查看文件

@@ -19,6 +19,7 @@ import dayjs from 'dayjs'
import { v4 as uuid } from 'uuid'
import productlineInfoAPI from '@/api/productlineInfo/service'
import processAPI from '@/api/process/service';
import deviceAPI from '@/api/DeviceInfo';
import productlineInfoStepsAPI from '@/api/productlinesteps/service'
import { edges, nodes as newnodes } from './data';

@@ -35,6 +36,10 @@ export default () => {
const [flowOpen, setFlowOpen] = useState<boolean>(false)
const [flowItemOpen, setFlowItemOpen] = useState<boolean>(false)

const [deviceOpen, setDeviceOpen] = useState<boolean>(false)

const [selectProcess,setSelectProcess] =useState<any>(0)

const columns: ProColumns<productlineInfoTypes.output>[] = [
{
title: '主键',
@@ -108,7 +113,7 @@ export default () => {
配置工艺流程
</a>
<a onClick={() => {
// setFlowOpen(true)
// setDeviceOpen(true)
// setStepparams({ lineId: row.id })
}} key={+new Date() + Math.random()} target="_blank" rel="noopener noreferrer">
配置设备
@@ -159,15 +164,22 @@ export default () => {
const [node, setNode] = useState(null);
const sortActionRef = useRef<ActionType>();
const [proList, setProList] = useState<any[]>([]);
const [deviceList, setDeviceList] = useState<any[]>([]);
const [form] = Form.useForm();
const processIdFlag = Form.useWatch('processId', form);
useEffect(() => {
processAPI.Selectlist().then((v: MyResponse.Content) => {
processAPI.List({name:''}).then((v: MyResponse.Content) => {
if (v.statusCode === 200) {
console.log('v.data', v.data);
console.log('processAPI.List', v.data);
setProList(v.data)
}
})

deviceAPI.selectlist().then((v: MyResponse.Content) => {
if (v.statusCode === 200) {
console.log('v.data', v.data);
setDeviceList(v.data)
}
})

}, [])

@@ -310,7 +322,7 @@ export default () => {
align: 'center',
hideInSearch: true,
render(dom, entity, index, action, schema) {
return <>{proList.find((x) => x.key == entity.processId)?.value}</>
return <>{proList.find((x) => x.id == entity.processId)?.name}</>
},
},
{
@@ -483,9 +495,69 @@ export default () => {
</Form.Item>
<Form.Item label="工艺"
name="processId" rules={[{ required: true, message: '此项为必填项!' }]} >
<Select placeholder='请选择工艺' style={{ width: 375 }}>
<Select onChange={(v:processType.output)=>{
// console.log(proList.find(x=>x.id==v)?.processType);
// setSelectProcess(v.processType)
}} placeholder='请选择工艺' style={{ width: 375 }}>
{
proList.map((item: processType.output) => {
return <Select.Option value={item.id} key={item.id}>
<span>{item.name}</span>
</Select.Option>
})
}
</Select>
</Form.Item>
{proList.find(x=>x.id==processIdFlag)?.processType}
{proList.find(x=>x.id==processIdFlag)?.processType===0?processIdFlag:
<Form.List name="finalsl" >
{(fields, { add, remove }) => (
<>
{fields.map(({ key, name, ...restField }) => (
<Space key={key} align="baseline">
<Form.Item
shouldUpdate={true}
>
{() => (
<Form.Item
{...restField}
label="请选择设备"
name={[name, 'finalslId']}
rules={[
{
required: true,
message: '请选择设备',
},
]}
>
<Select style={{ width: 400, }} >
{deviceList.map((item) => (
<Select.Option key={item.key} value={item.key}>
{item.value}
</Select.Option>
))}
</Select>
</Form.Item>
)}
</Form.Item>
</Space>
))}
<Form.Item>
<Button type="dashed" onClick={() => add()} block icon={<PlusOutlined />}>
添加设备
</Button>
</Form.Item>
</>
)}
</Form.List>
}
{/* {proList.find(x=>x.id==intranetFlag)?.processType===0 ?"": <Form.Item label="请选择设备"
name="deviceId" rules={[{ required: true, message: '此项为必填项!' }]} >
<Select placeholder='请选择设备' style={{ width: 375 }}>
{
proList.map((item: MySelectType.Select) => {
deviceList.map((item: MySelectType.Select) => {
return <Select.Option value={item.key} key={item.key}>
<span>{item.value}</span>
</Select.Option>
@@ -493,9 +565,20 @@ export default () => {
}
</Select>
</Form.Item>
} */}
</Form>
</Modal >

<Modal open={deviceOpen} maskClosable={false} width={500} title='设置设备工艺'>
{/*
工艺
*/}



</Modal>
</>
);
};

撰写 预览
正在加载...
取消
保存