From 5e915675a542198faaa6c218624f1e84686c94b3 Mon Sep 17 00:00:00 2001
From: xingyongchun <xing.yongchun@free-sun.com.cn>
Date: Thu, 28 Jul 2022 21:13:30 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fillion/components/bridgeTable.js         | 21 +++----------
 .../fillion/components/highwaysTable.js       | 18 +----------
 .../sections/fillion/components/inforTable.js | 21 +++----------
 .../fillion/components/operationalTable.js    | 30 +++++++------------
 .../fillion/components/publicTable.js         | 16 ----------
 .../fillion/components/transportationTable.js | 30 ++++++++-----------
 .../src/sections/fillion/containers/bridge.js | 28 ++++++++---------
 .../sections/fillion/containers/highways.js   | 23 +++++---------
 .../src/sections/fillion/containers/infor.js  | 16 +++-------
 .../fillion/containers/operational.js         | 28 ++++++++---------
 .../fillion/containers/promotional.js         | 26 ++++++----------
 .../src/sections/fillion/containers/public.js | 24 +++++----------
 .../fillion/containers/transportation.js      | 30 +++++++++----------
 13 files changed, 99 insertions(+), 212 deletions(-)

diff --git a/web/client/src/sections/fillion/components/bridgeTable.js b/web/client/src/sections/fillion/components/bridgeTable.js
index 2f46b175..cf2e53a8 100644
--- a/web/client/src/sections/fillion/components/bridgeTable.js
+++ b/web/client/src/sections/fillion/components/bridgeTable.js
@@ -24,6 +24,7 @@ const BrideTable = (props) => {
     const [recortd, setRecortd] = useState()
     const [whichofits, setWhichofits] = useState('qiaoliang')
     const [delet, setDelet] = useState()
+    const [differentiate, setDifferentiate] = useState('bridge')
 
     const ref = useRef()
     useEffect(() => { ref.current.reload() }, [whichofits, delet])
@@ -1750,22 +1751,6 @@ const BrideTable = (props) => {
             setModalRecord(null);
         }
     }
-    //批量导出
-    const exports = (ids, counts) => {
-        // console.log(user);
-        let reportIds = [];
-        if (ids.length)
-            reportIds = ids
-        else
-            reportIds = (counts || {}).ids || [];
-        superagent.post('/_report/http')
-            .send({ id: reportIds.map(i => Number(i)) }).end((err, res) => {
-                const resTextIs = res.text.split('/').pop()
-                window.open(
-                    '/_api/' +
-                    `attachments?src=files/${resTextIs}&filename=${encodeURIComponent(resTextIs)}&token=${user.token}`)
-            })
-    }
     return (
         <Spin spinning={false}>
             <div className='protable-transpor'>
@@ -1782,12 +1767,14 @@ const BrideTable = (props) => {
                                     key: 'tab1',
                                     label: <span onClick={() => {
                                         setWhichofits('qiaoliang')
+                                        setDifferentiate('bridge')
                                     }}>桥梁{activeKey === 'tab1'}</span>,
                                 },
                                 {
                                     key: 'tab2',
                                     label: <span onClick={() => {
                                         setWhichofits('gongcheng')
+                                        setDifferentiate('project')
                                     }}>工程一览{activeKey === 'tab2'}</span>,
                                 },
 
@@ -1844,7 +1831,7 @@ const BrideTable = (props) => {
                         defaultCollapsed: false,
                         optionRender: (searchConfig, formProps, dom) => [
                             ...dom.reverse(),
-                            <Popconfirm title="确认导出?" onConfirm={() => { props.exports(rowSelected, counts) }}>
+                            <Popconfirm title="确认导出?" onConfirm={() => { props.exports(rowSelected,differentiate) }}>
                                 <Button
                                 >
                                     导出
diff --git a/web/client/src/sections/fillion/components/highwaysTable.js b/web/client/src/sections/fillion/components/highwaysTable.js
index f27d6124..a8d062f4 100644
--- a/web/client/src/sections/fillion/components/highwaysTable.js
+++ b/web/client/src/sections/fillion/components/highwaysTable.js
@@ -29,23 +29,7 @@ const hightModal = (type, record) => {
     } else {
         setModalRecord(null);
     }
-}  
- //批量导出
-const exports = (ids, counts) => {
-    // console.log(user);
-    let reportIds = [];
-    if (ids.length)
-        reportIds = ids
-    else
-        reportIds = (counts || {}).ids || [];
-    superagent.post('/_report/http')
-        .send({ id: reportIds.map(i => Number(i)) }).end((err, res) => {
-            const resTextIs = res.text.split('/').pop()
-            window.open(
-                '/_api/' +
-                `attachments?src=files/${resTextIs}&filename=${encodeURIComponent(resTextIs)}&token=${user.token}`)
-        })
-}
+} 
     const columns =
         [
             {
diff --git a/web/client/src/sections/fillion/components/inforTable.js b/web/client/src/sections/fillion/components/inforTable.js
index 7733ec5b..ca94c537 100644
--- a/web/client/src/sections/fillion/components/inforTable.js
+++ b/web/client/src/sections/fillion/components/inforTable.js
@@ -35,22 +35,6 @@ const InForTable = (props) => {
             setModalRecord(null);
         }
     }
-    //批量导出
-    const exports = (ids, counts) => {
-        // console.log(user);
-        let reportIds = [];
-        if (ids.length)
-            reportIds = ids
-        else
-            reportIds = (counts || {}).ids || [];
-        superagent.post('/_report/http')
-            .send({ id: reportIds.map(i => Number(i)) }).end((err, res) => {
-                const resTextIs = res.text.split('/').pop()
-                window.open(
-                    '/_api/' +
-                    `attachments?src=files/${resTextIs}&filename=${encodeURIComponent(resTextIs)}&token=${user.token}`)
-            })
-    }
     const deldata = (id) => { // 治超删除
         const query = {
             overspeedId: id
@@ -463,7 +447,10 @@ const InForTable = (props) => {
                         defaultCollapsed: false,
                         optionRender: (searchConfig, formProps, dom) => [
                             ...dom.reverse(),
-                            <Popconfirm title="确认导出?" onConfirm={() => { props.exports(rowSelected, counts) }}>
+                            <Popconfirm title="确认导出?" onConfirm={() => { 
+                                console.log(rowSelected)
+
+                                props.exports(rowSelected, counts) }}>
                                 <Button
                                 >
                                     导出
diff --git a/web/client/src/sections/fillion/components/operationalTable.js b/web/client/src/sections/fillion/components/operationalTable.js
index 259f39de..5e88d600 100644
--- a/web/client/src/sections/fillion/components/operationalTable.js
+++ b/web/client/src/sections/fillion/components/operationalTable.js
@@ -22,7 +22,9 @@ const OperaTionalTable = (props) => {
     const [recortd, setRecortd] = useState()
     const [rewkeys, setRewkeys] = useState('keyun')
     const [delet, setDelet] = useState()
-    // const [, setDelet] = useState()
+    const [differentiate, setDifferentiate] = useState()
+    const [genre, setGenre] = useState()
+
 
     const ref = useRef()
     useEffect(() => { ref.current.reload() }, [rewkeys, activeKey, delet])
@@ -63,22 +65,6 @@ const OperaTionalTable = (props) => {
             setModalRecord(null);
         }
     }
-    //批量导出
-    const exports = (ids, counts) => {
-        // console.log(user);
-        let reportIds = [];
-        if (ids.length)
-            reportIds = ids
-        else
-            reportIds = (counts || {}).ids || [];
-        superagent.post('/_report/http')
-            .send({ id: reportIds.map(i => Number(i)) }).end((err, res) => {
-                const resTextIs = res.text.split('/').pop()
-                window.open(
-                    '/_api/' +
-                    `attachments?src=files/${resTextIs}&filename=${encodeURIComponent(resTextIs)}&token=${user.token}`)
-            })
-    }
     const columns = {
         tab1: [
             {
@@ -1881,6 +1867,8 @@ const OperaTionalTable = (props) => {
                                     label: <span onClick={() => {
                                         {
                                             setRewkeys('chuzu')
+                                            setDifferentiate('vehicle')
+                                            setGenre('出租车')
                                         }
                                     }}>出租车{activeKey === 'tab2'}</span>,
 
@@ -1890,13 +1878,17 @@ const OperaTionalTable = (props) => {
                                     label: <span onClick={() => {
                                         {
                                             setRewkeys('weihuo')
+                                            setDifferentiate('vehicle')
+                                            setGenre('危货')
+
                                         }
                                     }}>危险货运{activeKey === 'tab3'}</span>,
 
                                 }, {
                                     key: 'tab4',
                                     label: <span onClick={() => {
-                                        setRewkeys('yehu')
+                                            setDifferentiate('business')
+                                            setRewkeys('yehu')
                                     }}>业户{activeKey === 'tab4'}</span>,
 
                                 },
@@ -1974,7 +1966,7 @@ const OperaTionalTable = (props) => {
                         defaultCollapsed: false,
                         optionRender: (searchConfig, formProps, dom) => [
                             ...dom.reverse(),
-                            ['tab2', 'tab3', 'tab4'].includes(activeKey) ? <Popconfirm title="确认导出?" onConfirm={() => { props.exports(rowSelected, counts) }}>
+                            ['tab2', 'tab3', 'tab4'].includes(activeKey) ? <Popconfirm title="确认导出?" onConfirm={() => { props.exports(rowSelected,differentiate,genre) }}>
                                 <Button
                                 >
                                     导出
diff --git a/web/client/src/sections/fillion/components/publicTable.js b/web/client/src/sections/fillion/components/publicTable.js
index 1b1d4a8c..23d5b009 100644
--- a/web/client/src/sections/fillion/components/publicTable.js
+++ b/web/client/src/sections/fillion/components/publicTable.js
@@ -51,22 +51,6 @@ const PublicTable = (props) => {
             setModalRecord(null);
         }
     }
-    //批量导出
-    const exports = (ids, counts) => {
-        // console.log(user);
-        let reportIds = [];
-        if (ids.length)
-            reportIds = ids
-        else
-            reportIds = (counts || {}).ids || [];
-        superagent.post('/_report/http')
-            .send({ id: reportIds.map(i => Number(i)) }).end((err, res) => {
-                const resTextIs = res.text.split('/').pop()
-                window.open(
-                    '/_api/' +
-                    `attachments?src=files/${resTextIs}&filename=${encodeURIComponent(resTextIs)}&token=${user.token}`)
-            })
-    }
     const deldata = (id) => { // 线路
         const query = {
             lineId: id
diff --git a/web/client/src/sections/fillion/components/transportationTable.js b/web/client/src/sections/fillion/components/transportationTable.js
index 9bd358e5..daca6ac0 100644
--- a/web/client/src/sections/fillion/components/transportationTable.js
+++ b/web/client/src/sections/fillion/components/transportationTable.js
@@ -21,6 +21,8 @@ const TransporTationTable = (props) => {
     const [recortd, setRecortd] = useState()
     const [whichofits, setWhichofits] = useState('县')
     const [delet, setDelet] = useState()
+    const [differentiate, setDifferentiate] = useState('road')
+    const [grade, setGrade] = useState('县')
     const ref = useRef()
     useEffect(() => { ref.current.reload() }, [whichofits, delet])
     //打开弹窗
@@ -60,22 +62,6 @@ const TransporTationTable = (props) => {
             setDelet(res)
         })
     }
-    //批量导出
-    const exports = (ids, counts) => {
-        // console.log(user);
-        let reportIds = [];
-        if (ids.length)
-            reportIds = ids
-        else
-            reportIds = (counts || {}).ids || [];
-        superagent.post('/_report/http')
-            .send({ id: reportIds.map(i => Number(i)) }).end((err, res) => {
-                const resTextIs = res.text.split('/').pop()
-                window.open(
-                    '/_api/' +
-                    `attachments?src=files/${resTextIs}&filename=${encodeURIComponent(resTextIs)}&token=${user.token}`)
-            })
-    }
     const columns = {
         tab1: [
             {
@@ -3750,23 +3736,33 @@ const TransporTationTable = (props) => {
                                     key: 'tab1',
                                     label: <span onClick={() => {
                                         setWhichofits('县')
+                                        setDifferentiate('road')
+                                        setGrade('县')
                                     }}>县道{activeKey === 'tab1'}</span>,
                                 },
                                 {
                                     key: 'tab2',
                                     label: <span onClick={() => {
                                         setWhichofits('乡')
+                                        setGrade('乡')
+                                        setDifferentiate('road')
+
                                     }}>乡道{activeKey === 'tab2'}</span>,
                                 },
                                 {
                                     key: 'tab3',
                                     label: <span onClick={() => {
                                         setWhichofits('村')
+                                        setDifferentiate('road')
+                                        setGrade('村')
+
                                     }}>村道{activeKey === 'tab3'}</span>,
                                 }, {
                                     key: 'tab4',
                                     label: <span onClick={() => {
                                         setWhichofits('gongcheng')
+                                        setDifferentiate('project')
+
                                     }}>工程一览{activeKey === 'tab4'}</span>,
                                 },
                             ],
@@ -3847,7 +3843,7 @@ const TransporTationTable = (props) => {
                         defaultCollapsed: false,
                         optionRender: (searchConfig, formProps, dom) => [
                             ...dom.reverse(),
-                            <Popconfirm title="确认导出?" onConfirm={() => { props.exports(rowSelected, counts) }}>
+                            <Popconfirm title="确认导出?" onConfirm={() => { props.exports(rowSelected,grade,differentiate) }}>
                                 <Button
                                 >
                                     导出
diff --git a/web/client/src/sections/fillion/containers/bridge.js b/web/client/src/sections/fillion/containers/bridge.js
index d65cad4f..b50d6e7c 100644
--- a/web/client/src/sections/fillion/containers/bridge.js
+++ b/web/client/src/sections/fillion/containers/bridge.js
@@ -9,24 +9,20 @@ const bridge = (props) => {
   const [data, setData] = useState()
   useEffect(() => {
     // dispatch(getDepMessage())
-    
+
     setData(props)
   }, []);
-  //批量导出
-  const exports = (ids, counts) => {
-    // console.log(user);
-    let reportIds = [];
-    if (ids.length)
-      reportIds = ids
-    else
-      reportIds = (counts || {}).ids || [];
-    superagent.post('/_report/http')
-      .send({ id: reportIds.map(i => Number(i)) }).end((err, res) => {
-        const resTextIs = res.text.split('/').pop()
-        window.open(
-          '/_api/' +
-          `attachments?src=files/${resTextIs}&filename=${encodeURIComponent(resTextIs)}&token=${user.token}`)
-      })
+  const exports = (ids, differentiate) => {
+    let idas = ids.toString()
+    if (differentiate == 'bridge') {
+      window.open(
+        '/_api/' + `data/export/?ids=${idas || ''}&exp=${differentiate}&token=${user.token}`)
+    }if(differentiate=='project'){
+      window.open(
+        '/_api/' + `data/export/?ids=${idas || ''}&exp=${differentiate}&token=${user.token}`)
+    }
+
+
   }
   return (
     <> <BridgeTable data={data} exports={exports} />
diff --git a/web/client/src/sections/fillion/containers/highways.js b/web/client/src/sections/fillion/containers/highways.js
index f734f12a..a4636c8f 100644
--- a/web/client/src/sections/fillion/containers/highways.js
+++ b/web/client/src/sections/fillion/containers/highways.js
@@ -12,22 +12,13 @@ const highways = (props) => {
    
     setData(props)
   }, []);
-  //批量导出
-  const exports = (ids, counts) => {
-    // console.log(user);
-    let reportIds = [];
-    if (ids.length)
-      reportIds = ids
-    else
-      reportIds = (counts || {}).ids || [];
-    superagent.post('/_report/http')
-      .send({ id: reportIds.map(i => Number(i)) }).end((err, res) => {
-        const resTextIs = res.text.split('/').pop()
-        window.open(
-          '/_api/' +
-          `attachments?src=files/${resTextIs}&filename=${encodeURIComponent(resTextIs)}&token=${user.token}`)
-      })
-  }
+  const exports = (ids,counts) => {
+    console.log(counts);
+    let idas=ids.toString()
+            window.open(
+                '/_api/'+`data/export/?ids=${idas||''}&exp=${'overspeed'}&token=${user.token}`)
+     
+}
   return (
     <> <HighwaysTable data={data} exports={exports} />
     </>
diff --git a/web/client/src/sections/fillion/containers/infor.js b/web/client/src/sections/fillion/containers/infor.js
index 1d492a93..dfc233e3 100644
--- a/web/client/src/sections/fillion/containers/infor.js
+++ b/web/client/src/sections/fillion/containers/infor.js
@@ -26,19 +26,11 @@ const infor = (props) => {
     // }
     //批量导出
     const exports = (ids,counts) => {
-        // console.log(user);
-        let reportIds = [];
-        if (ids.length)
-            reportIds = ids
-        else
-            reportIds = (counts || {}).ids || [];
-        superagent.post('/_report/http')
-            .send({ id: reportIds.map(i => Number(i)) }).end((err, res) => {
-                const resTextIs = res.text.split('/').pop()
+        console.log(counts);
+        let idas=ids.toString()
                 window.open(
-                    '/_api/' +
-                    `attachments?src=files/${resTextIs}&filename=${encodeURIComponent(resTextIs)}&token=${user.token}`)
-            })
+                    '/_api/'+`data/export/?ids=${idas||''}&exp=${'overspeed'}&token=${user.token}`)
+         
     }
     return (
         <> <InForTable data={data} exports={exports} />
diff --git a/web/client/src/sections/fillion/containers/operational.js b/web/client/src/sections/fillion/containers/operational.js
index 2c6a2fda..de09f852 100644
--- a/web/client/src/sections/fillion/containers/operational.js
+++ b/web/client/src/sections/fillion/containers/operational.js
@@ -12,22 +12,18 @@ const operational = (props) => {
    
     setData(props)
   }, []);
-  //批量导出
-  const exports = (ids, counts) => {
-    // console.log(user);
-    let reportIds = [];
-    if (ids.length)
-      reportIds = ids
-    else
-      reportIds = (counts || {}).ids || [];
-    superagent.post('/_report/http')
-      .send({ id: reportIds.map(i => Number(i)) }).end((err, res) => {
-        const resTextIs = res.text.split('/').pop()
-        window.open(
-          '/_api/' +
-          `attachments?src=files/${resTextIs}&filename=${encodeURIComponent(resTextIs)}&token=${user.token}`)
-      })
-  }
+  const exports = (ids,differentiate,genre) => {
+    let idas=ids.toString()
+    if(differentiate=='vehicle'){
+       window.open(
+                '/_api/'+`data/export/?ids=${idas||''}&exp=${differentiate}&municipalType=${genre}&token=${user.token}`)
+    }if(differentiate=='business'){
+      window.open(
+               '/_api/'+`data/export/?ids=${idas||''}&exp=${differentiate}&token=${user.token}`)
+   }
+           
+     
+}
   return (
     <> <OperaTionalTable data={data} exports={exports} />
     </>
diff --git a/web/client/src/sections/fillion/containers/promotional.js b/web/client/src/sections/fillion/containers/promotional.js
index 98b1bc6f..a0de564a 100644
--- a/web/client/src/sections/fillion/containers/promotional.js
+++ b/web/client/src/sections/fillion/containers/promotional.js
@@ -13,24 +13,16 @@ const promotional = (props) => {
     
     setData(props)
   }, []);
-  // //批量导出
-  // const exports = (ids, counts) => {
-  //   // console.log(user);
-  //   let reportIds = [];
-  //   if (ids.length)
-  //     reportIds = ids
-  //   else
-  //     reportIds = (counts || {}).ids || [];
-  //   superagent.post('/_report/http')
-  //     .send({ id: reportIds.map(i => Number(i)) }).end((err, res) => {
-  //       const resTextIs = res.text.split('/').pop()
-  //       window.open(
-  //         '/_api/' +
-  //         `attachments?src=files/${resTextIs}&filename=${encodeURIComponent(resTextIs)}&token=${user.token}`)
-  //     })
-  // }
+   //批量导出
+   const exports = (ids,counts) => {
+    console.log(counts);
+    let idas=ids.toString()
+            window.open(
+                '/_api/'+`data/export/?ids=${idas||''}&exp=${'overspeed'}&token=${user.token}`)
+     
+}
   return (
-    <> <PromoTionalTable data={data} />
+    <> <PromoTionalTable data={data} exports={exports}/>
     </>
   )
 }
diff --git a/web/client/src/sections/fillion/containers/public.js b/web/client/src/sections/fillion/containers/public.js
index b0a5dc1e..6d0fcbcd 100644
--- a/web/client/src/sections/fillion/containers/public.js
+++ b/web/client/src/sections/fillion/containers/public.js
@@ -12,22 +12,14 @@ const Public = (props) => {
    
     setData(props)
   }, []);
-  //批量导出
-  const exports = (ids, counts) => {
-    // console.log(user);
-    let reportIds = [];
-    if (ids.length)
-      reportIds = ids
-    else
-      reportIds = (counts || {}).ids || [];
-    superagent.post('/_report/http')
-      .send({ id: reportIds.map(i => Number(i)) }).end((err, res) => {
-        const resTextIs = res.text.split('/').pop()
-        window.open(
-          '/_api/' +
-          `attachments?src=files/${resTextIs}&filename=${encodeURIComponent(resTextIs)}&token=${user.token}`)
-      })
-  }
+   //批量导出
+   const exports = (ids,counts) => {
+    console.log(counts);
+    let idas=ids.toString()
+            window.open(
+                '/_api/'+`data/export/?ids=${idas||''}&exp=${'overspeed'}&token=${user.token}`)
+     
+}
   return (
     <> <PublicTable data={data} exports={exports} />
     </>
diff --git a/web/client/src/sections/fillion/containers/transportation.js b/web/client/src/sections/fillion/containers/transportation.js
index 405f7082..afcf43df 100644
--- a/web/client/src/sections/fillion/containers/transportation.js
+++ b/web/client/src/sections/fillion/containers/transportation.js
@@ -12,22 +12,20 @@ const transportation = (props) => {
    
     setData(props)
   }, []);
-  //批量导出
-  const exports = (ids, counts) => {
-    // console.log(user);
-    let reportIds = [];
-    if (ids.length)
-      reportIds = ids
-    else
-      reportIds = (counts || {}).ids || [];
-    superagent.post('/_report/http')
-      .send({ id: reportIds.map(i => Number(i)) }).end((err, res) => {
-        const resTextIs = res.text.split('/').pop()
-        window.open(
-          '/_api/' +
-          `attachments?src=files/${resTextIs}&filename=${encodeURIComponent(resTextIs)}&token=${user.token}`)
-      })
-  }
+   //批量导出
+   const exports = (ids,grade,differentiate) => {
+    console.log(differentiate);
+    let idas=ids.toString()
+    if(differentiate=='road'){
+      window.open(
+                '/_api/'+`data/export/?ids=${idas||''}&exp=${differentiate}&roadLevel=${grade||''}&token=${user.token}`)
+    }if(differentiate=='project'){
+      window.open(
+        '/_api/'+`data/export/?ids=${idas||''}&exp=${differentiate}&token=${user.token}`)
+    }
+            
+     
+}
   return (
     <> <TransporTationTable data={data} exports={exports} />
     </>

From 2fceb76eac560b8661d7f0677599400868fb1f1e Mon Sep 17 00:00:00 2001
From: xingyongchun <xing.yongchun@free-sun.com.cn>
Date: Thu, 28 Jul 2022 21:20:46 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E6=A1=A5=E6=A2=81=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/client/src/sections/fillion/components/infor/details.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/client/src/sections/fillion/components/infor/details.js b/web/client/src/sections/fillion/components/infor/details.js
index a8a125a7..303e1dd2 100644
--- a/web/client/src/sections/fillion/components/infor/details.js
+++ b/web/client/src/sections/fillion/components/infor/details.js
@@ -171,7 +171,7 @@ const UserModal = (props) => {
                         if (rewkeys === 'bridge') {
                             if (typecard == '111') {
                                 setDelet(values)
-                                const query = { ...values, roadId: records?.[0]?.value || '' }
+                                const query = { ...values, bridgeId: records?.[0]?.value || '' }
                                 dispatch(putBridge(query)).then((res) => {
 
                                 })

From 63b867f9bc9a178587974dcb7bcb129375cb7d32 Mon Sep 17 00:00:00 2001
From: wanyiwei <wan.yiwei@free-sun.com.cn>
Date: Thu, 28 Jul 2022 21:20:47 +0800
Subject: [PATCH 3/7] =?UTF-8?q?*=E5=A4=A7=E5=B1=8F=E8=BF=90=E8=90=A5?=
 =?UTF-8?q?=E4=B8=BAnull=E5=88=A4=E6=96=AD=EF=BC=8C=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E9=80=BB=E8=BE=91=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../containers/footer/operation/left.js       | 88 +++++++++----------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/web/client/src/sections/quanju/containers/footer/operation/left.js b/web/client/src/sections/quanju/containers/footer/operation/left.js
index 2966deaf..4faa15ba 100644
--- a/web/client/src/sections/quanju/containers/footer/operation/left.js
+++ b/web/client/src/sections/quanju/containers/footer/operation/left.js
@@ -5,8 +5,6 @@ import Module from '../../public/module'
 import { getBusTierList } from '../../../actions/example'
 import './style.less'
 
-
-
 const Left = (props) => {
     const [treeData, setTreeData] = useState([])
     const [treeDataList, setTreeDataList] = useState([])
@@ -29,12 +27,12 @@ const Left = (props) => {
 
     const onChange = (e) => {
         const { value } = e.target;
-        let keys = []
-        const newExpandedKeys = treeDataList.filter(e => e.key.match(value))
+        let titles = []
+        const newExpandedKeys = treeDataList.filter(e => e.title != null && e.title.match(value))
         newExpandedKeys.forEach(e => {
-            keys.push(e.key)
+            titles.push(e.title)
         })
-        setExpandedKeys(keys);
+        setExpandedKeys(titles);
         setSearchValue(value);
         setAutoExpandParent(true);
     };
@@ -78,51 +76,53 @@ const Left = (props) => {
         let busTierOpen = []
         let dataList = []
         let busTierNewList = []
-        if (busTier && busTier.data && busTier.data.length > 0) {
-            busTierNewList.push(busTier && busTier.data && busTier.data[0])
-        }
-        if (busTierNewList.length > 0) {
-            busTierNewList.forEach((e, index) => {
-                if (index == 0) {
-                    busTierOpen.push(e.name)
-                }
-                busTierList.push({
-                    key: e.name,
-                    title: e.name,
-                    children: e.child.map(s => {
-                        return {
-                            key: s.name,
-                            title: s.name,
-                            children: s.child.map(i => {
-                                return {
-                                    key: i.name,
-                                    title: i.name,
-                                    children: i.child.map(x => {
-                                        return {
-                                            key: x.name,
-                                            title: x.name,
-                                        }
-                                    })
-                                }
-                            })
-                        }
+        // Math.ceil(Math.random() * 100);
+        // if (busTier && busTier.data && busTier.data.length > 0) {
+        //     busTierNewList.push(busTier && busTier.data && busTier.data[0])
+        // }
+        // if (busTierNewList.length > 0) {
+        // }
+        busTier && busTier.data && busTier.data.forEach((e, index) => {
+            if (index == 0) {
+                busTierOpen.push(e.name)
+            }
+            busTierList.push({
+                key: e.name,
+                title: e.name,
+                children: e.child.map(s => {
+                    return {
+                        key: s.name,
+                        title: s.name,
+                        children: s.child.map(i => {
+                            return {
+                                key: i.name == '--' || i.name == null ? Math.ceil(Math.random() * 100) : i.name,
+                                title: i.name,
+                                children: i.child.map(x => {
+                                    return {
+                                        key: x.name == '--' || x.name == null ? Math.ceil(Math.random() * 100) : x.name,
+                                        title: x.name == null ? '--' : x.name,
+                                    }
+                                })
+
+                            }
+                        })
+                    }
 
-                    })
                 })
             })
-            busTierNewList.forEach(e => {
-                e.child.forEach(i => {
-                    i.child.forEach(s => {
-                        s.child.forEach(x => {
-                            dataList.push({
-                                key: x.name,
-                                title: x.name
-                            })
+        })
+        busTier && busTier.data && busTier.data.forEach(e => {
+            e.child.forEach(i => {
+                i.child.forEach(s => {
+                    s.child.forEach(x => {
+                        dataList.push({
+                            key: x.name,
+                            title: x.name
                         })
                     })
                 })
             })
-        }
+        })
         setTreeData(busTierList)
         setExpandedKeys(busTierOpen)
         setTreeDataList(dataList)

From 3654c12808c07c6fdafcfd560b3c1549eda8f1c4 Mon Sep 17 00:00:00 2001
From: wanyiwei <wan.yiwei@free-sun.com.cn>
Date: Thu, 28 Jul 2022 21:26:06 +0800
Subject: [PATCH 4/7] =?UTF-8?q?*=E5=A4=A7=E5=B1=8F=E8=BF=90=E8=90=A5?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sections/quanju/containers/footer/operation/left.js   | 2 +-
 .../sections/quanju/containers/footer/operation/right.js  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/web/client/src/sections/quanju/containers/footer/operation/left.js b/web/client/src/sections/quanju/containers/footer/operation/left.js
index 4faa15ba..6d870d0e 100644
--- a/web/client/src/sections/quanju/containers/footer/operation/left.js
+++ b/web/client/src/sections/quanju/containers/footer/operation/left.js
@@ -132,7 +132,7 @@ const Left = (props) => {
             <Module style={style} customize={true} title={"公交车辆信息"}>
                 <div style={{ width: '90%', height: '96%', margin: '2% 5%', overflow: 'hidden' }}>
                     <div style={{ border: '1px solid rgba(10, 114, 255, 1)', backgroundColor: 'rgba(10, 114, 255, 0.1)' }}>
-                        <img src='assets/images/quanju/search.png' style={{ width: '5%', margin: '0 1.5% 1% 3.5%' }} />
+                        <img src='/assets/images/quanju/search.png' style={{ width: '5%', margin: '0 1.5% 1% 3.5%' }} />
                         <Input
                             style={{
                                 width: '90%',
diff --git a/web/client/src/sections/quanju/containers/footer/operation/right.js b/web/client/src/sections/quanju/containers/footer/operation/right.js
index fd928492..30cdf2ed 100644
--- a/web/client/src/sections/quanju/containers/footer/operation/right.js
+++ b/web/client/src/sections/quanju/containers/footer/operation/right.js
@@ -37,7 +37,7 @@ const Right = () => {
                             dataLists.map((data, index) => (
                                 <div key={index} style={{width:'100%',height:'40%'}}>
                                     <div className='busInformation'>
-                                        <img src='assets/images/quanju/theBus.png' style={{ width: '15%', display:'block',float:'left' }} />
+                                        <img src='/assets/images/quanju/theBus.png' style={{ width: '15%', display:'block',float:'left' }} />
                                         <span>
                                             <h3>所属线路</h3>
                                             <h4>{data.route}</h4>
@@ -49,15 +49,15 @@ const Right = () => {
                                         <div style={{
                                             width:'98%',margin:'1% 1%',height:152,display:'block',float:'left',boxShadow: '0px 1px 5px 0px #1C60FE',
                                             border:'1px solid #1C60FE'
-                                            }}><img src='assets/images/quanju/busVideo.png' style={{width:'100%',height:'100%'}} /></div>
+                                            }}><img src='/assets/images/quanju/busVideo.png' style={{width:'100%',height:'100%'}} /></div>
                                         <div style={{
                                             width:'48%',margin:'1% 1%',height:100,display:'block',float:'left',boxShadow: '0px 1px 5px 0px #1C60FE',
                                             border:'1px solid #1C60FE'
-                                            }}><img src='assets/images/quanju/busVideo.png' style={{width:'100%',height:'100%'}} /></div>
+                                            }}><img src='/assets/images/quanju/busVideo.png' style={{width:'100%',height:'100%'}} /></div>
                                         <div style={{
                                             width:'48%',margin:'1% 1%',height:100,display:'block',float:'left',boxShadow: '0px 1px 5px 0px #1C60FE',
                                             border:'1px solid #1C60FE'
-                                            }}><img src='assets/images/quanju/busVideo.png' style={{width:'100%',height:'100%'}} /></div>
+                                            }}><img src='/assets/images/quanju/busVideo.png' style={{width:'100%',height:'100%'}} /></div>
                                     </div>
                                 </div>
                             ))

From 837b438510f39c007d9b8754567612b460ed8ce4 Mon Sep 17 00:00:00 2001
From: wanyiwei <wan.yiwei@free-sun.com.cn>
Date: Thu, 28 Jul 2022 21:30:37 +0800
Subject: [PATCH 5/7] =?UTF-8?q?*=E5=A4=A7=E5=B1=8F=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=B1=82=E7=BA=A7=E4=B8=AD=E6=9C=89null=E5=80=BC=E7=9A=84key?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/sections/quanju/containers/footer/operation/left.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/client/src/sections/quanju/containers/footer/operation/left.js b/web/client/src/sections/quanju/containers/footer/operation/left.js
index 6d870d0e..175efc1e 100644
--- a/web/client/src/sections/quanju/containers/footer/operation/left.js
+++ b/web/client/src/sections/quanju/containers/footer/operation/left.js
@@ -91,7 +91,7 @@ const Left = (props) => {
                 title: e.name,
                 children: e.child.map(s => {
                     return {
-                        key: s.name,
+                        key: s.name == '--' ||  s.name == null ? Math.ceil(Math.random() * 100) : s.name,
                         title: s.name,
                         children: s.child.map(i => {
                             return {

From 73e3219c88ae001c6075a69b43698c907931c5c9 Mon Sep 17 00:00:00 2001
From: dengyinhuan <deng.yinhuan@free-sun.com.cn>
Date: Thu, 28 Jul 2022 21:43:26 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BB=BA=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=95=85=E9=9A=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/sections/quanju/containers/footer/build/index.js       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/client/src/sections/quanju/containers/footer/build/index.js b/web/client/src/sections/quanju/containers/footer/build/index.js
index 679eb3da..66f67e1b 100644
--- a/web/client/src/sections/quanju/containers/footer/build/index.js
+++ b/web/client/src/sections/quanju/containers/footer/build/index.js
@@ -121,6 +121,7 @@ const Build = (props) => {
     //     }
     // ]
     console.log(localStorage.getItem("qndmn"),'七牛')
+    console.log(xuandata,"宣传")
     return (
        <div className='bgbuild'>
         <div className='bgbuild-left'>
@@ -200,7 +201,7 @@ const Build = (props) => {
             }} customize={true}>
                <div className='build-right-top'>
                {/* <img src='/assets/images/quanju/xuanchuanlan.jpg'></img> */}
-               <video src={xuandata?`${localStorage.getItem("qndmn")}/${xuandata[0].video!==null&&xuandata[0].video?xuandata[0].video[0]:""}`:"#"} autoPlay="autoplay" loop></video>
+               <video src={xuandata&&xuandata!==null&&xuandata.length!==0?`${localStorage.getItem("qndmn")}/${xuandata[0].video!==null&&xuandata[0].video?xuandata[0].video[0]:""}`:"#"} autoPlay="autoplay" loop></video>
                <h2>全面建设好农村公路，切实发挥先行官作用</h2>
                </div>
             </Module>

From e6214053825de88a9d76682c3e2071c569181403 Mon Sep 17 00:00:00 2001
From: xingyongchun <xing.yongchun@free-sun.com.cn>
Date: Thu, 28 Jul 2022 21:59:36 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E5=B7=B2=E5=AE=8C=E6=88=90=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fillion/components/bridgeTable.js         |  4 +-
 .../fillion/components/enforceTable.js        |  2 +-
 .../components/highways/highwaysdata.js       |  2 +-
 .../fillion/components/highwaysTable.js       |  2 +-
 .../fillion/components/infor/details.js       | 22 ++---
 .../sections/fillion/components/inforTable.js |  2 +-
 .../fillion/components/operationalTable.js    |  8 +-
 .../fillion/components/project/project.js     | 90 +++++++++----------
 .../fillion/components/publicTable.js         |  4 +-
 .../fillion/components/transportationTable.js |  9 +-
 10 files changed, 72 insertions(+), 73 deletions(-)

diff --git a/web/client/src/sections/fillion/components/bridgeTable.js b/web/client/src/sections/fillion/components/bridgeTable.js
index cf2e53a8..c6761572 100644
--- a/web/client/src/sections/fillion/components/bridgeTable.js
+++ b/web/client/src/sections/fillion/components/bridgeTable.js
@@ -1507,7 +1507,7 @@ const BrideTable = (props) => {
                     return <div><Button type="link"
                         onClick={() => {
                             openModal('edit', record)
-                            setTypecard('111')
+                            setTypecard('compile')
                             setRecortd(record)
                         }}
                     >编辑</Button>
@@ -1691,7 +1691,7 @@ const BrideTable = (props) => {
                     return <div><Button type="link"
                         onClick={() => {
                             yilanModal('edit', record)
-                            setTypecard('111')
+                            setTypecard('compile')
                             setRecortd(record)
                         }}
                     >编辑</Button><Popconfirm title='是否确认删除' onConfirm={() => { deldatas(record.id) }}>
diff --git a/web/client/src/sections/fillion/components/enforceTable.js b/web/client/src/sections/fillion/components/enforceTable.js
index 1f239e22..cbeca915 100644
--- a/web/client/src/sections/fillion/components/enforceTable.js
+++ b/web/client/src/sections/fillion/components/enforceTable.js
@@ -1508,7 +1508,7 @@ const openModal = (type, record) => {
                     return <div><Button type="link"
                     onClick={() => {
                         openModal('edit', record)
-                        setTypecard('111')
+                        setTypecard('compile')
                         
                     }}
                     >编辑</Button><Button type="link">删除</Button></div>
diff --git a/web/client/src/sections/fillion/components/highways/highwaysdata.js b/web/client/src/sections/fillion/components/highways/highwaysdata.js
index 854781da..c5bc3851 100644
--- a/web/client/src/sections/fillion/components/highways/highwaysdata.js
+++ b/web/client/src/sections/fillion/components/highways/highwaysdata.js
@@ -47,7 +47,7 @@ const HightModal = (props) => {
                 }}
                 initialValues={recortd}
             >
-                {typecard == '111' ?
+                {typecard == 'compile' ?
                     <ProForm.Group
                     >
                         <ProFormText
diff --git a/web/client/src/sections/fillion/components/highwaysTable.js b/web/client/src/sections/fillion/components/highwaysTable.js
index a8d062f4..87fb9798 100644
--- a/web/client/src/sections/fillion/components/highwaysTable.js
+++ b/web/client/src/sections/fillion/components/highwaysTable.js
@@ -75,7 +75,7 @@ const hightModal = (type, record) => {
                     return <div><Button type="link"
                     onClick={() => {
                         hightModal('edit', record)
-                        setTypecard('111')
+                        setTypecard('compile')
                         setRecortd(record)
                     }}
                     >编辑</Button></div>
diff --git a/web/client/src/sections/fillion/components/infor/details.js b/web/client/src/sections/fillion/components/infor/details.js
index 303e1dd2..4df3a38c 100644
--- a/web/client/src/sections/fillion/components/infor/details.js
+++ b/web/client/src/sections/fillion/components/infor/details.js
@@ -152,12 +152,12 @@ const UserModal = (props) => {
                     if (Object.values(values).length > 0) {
                         if (rewkeys === 'transportation') {
 
-                            if (typecard == '111') {
+                            if (typecard == 'compile') {
                                 setDelet(values)
                                 const query = { ...values, level: whichofits, roadId: records?.[0]?.value || '' }
                                 dispatch(putRoadway(query)).then((res) => {
-                                return true
-                                })          
+                                })       
+                                return true   
                             } else {
                                 setDelet(values)
                                 const query = { ...values, level: whichofits }
@@ -169,7 +169,7 @@ const UserModal = (props) => {
                            
                         }
                         if (rewkeys === 'bridge') {
-                            if (typecard == '111') {
+                            if (typecard == 'compile') {
                                 setDelet(values)
                                 const query = { ...values, bridgeId: records?.[0]?.value || '' }
                                 dispatch(putBridge(query)).then((res) => {
@@ -186,7 +186,7 @@ const UserModal = (props) => {
                             }
                         }
                         if (rewkeys === 'weihuo') {
-                            if (typecard == '111') {
+                            if (typecard == 'compile') {
 
                                 setDelet(values)
                                 const query = { ...values, vehicleId: records?.[0]?.value || '', type: '危货' }
@@ -205,7 +205,7 @@ const UserModal = (props) => {
                             }
                         }
                         if (rewkeys === 'chuzu') {
-                            if (typecard == '111') {
+                            if (typecard == 'compile') {
 
                                 setDelet(values)
                                 const query = { ...values, vehicleId: records?.[0]?.value || '', type: '出租车' }
@@ -224,7 +224,7 @@ const UserModal = (props) => {
                             }
                         }
                         if (rewkeys === 'yehu') {
-                            if (typecard == '111') {
+                            if (typecard == 'compile') {
                                 setDelet(values)
                                 const query = { ...values, businessId: records?.[0]?.value, type: values.type }
                                 dispatch(putHouseholds(query)).then((res) => {
@@ -240,7 +240,7 @@ const UserModal = (props) => {
                                 return true
                             }
                         } if (rewkeys === 'xianlu') {
-                            if (typecard == '111') {
+                            if (typecard == 'compile') {
                                 setDelet(values)
                                 const query = { ...values, lineId: records?.[0]?.value || '' }
                                 dispatch(putCircuit(query)).then((res) => {
@@ -257,7 +257,7 @@ const UserModal = (props) => {
                             }
                         }
                         if (rewkeys === 'cheliang') {
-                            if (typecard == '111') {
+                            if (typecard == 'compile') {
                                 setDelet(values)
                                 const query = { ...values, carId: records?.[0]?.value || '' }
                                 dispatch(putVehicle(query)).then((res) => {
@@ -274,7 +274,7 @@ const UserModal = (props) => {
                             }
                         }
                         if (rewkeys === 'zhichao') {
-                            if (typecard == '111') {
+                            if (typecard == 'compile') {
                                 setDelet(values)
                                 const query = { ...values, overspeedId: records?.[0]?.value || '' }
                                 dispatch(putPurchase(query)).then((res) => {
@@ -297,7 +297,7 @@ const UserModal = (props) => {
                 }}
                 initialValues={recortd}
             >
-                {typecard == '111' ?
+                {typecard == 'compile' ?
                     <ProForm.Group
                     >
                         <ProFormText
diff --git a/web/client/src/sections/fillion/components/inforTable.js b/web/client/src/sections/fillion/components/inforTable.js
index ca94c537..44b26b61 100644
--- a/web/client/src/sections/fillion/components/inforTable.js
+++ b/web/client/src/sections/fillion/components/inforTable.js
@@ -353,7 +353,7 @@ const InForTable = (props) => {
                     return <div><Button type="link"
                         onClick={() => {
                             openModal('edit', record)
-                            setTypecard('111')
+                            setTypecard('compile')
                             setRecortd(record)
                         }}
                     >编辑</Button>
diff --git a/web/client/src/sections/fillion/components/operationalTable.js b/web/client/src/sections/fillion/components/operationalTable.js
index 5e88d600..05ec484b 100644
--- a/web/client/src/sections/fillion/components/operationalTable.js
+++ b/web/client/src/sections/fillion/components/operationalTable.js
@@ -110,7 +110,7 @@ const OperaTionalTable = (props) => {
                     return <div><Button type="link"
                         onClick={() => {
                             hightModal('edit', record)
-                            setTypecard('111')
+                            setTypecard('compile')
                             setRecortd(record)
                         }}
                     >编辑</Button></div>
@@ -697,7 +697,7 @@ const OperaTionalTable = (props) => {
                     return <div><Button type="link"
                         onClick={() => {
                             openModal('edit', record)
-                            setTypecard('111')
+                            setTypecard('compile')
                             setRecortd(record)
                         }}
                     >编辑</Button> <Popconfirm title='是否确认删除' onConfirm={() => { deldata(record.id) }}>
@@ -1330,7 +1330,7 @@ const OperaTionalTable = (props) => {
                     return <div><Button type="link"
                         onClick={() => {
                             openModal('edit', record)
-                            setTypecard('111')
+                            setTypecard('compile')
                             setRecortd(record)
                         }}
                     >编辑</Button> <Popconfirm title='是否确认删除' onConfirm={() => { deldata(record.id) }}>
@@ -1800,7 +1800,7 @@ const OperaTionalTable = (props) => {
                     return <div><Button type="link"
                         onClick={() => {
                             openModal('edit', record)
-                            setTypecard('111')
+                            setTypecard('compile')
                             setRecortd(record)
                         }}
                     >编辑</Button><Popconfirm title='是否确认删除' onConfirm={() => { deldatas(record.id) }}>
diff --git a/web/client/src/sections/fillion/components/project/project.js b/web/client/src/sections/fillion/components/project/project.js
index fc292af8..9e6f852a 100644
--- a/web/client/src/sections/fillion/components/project/project.js
+++ b/web/client/src/sections/fillion/components/project/project.js
@@ -1,9 +1,9 @@
 import React, { useEffect, useState } from 'react';
 import { connect } from 'react-redux';
 import { Form, Spin, Table } from 'antd';
-import { DrawerForm, ProForm, ProFormText,ProFormSelect } from '@ant-design/pro-form';
+import { DrawerForm, ProForm, ProFormText, ProFormSelect } from '@ant-design/pro-form';
 import { putProject } from "../../actions/infor"
-import  _  from 'lodash'
+import _ from 'lodash'
 
 const data = {
     "entryName": "项目名称",
@@ -32,7 +32,7 @@ const ProjectModal = (props) => {
             setNewlys(array?.splice(0, 2))
             setNewlysay(array)
             // console.log()
-            
+
         }
         if (rewkeys === 'bridge') {
             _.forIn(data, function (value, key) {
@@ -41,7 +41,7 @@ const ProjectModal = (props) => {
             setNewlys(array?.splice(0, 2))
             setNewlysay(array)
             // console.log()
-            
+
         }
     }, [])
     useEffect(() => {
@@ -51,7 +51,7 @@ const ProjectModal = (props) => {
                 arr.push({ value: value, type: key })
             });
             setRecordsay(arr.splice(1, 2))
-           
+
             setRecords(arr)
         }
         if (rewkeys === 'bridge') {
@@ -79,68 +79,68 @@ const ProjectModal = (props) => {
                 onFinish={(values) => {
                     console.log(values)
                     if (rewkeys === 'road') {
-                        if (typecard == '111') {
+                        if (typecard == 'compile') {
                             setDelet(values)
-                            const query = { ...values, type:rewkeys,projectId:records?.[0]?.value || '' }
+                            const query = { ...values, type: rewkeys, projectId: records?.[0]?.value || '', done: values.done === 'true' ? true : false }
                             dispatch(putProject(query)).then((res) => {
-                                
+
                             })
                             return true
                         } else {
                             setDelet(values)
-                            const query = { ...values, type:rewkeys }
+                            const query = { ...values, type: rewkeys,done: values.done === 'true' ? true : false }
                             dispatch(putProject(query)).then((res) => {
-                                
+
                             })
                             return true
                         }
                     }
                     if (rewkeys === 'bridge') {
-                        if (typecard == '111') {
+                        if (typecard == 'compile') {
                             setDelet(values)
-                            const query = { ...values, type:rewkeys,projectId:records?.[0]?.value || '' }
+                            const query = { ...values, type: rewkeys, projectId: records?.[0]?.value || '',done: values.done === 'true' ? true : false }
                             dispatch(putProject(query)).then((res) => {
-                                
+
                             })
                             return true
                         } else {
                             setDelet(values)
-                            const query = { ...values, type:rewkeys }
+                            const query = { ...values, type: rewkeys,done: values.done === 'true' ? true : false }
                             dispatch(putProject(query)).then((res) => {
-                                
+
                             })
                             return true
                         }
                     }
                 }}
-                initialValues={recortd}
+                initialValues={{ ...recortd, done: recortd.done ? 'true' : 'false' }}
             >
-                {typecard == '111' ?
+                {typecard == 'compile' ?
                     <ProForm.Group
                     >
                         <ProFormText
                             name={newlys?.[0]?.type}
                             width="md"
                             label={newlys?.[0]?.name}
-                           
+
                             placeholder="请输入名称"
-                            // value={recordsay?.[0]?.value}
-                            // rules={[{ required: true, message: "必填" }]}
+                        // value={recordsay?.[0]?.value}
+                        // rules={[{ required: true, message: "必填" }]}
                         /><ProFormText
                             name={newlys?.[1]?.type}
                             width="md"
                             label={newlys?.[1]?.name}
-                           
+
                             placeholder="请输入名称"
-                            // value={recordsay?.[1]?.value}
-                            // rules={[{ required: true, message: "必填" }]}
+                        // value={recordsay?.[1]?.value}
+                        // rules={[{ required: true, message: "必填" }]}
                         />
                         <ProFormSelect
                             options={[
                                 {
                                     value: 'true',
                                     label: '是',
-                                },{
+                                }, {
                                     value: 'false',
                                     label: '否',
                                 },
@@ -162,38 +162,38 @@ const ProjectModal = (props) => {
                             name={newlys?.[0]?.type}
                             width="md"
                             label={newlys?.[0]?.name}
-                           
+
                             placeholder="请输入名称"
-                            // value={recordssy?.[0]?.value}
-                            // rules={[{ required: true, message: "必填" }]}
+                        // value={recordssy?.[0]?.value}
+                        // rules={[{ required: true, message: "必填" }]}
                         /><ProFormText
                             name={newlys?.[1]?.type}
                             width="md"
                             label={newlys?.[1]?.name}
-                           
+
                             placeholder="请输入名称"
-                            // value={recordssy?.[1]?.value}
-                            // rules={[{ required: true, message: "必填" }]}
+                        // value={recordssy?.[1]?.value}
+                        // rules={[{ required: true, message: "必填" }]}
                         />
-                         <ProFormSelect
-                           options={[
-                            {
-                                value: 'true',
-                                label: '是',
-                            },{
-                                value: 'false',
-                                label: '否',
-                            },
-                        ]}
-                        width="xs"
-                        name='done'
-                        label='是否已完成'
-                        rules={[{ required: true, message: "必填" }]}
+                        <ProFormSelect
+                            request={async () => [
+                                {
+                                    value: 'true',
+                                    label: '是',
+                                }, {
+                                    value: 'false',
+                                    label: '否',
+                                },
+                            ]}
+
+                            name='done'
+                            label='是否已完成'
+                            rules={[{ required: true, message: "必填" }]}
                         />
                         {newlysay?.map((item, index) => {
                             return <ProFormText width="md"
                                 name={item?.type} label={newlysay[index]?.name} placeholder="请输入名称" key={index}
-                               
+
 
                             />
                         })}
diff --git a/web/client/src/sections/fillion/components/publicTable.js b/web/client/src/sections/fillion/components/publicTable.js
index 23d5b009..66510447 100644
--- a/web/client/src/sections/fillion/components/publicTable.js
+++ b/web/client/src/sections/fillion/components/publicTable.js
@@ -408,7 +408,7 @@ const PublicTable = (props) => {
                     return <div><Button type="link"
                         onClick={() => {
                             openModal('edit', record)
-                            setTypecard('111')
+                            setTypecard('compile')
                             setRecortd(record)
                         }}
                     >编辑</Button><Popconfirm title='是否确认删除' onConfirm={() => { deldata(record.id) }}>
@@ -1103,7 +1103,7 @@ const PublicTable = (props) => {
                     return <div><Button type="link"
                         onClick={() => {
                             openModal('edit', record)
-                            setTypecard('111')
+                            setTypecard('compile')
                             setRecortd(record)
                         }}
                     >编辑</Button><Popconfirm title='是否确认删除' onConfirm={() => { deldatas(record.id) }}>
diff --git a/web/client/src/sections/fillion/components/transportationTable.js b/web/client/src/sections/fillion/components/transportationTable.js
index daca6ac0..53cba191 100644
--- a/web/client/src/sections/fillion/components/transportationTable.js
+++ b/web/client/src/sections/fillion/components/transportationTable.js
@@ -1178,7 +1178,7 @@ const TransporTationTable = (props) => {
                         onClick={() => {
                             setRecortd(record)
                             openModal('edit', record)
-                            setTypecard('111')
+                            setTypecard('compile')
                         }}
                     >编辑</Button>
                         <Popconfirm title='是否确认删除' onConfirm={() => { deldata(record.id) }}><Button type="link"
@@ -2334,7 +2334,7 @@ const TransporTationTable = (props) => {
                     return <div><Button type="link"
                         onClick={() => {
                             openModal('edit', record)
-                            setTypecard('111')
+                            setTypecard('compile')
                             setRecortd(record)
 
                         }}
@@ -3491,7 +3491,7 @@ const TransporTationTable = (props) => {
                     return <div><Button type="link"
                         onClick={() => {
                             openModal('edit', record)
-                            setTypecard('111')
+                            setTypecard('compile')
                             setRecortd(record)
 
                         }}
@@ -3678,7 +3678,7 @@ const TransporTationTable = (props) => {
                     return <div><Button type="link"
                         onClick={() => {
                             yilanModal('edit', record)
-                            setTypecard('111')
+                            setTypecard('compile')
                             setRecortd(record)
                         }}
                     >编辑</Button>
@@ -3832,7 +3832,6 @@ const TransporTationTable = (props) => {
                             setRowSelected([]);
                             const res = await dispatch(getProject(query));
                             setCounts(res.payload.data)
-                            console.log(res)
                             return {
                                 ...res,
                                 total: res.payload.data ? res.payload.data.count : 0