Merge branch 'dev' of https://gitea.anxinyun.cn/gao.zhiyuan/Highways4Good into dev

web/client/src/sections/fillion/components/maintenanceTable.js

@@ -99,6 +99,11 @@ const DetailList = (props) => {
             render: (text, record) => {
                 return moment(record.time).format("YYYYMMDD") * 10000 + record.id;
             }
+        }, {
+            title: '工程类型',
+            key: 'projectType',
+            dataIndex: 'projectType',
+            align: 'center',
         }, {
             title: '所属道路',
             key: 'road',
@@ -120,7 +125,7 @@ const DetailList = (props) => {
             align: 'center'
         },
         {
-            title: '巡查人',
+            title: '养护人',
             width: 100,
             key: 'userName',
             dataIndex: 'userName',

web/client/src/sections/fillion/components/patrolTable.js

@@ -100,7 +100,14 @@ const DetailList = (props) => {
             render: (text, record) => {
                 return moment(record.time).format("YYYYMMDD") * 10000 + record.id;
             }
-        }, {
+        },
+        {
+            title: '工程类型',
+            key: 'projectType',
+            dataIndex: 'projectType',
+            align: 'center',
+        },
+        {
             title: '所属道路',
             key: 'road',
             dataIndex: 'road',

web/client/src/sections/quanju/containers/footer/build/Leftbottom.js

@@ -274,6 +274,7 @@ legend: {
 
   return (
     <div className='build-left-bottom'>
+       <span style={{position:"absolute",width:"10%",color:"#FFF",backgroundColor:'rgba(216, 240, 255, 0.1)',right:"5%",textAlign:"center",top:0}}>公里</span>
      <div className='build-left-bottom-title'>
         <h2>{total}</h2>
         <span>道路总公里</span>

web/client/src/sections/quanju/containers/footer/build/Rightbottom.js

@@ -58,7 +58,7 @@ function Rightbottom(props) {
       textStyle: {
         color: '#fff',
       },
-      formatter: (values) => `${values.seriesName}<br /> ${values.marker} ${values.name}<b>${values.value}</b>条`,
+      formatter: (values) => `${values.seriesName}<br /> ${values.marker} ${values.name}<b>${values.value}</b>段`,
     },
     legend: {
       orient: "vertical",
@@ -172,6 +172,7 @@ function Rightbottom(props) {
 
   return (
     <div className='build-right-bottom'>
+      <span style={{position:"absolute",width:"10%",color:"#FFF",backgroundColor:'rgba(216, 240, 255, 0.1)',right:"5%",textAlign:"center",top:0}}>段</span>
       <div className='build-right-bottom-title'>
         <h2>{total||0}</h2>
         <span>道路总公里</span>

web/client/src/sections/quanju/containers/footer/build/index.js

@@ -56,7 +56,8 @@ const Build = (props) => {
     let t1 = Object.values(buildingnumber?.townRoad || {})
     
     let totalgongli = t1.length!==0 ? t1.reduce((x,y)=>x+y.mileage,0):0      //乡镇道路占比总公里数
-    let totalcount = t1.length !==0 ? t1.reduce((x,y)=>x+y.roadCount,0):0     //乡镇道路占比公路总条数
+    // let totalcount = t1.length !==0 ? t1.reduce((x,y)=>x+y.roadCount,0):0     //乡镇道路占比公路总条数
+    let totalcount = buildingnumber?.buildedRoad || 0
     
     // let sungongli = alltype.reduce((x,y)=>x+y.value,0)
 
@@ -117,7 +118,7 @@ const Build = (props) => {
     return (
        <>
         <div className='bgbuild-left'>
-            <Module title={"各种状态公路数量统计"} style={{ width: "100%",
+            <Module title={"各状态公路数量统计"} style={{ width: "100%",
             height:" 33%"
             }} customize = {true}>
               <div style={{height:"100%",position:"relative"}} >
@@ -143,7 +144,7 @@ const Build = (props) => {
                </div>:<NoData/>}
               </div>
             </Module>
-            <Module title={"各乡镇道路分布统计"} style={{ width: "100%",
+            <Module title={"各乡镇已建道路统计"} style={{ width: "100%",
             height:" 33%",marginTop:'3%'
             }} customize = {true}>
                { totalcount && totalcount!==0?<div className='build-left-center'>
@@ -210,12 +211,12 @@ const Build = (props) => {
                <h2>全面建设好农村公路，切实发挥先行官作用</h2>
                </div>
             </Module>
-        <Module title={"各乡镇在建公路工程"} style={{ width: "100%",
+        <Module title={"各乡镇在建工程统计"} style={{ width: "100%",
             height:" 33%",marginTop:'3%'
             }} customize = {true}>
                 {sunonlineproject!==0?<Rightcenter data={onlineproject} sundata={sunonlineproject}/>:<NoData/>}
             </Module>
-        <Module title={"公路等级统计"} style={{ width: "100%",
+        <Module title={"各路段技术等级统计"} style={{ width: "100%",
             height:" 30%",marginTop:'3%'
             }} customize = {true}>
                 {safetyData&&sunsafetyData!==0?<RightBottom  width='100%'