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

api/app/lib/controllers/file/index.js

@@ -167,6 +167,10 @@ async function getFileList(ctx, next) {
             queryOptions.roadId = roadId
         }
 
+        rslt.road = await models.FileRoad.findOne({
+            where: { rId: roadId }
+        })
+
         rslt.type = await models.FileType.findOne({
             where: { fId }
         })
@@ -179,6 +183,9 @@ async function getFileList(ctx, next) {
                 ['id', 'DESC']
             ]
         })
+
+
+
         rslt.counter = await models.Files.count({
             where: queryOptions
         })

weapp/src/config.js

@@ -8,8 +8,8 @@ const baseConfig = {
 };
 
 const development = {
-  baseUrl: 'http://221.230.55.29:31919',
+  // baseUrl: 'http://221.230.55.29:31919',
-  // baseUrl: 'https://c5a6-117-90-37-10.ap.ngrok.io',
+  baseUrl: 'https://c5a6-117-90-37-10.ap.ngrok.io',
   // webUrl: 'https://smartwater.anxinyun.cn',
   // pcode: 'fce4afe2-5b6a-408a-ab18-a2afa7fa027c',
   imgUrl: 'http://test.resources.anxinyun.cn/',

weapp/src/packages/patrol/index.jsx

@@ -34,6 +34,12 @@ const Index = () => {
   const [sourceRoadStartSel, setSourceRoadStartSel] = useState([])
   const [sourceRoadEndSel, setSourceRoadEndSel] = useState([])
 
+  const prjType = [
+    { text: '道路', value: 'road'},
+    { text: '桥梁', value: 'bridge'},
+    { text: '涵洞', value: 'culvert'},
+    { text: '其他', value: 'other'},
+  ]
   const prjTypeSelector = ['道路', '桥梁', '涵洞', '其他']
   const [roadStartSel, setRoadStartSel] = useState([])
   const [roadEndSel, setRoadEndSel] = useState([])
@@ -60,8 +66,15 @@ const Index = () => {
         Taro.hideLoading()
         if (res.statusCode == 200 || res.statusCode == 204) {
           const { data } = res
+          let showPrjType = ''
+          for (const item of prjType) {
+            if (item.value === data.projectType) {
+              showPrjType = item.text
+              break
+            }
+          }
           setReportType(data.reportType)
-          setProjectType(data.projectType)
+          setProjectType(showPrjType || data.projectType)
           setRoad(data.road)
           setRoadSectionStart(data.roadSectionStart)
           setRoadSectionEnd(data.roadSectionEnd)
@@ -118,6 +131,7 @@ const Index = () => {
       })
     }
   }, [])
+
   useEffect(() => {
     setRoadStartSel(sourceRoadStartSel)
     setRoadEndSel(sourceRoadEndSel)
@@ -148,9 +162,11 @@ const Index = () => {
       Taro.showToast({ title: '工程类型错误', icon: 'none' })
       return
     }
+    const reportProjectType = prjType[prjTypeSelector.indexOf(projectType)].value
+
     let data = {
       reportType,
-      projectType,
+      projectType: reportProjectType,
       road,
       roadSectionStart,
       roadSectionEnd,

weapp/src/packages/patrolView/index.jsx

@@ -84,6 +84,8 @@ function Index() {
   })
 
   useDidShow(() => {
+    setPage(0)
+    setNum(Math.random())
     let refresh = Taro.getStorageSync('refresh'); // 返回列表需要刷新
     if (refresh) {
       Taro.removeStorageSync('refresh'); // 返回列表需要刷新

web/client/src/sections/fillion/actions/infor.js

@@ -41,7 +41,7 @@ export function putOperaTional (query) {
       data: query,
       actionType: 'PUT_OPERA_TIONAL',
       url: ApiTable.putOperaTional,
-      msg: { error: '获取车辆信息失败' },
+      msg: { option: '编辑车辆信息' },
 
    });
 }

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

@@ -1501,7 +1501,7 @@ const BrideTable = (props) => {
                 dataIndex: 'creatTime',
                 valueType: 'dateTimeRange',
                 hideInSearch: true,
-                width: 120,
+                width: 160,
                 fixed: 'right',
                 render: (dom, record) => {
                     return <div><Button type="link"
@@ -1685,7 +1685,7 @@ const BrideTable = (props) => {
                 dataIndex: 'creatTime',
                 valueType: 'dateTimeRange',
                 hideInSearch: true,
-                width: 120,
+                width: 160,
                 fixed: 'right',
                 render: (dom, record) => {
                     return <div><Button type="link"

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

@@ -1502,7 +1502,7 @@ const openModal = (type, record) => {
                 dataIndex: 'creatTime',
                 valueType: 'dateTimeRange',
                 hideInSearch: true,
-                width: 120,
+                width: 160,
                 fixed: 'right',
                 render: (dom, record) => {
                     return <div><Button type="link"
@@ -1559,10 +1559,10 @@ const openModal = (type, record) => {
                     rowKey='id'
                     onReset={(v) => {
                         const { id } = depMessage[0]
-                        console.log(id)
+                        // console.log(id)
-                        setRegionId(id)
+                        // setRegionId(id)
-                        setPlaceType(-1)
+                        // setPlaceType(-1)
-                        setDay([moment('2022-03-01').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')])
+                        // setDay([moment('2022-03-01').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')])
                         setSitename('')
                     }}
                     rowSelection={{

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

@@ -80,15 +80,15 @@ const DetailList = (props) => {
             dataIndex: 'road',
             align: 'center',
             render: (text, record) => {
-                return '';
+                return fileList?.road?.roadName;
             }
         }, {
             title: '资料类型',
-            key: 'address',
+            key: 'fileType',
-            dataIndex: 'address',
+            dataIndex: 'fileType',
             align: 'center',
             render: (text, record) => {
-                return '';
+                return fileList?.type?.fileType;
             }
         },
         {
@@ -120,7 +120,7 @@ const DetailList = (props) => {
             align: 'center'
         }, {
             title: '操作',
-            width: 200,
+            width: 160,
             key: 'option',
             valueType: 'option',
             align: 'center',
@@ -218,7 +218,7 @@ const RoadNameList = (props) => {
     ];
 
     useEffect(() => {
-        if (roads && roads instanceof Array) {
+        if (roads && roads instanceof Array && roads.length) {
             setSelectRoad(roads[0].rId)
             onChange(roads[0]);
         }

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

@@ -69,7 +69,7 @@ const hightModal = (type, record) => {
                 dataIndex: 'creatTime',
                 valueType: 'dateTimeRange',
                 hideInSearch: true,
-                width: 120,
+                width: 160,
                 fixed: 'right',
                 render: (dom, record) => {
                     return <div><Button type="link"

web/client/src/sections/fillion/components/infor/details.js

@@ -13,7 +13,7 @@ const UserModal = (props) => {
     const [recordsay, setRecordsay] = useState()//必填数据
     // const [success, setSuccess] = useState() //状态
     // const [establishment, setEstablishment] = useState() //业户类型
-    console.log(recortd)
+    // console.log(recortd)
     useEffect(() => {
         const array = []
         if (rewkeys === 'transportation') {

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

@@ -201,7 +201,7 @@ const InForTable = (props) => {
                 },
                 fieldProps: {
                     onChange: (value, cs) => {
-                        console.log(cs)
+                        // console.log(cs)
                         setTestTime(cs)
                     },
                     getPopupContainer: (triggerNode) => triggerNode.parentNode,
@@ -347,7 +347,7 @@ const InForTable = (props) => {
                 dataIndex: 'creatTime',
                 valueType: 'dateTimeRange',
                 hideInSearch: true,
-                width: 120,
+                width: 160,
                 fixed: 'right',
                 render: (dom, record) => {
                     return <div><Button type="link"
@@ -423,7 +423,7 @@ const InForTable = (props) => {
                         setTestTime('')
                     }}
                     request={async (params) => {
-                        console.log(params)
+                        // console.log(params)
                         const query = {
                             limit: params.pageSize,
                             page: params.current - 1,
@@ -436,7 +436,7 @@ const InForTable = (props) => {
                         }
                         setRowSelected([]);
                         const res = await dispatch(getPurchase(query));
-                        console.log(res)
+                        // console.log(res)
                         setCounts(res.payload.data.rows)
                         return {
                             ...res,
@@ -448,7 +448,7 @@ const InForTable = (props) => {
                         optionRender: (searchConfig, formProps, dom) => [
                             ...dom.reverse(),
                             <Popconfirm title="确认导出?" onConfirm={() => { 
-                                console.log(rowSelected)
+                                // console.log(rowSelected)
 
                                 props.exports(rowSelected, counts) }}>
                                 <Button

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

@@ -104,7 +104,7 @@ const OperaTionalTable = (props) => {
                 dataIndex: 'creatTime',
                 valueType: 'dateTimeRange',
                 hideInSearch: true,
-                width: 120,
+                width: 160,
                 fixed: 'right',
                 render: (dom, record) => {
                     return <div><Button type="link"
@@ -691,7 +691,7 @@ const OperaTionalTable = (props) => {
                 dataIndex: 'creatTime55',
                 valueType: 'dateTimeRange',
                 hideInSearch: true,
-                width: 120,
+                width: 160,
                 fixed: 'right',
                 render: (dom, record) => {
                     return <div><Button type="link"
@@ -1324,7 +1324,7 @@ const OperaTionalTable = (props) => {
                 dataIndex: 'creatTime',
                 valueType: 'dateTimeRange',
                 hideInSearch: true,
-                width: 120,
+                width: 160,
                 fixed: 'right',
                 render: (dom, record) => {
                     return <div><Button type="link"
@@ -1794,7 +1794,7 @@ const OperaTionalTable = (props) => {
                 dataIndex: 'creatTime',
                 valueType: 'dateTimeRange',
                 hideInSearch: true,
-                width: 120,
+                width: 160,
                 fixed: 'right',
                 render: (dom, record) => {
                     return <div><Button type="link"

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

@@ -136,7 +136,7 @@ const DetailList = (props) => {
             align: 'center'
         }, {
             title: '操作',
-            width: 200,
+            width: 160,
             key: 'option',
             valueType: 'option',
             align: 'center',
@@ -236,7 +236,7 @@ const PatrolNameList = (props) => {
                     return {
                         onClick: () => {
                             if (record) {
-                                console.log('record:', record)
+                                // console.log('record:', record)
                                 onChange(record);
                             }
                         },

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

@@ -77,7 +77,7 @@ const ProjectModal = (props) => {
                 visible={visible}
                 onVisibleChange={onVisibleChange}
                 onFinish={(values) => {
-                    console.log(values)
+                    // console.log(values)
                     if (rewkeys === 'road') {
                         if (typecard == 'compile') {
                             setDelet(values)
@@ -113,7 +113,7 @@ const ProjectModal = (props) => {
                         }
                     }
                 }}
-                initialValues={{ ...recortd, done: recortd.done ? 'true' : 'false' }}
+                initialValues={{ ...recortd, done: typecard == 'compile'?recortd?.done ? 'true' : 'false':'' }}
             >
                 {typecard == 'compile' ?
                     <ProForm.Group

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

@@ -69,7 +69,7 @@ const promotionalTable = (props) => {
          dataIndex: 'creatTime',
          valueType: 'dateTimeRange',
          hideInSearch: true,
-         width: 120,
+         width: 160,
          fixed: 'right',
          render: (dom, record) => {
             return <div style={{ position: 'relative', marginTop: '-30px' }}>

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

@@ -402,7 +402,7 @@ const PublicTable = (props) => {
                 dataIndex: 'creatTime',
                 valueType: 'dateTimeRange',
                 hideInSearch: true,
-                width: 120,
+                width: 160,
                 fixed: 'right',
                 render: (dom, record) => {
                     return <div><Button type="link"
@@ -1097,7 +1097,7 @@ const PublicTable = (props) => {
                 dataIndex: 'creatTime',
                 valueType: 'dateTimeRange',
                 hideInSearch: true,
-                width: 120,
+                width: 160,
                 fixed: 'right',
                 render: (dom, record) => {
                     return <div><Button type="link"

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

@@ -1170,7 +1170,7 @@ const TransporTationTable = (props) => {
                 dataIndex: 'creatTime',
                 valueType: 'dateTimeRange',
                 hideInSearch: true,
-                width: 120,
+                width: 160,
                 fixed: 'right',
                 render: (dom, record) => {
                     // node = renderRemoveUser('移除');
@@ -2328,7 +2328,7 @@ const TransporTationTable = (props) => {
                 dataIndex: 'creatTime',
                 valueType: 'dateTimeRange',
                 hideInSearch: true,
-                width: 120,
+                width: 160,
                 fixed: 'right',
                 render: (dom, record) => {
                     return <div><Button type="link"
@@ -3485,7 +3485,7 @@ const TransporTationTable = (props) => {
                 dataIndex: 'creatTime',
                 valueType: 'dateTimeRange',
                 hideInSearch: true,
-                width: 120,
+                width: 160,
                 fixed: 'right',
                 render: (dom, record) => {
                     return <div><Button type="link"
@@ -3672,7 +3672,7 @@ const TransporTationTable = (props) => {
                 dataIndex: 'creatTime',
                 valueType: 'dateTimeRange',
                 hideInSearch: true,
-                width: 120,
+                width: 160,
                 fixed: 'right',
                 render: (dom, record) => {
                     return <div><Button type="link"

web/client/src/sections/fillion/nav-item.js

@@ -32,6 +32,9 @@ export function getNavItem(user, dispatch) {
             <Menu.Item key="fillionpublic">
                 <Link to="/fillion/public">公交管理</Link>
             </Menu.Item>
+            <Menu.Item key="fileCont">
+                <Link to="/fillion/file">档案管理</Link>
+            </Menu.Item>
             {/* <Menu.Item key="fillionvideois">
                 <Link to="/fillion/videois">视频管理</Link>
             </Menu.Item> */}

web/client/src/sections/quanju/containers/example.js

@@ -35,12 +35,14 @@ const Example = (props) => {
                     document.body.clientHeight / 1080
                 )})`, */
             }}>
-                <Gis />
+
                 <div style={{ width: "100%", height: "10%" }}>
                     <Header tabChange={tabChange} tabKey={tabKey} dispatch={dispatch} />
                 </div>
                 <div style={{ position: 'absolute', width: "100%", height: "90%" }}>
+                    <Gis />
                     <Footer tabKey={tabKey} dispatch={dispatch} />
+
                 </div>
 
             </div>

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

@@ -32,6 +32,8 @@ function Rightbottom(props) {
   // {name: '等外公路', value: 30},
 
   // ]
+  console.log(data,'数据')
+  data?.sort((a,b)=>b.value - a.value)
   data?.forEach(d => {
     name.push(d.name)
     emptyName.push({

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

@@ -115,7 +115,7 @@ const Build = (props) => {
     console.log(localStorage.getItem("qndmn"),'七牛')
     console.log(xuandata,"宣传")
     return (
-       <div className='bgbuild'>
+       <>
         <div className='bgbuild-left'>
             <Module title={"各种状态公路数量统计"} style={{ width: "100%",
             height:" 33%"
@@ -204,7 +204,7 @@ const Build = (props) => {
                     }
                     // return <video src={`${localStorage.getItem("qndmn")}/${item.video!==null&&item.video.length!==0?item.video[0]:""}`} autoPlay="autoplay" loop></video>
                 }
-              }):""}
+              }):<video src='#'></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> */}
               </Carousel>
                <h2>全面建设好农村公路，切实发挥先行官作用</h2>
@@ -225,7 +225,7 @@ const Build = (props) => {
            data={keepThreeNum(safetyData)}/>:<NoData/>}
             </Module>
         </div>
-        </div>
+        </>
     )
 }
 function mapStateToProps(state) {

web/client/src/sections/quanju/containers/footer/build/style.less

@@ -3,14 +3,14 @@
         font-size: 10px;
     }
 }
-.bgbuild{
+// .bgbuild{
-    // box-sizing: border-box;
+    // // box-sizing: border-box;
-    padding: 0 15px 0 15px;
+    // padding: 0 15px 0 15px;
-    width: 100%;
+    // width: 100%;
-    height: 100%;
+    // height: 100%;
-    // display: flex;
+    // // display: flex;
-    position: relative;
+    // position: relative;
-    justify-content: space-between;
+    // justify-content: space-between;
     .bgbuild-left{
         position: absolute;
         left: 0;
@@ -302,6 +302,6 @@
             }
         }
     }
-}
+
 
 

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

@@ -29,11 +29,9 @@ const Conserve = (props) => {
 
     return (
        <div style={{ width: '100%', height: '100%', }}>
-         <div style={{ display: 'flex', width: '100%', height: '100%', justifyContent: 'space-between' }}>
             <Left roadData={roadData} loading={loading} />
             <Right highwaysData={highwaysData} roadMaintenances={roadMaintenances}/>
        </div>
-       </div>
     )
 }
 function mapStateToProps(state) {

web/client/src/sections/quanju/containers/footer/conserve/left.js

@@ -6,7 +6,7 @@ import LeftTop from './left/left-top'
 const Left = (props) => {
     const { roadData, loading } = props
     return (
-        <div style={{ display: 'flex', flexDirection: 'column', width: "23%", height: "100%", marginLeft: "1%" }}>
+        <div style={{ position: 'absolute', left: 0, width: "23%", height: "100%", marginLeft: "1%" }}>
             <LeftTop roadData={roadData} loading={loading} />
             <LeftCenter roadData={roadData} loading={loading} />
             <LeftBottom roadData={roadData} loading={loading} />

web/client/src/sections/quanju/containers/footer/conserve/left/left-bottom.js

@@ -2,12 +2,12 @@ import React from 'react'
 import Module from '../../../public/module'
 import PieChart from '../chart/pie-chart';
 
-let colorList = [
+let color = [
   "rgba(7,185,254,1)",
   "rgba(28,96,254,1)",
   "rgba(4,251,240,1)",
 ]
-let underColorList = [
+let underColor = [
   "rgba(7,185,254,0.5)",
   "rgba(28,96,254,0.5)",
   "rgba(4,251,240,0.5)",
@@ -22,9 +22,14 @@ const LeftBottom = (props) => {
     totalData += s.isGreen
     return {
       name: grade[index],
-      value: s.isGreen.toFixed(3)
+      value: s.isGreen.toFixed(3),
+      colorList: color[index],
+      underColorList: underColor[index]
+
     }
   })
+  let colorList = value?.map(c =>c.colorList)
+  let underColorList = value?.map(c =>c.underColorList)
 
   return (
     <>

web/client/src/sections/quanju/containers/footer/conserve/left/left-center.js

@@ -114,7 +114,7 @@ const LeftCenter = (props) => {
                     axisLabel: {
                         show: true,
                         backgroundColor: {
-                            image: 'assets/images/quanju/kelvhua_bdbg.png',
+                            image: '/assets/images/quanju/kelvhua_bdbg.png',
                         },
                         width: 70,
                         height: 22,
@@ -228,9 +228,9 @@ const LeftCenter = (props) => {
                 <Row align='middle' style={{ padding: '10px 3% 0px 15px' }}>
                     <Col span={15}>
                         <img src='/assets/images/quanju/kelvhua_icon.png' alt='icon' style={{ width: '26%' }} />
-                        <span style={{ color: '#C2EEFF', marginLeft: 5, textShadow: '0px 0px 4px #07B9FE' }}>可绿化里程总数</span>
+                        <span style={{ color: '#C2EEFF', marginLeft: 5 }}>可绿化里程总数</span>
                     </Col>
-                    <Col span={9} style={{ fontSize: 24, fontFamily: 'YouSheBiaoTiHei', color: '#fff' }}>{totalData.toFixed(3) || 0}</Col>
+                    <Col span={9} style={{ fontSize: 24, fontFamily: 'YouSheBiaoTiHei', color: '#fff', textShadow: '0px 0px 4px #07B9FE' }}>{totalData.toFixed(3) || 0}</Col>
                 </Row>
                 <div ref={chartRef} style={{ height: "14.5vh", width: "100%" }}></div>
 

web/client/src/sections/quanju/containers/footer/conserve/right.js

@@ -6,7 +6,7 @@ import RightTop from './right/right-top'
 const Right = (props) => {
     const { highwaysData, roadMaintenances } = props
     return (
-        <div style={{ display: 'flex', flexDirection: 'column', width: "23%", height: "100%", marginRight: "1%", }}>
+        <div style={{ position: 'absolute', right: 0, width: "23%", height: "100%", marginRight: "1%", }}>
             <RightTop highwaysData={highwaysData} />
             <RightCenter highwaysData={highwaysData} />
             <RightBottom roadMaintenances={roadMaintenances} />

web/client/src/sections/quanju/containers/footer/conserve/right/right-bottom.js

@@ -2,18 +2,18 @@ import React from 'react'
 import Module from '../../../public/module'
 import PieChart from '../chart/pie-chart';
 
-let colorList = [
+// let colorList = [
-  "rgba(7,185,254,1)",
+//   "rgba(7,185,254,1)",
-  "rgba(28,96,254,1)",
+//   "rgba(28,96,254,1)",
-  "rgba(4,251,240,1)",
+//   "rgba(4,251,240,1)",
-  "rgba(255,194,20,1)"
+//   "rgba(255,194,20,1)"
-]
+// ]
-let underColorList = [
+// let underColorList = [
-  "rgba(7,185,254,0.5)",
+//   "rgba(7,185,254,0.5)",
-  "rgba(28,96,254,0.5)",
+//   "rgba(28,96,254,0.5)",
-  "rgba(4,251,240,0.5)",
+//   "rgba(4,251,240,0.5)",
-  "rgba(255,194,20,0.5)"
+//   "rgba(255,194,20,0.5)"
-]
+// ]
 
 const type = ['culvert', '', 'road', 'bridge']
 
@@ -30,27 +30,37 @@ const RightBottom = (props) => {
       case 'road':
         return {
           name: '道路',
-          value: r.count
+          value: r.count,
+          colorList: 'rgba(7,185,254,1)',
+          underColorList: 'rgba(7,185,254,0.5)'
+
         };
       case 'culvert':
         return {
           name: '涵洞',
-          value: r.count
+          value: r.count,
+          colorList: 'rgba(4,251,240,1)',
+          underColorList: 'rgba(4,251,240,0.5)'
         };
       case 'bridge':
         return {
           name: '桥梁',
-          value: r.count
+          value: r.count,
+          colorList: 'rgba(28,96,254,1)',
+          underColorList: 'rgba(28,96,254,0.5)'
         };
-      case '其他':
+      case 'other':
         return {
           name: '其他',
-          value: r.count
+          value: r.count,
+          colorList: 'rgba(255,194,20,1)',
+          underColorList: 'rgba(255,194,20,0.5)'
         };
     }
   }).filter(f => f !== undefined)
-  // const otherNum = totalData - typesNum
+  console.log('list:',list);
-  // otherNum !== null && list?.push({ name: '其他', value: otherNum })
+  let colorList = list?.map(c => c.colorList)
+  let underColorList =list?.map(c => c.underColorList)
   const style = { height: "31%", marginTop: "3%" }
   return (
     <>

web/client/src/sections/quanju/containers/footer/gis/gis.js

@@ -21,9 +21,9 @@ const Gis = (props) => {
   const loadMap = () => {
     const map = new AMap.Map(MAPID, {
       resizeEnable: true,
-      center: [115.912663, 28.543149],//地图中心点，初始定位加载显示楼块
+      center: [115.99255, 28.503617],//地图中心点，初始定位加载显示楼块
-      zoom: 15,//地图显示的缩放级别
+      zoom: 8,//地图显示的缩放级别
-      zooms: [10, 12],
+      zooms: [8, 18],
       pitch: 0, // 地图俯仰角度，有效范围 0 度- 83 度
       viewMode: '3D', // 地图模式
       mapStyle: 'amap://styles/fb26776387242721c2fc32e2cb1daccc',
@@ -42,8 +42,8 @@ const Gis = (props) => {
   };
 
   return (
-    <div style={{ position: 'absolute', width: '100%', backgroundColor: '#101824', height: '100%', minHeight: 700 }}>
+    <div style={{ position: 'absolute', width: '100%',  height: '100%' }}>
-      <div id={MAPID} style={{ width: '100%', height: '100%', background: "#101824", minHeight: 700 }} />
+      <div id={MAPID} style={{ width: '100%', height: '100%',}} />
       {mapObj ? <Bounds map={mapObj} /> : ''}
     </div >
   )

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

@@ -56,12 +56,12 @@ const Guanli = (props) => {
     // datalist.fill({licensePlate:"赣A44454",overrunRate:"30%",fine:"200元",processingTime:"2020年4月1日"})
     const renderContent = () => {
         return <div style={{height:"100%"}}>
-          {rightitemlist && rightitemlist.length!==0?rightitemlist?.map(({ id, licensePlate, overrunRate,fine,processingTime }, index) => {
+          {rightitemlist && rightitemlist.length!==0?rightitemlist?.map(({ id, licensePlate, overrunRate,fine,processingTime,deductPoints }, index) => {
            if(index<120){
             return <div key={index} className='guanli-right-item'>
             <span>{licensePlate}</span>
             <span>{overrunRate}%</span>
-            <span>{fine}{fine?"元":""}</span>
+            <span>{deductPoints?`-${deductPoints}分`:""}和-{fine}{fine?"元":""}</span>
             <span>{processingTime}</span>
         </div>
            }
@@ -78,7 +78,7 @@ const Guanli = (props) => {
     }
     //   renderContent()
     return (
-        <div className='guanli'>
+        <>
         <div className='guanli-left'> 
         <Module style={{height:"100%"}} title="检测点治超处理占比" customize={true}>
         {leftDatas && leftDatas.length!==0?<AutoRollComponent content={renderLeftContent()}
@@ -105,7 +105,7 @@ const Guanli = (props) => {
             divHeight={"100%"} divId={"chart-overview-deviceList"} />:<NoData style={{height:"70%"}}/>}
         </Module>
         </div>
-        </div>
+        </>
     )
 }
 function mapStateToProps(state) {

web/client/src/sections/quanju/containers/footer/guanli/style.less

@@ -3,12 +3,12 @@
         font-size: 12px;
     }
 }
-.guanli{
+// .guanli{
-    // box-sizing: border-box;
+//     // box-sizing: border-box;
-    padding: 0 15px 0 15px;
+//     padding: 0 15px 0 15px;
-    width: 100%;
+//     width: 100%;
-    height: 100%;
+//     height: 100%;
-    position: relative;
+//     position: relative;
     // display: flex;
     // justify-content: space-between;
     .guanli-left{
@@ -172,6 +172,6 @@
             }
         }
     }
-}
+
 
 

web/client/src/sections/quanju/containers/footer/leadership/centerLeft.js

@@ -8,7 +8,7 @@ const CenterLeft = (props) => {
     const { dispatch } = props
     return (
         <>
-            <div style={{ width: "48%", height: "100%", float: "left", marginLeft: "1%" }}>
+            <div style={{ width: "48%", height: "100%", position: "absolute", left: "25%" }}>
                 <Centerlefttop dispatch={dispatch} />
                 <Centerleftbottom dispatch={dispatch} />
             </div>

web/client/src/sections/quanju/containers/footer/leadership/centerleft/daolu.js

@@ -18,7 +18,7 @@ const Right = (props) => {
             setNums(res.payload.data.reportCount.filter((item, index) => {
                 return item.projectType == "road"
             }))
-            console.log(res.payload.data);
+            // console.log(res.payload.data);
         })
     }, [])
     useEffect(() => {
@@ -33,6 +33,7 @@ const Right = (props) => {
         return (
 
             <div style={{ width: "100%", height: "100%" }}>
+                {/* <Spin spinning={!nums} tip="Loading" style={{ width: "100%", height: "100%" }}> */}
                 {
                     list.map((item, index) => {
                         return (
@@ -53,30 +54,35 @@ const Right = (props) => {
                         )
                     })
                 }
+                {/* </Spin> */}
             </div>
         )
     }
     return (
         <>
+            {/* <Spin spinning={!nums && list && roads} tip="Loading" size="large" > */}
             <div style={{ width: "100%", height: "100%", float: "right", marginRight: "1%", position: "relative" }}>
 
                 <div style={{ width: "100%", height: "43%", position: "relative", left: "1%" }}>
                     <div style={{ width: "96%", position: "relative", left: "2%" }}>
+                        {/* <Spin spinning={!roads} tip="Loading" > */}
                         <p style={{ position: "absolute", color: "rgba(216,240,255,0.8)", top: "10px" }}>占比<span style={{ fontFamily: " PingFangSC-Regular, PingFang SC" }}>{((roads?.["县"] / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100).toFixed(2)}</span>%</p>
                         <p style={{ width: "50%", position: "absolute", right: "0%", fontFamily: "YouSheBiaoTiHei", textAlign: "right", fontSize: "24px", color: "#F5FCFF", marginLeft: "10%" }}>{roads?.["县"].toFixed(3)}<span style={{ color: "#F5FCFF", fontSize: "16px", fontFamily: "PingFangSC-Regular, PingFang SC", marginLeft: "5%" }}>公里</span><span style={{ fontSize: "18px", color: "rgba(216,240,255,0.8)", fontFamily: "PingFangSC-Regular, PingFang SC", marginLeft: "5%" }}>县道道路</span></p>
+                        {/* </Spin> */}
                     </div>
                     <div style={{ width: "96%", position: "relative", left: "2%", height: "50%" }}>
-                        <div style={{ width: (roads?.["县"] / (roads?.["乡"] + roads?.["村"] + roads?.["县"])).toFixed(4) * 100 + "%" || "", height: "20%", transform: "skewX(-45deg)", backgroundColor: "#18ABFF", float: "left", marginTop: "5.6%" }}>
+                        <div style={{ width: parseInt((roads?.["县"] / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100) + "%" || "", height: "20%", transform: "skewX(-45deg)", backgroundColor: "#18ABFF", float: "left", marginTop: "5.6%" }}>
 
                         </div>
-                        {/* <div style={{ width: "15%", height: "20%", backgroundColor: "#df0001", float: "left", marginTop: "5.6%" }}>
+                        <div style={{ width: parseInt(((roads?.["乡"] + roads?.["村"]) / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100) + "%" || "", height: "20%", transform: "skewX(-45deg)", backgroundColor: "#0A72FF", float: "left", marginTop: "5.6%" }}></div>
-
-</div> */}
-                        <div style={{ width: ((roads?.["乡"] + roads?.["村"]) / (roads?.["乡"] + roads?.["村"] + roads?.["县"])).toFixed(4) * 100 + "%" || "", height: "20%", transform: "skewX(-45deg)", backgroundColor: "#0A72FF", float: "left", marginTop: "5.6%" }}></div>
                     </div>
                     <div style={{ width: "96%", position: "relative", left: "2%" }}>
+                        {/* <Spin spinning={!roads} tip="Loading" > */}
+
                         <p style={{ width: "50%", position: "absolute", color: "rgba(216,240,255,0.8)", fontSize: "18px" }}>乡村道道路<span style={{ marginLeft: "4%", fontFamily: "YouSheBiaoTiHei", fontSize: "24px", color: "#F5FCFF" }}>{(roads?.["乡"] + roads?.["村"]).toFixed(3)}</span><span style={{ marginLeft: "4%" }}>公里</span></p>
                         <p style={{ position: "absolute", right: "0", color: "rgba(216,240,255,0.8)", top: "10px" }}>占比<span>{(((roads?.["乡"] + roads?.["村"]) / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100).toFixed(2)}</span><span>%</span></p>
+                        {/* </Spin> */}
+
                     </div>
                 </div>
                 <div style={{ height: "80%", width: "100%", position: "relative", left: "5%", top: "-8%" }}>
@@ -99,6 +105,7 @@ const Right = (props) => {
                 </div>
 
             </div>
+            {/* </Spin> */}
         </>
     )
 }

web/client/src/sections/quanju/containers/footer/leadership/centerleft/handong.js

@@ -2,6 +2,7 @@ import React, { useState, useEffect } from 'react'
 import Lun from "../right/lunbo"
 import { getRoadmaintain, getdaolutongji } from "../../../../actions/example"
 import moment from 'moment'
+// import { Spin } from 'antd'
 
 
 const Right = (props) => {
@@ -34,6 +35,8 @@ const Right = (props) => {
         return (
 
             <div style={{ width: "100%", height: "100%" }}>
+                {/* <Spin spinning={!nums} tip="Loading" style={{ width: "100%", height: "100%" }}> */}
+
                 {
                     list.map((item, index) => {
                         console.log(list);
@@ -57,31 +60,35 @@ const Right = (props) => {
                         )
                     })
                 }
+                {/* </Spin> */}
             </div>
         )
     }
     return (
         <>
+
             <div style={{ width: "100%", height: "100%", float: "right", marginRight: "1%", position: "relative" }}>
 
                 <div style={{ width: "100%", height: "43%", position: "relative", left: "1%" }}>
+                    {/* <Spin spinning={!roads} tip="Loading"  ></Spin> */}
                     <div style={{ width: "96%", position: "relative", left: "2%" }}>
                         <p style={{ position: "absolute", color: "rgba(216,240,255,0.8)", top: "10px" }}>占比<span style={{ fontFamily: " PingFangSC-Regular, PingFang SC" }}>{((roads?.["县"] / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100).toFixed(2)}</span>%</p>
                         <p style={{ width: "50%", position: "absolute", right: "0%", textAlign: "right", fontFamily: "YouSheBiaoTiHei", fontSize: "24px", color: "#F5FCFF", marginLeft: "10%" }}>{roads?.["县"].toFixed(0)}<span style={{ color: "#F5FCFF", fontSize: "16px", fontFamily: "PingFangSC-Regular, PingFang SC", marginLeft: "5%" }}>个</span><span style={{ fontSize: "18px", color: "rgba(216,240,255,0.8)", fontFamily: "PingFangSC-Regular, PingFang SC", marginLeft: "5%" }}>县涵洞</span></p>
                     </div>
                     <div style={{ width: "96%", position: "relative", left: "2%", height: "50%" }}>
-                        <div style={{ width: (roads?.["县"] / (roads?.["乡"] + roads?.["村"] + roads?.["县"])).toFixed(4) * 100 + "%" || "", height: "20%", transform: "skewX(-45deg)", backgroundColor: "#18ABFF", float: "left", marginTop: "5.6%" }}>
+                        <div style={{ width: parseInt((roads?.["县"] / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100) + "%" || "", height: "20%", transform: "skewX(-45deg)", backgroundColor: "#18ABFF", float: "left", marginTop: "5.6%" }}>
 
                         </div>
                         {/* <div style={{ width: "15%", height: "20%", backgroundColor: "#df0001", float: "left", marginTop: "5.6%" }}>
 
                         </div> */}
-                        <div style={{ width: ((roads?.["乡"] + roads?.["村"]) / (roads?.["乡"] + roads?.["村"] + roads?.["县"])).toFixed(4) * 100 + "%" || "", height: "20%", transform: "skewX(-45deg)", backgroundColor: "#0A72FF", float: "left", marginTop: "5.6%" }}></div>
+                        <div style={{ width: parseInt(((roads?.["乡"] + roads?.["村"]) / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100) + "%" || "", height: "20%", transform: "skewX(-45deg)", backgroundColor: "#0A72FF", float: "left", marginTop: "5.6%" }}></div>
                     </div>
                     <div style={{ width: "96%", position: "relative", left: "2%" }}>
                         <p style={{ width: "50%", position: "absolute", color: "rgba(216,240,255,0.8)", fontSize: "18px" }}>乡村涵洞<span style={{ marginLeft: "4%", fontFamily: "YouSheBiaoTiHei", fontSize: "24px", color: "#F5FCFF" }}>{(roads?.["乡"] + roads?.["村"]).toFixed(0)}</span><span style={{ marginLeft: "4%" }}>个</span></p>
                         <p style={{ position: "absolute", right: "0", color: "rgba(216,240,255,0.8)", top: "10px" }}>占比<span>{(((roads?.["乡"] + roads?.["村"]) / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100).toFixed(2)}</span><span>%</span></p>
                     </div>
+
                 </div>
                 <div style={{ height: "80%", width: "100%", position: "relative", left: "5%", top: "-8%" }}>
                     <div style={{ width: "100%", height: "40px"/* , backgroundColor: "#fff" */, position: "relative" }}>

web/client/src/sections/quanju/containers/footer/leadership/centerleft/qiqoliang.js

@@ -65,10 +65,10 @@ const Right = (props) => {
                         <p style={{ width: "25%", position: "absolute", right: "0%", fontFamily: "YouSheBiaoTiHei", fontSize: "24px", color: "#F5FCFF", marginLeft: "10%", textAlign: "right" }}>{roads?.["大桥"]}<span style={{ color: "#F5FCFF", fontSize: "16px", fontFamily: "PingFangSC-Regular, PingFang SC", marginLeft: "5%" }}>座</span><span style={{ fontSize: "18px", color: "rgba(216,240,255,0.8)", fontFamily: "PingFangSC-Regular, PingFang SC", marginLeft: "5%" }}>大桥</span></p>
                     </div>
                     <div style={{ width: "96%", position: "relative", left: "2%", height: "50%" }}>
-                        <div style={{ width: (roads?.["大桥"] / (roads?.["小桥"] + roads?.["中桥"] + roads?.["大桥"])).toFixed(2) * 100 + "%" || "", height: "20%", transform: "skewX(-45deg)", backgroundColor: "#18ABFF", float: "left", marginTop: "5.6%" }}>
+                        <div style={{ width: parseInt((roads?.["大桥"] / (roads?.["小桥"] + roads?.["中桥"] + roads?.["大桥"])) * 100) + "%" || "", height: "20%", transform: "skewX(-45deg)", backgroundColor: "#18ABFF", float: "left", marginTop: "5.6%" }}>
 
                         </div>
-                        <div style={{ width: ((roads?.["中桥"] + roads?.["小桥"]) / (roads?.["小桥"] + roads?.["中桥"] + roads?.["大桥"])).toFixed(2) * 100 + "%" || "", height: "20%", transform: "skewX(-45deg)", backgroundColor: "#0A72FF", float: "left", marginTop: "5.6%" }}>
+                        <div style={{ width: parseInt(((roads?.["中桥"] + roads?.["小桥"]) / (roads?.["小桥"] + roads?.["中桥"] + roads?.["大桥"])) * 100) + "%" || "", height: "20%", transform: "skewX(-45deg)", backgroundColor: "#0A72FF", float: "left", marginTop: "5.6%" }}>
 
                         </div>
                         {/* <div style={{ width: (roads?.["小桥"] / (roads?.["小桥"] + roads?.["中桥"] + roads?.["大桥"])).toFixed(2) * 100 + "%" || "", height: "20%", transform: "skewX(-45deg)", backgroundColor: "#18ABFF", float: "left", marginTop: "5.6%", borderRadius: "0 2% 2% 0" }}></div> */}

web/client/src/sections/quanju/containers/footer/leadership/left.js

@@ -7,7 +7,7 @@ const Left = (props) => {
     const { dispatch } = props
     return (
         <>
-            <div style={{ width: "23%", height: "100%", float: "left", marginLeft: "1%" }}>
+            <div style={{ width: "23%", height: "100%", position: "absolute", left: "1%" }}>
                 <Lefttop dispatch={dispatch} />
 
                 <Leftbottom dispatch={dispatch} />

web/client/src/sections/quanju/containers/footer/leadership/left/left-top.js

@@ -15,9 +15,12 @@ const Lefttop = (props) => {
         const shuju = dispatch(getGodshuju()).then((res) => {
             // console.log(res);
             setMass(res.payload.data.index)
+            // setMass(70)
             setspeed(res.payload.data.speed)
         })
     }, [])
+
+    // console.log(mass);
     return (
         <>
             <Module style={style} title={"道路拥堵指数"} >

web/client/src/sections/quanju/containers/footer/leadership/right.js

@@ -7,7 +7,7 @@ const Right = (props) => {
     const { dispatch } = props
     return (
         <>
-            <div style={{ width: "25%", height: "100%", float: "right", marginRight: "1%" }}>
+            <div style={{ width: "25%", height: "100%", position: "absolute", left: "74%" }}>
                 <Righttop dispatch={dispatch} />
                 <Rightbottom dispatch={dispatch} />
             </div>

web/client/src/sections/quanju/containers/footer/leadership/right/right-bottom.js

@@ -22,6 +22,7 @@ const Rightbottom = (props) => {
     const renderBody = () => {
         return (
             <div style={{ width: "100%", height: "50%" }}>
+                {/* <Spin spinning={!list} tip="Loading" size="large"> */}
                 {list?.map((item, index) => {
                     return <li style={{ width: "100%", height: "3vh", marginTop: "5px", position: "relative", }} onMouseEnter={() => {
                         setBeijing(index)
@@ -38,6 +39,7 @@ const Rightbottom = (props) => {
                 })
 
                 }
+                {/* </Spin> */}
             </div>
         )
     }

web/client/src/sections/quanju/containers/footer/leadership/right/right-top.js

@@ -77,8 +77,8 @@ const Righttop = () => {
 
             <Module style={style} title={"路面执法监控"}>
                 <div style={{ width: "100%", height: "65%", position: "relative" }}>
-                    <p style={{ position: "absolute", left: "30%", top: "2%", fontSize: "14px", color: "#FFFFFF" }}>监控总数</p><p style={{ position: "absolute", left: "42%", fontSize: "24px", marginLeft: "1%", top: "-0.5%", color: "#FFFFFF", fontFamily: "YouSheBiaoTiHei" }}>129</p>
+                    <p style={{ position: "absolute", left: "25%", top: "2%", fontSize: "14px", color: "#FFFFFF" }}>监控总数</p><p style={{ position: "absolute", left: "37%", fontSize: "24px", marginLeft: "1%", top: "-0.5%", color: "#FFFFFF", fontFamily: "YouSheBiaoTiHei" }}>129</p>
-                    <p style={{ position: "absolute", left: "60%", top: "2%", fontSize: "14px", color: "#FFFFFF" }}>在线率</p><p style={{ position: "absolute", left: "68%", fontSize: "24px", marginLeft: "2%", top: "-0.5%", color: "#FFFFFF", fontFamily: "YouSheBiaoTiHei" }}>88.87%</p>
+                    <p style={{ position: "absolute", left: "55%", top: "2%", fontSize: "14px", color: "#FFFFFF" }}>在线率</p><p style={{ position: "absolute", right: "15%", fontSize: "24px", marginLeft: "2%", top: "-0.5%", color: "#FFFFFF", fontFamily: "YouSheBiaoTiHei" }}>88.87%</p>
                     <div style={{ width: "100%", height: "10%", position: "relative" }}>
                         <img src='/assets/images/leadership/head.png' style={{ width: "15%", marginLeft: "5%" }} />
 

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

@@ -17,7 +17,7 @@ const Operation = (props) => {
     }, [])
 
     return (
-        <div style={{ display: 'flex', width: '100%', height: '100%', justifyContent: 'space-between' }}>
+        <div style={{ width: '100%', height: '100%' }}>
             <Left roadData={roadData} loading={loading} />
             <Right roadData={roadData} loading={loading} />
         </div>

web/client/src/sections/quanju/containers/footer/operation/left.js

@@ -128,7 +128,7 @@ const Left = (props) => {
         setTreeDataList(dataList)
     }, [busTier])
     return (
-        <div style={{ display: 'flex', flexDirection: 'column', width: "23%", height: "100%", marginLeft: "1%" }}>
+        <div style={{ position:'absolute',left:0, width: "23%", height: "100%", marginLeft: "1%" }}>
             <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)' }}>

web/client/src/sections/quanju/containers/footer/operation/right.js

@@ -23,7 +23,7 @@ const Right = () => {
     ])
     const style = { height: "97%", marginTop: "3%" }
     return (
-        <div style={{ display: 'flex', flexDirection: 'column', width: "23%", height: "100%", marginRight: "1%", }}>
+        <div style={{ position:'absolute',right:0, width: "23%", height: "100%", marginRight: "1%", }}>
             <Module style={style} customize={true} title={"车辆视频监控"}>
                 <div style={{ width: '90%', height: '96%', margin: '2% 5%', overflow: 'hidden' }}>
                     <Carousel

web/client/src/sections/quanju/containers/heand/index.js

@@ -28,7 +28,7 @@ const Header = (props) => {
                 onClick("leadership")
             }}><a>领导驾驶舱</a></div>
             <div className={tabKey == "leadership" ? "tabKey-map" : "notabKey"} style={{ left: "50%", transform: "translate(-50%, -50%)", width: "25%", minWidth: "420px", fontSize: "2.3vw", color: "#FFFFFF", fontFamily: "YouSheBiaoTiHei" }}>南昌县智慧交通监管系统</div>
-            <div className={tabKey == "conserve" ? "tabKey-map" : "notabKey"} style={{ left: "65%", backgroundImage: "url(/assets/images/quanju/zuobeijing.png)", backgroundSize: "100% 100%" }} onClick={() => {
+            <div className={tabKey == "conserve" ? "tabKey-map" : "notabKey"} style={{ left: "65%", backgroundImage: "url(/assets/images/quanju/youbeijing.png)", backgroundSize: "100% 100%" }} onClick={() => {
                 onClick("conserve")
             }}><a>养护</a></div>
             <div className={tabKey == "operation" ? "tabKey-map" : "notabKey"} style={{ left: "76%", backgroundImage: "url(/assets/images/quanju/youbeijing.png)", backgroundSize: "100% 100%" }} onClick={() => {