Merge branch 'master' of http://10.2.1.24:10244/BPA_MES/PZTJ.MES

# Conflicts:
#	frontend/config/proxy.ts
#	frontend/config/routes.ts
#	frontend/dist/index.html
#	frontend/dist/t__plugin-layout__Layout.0044e113.async.js
#	frontend/dist/umi.65cd7f67.js
#	frontend/src/pages/user/login/index.tsx

.gitignore

@@ -1,3 +1,4 @@
 .vs
 obj
 bin
+Properties

backend/BPA.MES.Base.Application/BPA.MES.Base.Application.xml

@@ -747,6 +747,11 @@
             更新时间
             </summary>
         </member>
+        <member name="P:BPA.MES.Base.Application.Entitys.WorkInfoMaterialsRecordEntity.ErrorWeight">
+            <summary>
+            误差
+            </summary>
+        </member>
         <member name="T:BPA.MES.Base.Application.Entitys.DeviceProductEntity">
             <summary>
             名    称 ：设备产品 
@@ -1038,6 +1043,11 @@
             描述
             </summary>
         </member>
+        <member name="P:BPA.MES.Base.Application.Entitys.RecipeMaterialEntity.ErrorWeight">
+            <summary>
+            误差
+            </summary>
+        </member>
         <member name="T:BPA.MES.Base.Application.Entitys.RecipesGroupEntity">
             <summary>
             名    称 ：配方分组  
@@ -6745,6 +6755,11 @@
             描述
             </summary>
         </member>
+        <member name="P:BPA.MES.Base.Application.Services.RecipeMaterialDto.ErrorWeight">
+            <summary>
+            误差
+            </summary>
+        </member>
         <member name="T:BPA.MES.Base.Application.Services.RecipeMaterialAddInput">
             <summary>
             增加
@@ -7827,6 +7842,11 @@
             更新时间
             </summary>
         </member>
+        <member name="P:BPA.MES.Base.Application.Services.WorkInfoMaterialsRecordDto.ErrorWeight">
+            <summary>
+            误差重量
+            </summary>
+        </member>
         <member name="T:BPA.MES.Base.Application.Services.WorkInfoMaterialsRecordAddInput">
             <summary>
             增加

backend/BPA.MES.Base.Application/Entitys/App/WorkInfoMaterialsRecordEntity.cs

@@ -50,5 +50,9 @@
         /// </summary>
         [SugarColumn(IsNullable = true)]
         public DateTime? UpdateTime { get; set; }
+        /// <summary>
+        /// 误差
+        /// </summary>
+        public string ErrorWeight { get; set; }
     }
 }

backend/BPA.MES.Base.Application/Entitys/Base/RecipeMaterialEntity.cs

@@ -27,5 +27,10 @@
         /// </summary>
         [SugarColumn(IsNullable = true)]
         public string Describe { get; set; }
+        /// <summary>
+        /// 误差
+        /// </summary>
+        [SugarColumn(IsNullable = true)]
+        public string ErrorWeight { get; set; }
     }
 }

backend/BPA.MES.Base.Application/Services/RecipesService/Dtos/RecipeMaterialDto.cs

@@ -24,6 +24,10 @@
         /// 描述
         /// </summary>
         public string Describe { get; set; }
+        /// <summary>
+        /// 误差
+        /// </summary>
+        public string ErrorWeight { get; set; }
     }
     /// <summary>
     /// 增加

backend/BPA.MES.Base.Application/Services/WorkInfoService/Dtos/WorkInfoMaterialsRecordDto.cs

@@ -44,6 +44,10 @@
         /// 更新时间
         /// </summary>
         public DateTime? UpdateTime { get; set; }
+        /// <summary>
+        /// 误差重量
+        /// </summary>
+        public string ErrorWeight { get; set; }
     }
     /// <summary>
     /// 增加

backend/BPA.MES.Base.Application/Services/WorkInfoService/Services/WorkInfoService.cs

@@ -429,7 +429,8 @@ namespace BPA.MES.Base.Application.Services.WorkInfoService.Services
                          WorkId = input.WorkId,
                          Weight = a.Weight,
                          RecipeId = a.RecipesId,
-                         RecipeName = c.Name
+                         RecipeName = c.Name,
+                         ErrorWeight = a.ErrorWeight,
                      })
                     .ToListAsync();
 
@@ -468,6 +469,7 @@ namespace BPA.MES.Base.Application.Services.WorkInfoService.Services
                             Weight = item.Weight,
                             RecipeId = item.RecipeId,
                             RecipeName = item.RecipeName,
+                            ErrorWeight = item.ErrorWeight
                         };
                         newmateriallist.Add(itementity);
                     }

backend/BPA.MES.Base.Web.Entry/appsettings.json

@@ -10,7 +10,8 @@
   "AllowedHosts": "*",
   "ConnectionConfigs": [
     {
-      "ConnectionString": "server=10.2.1.254;Port=3306;Database=bpa_pztj_mes;Uid=root;Pwd=BapAdmin123456.;",
+      //"ConnectionString": "server=10.2.1.254;Port=3306;Database=bpa_pztj_mes;Uid=root;Pwd=BapAdmin123456.;",
+      "ConnectionString": "server=192.168.1.231;Port=3306;Database=bpa_pztj_mes;Uid=root;Pwd=pztj8127;",
       "DbType": "MySql",
       "IsAutoCloseConnection": true
     }

frontend/dist/390.6ffbfa0a.async.js

@@ -1 +0,0 @@
-"use strict";(self.webpackChunkant_design_pro=self.webpackChunkant_design_pro||[]).push([[390],{96390:function(o,n,t){t.r(n),t.d(n,{default:function(){return E}});var O=t(67294),u=t(12578),s=t(85893);function E(){var e=(0,u.useOutletContext)();return(0,s.jsx)(u.Outlet,{context:e})}}}]);

frontend/dist/CNAME

@@ -1 +0,0 @@
-preview.pro.ant.design

frontend/dist/logo.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200" version="1.1" viewBox="0 0 200 200"><title>Group 28 Copy 5</title><desc>Created with Sketch.</desc><defs><linearGradient id="linearGradient-1" x1="62.102%" x2="108.197%" y1="0%" y2="37.864%"><stop offset="0%" stop-color="#4285EB"/><stop offset="100%" stop-color="#2EC7FF"/></linearGradient><linearGradient id="linearGradient-2" x1="69.644%" x2="54.043%" y1="0%" y2="108.457%"><stop offset="0%" stop-color="#29CDFF"/><stop offset="37.86%" stop-color="#148EFF"/><stop offset="100%" stop-color="#0A60FF"/></linearGradient><linearGradient id="linearGradient-3" x1="69.691%" x2="16.723%" y1="-12.974%" y2="117.391%"><stop offset="0%" stop-color="#FA816E"/><stop offset="41.473%" stop-color="#F74A5C"/><stop offset="100%" stop-color="#F51D2C"/></linearGradient><linearGradient id="linearGradient-4" x1="68.128%" x2="30.44%" y1="-35.691%" y2="114.943%"><stop offset="0%" stop-color="#FA8E7D"/><stop offset="51.264%" stop-color="#F74A5C"/><stop offset="100%" stop-color="#F51D2C"/></linearGradient></defs><g id="Page-1" fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><g id="logo" transform="translate(-20.000000, -20.000000)"><g id="Group-28-Copy-5" transform="translate(20.000000, 20.000000)"><g id="Group-27-Copy-3"><g id="Group-25" fill-rule="nonzero"><g id="2"><path id="Shape" fill="url(#linearGradient-1)" d="M91.5880863,4.17652823 L4.17996544,91.5127728 C-0.519240605,96.2081146 -0.519240605,103.791885 4.17996544,108.487227 L91.5880863,195.823472 C96.2872923,200.518814 103.877304,200.518814 108.57651,195.823472 L145.225487,159.204632 C149.433969,154.999611 149.433969,148.181924 145.225487,143.976903 C141.017005,139.771881 134.193707,139.771881 129.985225,143.976903 L102.20193,171.737352 C101.032305,172.906015 99.2571609,172.906015 98.0875359,171.737352 L28.285908,101.993122 C27.1162831,100.824459 27.1162831,99.050775 28.285908,97.8821118 L98.0875359,28.1378823 C99.2571609,26.9692191 101.032305,26.9692191 102.20193,28.1378823 L129.985225,55.8983314 C134.193707,60.1033528 141.017005,60.1033528 145.225487,55.8983314 C149.433969,51.69331 149.433969,44.8756232 145.225487,40.6706018 L108.58055,4.05574592 C103.862049,-0.537986846 96.2692618,-0.500797906 91.5880863,4.17652823 Z"/><path id="Shape" fill="url(#linearGradient-2)" d="M91.5880863,4.17652823 L4.17996544,91.5127728 C-0.519240605,96.2081146 -0.519240605,103.791885 4.17996544,108.487227 L91.5880863,195.823472 C96.2872923,200.518814 103.877304,200.518814 108.57651,195.823472 L145.225487,159.204632 C149.433969,154.999611 149.433969,148.181924 145.225487,143.976903 C141.017005,139.771881 134.193707,139.771881 129.985225,143.976903 L102.20193,171.737352 C101.032305,172.906015 99.2571609,172.906015 98.0875359,171.737352 L28.285908,101.993122 C27.1162831,100.824459 27.1162831,99.050775 28.285908,97.8821118 L98.0875359,28.1378823 C100.999864,25.6271836 105.751642,20.541824 112.729652,19.3524487 C117.915585,18.4685261 123.585219,20.4140239 129.738554,25.1889424 C125.624663,21.0784292 118.571995,14.0340304 108.58055,4.05574592 C103.862049,-0.537986846 96.2692618,-0.500797906 91.5880863,4.17652823 Z"/></g><path id="Shape" fill="url(#linearGradient-3)" d="M153.685633,135.854579 C157.894115,140.0596 164.717412,140.0596 168.925894,135.854579 L195.959977,108.842726 C200.659183,104.147384 200.659183,96.5636133 195.960527,91.8688194 L168.690777,64.7181159 C164.472332,60.5180858 157.646868,60.5241425 153.435895,64.7316526 C149.227413,68.936674 149.227413,75.7543607 153.435895,79.9593821 L171.854035,98.3623765 C173.02366,99.5310396 173.02366,101.304724 171.854035,102.473387 L153.685633,120.626849 C149.47715,124.83187 149.47715,131.649557 153.685633,135.854579 Z"/></g><ellipse id="Combined-Shape" cx="100.519" cy="100.437" fill="url(#linearGradient-4)" rx="23.6" ry="23.581"/></g></g></g></g></svg>

frontend/dist/p__bucket__index.2314baa2.chunk.css

@@ -0,0 +1 @@
+.qrcodebox{display:flex;flex-direction:column;text-align:center;align-items:center}.btn1{display:block}

frontend/dist/p__craftInfo__pot.b10f2cd8.chunk.css

@@ -0,0 +1 @@
+.box .rowBgColor{background-color:#cfd0d1}.box .ant-table-tbody>tr.ant-table-row:hover>td{background:none!important}

frontend/dist/p__deviceProductInfo__index.835c0c6c.chunk.css

@@ -0,0 +1 @@
+.sss{color:red}

frontend/dist/p__kep__alarmLimit__index.218876c4.async.js

@@ -0,0 +1 @@
+"use strict";(self.webpackChunkant_design_pro=self.webpackChunkant_design_pro||[]).push([[776],{47870:function(J,C,a){a.r(C),a.d(C,{default:function(){return O}});var D=a(15009),f=a.n(D),E=a(99289),F=a.n(E),V=a(5574),S=a.n(V),k=a(51042),$=a(74254),d=a(40741),B=a(86738),c=a(45360),P=a(15867),G=a(5914),g=a(12096),y=a(67294),L=a(97857),I=a.n(L),h=a(12578),j={Getdatavalarmlimitpage:function(l){return(0,h.request)("/api/kepdata/getdatavalarmlimitlist",{method:"POST",data:I()({},l)})},Adddatavalarmlimit:function(l){return(0,h.request)("/api/kepdata/adddatavalarmlimit",{method:"POST",data:I()({},l)})},Updatedatavalarmlimit:function(l){return(0,h.request)("/api/kepdata/updatedatavalarmlimit",{method:"POST",data:I()({},l)})},Del:function(l){return(0,h.request)("/api/kepdata/deldatavalarmlimitlist/"+l,{method:"POST"})},getdatavData:function(){return(0,h.request)("/api/kepdata/getdatavlist",{method:"GET"})},getlogs:function(){return(0,h.request)("/api/kepdata/getlogs",{method:"GET"})}},e=a(85893),O=function(){var n=(0,y.useRef)(),l=(0,y.useState)({}),A=S()(l,2),b=A[0],U=A[1],z=(0,y.useState)(!1),R=S()(z,2),M=R[0],x=R[1],H=d.Z.useForm(),K=S()(H,1),T=K[0],N=0,W=[{title:"id",dataIndex:"id",key:"id",hideInSearch:!0},{title:"\u540D\u79F0",dataIndex:"name",key:"name"},{title:"\u4EE3\u7801",dataIndex:"code",key:"code"},{title:"\u6700\u5C0F\u533A\u95F4\u503C",dataIndex:"minLimitValue",key:"minLimitValue",hideInSearch:!0},{title:"\u6700\u5927\u533A\u95F4\u503C",dataIndex:"maxLimitValue",key:"maxLimitValue",hideInSearch:!0},{title:"\u64CD\u4F5C",valueType:"option",key:"option",render:function(o,s,v,i){return[(0,e.jsx)("a",{onClick:function(){U(s),T.setFieldsValue(s),x(!0)},children:"\u7F16\u8F91"},"editable"),(0,e.jsx)(B.Z,{title:"\u786E\u5B9A\u8981\u5220\u9664\u5417\uFF1F",onConfirm:F()(f()().mark(function t(){var m,r;return f()().wrap(function(Z){for(;;)switch(Z.prev=Z.next){case 0:return Z.next=2,j.Del(s.id);case 2:m=Z.sent,m.data?(c.ZP.success("\u5220\u9664\u6210\u529F"),(r=n.current)===null||r===void 0||r.reload()):c.ZP.error(m.msg||"\u5220\u9664\u5931\u8D25");case 4:case"end":return Z.stop()}},t)})),okText:"\u786E\u5B9A",cancelText:"\u53D6\u6D88",children:(0,e.jsx)("a",{children:"\u5220\u9664"})},"del")]}}];return(0,e.jsxs)(e.Fragment,{children:[(0,e.jsx)($.Z,{columns:W,actionRef:n,cardBordered:!0,rowKey:"id",request:F()(f()().mark(function p(){var o,s,v,i,t=arguments;return f()().wrap(function(r){for(;;)switch(r.prev=r.next){case 0:return o=t.length>0&&t[0]!==void 0?t[0]:{},s=t.length>1?t[1]:void 0,v=t.length>2?t[2]:void 0,console.log(s,v),r.next=6,j.Getdatavalarmlimitpage({pageIndex:o.current||1,pageSize:o.pageSize||10});case 6:if(i=r.sent,i.statusCode!==200){r.next=11;break}return r.abrupt("return",{data:i.data.items,success:!0,total:i.data.total});case 11:return c.ZP.error(i.errors||"\u83B7\u53D6\u5217\u8868\u5931\u8D25"),r.abrupt("return",{data:[],success:!1,total:0});case 13:case"end":return r.stop()}},p)})),search:{labelWidth:"auto"},options:{setting:{listsHeight:400}},headerTitle:"\u5927\u5C4F\u914D\u7F6E",toolBarRender:function(){return[(0,e.jsx)(P.ZP,{icon:(0,e.jsx)(k.Z,{}),onClick:function(){T.resetFields(),x(!0)},type:"primary",children:"\u65B0\u5EFA"},"button")]}}),(0,e.jsx)(G.Z,{footer:null,title:b.id===""?"\u6DFB\u52A0":"\u7F16\u8F91",open:M,onCancel:function(){return x(!1)},children:(0,e.jsxs)(d.Z,{name:"basic",form:T,onFinish:function(){var p=F()(f()().mark(function o(s){var v,i,t,m;return f()().wrap(function(u){for(;;)switch(u.prev=u.next){case 0:if(!s.id){u.next=7;break}return u.next=3,j.Updatedatavalarmlimit(s);case 3:v=u.sent,v.data?(c.ZP.success("\u66F4\u65B0\u4FE1\u606F\u6210\u529F"),x(!1),(i=n.current)===null||i===void 0||i.reload()):c.ZP.error(v.msg||"\u66F4\u65B0\u4FE1\u606F\u5931\u8D25"),u.next=11;break;case 7:return u.next=9,j.Adddatavalarmlimit(s);case 9:t=u.sent,t.data?(c.ZP.success("\u521B\u5EFA\u6210\u529F"),x(!1),(m=n.current)===null||m===void 0||m.reload()):c.ZP.error(t.msg||"\u521B\u5EFA\u5931\u8D25");case 11:case"end":return u.stop()}},o)}));return function(o){return p.apply(this,arguments)}}(),children:[(0,e.jsx)(d.Z.Item,{label:"id",name:"id",hidden:!0,children:(0,e.jsx)(g.Z,{})}),(0,e.jsx)(d.Z.Item,{label:"\u540D\u79F0",name:"name",rules:[{required:!0,message:"\u8BF7\u8F93\u5165\u540D\u79F0\uFF01"}],children:(0,e.jsx)(g.Z,{})}),(0,e.jsx)(d.Z.Item,{label:"\u4EE3\u7801",name:"code",rules:[{required:!0,message:"\u8BF7\u8F93\u5165\u4EE3\u7801\uFF01"}],children:(0,e.jsx)(g.Z,{})}),(0,e.jsx)(d.Z.Item,{label:"\u6700\u5C0F\u533A\u95F4\u503C",name:"minLimitValue",rules:[{required:!0,message:"\u8BF7\u8F93\u5165\u503C\uFF01"}],children:(0,e.jsx)(g.Z,{})}),(0,e.jsx)(d.Z.Item,{label:"\u6700\u5927\u533A\u95F4\u503C",name:"maxLimitValue",rules:[{required:!0,message:"\u8BF7\u8F93\u5165\u503C\uFF01"}],children:(0,e.jsx)(g.Z,{})}),(0,e.jsx)(d.Z.Item,{children:(0,e.jsx)(P.ZP,{type:"primary",htmlType:"submit",children:"\u786E\u5B9A"})})]})})]})}}}]);

frontend/dist/p__kep__datav__index.ace6b6cb.async.js

@@ -0,0 +1 @@
+(self.webpackChunkant_design_pro=self.webpackChunkant_design_pro||[]).push([[582],{66785:function(){},25123:function(e,t,n){"use strict";n.r(t);var a=n(67294),s=n(66785),E=n.n(s),_=n(85893),u=function(){return(0,a.useEffect)(function(){},[]),(0,_.jsx)("div",{id:"app",children:(0,_.jsx)(E(),{})})};t.default=u}}]);

frontend/dist/p__manufacturing__index.1ac7465e.chunk.css

@@ -0,0 +1 @@
+.tag___uiPjc{height:100%;width:100%}.tag_item___gsaqa{padding:0 5px 0 20px;height:72px;position:relative;cursor:pointer;display:flex;align-items:center}.tag_item_active___IY6iJ{position:absolute;width:3px;height:72px;left:0;top:0;background-color:#13c2c2}.tag_item_activeItem___aLzBU{background-color:#f7f8fa}.tag_item_editicon___qJMP7{position:absolute;right:0;top:0;bottom:0;display:flex;align-items:center}

frontend/dist/p__system__user__index.695d982e.chunk.css

@@ -0,0 +1 @@
+.tab_navbar_card___TM3Di{display:flex;align-items:center;box-shadow:0 4px 8px 1px #07111b26;height:100px;border-radius:5px;background-color:#fff}.tab_navbar_active___PLvNu{position:relative;color:#546bf0}.tab_navbar_active___PLvNu:after{position:absolute;content:"";bottom:-10px;left:0;width:70px;height:2px;background-color:#546bf0}.tab_navbar_item___FaQZn{cursor:pointer;margin:0 20px;font-size:18px}.tab_navbar_item___FaQZn:hover{transition:all .3s;color:#546bf0;transform:scale(1.1)}.log_head_card___e4OFg{padding:20px;box-shadow:0 4px 8px 1px #07111b26}.log_head_card_text____MQ82{font-size:18px;font-weight:700;margin-bottom:30px}.log_card_data___Uhh4q{padding:0 40px;display:flex;flex-wrap:wrap;justify-content:space-between}.log_data_pos___M3M6A{text-align:center;margin-bottom:20px}.log_data_number___Fh2Z2{color:#546bf0;font-size:20px;margin-bottom:5px}.log_data_text___ApoMe{font-size:16px;color:#222}.log_list_title___l0YtY{font-size:18px;font-weight:700;margin:20px 0;color:#222}.log_detail_row___B6WKE{display:flex;align-items:center;justify-content:space-between}.log_detail_item___JgTlO{display:flex;align-items:center;flex-grow:1;flex-shrink:0;border:1px solid #dedede;border-bottom:none;height:50px;box-sizing:border-box;font-size:16px}.log_detail_half___bh7yF{width:50%}.log_detail_item___JgTlO:nth-child(2){border-left:none}.log_detail_item_last___w0ouH{border-bottom:1px solid #dedede}.log_detail_title____90Pu{display:flex;align-items:center;flex-shrink:0;background-color:#fafafa;width:100px;color:#222;height:100%;border-right:1px solid #dedede;padding-left:10px}.log_detail_content___nhonA{display:flex;align-items:center;padding-left:10px}.tab_navbar_btn___yQEXt{margin-left:auto;margin-right:50px}.person_list___ZO8Fs{display:flex;flex-wrap:wrap;justify-content:space-between;padding:20px 0}.person_list_item___HkHZR{position:relative;height:300px;width:200px;display:flex;flex-direction:column;justify-content:space-around;align-items:center;box-shadow:0 2px 8px #07111b26;background-color:#fff}.person_list_btn___ZGGz9{position:absolute;bottom:10px;right:10px}.person_list_item___HkHZR .item_content___btVdX{width:150px;display:flex;align-items:center;justify-content:flex-start}

frontend/dist/pro_icon.svg

@@ -1,5 +0,0 @@
-<svg width="42" height="42" xmlns="http://www.w3.org/2000/svg">
- <g>
-  <path fill="#070707" d="m6.717392,13.773912l5.6,0c2.8,0 4.7,1.9 4.7,4.7c0,2.8 -2,4.7 -4.9,4.7l-2.5,0l0,4.3l-2.9,0l0,-13.7zm2.9,2.2l0,4.9l1.9,0c1.6,0 2.6,-0.9 2.6,-2.4c0,-1.6 -0.9,-2.4 -2.6,-2.4l-1.9,0l0,-0.1zm8.9,11.5l2.7,0l0,-5.7c0,-1.4 0.8,-2.3 2.2,-2.3c0.4,0 0.8,0.1 1,0.2l0,-2.4c-0.2,-0.1 -0.5,-0.1 -0.8,-0.1c-1.2,0 -2.1,0.7 -2.4,2l-0.1,0l0,-1.9l-2.7,0l0,10.2l0.1,0zm11.7,0.1c-3.1,0 -5,-2 -5,-5.3c0,-3.3 2,-5.3 5,-5.3s5,2 5,5.3c0,3.4 -1.9,5.3 -5,5.3zm0,-2.1c1.4,0 2.2,-1.1 2.2,-3.2c0,-2 -0.8,-3.2 -2.2,-3.2c-1.4,0 -2.2,1.2 -2.2,3.2c0,2.1 0.8,3.2 2.2,3.2z" class="st0" id="Ant-Design-Pro"/>
- </g>
-</svg>

frontend/dist/t__plugin-maxtabs__Layout.a90e0615.async.js

@@ -1 +0,0 @@
-"use strict";(self.webpackChunkant_design_pro=self.webpackChunkant_design_pro||[]).push([[558],{76666:function(_,e,n){n.r(e);var u=n(12578),t=n(85893),a=function(){var s=(0,u.useKeepOutlets)();return(0,t.jsx)(t.Fragment,{children:s})};e.default=a}}]);

frontend/dist/umi.9df7db21.css

@@ -1 +0,0 @@
-html,body,#root{height:100%;margin:0;padding:0;font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,"Apple Color Emoji","Segoe UI Emoji",Segoe UI Symbol,"Noto Color Emoji"}.colorWeak{filter:invert(80%)}.ant-layout{min-height:100vh}.ant-pro-sider.ant-layout-sider.ant-pro-sider-fixed{left:unset}canvas{display:block}.ant-pro-global-header-logo img{height:53px}body{text-rendering:optimizeLegibility;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}ul,ol{list-style:none}@media (max-width: 768px){.ant-table{width:100%;overflow-x:auto}.ant-table-thead>tr>th,.ant-table-tbody>tr>th,.ant-table-thead>tr>td,.ant-table-tbody>tr>td{white-space:pre}.ant-table-thead>tr>th>span,.ant-table-tbody>tr>th>span,.ant-table-thead>tr>td>span,.ant-table-tbody>tr>td>span{display:block}}html,body{width:100%;height:100%}input::-ms-clear,input::-ms-reveal{display:none}*,*:before,*:after{box-sizing:border-box}html{font-family:sans-serif;line-height:1.15;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-ms-overflow-style:scrollbar;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{margin:0}[tabindex="-1"]:focus{outline:none}hr{box-sizing:content-box;height:0;overflow:visible}h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:.5em;font-weight:500}p{margin-top:0;margin-bottom:1em}abbr[title],abbr[data-original-title]{text-decoration:underline;text-decoration:underline dotted;border-bottom:0;cursor:help}address{margin-bottom:1em;font-style:normal;line-height:inherit}input[type=text],input[type=password],input[type=number],textarea{-webkit-appearance:none}ol,ul,dl{margin-top:0;margin-bottom:1em}ol ol,ul ul,ol ul,ul ol{margin-bottom:0}dt{font-weight:500}dd{margin-bottom:.5em;margin-left:0}blockquote{margin:0 0 1em}dfn{font-style:italic}b,strong{font-weight:bolder}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}pre,code,kbd,samp{font-size:1em;font-family:SFMono-Regular,Consolas,Liberation Mono,Menlo,Courier,monospace}pre{margin-top:0;margin-bottom:1em;overflow:auto}figure{margin:0 0 1em}img{vertical-align:middle;border-style:none}a,area,button,[role=button],input:not([type="range"]),label,select,summary,textarea{touch-action:manipulation}table{border-collapse:collapse}caption{padding-top:.75em;padding-bottom:.3em;text-align:left;caption-side:bottom}input,button,select,optgroup,textarea{margin:0;color:inherit;font-size:inherit;font-family:inherit;line-height:inherit}button,input{overflow:visible}button,select{text-transform:none}button,html [type=button],[type=reset],[type=submit]{-webkit-appearance:button}button::-moz-focus-inner,[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner{padding:0;border-style:none}input[type=radio],input[type=checkbox]{box-sizing:border-box;padding:0}input[type=date],input[type=time],input[type=datetime-local],input[type=month]{-webkit-appearance:listbox}textarea{overflow:auto;resize:vertical}fieldset{min-width:0;margin:0;padding:0;border:0}legend{display:block;width:100%;max-width:100%;margin-bottom:.5em;padding:0;color:inherit;font-size:1.5em;line-height:inherit;white-space:normal}progress{vertical-align:baseline}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{outline-offset:-2px;-webkit-appearance:none}[type=search]::-webkit-search-cancel-button,[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{font:inherit;-webkit-appearance:button}output{display:inline-block}summary{display:list-item}template{display:none}[hidden]{display:none!important}mark{padding:.2em;background-color:#feffe6}.login_user_info___eVsKL{width:200px;text-align:center;cursor:pointer}.login_user_name___mWfUx{font-size:16px;margin-left:10px;color:#fff}

frontend/src/pages/recipe/index.tsx

@@ -184,33 +184,17 @@ const Index = () => {
         };
       },
     },
-    //  {
-    //    title: '步骤',
-    //    dataIndex: 'sort',
-    //    valueType: 'text',
-    //    tooltip: "步骤不可重复",
-    //    ellipsis: true,
-    //    formItemProps: () => {
-    //      return {
-    //        rules:  [{ required: true, message: '此项为必填项' }]
-    //        // ,
-    //        //  () => ({
-    //        //   validator(_, value) {
-    //        //     if (!materiallist[rowIndex]) {
-    //        //       if (!materiallist.find(x => x.sort === value)) {
-    //        //         return Promise.resolve();
-    //        //       }
-    //        //     } else {
-    //        //       if (materiallist.filter(x => x.sort === value && x.id !== materiallist[rowIndex].id).length < 1) {
-    //        //         return Promise.resolve();
-    //        //       }
-    //        //     }
-    //        //     return Promise.reject(new Error('已存在步骤!'));
-    //        //   },
-    //        // })
-    //      };
-    //    },
-    //  },
+    {
+      title: '重量误差(±)',
+      dataIndex: 'errorWeight',
+      valueType: 'text',
+      ellipsis: true,
+      formItemProps: () => {
+        return {
+          rules: [{ required: true, message: '此项为必填项' }],
+        };
+      },
+    },
     {
       title: '操作',
       valueType: 'option',