Xiaopeng Zhang 5 місяців тому
батько
коміт
69c819d2c8
3 змінених файлів з 27 додано та 10 видалено
  1. 11 7
      src/App2.js
  2. 1 1
      src/Qingdan3.js
  3. 15 2
      src/Service.js

+ 11 - 7
src/App2.js

@@ -281,7 +281,7 @@ import Tooltip from '@mui/material/Tooltip';
           console.log("error");
           return;
         }
-        Service.generateSingleDingeXilie(zhuanye2, acinputvalue).then(x=>{
+        Service.generateSingleDingeXilie2(zhuanye2, acinputvalue).then(x=>{
           let res = JSON.parse(x);
           let id = res['reverse'];
           if (id && id != "None") {
@@ -366,7 +366,7 @@ import Tooltip from '@mui/material/Tooltip';
     };
   
 
-    const clickCallback = (qdbm, debh) => {
+    const clickCallback = (qdbm, debh, mc) => {
       console.log('####################################zylb#####################'.concat(zylb.toString()));
        //console.log(debh);
        setExpandedQd(false);
@@ -377,7 +377,7 @@ import Tooltip from '@mui/material/Tooltip';
           suggestion = 50;
         }  
         setZhuanye(suggestion);
-          Service.generateSingleDingeXilie(suggestion, debh).then(x=>{
+          Service.generateSingleDingeXilie(suggestion, debh, mc).then(x=>{
             handleGenerateSingleDingeXilie(x);
            });
        
@@ -387,22 +387,26 @@ import Tooltip from '@mui/material/Tooltip';
           suggestion = 60;
         }   
         setZhuanye(suggestion);
-         Service.generateSingleDingeXilie(suggestion, debh).then(x=>{
+         Service.generateSingleDingeXilie(suggestion, debh, mc).then(x=>{
           handleGenerateSingleDingeXilie(x);
        });
        } else if (qdbm.startsWith("04")) {////市政
          setZhuanye(20);
-         Service.generateSingleDingeXilie(20, debh).then(x=>{
+         Service.generateSingleDingeXilie(20, debh, mc).then(x=>{
           handleGenerateSingleDingeXilie(x);
        });
        }
        else if (qdbm.startsWith("05")) {//园林
         setZhuanye(40);
-        Service.generateSingleDingeXilie(40, debh).then(x=>{
+        Service.generateSingleDingeXilie(40, debh, mc).then(x=>{
           handleGenerateSingleDingeXilie(x);
       });
        } else {
         console.log('####################################zylb#####################'.concat(zylb.toString()));
+        setZhuanye(10);
+        Service.generateSingleDingeXilie(10, debh, mc).then(x=>{
+          handleGenerateSingleDingeXilie(x);
+      });
        }
     };
 
@@ -461,7 +465,7 @@ import Tooltip from '@mui/material/Tooltip';
 
     const handleDingEEvent = (row) => {
       
-      Service.generateSingleDingeXilie(zhuanye, row.id).then(x=>{
+      Service.generateSingleDingeXilie2(zhuanye, row.id).then(x=>{
        
         let res = JSON.parse(x);
         console.log(res);

+ 1 - 1
src/Qingdan3.js

@@ -392,7 +392,7 @@ export default function Qingdan3({name, bh, bt, rgde, jxde, clde, beizhu/*后台
                console.log(debm);
                let danwei = row._row['data']['单位'];
 
-               clickCallback(qdbm, debm);/**dingercj need row key */
+               clickCallback(qdbm, debm, row._row['data']['名称']);/**dingercj need row key */
                Service.generateDingercj(name, bh,bt,qdbm, debm, danwei, row._row['data']['key']).then(x=>{
                  console.log(x);
                  let y =[];

+ 15 - 2
src/Service.js

@@ -713,8 +713,21 @@ async generateQingdanTuijian(name, bh, bt, bm) {
             return data;
         }
     }
-    async generateSingleDingeXilie(zhuanye, debh) {//清单页面展示用
-        const response = await fetch(this.ip().concat( "/singledexilie/").concat(zhuanye.toString()).concat("/").concat(debh), {
+    async generateSingleDingeXilie(zhuanye, debh, mc) {//清单页面展示用
+        const response = await fetch(this.ip().concat( "/singledexilie/").concat(zhuanye.toString()).concat("/").concat(debh).concat("/").concat(mc), {
+            method : "GET",
+           
+        });
+        if (!response.ok) {
+            //const error = await response.json();
+            console.error('error');
+        } else {
+            const data = await response.json();
+            return data;
+        }
+    }
+    async generateSingleDingeXilie2(zhuanye, debh) {//清单页面展示用
+        const response = await fetch(this.ip().concat( "/singledexilie2/").concat(zhuanye.toString()).concat("/").concat(debh), {
             method : "GET",
            
         });