@@ -21,7 +21,7 @@ const Settings: LayoutSettings & { | |||||
}, | }, | ||||
pwa: false, | pwa: false, | ||||
splitMenus:false, | splitMenus:false, | ||||
logo: './logo.png', | |||||
iconfontUrl: '', | iconfontUrl: '', | ||||
}; | }; | ||||
@@ -128,7 +128,7 @@ | |||||
{ path: '/base/bucket', name: '桶管理', component: './bucket/index' }, | { path: '/base/bucket', name: '桶管理', component: './bucket/index' }, | ||||
{ path: '/base/final', name: '成品管理', component: './final/index' }, | { path: '/base/final', name: '成品管理', component: './final/index' }, | ||||
{ path: '/base/dict', name: '数据字典', component: './dict/index' }, | { path: '/base/dict', name: '数据字典', component: './dict/index' }, | ||||
{ path: '/base/manufacturing', name: '产线设备管理', component: './manufacturing/index' }, | |||||
// { path: '/base/manufacturing', name: '产线设备管理', component: './manufacturing/index' }, | |||||
] | ] | ||||
}, | }, | ||||
@@ -0,0 +1 @@ | |||||
"use strict";(self.webpackChunkant_design_pro=self.webpackChunkant_design_pro||[]).push([[522],{90503:function(A,i,n){n.d(i,{DH:function(){return c},Xk:function(){return E},n5:function(){return p},xu:function(){return g}});var P=n(97857),d=n.n(P),t=n(12578),E={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)})}},c={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)})}},p={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)})}},g={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),E=n.n(t),c=n(13769),p=n.n(c),g=n(5574),r=n.n(g),e=n(67286),b=n(15513),j=n(27484),D=n.n(j),I=n(76239),U=n(71577),m=n(45360),T=n(67294),O=n(90503),u=n(85893),C=["type","defaultRender"],B=I.Z.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=p()(_,C);return(0,u.jsx)(B,{showTime:!0})},render:function(a,_){return(0,u.jsx)(u.Fragment,{children:_.createDate?D()(_.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:E()(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?D()(a.createDate[0]):null,endTime:a.createDate?D()(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,showSizeChanger:!1},rowKey:"id",dateFormatter:"string",headerTitle:"\u5217\u8868",toolBarRender:!1})]})})}}}]); |
@@ -0,0 +1 @@ | |||||
"use strict";(self.webpackChunkant_design_pro=self.webpackChunkant_design_pro||[]).push([[309],{90503:function(A,i,r){r.d(i,{DH:function(){return p},Xk:function(){return E},n5:function(){return c},xu:function(){return g}});var P=r(97857),d=r.n(P),t=r(12578),E={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)})}},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)})}},g={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),E=r.n(t),p=r(13769),c=r.n(p),g=r(5574),a=r.n(g),e=r(67286),b=r(15513),j=r(27484),D=r.n(j),I=r(76239),U=r(71577),m=r(45360),T=r(67294),O=r(90503),u=r(85893),C=["type","defaultRender"],B=I.Z.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,_;(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,Z=_.defaultRender,o=c()(_,C);return(0,u.jsx)(B,{showTime:!0})},render:function(n,_){return(0,u.jsx)(u.Fragment,{children:_.createDate?D()(_.createDate).format("YYYY-MM-DD HH:mm:ss"):""})},width:160}];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.DH.Update(n).then(function(_){_.statusCode===200?(m.ZP.info("\u66F4\u65B0\u6210\u529F!"),M("table"),R()):m.ZP.error(_.errors)}):O.DH.Add(n).then(function(_){_.statusCode===200?(m.ZP.info("\u65B0\u589E\u6210\u529F!"),M("table"),R()):m.ZP.error(_.errors)}))},request:E()(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?D()(n.createDate[0]):null,endTime:n.createDate?D()(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,showSizeChanger:!1},rowKey:"id",dateFormatter:"string",headerTitle:"\u5217\u8868",toolBarRender:!1})]})})}}}]); |
@@ -0,0 +1 @@ | |||||
"use strict";(self.webpackChunkant_design_pro=self.webpackChunkant_design_pro||[]).push([[675],{90503:function(A,i,r){r.d(i,{DH:function(){return p},Xk:function(){return E},n5:function(){return c},xu:function(){return g}});var P=r(97857),d=r.n(P),t=r(12578),E={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)})}},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)})}},g={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),E=r.n(t),p=r(13769),c=r.n(p),g=r(5574),a=r.n(g),e=r(67286),b=r(15513),j=r(27484),D=r.n(j),I=r(76239),U=r(71577),m=r(45360),T=r(67294),O=r(90503),u=r(85893),C=["type","defaultRender"],B=I.Z.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,Z=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?D()(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:E()(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?D()(n.createDate[0]).add(8,"h").toDate():null,endTime:n.createDate?D()(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,showSizeChanger:!1},rowKey:"id",dateFormatter:"string",headerTitle:"\u5217\u8868",toolBarRender:!1})]})})}}}]); |
@@ -0,0 +1 @@ | |||||
"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 E},xu:function(){return c}});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)})}},E={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)})}},c={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),E=n.n(p),c=n(67286),a=n(15513),e=n(27484),R=n.n(e),b=n(71577),l=n(45360),g=n(67294),D=n(90503),s=n(85893);i.default=function(){var j=(0,g.useState)("table"),S=E()(j,2),T=S[0],O=S[1],h=(0,g.useRef)(),v=(0,g.useRef)(),L=function(){var d,o;(d=h.current)===null||d===void 0||d.resetFields(),(o=v.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,s.jsx)(s.Fragment,{children:o.createDate?R()(o.createDate).format("YYYY-MM-DD HH:mm:ss"):""})}}];return(0,s.jsx)(s.Fragment,{children:(0,s.jsxs)(c.Z,{children:[T==="form"?(0,s.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,s.jsx)(a.Z,{columns:I,type:T,formRef:h,actionRef:v,onSubmit:function(d){console.log(d),T==="form"&&(d.id?D.n5.Update(d).then(function(o){o.statusCode===200?(l.ZP.info("\u66F4\u65B0\u6210\u529F!"),O("table"),L()):l.ZP.error(o.errors)}):D.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 _(){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,D.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()}},_)})),pagination:{pageSize:5,showSizeChanger:!1},rowKey:"id",dateFormatter:"string",headerTitle:"\u5217\u8868",toolBarRender:!1})]})})}}}]); |
@@ -0,0 +1 @@ | |||||
"use strict";(self.webpackChunkant_design_pro=self.webpackChunkant_design_pro||[]).push([[496],{76704:function(m,n,e){var s=e(97857),t=e.n(s),d=e(12578);n.Z={PagedList:function(r){return(0,d.request)("/api/report/getproductreport",{method:"POST",data:t()({},r)})},PagedMaterialList:function(r){return(0,d.request)("/api/report/getmaterialsreport",{method:"POST",data:t()({},r)})}}},7780:function(m,n,e){e.r(n);var s=e(15009),t=e.n(s),d=e(99289),u=e.n(d),r=e(67294),E=e(15513),P=e(76704),p=e(85893);n.default=function(){var T=(0,r.useRef)(),M=[{title:"materialId",dataIndex:"materialId",hideInSearch:!0,hideInTable:!0,align:"center"},{title:"\u539F\u6599\u540D\u79F0",dataIndex:"materialName",align:"center"},{title:"\u751F\u4EA7\u91CD\u91CF(kg)",dataIndex:"count",hideInSearch:!0,align:"center"},{title:"\u751F\u4EA7\u65F6\u95F4",dataIndex:"dateTime",valueType:"dateRange",hideInTable:!0,align:"center"}];return(0,p.jsx)(E.Z,{columns:M,actionRef:T,cardBordered:!0,request:u()(t()().mark(function c(){var _,o,i,l=arguments;return t()().wrap(function(a){for(;;)switch(a.prev=a.next){case 0:return _=l.length>0&&l[0]!==void 0?l[0]:{},o={pageIndex:_.current||1,pageSize:_.pageSize||10,endTime:_.dateTime?_.dateTime[1]:void 0,startTime:_.dateTime?_.dateTime[0]:void 0,materialName:_.materialName},a.next=4,P.Z.PagedMaterialList(o);case 4:if(i=a.sent,i.statusCode!==200){a.next=9;break}return a.abrupt("return",{data:i.data.items,success:!0,total:1});case 9:return a.abrupt("return",{data:[],success:!1,total:0});case 10:case"end":return a.stop()}},c)})),rowKey:"productId",pagination:{pageSize:10,showSizeChanger:!1},dateFormatter:"string",headerTitle:"\u5217\u8868"})}}}]); |
@@ -0,0 +1 @@ | |||||
"use strict";(self.webpackChunkant_design_pro=self.webpackChunkant_design_pro||[]).push([[926],{76704:function(m,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(m,r,e){e.r(r);var u=e(15009),a=e.n(u),d=e(99289),o=e.n(d),n=e(67294),E=e(15513),p=e(76704),P=e(85893);r.default=function(){var c=(0,n.useRef)(),T=[{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,P.jsx)(E.Z,{columns:T,actionRef:c,cardBordered:!0,request:o()(a()().mark(function M(){var _,l,s,i=arguments;return a()().wrap(function(t){for(;;)switch(t.prev=t.next){case 0:return _=i.length>0&&i[0]!==void 0?i[0]:{},l={pageIndex:_.current||1,pageSize:_.pageSize||10,endTime:_.dateTime?_.dateTime[1]:void 0,startTime:_.dateTime?_.dateTime[0]:void 0,productName:_.productName||""},t.next=4,p.Z.PagedList(l);case 4:if(s=t.sent,s.statusCode!==200){t.next=9;break}return t.abrupt("return",{data:s.data.items,success:!0,total:s.total});case 9:return t.abrupt("return",{data:[],success:!1,total:0});case 10:case"end":return t.stop()}},M)})),rowKey:"productId",pagination:{pageSize:10,showSizeChanger:!1},dateFormatter:"string"},"myTable")}}}]); |
@@ -27,6 +27,7 @@ canvas { | |||||
.ant-pro-global-header-logo img { | .ant-pro-global-header-logo img { | ||||
height: 53px; | height: 53px; | ||||
} | } | ||||
body { | body { | ||||
text-rendering: optimizeLegibility; | text-rendering: optimizeLegibility; | ||||
-webkit-font-smoothing: antialiased; | -webkit-font-smoothing: antialiased; | ||||
@@ -154,6 +154,7 @@ const AgvPoint = () => { | |||||
rowKey="id" | rowKey="id" | ||||
pagination={{ | pagination={{ | ||||
pageSize: 10, | pageSize: 10, | ||||
showSizeChanger:false | |||||
}} | }} | ||||
dateFormatter="string" | dateFormatter="string" | ||||
headerTitle="点位列表" | headerTitle="点位列表" | ||||
@@ -154,6 +154,7 @@ const AgvPoint = () => { | |||||
rowKey="id" | rowKey="id" | ||||
pagination={{ | pagination={{ | ||||
pageSize: 10, | pageSize: 10, | ||||
showSizeChanger:false | |||||
}} | }} | ||||
dateFormatter="string" | dateFormatter="string" | ||||
headerTitle="点位列表" | headerTitle="点位列表" | ||||
@@ -214,6 +214,7 @@ const Agvline = () => { | |||||
rowKey="id" | rowKey="id" | ||||
pagination={{ | pagination={{ | ||||
pageSize: 10, | pageSize: 10, | ||||
showSizeChanger:false | |||||
}} | }} | ||||
dateFormatter="string" | dateFormatter="string" | ||||
headerTitle="线路列表" | headerTitle="线路列表" | ||||
@@ -345,6 +345,7 @@ const bucket = () => { | |||||
rowKey="id" | rowKey="id" | ||||
pagination={{ | pagination={{ | ||||
pageSize: 10, | pageSize: 10, | ||||
showSizeChanger:false | |||||
}} | }} | ||||
dateFormatter="string" | dateFormatter="string" | ||||
headerTitle="桶列表" | headerTitle="桶列表" | ||||
@@ -250,6 +250,7 @@ const Index = () => { | |||||
rowKey="id" | rowKey="id" | ||||
pagination={{ | pagination={{ | ||||
pageSize: 10, | pageSize: 10, | ||||
showSizeChanger:false | |||||
}} | }} | ||||
toolBarRender={() => [ | toolBarRender={() => [ | ||||
@@ -373,6 +374,7 @@ const Index = () => { | |||||
rowKey="id" | rowKey="id" | ||||
pagination={{ | pagination={{ | ||||
pageSize: 10, | pageSize: 10, | ||||
showSizeChanger:false | |||||
}} | }} | ||||
dateFormatter="string" | dateFormatter="string" | ||||
headerTitle={stepTitle} | headerTitle={stepTitle} | ||||
@@ -220,6 +220,7 @@ const Index = () => { | |||||
rowKey="id" | rowKey="id" | ||||
pagination={{ | pagination={{ | ||||
pageSize: 10, | pageSize: 10, | ||||
showSizeChanger:false | |||||
}} | }} | ||||
toolBarRender={() => [ | toolBarRender={() => [ | ||||
@@ -392,7 +393,7 @@ const Index = () => { | |||||
]} | ]} | ||||
rowKey="step" | rowKey="step" | ||||
search={false} | search={false} | ||||
pagination={{ pageSize: 100 }} | |||||
pagination={{ pageSize: 100,showSizeChanger:false }} | |||||
params={stepparams} | params={stepparams} | ||||
request={async (params = {}) => { | request={async (params = {}) => { | ||||
@@ -172,6 +172,7 @@ export default () => { | |||||
rowKey="id" | rowKey="id" | ||||
pagination={{ | pagination={{ | ||||
pageSize: 10, | pageSize: 10, | ||||
showSizeChanger:false | |||||
}} | }} | ||||
dateFormatter="string" | dateFormatter="string" | ||||
headerTitle="设备列表" | headerTitle="设备列表" | ||||
@@ -206,6 +206,7 @@ export default () => { | |||||
}} | }} | ||||
pagination={{ | pagination={{ | ||||
pageSize: 5, | pageSize: 5, | ||||
showSizeChanger:false | |||||
}} | }} | ||||
rowKey="id" | rowKey="id" | ||||
dateFormatter="string" | dateFormatter="string" | ||||
@@ -462,6 +463,7 @@ export default () => { | |||||
}} | }} | ||||
pagination={{ | pagination={{ | ||||
pageSize: 5, | pageSize: 5, | ||||
showSizeChanger:false | |||||
}} | }} | ||||
rowKey="id" | rowKey="id" | ||||
dateFormatter="string" | dateFormatter="string" | ||||
@@ -347,6 +347,7 @@ export default () => { | |||||
}} | }} | ||||
pagination={{ | pagination={{ | ||||
pageSize: 10, | pageSize: 10, | ||||
showSizeChanger:false | |||||
}} | }} | ||||
rowKey="id" | rowKey="id" | ||||
dateFormatter="string" | dateFormatter="string" | ||||
@@ -406,6 +407,7 @@ export default () => { | |||||
}} | }} | ||||
pagination={{ | pagination={{ | ||||
pageSize: 5, | pageSize: 5, | ||||
showSizeChanger:false | |||||
}} | }} | ||||
rowKey="id" | rowKey="id" | ||||
dateFormatter="string" | dateFormatter="string" | ||||
@@ -217,6 +217,7 @@ const final = () => { | |||||
rowKey="id" | rowKey="id" | ||||
pagination={{ | pagination={{ | ||||
pageSize: 10, | pageSize: 10, | ||||
showSizeChanger:false | |||||
}} | }} | ||||
dateFormatter="string" | dateFormatter="string" | ||||
headerTitle="成品列表" | headerTitle="成品列表" | ||||
@@ -189,6 +189,7 @@ const group = () => { | |||||
rowKey="id" | rowKey="id" | ||||
pagination={{ | pagination={{ | ||||
pageSize: 10, | pageSize: 10, | ||||
showSizeChanger:false | |||||
}} | }} | ||||
dateFormatter="string" | dateFormatter="string" | ||||
headerTitle="分组列表" | headerTitle="分组列表" | ||||
@@ -132,6 +132,7 @@ export default () => { | |||||
}} | }} | ||||
pagination={{ | pagination={{ | ||||
pageSize: 5, | pageSize: 5, | ||||
showSizeChanger:false | |||||
}} | }} | ||||
rowKey="id" | rowKey="id" | ||||
dateFormatter="string" | dateFormatter="string" | ||||
@@ -116,6 +116,7 @@ export default () => { | |||||
}} | }} | ||||
pagination={{ | pagination={{ | ||||
pageSize: 5, | pageSize: 5, | ||||
showSizeChanger:false | |||||
}} | }} | ||||
rowKey="id" | rowKey="id" | ||||
dateFormatter="string" | dateFormatter="string" | ||||
@@ -114,6 +114,7 @@ export default () => { | |||||
}} | }} | ||||
pagination={{ | pagination={{ | ||||
pageSize: 5, | pageSize: 5, | ||||
showSizeChanger:false | |||||
}} | }} | ||||
rowKey="id" | rowKey="id" | ||||
dateFormatter="string" | dateFormatter="string" | ||||
@@ -117,6 +117,7 @@ export default () => { | |||||
}} | }} | ||||
pagination={{ | pagination={{ | ||||
pageSize: 5, | pageSize: 5, | ||||
showSizeChanger:false | |||||
}} | }} | ||||
rowKey="id" | rowKey="id" | ||||
dateFormatter="string" | dateFormatter="string" | ||||
@@ -536,6 +536,7 @@ const Index = () => { | |||||
rowKey="id" | rowKey="id" | ||||
pagination={{ | pagination={{ | ||||
pageSize: 4, | pageSize: 4, | ||||
showSizeChanger:false | |||||
}} | }} | ||||
dateFormatter="string" | dateFormatter="string" | ||||
headerTitle="设备列表" | headerTitle="设备列表" | ||||
@@ -592,6 +593,7 @@ const Index = () => { | |||||
rowKey="id" | rowKey="id" | ||||
pagination={{ | pagination={{ | ||||
pageSize: 4, | pageSize: 4, | ||||
showSizeChanger:false | |||||
}} | }} | ||||
dateFormatter="string" | dateFormatter="string" | ||||
headerTitle="料仓列表" | headerTitle="料仓列表" | ||||
@@ -168,6 +168,7 @@ const Index = () => { | |||||
rowKey="id" | rowKey="id" | ||||
pagination={{ | pagination={{ | ||||
pageSize: 10, | pageSize: 10, | ||||
showSizeChanger:false | |||||
}} | }} | ||||
dateFormatter="string" | dateFormatter="string" | ||||
headerTitle="物料列表" | headerTitle="物料列表" | ||||
@@ -350,6 +350,7 @@ export default () => { | |||||
rowKey="id" | rowKey="id" | ||||
pagination={{ | pagination={{ | ||||
pageSize: 10, | pageSize: 10, | ||||
showSizeChanger:false | |||||
}} | }} | ||||
dateFormatter="string" | dateFormatter="string" | ||||
headerTitle="订单列表" | headerTitle="订单列表" | ||||
@@ -483,6 +483,7 @@ const Index = () => { | |||||
rowKey="id" | rowKey="id" | ||||
pagination={{ | pagination={{ | ||||
pageSize: 10, | pageSize: 10, | ||||
showSizeChanger:false | |||||
}} | }} | ||||
dateFormatter="string" | dateFormatter="string" | ||||
headerTitle="产品列表" | headerTitle="产品列表" | ||||
@@ -256,6 +256,7 @@ const Index = () => { | |||||
rowKey="id" | rowKey="id" | ||||
pagination={{ | pagination={{ | ||||
pageSize: 10, | pageSize: 10, | ||||
showSizeChanger:false | |||||
}} | }} | ||||
dateFormatter="string" | dateFormatter="string" | ||||
headerTitle="配方列表" | headerTitle="配方列表" | ||||
@@ -19,44 +19,43 @@ export default () => { | |||||
align: 'center', | align: 'center', | ||||
}, | }, | ||||
{ | { | ||||
title: '成品名称', | |||||
title: '原料名称', | |||||
dataIndex: 'materialName', | dataIndex: 'materialName', | ||||
align: 'center', | align: 'center', | ||||
}, | }, | ||||
{ | { | ||||
title: '生产数量', | |||||
title: '生产重量(kg)', | |||||
dataIndex: 'count', | dataIndex: 'count', | ||||
hideInSearch: true, | hideInSearch: true, | ||||
align: 'center', | align: 'center', | ||||
}, | |||||
{ | |||||
title: '生产时间', | |||||
dataIndex: 'dateTime', | |||||
valueType: 'dateRange', | |||||
hideInTable:true, | |||||
align: 'center', | |||||
} | |||||
},{ | |||||
title: '生产时间', | |||||
dataIndex: 'dateTime', | |||||
valueType: 'dateRange', | |||||
hideInTable:true, | |||||
align: 'center', | |||||
} | |||||
] | ] | ||||
return ( | return ( | ||||
<ProTable<ReportType.MaterialReport> | <ProTable<ReportType.MaterialReport> | ||||
key="myTable" | |||||
columns={columns} | columns={columns} | ||||
actionRef={actionRef} | actionRef={actionRef} | ||||
cardBordered | cardBordered | ||||
request={async (params = {}) => { | request={async (params = {}) => { | ||||
const jsonData: ReportType.ReportInput = { | |||||
const jsonData: any = { | |||||
pageIndex: params.current || 1, | |||||
pageSize: params.pageSize || 10, | |||||
endTime:params.dateTime?params.dateTime[1]:undefined, | endTime:params.dateTime?params.dateTime[1]:undefined, | ||||
startTime:params.dateTime?params.dateTime[0]:undefined, | startTime:params.dateTime?params.dateTime[0]:undefined, | ||||
productName:params.productName||"" | |||||
materialName:params.materialName | |||||
}; | }; | ||||
const response = await api.PagedMaterialList(jsonData); | const response = await api.PagedMaterialList(jsonData); | ||||
if (response.statusCode === 200) { | if (response.statusCode === 200) { | ||||
return { | return { | ||||
data: response.data, | |||||
data: response.data.items, | |||||
success: true, | success: true, | ||||
total: 1, | total: 1, | ||||
}; | }; | ||||
@@ -71,6 +70,7 @@ export default () => { | |||||
rowKey="productId" | rowKey="productId" | ||||
pagination={{ | pagination={{ | ||||
pageSize: 10, | pageSize: 10, | ||||
showSizeChanger:false | |||||
}} | }} | ||||
dateFormatter="string" | dateFormatter="string" | ||||
headerTitle="列表" | headerTitle="列表" | ||||
@@ -49,16 +49,20 @@ export default () => { | |||||
cardBordered | cardBordered | ||||
request={async (params = {}) => { | request={async (params = {}) => { | ||||
const jsonData: ReportType.ReportInput = { | const jsonData: ReportType.ReportInput = { | ||||
pageIndex: params.current || 1, | |||||
pageSize: params.pageSize || 10, | |||||
endTime:params.dateTime?params.dateTime[1]:undefined, | endTime:params.dateTime?params.dateTime[1]:undefined, | ||||
startTime:params.dateTime?params.dateTime[0]:undefined, | startTime:params.dateTime?params.dateTime[0]:undefined, | ||||
productName:params.productName||"" | productName:params.productName||"" | ||||
}; | }; | ||||
const response = await ReportService.PagedList(jsonData); | const response = await ReportService.PagedList(jsonData); | ||||
if (response.statusCode === 200) { | if (response.statusCode === 200) { | ||||
return { | return { | ||||
data: response.data, | |||||
data: response.data.items, | |||||
success: true, | success: true, | ||||
total: 1, | |||||
total: response.total, | |||||
}; | }; | ||||
} else { | } else { | ||||
return { | return { | ||||
@@ -71,6 +75,7 @@ export default () => { | |||||
rowKey="productId" | rowKey="productId" | ||||
pagination={{ | pagination={{ | ||||
pageSize: 10, | pageSize: 10, | ||||
showSizeChanger:false | |||||
}} | }} | ||||
dateFormatter="string" | dateFormatter="string" | ||||
// headerTitle="列表" | // headerTitle="列表" | ||||
@@ -204,6 +204,7 @@ export default () => { | |||||
rowKey="id" | rowKey="id" | ||||
pagination={{ | pagination={{ | ||||
pageSize: 10, | pageSize: 10, | ||||
showSizeChanger:false | |||||
}} | }} | ||||
dateFormatter="string" | dateFormatter="string" | ||||
headerTitle="料仓列表" | headerTitle="料仓列表" | ||||
@@ -138,6 +138,7 @@ const Index = () => { | |||||
rowKey="id" | rowKey="id" | ||||
pagination={{ | pagination={{ | ||||
pageSize: 10, | pageSize: 10, | ||||
showSizeChanger:false | |||||
}} | }} | ||||
dateFormatter="string" | dateFormatter="string" | ||||
headerTitle="设备列表" | headerTitle="设备列表" | ||||
@@ -111,6 +111,7 @@ export default () => { | |||||
rowKey="id" | rowKey="id" | ||||
pagination={{ | pagination={{ | ||||
pageSize: 10, | pageSize: 10, | ||||
showSizeChanger:false | |||||
}} | }} | ||||
dateFormatter="string" | dateFormatter="string" | ||||
headerTitle="账号列表" | headerTitle="账号列表" | ||||
@@ -260,6 +260,7 @@ const SystemManagement: React.FC = () => { | |||||
pagination={{ | pagination={{ | ||||
current: currentPage, | current: currentPage, | ||||
pageSize: 10, | pageSize: 10, | ||||
showSizeChanger:false, | |||||
onChange: (page) => setCurrentPage(page), | onChange: (page) => setCurrentPage(page), | ||||
}} | }} | ||||
dateFormatter="string" | dateFormatter="string" | ||||
@@ -211,7 +211,8 @@ const Role: React.FC = () => { | |||||
}} | }} | ||||
rowKey="id" | rowKey="id" | ||||
pagination={{ | pagination={{ | ||||
pageSize: 10 | |||||
pageSize: 10, | |||||
showSizeChanger:false | |||||
}} | }} | ||||
dateFormatter="string" | dateFormatter="string" | ||||
headerTitle="角色列表" | headerTitle="角色列表" | ||||
@@ -36,12 +36,14 @@ const User: React.FC = () => { | |||||
title: '登录账号', | title: '登录账号', | ||||
dataIndex: 'account', | dataIndex: 'account', | ||||
key: 'account', | key: 'account', | ||||
hideInSearch:true, | |||||
}, | }, | ||||
{ | { | ||||
title: '性别', | title: '性别', | ||||
dataIndex: 'gender', | dataIndex: 'gender', | ||||
key: 'gender', | key: 'gender', | ||||
valueType: 'select', | valueType: 'select', | ||||
hideInSearch:false, | |||||
valueEnum: { | valueEnum: { | ||||
0: { | 0: { | ||||
text: '男' | text: '男' | ||||
@@ -68,6 +70,7 @@ const User: React.FC = () => { | |||||
{ | { | ||||
title: '角色', | title: '角色', | ||||
search: false, | search: false, | ||||
hideInSearch:true, | |||||
dataIndex: 'roleId', | dataIndex: 'roleId', | ||||
key: 'roleId', | key: 'roleId', | ||||
render: (_, record) => ( | render: (_, record) => ( | ||||
@@ -90,6 +93,7 @@ const User: React.FC = () => { | |||||
dataIndex: 'status', | dataIndex: 'status', | ||||
key: 'status', | key: 'status', | ||||
valueType: 'select', | valueType: 'select', | ||||
hideInSearch:false, | |||||
valueEnum: { | valueEnum: { | ||||
0: { | 0: { | ||||
text: '在职' | text: '在职' | ||||
@@ -269,6 +273,7 @@ const User: React.FC = () => { | |||||
const response = await userApi.GetUserPagedList({ | const response = await userApi.GetUserPagedList({ | ||||
name: params.name, | name: params.name, | ||||
status: params.status, | status: params.status, | ||||
pageIndex: params.current || 1, | pageIndex: params.current || 1, | ||||
pageSize: params.pageSize || 10, | pageSize: params.pageSize || 10, | ||||
gender: params.gender | gender: params.gender | ||||
@@ -290,7 +295,8 @@ const User: React.FC = () => { | |||||
}} | }} | ||||
rowKey="id" | rowKey="id" | ||||
pagination={{ | pagination={{ | ||||
pageSize: 10 | |||||
pageSize: 10, | |||||
showSizeChanger:false | |||||
}} | }} | ||||
dateFormatter="string" | dateFormatter="string" | ||||
headerTitle="员工列表" | headerTitle="员工列表" | ||||
@@ -148,6 +148,7 @@ export default () => { | |||||
}} | }} | ||||
pagination={{ | pagination={{ | ||||
pageSize: 5, | pageSize: 5, | ||||
showSizeChanger:false | |||||
}} | }} | ||||
rowKey="id" | rowKey="id" | ||||
dateFormatter="string" | dateFormatter="string" | ||||
@@ -1,16 +1,18 @@ | |||||
import { Card } from 'antd'; | import { Card } from 'antd'; | ||||
import React from 'react'; | import React from 'react'; | ||||
import dayjs from 'dayjs' | |||||
import { PageContainer } from '@ant-design/pro-components'; | import { PageContainer } from '@ant-design/pro-components'; | ||||
const Welcome: React.FC = () => { | const Welcome: React.FC = () => { | ||||
return ( | return ( | ||||
<Card | <Card | ||||
style={{ | style={{ | ||||
borderRadius: 8, | borderRadius: 8, | ||||
}} | }} | ||||
> | > | ||||
数据看板 | |||||
你好, 欢迎使用中控管理系统,今天是星期{dayjs().day()} | |||||
</Card> | </Card> | ||||
); | ); | ||||
}; | }; | ||||
@@ -1,4 +1,5 @@ | |||||
.xxx{ | .xxx{ | ||||
width: 100px; | width: 100px; | ||||
margin: auto; | margin: auto; | ||||
} | |||||
} | |||||
@@ -77,7 +77,9 @@ export default () => { | |||||
const [selectItemRow, setSelectItemRow] = useState<WorkInfoTypes.WorkInfoOutput>(); | const [selectItemRow, setSelectItemRow] = useState<WorkInfoTypes.WorkInfoOutput>(); | ||||
const [selectBatchItemRow, setSelectBatchItemRow] = useState<WorkInfoTypes.WorkInfoOutput>(); | |||||
const [selectBatchItemRow, setSelectBatchItemRow] = useState<any>(); | |||||
const [itemparams,setitemparams] = useState<any>(); | |||||
//编辑/新增弹窗 | //编辑/新增弹窗 | ||||
const [isModalOpen, setIsModalOpen] = useState(false); | const [isModalOpen, setIsModalOpen] = useState(false); | ||||
@@ -86,6 +88,8 @@ export default () => { | |||||
const [isModalStatusOpen, setIsModalStatusOpen] = useState(false); | const [isModalStatusOpen, setIsModalStatusOpen] = useState(false); | ||||
const actionRef = useRef<ActionType>(); | const actionRef = useRef<ActionType>(); | ||||
const batchActionRef = useRef<ActionType>(); | const batchActionRef = useRef<ActionType>(); | ||||
const [itemData,setItemData] = useState<WorkInfoTypes.WorkInfoOutput[]>([]); | |||||
const [itemLoading,SetItemLoading] = useState<boolean>(false) | |||||
const columns: ProColumns<WorkInfoTypes.WorkInfoOutput>[] = [ | const columns: ProColumns<WorkInfoTypes.WorkInfoOutput>[] = [ | ||||
{ | { | ||||
title: '工单编码', | title: '工单编码', | ||||
@@ -102,6 +106,17 @@ export default () => { | |||||
align: 'center', | align: 'center', | ||||
width: 100 | width: 100 | ||||
}, | }, | ||||
{ | |||||
title: '炒锅名称', | |||||
dataIndex: 'deviceName', | |||||
ellipsis: true, | |||||
hideInSearch: true, | |||||
align: 'center', | |||||
width: 100, | |||||
renderText(text, record, index, action) { | |||||
return <>{record.deviceName?record.deviceName:"自动分配"}</> | |||||
}, | |||||
}, | |||||
{ | { | ||||
title: '成品名称', | title: '成品名称', | ||||
dataIndex: 'finalName', | dataIndex: 'finalName', | ||||
@@ -117,6 +132,13 @@ export default () => { | |||||
align: 'center', | align: 'center', | ||||
width: 100 | width: 100 | ||||
}, | }, | ||||
{ | |||||
dataIndex: 'batchId', | |||||
align: 'center', | |||||
hideInSearch: true, | |||||
ellipsis: true, | |||||
hideInTable:true | |||||
}, | |||||
{ | { | ||||
title: '进度', | title: '进度', | ||||
dataIndex: 'status', | dataIndex: 'status', | ||||
@@ -195,7 +217,7 @@ export default () => { | |||||
if (r.statusCode === 200) { | if (r.statusCode === 200) { | ||||
message.success(r.statusCode === 200 ? '删除成功' : r.message); | message.success(r.statusCode === 200 ? '删除成功' : r.message); | ||||
batchActionRef.current?.reload(); | batchActionRef.current?.reload(); | ||||
actionRef.current?.reload(); | |||||
} | } | ||||
}); | }); | ||||
}} | }} | ||||
@@ -213,15 +235,17 @@ export default () => { | |||||
title="确定要下发此工单吗?" | title="确定要下发此工单吗?" | ||||
onConfirm={() => { | onConfirm={() => { | ||||
setSelectItemRow(record) | setSelectItemRow(record) | ||||
var jsonData: ProductlineTypes.ProductionlineQuery = { | |||||
lineId: record.lineId | |||||
const jsonData = { | |||||
workId: record.id! | |||||
} | } | ||||
ProductLineAPI.devicelist(jsonData).then((res: MyResponse.Content) => { | |||||
if (res.statusCode === 200) { | |||||
setLineDeviceData(res.data) | |||||
WorkInfoAPI.Publish(jsonData).then((r) => { | |||||
if (r.statusCode === 200) { | |||||
message.success(r.statusCode === 200 ? '下发成功' : r.message); | |||||
batchActionRef.current?.reload(); | |||||
} | } | ||||
}) | |||||
setIsModalPublishOpen(true) | |||||
}); | |||||
}} | }} | ||||
onCancel={() => { | onCancel={() => { | ||||
message.info('已取消操作'); | message.info('已取消操作'); | ||||
@@ -237,18 +261,20 @@ export default () => { | |||||
key="workedit" | key="workedit" | ||||
title="确定要下发此工单吗?" | title="确定要下发此工单吗?" | ||||
onConfirm={() => { | onConfirm={() => { | ||||
console.log('ssssssssddd',record); | |||||
setSelectItemRow(record) | setSelectItemRow(record) | ||||
var jsonData: ProductlineTypes.ProductionlineQuery = { | |||||
lineId: record.lineId | |||||
const jsonData = { | |||||
workId: record.id! | |||||
} | } | ||||
ProductLineAPI.devicelist(jsonData).then((res: MyResponse.Content) => { | |||||
if (res.statusCode === 200) { | |||||
res.data.push({ deviceId : "", | |||||
deviceName :"自动(系统根据设备使用情况自动分配)" }) | |||||
setLineDeviceData(res.data) | |||||
WorkInfoAPI.Publish(jsonData).then((r) => { | |||||
if (r.statusCode === 200) { | |||||
message.success(r.statusCode === 200 ? '下发成功' : r.message); | |||||
batchActionRef.current?.reload(); | |||||
} | } | ||||
}) | |||||
setIsModalPublishOpen(true) | |||||
}); | |||||
}} | }} | ||||
onCancel={() => { | onCancel={() => { | ||||
message.info('已取消操作'); | message.info('已取消操作'); | ||||
@@ -265,7 +291,8 @@ export default () => { | |||||
WorkInfoAPI.ForcedEnd(record.id).then((r) => { | WorkInfoAPI.ForcedEnd(record.id).then((r) => { | ||||
if (r.statusCode === 200) { | if (r.statusCode === 200) { | ||||
message.success(r.statusCode === 200 ? '强制结束成功' : r.message); | message.success(r.statusCode === 200 ? '强制结束成功' : r.message); | ||||
actionRef.current?.reload(); | |||||
batchActionRef.current?.reload(); | |||||
} | } | ||||
}); | }); | ||||
}} | }} | ||||
@@ -285,7 +312,7 @@ export default () => { | |||||
WorkInfoAPI.ForcedEnd(record.id).then((r) => { | WorkInfoAPI.ForcedEnd(record.id).then((r) => { | ||||
if (r.statusCode === 200) { | if (r.statusCode === 200) { | ||||
message.success(r.statusCode === 200 ? '强制结束成功' : r.message); | message.success(r.statusCode === 200 ? '强制结束成功' : r.message); | ||||
actionRef.current?.reload(); | |||||
} | } | ||||
}); | }); | ||||
}} | }} | ||||
@@ -305,7 +332,7 @@ export default () => { | |||||
WorkInfoAPI.ForcedEnd(record.id).then((r) => { | WorkInfoAPI.ForcedEnd(record.id).then((r) => { | ||||
if (r.statusCode === 200) { | if (r.statusCode === 200) { | ||||
message.success(r.statusCode === 200 ? '强制结束成功' : r.message); | message.success(r.statusCode === 200 ? '强制结束成功' : r.message); | ||||
actionRef.current?.reload(); | |||||
} | } | ||||
}); | }); | ||||
}} | }} | ||||
@@ -357,33 +384,29 @@ export default () => { | |||||
width: 80 | width: 80 | ||||
}, | }, | ||||
{ | { | ||||
title: '批次状态', | |||||
title: '状态', | |||||
dataIndex: 'status', | dataIndex: 'status', | ||||
ellipsis: true, | ellipsis: true, | ||||
hideInSearch: true, | hideInSearch: true, | ||||
align: 'center', | 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={BatchStepitems} | |||||
/> | |||||
</ConfigProvider> | |||||
} | |||||
valueEnum: { | |||||
0: { | |||||
text: '草稿' | |||||
}, | |||||
1: { | |||||
text: '已下发', | |||||
}, | |||||
2: { | |||||
text: '已接受', | |||||
}, | |||||
3: { | |||||
text: '已启动', | |||||
}, | |||||
4: { | |||||
text: '已完成', | |||||
} | |||||
}, | |||||
width: 180 | |||||
}, | }, | ||||
{ | { | ||||
title: '创建时间', | title: '创建时间', | ||||
@@ -418,8 +441,13 @@ export default () => { | |||||
// typeForm.setFieldsValue(copyFormData); | // typeForm.setFieldsValue(copyFormData); | ||||
typeForm.resetFields(); | typeForm.resetFields(); | ||||
typeForm.setFieldValue("number","1") | |||||
setIsModalOpen(true); | setIsModalOpen(true); | ||||
setSelectBatchItemRow(record); | setSelectBatchItemRow(record); | ||||
setitemparams({batchId:record.id}) | |||||
setExpandedRowKeys((prevKeys:any) => { | |||||
return [record.id]; // 假设record.id是唯一key | |||||
}); | |||||
setModelTitle('新增信息'); | setModelTitle('新增信息'); | ||||
}} | }} | ||||
> | > | ||||
@@ -569,6 +597,18 @@ export default () => { | |||||
}, []) | }, []) | ||||
// const GetItemData=async (jsonData:any)=>{ | |||||
// setItemData([]) | |||||
// SetItemLoading(true) | |||||
// const response = await WorkInfoAPI.List(jsonData); | |||||
// if (response.statusCode === 200) { | |||||
// setItemData( response.data) | |||||
// } else { | |||||
// setItemData([]) | |||||
// } | |||||
// SetItemLoading(false) | |||||
// } | |||||
/* | /* | ||||
* | * | ||||
*提交 | *提交 | ||||
@@ -590,6 +630,7 @@ const OnBatchSubmit= async (values:any)=>{ | |||||
if (response.statusCode === 200) { | if (response.statusCode === 200) { | ||||
message.success('添加成功'); | message.success('添加成功'); | ||||
batchActionRef.current?.reload(); | batchActionRef.current?.reload(); | ||||
setIsBatchModalOpen(false); | setIsBatchModalOpen(false); | ||||
} else { | } else { | ||||
message.error(JSON.stringify(response.errors) || '添加失败'); | message.error(JSON.stringify(response.errors) || '添加失败'); | ||||
@@ -607,7 +648,7 @@ const OnBatchSubmit= async (values:any)=>{ | |||||
const response = await WorkInfoAPI.Update(values); | const response = await WorkInfoAPI.Update(values); | ||||
if (response.statusCode === 200) { | if (response.statusCode === 200) { | ||||
message.success('修改成功'); | message.success('修改成功'); | ||||
actionRef.current?.reload(); | |||||
setIsModalOpen(false); | setIsModalOpen(false); | ||||
} else { | } else { | ||||
message.error(JSON.stringify(response.errors) || '修改失败'); | message.error(JSON.stringify(response.errors) || '修改失败'); | ||||
@@ -618,46 +659,56 @@ const OnBatchSubmit= async (values:any)=>{ | |||||
if (response.statusCode === 200) { | if (response.statusCode === 200) { | ||||
message.success('添加成功'); | message.success('添加成功'); | ||||
batchActionRef.current?.reload(); | batchActionRef.current?.reload(); | ||||
actionRef.current?.reload(); | |||||
setIsModalOpen(false); | setIsModalOpen(false); | ||||
} else { | } else { | ||||
message.error(JSON.stringify(response.errors) || '添加失败'); | message.error(JSON.stringify(response.errors) || '添加失败'); | ||||
} | } | ||||
} | } | ||||
}; | }; | ||||
const [expandedRowKeys, setExpandedRowKeys] = useState<any>([]); | |||||
const expandedRowRender = (data: OrderType.Info) => { | const expandedRowRender = (data: OrderType.Info) => { | ||||
console.log('data',data); | |||||
var res = data.orderInfos; | |||||
console.log('data',data.workList); | |||||
var res = data.workList; | |||||
// setitemparams({batchId:data.id}) | |||||
return ( | return ( | ||||
<ProTable<WorkInfoTypes.WorkInfoOutput> | <ProTable<WorkInfoTypes.WorkInfoOutput> | ||||
key="myWorkTable" | |||||
search={false} | search={false} | ||||
columns={columns} | columns={columns} | ||||
actionRef={actionRef} | actionRef={actionRef} | ||||
cardBordered | 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, | |||||
}; | |||||
} | |||||
style={{ | |||||
background: "burlywood" | |||||
}} | }} | ||||
loading={itemLoading} | |||||
params={itemparams} | |||||
dataSource={res} | |||||
// request={async (params = { | |||||
// }) => { | |||||
// console.log('sssss',params); | |||||
// const jsonData: WorkInfoTypes.Page = { | |||||
// pageIndex: params.current || 1, | |||||
// pageSize: params.pageSize || 10, | |||||
// name: params.name || '', | |||||
// code: params.code, | |||||
// batchId:params.batchId | |||||
// }; | |||||
// 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" | rowKey="id" | ||||
pagination={false} | pagination={false} | ||||
// { | // { | ||||
@@ -688,11 +739,24 @@ const OnBatchSubmit= async (values:any)=>{ | |||||
<> | <> | ||||
<ProTable<WorkInfoTypes.WorkInfoOutput> | <ProTable<WorkInfoTypes.WorkInfoOutput> | ||||
key="myBatchTable" | key="myBatchTable" | ||||
expandable={{ expandedRowRender,onExpand:(expanded: boolean, record: WorkInfoTypes.WorkInfoOutput)=>{ | |||||
console.log('record',record); | |||||
}}} | |||||
expandable={{expandedRowRender,expandedRowKeys:expandedRowKeys, onExpand:(expanded: boolean, record: WorkInfoTypes.WorkInfoOutput)=>{ | |||||
// if (expanded) { | |||||
// const jsonData = { | |||||
// batchId:record.id | |||||
// }; | |||||
// GetItemData(jsonData) | |||||
// setitemparams({batchId:record.id}) | |||||
// } | |||||
// 如果当前正在展开,且已有其他嵌套数据展开,则收起它们 | |||||
setExpandedRowKeys((prevKeys:any) => { | |||||
if (expanded) { | |||||
return [record.id]; // 假设record.id是唯一key | |||||
} | |||||
return []; // 如果不展开,清空数组 | |||||
}); | |||||
}}} | |||||
columns={batchColumns} | columns={batchColumns} | ||||
actionRef={batchActionRef} | actionRef={batchActionRef} | ||||
cardBordered | cardBordered | ||||
@@ -706,6 +770,7 @@ const OnBatchSubmit= async (values:any)=>{ | |||||
}; | }; | ||||
const response = await WorkInfoAPI.WorkBatchPagedList(jsonData); | const response = await WorkInfoAPI.WorkBatchPagedList(jsonData); | ||||
if (response.statusCode === 200) { | if (response.statusCode === 200) { | ||||
return { | return { | ||||
data: response.data.items, | data: response.data.items, | ||||
success: true, | success: true, | ||||
@@ -722,8 +787,8 @@ const OnBatchSubmit= async (values:any)=>{ | |||||
rowKey="id" | rowKey="id" | ||||
pagination={{ | pagination={{ | ||||
pageSize: 10, | pageSize: 10, | ||||
showTitle:true | |||||
showTitle:true, | |||||
showSizeChanger:false | |||||
}} | }} | ||||
dateFormatter="string" | dateFormatter="string" | ||||
headerTitle="批次计划列表" | headerTitle="批次计划列表" | ||||
@@ -814,14 +879,10 @@ const OnBatchSubmit= async (values:any)=>{ | |||||
})} | })} | ||||
</Select> | </Select> | ||||
</Form.Item> | </Form.Item> | ||||
<Form.Item name="deviceId" label="选择设备" initialValue={{ key: '', label: '自动(系统根据设备使用情况自动分配)', value: '' }} > | |||||
<Select > | |||||
<Select.Option value='' key=''> | |||||
<span>自动(系统根据设备使用情况自动分配)</span> | |||||
</Select.Option> | |||||
<Form.Item name="deviceId" label="选择设备" rules={[{ required: true, message: '此项为必选项!' }]}> | |||||
<Select placeholder="请选择设备" > | |||||
{lineDeviceData.map((item, index) => ( | {lineDeviceData.map((item, index) => ( | ||||
// <Radio key={index} value={item.deviceId}>{item.deviceName}</Radio> | // <Radio key={index} value={item.deviceId}>{item.deviceName}</Radio> | ||||
<Select.Option value={item.deviceId} key={index}> | <Select.Option value={item.deviceId} key={index}> | ||||
<span>{item.deviceName}</span> | <span>{item.deviceName}</span> | ||||
</Select.Option> | </Select.Option> | ||||
@@ -829,7 +890,7 @@ const OnBatchSubmit= async (values:any)=>{ | |||||
</Select> | </Select> | ||||
</Form.Item> | </Form.Item> | ||||
<Form.Item label="产量(锅)" name="number" rules={[{ required: true, message: '此项为必填项!' }]} > | <Form.Item label="产量(锅)" name="number" rules={[{ required: true, message: '此项为必填项!' }]} > | ||||
<Input /> | |||||
<Input type='number' min={1} /> | |||||
</Form.Item> | </Form.Item> | ||||
</Form> | </Form> | ||||
</Modal> | </Modal> | ||||
@@ -900,6 +961,7 @@ const OnBatchSubmit= async (values:any)=>{ | |||||
if (r.statusCode === 200) { | if (r.statusCode === 200) { | ||||
message.success(r.statusCode === 200 ? '下发成功' : r.message); | message.success(r.statusCode === 200 ? '下发成功' : r.message); | ||||
batchActionRef.current?.reload(); | batchActionRef.current?.reload(); | ||||
setIsModalPublishOpen(false); | setIsModalPublishOpen(false); | ||||
} | } | ||||
}); | }); | ||||
@@ -911,6 +973,8 @@ const OnBatchSubmit= async (values:any)=>{ | |||||
if (r.statusCode === 200) { | if (r.statusCode === 200) { | ||||
message.success(r.statusCode === 200 ? '下发成功' : r.message); | message.success(r.statusCode === 200 ? '下发成功' : r.message); | ||||
batchActionRef.current?.reload(); | batchActionRef.current?.reload(); | ||||
// GetItemData({batchId:selectBatchItemRow?.id}); | |||||
setIsModalPublishOpen(false); | setIsModalPublishOpen(false); | ||||
} | } | ||||
}); | }); | ||||
@@ -4,7 +4,9 @@ declare namespace ReportType { | |||||
interface ReportInput { | interface ReportInput { | ||||
productName: string, | productName: string, | ||||
startTime?:string, | startTime?:string, | ||||
endTime?:string | |||||
endTime?:string, | |||||
pageIndex:number, | |||||
pageSize:number | |||||
} | } | ||||
// 产品统计 | // 产品统计 | ||||
@@ -77,6 +77,7 @@ | |||||
* @interface WorkInfoOutput | * @interface WorkInfoOutput | ||||
*/ | */ | ||||
export interface WorkInfoOutput extends Info { | export interface WorkInfoOutput extends Info { | ||||
key(key: any); | |||||
id:string, | id:string, | ||||
} | } | ||||
/** | /** | ||||