finish az

src/AI.js

@@ -227,7 +227,7 @@ export default function AI() {
   };
   const VisuallyHiddenInput = styled('input')({
     display: 'none',
-    accept: ".13jz, .13jt, .jszf"
+    accept: ".13jz, .13jt, .jszf, .jscf"
     });
 
     const itemRef = React.useRef(null);

src/App2.js

@@ -282,9 +282,9 @@ function a11yProps(index) {
       });
     };
 
- const AICallback = (data, maxN) => {
+ const AICallback = (data, maxN, name, bh) => {
         setBopen(true); 
-        Service.pushTask(data, maxN, outlineLabelRef.current, navigate);
+        Service.pushTask(name, bh, data, maxN, outlineLabelRef.current, navigate);
     };
 
 

src/Djcs3.js

@@ -1064,7 +1064,7 @@ export default function Djcs3({name, bh,  beizhu, beizhuFK, clickCallback, AICal
                                                   }
                                             }
                                     }
-                                    AICallback(target[0]._row['data'], maxN);
+                                    AICallback(target[0]._row['data'], maxN, name, bh);
                             }
 
                       }}

src/Home2.js

@@ -151,7 +151,7 @@ export default function Home2() {
   };
   const VisuallyHiddenInput = styled('input')({
     display: 'none',
-    accept: ".13jz, .13jt, .jszf"
+    accept: ".13jz, .13jt, .jszf, .jscf"
     });
 
     const itemRef = React.useRef(null);
@@ -400,7 +400,7 @@ export default function Home2() {
         <AddIcon />
         <VisuallyHiddenInput
              type="file"
-             accept=".13jz, .13jt, .jszf"
+             accept=".13jz, .13jt, .jszf, .jscf"
              onChange={handleFileChange}
           />
       </Fab>

src/Qingdan3.js

@@ -1036,6 +1036,8 @@ export default function Qingdan3({name, bh, bt,  beizhu/*后台传回来的附
               if (AIClick!=null){
                  const [success, data, key] = handleAI(AIClick);
                          if(success) {
+				 if (myTable.current.element.children[1] === undefined) {}
+				 else{
                                           let former = myTable.current.element.children[1].scrollTop;
                                           let former2 = myTable.current.element.children[1].scrollLeft;
                               myTable.current.updateData(data.filter(x=>x['key'] == selectedRowKeysTableParent.current)).then(function(){
@@ -1044,6 +1046,7 @@ export default function Qingdan3({name, bh, bt,  beizhu/*后台传回来的附
                                    resetUI();
                                  });
                          }
+			 }
               }
           }, [AIClick]//AI添加定额
       );  
@@ -1473,7 +1476,7 @@ const EditableCell = ({ rowData, dataType, dataKey, onChange, ...props }) => {
 						  }
 					    }
 				    }
-				    AICallback(target[0]._row['data'], maxN);
+				    AICallback(target[0]._row['data'], maxN, name, bh);
 			    }
                       
                       }}

src/Service.js

@@ -2926,7 +2926,7 @@ class Service{
         return input;
     }
 
- async   pushTask(data, maxN, label, navigate) {
+ async   pushTask(name, bh, data, maxN, label, navigate) {
         let data2 = copy(data);
         data2['now'] = Date.now();
         const response = await fetch(this.ip().concat( "/pushtask/"), {
@@ -2943,7 +2943,9 @@ class Service{
                "dw" : data['单位'] ,
                "sl" : data['数量'],
 	       "n"  : maxN,
-	       "label": label
+	       "label": label,
+	       "name": name,
+	       "bh": bh
             } )
         });
         if (!response.ok) {

src/utils.js

@@ -586,7 +586,7 @@ const predef = {
     "rate": [
     [['人工费',10,25,75,0],['人工费',5,25,75,0],['人工费',5,25,75,0],['人工费',10,25,75,0],['人工费',4,25,75,0],['人工费',4,25,75,0],['人工费',4,25,75,0],['人工费',3,25,75,0],['人工费',7,25,75,0],['人工费',5,25,75,0],['人工费',5,25,75,0],['人工费',8,25,75,0],['人工费',12,25,75,0],['人工费',20,25,75,0],['人工费',8,25,75,0], ['人工费',12,25,75,0]],
     [
-     ['人工费+机械费', 25, 50, 0, 50],['人工费+机械费', 35, 50, 0, 50],['人工费+机械费', 45, 50, 0, 50],['人工费+机械费', 55, 50, 0, 50],['人工费+机械费', 70, 50, 0, 50],['人工费+机械费', 90, 50, 0, 50], ['人工费+机械费', 25, 50, 0, 50], ['人工费+机械费', 35, 50, 0, 50],['人工费+机械费', 45, 50, 0, 50],['人工费+机械费', 55, 50, 0, 50],['人工费+机械费', 70, 50, 0, 50],['人工费+机械费', 90, 50, 0, 50],['人工费', 33, 100, 0, 0],['人工费', 25, 100, 0, 0],['人工费', 40, 100, 0, 0],['人工费', 60, 100, 0, 0],['人工费', 15, 100, 0, 0],['人工费', 10, 100, 0, 0],['人工费', 15, 100, 0, 0],['人工费', 20, 100, 0, 0],['人工费', 25, 100, 0, 0],['人工费', 10, 100, 0, 0],['人工费', 15, 100, 0, 0],['人工费', 20, 100, 0, 0],['人工费', 25, 100, 0, 0],['人工费+机械费', 30, 50, 0, 50],['人工费+机械费', 40, 50, 0, 50],['人工费+机械费', 50, 50, 0, 50],['人工费+机械费', 60, 50, 0, 50],['人工费+机械费', 70, 50, 0, 50],['人工费+机械费', 80, 50, 0, 50],['人工费+机械费', 90, 50, 0, 50],['人工费+机械费', 100, 50, 0, 50]
+     ['人工费+机械费', 25, 50, 0, 50],['人工费+机械费', 35, 50, 0, 50],['人工费+机械费', 45, 50, 0, 50],['人工费+机械费', 55, 50, 0, 50],['人工费+机械费', 70, 50, 0, 50],['人工费+机械费', 90, 50, 0, 50], ['人工费+机械费', 25, 50, 0, 50], ['人工费+机械费', 35, 50, 0, 50],['人工费+机械费', 45, 50, 0, 50],['人工费+机械费', 55, 50, 0, 50],['人工费+机械费', 70, 50, 0, 50],['人工费+机械费', 90, 50, 0, 50],['人工费', 33, 100, 0, 0]/*4-F2*/,['人工费', 25, 100, 0, 0],['人工费', 40, 100, 0, 0],['人工费', 60, 100, 0, 0]/*5-F2*/,['人工费', 15, 100, 0, 0]/*6-F2*/,['人工费', 10, 100, 0, 0]/*7-F2*/,['人工费', 10, 100, 0, 0],['人工费', 15, 100, 0, 0],['人工费', 20, 100, 0, 0],['人工费', 25, 100, 0, 0]/*9-F2*/,['人工费', 10, 100, 0, 0],['人工费', 15, 100, 0, 0],['人工费', 20, 100, 0, 0],['人工费', 25, 100, 0, 0]/*10-F2*/,['人工费+机械费', 30, 50, 0, 50],['人工费+机械费', 40, 50, 0, 50],['人工费+机械费', 50, 50, 0, 50],['人工费+机械费', 60, 50, 0, 50],['人工费+机械费', 70, 50, 0, 50],['人工费+机械费', 80, 50, 0, 50],['人工费+机械费', 90, 50, 0, 50],['人工费+机械费', 100, 50, 0, 50]
     ],
     [
       ['人工费', 10, 100, 0, 0],['人工费', 10, 100, 0, 0],['人工费', 10, 100, 0, 0],['人工费', 10, 100, 0, 0],['人工费', 10, 100, 0, 0],['人工费', 10, 100, 0, 0],['人工费', 10, 100, 0, 0],['人工费', 10, 100, 0, 0],['人工费', 10, 100, 0, 0],['人工费', 10, 100, 0, 0],['人工费', 10, 100, 0, 0],
@@ -847,7 +847,7 @@ const predef = {
     ],
     "sm": [
      ["第1-5章取人工费*10%,其中工资占25%,材料占75%", "第6章取人工费*5%,其中工资占25%,材料占75%", "静置设备制作取人工费*5%,其中工资占25%,材料占75%", "除静置设备制作以外的取人工费*10%,其中工资占25%,材料占75%", "取人工费*4%,其中工资占25%,材料占75%.10kv以下架空线路除外", "按单位工程人工费*4%计算,其中工资占25%", "取人工费*4%,其中工资占25%", "取人工费*3%,其中工资占25%,材料占75%", "取人工费*7%,其中工资占25%,注意单独承担的麦迪管道工程，不计取脚手架费用", "取人工费*5%,其中工资占25%", "取人工费*5%,其中工资占25%,材料占75%", "刷油工程取人工费*8%,其中工资占25%,材料占75%", "防腐蚀工程取人工费*12%,其中工资占25%,材料占75%", "绝热工程取人工费*20%,其中工资占25%,材料占75%", "刷油工程取人工费的8%，其中人工工资占25%", "防腐蚀工程取人工费的12%，其中人工工资占25%"],
-     [ "取人工费+机械费的25%", "取人工费+机械费的35%", "取人工费+机械费的45%", "取人工费+机械费的55%", "取人工费+机械费的70%", "取人工费+机械费的90%", "取人工费+机械费的25%", "取人工费+机械费的35%", "取人工费+机械费的45%", "取人工费+机械费的55%", "取人工费+机械费的70%", "取人工费+机械费的90%", "按人工费的33%.操作物高度离楼地面5m以上,20m以下的电器安装工程,已考虑超高因素的定额项目除外", "按人工费*25%计算", "按40%计算", "按60%计算" , "当操作高度距离楼地面6.00m以上按人工费*15%计算" , "按人工费*10%计算", "按15%计算", "按20%计算", "按25%计算", "按人工费*10%计算", "按人工费*15%计算", "按人工费*20%计算","按人工费*25%计算", "取人工费+机械费的30%", "取人工费+机械费的40%","取人工费+机械费的50%","取人工费+机械费的60%","取人工费+机械费的70%","取人工费+机械费的80%","取人工费+机械费的90%","取人工费+机械费的100%"],
+     [ "取人工费+机械费的25%", "取人工费+机械费的35%", "取人工费+机械费的45%", "取人工费+机械费的55%", "取人工费+机械费的70%", "取人工费+机械费的90%", "取人工费+机械费的25%", "取人工费+机械费的35%", "取人工费+机械费的45%", "取人工费+机械费的55%", "取人工费+机械费的70%", "取人工费+机械费的90%", "按人工费的33%.操作物高度离楼地面5m以上,20m以下的电器安装工程,已考虑超高因素的定额项目除外"/*4-F2*/, "按人工费*25%计算", "按40%计算", "按60%计算" /*5-F2*/, "当操作高度距离楼地面6.00m以上按人工费*15%计算"/*6-F2*/ , "按人工费*10%计算"/*7-F2*/, "按10%计算","按15%计算", "按20%计算", "按25%计算", "按人工费*10%计算", "按人工费*15%计算", "按人工费*20%计算","按人工费*25%计算", "取人工费+机械费的30%", "取人工费+机械费的40%","取人工费+机械费的50%","取人工费+机械费的60%","取人工费+机械费的70%","取人工费+机械费的80%","取人工费+机械费的90%","取人工费+机械费的100%"],
     ["取人工费*10%","取人工费*10%","取人工费*10%","取人工费*10%","取人工费*10%","取人工费*10%","取人工费*10%","取人工费*10%","取人工费*10%","取人工费*10%","取人工费*10%",],
     ["取人工费*10%","取人工费*10%","取人工费*10%","取人工费*10%","取人工费*10%","取人工费*10%","取人工费*10%","取人工费*10%","取人工费*10%","取人工费*10%","取人工费*10%",],
     ["按人工费的6%计算", "按人工费的9%计算", "按人工费的12%计算", "按人工费的15%计算", "按人工费的19%计算", "按人工费的23%计算", "按人工费的26%计算", "按人工费的30%计算", "按人工费的34%计算", "按人工费的37%计算", "按人工费的43%计算", "按人工费的43%计算", "按人工费的47%计算", "按人工费的50%计算", "按人工费的54%计算", "按人工费的58%计算", "按人工费的62%计算", "按人工费的65%计算"],