BPA_MES
/
PZTJ.MES
4
0
複製 0
程式碼 問題管理 0 合併請求 0 版本發佈 0 Wiki Activity
瀏覽代碼

胖子天骄修改

master
747575620@qq.com 5 月之前
父節點
b6b68c0a27
當前提交
964e4c18e0
共有 51 個文件被更改，包括 544 次插入 和 2345 次删除
分割檢視
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      frontend/config/proxy.ts
  2. +27
    -28
      frontend/config/routes.ts
  3. +0
    -3
      frontend/dist/110.a1ce0e12.async.js
  4. +0
    -645
      frontend/dist/254.5aba7fd3.async.js
  5. +0
    -993
      frontend/dist/348.5c88ec60.async.js
  6. +0
    -80
      frontend/dist/360.3a8a1640.async.js
  7. +0
    -8
      frontend/dist/564.10b0d993.async.js
  8. +0
    -6
      frontend/dist/635.f0b1759e.async.js
  9. +0
    -143
      frontend/dist/749.e57b7c68.async.js
  10. +0
    -1
      frontend/dist/821.4d8dc185.async.js
  11. +1
    -5
      frontend/dist/index.html
  12. +0
    -1
      frontend/dist/p__404.d34acf09.async.js
  13. +0
    -1
      frontend/dist/p__agvbasic__index.2f84e012.async.js
  14. +0
    -1
      frontend/dist/p__agvline__index.b3ef20ec.async.js
  15. +0
    -1
      frontend/dist/p__bucket__index.834f2f89.async.js
  16. +0
    -1
      frontend/dist/p__craftInfo__pot.f7c7ae8b.async.js
  17. +0
    -1
      frontend/dist/p__deviceInfo__index.7f221ab8.async.js
  18. +0
    -1
      frontend/dist/p__deviceProductInfo__index.ec10efaa.async.js
  19. +0
    -1
      frontend/dist/p__dict__index.07c1984f.async.js
  20. +0
    -1
      frontend/dist/p__final__index.b3adffd9.async.js
  21. +0
    -1
      frontend/dist/p__kep__index.c95cb979.async.js
  22. +0
    -1
      frontend/dist/p__kep__index.feb0c626.chunk.css
  23. +0
    -1
      frontend/dist/p__logs__alarmlog.71ae930c.async.js
  24. +0
    -1
      frontend/dist/p__logs__programlog.65185758.async.js
  25. +0
    -1
      frontend/dist/p__logs__runlog.51604da7.async.js
  26. +0
    -1
      frontend/dist/p__logs__userlog.15049bc9.async.js
  27. +0
    -1
      frontend/dist/p__manufacturing__index.35414a0e.async.js
  28. +0
    -1
      frontend/dist/p__materials__index.7c5152c1.async.js
  29. +0
    -1
      frontend/dist/p__order__index.bd991950.async.js
  30. +0
    -1
      frontend/dist/p__recipe__index.5666d931.async.js
  31. +0
    -1
      frontend/dist/p__report__material__index.37080e62.async.js
  32. +0
    -1
      frontend/dist/p__report__product__index.d2d20dbd.async.js
  33. +0
    -1
      frontend/dist/p__stock__index.cca8ad01.async.js
  34. +0
    -1
      frontend/dist/p__system__module__index.9dbdf5ff.async.js
  35. +0
    -1
      frontend/dist/p__system__role__index.d78f1e55.async.js
  36. +0
    -1
      frontend/dist/p__system__user__index.bc480bbe.async.js
  37. +0
    -1
      frontend/dist/p__user__login__index.0dee4dca.async.js
  38. +0
    -10
      frontend/dist/p__welcome__index.7ec40c75.async.js
  39. +0
    -1
      frontend/dist/p__workInfo__index.e374edd1.async.js
  40. 二進制
     
  41. +0
    -1
      frontend/dist/t__plugin-layout__Layout.8f39539f.chunk.css
  42. +0
    -1
      frontend/dist/t__plugin-layout__Layout.f1f97356.async.js
  43. +0
    -345
      frontend/dist/umi.eeba41ac.js
  44. +44
    -1
      frontend/src/api/workService.ts
  45. +2
    -1
      frontend/src/pages/craftInfo/pot.tsx
  46. +11
    -11
      frontend/src/pages/report/material/index.tsx
  47. +11
    -11
      frontend/src/pages/report/product/index.tsx
  48. +1
    -1
      frontend/src/pages/system/user/index.tsx
  49. +1
    -1
      frontend/src/pages/user/login/index.tsx
  50. +438
    -22
      frontend/src/pages/workInfo/index.tsx
  51. +7
    -0
      frontend/src/types/WorkInfo.d.ts

+ 1
- 1
frontend/config/proxy.ts 查看文件

@@ -6,7 +6,7 @@
export default {
dev: {
'/api/': {
target: 'http://localhost:5001',
target: 'http://192.168.1.243:5502',
pathRewrite: {
'/api': '/api'
},


+ 27
- 28
frontend/config/routes.ts 查看文件

@@ -1,6 +1,5 @@
export default [
{ path: '/user', layout: false, routes: [{ path: '/user/login', component: './user/login' }] },
<<<<<<< HEAD
// { path: '/', icon: 'SmileOutlined', component: './welcome', name: '数据看板' },
// {
// icon: 'SettingOutlined',
@@ -24,20 +23,20 @@
// ]
// },
{
path: '/kep', icon: 'SettingOutlined', name: '大屏数据',
routes: [ {
name: '数据看板',
path: '/kep/datav',
component: './kep/datav',
},
{
name: '报警限制',
path: '/kep/alarmLimit',
component: './kep/alarmLimit',
}
]
},
// {
// path: '/kep', icon: 'SettingOutlined', name: '大屏数据',
// routes: [ {
// name: '数据看板',
// path: '/kep/datav',
// component: './kep/datav',
// },
// {
// name: '报警限制',
// path: '/kep/alarmLimit',
// component: './kep/alarmLimit',
// }
// ]
// },
// {
// path: '/base', icon: 'SettingOutlined', name: '基础数据管理',
// routes: [{ path: '/base/deviceinfo', name: '设备管理', component: './deviceInfo/index' },
@@ -87,8 +86,8 @@
// { path: '/report/material', name: '原料统计', component: './report/material' },
// ]
// },
=======
{ path: '/', icon: 'SmileOutlined', component: './welcome', name: '数据看板' },
{ path: '/', icon: 'SmileOutlined', component: './welcome', name: '欢迎页' },
{
icon: 'SettingOutlined',
path: '/system',
@@ -111,16 +110,16 @@

]
},
{
path: '/kep', icon: 'SettingOutlined', name: '大屏数据',
routes: [{
name: '数据看板',
path: '/kep',
component: './kep',
},
// {
// path: '/kep', icon: 'SettingOutlined', name: '大屏数据',
// routes: [{
// name: '数据看板',
// path: '/kep',
// component: './kep',
// },

]
},
// ]
// },
{
path: '/base', icon: 'SettingOutlined', name: '基础数据管理',
routes: [{ path: '/base/deviceinfo', name: '设备管理', component: './deviceInfo/index' },
@@ -163,7 +162,7 @@
{ path: '/agv/agvline', name: 'agv线路管理', component: './agvline/index' }
]
},
{ path: '/order', icon: 'SettingOutlined', name: '订单管理', component: './order/index' },
// { path: '/order', icon: 'SettingOutlined', name: '订单管理', component: './order/index' },
{
path: '/report', icon: 'SettingOutlined', name: '统计报表',
routes: [
@@ -171,7 +170,7 @@
{ path: '/report/material', name: '原料统计', component: './report/material' },
]
},
>>>>>>> 6f4b2f1df49c81e7fad80144116bbcedd9567b2e
{ path: '*', layout: false, component: './404' },

];

+ 0
- 3
frontend/dist/110.a1ce0e12.async.js
文件差異過大導致無法顯示
查看文件


+ 0
- 645
frontend/dist/254.5aba7fd3.async.js
文件差異過大導致無法顯示
查看文件


+ 0
- 993
frontend/dist/348.5c88ec60.async.js
文件差異過大導致無法顯示
查看文件


+ 0
- 80
frontend/dist/360.3a8a1640.async.js
文件差異過大導致無法顯示
查看文件


+ 0
- 8
frontend/dist/564.10b0d993.async.js
文件差異過大導致無法顯示
查看文件


+ 0
- 6
frontend/dist/635.f0b1759e.async.js
文件差異過大導致無法顯示
查看文件


+ 0
- 143
frontend/dist/749.e57b7c68.async.js
文件差異過大導致無法顯示
查看文件


+ 0
- 1
frontend/dist/821.4d8dc185.async.js
文件差異過大導致無法顯示
查看文件


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

@@ -6,10 +6,6 @@
</head>
<body>
<div id="root"></div>
<<<<<<< HEAD
<script src="/umi.21356be0.js"></script>
=======
<script src="/umi.eeba41ac.js"></script>
>>>>>>> 6f4b2f1df49c81e7fad80144116bbcedd9567b2e
<script src="/umi.b6513e6d.js"></script>

</body></html>

+ 0
- 1
frontend/dist/p__404.d34acf09.async.js 查看文件

@@ -1 +0,0 @@
"use strict";(self.webpackChunkant_design_pro=self.webpackChunkant_design_pro||[]).push([[571],{9826:function(D,n,u){u.r(n);var E=u(12578),_=u(45821),a=u(15867),P=u(67294),t=u(85893),s=function(){return(0,t.jsx)(_.ZP,{status:"404",title:"404",subTitle:"\u6B64\u9875\u9762\u4E0D\u5B58\u5728\uFF01\u8BF7\u8FD4\u56DE\u9996\u9875\uFF01",extra:(0,t.jsx)(a.ZP,{type:"primary",onClick:function(){return E.history.push("/")},children:"\u56DE\u5230\u9996\u9875"})})};n.default=s}}]);

+ 0
- 1
frontend/dist/p__agvbasic__index.2f84e012.async.js 查看文件

@@ -1 +0,0 @@
"use strict";(self.webpackChunkant_design_pro=self.webpackChunkant_design_pro||[]).push([[614],{19127:function(S,D,e){var M=e(97857),s=e.n(M),m=e(12578);D.Z={Add:function(o){return(0,m.request)("/api/agvpoint/add",{method:"POST",data:s()({},o)})},Del:function(o){return(0,m.request)("/api/agvpoint/del",{method:"POST",data:s()({},o)})},Update:function(o){return(0,m.request)("/api/agvpoint/update",{method:"POST",data:s()({},o)})},List:function(){return(0,m.request)("/api/agvpoint/list",{method:"POST"})},PagedList:function(o){return(0,m.request)("/api/agvpoint/pagedlist",{method:"POST",data:s()({},o)})},selectlist:function(){return(0,m.request)("/api/agvpoint/selectlist",{method:"GET"})}}},66871:function(S,D,e){e.r(D);var M=e(15009),s=e.n(M),m=e(99289),i=e.n(m),o=e(5574),T=e.n(o),A=e(74254),p=e(40741),P=e(15867),B=e(86738),E=e(45360),I=e(5914),R=e(66309),g=e(12096),v=e(67294),O=e(19127),t=e(85893),F=function(){var L=(0,v.useState)(!1),C=T()(L,2),y=C[0],f=C[1],U=p.Z.useForm(),K=T()(U,1),b=K[0],W=(0,v.useState)(),j=T()(W,2),x=j[0],Z=j[1],h=(0,v.useRef)(),J=[{title:"id",dataIndex:"id",tip:"\u89C4\u5219\u540D\u79F0\u662F\u552F\u4E00\u7684 key",hideInSearch:!0,hideInTable:!0},{title:"\u70B9\u4F4D\u540D\u79F0",dataIndex:"name",ellipsis:!0,align:"center"},{title:"\u70B9\u4F4D\u7F16\u7801",dataIndex:"code",hideInSearch:!0,ellipsis:!0,align:"center"},{title:"\u64CD\u4F5C",valueType:"option",key:"option",align:"center",render:function(l,u){return[(0,t.jsx)(P.ZP,{type:"primary",ghost:!0,onClick:i()(s()().mark(function a(){var r;return s()().wrap(function(n){for(;;)switch(n.prev=n.next){case 0:f(!0),Z("\u7F16\u8F91\u70B9\u4F4D"),r=JSON.parse(JSON.stringify(u)),b.setFieldsValue(r);case 4:case"end":return n.stop()}},a)})),children:"\u7F16\u8F91"},"edit"),(0,t.jsx)(B.Z,{title:"\u786E\u5B9A\u8981\u5220\u9664\u6B64\u6761\u6570\u636E\u5417\uFF1F",onConfirm:function(){var r={id:u.id,name:"",code:""};O.Z.Del(r).then(function(_){if(_.statusCode===200){var n;E.ZP.success(_.statusCode===200?"\u5220\u9664\u6210\u529F":_.message),(n=h.current)===null||n===void 0||n.reload()}})},onCancel:function(){E.ZP.info("\u5DF2\u53D6\u6D88\u5220\u9664")},okText:"\u786E\u8BA4",cancelText:"\u5173\u95ED",children:(0,t.jsx)(P.ZP,{type:"primary",danger:!0,ghost:!0,children:"\u5220\u9664"})},"del")]}}];(0,v.useEffect)(function(){},[]);var $=function(){var c=i()(s()().mark(function l(u){var a,r,_,n;return s()().wrap(function(d){for(;;)switch(d.prev=d.next){case 0:if(!u.id){d.next=7;break}return d.next=3,O.Z.Update(u);case 3:a=d.sent,a.statusCode===200?(E.ZP.success("\u4FEE\u6539\u6210\u529F"),(r=h.current)===null||r===void 0||r.reload(),f(!1)):E.ZP.error(JSON.stringify(a.errors)||"\u4FEE\u6539\u5931\u8D25"),d.next=12;break;case 7:return d.next=9,O.Z.Add(u);case 9:_=d.sent,console.log("response",_),_.statusCode===200?(E.ZP.success("\u6DFB\u52A0\u6210\u529F"),(n=h.current)===null||n===void 0||n.reload(),f(!1)):E.ZP.error(JSON.stringify(_.errors)||"\u6DFB\u52A0\u5931\u8D25");case 12:case"end":return d.stop()}},l)}));return function(u){return c.apply(this,arguments)}}();return(0,t.jsxs)(t.Fragment,{children:[(0,t.jsx)(A.Z,{actionRef:h,cardBordered:!0,request:i()(s()().mark(function c(){var l,u,a,r=arguments;return s()().wrap(function(n){for(;;)switch(n.prev=n.next){case 0:return l=r.length>0&&r[0]!==void 0?r[0]:{},u={pageIndex:l.current||1,pageSize:l.pageSize||10,name:l.name||""},n.next=4,O.Z.PagedList(u);case 4:if(a=n.sent,a.statusCode!==200){n.next=9;break}return n.abrupt("return",{data:a.data.items,success:!0,total:a.data.total});case 9:return n.abrupt("return",{data:[],success:!1,total:0});case 10:case"end":return n.stop()}},c)})),rowKey:"id",pagination:{pageSize:10},dateFormatter:"string",headerTitle:"\u70B9\u4F4D\u5217\u8868",columns:J,toolBarRender:function(){return[(0,t.jsx)(P.ZP,{type:"primary",onClick:function(){b.resetFields(),f(!0),Z("\u65B0\u589E\u70B9\u4F4D")},children:"\u65B0\u589E\u70B9\u4F4D"},"button")]}},"myTable"),(0,t.jsx)(I.Z,{maskClosable:!1,width:800,title:(0,t.jsx)(R.Z,{color:"#cd201f",children:x}),open:y,onCancel:function(){f(!1)},footer:[(0,t.jsx)(P.ZP,{onClick:function(){f(!1)},children:"\u8FD4\u56DE"},"back"),(0,t.jsx)(P.ZP,{form:"agvbasicForm",type:"primary",htmlType:"submit",children:"\u63D0\u4EA4"},"submit")],children:(0,t.jsxs)(p.Z,{form:b,name:"basic",id:"agvbasicForm",labelAlign:"right",wrapperCol:{span:12},onFinish:$,autoComplete:"off",children:[(0,t.jsx)(p.Z.Item,{label:"id",name:"id",hidden:!0,children:(0,t.jsx)(g.Z,{})}),(0,t.jsx)(p.Z.Item,{label:"\u70B9\u4F4D\u540D\u79F0",name:"name",rules:[{required:!0,message:"\u6B64\u9879\u4E3A\u5FC5\u586B\u9879!"}],children:(0,t.jsx)(g.Z,{})}),(0,t.jsx)(p.Z.Item,{label:"\u70B9\u4F4D\u7F16\u7801",name:"code",rules:[{required:!0,message:"\u6B64\u9879\u4E3A\u5FC5\u586B\u9879!"}],children:(0,t.jsx)(g.Z,{})})]})},"01")]})};D.default=F}}]);

+ 0
- 1
frontend/dist/p__agvline__index.b3ef20ec.async.js
文件差異過大導致無法顯示
查看文件


+ 0
- 1
frontend/dist/p__bucket__index.834f2f89.async.js
文件差異過大導致無法顯示
查看文件


+ 0
- 1
frontend/dist/p__craftInfo__pot.f7c7ae8b.async.js
文件差異過大導致無法顯示
查看文件


+ 0
- 1
frontend/dist/p__deviceInfo__index.7f221ab8.async.js
文件差異過大導致無法顯示
查看文件


+ 0
- 1
frontend/dist/p__deviceProductInfo__index.ec10efaa.async.js
文件差異過大導致無法顯示
查看文件


+ 0
- 1
frontend/dist/p__dict__index.07c1984f.async.js
文件差異過大導致無法顯示
查看文件


+ 0
- 1
frontend/dist/p__final__index.b3adffd9.async.js
文件差異過大導致無法顯示
查看文件


+ 0
- 1
frontend/dist/p__kep__index.c95cb979.async.js
文件差異過大導致無法顯示
查看文件


+ 0
- 1
frontend/dist/p__kep__index.feb0c626.chunk.css 查看文件

@@ -1 +0,0 @@
#data-view{width:100%;height:100%;background-color:#030409;color:#fff}#data-view #dv-full-screen-container{background-image:url(./static/bg.9a80c9d4.png);background-size:100% 100%;box-shadow:0 0 3px #00f;display:flex;flex-direction:column}#data-view #dv-full-screen-container #chart_title{padding:10;color:"#04b2f7";font-size:"18px";font-weight:"bold"}#data-view .head_title{text-align:center;position:relative}#data-view .head_title_txt{position:absolute;top:15px;font-size:24px;right:46%}#data-view .g2-tooltip-title{color:#fff}#data-view .g2-html-annotation{font-size:14px}

+ 0
- 1
frontend/dist/p__logs__alarmlog.71ae930c.async.js 查看文件

@@ -1 +0,0 @@
"use strict";(self.webpackChunkant_design_pro=self.webpackChunkant_design_pro||[]).push([[522],{90503:function(A,i,n){n.d(i,{DH:function(){return p},Xk:function(){return c},n5:function(){return D},xu:function(){return E}});var P=n(97857),d=n.n(P),t=n(12578),c={Add:function(e){return(0,t.request)("/api/alarmlog/add",{method:"POST",data:d()({},e)})},Del:function(e){return(0,t.request)("/api/alarmlog/del",{method:"POST",data:d()({},e)})},Update:function(e){return(0,t.request)("/api/alarmlog/update",{method:"POST",data:d()({},e)})},Detail:function(e){return(0,t.request)("/api/alarmlog/detail?id=".concat(e),{method:"GET"})},List:function(e){return(0,t.request)("/api/alarmlog/list",{method:"POST",data:d()({},e)})},PagedList:function(e){return(0,t.request)("/api/alarmlog/pagedlist",{method:"POST",data:d()({},e)})}},p={Add:function(e){return(0,t.request)("/api/programlog/add",{method:"POST",data:d()({},e)})},Del:function(e){return(0,t.request)("/api/programlog/del",{method:"POST",data:d()({},e)})},Update:function(e){return(0,t.request)("/api/programlog/update",{method:"POST",data:d()({},e)})},Detail:function(e){return(0,t.request)("/api/programlog/detail?id=".concat(e),{method:"GET"})},List:function(e){return(0,t.request)("/api/programlog/list",{method:"POST",data:d()({},e)})},PagedList:function(e){return(0,t.request)("/api/programlog/pagedlist",{method:"POST",data:d()({},e)})}},D={Add:function(e){return(0,t.request)("/api/userlog/add",{method:"POST",data:d()({},e)})},Del:function(e){return(0,t.request)("/api/userlog/del",{method:"POST",data:d()({},e)})},Update:function(e){return(0,t.request)("/api/userlog/update",{method:"POST",data:d()({},e)})},Detail:function(e){return(0,t.request)("/api/userlog/detail?id=".concat(e),{method:"GET"})},List:function(e){return(0,t.request)("/api/userlog/list",{method:"POST",data:d()({},e)})},PagedList:function(e){return(0,t.request)("/api/userlog/pagedlist",{method:"POST",data:d()({},e)})}},E={Add:function(e){return(0,t.request)("/api/runlog/add",{method:"POST",data:d()({},e)})},Del:function(e){return(0,t.request)("/api/runlog/del",{method:"POST",data:d()({},e)})},Update:function(e){return(0,t.request)("/api/runlog/update",{method:"POST",data:d()({},e)})},Detail:function(e){return(0,t.request)("/api/runlog/detail?id=".concat(e),{method:"GET"})},List:function(e){return(0,t.request)("/api/runlog/list",{method:"POST",data:d()({},e)})},PagedList:function(e){return(0,t.request)("/api/runlog/pagedlist",{method:"POST",data:d()({},e)})}}},48350:function(A,i,n){n.r(i);var P=n(15009),d=n.n(P),t=n(99289),c=n.n(t),p=n(13769),D=n.n(p),E=n(5574),r=n.n(E),e=n(85322),b=n(74254),j=n(27484),g=n.n(j),I=n(41594),U=n(15867),m=n(45360),T=n(67294),O=n(90503),u=n(85893),C=["type","defaultRender"],B=I.default.RangePicker;i.default=function(){var W=(0,T.useState)("table"),S=r()(W,2),h=S[0],M=S[1],v=(0,T.useRef)(),L=(0,T.useRef)(),R=function(){var a,_;(a=v.current)===null||a===void 0||a.resetFields(),(_=L.current)===null||_===void 0||_.reload()},K=[{title:"\u4E3B\u952E",dataIndex:"id",hideInForm:!0,search:!1},{title:"\u8BBE\u5907\u540D\u79F0",dataIndex:"deviceName"},{title:"\u65F6\u95F4",dataIndex:"createDate",renderFormItem:function(a,_,l){var f=_.type,Z=_.defaultRender,o=D()(_,C);return(0,u.jsx)(B,{showTime:!0})},render:function(a,_){return(0,u.jsx)(u.Fragment,{children:_.createDate?g()(_.createDate).format("YYYY-MM-DD HH:mm:ss"):""})}},{title:"\u62A5\u8B66\u7B49\u7EA7",dataIndex:"grade"},{title:"\u62A5\u8B66\u7C7B\u578B",dataIndex:"logType"},{title:"\u62A5\u8B66\u503C",dataIndex:"value",search:!1},{title:"\u62A5\u8B66\u4FE1\u606F",dataIndex:"msgInfo",search:!1}];return(0,u.jsx)(u.Fragment,{children:(0,u.jsxs)(e.Z,{children:[h==="form"?(0,u.jsx)(U.ZP,{type:"link",onClick:function(){var a;(a=v.current)===null||a===void 0||a.resetFields(),M("table")},children:"\u2B05\u8FD4\u56DE"}):"",(0,u.jsx)(b.Z,{columns:K,type:h,formRef:v,actionRef:L,onSubmit:function(a){console.log(a),h==="form"&&(a.id?O.Xk.Update(a).then(function(_){_.statusCode===200?(m.ZP.info("\u66F4\u65B0\u6210\u529F!"),M("table"),R()):m.ZP.error(_.errors)}):O.Xk.Add(a).then(function(_){_.statusCode===200?(m.ZP.info("\u65B0\u589E\u6210\u529F!"),M("table"),R()):m.ZP.error(_.errors)}))},request:c()(d()().mark(function s(){var a,_,l,f=arguments;return d()().wrap(function(o){for(;;)switch(o.prev=o.next){case 0:return a=f.length>0&&f[0]!==void 0?f[0]:{},_={pageIndex:a.current||1,pageSize:a.pageSize||10,msgInfo:a.msgInfo,value:a.value,grade:a.grade,deviceName:a.deviceName,startTime:a.createDate?g()(a.createDate[0]):null,endTime:a.createDate?g()(a.createDate[1]):null},o.next=4,O.Xk.PagedList(_);case 4:if(l=o.sent,l.statusCode!==200){o.next=9;break}return o.abrupt("return",{data:l.data.items,success:!0,total:l.data.total});case 9:return o.abrupt("return",{data:[],success:!1,total:0});case 10:case"end":return o.stop()}},s)})),pagination:{pageSize:5},rowKey:"id",dateFormatter:"string",headerTitle:"\u5217\u8868",toolBarRender:!1})]})})}}}]);

+ 0
- 1
frontend/dist/p__logs__programlog.65185758.async.js 查看文件

@@ -1 +0,0 @@
"use strict";(self.webpackChunkant_design_pro=self.webpackChunkant_design_pro||[]).push([[309],{90503:function(A,i,r){r.d(i,{DH:function(){return D},Xk:function(){return p},n5:function(){return c},xu:function(){return E}});var P=r(97857),d=r.n(P),t=r(12578),p={Add:function(e){return(0,t.request)("/api/alarmlog/add",{method:"POST",data:d()({},e)})},Del:function(e){return(0,t.request)("/api/alarmlog/del",{method:"POST",data:d()({},e)})},Update:function(e){return(0,t.request)("/api/alarmlog/update",{method:"POST",data:d()({},e)})},Detail:function(e){return(0,t.request)("/api/alarmlog/detail?id=".concat(e),{method:"GET"})},List:function(e){return(0,t.request)("/api/alarmlog/list",{method:"POST",data:d()({},e)})},PagedList:function(e){return(0,t.request)("/api/alarmlog/pagedlist",{method:"POST",data:d()({},e)})}},D={Add:function(e){return(0,t.request)("/api/programlog/add",{method:"POST",data:d()({},e)})},Del:function(e){return(0,t.request)("/api/programlog/del",{method:"POST",data:d()({},e)})},Update:function(e){return(0,t.request)("/api/programlog/update",{method:"POST",data:d()({},e)})},Detail:function(e){return(0,t.request)("/api/programlog/detail?id=".concat(e),{method:"GET"})},List:function(e){return(0,t.request)("/api/programlog/list",{method:"POST",data:d()({},e)})},PagedList:function(e){return(0,t.request)("/api/programlog/pagedlist",{method:"POST",data:d()({},e)})}},c={Add:function(e){return(0,t.request)("/api/userlog/add",{method:"POST",data:d()({},e)})},Del:function(e){return(0,t.request)("/api/userlog/del",{method:"POST",data:d()({},e)})},Update:function(e){return(0,t.request)("/api/userlog/update",{method:"POST",data:d()({},e)})},Detail:function(e){return(0,t.request)("/api/userlog/detail?id=".concat(e),{method:"GET"})},List:function(e){return(0,t.request)("/api/userlog/list",{method:"POST",data:d()({},e)})},PagedList:function(e){return(0,t.request)("/api/userlog/pagedlist",{method:"POST",data:d()({},e)})}},E={Add:function(e){return(0,t.request)("/api/runlog/add",{method:"POST",data:d()({},e)})},Del:function(e){return(0,t.request)("/api/runlog/del",{method:"POST",data:d()({},e)})},Update:function(e){return(0,t.request)("/api/runlog/update",{method:"POST",data:d()({},e)})},Detail:function(e){return(0,t.request)("/api/runlog/detail?id=".concat(e),{method:"GET"})},List:function(e){return(0,t.request)("/api/runlog/list",{method:"POST",data:d()({},e)})},PagedList:function(e){return(0,t.request)("/api/runlog/pagedlist",{method:"POST",data:d()({},e)})}}},95690:function(A,i,r){r.r(i);var P=r(15009),d=r.n(P),t=r(99289),p=r.n(t),D=r(13769),c=r.n(D),E=r(5574),a=r.n(E),e=r(85322),b=r(74254),j=r(27484),g=r.n(j),I=r(41594),U=r(15867),m=r(45360),T=r(67294),O=r(90503),u=r(85893),C=["type","defaultRender"],B=I.default.RangePicker;i.default=function(){var W=(0,T.useState)("table"),S=a()(W,2),M=S[0],h=S[1],v=(0,T.useRef)(),L=(0,T.useRef)(),R=function(){var n,_;(n=v.current)===null||n===void 0||n.resetFields(),(_=L.current)===null||_===void 0||_.reload()},K=[{title:"\u4E3B\u952E",dataIndex:"id",search:!1},{title:"\u65E5\u5FD7\u7C7B\u522B",dataIndex:"logType",width:160},{title:"\u65E5\u5FD7\u6D88\u606F",dataIndex:"msgInfo"},{title:"\u65F6\u95F4",dataIndex:"createDate",renderFormItem:function(n,_,l){var f=_.type,y=_.defaultRender,o=c()(_,C);return(0,u.jsx)(B,{showTime:!0})},render:function(n,_){return(0,u.jsx)(u.Fragment,{children:_.createDate?g()(_.createDate).format("YYYY-MM-DD HH:mm:ss"):""})},width:160}];return(0,u.jsx)(u.Fragment,{children:(0,u.jsxs)(e.Z,{children:[M==="form"?(0,u.jsx)(U.ZP,{type:"link",onClick:function(){var n;(n=v.current)===null||n===void 0||n.resetFields(),h("table")},children:"\u2B05\u8FD4\u56DE"}):"",(0,u.jsx)(b.Z,{columns:K,type:M,formRef:v,actionRef:L,onSubmit:function(n){console.log(n),M==="form"&&(n.id?O.DH.Update(n).then(function(_){_.statusCode===200?(m.ZP.info("\u66F4\u65B0\u6210\u529F!"),h("table"),R()):m.ZP.error(_.errors)}):O.DH.Add(n).then(function(_){_.statusCode===200?(m.ZP.info("\u65B0\u589E\u6210\u529F!"),h("table"),R()):m.ZP.error(_.errors)}))},request:p()(d()().mark(function s(){var n,_,l,f=arguments;return d()().wrap(function(o){for(;;)switch(o.prev=o.next){case 0:return n=f.length>0&&f[0]!==void 0?f[0]:{},_={pageIndex:n.current||1,pageSize:n.pageSize||10,logType:n.logType,msgInfo:n.msgInfo,startTime:n.createDate?g()(n.createDate[0]):null,endTime:n.createDate?g()(n.createDate[1]):null},o.next=4,O.DH.PagedList(_);case 4:if(l=o.sent,l.statusCode!==200){o.next=9;break}return o.abrupt("return",{data:l.data.items,success:!0,total:l.data.total});case 9:return o.abrupt("return",{data:[],success:!1,total:0});case 10:case"end":return o.stop()}},s)})),pagination:{pageSize:5},rowKey:"id",dateFormatter:"string",headerTitle:"\u5217\u8868",toolBarRender:!1})]})})}}}]);

+ 0
- 1
frontend/dist/p__logs__runlog.51604da7.async.js 查看文件

@@ -1 +0,0 @@
"use strict";(self.webpackChunkant_design_pro=self.webpackChunkant_design_pro||[]).push([[675],{90503:function(A,i,r){r.d(i,{DH:function(){return D},Xk:function(){return p},n5:function(){return c},xu:function(){return E}});var P=r(97857),d=r.n(P),t=r(12578),p={Add:function(e){return(0,t.request)("/api/alarmlog/add",{method:"POST",data:d()({},e)})},Del:function(e){return(0,t.request)("/api/alarmlog/del",{method:"POST",data:d()({},e)})},Update:function(e){return(0,t.request)("/api/alarmlog/update",{method:"POST",data:d()({},e)})},Detail:function(e){return(0,t.request)("/api/alarmlog/detail?id=".concat(e),{method:"GET"})},List:function(e){return(0,t.request)("/api/alarmlog/list",{method:"POST",data:d()({},e)})},PagedList:function(e){return(0,t.request)("/api/alarmlog/pagedlist",{method:"POST",data:d()({},e)})}},D={Add:function(e){return(0,t.request)("/api/programlog/add",{method:"POST",data:d()({},e)})},Del:function(e){return(0,t.request)("/api/programlog/del",{method:"POST",data:d()({},e)})},Update:function(e){return(0,t.request)("/api/programlog/update",{method:"POST",data:d()({},e)})},Detail:function(e){return(0,t.request)("/api/programlog/detail?id=".concat(e),{method:"GET"})},List:function(e){return(0,t.request)("/api/programlog/list",{method:"POST",data:d()({},e)})},PagedList:function(e){return(0,t.request)("/api/programlog/pagedlist",{method:"POST",data:d()({},e)})}},c={Add:function(e){return(0,t.request)("/api/userlog/add",{method:"POST",data:d()({},e)})},Del:function(e){return(0,t.request)("/api/userlog/del",{method:"POST",data:d()({},e)})},Update:function(e){return(0,t.request)("/api/userlog/update",{method:"POST",data:d()({},e)})},Detail:function(e){return(0,t.request)("/api/userlog/detail?id=".concat(e),{method:"GET"})},List:function(e){return(0,t.request)("/api/userlog/list",{method:"POST",data:d()({},e)})},PagedList:function(e){return(0,t.request)("/api/userlog/pagedlist",{method:"POST",data:d()({},e)})}},E={Add:function(e){return(0,t.request)("/api/runlog/add",{method:"POST",data:d()({},e)})},Del:function(e){return(0,t.request)("/api/runlog/del",{method:"POST",data:d()({},e)})},Update:function(e){return(0,t.request)("/api/runlog/update",{method:"POST",data:d()({},e)})},Detail:function(e){return(0,t.request)("/api/runlog/detail?id=".concat(e),{method:"GET"})},List:function(e){return(0,t.request)("/api/runlog/list",{method:"POST",data:d()({},e)})},PagedList:function(e){return(0,t.request)("/api/runlog/pagedlist",{method:"POST",data:d()({},e)})}}},48098:function(A,i,r){r.r(i);var P=r(15009),d=r.n(P),t=r(99289),p=r.n(t),D=r(13769),c=r.n(D),E=r(5574),a=r.n(E),e=r(85322),b=r(74254),j=r(27484),g=r.n(j),I=r(41594),U=r(15867),m=r(45360),T=r(67294),O=r(90503),u=r(85893),C=["type","defaultRender"],B=I.default.RangePicker;i.default=function(){var W=(0,T.useState)("table"),S=a()(W,2),h=S[0],M=S[1],v=(0,T.useRef)(),L=(0,T.useRef)(),R=function(){var n,o;(n=v.current)===null||n===void 0||n.resetFields(),(o=L.current)===null||o===void 0||o.reload()},K=[{title:"\u4E3B\u952E",dataIndex:"id",search:!1},{title:"\u65E5\u5FD7\u7C7B\u522B",dataIndex:"logType",width:160},{title:"\u65E5\u5FD7\u6D88\u606F",dataIndex:"msgInfo"},{title:"\u65F6\u95F4",dataIndex:"createDate",renderFormItem:function(n,o,l){var f=o.type,y=o.defaultRender,_=c()(o,C);return(0,u.jsx)(B,{showTime:!0})},render:function(n,o){return(0,u.jsx)(u.Fragment,{children:o.createDate?g()(o.createDate).format("YYYY-MM-DD HH:mm:ss"):""})}}];return(0,u.jsx)(u.Fragment,{children:(0,u.jsxs)(e.Z,{children:[h==="form"?(0,u.jsx)(U.ZP,{type:"link",onClick:function(){var n;(n=v.current)===null||n===void 0||n.resetFields(),M("table")},children:"\u2B05\u8FD4\u56DE"}):"",(0,u.jsx)(b.Z,{columns:K,type:h,formRef:v,actionRef:L,onSubmit:function(n){console.log(n),h==="form"&&(n.id?O.xu.Update(n).then(function(o){o.statusCode===200?(m.ZP.info("\u66F4\u65B0\u6210\u529F!"),M("table"),R()):m.ZP.error(o.errors)}):O.xu.Add(n).then(function(o){o.statusCode===200?(m.ZP.info("\u65B0\u589E\u6210\u529F!"),M("table"),R()):m.ZP.error(o.errors)}))},request:p()(d()().mark(function s(){var n,o,l,f=arguments;return d()().wrap(function(_){for(;;)switch(_.prev=_.next){case 0:return n=f.length>0&&f[0]!==void 0?f[0]:{},o={pageIndex:n.current||1,pageSize:n.pageSize||10,logType:n.logType,msgInfo:n.msgInfo,startTime:n.createDate?g()(n.createDate[0]).add(8,"h").toDate():null,endTime:n.createDate?g()(n.createDate[1]).add(8,"h").toDate():null},_.next=4,O.xu.PagedList(o);case 4:if(l=_.sent,l.statusCode!==200){_.next=9;break}return _.abrupt("return",{data:l.data.items,success:!0,total:l.data.total});case 9:return _.abrupt("return",{data:[],success:!1,total:0});case 10:case"end":return _.stop()}},s)})),pagination:{pageSize:5},rowKey:"id",dateFormatter:"string",headerTitle:"\u5217\u8868",toolBarRender:!1})]})})}}}]);

+ 0
- 1
frontend/dist/p__logs__userlog.15049bc9.async.js 查看文件

@@ -1 +0,0 @@
"use strict";(self.webpackChunkant_design_pro=self.webpackChunkant_design_pro||[]).push([[464],{90503:function(A,i,n){n.d(i,{DH:function(){return p},Xk:function(){return P},n5:function(){return c},xu:function(){return g}});var f=n(97857),r=n.n(f),t=n(12578),P={Add:function(e){return(0,t.request)("/api/alarmlog/add",{method:"POST",data:r()({},e)})},Del:function(e){return(0,t.request)("/api/alarmlog/del",{method:"POST",data:r()({},e)})},Update:function(e){return(0,t.request)("/api/alarmlog/update",{method:"POST",data:r()({},e)})},Detail:function(e){return(0,t.request)("/api/alarmlog/detail?id=".concat(e),{method:"GET"})},List:function(e){return(0,t.request)("/api/alarmlog/list",{method:"POST",data:r()({},e)})},PagedList:function(e){return(0,t.request)("/api/alarmlog/pagedlist",{method:"POST",data:r()({},e)})}},p={Add:function(e){return(0,t.request)("/api/programlog/add",{method:"POST",data:r()({},e)})},Del:function(e){return(0,t.request)("/api/programlog/del",{method:"POST",data:r()({},e)})},Update:function(e){return(0,t.request)("/api/programlog/update",{method:"POST",data:r()({},e)})},Detail:function(e){return(0,t.request)("/api/programlog/detail?id=".concat(e),{method:"GET"})},List:function(e){return(0,t.request)("/api/programlog/list",{method:"POST",data:r()({},e)})},PagedList:function(e){return(0,t.request)("/api/programlog/pagedlist",{method:"POST",data:r()({},e)})}},c={Add:function(e){return(0,t.request)("/api/userlog/add",{method:"POST",data:r()({},e)})},Del:function(e){return(0,t.request)("/api/userlog/del",{method:"POST",data:r()({},e)})},Update:function(e){return(0,t.request)("/api/userlog/update",{method:"POST",data:r()({},e)})},Detail:function(e){return(0,t.request)("/api/userlog/detail?id=".concat(e),{method:"GET"})},List:function(e){return(0,t.request)("/api/userlog/list",{method:"POST",data:r()({},e)})},PagedList:function(e){return(0,t.request)("/api/userlog/pagedlist",{method:"POST",data:r()({},e)})}},g={Add:function(e){return(0,t.request)("/api/runlog/add",{method:"POST",data:r()({},e)})},Del:function(e){return(0,t.request)("/api/runlog/del",{method:"POST",data:r()({},e)})},Update:function(e){return(0,t.request)("/api/runlog/update",{method:"POST",data:r()({},e)})},Detail:function(e){return(0,t.request)("/api/runlog/detail?id=".concat(e),{method:"GET"})},List:function(e){return(0,t.request)("/api/runlog/list",{method:"POST",data:r()({},e)})},PagedList:function(e){return(0,t.request)("/api/runlog/pagedlist",{method:"POST",data:r()({},e)})}}},46730:function(A,i,n){n.r(i);var f=n(15009),r=n.n(f),t=n(99289),P=n.n(t),p=n(5574),c=n.n(p),g=n(85322),a=n(74254),e=n(27484),R=n.n(e),b=n(15867),l=n(45360),D=n(67294),E=n(90503),_=n(85893);i.default=function(){var j=(0,D.useState)("table"),v=c()(j,2),T=v[0],O=v[1],h=(0,D.useRef)(),S=(0,D.useRef)(),L=function(){var d,o;(d=h.current)===null||d===void 0||d.resetFields(),(o=S.current)===null||o===void 0||o.reload()},I=[{title:"\u4E3B\u952E",dataIndex:"id",hideInForm:!0,search:!1},{title:"\u6743\u9650",dataIndex:"permission",ellipsis:!0,search:!1},{title:"\u7528\u6237\u540D",dataIndex:"userName"},{title:"\u65E5\u5FD7\u6D88\u606F",dataIndex:"msgInfo",width:120},{title:"\u65F6\u95F4",dataIndex:"createDate",render:function(d,o){return(0,_.jsx)(_.Fragment,{children:o.createDate?R()(o.createDate).format("YYYY-MM-DD HH:mm:ss"):""})}}];return(0,_.jsx)(_.Fragment,{children:(0,_.jsxs)(g.Z,{children:[T==="form"?(0,_.jsx)(b.ZP,{type:"link",onClick:function(){var d;(d=h.current)===null||d===void 0||d.resetFields(),O("table")},children:"\u2B05\u8FD4\u56DE"}):"",(0,_.jsx)(a.Z,{columns:I,type:T,formRef:h,actionRef:S,onSubmit:function(d){console.log(d),T==="form"&&(d.id?E.n5.Update(d).then(function(o){o.statusCode===200?(l.ZP.info("\u66F4\u65B0\u6210\u529F!"),O("table"),L()):l.ZP.error(o.errors)}):E.n5.Add(d).then(function(o){o.statusCode===200?(l.ZP.info("\u65B0\u589E\u6210\u529F!"),O("table"),L()):l.ZP.error(o.errors)}))},request:P()(r()().mark(function s(){var d,o,m,M=arguments;return r()().wrap(function(u){for(;;)switch(u.prev=u.next){case 0:return d=M.length>0&&M[0]!==void 0?M[0]:{},o={pageIndex:d.current||1,pageSize:d.pageSize||10,userName:d.userName,msgInfo:d.msgInfo},u.next=4,E.n5.PagedList(o);case 4:if(m=u.sent,m.statusCode!==200){u.next=9;break}return u.abrupt("return",{data:m.data.items,success:!0,total:m.data.total});case 9:return u.abrupt("return",{data:[],success:!1,total:0});case 10:case"end":return u.stop()}},s)})),pagination:{pageSize:5},rowKey:"id",dateFormatter:"string",headerTitle:"\u5217\u8868",toolBarRender:!1})]})})}}}]);

+ 0
- 1
frontend/dist/p__manufacturing__index.35414a0e.async.js
文件差異過大導致無法顯示
查看文件


+ 0
- 1
frontend/dist/p__materials__index.7c5152c1.async.js
文件差異過大導致無法顯示
查看文件


+ 0
- 1
frontend/dist/p__order__index.bd991950.async.js
文件差異過大導致無法顯示
查看文件


+ 0
- 1
frontend/dist/p__recipe__index.5666d931.async.js
文件差異過大導致無法顯示
查看文件


+ 0
- 1
frontend/dist/p__report__material__index.37080e62.async.js 查看文件

@@ -1 +0,0 @@
"use strict";(self.webpackChunkant_design_pro=self.webpackChunkant_design_pro||[]).push([[496],{76704:function(P,r,e){var u=e(97857),a=e.n(u),d=e(12578);r.Z={PagedList:function(n){return(0,d.request)("/api/report/getproductreport",{method:"POST",data:a()({},n)})},PagedMaterialList:function(n){return(0,d.request)("/api/report/getmaterialsreport",{method:"POST",data:a()({},n)})}}},7780:function(P,r,e){e.r(r);var u=e(15009),a=e.n(u),d=e(99289),s=e.n(d),n=e(67294),c=e(15867),p=e(74254),T=e(76704),l=e(85893);r.default=function(){var D=(0,n.useRef)(),M=[{title:"materialId",dataIndex:"materialId",hideInSearch:!0,hideInTable:!0,align:"center"},{title:"\u6210\u54C1\u540D\u79F0",dataIndex:"materialName",align:"center"},{title:"\u751F\u4EA7\u6570\u91CF",dataIndex:"count",hideInSearch:!0,align:"center"},{title:"\u751F\u4EA7\u65F6\u95F4",dataIndex:"dateTime",valueType:"dateRange",hideInTable:!0,align:"center"}];return(0,l.jsx)(p.Z,{columns:M,actionRef:D,cardBordered:!0,request:s()(a()().mark(function m(){var t,E,o,i=arguments;return a()().wrap(function(_){for(;;)switch(_.prev=_.next){case 0:return t=i.length>0&&i[0]!==void 0?i[0]:{},E={endTime:t.dateTime?t.dateTime[1]:void 0,startTime:t.dateTime?t.dateTime[0]:void 0,productName:t.productName||""},_.next=4,T.Z.PagedMaterialList(E);case 4:if(o=_.sent,o.statusCode!==200){_.next=9;break}return _.abrupt("return",{data:o.data,success:!0,total:1});case 9:return _.abrupt("return",{data:[],success:!1,total:0});case 10:case"end":return _.stop()}},m)})),rowKey:"productId",pagination:{pageSize:10},dateFormatter:"string",headerTitle:"\u5DE5\u5355\u5217\u8868",toolBarRender:function(){return[(0,l.jsx)(c.ZP,{type:"primary",onClick:function(){},children:"\u65B0\u5EFA\u5DE5\u5355"},"button")]}},"myTable")}}}]);

+ 0
- 1
frontend/dist/p__report__product__index.d2d20dbd.async.js 查看文件

@@ -1 +0,0 @@
"use strict";(self.webpackChunkant_design_pro=self.webpackChunkant_design_pro||[]).push([[926],{76704:function(P,r,e){var u=e(97857),a=e.n(u),d=e(12578);r.Z={PagedList:function(n){return(0,d.request)("/api/report/getproductreport",{method:"POST",data:a()({},n)})},PagedMaterialList:function(n){return(0,d.request)("/api/report/getmaterialsreport",{method:"POST",data:a()({},n)})}}},47667:function(P,r,e){e.r(r);var u=e(15009),a=e.n(u),d=e(99289),s=e.n(d),n=e(67294),c=e(15867),p=e(74254),T=e(76704),l=e(85893);r.default=function(){var D=(0,n.useRef)(),M=[{title:"productId",dataIndex:"productId",hideInSearch:!0,hideInTable:!0,align:"center"},{title:"\u6210\u54C1\u540D\u79F0",dataIndex:"productName",align:"center"},{title:"\u751F\u4EA7\u6570\u91CF",dataIndex:"count",hideInSearch:!0,align:"center"},{title:"\u751F\u4EA7\u65F6\u95F4",dataIndex:"dateTime",valueType:"dateRange",hideInTable:!0,align:"center"}];return(0,l.jsx)(p.Z,{columns:M,actionRef:D,cardBordered:!0,request:s()(a()().mark(function m(){var t,E,o,i=arguments;return a()().wrap(function(_){for(;;)switch(_.prev=_.next){case 0:return t=i.length>0&&i[0]!==void 0?i[0]:{},E={endTime:t.dateTime?t.dateTime[1]:void 0,startTime:t.dateTime?t.dateTime[0]:void 0,productName:t.productName||""},_.next=4,T.Z.PagedList(E);case 4:if(o=_.sent,o.statusCode!==200){_.next=9;break}return _.abrupt("return",{data:o.data,success:!0,total:1});case 9:return _.abrupt("return",{data:[],success:!1,total:0});case 10:case"end":return _.stop()}},m)})),rowKey:"productId",pagination:{pageSize:10},dateFormatter:"string",headerTitle:"\u5DE5\u5355\u5217\u8868",toolBarRender:function(){return[(0,l.jsx)(c.ZP,{type:"primary",onClick:function(){},children:"\u65B0\u5EFA\u5DE5\u5355"},"button")]}},"myTable")}}}]);

+ 0
- 1
frontend/dist/p__stock__index.cca8ad01.async.js
文件差異過大導致無法顯示
查看文件


+ 0
- 1
frontend/dist/p__system__module__index.9dbdf5ff.async.js
文件差異過大導致無法顯示
查看文件


+ 0
- 1
frontend/dist/p__system__role__index.d78f1e55.async.js
文件差異過大導致無法顯示
查看文件


+ 0
- 1
frontend/dist/p__system__user__index.bc480bbe.async.js
文件差異過大導致無法顯示
查看文件


+ 0
- 1
frontend/dist/p__user__login__index.0dee4dca.async.js
文件差異過大導致無法顯示
查看文件


+ 0
- 10
frontend/dist/p__welcome__index.7ec40c75.async.js
文件差異過大導致無法顯示
查看文件


+ 0
- 1
frontend/dist/p__workInfo__index.e374edd1.async.js
文件差異過大導致無法顯示
查看文件


二進制
查看文件


+ 0
- 1
frontend/dist/t__plugin-layout__Layout.8f39539f.chunk.css 查看文件

@@ -1 +0,0 @@
@media screen and (max-width: 480px){.umi-plugin-layout-container{width:100%!important}.umi-plugin-layout-container>*{border-radius:0!important}}.umi-plugin-layout-menu .anticon{margin-right:8px}.umi-plugin-layout-menu .ant-dropdown-menu-item{min-width:160px}.umi-plugin-layout-right{display:flex!important;float:right;height:100%;margin-left:auto;overflow:hidden}.umi-plugin-layout-right .umi-plugin-layout-action{display:flex;align-items:center;height:100%;padding:0 12px;cursor:pointer;transition:all .3s}.umi-plugin-layout-right .umi-plugin-layout-action>i{color:#ffffffd9;vertical-align:middle}.umi-plugin-layout-right .umi-plugin-layout-action:hover,.umi-plugin-layout-right .umi-plugin-layout-action.opened{background:rgba(0,0,0,.025)}.umi-plugin-layout-right .umi-plugin-layout-search{padding:0 12px}.umi-plugin-layout-right .umi-plugin-layout-search:hover{background:transparent}.umi-plugin-layout-name{margin-left:8px}

+ 0
- 1
frontend/dist/t__plugin-layout__Layout.f1f97356.async.js
文件差異過大導致無法顯示
查看文件


+ 0
- 345
frontend/dist/umi.eeba41ac.js
文件差異過大導致無法顯示
查看文件


+ 44
- 1
frontend/src/api/workService.ts 查看文件

@@ -11,6 +11,30 @@ export default {
},
});
},
AddBatch(parms:any){
return request('/api/workbatch/add', {
method: 'POST',
data: {
...parms,
},
});
},
UpdateBatch(parms:any){
return request('/api/workbatch/update', {
method: 'POST',
data: {
...parms,
},
});
},
DelBatch(parms:any){
return request(`/api/workbatch/del`, {
method: 'POST',
data: {
...parms,
},
});
},
//删除
Del(parms: WorkInfoTypes.WorkInfoDelInput) {
return request(`/api/workinfo/del`, {
@@ -30,9 +54,12 @@ export default {
});
},
//列表
List() {
List(parms: WorkInfoTypes.Query) {
return request('/api/workinfo/list', {
method: 'POST',
data: {
...parms,
}
});
},
/**
@@ -48,6 +75,14 @@ export default {
},
});
},
WorkBatchPagedList(parms: WorkInfoTypes.Page) {
return request('/api/workbatch/pagedlist', {
method: 'POST',
data: {
...parms,
},
});
},
Publish(parms: any) {
return request(`/api/workinfo/publish`, {
method: 'POST',
@@ -56,6 +91,14 @@ export default {
},
});
},
publishs(parms:any){
return request(`/api/workinfo/publishs`, {
method: 'POST',
data: {
...parms,
},
});
},
UpdateStatus(parms: WorkInfoTypes.WorkInfoStatusUpdateInput) {
return request('/api/workinfo/ForcedEnd', {
method: 'POST',


+ 2
- 1
frontend/src/pages/craftInfo/pot.tsx 查看文件

@@ -392,7 +392,8 @@ const Index = () => {
]}
rowKey="step"
search={false}
pagination={false}
pagination={{ pageSize: 100 }}
params={stepparams}
request={async (params = {}) => {
if (!params.craftId) {


+ 11
- 11
frontend/src/pages/report/material/index.tsx 查看文件

@@ -73,17 +73,17 @@ export default () => {
pageSize: 10,
}}
dateFormatter="string"
headerTitle="工单列表"
toolBarRender={() => [
<Button
key="button"
type="primary"
onClick={() => {
}}
>
新建工单
</Button>,
]}
headerTitle="列表"
// toolBarRender={() => [
// <Button
// key="button"
// type="primary"
// onClick={() => {
// }}
// >
// 新建工单
// </Button>,
// ]}
/>
);


+ 11
- 11
frontend/src/pages/report/product/index.tsx 查看文件

@@ -73,17 +73,17 @@ export default () => {
pageSize: 10,
}}
dateFormatter="string"
headerTitle="工单列表"
toolBarRender={() => [
<Button
key="button"
type="primary"
onClick={() => {
}}
>
新建工单
</Button>,
]}
// headerTitle="列表"
// toolBarRender={() => [
// <Button
// key="button"
// type="primary"
// onClick={() => {
// }}
// >
// 新建工单
// </Button>,
// ]}
/>
);


+ 1
- 1
frontend/src/pages/system/user/index.tsx 查看文件

@@ -146,7 +146,7 @@ const User: React.FC = () => {
}
}}
onCancel={() => {
message.info('已取消删除');
message.info('已取消');
}}
okText="确认"
cancelText="关闭"


+ 1
- 1
frontend/src/pages/user/login/index.tsx 查看文件

@@ -48,7 +48,7 @@ const Login: React.FC = () => {
</div>
<div className={styles.login_input}>
<div className={styles.login_logo_name}>控管理系统</div>
<div className={styles.login_logo_name}>中控管理系统</div>
<Divider/>
<Form name="basic" onFinish={onUserLogin} >


+ 438
- 22
frontend/src/pages/workInfo/index.tsx 查看文件

@@ -12,6 +12,7 @@ import FinalAPI from '@/api/finalService';
import ProductLineAPI from '@/api/productlineService';
import styles from "./index.less";
import dayjs from 'dayjs'
import workService from '@/api/workService';



@@ -38,13 +39,35 @@ const Stepitems = [
description: '',
}
];

const BatchStepitems = [
{
title: '草稿',
description: '',
},
{
title: '已下发',
description: '',
},
{
title: '已接受',
description: '',
},
{
title: '已启动',
description: '',
},
{
title: '已完成',
description: '',
}
];

export default () => {


//表单
const [typeForm] = Form.useForm();
const [batchForm] = Form.useForm();
const [modelTitle, setModelTitle] = useState<string>();
const [finalData, setFinalData] = useState<MySelectType.Select[]>([])
const [lineData, setLineData] = useState<MySelectType.Select[]>([])
@@ -53,11 +76,16 @@ export default () => {
const [lineDeviceData, setLineDeviceData] = useState<any[]>([])

const [selectItemRow, setSelectItemRow] = useState<WorkInfoTypes.WorkInfoOutput>();

const [selectBatchItemRow, setSelectBatchItemRow] = useState<WorkInfoTypes.WorkInfoOutput>();
//编辑/新增弹窗
const [isModalOpen, setIsModalOpen] = useState(false);
const [isBatchModalOpen, setIsBatchModalOpen] = useState(false);
const [isModalPublishOpen, setIsModalPublishOpen] = useState(false);
const [isModalStatusOpen, setIsModalStatusOpen] = useState(false);
const actionRef = useRef<ActionType>();
const batchActionRef = useRef<ActionType>();
const columns: ProColumns<WorkInfoTypes.WorkInfoOutput>[] = [
{
title: '工单编码',
@@ -70,6 +98,7 @@ export default () => {
title: '线路名称',
dataIndex: 'lineName',
ellipsis: true,
hideInSearch: true,
align: 'center',
width: 100
},
@@ -77,6 +106,7 @@ export default () => {
title: '成品名称',
dataIndex: 'finalName',
align: 'center',
hideInSearch: true,
ellipsis: true,
},
{
@@ -141,7 +171,14 @@ export default () => {
const copyFormData = JSON.parse(JSON.stringify(record));
// copyFormData.repairDate =dayjs(record.repairDate)
console.log('record', record);

var jsonData: ProductlineTypes.ProductionlineQuery = {
lineId: record.lineId
}
ProductLineAPI.devicelist(jsonData).then((res: MyResponse.Content) => {
if (res.statusCode === 200) {
setLineDeviceData(res.data)
}
})
typeForm.setFieldsValue(copyFormData);
}}
>
@@ -205,6 +242,8 @@ export default () => {
}
ProductLineAPI.devicelist(jsonData).then((res: MyResponse.Content) => {
if (res.statusCode === 200) {
res.data.push({ deviceId : "",
deviceName :"自动(系统根据设备使用情况自动分配)" })
setLineDeviceData(res.data)
}
})
@@ -293,8 +332,218 @@ export default () => {
},
];

const batchColumns:ProColumns<any>[]=[
{
title: '批次编码',
dataIndex: 'id',
width: 160,
align: 'center',
},
{
title: '批次名称',
dataIndex: 'name',
ellipsis: true,
hideInSearch: true,
align: 'center',
width: 180
},
{
title: '批次状态',
dataIndex: 'status',
ellipsis: true,
hideInSearch: true,
align: 'center',
render(_, record) {
return <ConfigProvider
theme={{
components: {
Steps: {
navArrowColor: 'red',
descriptionMaxWidth: 50
},
},
}}
>
<Steps
progressDot
direction='horizontal'

type='default'
current={record.status}
size='small'
items={Stepitems}
/>
</ConfigProvider>
}
},
{
title: '创建时间',
dataIndex: 'createTime',
render(dom, entity, index, action, schema) {
return<>{dayjs(entity.createTime).format('YYYY-MM-DD HH:mm:ss')}</>
},
align: 'center',
valueType:'dateRange',
ellipsis: true,
},
{
title: '操作',
valueType: 'option',
key: 'option',
render: (_, record) => {
switch (record.status) {
case 0:
return (
[
<Button
key="edit"
type="primary" ghost
onClick={async () => {
// setIsModalOpen(true);
// setModelTitle('编辑信息');
// const copyFormData = JSON.parse(JSON.stringify(record));
// // copyFormData.repairDate =dayjs(record.repairDate)
// console.log('record', record);

// typeForm.setFieldsValue(copyFormData);
typeForm.resetFields();
setIsModalOpen(true);
setSelectBatchItemRow(record);
setModelTitle('新增信息');
}}
>
新增工单
</Button>,
<Popconfirm
key="workedit"
title="确定要下发全部工单吗？"
onConfirm={() => {
setSelectItemRow(record)
var jsonData: any = {
batchId: record.id
}
workService.publishs(jsonData).then((res: MyResponse.Content) => {
if (res.statusCode === 200) {
batchActionRef.current?.reload()
}
})
}}
onCancel={() => {
message.info('已取消操作');
}}
okText="确认"
cancelText="关闭"
>
<Button type="primary" ghost>批次下发</Button>
</Popconfirm>
,
<Popconfirm
key="workdel"
title="确定要删除此工单吗？"
onConfirm={() => {
const EnablejsonData: WorkInfoTypes.WorkInfoDelInput = {
id: record.id,
};
WorkInfoAPI.DelBatch(EnablejsonData).then((r) => {
if (r.statusCode === 200) {
message.success(r.statusCode === 200 ? '删除成功' : r.message);
actionRef.current?.reload();
}
});
}}
onCancel={() => {
message.info('已取消删除');
}}
okText="确认"
cancelText="关闭"
>
<Button type="primary" danger ghost>删除</Button>
</Popconfirm>,
]
)
case 1:
return (
[
<Button
key="edit"
type="primary" ghost
onClick={async () => {
// setIsModalOpen(true);
// setModelTitle('编辑信息');
// const copyFormData = JSON.parse(JSON.stringify(record));
// // copyFormData.repairDate =dayjs(record.repairDate)
// console.log('record', record);
// typeForm.setFieldsValue(copyFormData);
typeForm.resetFields();
setIsModalOpen(true);
setSelectBatchItemRow(record);
setModelTitle('新增信息');
}}
>
新增工单
</Button>,
<Popconfirm
key="workedit"
title="确定要下发全部工单吗？"
onConfirm={() => {
setSelectItemRow(record)
var jsonData: any = {
batchId: record.id
}
workService.publishs(jsonData).then((res: MyResponse.Content) => {
if (res.statusCode === 200) {
batchActionRef.current?.reload()
}
})
}}
onCancel={() => {
message.info('已取消操作');
}}
okText="确认"
cancelText="关闭"
>
<Button type="primary" ghost>继续下发</Button>
</Popconfirm>
,
<Popconfirm
key="workdel"
title="确定要删除此工单吗？"
onConfirm={() => {
const EnablejsonData: WorkInfoTypes.WorkInfoDelInput = {
id: record.id,
};
WorkInfoAPI.DelBatch(EnablejsonData).then((r) => {
if (r.statusCode === 200) {
message.success(r.statusCode === 200 ? '删除成功' : r.message);
actionRef.current?.reload();
}
});
}}
onCancel={() => {
message.info('已取消删除');
}}
okText="确认"
cancelText="关闭"
>
<Button type="primary" danger ghost>删除</Button>
</Popconfirm>,
]
)
case 2:
return []
default:
return[]
}
}
}
]

//初始化
useEffect(() => {
@@ -309,11 +558,42 @@ export default () => {
}
})
}, [])


/*
*
*提交
*
*/
const OnBatchSubmit= async (values:any)=>{
if (values.id) {
const response = await WorkInfoAPI.UpdateBatch(values);
if (response.statusCode === 200) {
message.success('修改成功');
actionRef.current?.reload();
setIsBatchModalOpen(false);
} else {
message.error(JSON.stringify(response.errors) || '修改失败');
}
} else {
const response = await WorkInfoAPI.AddBatch(values);
console.log('response', response);
if (response.statusCode === 200) {
message.success('添加成功');
actionRef.current?.reload();
setIsBatchModalOpen(false);
} else {
message.error(JSON.stringify(response.errors) || '添加失败');
}
}
}

/*
*表单提交
*/
const OnSubmit = async (values: WorkInfoTypes.WorkInfoOutput) => {

const OnSubmit = async (values: any) => {
console.log(selectBatchItemRow);
values.batchId = selectBatchItemRow?.id
if (values.id) {
const response = await WorkInfoAPI.Update(values);
if (response.statusCode === 200) {
@@ -335,22 +615,85 @@ export default () => {
}
}
};
const expandedRowRender = (data: OrderType.Info) => {
console.log('data',data);
var res = data.orderInfos;
return (
<ProTable<WorkInfoTypes.WorkInfoOutput>
key="myWorkTable"
search={false}
columns={columns}
actionRef={actionRef}
cardBordered
request={async (params = {}) => {
const jsonData: WorkInfoTypes.Page = {
pageIndex: params.current || 1,
pageSize: params.pageSize || 10,
name: params.name || '',
code: params.code,
batchId:data.id
};
const response = await WorkInfoAPI.List(jsonData);
if (response.statusCode === 200) {
return {
data: response.data,
success: true,
total: response.data.total,
};
} else {
return {
data: [],
success: false,
total: 0,
};
}
}}
rowKey="id"
pagination={false}
// {
// pageSize: 10,
// style:{margin: "auto",width:"300px",height:"50px",padding:'20px'}
// }
dateFormatter="string"
headerTitle="工单列表"
toolBarRender={false
// () => [
// <Button
// key="button"
// type="primary"
// onClick={() => {
// typeForm.resetFields();
// setIsModalOpen(true);
// setModelTitle('新增信息');
// }}
// >
// 新建工单
// </Button>,
// ]
}
/>
);
};
return (
<>
<ProTable<WorkInfoTypes.WorkInfoOutput>
key="myTable"

columns={columns}
actionRef={actionRef}
key="myBatchTable"
expandable={{ expandedRowRender,onExpand:(expanded: boolean, record: WorkInfoTypes.WorkInfoOutput)=>{
console.log('record',record);
}}}
columns={batchColumns}
actionRef={batchActionRef}
cardBordered
request={async (params = {}) => {
const jsonData: WorkInfoTypes.Page = {
pageIndex: params.current || 1,
pageSize: params.pageSize || 10,
name: params.name || '',
code: params.code
code: params.code,
batchId: ''
};
const response = await WorkInfoAPI.PagedList(jsonData);
const response = await WorkInfoAPI.WorkBatchPagedList(jsonData);
if (response.statusCode === 200) {
return {
data: response.data.items,
@@ -368,22 +711,27 @@ export default () => {
rowKey="id"
pagination={{
pageSize: 10,
showTitle:true
}}
dateFormatter="string"
headerTitle="工单列表"
toolBarRender={() => [
headerTitle="批次计划列表"
toolBarRender={
() => [
<Button
key="button"
type="primary"
onClick={() => {
typeForm.resetFields();
setIsModalOpen(true);
setModelTitle('新增信息');
batchForm.resetFields();
batchForm.setFieldValue("name",dayjs().format("YYYYMMDDHHmmss")+"批次任务")
setIsBatchModalOpen(true);
// setModelTitle('新增信息');
}}
>
新建工单
新建批次
</Button>,
]}
]
}
/>
<Modal
maskClosable={false}
@@ -437,7 +785,17 @@ export default () => {
</Select>
</Form.Item>
<Form.Item label="产线" name="lineId" rules={[{ required: true, message: '此项为必填项!' }]}>
<Select>
<Select onChange={(e)=>{
typeForm.setFieldValue("deviceId","")
var jsonData: ProductlineTypes.ProductionlineQuery = {
lineId: e
}
ProductLineAPI.devicelist(jsonData).then((res: MyResponse.Content) => {
if (res.statusCode === 200) {
setLineDeviceData(res.data)
}
})
}}>
{lineData.map((item, index) => {
return <Select.Option value={item.key} key={item.key}>
<span>{item.value}</span>
@@ -445,7 +803,21 @@ export default () => {
})}
</Select>
</Form.Item>
<Form.Item label="产量" name="number" rules={[{ required: true, message: '此项为必填项!' }]} >
<Form.Item name="deviceId" label="选择设备" initialValue={{ key: '', label: '自动(系统根据设备使用情况自动分配)', value: '' }} >
<Select >
<Select.Option value='' key=''>
<span>自动(系统根据设备使用情况自动分配)</span>
</Select.Option>
{lineDeviceData.map((item, index) => (
// <Radio key={index} value={item.deviceId}>{item.deviceName}</Radio>
<Select.Option value={item.deviceId} key={index}>
<span>{item.deviceName}</span>
</Select.Option>
))}
</Select>
</Form.Item>
<Form.Item label="产量(锅)" name="number" rules={[{ required: true, message: '此项为必填项!' }]} >
<Input />
</Form.Item>
</Form>
@@ -465,7 +837,7 @@ export default () => {
<List
size="large"
dataSource={workStatusList}
renderItem={(item, index) => (
renderItem={(item:any, index) => (
<div>
<List.Item>
<Space>
@@ -516,7 +888,7 @@ export default () => {
WorkInfoAPI.Publish(jsonData).then((r) => {
if (r.statusCode === 200) {
message.success(r.statusCode === 200 ? '下发成功' : r.message);
actionRef.current?.reload();
batchActionRef.current?.reload();
setIsModalPublishOpen(false);
}
});
@@ -527,7 +899,7 @@ export default () => {
WorkInfoAPI.Publish(jsonData).then((r) => {
if (r.statusCode === 200) {
message.success(r.statusCode === 200 ? '下发成功' : r.message);
actionRef.current?.reload();
batchActionRef.current?.reload();
setIsModalPublishOpen(false);
}
});
@@ -547,6 +919,50 @@ export default () => {
</Form>
</Card>
</Modal>

<Modal maskClosable={false}
destroyOnClose
width={800}
title="批次计划"
open={isBatchModalOpen}
onCancel={() => {
setIsBatchModalOpen(false);
}}
footer={[
<Button
key="back"
onClick={() => {
setIsBatchModalOpen(false);
}}
>
返回
</Button>,
<Button key="submit" form="batchForm" type="primary" htmlType="submit">
提交
</Button>,
]}
>
<Form
form={batchForm}
name="basic"
id="batchForm"

onFinish={OnBatchSubmit}
autoComplete="off"
>
<Form.Item label="id" name="id" hidden>
<Input />
</Form.Item>

<Form.Item
label="批次名称"
name="name"
rules={[{ required: true, message: '此项为必填项!' }]}
>
<Input defaultValue={dayjs().format("YYYYMMDDHHmmss")+"批次任务"} />
</Form.Item>
</Form>
</Modal>
</>
);
};

+ 7
- 0
frontend/src/types/WorkInfo.d.ts 查看文件

@@ -14,10 +14,17 @@
creatTime:string
status:number
}
interface Query{
name:string,
code:string,
batchId:string
}
interface Page {
pageIndex:number,
pageSize:number
name:string,
code:string,
batchId:string,
}
type BatchAdd = Info
interface WorkMaterialsRecordQueryPageInput {


Write Preview
Loading…
取消
儲存