删除和编辑

web/client/assets/color.less

@@ -1150,6 +1150,7 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte
 .ant-menu-item-danger.ant-menu-item {color: #ff4d4f;}
 .ant-menu-item-danger.ant-menu-item:hover, .ant-menu-item-danger.ant-menu-item-active {color: #ff4d4f;}
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 
 .ant-menu-item-danger.ant-menu-item:active {background: color(~`colorPalette("@{modal-header-border-color-split}", 1)`);}
 .ant-menu-item-danger.ant-menu-item-selected {color: #ff4d4f;}
@@ -1161,6 +1162,12 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte
 .ant-menu-item-danger.ant-menu-item-selected > a, .ant-menu-item-danger.ant-menu-item-selected > a:hover {color: #ff4d4f;}
 .ant-menu:not(.ant-menu-horizontal) .ant-menu-item-danger.ant-menu-item-selected {background-color: color(~`colorPalette("@{segmented-label-hover-color}", 1)`);}
 >>>>>>> Stashed changes
+=======
+.ant-menu-item-danger.ant-menu-item:active {background: #fff1f0;}
+.ant-menu-item-danger.ant-menu-item-selected {color: #ff4d4f;}
+.ant-menu-item-danger.ant-menu-item-selected > a, .ant-menu-item-danger.ant-menu-item-selected > a:hover {color: #ff4d4f;}
+.ant-menu:not(.ant-menu-horizontal) .ant-menu-item-danger.ant-menu-item-selected {background-color: #fff1f0;}
+>>>>>>> Stashed changes
 .ant-menu-inline .ant-menu-item-danger.ant-menu-item::after {border-right-color: #ff4d4f;}
 .ant-menu-dark .ant-menu-item-danger.ant-menu-item, .ant-menu-dark .ant-menu-item-danger.ant-menu-item:hover, .ant-menu-dark .ant-menu-item-danger.ant-menu-item > a {color: #ff4d4f;}
 .ant-menu-dark.ant-menu-dark:not(.ant-menu-horizontal) .ant-menu-item-danger.ant-menu-item-selected {color: #fff;background-color: #ff4d4f;}
@@ -1731,9 +1738,12 @@ tr.ant-table-expanded-row:hover > td {background: @table-expanded-row-bg;}
 .ant-tag-checkable-checked {background-color: @primary-color;}
 .ant-tag-checkable:active {background-color: color(~`colorPalette("@{primary-color}", 7)`);}
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 
 .ant-tag-pink {color: #c41d7f;background: color(~`colorPalette("@{component-background}", 1)`);border-color: #ffadd2;}
 
+=======
+>>>>>>> Stashed changes
 =======
 >>>>>>> Stashed changes
 .ant-tag-pink {color: #c41d7f;background: #fff0f6;border-color: #ffadd2;}
@@ -1743,6 +1753,7 @@ tr.ant-table-expanded-row:hover > td {background: @table-expanded-row-bg;}
 .ant-tag-magenta-inverse {color: #fff;background: #eb2f96;border-color: #eb2f96;}
 <<<<<<< Updated upstream
 .ant-tag-red {color: #cf1322;background: #fff1f0;border-color: #ffa39e;}
+<<<<<<< Updated upstream
 
 .ant-tag-pink {color: #c41d7f;background: color(~`colorPalette("@{success-color-deprecated-bg}", 1)`);border-color: #ffadd2;}
 .ant-tag-pink-inverse {color: #fff;background: #eb2f96;border-color: #eb2f96;}
@@ -1753,6 +1764,8 @@ tr.ant-table-expanded-row:hover > td {background: @table-expanded-row-bg;}
 =======
 .ant-tag-red {color: #cf1322;background: color(~`colorPalette("@{segmented-label-hover-color}", 1)`);border-color: #ffa39e;}
 >>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
 .ant-tag-red-inverse {color: #fff;background: #f5222d;border-color: #f5222d;}
 .ant-tag-volcano {color: #d4380d;background: #fff2e8;border-color: #ffbb96;}
 .ant-tag-volcano-inverse {color: #fff;background: #fa541c;border-color: #fa541c;}
@@ -1769,6 +1782,7 @@ tr.ant-table-expanded-row:hover > td {background: @table-expanded-row-bg;}
 .ant-tag-green {color: #389e0d;background: #f6ffed;border-color: #b7eb8f;}
 .ant-tag-green-inverse {color: #fff;background: #52c41a;border-color: #52c41a;}
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 
 .ant-tag-blue {color: #096dd9;background: #e6f7ff;border-color: #91d5ff;}
 .ant-tag-blue-inverse {color: #fff;background: #1890ff;border-color: #1890ff;}
@@ -1788,6 +1802,13 @@ tr.ant-table-expanded-row:hover > td {background: @table-expanded-row-bg;}
 .ant-tag-geekblue-inverse {color: #fff;background: #2f54eb;border-color: #2f54eb;}
 .ant-tag-purple {color: #531dab;background: color(~`colorPalette("@{alert-error-bg-color}", 1)`);border-color: #d3adf7;}
 >>>>>>> Stashed changes
+=======
+.ant-tag-blue {color: #096dd9;background: #e6f7ff;border-color: #91d5ff;}
+.ant-tag-blue-inverse {color: #fff;background: #1890ff;border-color: #1890ff;}
+.ant-tag-geekblue {color: #1d39c4;background: color(~`colorPalette("@{info-color-deprecated-bg}", 1)`);border-color: #adc6ff;}
+.ant-tag-geekblue-inverse {color: #fff;background: #2f54eb;border-color: #2f54eb;}
+.ant-tag-purple {color: #531dab;background: color(~`colorPalette("@{background-color-light}", 1)`);border-color: #d3adf7;}
+>>>>>>> Stashed changes
 .ant-tag-purple-inverse {color: #fff;background: #722ed1;border-color: #722ed1;}
 .ant-tag-success {color: #52c41a;background: @success-color-deprecated-bg;border-color: @success-color-deprecated-border;}
 .ant-tag-processing {color: @primary-color;background: @info-color-deprecated-bg;border-color: @info-color-deprecated-border;}
@@ -2026,14 +2047,16 @@ a.ant-typography.ant-typography-disabled:hover, .ant-typography a.ant-typography
 .ant-upload-list-picture .ant-upload-list-item:hover .ant-upload-list-item-info, .ant-upload-list-picture-card .ant-upload-list-item:hover .ant-upload-list-item-info {background: transparent;}
 .ant-upload-list-picture .ant-upload-list-item-uploading, .ant-upload-list-picture-card .ant-upload-list-item-uploading {border-style: dashed;}
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 
 .ant-upload-list-picture .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='#e6f7ff'], .ant-upload-list-picture-card .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='#e6f7ff'] {fill: @error-color-deprecated-bg;}
 
 .ant-upload-list-picture .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='#e6f7ff'], .ant-upload-list-picture-card .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='#e6f7ff'] {fill: @error-color-deprecated-bg;}
 
 =======
-.ant-upload-list-picture .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='#e6f7ff'], .ant-upload-list-picture-card .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='#e6f7ff'] {fill: @error-color-deprecated-bg;}
+=======
 >>>>>>> Stashed changes
+.ant-upload-list-picture .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='#e6f7ff'], .ant-upload-list-picture-card .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='#e6f7ff'] {fill: @error-color-deprecated-bg;}
 .ant-upload-list-picture .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='#1890ff'], .ant-upload-list-picture-card .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='#1890ff'] {fill: #ff4d4f;}
 .ant-upload-list-picture-card .ant-upload-list-item-info::before {background-color: rgba(0, 0, 0, 0.5);}
 .ant-upload-list-picture-card .ant-upload-list-item-actions .anticon-eye, .ant-upload-list-picture-card .ant-upload-list-item-actions .anticon-download, .ant-upload-list-picture-card .ant-upload-list-item-actions .anticon-delete {color: rgba(255, 255, 255, 0.85);}

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

@@ -34,6 +34,17 @@ export function getOperaTional(query) {
         // reducer: { name: 'reportstatistic' }
     });
 }
+export function putOperaTional(query) {
+    return dispatch => basicAction({
+        type: 'put',
+        dispatch: dispatch,
+        data: query,
+        actionType: 'PUT_OPERA_TIONAL',
+        url: ApiTable.putOperaTional,
+        msg: { error: '获取车辆信息失败' },
+        // reducer: { name: 'reportstatistic' }
+    });
+}
 export function getSpecificVehicle(query) {
     return dispatch => basicAction({
         type: 'get',
@@ -45,6 +56,28 @@ export function getSpecificVehicle(query) {
         // reducer: { name: 'reportstatistic' }
     });
 }
+export function putSpecificVehicle(query) {
+    return dispatch => basicAction({
+        type: 'put',
+        dispatch: dispatch,
+        data: query,
+        actionType: 'put_SPECIFIC_VEHICLE',
+        url: ApiTable.putSpecificVehicle,
+        msg: { error: '编辑车辆信息失败' },
+        // reducer: { name: 'reportstatistic' }
+    });
+}
+export function putHouseholds(query) {
+    return dispatch => basicAction({
+        type: 'put',
+        dispatch: dispatch,
+        data: query,
+        actionType: 'put_HOUSEHOLDS',
+        url: ApiTable.putHouseholds,
+        msg: { error: '编辑业户信息失败' },
+        // reducer: { name: 'reportstatistic' }
+    });
+}
 export function getHouseholds(query) {
     return dispatch => basicAction({
         type: 'get',
@@ -122,3 +155,139 @@ export function putProject(query) {
         // reducer: { name: 'reportstatistic' }
     });
 }
+export function getHighways(query) {
+    return dispatch => basicAction({
+        type: 'get',
+        dispatch: dispatch,
+        query: query,
+        actionType: 'GET_HIGHWAYS',
+        url: ApiTable.getHighways,
+        msg: { error: '获取路政信息失败' },
+        // reducer: { name: 'reportstatistic' }
+    });
+}
+export function putHighways(query) {
+    return dispatch => basicAction({
+        type: 'put',
+        dispatch: dispatch,
+        data: query,
+        actionType: 'GET_HIGHWAYS',
+        url: ApiTable.putHighways,
+        msg: { error: '编辑路政信息失败' },
+        // reducer: { name: 'reportstatistic' }
+    });
+}
+export function getCircuit(query) {
+    return dispatch => basicAction({
+        type: 'get',
+        dispatch: dispatch,
+        query: query,
+        actionType: 'GET_CIRCUIT',
+        url: ApiTable.getCircuit,
+        msg: { error: '获取线路信息失败' },
+        // reducer: { name: 'reportstatistic' }
+    });
+}
+export function putCircuit(query) {
+    return dispatch => basicAction({
+        type: 'put',
+        dispatch: dispatch,
+        data: query,
+        actionType: 'PUT_CIRCUIT',
+        url: ApiTable.putCircuit,
+        msg: { error: '编辑线路信息失败' },
+        // reducer: { name: 'reportstatistic' }
+    });
+}
+export function getVehicle(query) {
+    return dispatch => basicAction({
+        type: 'get',
+        dispatch: dispatch,
+        query: query,
+        actionType: 'GET_VEHICLE',
+        url: ApiTable.getVehicle,
+        msg: { error: '获取车辆信息失败' },
+        // reducer: { name: 'reportstatistic' }
+    });
+}
+export function putVehicle(query) {
+    return dispatch => basicAction({
+        type: 'put',
+        dispatch: dispatch,
+        data: query,
+        actionType: 'PUT_VEHICLE',
+        url: ApiTable.putVehicle,
+        msg: { error: '编辑车辆信息失败' },
+        // reducer: { name: 'reportstatistic' }
+    });
+}
+export function delRoadway(query) {
+    return dispatch => basicAction({
+        type: 'del',
+        dispatch: dispatch,
+        actionType: 'DEL_ROADWAY',
+        url: ApiTable.delRoadway.replace("{roadId}", query?.roadId),
+        msg: { error: '删除车辆信息失败' },
+        // reducer: { name: 'reportstatistic' }
+    });
+}
+export function delProject(query) {
+    return dispatch => basicAction({
+        type: 'del',
+        dispatch: dispatch,
+        actionType: 'DEL_PROJECT',
+        url: ApiTable.delProject.replace("{projectId}", query?.projectId),
+        msg: { error: '删除工程信息失败' },
+        // reducer: { name: 'reportstatistic' }
+    });
+}
+export function delBridge(query) {
+    return dispatch => basicAction({
+        type: 'del',
+        dispatch: dispatch,
+        actionType: 'DEL_BRIDGE',
+        url: ApiTable.delBridge.replace("{bridgeId}", query?.bridgeId),
+        msg: { error: '删除桥梁信息失败' },
+        // reducer: { name: 'reportstatistic' }
+    });
+}
+export function delSpecificVehicle(query) {
+    return dispatch => basicAction({
+        type: 'del',
+        dispatch: dispatch,
+        actionType: 'DEL_SPECIFICVENICLE',
+        url: ApiTable.delSpecificVehicle.replace("{vehicleId}", query?.vehicleId),
+        msg: { error: '删除车辆信息失败' },
+        // reducer: { name: 'reportstatistic' }
+    });
+}
+export function delHouseholds(query) {
+    return dispatch => basicAction({
+        type: 'del',
+        dispatch: dispatch,
+        actionType: 'DEL_HOUSEHOLDS',
+        url: ApiTable.delHouseholds.replace("{businessId}", query?.businessId),
+        msg: { error: '删除业户信息失败' },
+        // reducer: { name: 'reportstatistic' }
+    });
+}
+export function delCircuit(query) {
+    return dispatch => basicAction({
+        type: 'del',
+        dispatch: dispatch,
+        actionType: 'DEL_CIRCUIT',
+        url: ApiTable.delCircuit.replace("{lineId}", query?.lineId),
+        msg: { error: '删除运营线路信息失败' },
+        // reducer: { name: 'reportstatistic' }
+    });
+}
+export function delVehicle(query) {
+    return dispatch => basicAction({
+        type: 'del',
+        dispatch: dispatch,
+        actionType: 'DEL_VEHICLE',
+        url: ApiTable.delVehicle.replace("{carId}", query?.carId),
+        msg: { error: '删除车辆信息失败' },
+        // reducer: { name: 'reportstatistic' }
+    });
+}

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

@@ -1,10 +1,10 @@
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useState, useRef } from 'react';
 import { connect } from 'react-redux';
 import { Spin, Button, Popconfirm, Badge } from 'antd';
 import ProTable from '@ant-design/pro-table';
 import './protable.less'
 import moment from 'moment';
-import { getBridge, getProject } from "../actions/infor"
+import { getBridge, getProject,delBridge,delProject } from "../actions/infor"
 import UserModal from './infor/details';
 import ProjectModal from './project/project';
 
@@ -14,7 +14,7 @@ const BrideTable = (props) => {
     // const [regionId, setRegionId] = useState()//区域id
     // const [placeType, setPlaceType] = useState()//场所
     // const [day, setDay] = useState([moment('2022-03-01').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')])//日期
-    // const [sitename, setSitename] = useState()//场所名称
+    const [sitename, setSitename] = useState()//场所名称
     const [counts, setCounts] = useState()//shuju
     const [modalVisible, setModalVisible] = useState(false);
     const [modalVisibleyilan, setModalVisibleyilan] = useState(false);
@@ -22,6 +22,11 @@ const BrideTable = (props) => {
     const [typecard, setTypecard] = useState();
     const [activeKey, setActiveKey] = useState('tab1');
     const [recortd, setRecortd] = useState()
+    const [whichofits, setWhichofits] = useState('qiaoliang')
+    const [delet, setDelet] = useState()
+
+    const ref = useRef()
+    useEffect(() => { ref.current.reload() }, [modalVisible, modalVisibleyilan,whichofits,delet])
     const columns = {
         tab1: [
             {
@@ -30,12 +35,9 @@ const BrideTable = (props) => {
                 fixed: 'left',
                 width: 120,
                 options: 1,
+                search: false,
                 backgroundColor: "#ffffff",
                 fieldProps: {
-                    // onChange: (value, cs) => {
-                    //     setSitename(value.currentTarget.value)
-                    // },
-                    placeholder: '请输入桥梁代码进行搜索',
                     getPopupContainer: (triggerNode) => triggerNode.parentNode,
                 },
                 render: (dom, record) => {
@@ -45,17 +47,19 @@ const BrideTable = (props) => {
             },
             {
                 title: '桥梁名称',
-                search: false,
                 dataIndex: 'containers',
-
                 fixed: 'left',
                 width: 120,
                 render: (dom, record) => {
                     return record.bridgeName
                 },
                 fieldProps: {
+                    onChange: (value, cs) => {
+                        setSitename(value.currentTarget.value)
+                    },
+                    placeholder: '请输入桥梁名称进行搜索',
                     getPopupContainer: (triggerNode) => triggerNode.parentNode,
-                }
+                },
             },
             {
                 title: '中心桩号',
@@ -1489,7 +1493,16 @@ const BrideTable = (props) => {
                             setTypecard('111')
                             setRecortd(record)
                         }}
-                    >编辑</Button><Button type="link">删除</Button></div>
+                    >编辑</Button><Button type="link"
+                    onClick={() => {
+                        const query = {
+                            bridgeId: record.id
+                        }
+                        dispatch(delBridge(query)).then((res) => {
+                            setDelet(res)
+                        })
+                    }}
+                    >删除</Button></div>
 
                 }
             },
@@ -1532,9 +1545,9 @@ const BrideTable = (props) => {
                 options: 1,
                 backgroundColor: "#ffffff",
                 fieldProps: {
-                    // onChange: (value, cs) => {
+                    onChange: (value, cs) => {
-                    //     setSitename(value.currentTarget.value)
+                        setSitename(value.currentTarget.value)
-                    // },
+                    },
                     placeholder: '请输入项目名称进行搜索',
                     getPopupContainer: (triggerNode) => triggerNode.parentNode,
                 },
@@ -1670,7 +1683,16 @@ const BrideTable = (props) => {
                             setTypecard('111')
                             setRecortd(record)
                         }}
-                    >编辑</Button><Button type="link">删除</Button></div>
+                    >编辑</Button><Button type="link"
+                    onClick={() => {
+                        const query = {
+                            projectId: record.id
+                        }
+                        dispatch(delProject(query)).then((res) => {
+                            setDelet(res)
+                        })
+                    }}
+                    >删除</Button></div>
 
                 }
             },
@@ -1706,27 +1728,6 @@ const BrideTable = (props) => {
             },
         ]
     }
-    const requestBridge = () => {
-        const query = {
-        }
-        setRowSelected([]);
-        dispatch(getBridge(query)).then((res) => {
-            setCounts(res?.payload?.data)
-            console.log(res)
-        });
-
-    }
-    //工程数据
-    const requestProject = () => {
-        const query = {
-            type: '桥梁'
-        }
-        setRowSelected([]);
-        dispatch(getProject(query)).then((res) => {
-            setCounts(res?.payload?.data)
-        })
-
-    }
     //打开弹窗
     const openModal = (type, record) => {
         setModalVisible(true);
@@ -1766,7 +1767,7 @@ const BrideTable = (props) => {
         <Spin spinning={false}>
             <div className='protable-transpor'>
                 <ProTable
-
+                    actionRef={ref}
                     toolbar={{
                         multipleLine: true,
 
@@ -1777,13 +1778,13 @@ const BrideTable = (props) => {
                                 {
                                     key: 'tab1',
                                     label: <span onClick={() => {
-                                        requestBridge()
+                                        setWhichofits('qiaoliang')
                                     }}>桥梁{activeKey === 'tab1'}</span>,
                                 },
                                 {
                                     key: 'tab2',
                                     label: <span onClick={() => {
-                                        requestProject()
+                                        setWhichofits('gongcheng')
                                     }}>工程一览{activeKey === 'tab2'}</span>,
                                 },
 
@@ -1796,12 +1797,7 @@ const BrideTable = (props) => {
                     style={{ width: "100% ", overflow: "auto", height: '760px' }}
                     rowKey='id'
                     onReset={(v) => {
-                        // const { id } = depMessage[0]
+                        setSitename('')
-                        // console.log(id)
-                        // setRegionId(id)
-                        // setPlaceType(-1)
-                        // setDay([moment('2022-03-01').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')])
-                        // setSitename('')
                     }}
                     rowSelection={{
                         selectedRowKeys: rowSelected,
@@ -1813,16 +1809,33 @@ const BrideTable = (props) => {
 
                     dataSource={counts || []}
                     request={async (params) => {
-                        const query = {
+                        if(whichofits=='qiaoliang'){
-
+                            const query = {
-                        }
+                                bridgeName:sitename
-                        setRowSelected([]);
+                            }
-                        const res = await dispatch(getBridge(query));
+                            setRowSelected([]);
-                        setCounts(res.payload.data)
+                            const res = await dispatch(getBridge(query));
-                        return {
+                            // console.log(res)
-                            ...res,
+    
-                            total: res.payload.data ? res.payload.data.count : 0
+                            setCounts(res.payload.data)
+                            return {
+                                ...res,
+                                total: res.payload.data ? res.payload.data.count : 0
+                            }
+                        }if(whichofits=='gongcheng'){
+                            const query = {
+                                type: 'bridge',
+                                // type:sitename
+                            }
+                            setRowSelected([]);
+                            const res = await dispatch(getProject(query));
+                            setCounts(res.payload.data)
+                            return {
+                                ...res,
+                                total: res.payload.data ? res.payload.data.count : 0
+                            }
                         }
+                       
                     }}
                     search={{
                         defaultCollapsed: false,

web/client/src/sections/fillion/components/highways/highwaysdata.js

@@ -0,0 +1,106 @@
+import React, { useEffect, useState } from 'react';
+import { connect } from 'react-redux';
+import { Form, Spin, Table } from 'antd';
+import { ModalForm, ProForm, ProFormText,ProFormSelect } from '@ant-design/pro-form';
+import { putOperaTional,putHighways } from "../../actions/infor"
+
+const HightModal = (props) => {
+    const { visible, onVisibleChange, typecard, rewkeys, recortd, dispatch, setRecortd } = props
+    const [success,setSuccess]=useState()
+    
+    useEffect(() => {
+        return () => {
+            setRecortd()
+        }
+    }, [setRecortd])
+    // console.log(recortd)
+    return (
+        <Spin spinning={false}>
+            {/* {
+                newlysay ? */}
+            <ModalForm
+                width={'90rem'}
+                visible={visible}
+                onVisibleChange={onVisibleChange}
+                onFinish={(values) => {
+                    if (rewkeys === 'passenger') {
+                        
+                            console.log(values)
+                            const query = { ...values, id:recortd?.id }
+                            dispatch(putOperaTional(query)).then((res) => {
+                                setSuccess(res.success)
+                            })
+                            return true
+                        
+                    }
+                    if (rewkeys === 'highways') {
+                        
+                        console.log(values)
+                        const query = { ...values, id:recortd?.id }
+                        dispatch(putHighways(query)).then((res) => {
+                            setSuccess(res.success)
+                        })
+                        return true
+                    
+                }
+                   
+                }}
+                initialValues={recortd}
+            >
+                {typecard == '111' ?
+                    <ProForm.Group
+                    >
+                        <ProFormText
+                            name='name'
+                            width="md"
+                            label='类型'
+                            tooltip="最长为 24 位"
+                            placeholder="请输入名称"
+                            // value={recortd?.[0]?.value}
+                            disabled
+                            rules={[{ required: true, message: "必填" }]}
+                        />
+                        <ProFormText
+                            name='count'
+                            width="md"
+                            label='数量'
+                            tooltip="最长为 24 位"
+                            placeholder="请输入名称"
+                        />
+
+                    </ProForm.Group>
+                    : <ProForm.Group>
+                        <ProFormText
+                            name={newlys?.[0]?.type}
+                            width="md"
+                            label={newlys?.[0]?.name}
+                            tooltip="最长为 24 位"
+                            placeholder="请输入名称"
+                        />
+                    </ProForm.Group>}
+
+            </ModalForm>
+            {/* : ''
+            }  */}
+
+        </Spin>
+    )
+}
+function mapStateToProps(state) {
+    const { depMessage } = state;
+    const pakData = (dep) => {
+        return dep.map((d) => {
+            return {
+                title: d.name,
+                value: d.id,
+                children: pakData(d.subordinate)
+            }
+        })
+    }
+    let depData = pakData(depMessage.data || [])
+    return {
+        loading: depMessage.isRequesting,
+        depData,
+    };
+}
+export default connect(mapStateToProps)(HightModal);

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

@@ -1,27 +1,27 @@
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useState,useRef } from 'react';
 import { connect } from 'react-redux';
 import { Spin, Button, Popconfirm, Badge } from 'antd';
 import ProTable from '@ant-design/pro-table';
 import './protable.less'
-import moment from 'moment';
+import { getHighways } from "../actions/infor"
-import { getReportStatistic } from "../actions/infor"
+import HightModal from './highways/highwaysdata';
-import UserModal from './infor/details';
+
 
 const HigwaysTable = (props) => {
-    const { dispatch, user, depData, depMessage, depLoading } = props
+    const { dispatch, user, } = props
     const [rowSelected, setRowSelected] = useState([])
-    const [regionId, setRegionId] = useState()//区域id
-    const [placeType, setPlaceType] = useState()//场所
-    const [day, setDay] = useState([moment('2022-03-01').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')])//日期
-    const [sitename, setSitename] = useState()//场所名称
     const [counts, setCounts] = useState()//shuju
-    const [modalVisible, setModalVisible] = useState(false);
+    const [modalVisibleyilan, setModalVisibleyilan] = useState(false);
     const [modalRecord, setModalRecord] = useState();
     const [typecard, setTypecard] = useState();
+    const [recortd, setRecortd] = useState()
+    const [sitename, setSitename] = useState()//桥梁名称
 
+    const ref = useRef()
+    useEffect(() => { ref.current.reload() }, [ modalVisibleyilan])
 //打开弹窗
-const openModal = (type, record) => {
+const hightModal = (type, record) => {
-    setModalVisible(true);
+    setModalVisibleyilan(true);
     // setModalType(type);
     if (type == 'edit') {
         setModalRecord(record);
@@ -61,6 +61,9 @@ const exports = (ids, counts) => {
                     placeholder: '请输入类型进行搜索',
                     getPopupContainer: (triggerNode) => triggerNode.parentNode,
                 },
+                render: (dom, record) => {
+                    return record.name
+                },
             },
             {
                 title: '数量',
@@ -70,7 +73,7 @@ const exports = (ids, counts) => {
                 fixed: 'left',
                 width: 120,
                 render: (dom, record) => {
-                    return record.address
+                    return record.count
                 },
                 fieldProps: {
                     getPopupContainer: (triggerNode) => triggerNode.parentNode,
@@ -86,8 +89,9 @@ const exports = (ids, counts) => {
                 render: (dom, record) => {
                     return <div><Button type="link"
                     onClick={() => {
-                        openModal('edit', record)
+                        hightModal('edit', record)
                         setTypecard('111')
+                        setRecortd(record)
                     }}
                     >编辑</Button></div>
 
@@ -99,18 +103,14 @@ const exports = (ids, counts) => {
         <Spin spinning={false}>
             <div className='protable-transpor'>
                 <ProTable
+                    actionRef={ref}
                     scroll={{ x: 800 }}
                     options={false}
                     ref={c => { finishedProductTable = c; }}
                     style={{ width: "100% ", overflow: "auto", height: '760px' }}
                     rowKey='id'
                     onReset={(v) => {
-                        const { id } = depMessage[0]
+                      setSitename('')
-                        console.log(id)
-                        setRegionId(id)
-                        setPlaceType(-1)
-                        setDay([moment('2022-03-01').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')])
-                        setSitename('')
                     }}
                     rowSelection={{
                         selectedRowKeys: rowSelected,
@@ -120,46 +120,30 @@ const exports = (ids, counts) => {
                     }}
                     columns={columns}
 
-                    dataSource={(counts || {}).rows || []}
+                    dataSource={counts ||  []}
                     request={async (params) => {
                         const query = {
-                            startDate: day[0],
+                            name:sitename
-                            endDate: day[1],
-                            placeType: placeType,
-                            regionId: regionId,
-                            placeName: sitename,
-                            limit: params.pageSize,
-                            offset: ((params.current ? params.current : 1) - 1) * params.pageSize
                         }
                         setRowSelected([]);
-                        const res = await dispatch(getReportStatistic(query));
+                        const res = await dispatch(getHighways(query));
                         setCounts(res.payload.data)
                         return {
                             ...res,
                             total: res.payload.data ? res.payload.data.count : 0
                         }
                     }}
-                    search={{
-                        defaultCollapsed: false,
-                        optionRender: (searchConfig, formProps, dom) => [
-                            ...dom.reverse(),
-                            // <Popconfirm title="确认导出?" onConfirm={() => { props.exports(rowSelected, counts) }}>
-                            //     <Button
-                            //     >
-                            //         导出
-                            //     </Button>
-                            // </Popconfirm>
-                        ],
-                    }}
-
                 >
                 </ProTable></div>
-                <UserModal
+                {modalVisibleyilan ? <HightModal
-                visible={modalVisible}
+                visible={modalVisibleyilan}
-                onVisibleChange={setModalVisible}
+                onVisibleChange={setModalVisibleyilan}
                 modalRecord={modalRecord}
                 typecard={typecard}
-            />
+                rewkeys={'highways'}
+                recortd={recortd}
+                setRecortd={setRecortd}
+            /> : ''}
         </Spin >
     )
 }

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

@@ -1,21 +1,23 @@
 import React, { useEffect, useState } from 'react';
 import { connect } from 'react-redux';
 import { Form, Spin, Table } from 'antd';
-import { DrawerForm, ProForm, ProFormText } from '@ant-design/pro-form';
+import { DrawerForm, ProForm, ProFormText, ProFormSelect } from '@ant-design/pro-form';
-import { putRoadway } from "../../actions/infor"
+import { putRoadway, putSpecificVehicle, putHouseholds,putCircuit,putVehicle } from "../../actions/infor"
 import { putBridge } from "../../actions/infor"
 
 const UserModal = (props) => {
-    const { visible, onVisibleChange, typecard, rewkeys, data, recortd, sitename, dispatch, date, setRecortd,engineering } = props
+    const { visible, onVisibleChange, typecard, rewkeys, data, recortd, sitename, dispatch, setRecortd, engineering } = props
     const [newlys, setNewlys] = useState() //必填数据
     const [newlysay, setNewlysay] = useState() //处理hou
     const [records, setRecords] = useState()//处理
     const [recordsay, setRecordsay] = useState()//必填数据
-    const [success, setSuccess] = useState() //状态
+    // const [success, setSuccess] = useState() //状态
+    // const [establishment, setEstablishment] = useState() //业户类型
+    console.log(recortd)
     useEffect(() => {
         const array = []
         if (rewkeys === 'transportation') {
-            const xindata=[...data]
+            const xindata = [...data]
             setNewlys(xindata?.splice(0, 2))
             setNewlysay(xindata)
         } if (rewkeys === 'bridge') {
@@ -24,7 +26,44 @@ const UserModal = (props) => {
             });
             setNewlys(array?.splice(0, 2))
             setNewlysay(array)
-            console.log(array)
+            // console.log(array)
+        }
+        if (rewkeys === 'weihuo') {
+            _.forIn(data, function (value, key) {
+                array.push({ name: value, type: key })
+            });
+            setNewlys(array?.splice(0, 2))
+            setNewlysay(array)
+            // console.log(array)
+        }
+        if (rewkeys === 'chuzu') {
+            _.forIn(data, function (value, key) {
+                array.push({ name: value, type: key })
+            });
+            array?.splice(1, 1)
+            setNewlys(array?.splice(0, 2))
+            setNewlysay(array)
+        }
+        if (rewkeys === 'yehu') {
+            _.forIn(data, function (value, key) {
+                array.push({ name: value, type: key })
+            });
+            setNewlys(array?.splice(0, 2))
+
+            setNewlysay(array)
+            // console.log(array)
+        }if (rewkeys === 'xianlu') {
+            _.forIn(data, function (value, key) {
+                array.push({ name: value, type: key })
+            });
+            setNewlys(array?.splice(0, 2))
+            setNewlysay(array)
+        }if (rewkeys === 'cheliang') {
+            _.forIn(data, function (value, key) {
+                array.push({ name: value, type: key })
+            });
+            setNewlys(array?.splice(0, 2))
+            setNewlysay(array)
         }
     }, [])
     useEffect(() => {
@@ -43,12 +82,48 @@ const UserModal = (props) => {
             setRecordsay(arr.splice(1, 2))
             setRecords(arr)
         }
+        if (rewkeys === 'weihuo') {
+            _.forIn(recortd, function (value, key) {
+                arr.push({ value: value, type: key })
+            });
+            setRecordsay(arr.splice(1, 2))
+            setRecords(arr)
+        }
+        if (rewkeys === 'chuzu') {
+            _.forIn(recortd, function (value, key) {
+                arr.push({ value: value, type: key })
+            });
+            setRecordsay(arr.splice(1, 2))
+            setRecords(arr)
+        } if (rewkeys === 'yehu') {
+            _.forIn(recortd, function (value, key) {
+                arr.push({ value: value, type: key })
+            });
+            setRecordsay(arr.splice(1, 2))
+            // setEstablishment(arr.splice(-1, 1))
+            setRecords(arr)
+        }
+        if (rewkeys === 'xianlu') {
+            _.forIn(recortd, function (value, key) {
+                arr.push({ value: value, type: key })
+            });
+            setRecordsay(arr.splice(1, 2))
+            // setEstablishment(arr.splice(-1, 1))
+            setRecords(arr)
+        }if (rewkeys === 'cheliang') {
+            _.forIn(recortd, function (value, key) {
+                arr.push({ value: value, type: key })
+            });
+            setRecordsay(arr.splice(1, 2))
+            // setEstablishment(arr.splice(-1, 1))
+            setRecords(arr)
+        }
     }, [recortd])
     useEffect(() => {
         return () => {
             setRecortd()
         }
-    }, [])
+    }, [setRecortd])
     // console.log(recortd)
     return (
         <Spin spinning={false}>
@@ -59,38 +134,104 @@ const UserModal = (props) => {
                 visible={visible}
                 onVisibleChange={onVisibleChange}
                 onFinish={(values) => {
-                    if (rewkeys === 'transportation') {
+                    console.log(values)
-                        if (typecard == '111') {
+                    if (Object.values(values).length > 0) {
-                            console.log(values)
+                        if (rewkeys === 'transportation') {
-                            const query = { ...values, level: sitename, roadId: records?.[0]?.value || '' }
+                            if (typecard == '111') {
-                            dispatch(putRoadway(query)).then((res) => {
+                                const query = { ...values, level: sitename, roadId: records?.[0]?.value || '' }
-                                setSuccess(res.success)
+                                dispatch(putRoadway(query)).then((res) => {
-                            })
+                                    setSuccess(res.success)
-                            return success
+                                })
-                        } else {
+                                return true
-                            const query = { ...values, level: sitename }
+                            } else {
-                            dispatch(putRoadway(query)).then((res) => {
+                                const query = { ...values, level: sitename }
-                                setSuccess(res.success)
+                                dispatch(putRoadway(query)).then((res) => {
-                            })
+                                    setSuccess(res.success)
-                            return success
+                                })
+                                return true
+                            }
+                        }
+                        if (rewkeys === 'bridge') {
+                            if (typecard == '111') {
+                                console.log(values)
+                                const query = { ...values, roadId: records?.[0]?.value || '' }
+                                dispatch(putBridge(query)).then((res) => {
+                                    setSuccess(res.success)
+                                })
+                                return true
+                            } else {
+                                const query = { ...values }
+                                dispatch(putBridge(query)).then((res) => {
+                                    setSuccess(res.success)
+                                })
+                                return true
+                            }
+                        }
+                        if (rewkeys === 'weihuo' || rewkeys === 'chuzu') {
+                            if (typecard == '111') {
+                                console.log(values)
+                                const query = { ...values, vehicleId: records?.[0]?.value || '', type: rewkeys === 'chuzu' ? '出租车' : '危货' }
+                                dispatch(putSpecificVehicle(query)).then((res) => {
+                                    setSuccess(res.success)
+                                })
+                                return true
+                            } else {
+                                const query = { ...values, type: rewkeys }
+                                dispatch(putSpecificVehicle(query)).then((res) => {
+                                    setSuccess(res.success)
+                                })
+                                return true
+                            }
+                        }
+                        if (rewkeys === 'yehu') {
+                            if (typecard == '111') {
+                                console.log(values)
+                                const query = { ...values, businessId: records?.[0]?.value, type: rewkeys == 'chuzu' ? '出租车' : '危货' }
+                                dispatch(putHouseholds(query)).then((res) => {
+                                    setSuccess(res.success)
+                                })
+                                return true
+                            } else {
+                                const query = { ...values, type: rewkeys === 'chuzu' ? '出租车' : '危货' }
+                                dispatch(putHouseholds(query)).then((res) => {
+                                    setSuccess(res.success)
+                                })
+                                return true
+                            }
+                        }if (rewkeys === 'xianlu') {
+                            if (typecard == '111') {
+                                console.log(values)
+                                const query = { ...values, lineId:records?.[0]?.value || '' }
+                                dispatch(putCircuit(query)).then((res) => {
+                                    setSuccess(res.success)
+                                })
+                                return true
+                            } else {
+                                const query = { ...values }
+                                dispatch(putCircuit(query)).then((res) => {
+                                    setSuccess(res.success)
+                                })
+                                return true
+                            }
                         }
-                    }
+                        if (rewkeys === 'cheliang') {
-                    if (rewkeys === 'bridge') {
+                            if (typecard == '111') {
-                        if (typecard == '111') {
+                                console.log(values)
-                            console.log(values)
+                                const query = { ...values, carId:records?.[0]?.value || '' }
-                            const query = { ...values, roadId: records?.[0]?.value || '' }
+                                dispatch(putVehicle(query)).then((res) => {
-                            dispatch(putBridge(query)).then((res) => {
+                                    setSuccess(res.success)
-                                setSuccess(res.success)
+                                })
-                            })
+                                return true
-                            return success
+                            } else {
-                        } else {
+                                const query = { ...values }
-                            const query = { ...values }
+                                dispatch(putVehicle(query)).then((res) => {
-                            dispatch(putBridge(query)).then((res) => {
+                                    setSuccess(res.success)
-                                setSuccess(res.success)
+                                })
-                            })
+                                return true
-                            return success
+                            }
                         }
-                    }
+                    } else { return false }
+
                 }}
                 initialValues={recortd}
             >
@@ -104,7 +245,7 @@ const UserModal = (props) => {
                             tooltip="最长为 24 位"
                             placeholder="请输入名称"
                             value={recordsay?.[0]?.value}
-                            rules={[{ required: true, message: "必填" }]}
+                        // rules={[{ required: true, message: "必填" }]}
                         /><ProFormText
                             name={newlys?.[1]?.type}
                             width="md"
@@ -112,9 +253,24 @@ const UserModal = (props) => {
                             tooltip="最长为 24 位"
                             placeholder="请输入名称"
                             value={recordsay?.[1]?.value}
-                            rules={[{ required: true, message: "必填" }]}
+                        // rules={[{ required: true, message: "必填" }]}
                         />
-                        
+                        {rewkeys === 'yehu' ?
+                            <ProFormSelect
+                                rules={[{ required: true, message: "必填" }]}
+                                options={[
+                                    {
+                                        value: '出租车',
+                                        label: '出租车',
+                                    }, {
+                                        value: '危货',
+                                        label: '危险货运',
+                                    },
+                                ]}
+                                name='type'
+                                label='类型'
+                            /> : null
+                        }
                         {newlysay?.map((item, index) => {
                             return <ProFormText width="md"
                                 name={item?.type} label={newlysay[index]?.name} placeholder="请输入名称"
@@ -130,17 +286,33 @@ const UserModal = (props) => {
                             label={newlys?.[0]?.name}
                             tooltip="最长为 24 位"
                             placeholder="请输入名称"
-                            // value={recordssy?.[0]?.value}
+                        // value={recordssy?.[0]?.value}
-                            rules={[{ required: true, message: "必填" }]}
+                        // rules={[{ required: true, message: "必填" }]}
                         /><ProFormText
                             name={newlys?.[1]?.type}
                             width="md"
                             label={newlys?.[1]?.name}
                             tooltip="最长为 24 位"
                             placeholder="请输入名称"
-                            // value={recordssy?.[1]?.value}
+                        // value={recordssy?.[1]?.value}
-                            rules={[{ required: true, message: "必填" }]}
+                        // rules={[{ required: true, message: "必填" }]}
                         />
+                        {rewkeys === 'yehu' ?
+                            <ProFormSelect
+                                rules={[{ required: true, message: "必填" }]}
+                                options={[
+                                    {
+                                        value: '出租车',
+                                        label: '出租车',
+                                    }, {
+                                        value: '危货',
+                                        label: '危险货运',
+                                    },
+                                ]}
+                                name='type'
+                                label='类型'
+                            /> : null
+                        }
                         {newlysay?.map((item, index) => {
                             return <ProFormText width="md"
                                 name={item?.type} label={newlysay[index]?.name} placeholder="请输入名称" key={index}

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

@@ -121,7 +121,7 @@ const ProjectModal = (props) => {
                             label={newlys?.[0]?.name}
                             tooltip="最长为 24 位"
                             placeholder="请输入名称"
-                            value={recordsay?.[0]?.value}
+                            // value={recordsay?.[0]?.value}
                             rules={[{ required: true, message: "必填" }]}
                         /><ProFormText
                             name={newlys?.[1]?.type}
@@ -129,7 +129,7 @@ const ProjectModal = (props) => {
                             label={newlys?.[1]?.name}
                             tooltip="最长为 24 位"
                             placeholder="请输入名称"
-                            value={recordsay?.[1]?.value}
+                            // value={recordsay?.[1]?.value}
                             rules={[{ required: true, message: "必填" }]}
                         />
                         <ProFormSelect

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

@@ -4,17 +4,14 @@ import { Spin, Button, Popconfirm, Badge } from 'antd';
 import ProTable from '@ant-design/pro-table';
 import './protable.less'
 import moment from 'moment';
-import { getRoadway, getProject, putRoadway } from "../actions/infor"
+import { getRoadway, getProject, delRoadway, delProject } from "../actions/infor"
 import UserModal from './infor/details';
 import ProjectModal from './project/project';
 
 const TransporTationTable = (props) => {
     const { dispatch, user, depData, depMessage, depLoading } = props
     const [rowSelected, setRowSelected] = useState([])
-    // const [regionId, setRegionId] = useState()//区域id
+    const [sitename, setSitename] = useState()//桥梁名称
-    // const [placeType, setPlaceType] = useState()//场所
-    // const [day, setDay] = useState([moment('2022-03-01').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')])//日期
-    const [sitename, setSitename] = useState()//场所名称
     const [counts, setCounts] = useState()//shuju
     const [modalVisible, setModalVisible] = useState(false);
     const [modalVisibleyilan, setModalVisibleyilan] = useState(false);
@@ -22,29 +19,10 @@ const TransporTationTable = (props) => {
     const [typecard, setTypecard] = useState();
     const [activeKey, setActiveKey] = useState('tab1');
     const [recortd, setRecortd] = useState()
-    // const ref = useRef()
+    const [whichofits, setWhichofits] = useState('xian')
-    //请求数据
+    const [delet, setDelet] = useState()
-    const requestRoadway = (name) => {
+    const ref = useRef()
-        const query = {
+    useEffect(() => { ref.current.reload() }, [modalVisible, modalVisibleyilan, whichofits, delet])
-            level: name
-        }
-        setSitename(name)
-        setRowSelected([]);
-        dispatch(getRoadway(query)).then((res) => {
-            setCounts(res.payload.data)
-        });
-    }
-    // useEffect(()=>{ref.current.reload()},[counts])
-    //工程数据
-    const requestProject = () => {
-        const query = {
-            type: '道路'
-        }
-        setRowSelected([]);
-        dispatch(getProject(query)).then((res) => {
-            setCounts(res.payload.data)
-        })
-    }
     //打开弹窗
     const openModal = (type, record) => {
         setModalVisible(true);
@@ -91,9 +69,9 @@ const TransporTationTable = (props) => {
                 options: 1,
                 backgroundColor: "#ffffff",
                 fieldProps: {
-                    // onChange: (value, cs) => {
+                    onChange: (value, cs) => {
-                    //     setSitename(value.currentTarget.value)
+                        setSitename(value.currentTarget.value)
-                    // },
+                    },
                     placeholder: '请输入道路名称进行搜索',
                     getPopupContainer: (triggerNode) => triggerNode.parentNode,
                 },
@@ -1197,11 +1175,17 @@ const TransporTationTable = (props) => {
                             setRecortd(record)
                             openModal('edit', record)
                             setTypecard('111')
-                            // sessionStorage.setItem('record', JSON.stringify(record))
-                            // sessionStorage.setItem('newly', JSON.stringify(data))
-
                         }}
-                    >编辑</Button><Button type="link">删除</Button></div>
+                    >编辑</Button><Button type="link"
+                        onClick={() => {
+                            const query = {
+                                roadId: record.id
+                            }
+                            dispatch(delRoadway(query)).then((res) => {
+                                setDelet(res)
+                            })
+                        }}
+                    >删除</Button></div>
 
                 }
             },
@@ -1245,9 +1229,9 @@ const TransporTationTable = (props) => {
                 options: 1,
                 backgroundColor: "#ffffff",
                 fieldProps: {
-                    // onChange: (value, cs) => {
+                    onChange: (value, cs) => {
-                    //     setSitename(value.currentTarget.value)
+                        setSitename(value.currentTarget.value)
-                    // },
+                    },
                     placeholder: '请输入道路名称进行搜索',
                     getPopupContainer: (triggerNode) => triggerNode.parentNode,
                 },
@@ -2353,7 +2337,14 @@ const TransporTationTable = (props) => {
                             setRecortd(record)
 
                         }}
-                    >编辑</Button><Button type="link">删除</Button></div>
+                    >编辑</Button><Button type="link" onClick={() => {
+                        const query = {
+                            roadId: record.id
+                        }
+                        dispatch(delRoadway(query)).then((res) => {
+                            setDelet(res)
+                        })
+                    }}>删除</Button></div>
 
                 }
             },
@@ -2398,9 +2389,9 @@ const TransporTationTable = (props) => {
                 options: 1,
                 backgroundColor: "#ffffff",
                 fieldProps: {
-                    // onChange: (value, cs) => {
+                    onChange: (value, cs) => {
-                    //     setSitename(value.currentTarget.value)
+                        setSitename(value.currentTarget.value)
-                    // },
+                    },
                     placeholder: '请输入道路名称进行搜索',
                     getPopupContainer: (triggerNode) => triggerNode.parentNode,
                 },
@@ -3506,7 +3497,15 @@ const TransporTationTable = (props) => {
                             setRecortd(record)
 
                         }}
-                    >编辑</Button><Button type="link">删除</Button></div>
+                    >编辑</Button><Button type="link" onClick={() => {
+                        const query = {
+                            roadId: record.id
+                        }
+                        dispatch(delRoadway(query)).then((res) => {
+                            setDelet(res)
+                        })
+                    }}
+                    >删除</Button></div>
 
                 }
             },
@@ -3551,9 +3550,9 @@ const TransporTationTable = (props) => {
                 options: 1,
                 backgroundColor: "#ffffff",
                 fieldProps: {
-                    // onChange: (value, cs) => {
+                    onChange: (value, cs) => {
-                    //     setSitename(value.currentTarget.value)
+                        setSitename(value.currentTarget.value)
-                    // },
+                    },
                     placeholder: '请输入项目名称进行搜索',
                     getPopupContainer: (triggerNode) => triggerNode.parentNode,
                 },
@@ -3689,7 +3688,16 @@ const TransporTationTable = (props) => {
                             setTypecard('111')
                             setRecortd(record)
                         }}
-                    >编辑</Button><Button type="link">删除</Button></div>
+                    >编辑</Button><Button type="link"
+                    onClick={() => {
+                        const query = {
+                            projectId: record.id
+                        }
+                        dispatch(delProject(query)).then((res) => {
+                            setDelet(res)
+                        })
+                    }}
+                    >删除</Button></div>
 
                 }
             },
@@ -3729,7 +3737,7 @@ const TransporTationTable = (props) => {
         <Spin spinning={false}>
             <div className='protable-transpor'>
                 <ProTable
-                    // actionRef={ref}
+                    actionRef={ref}
                     toolbar={{
                         multipleLine: true,
                         menu: {
@@ -3738,18 +3746,26 @@ const TransporTationTable = (props) => {
                             items: [
                                 {
                                     key: 'tab1',
-                                    label: <span onClick={() => requestRoadway('县')}>县道{activeKey === 'tab1'}</span>,
+                                    label: <span onClick={() => {
+                                        setWhichofits('xian')
+                                    }}>县道{activeKey === 'tab1'}</span>,
                                 },
                                 {
                                     key: 'tab2',
-                                    label: <span onClick={() => requestRoadway('乡')}>乡道{activeKey === 'tab2'}</span>,
+                                    label: <span onClick={() => {
+                                        setWhichofits('xiang')
+                                    }}>乡道{activeKey === 'tab2'}</span>,
                                 },
                                 {
                                     key: 'tab3',
-                                    label: <span onClick={() => requestRoadway('村')}>村道{activeKey === 'tab3'}</span>,
+                                    label: <span onClick={() => {
+                                        setWhichofits('cun')
+                                    }}>村道{activeKey === 'tab3'}</span>,
                                 }, {
                                     key: 'tab4',
-                                    label: <span onClick={() => requestProject()}>工程一览{activeKey === 'tab4'}</span>,
+                                    label: <span onClick={() => {
+                                        setWhichofits('gongcheng')
+                                    }}>工程一览{activeKey === 'tab4'}</span>,
                                 },
                             ],
                         },
@@ -3760,12 +3776,7 @@ const TransporTationTable = (props) => {
                     style={{ width: "100% ", overflow: "auto", height: '760px' }}
                     rowKey='id'
                     onReset={(v) => {
-                        const { id } = depMessage[0]
+                        setSitename('')
-                        // console.log(id)
-                        // setRegionId(id)
-                        // setPlaceType(-1)
-                        // setDay([moment('2022-03-01').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')])
-                        // setSitename('')
                     }}
                     rowSelection={{
                         selectedRowKeys: rowSelected,
@@ -3774,22 +3785,59 @@ const TransporTationTable = (props) => {
                         },
                     }}
                     columns={columns[activeKey]}
-
                     dataSource={counts || []}
                     request={async (params) => {
-                        const query = {
+                        if (whichofits == 'xian') {
-                            level: '县'
+                            const query = {
+                                level: '县',
+                                road: sitename
+                            }
+                            setRowSelected([]);
+                            const res = await dispatch(getRoadway(query));
+                            // console.log(res)
+
+                            setCounts(res.payload.data)
+                            return {
+                                ...res,
+                                total: res.payload.data ? res.payload.data.count : 0
+                            }
+                        } if (whichofits == 'xiang') {
+                            const query = {
+                                level: '乡',
+                                road: sitename
+                            }
+                            setRowSelected([]);
+                            const res = await dispatch(getRoadway(query));
+                            setCounts(res.payload.data)
+                            return {
+                                ...res,
+                                total: res.payload.data ? res.payload.data.count : 0
+                            }
+                        } if (whichofits == 'cun') {
+                            const query = {
+                                level: '村',
+                                road: sitename
+                            }
+                            setRowSelected([]);
+                            const res = await dispatch(getRoadway(query));
+                            setCounts(res.payload.data)
+                            return {
+                                ...res,
+                                total: res.payload.data ? res.payload.data.count : 0
+                            }
                         }
-                        setSitename('县')
+                        if (whichofits == 'gongcheng') {
-
+                            const query = {
-                        setRowSelected([]);
+                                type: 'road',
-                        const res = await dispatch(getRoadway(query));
+                                // type:sitename
-                        // console.log(res)
+                            }
-
+                            setRowSelected([]);
-                        setCounts(res.payload.data)
+                            const res = await dispatch(getProject(query));
-                        return {
+                            setCounts(res.payload.data)
-                            ...res,
+                            return {
-                            total: res.payload.data ? res.payload.data.count : 0
+                                ...res,
+                                total: res.payload.data ? res.payload.data.count : 0
+                            }
                         }
                     }}
                     search={{

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

@@ -20,9 +20,9 @@ export function getNavItem(user, dispatch) {
             <Menu.Item key="fillionoperational">
                 <Link to="/fillion/operational">运政管理</Link>
             </Menu.Item>
-            <Menu.Item key="fillionenforce">
+            {/* <Menu.Item key="fillionenforce">
                 <Link to="/fillion/enforce">执法管理</Link>
-            </Menu.Item>
+            </Menu.Item> */}
             <Menu.Item key="fillionmaintenance">
                 <Link to="/fillion/maintenance">养护管理</Link>
             </Menu.Item>

web/client/src/utils/webapi.js

@@ -45,23 +45,24 @@ export const ApiTable = {
 
 
     //运政管理
-    getOperaTional: 'vehicle',
+    getOperaTional: 'vehicle',putOperaTional: 'vehicle',
-    getSpecificVehicle: 'vehicle/specific',
+    getSpecificVehicle: 'vehicle/specific',putSpecificVehicle: 'vehicle/specific',delSpecificVehicle: 'vehicle/{vehicleId}/specific',
-    getHouseholds: 'vehicle/business',
+    getHouseholds: 'vehicle/business',putHouseholds: 'vehicle/business',delHouseholds: 'vehicle/business/{businessId}',
     getRoadway: 'road',
-    // 获取运政统计
+ // 获取运政统计
-    getYunZheng: "transportation/statistic",
+ getYunZheng: "transportation/statistic",
-    //桥梁管理
+  //桥梁管理
-    getBridge: 'bridge',
+getBridge:'bridge',
-    //工程数据
+putBridge:'bridge',
-    getProject: 'project',
+delBridge:'bridge/{bridgeId}',
-    //桥梁管理
+  //工程数据
-    getBridge: 'bridge',
+getProject:'project',
-    putBridge: 'bridge',
+putProject:'project',
-    //工程数据
+delProject:'project/{projectId}',
-    getProject: 'project',
+//道路数据
-    putProject: 'project',
+getRoadway: 'road',
-
+putRoadway: 'road',
+delRoadway:'road/{roadId}',
     //道路统计
     getBgroadstatistics: "build/road_state",
 
@@ -79,13 +80,16 @@ export const ApiTable = {
     getBusTier: '/operation/car_level',
 
     //获取路政列表
-    getHighways: 'road_manage',
+    getHighways: 'road_manage',putHighways: 'road_manage',
 
     //获取道路养护统计及列表
     getRoadMaintenance: 'conserve/statistic',
 
     //获取宣传数据
     getpropagata: 'publicity',
+//公交信息
+getCircuit:'bus/line',putCircuit:'bus/line',delCircuit:'bus/line/{lineId}',
+getVehicle:'bus/car',putVehicle:'bus/car',delVehicle:'bus/car/{carId}',
 };
 
 

web/log/development.txt

@@ -20324,4 +20324,649 @@
     '    at processTicksAndRejections (internal/process/task_queues.js:84:21)'
 }
 >>>>>>> Stashed changes
+<<<<<<< Updated upstream
 >>>>>>> 385f017aeac33adc39a31e75faf6254a1a881d16
+=======
+2022-07-26 10:36:17.862 - debug: [FS-LOGGER] Init.
+2022-07-26 14:17:07.892 - error: [FS-ERRHD] 
+{
+  message: 'Error: connect ETIMEDOUT 10.8.30.7:14000',
+  name: 'RequestError',
+  cause: {
+    errno: 'ETIMEDOUT',
+    code: 'ETIMEDOUT',
+    syscall: 'connect',
+    address: '10.8.30.7',
+    port: 14000
+  },
+  error: { '$ref': '$["cause"]' },
+  options: {
+    jar: false,
+    url: 'http://10.8.30.7:14000/department?token=3de82f98-253d-4ebd-a444-eff69920459b',
+    headers: {
+      host: '10.8.30.7:14000',
+      connection: 'keep-alive',
+      'sec-ch-ua': '".Not/A)Brand";v="99", "Google Chrome";v="103", "Chromium";v="103"',
+      'sec-ch-ua-mobile': '?0',
+      'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36',
+      'cache-control': 'no-cache,no-store,must-revalidate,max-age=-1,private',
+      'x-requested-with': 'XMLHttpRequest',
+      token: '3de82f98-253d-4ebd-a444-eff69920459b',
+      'sec-ch-ua-platform': '"Windows"',
+      expires: '-1',
+      accept: '*/*',
+      'sec-fetch-site': 'same-origin',
+      'sec-fetch-mode': 'cors',
+      'sec-fetch-dest': 'empty',
+      referer: 'http://localhost:5000/fillion/operational',
+      'accept-encoding': 'gzip, deflate, br',
+      'accept-language': 'zh-CN,zh;q=0.9'
+    },
+    encoding: null,
+    followRedirect: true,
+    method: 'GET',
+    body: '[object Object]',
+    simple: false,
+    resolveWithFullResponse: true,
+    callback: [Function: RP$callback],
+    transform: undefined,
+    transform2xxOnly: false
+  },
+  response: undefined,
+  stack: 'RequestError: Error: connect ETIMEDOUT 10.8.30.7:14000\n' +
+    '    at new RequestError (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\errors.js:14:15)\n' +
+    '    at Request.plumbing.callback (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:87:29)\n' +
+    '    at Request.RP$callback [as _callback] (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:46:31)\n' +
+    '    at self.callback (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request\\request.js:185:22)\n' +
+    '    at Request.emit (events.js:314:20)\n' +
+    '    at Request.onRequestError (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request\\request.js:877:8)\n' +
+    '    at ClientRequest.emit (events.js:314:20)\n' +
+    '    at Socket.socketErrorListener (_http_client.js:427:9)\n' +
+    '    at Socket.emit (events.js:314:20)\n' +
+    '    at emitErrorNT (internal/streams/destroy.js:92:8)\n' +
+    '    at emitErrorAndCloseNT (internal/streams/destroy.js:60:3)\n' +
+    '    at processTicksAndRejections (internal/process/task_queues.js:84:21)'
+}
+2022-07-26 14:17:08.280 - error: [FS-ERRHD] 
+{
+  message: 'Error: connect ETIMEDOUT 10.8.30.7:14000',
+  name: 'RequestError',
+  cause: {
+    errno: 'ETIMEDOUT',
+    code: 'ETIMEDOUT',
+    syscall: 'connect',
+    address: '10.8.30.7',
+    port: 14000
+  },
+  error: { '$ref': '$["cause"]' },
+  options: {
+    jar: false,
+    url: 'http://10.8.30.7:14000/vehicle?token=3de82f98-253d-4ebd-a444-eff69920459b',
+    headers: {
+      host: '10.8.30.7:14000',
+      connection: 'keep-alive',
+      'sec-ch-ua': '".Not/A)Brand";v="99", "Google Chrome";v="103", "Chromium";v="103"',
+      'sec-ch-ua-mobile': '?0',
+      'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36',
+      'cache-control': 'no-cache,no-store,must-revalidate,max-age=-1,private',
+      'x-requested-with': 'XMLHttpRequest',
+      token: '3de82f98-253d-4ebd-a444-eff69920459b',
+      'sec-ch-ua-platform': '"Windows"',
+      expires: '-1',
+      accept: '*/*',
+      'sec-fetch-site': 'same-origin',
+      'sec-fetch-mode': 'cors',
+      'sec-fetch-dest': 'empty',
+      referer: 'http://localhost:5000/fillion/operational',
+      'accept-encoding': 'gzip, deflate, br',
+      'accept-language': 'zh-CN,zh;q=0.9'
+    },
+    encoding: null,
+    followRedirect: true,
+    method: 'GET',
+    body: '[object Object]',
+    simple: false,
+    resolveWithFullResponse: true,
+    callback: [Function: RP$callback],
+    transform: undefined,
+    transform2xxOnly: false
+  },
+  response: undefined,
+  stack: 'RequestError: Error: connect ETIMEDOUT 10.8.30.7:14000\n' +
+    '    at new RequestError (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\errors.js:14:15)\n' +
+    '    at Request.plumbing.callback (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:87:29)\n' +
+    '    at Request.RP$callback [as _callback] (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:46:31)\n' +
+    '    at self.callback (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request\\request.js:185:22)\n' +
+    '    at Request.emit (events.js:314:20)\n' +
+    '    at Request.onRequestError (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request\\request.js:877:8)\n' +
+    '    at ClientRequest.emit (events.js:314:20)\n' +
+    '    at Socket.socketErrorListener (_http_client.js:427:9)\n' +
+    '    at Socket.emit (events.js:314:20)\n' +
+    '    at emitErrorNT (internal/streams/destroy.js:92:8)\n' +
+    '    at emitErrorAndCloseNT (internal/streams/destroy.js:60:3)\n' +
+    '    at processTicksAndRejections (internal/process/task_queues.js:84:21)'
+}
+2022-07-26 14:17:10.564 - error: [FS-ERRHD] 
+{
+  message: 'Error: connect ETIMEDOUT 10.8.30.7:14000',
+  name: 'RequestError',
+  cause: {
+    errno: 'ETIMEDOUT',
+    code: 'ETIMEDOUT',
+    syscall: 'connect',
+    address: '10.8.30.7',
+    port: 14000
+  },
+  error: { '$ref': '$["cause"]' },
+  options: {
+    jar: false,
+    url: 'http://10.8.30.7:14000/vehicle/specific?token=3de82f98-253d-4ebd-a444-eff69920459b&%E5%87%BA%E7%A7%9F%E8%BD%A6',
+    headers: {
+      host: '10.8.30.7:14000',
+      connection: 'keep-alive',
+      'sec-ch-ua': '".Not/A)Brand";v="99", "Google Chrome";v="103", "Chromium";v="103"',
+      'sec-ch-ua-mobile': '?0',
+      'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36',
+      'cache-control': 'no-cache,no-store,must-revalidate,max-age=-1,private',
+      'x-requested-with': 'XMLHttpRequest',
+      token: '3de82f98-253d-4ebd-a444-eff69920459b',
+      'sec-ch-ua-platform': '"Windows"',
+      expires: '-1',
+      accept: '*/*',
+      'sec-fetch-site': 'same-origin',
+      'sec-fetch-mode': 'cors',
+      'sec-fetch-dest': 'empty',
+      referer: 'http://localhost:5000/fillion/operational',
+      'accept-encoding': 'gzip, deflate, br',
+      'accept-language': 'zh-CN,zh;q=0.9'
+    },
+    encoding: null,
+    followRedirect: true,
+    method: 'GET',
+    body: '[object Object]',
+    simple: false,
+    resolveWithFullResponse: true,
+    callback: [Function: RP$callback],
+    transform: undefined,
+    transform2xxOnly: false
+  },
+  response: undefined,
+  stack: 'RequestError: Error: connect ETIMEDOUT 10.8.30.7:14000\n' +
+    '    at new RequestError (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\errors.js:14:15)\n' +
+    '    at Request.plumbing.callback (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:87:29)\n' +
+    '    at Request.RP$callback [as _callback] (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:46:31)\n' +
+    '    at self.callback (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request\\request.js:185:22)\n' +
+    '    at Request.emit (events.js:314:20)\n' +
+    '    at Request.onRequestError (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request\\request.js:877:8)\n' +
+    '    at ClientRequest.emit (events.js:314:20)\n' +
+    '    at Socket.socketErrorListener (_http_client.js:427:9)\n' +
+    '    at Socket.emit (events.js:314:20)\n' +
+    '    at emitErrorNT (internal/streams/destroy.js:92:8)\n' +
+    '    at emitErrorAndCloseNT (internal/streams/destroy.js:60:3)\n' +
+    '    at processTicksAndRejections (internal/process/task_queues.js:84:21)'
+}
+2022-07-26 14:17:12.386 - error: [FS-ERRHD] 
+{
+  message: 'Error: connect ETIMEDOUT 10.8.30.7:14000',
+  name: 'RequestError',
+  cause: {
+    errno: 'ETIMEDOUT',
+    code: 'ETIMEDOUT',
+    syscall: 'connect',
+    address: '10.8.30.7',
+    port: 14000
+  },
+  error: { '$ref': '$["cause"]' },
+  options: {
+    jar: false,
+    url: 'http://10.8.30.7:14000/bridge?token=3de82f98-253d-4ebd-a444-eff69920459b',
+    headers: {
+      host: '10.8.30.7:14000',
+      connection: 'keep-alive',
+      'sec-ch-ua': '".Not/A)Brand";v="99", "Google Chrome";v="103", "Chromium";v="103"',
+      'sec-ch-ua-mobile': '?0',
+      'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36',
+      'cache-control': 'no-cache,no-store,must-revalidate,max-age=-1,private',
+      'x-requested-with': 'XMLHttpRequest',
+      token: '3de82f98-253d-4ebd-a444-eff69920459b',
+      'sec-ch-ua-platform': '"Windows"',
+      expires: '-1',
+      accept: '*/*',
+      'sec-fetch-site': 'same-origin',
+      'sec-fetch-mode': 'cors',
+      'sec-fetch-dest': 'empty',
+      referer: 'http://localhost:5000/fillion/bridge',
+      'accept-encoding': 'gzip, deflate, br',
+      'accept-language': 'zh-CN,zh;q=0.9'
+    },
+    encoding: null,
+    followRedirect: true,
+    method: 'GET',
+    body: '[object Object]',
+    simple: false,
+    resolveWithFullResponse: true,
+    callback: [Function: RP$callback],
+    transform: undefined,
+    transform2xxOnly: false
+  },
+  response: undefined,
+  stack: 'RequestError: Error: connect ETIMEDOUT 10.8.30.7:14000\n' +
+    '    at new RequestError (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\errors.js:14:15)\n' +
+    '    at Request.plumbing.callback (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:87:29)\n' +
+    '    at Request.RP$callback [as _callback] (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:46:31)\n' +
+    '    at self.callback (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request\\request.js:185:22)\n' +
+    '    at Request.emit (events.js:314:20)\n' +
+    '    at Request.onRequestError (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request\\request.js:877:8)\n' +
+    '    at ClientRequest.emit (events.js:314:20)\n' +
+    '    at Socket.socketErrorListener (_http_client.js:427:9)\n' +
+    '    at Socket.emit (events.js:314:20)\n' +
+    '    at emitErrorNT (internal/streams/destroy.js:92:8)\n' +
+    '    at emitErrorAndCloseNT (internal/streams/destroy.js:60:3)\n' +
+    '    at processTicksAndRejections (internal/process/task_queues.js:84:21)'
+}
+2022-07-26 14:17:33.973 - error: [FS-ERRHD] 
+{
+  message: 'Error: connect ETIMEDOUT 10.8.30.7:14000',
+  name: 'RequestError',
+  cause: {
+    errno: 'ETIMEDOUT',
+    code: 'ETIMEDOUT',
+    syscall: 'connect',
+    address: '10.8.30.7',
+    port: 14000
+  },
+  error: { '$ref': '$["cause"]' },
+  options: {
+    jar: false,
+    url: 'http://10.8.30.7:14000/department?token=3de82f98-253d-4ebd-a444-eff69920459b',
+    headers: {
+      host: '10.8.30.7:14000',
+      connection: 'keep-alive',
+      'sec-ch-ua': '".Not/A)Brand";v="99", "Google Chrome";v="103", "Chromium";v="103"',
+      'sec-ch-ua-mobile': '?0',
+      'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36',
+      'cache-control': 'no-cache,no-store,must-revalidate,max-age=-1,private',
+      'x-requested-with': 'XMLHttpRequest',
+      token: '3de82f98-253d-4ebd-a444-eff69920459b',
+      'sec-ch-ua-platform': '"Windows"',
+      expires: '-1',
+      accept: '*/*',
+      'sec-fetch-site': 'same-origin',
+      'sec-fetch-mode': 'cors',
+      'sec-fetch-dest': 'empty',
+      referer: 'http://localhost:5000/fillion/bridge',
+      'accept-encoding': 'gzip, deflate, br',
+      'accept-language': 'zh-CN,zh;q=0.9'
+    },
+    encoding: null,
+    followRedirect: true,
+    method: 'GET',
+    body: '[object Object]',
+    simple: false,
+    resolveWithFullResponse: true,
+    callback: [Function: RP$callback],
+    transform: undefined,
+    transform2xxOnly: false
+  },
+  response: undefined,
+  stack: 'RequestError: Error: connect ETIMEDOUT 10.8.30.7:14000\n' +
+    '    at new RequestError (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\errors.js:14:15)\n' +
+    '    at Request.plumbing.callback (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:87:29)\n' +
+    '    at Request.RP$callback [as _callback] (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:46:31)\n' +
+    '    at self.callback (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request\\request.js:185:22)\n' +
+    '    at Request.emit (events.js:314:20)\n' +
+    '    at Request.onRequestError (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request\\request.js:877:8)\n' +
+    '    at ClientRequest.emit (events.js:314:20)\n' +
+    '    at Socket.socketErrorListener (_http_client.js:427:9)\n' +
+    '    at Socket.emit (events.js:314:20)\n' +
+    '    at emitErrorNT (internal/streams/destroy.js:92:8)\n' +
+    '    at emitErrorAndCloseNT (internal/streams/destroy.js:60:3)\n' +
+    '    at processTicksAndRejections (internal/process/task_queues.js:84:21)'
+}
+2022-07-26 14:17:34.427 - error: [FS-ERRHD] 
+{
+  message: 'Error: connect ETIMEDOUT 10.8.30.7:14000',
+  name: 'RequestError',
+  cause: {
+    errno: 'ETIMEDOUT',
+    code: 'ETIMEDOUT',
+    syscall: 'connect',
+    address: '10.8.30.7',
+    port: 14000
+  },
+  error: { '$ref': '$["cause"]' },
+  options: {
+    jar: false,
+    url: 'http://10.8.30.7:14000/bridge?token=3de82f98-253d-4ebd-a444-eff69920459b',
+    headers: {
+      host: '10.8.30.7:14000',
+      connection: 'keep-alive',
+      'sec-ch-ua': '".Not/A)Brand";v="99", "Google Chrome";v="103", "Chromium";v="103"',
+      'sec-ch-ua-mobile': '?0',
+      'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36',
+      'cache-control': 'no-cache,no-store,must-revalidate,max-age=-1,private',
+      'x-requested-with': 'XMLHttpRequest',
+      token: '3de82f98-253d-4ebd-a444-eff69920459b',
+      'sec-ch-ua-platform': '"Windows"',
+      expires: '-1',
+      accept: '*/*',
+      'sec-fetch-site': 'same-origin',
+      'sec-fetch-mode': 'cors',
+      'sec-fetch-dest': 'empty',
+      referer: 'http://localhost:5000/fillion/bridge',
+      'accept-encoding': 'gzip, deflate, br',
+      'accept-language': 'zh-CN,zh;q=0.9'
+    },
+    encoding: null,
+    followRedirect: true,
+    method: 'GET',
+    body: '[object Object]',
+    simple: false,
+    resolveWithFullResponse: true,
+    callback: [Function: RP$callback],
+    transform: undefined,
+    transform2xxOnly: false
+  },
+  response: undefined,
+  stack: 'RequestError: Error: connect ETIMEDOUT 10.8.30.7:14000\n' +
+    '    at new RequestError (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\errors.js:14:15)\n' +
+    '    at Request.plumbing.callback (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:87:29)\n' +
+    '    at Request.RP$callback [as _callback] (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:46:31)\n' +
+    '    at self.callback (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request\\request.js:185:22)\n' +
+    '    at Request.emit (events.js:314:20)\n' +
+    '    at Request.onRequestError (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request\\request.js:877:8)\n' +
+    '    at ClientRequest.emit (events.js:314:20)\n' +
+    '    at Socket.socketErrorListener (_http_client.js:427:9)\n' +
+    '    at Socket.emit (events.js:314:20)\n' +
+    '    at emitErrorNT (internal/streams/destroy.js:92:8)\n' +
+    '    at emitErrorAndCloseNT (internal/streams/destroy.js:60:3)\n' +
+    '    at processTicksAndRejections (internal/process/task_queues.js:84:21)'
+}
+2022-07-26 14:17:37.083 - error: [FS-ERRHD] 
+{
+  message: 'Error: connect ETIMEDOUT 10.8.30.7:14000',
+  name: 'RequestError',
+  cause: {
+    errno: 'ETIMEDOUT',
+    code: 'ETIMEDOUT',
+    syscall: 'connect',
+    address: '10.8.30.7',
+    port: 14000
+  },
+  error: { '$ref': '$["cause"]' },
+  options: {
+    jar: false,
+    url: 'http://10.8.30.7:14000/road?token=3de82f98-253d-4ebd-a444-eff69920459b&level=%E5%8E%BF',
+    headers: {
+      host: '10.8.30.7:14000',
+      connection: 'keep-alive',
+      'sec-ch-ua': '".Not/A)Brand";v="99", "Google Chrome";v="103", "Chromium";v="103"',
+      'sec-ch-ua-mobile': '?0',
+      'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36',
+      'cache-control': 'no-cache,no-store,must-revalidate,max-age=-1,private',
+      'x-requested-with': 'XMLHttpRequest',
+      token: '3de82f98-253d-4ebd-a444-eff69920459b',
+      'sec-ch-ua-platform': '"Windows"',
+      expires: '-1',
+      accept: '*/*',
+      'sec-fetch-site': 'same-origin',
+      'sec-fetch-mode': 'cors',
+      'sec-fetch-dest': 'empty',
+      referer: 'http://localhost:5000/fillion/transportation',
+      'accept-encoding': 'gzip, deflate, br',
+      'accept-language': 'zh-CN,zh;q=0.9'
+    },
+    encoding: null,
+    followRedirect: true,
+    method: 'GET',
+    body: '[object Object]',
+    simple: false,
+    resolveWithFullResponse: true,
+    callback: [Function: RP$callback],
+    transform: undefined,
+    transform2xxOnly: false
+  },
+  response: undefined,
+  stack: 'RequestError: Error: connect ETIMEDOUT 10.8.30.7:14000\n' +
+    '    at new RequestError (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\errors.js:14:15)\n' +
+    '    at Request.plumbing.callback (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:87:29)\n' +
+    '    at Request.RP$callback [as _callback] (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:46:31)\n' +
+    '    at self.callback (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request\\request.js:185:22)\n' +
+    '    at Request.emit (events.js:314:20)\n' +
+    '    at Request.onRequestError (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request\\request.js:877:8)\n' +
+    '    at ClientRequest.emit (events.js:314:20)\n' +
+    '    at Socket.socketErrorListener (_http_client.js:427:9)\n' +
+    '    at Socket.emit (events.js:314:20)\n' +
+    '    at emitErrorNT (internal/streams/destroy.js:92:8)\n' +
+    '    at emitErrorAndCloseNT (internal/streams/destroy.js:60:3)\n' +
+    '    at processTicksAndRejections (internal/process/task_queues.js:84:21)'
+}
+2022-07-26 14:19:12.817 - error: [FS-ERRHD] 
+{
+  message: 'Error: connect ETIMEDOUT 10.8.30.7:14000',
+  name: 'RequestError',
+  cause: {
+    errno: 'ETIMEDOUT',
+    code: 'ETIMEDOUT',
+    syscall: 'connect',
+    address: '10.8.30.7',
+    port: 14000
+  },
+  error: { '$ref': '$["cause"]' },
+  options: {
+    jar: false,
+    url: 'http://10.8.30.7:14000/department?token=3de82f98-253d-4ebd-a444-eff69920459b',
+    headers: {
+      host: '10.8.30.7:14000',
+      connection: 'keep-alive',
+      'sec-ch-ua': '".Not/A)Brand";v="99", "Google Chrome";v="103", "Chromium";v="103"',
+      'sec-ch-ua-mobile': '?0',
+      'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36',
+      'cache-control': 'no-cache,no-store,must-revalidate,max-age=-1,private',
+      'x-requested-with': 'XMLHttpRequest',
+      token: '3de82f98-253d-4ebd-a444-eff69920459b',
+      'sec-ch-ua-platform': '"Windows"',
+      expires: '-1',
+      accept: '*/*',
+      'sec-fetch-site': 'same-origin',
+      'sec-fetch-mode': 'cors',
+      'sec-fetch-dest': 'empty',
+      referer: 'http://localhost:5000/fillion/transportation',
+      'accept-encoding': 'gzip, deflate, br',
+      'accept-language': 'zh-CN,zh;q=0.9'
+    },
+    encoding: null,
+    followRedirect: true,
+    method: 'GET',
+    body: '[object Object]',
+    simple: false,
+    resolveWithFullResponse: true,
+    callback: [Function: RP$callback],
+    transform: undefined,
+    transform2xxOnly: false
+  },
+  response: undefined,
+  stack: 'RequestError: Error: connect ETIMEDOUT 10.8.30.7:14000\n' +
+    '    at new RequestError (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\errors.js:14:15)\n' +
+    '    at Request.plumbing.callback (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:87:29)\n' +
+    '    at Request.RP$callback [as _callback] (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:46:31)\n' +
+    '    at self.callback (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request\\request.js:185:22)\n' +
+    '    at Request.emit (events.js:314:20)\n' +
+    '    at Request.onRequestError (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request\\request.js:877:8)\n' +
+    '    at ClientRequest.emit (events.js:314:20)\n' +
+    '    at Socket.socketErrorListener (_http_client.js:427:9)\n' +
+    '    at Socket.emit (events.js:314:20)\n' +
+    '    at emitErrorNT (internal/streams/destroy.js:92:8)\n' +
+    '    at emitErrorAndCloseNT (internal/streams/destroy.js:60:3)\n' +
+    '    at processTicksAndRejections (internal/process/task_queues.js:84:21)'
+}
+2022-07-26 14:19:13.254 - error: [FS-ERRHD] 
+{
+  message: 'Error: connect ETIMEDOUT 10.8.30.7:14000',
+  name: 'RequestError',
+  cause: {
+    errno: 'ETIMEDOUT',
+    code: 'ETIMEDOUT',
+    syscall: 'connect',
+    address: '10.8.30.7',
+    port: 14000
+  },
+  error: { '$ref': '$["cause"]' },
+  options: {
+    jar: false,
+    url: 'http://10.8.30.7:14000/road?token=3de82f98-253d-4ebd-a444-eff69920459b&level=%E5%8E%BF',
+    headers: {
+      host: '10.8.30.7:14000',
+      connection: 'keep-alive',
+      'sec-ch-ua': '".Not/A)Brand";v="99", "Google Chrome";v="103", "Chromium";v="103"',
+      'sec-ch-ua-mobile': '?0',
+      'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36',
+      'cache-control': 'no-cache,no-store,must-revalidate,max-age=-1,private',
+      'x-requested-with': 'XMLHttpRequest',
+      token: '3de82f98-253d-4ebd-a444-eff69920459b',
+      'sec-ch-ua-platform': '"Windows"',
+      expires: '-1',
+      accept: '*/*',
+      'sec-fetch-site': 'same-origin',
+      'sec-fetch-mode': 'cors',
+      'sec-fetch-dest': 'empty',
+      referer: 'http://localhost:5000/fillion/transportation',
+      'accept-encoding': 'gzip, deflate, br',
+      'accept-language': 'zh-CN,zh;q=0.9'
+    },
+    encoding: null,
+    followRedirect: true,
+    method: 'GET',
+    body: '[object Object]',
+    simple: false,
+    resolveWithFullResponse: true,
+    callback: [Function: RP$callback],
+    transform: undefined,
+    transform2xxOnly: false
+  },
+  response: undefined,
+  stack: 'RequestError: Error: connect ETIMEDOUT 10.8.30.7:14000\n' +
+    '    at new RequestError (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\errors.js:14:15)\n' +
+    '    at Request.plumbing.callback (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:87:29)\n' +
+    '    at Request.RP$callback [as _callback] (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:46:31)\n' +
+    '    at self.callback (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request\\request.js:185:22)\n' +
+    '    at Request.emit (events.js:314:20)\n' +
+    '    at Request.onRequestError (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request\\request.js:877:8)\n' +
+    '    at ClientRequest.emit (events.js:314:20)\n' +
+    '    at Socket.socketErrorListener (_http_client.js:427:9)\n' +
+    '    at Socket.emit (events.js:314:20)\n' +
+    '    at emitErrorNT (internal/streams/destroy.js:92:8)\n' +
+    '    at emitErrorAndCloseNT (internal/streams/destroy.js:60:3)\n' +
+    '    at processTicksAndRejections (internal/process/task_queues.js:84:21)'
+}
+2022-07-26 16:47:41.611 - error: [FS-ERRHD] 
+{
+  message: 'Error: read ECONNRESET',
+  name: 'RequestError',
+  cause: { errno: 'ECONNRESET', code: 'ECONNRESET', syscall: 'read' },
+  error: { '$ref': '$["cause"]' },
+  options: {
+    jar: false,
+    url: 'http://10.8.30.7:14000/road?token=3de82f98-253d-4ebd-a444-eff69920459b&level=%E5%8E%BF',
+    headers: {
+      host: '10.8.30.7:14000',
+      connection: 'keep-alive',
+      'sec-ch-ua': '".Not/A)Brand";v="99", "Google Chrome";v="103", "Chromium";v="103"',
+      'sec-ch-ua-mobile': '?0',
+      'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36',
+      'cache-control': 'no-cache,no-store,must-revalidate,max-age=-1,private',
+      'x-requested-with': 'XMLHttpRequest',
+      token: '3de82f98-253d-4ebd-a444-eff69920459b',
+      'sec-ch-ua-platform': '"Windows"',
+      expires: '-1',
+      accept: '*/*',
+      'sec-fetch-site': 'same-origin',
+      'sec-fetch-mode': 'cors',
+      'sec-fetch-dest': 'empty',
+      referer: 'http://localhost:5000/fillion/transportation',
+      'accept-encoding': 'gzip, deflate, br',
+      'accept-language': 'zh-CN,zh;q=0.9'
+    },
+    encoding: null,
+    followRedirect: true,
+    method: 'GET',
+    body: '[object Object]',
+    simple: false,
+    resolveWithFullResponse: true,
+    callback: [Function: RP$callback],
+    transform: undefined,
+    transform2xxOnly: false
+  },
+  response: undefined,
+  stack: 'RequestError: Error: read ECONNRESET\n' +
+    '    at new RequestError (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\errors.js:14:15)\n' +
+    '    at Request.plumbing.callback (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:87:29)\n' +
+    '    at Request.RP$callback [as _callback] (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:46:31)\n' +
+    '    at self.callback (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request\\request.js:185:22)\n' +
+    '    at Request.emit (events.js:314:20)\n' +
+    '    at Request.onRequestError (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request\\request.js:877:8)\n' +
+    '    at ClientRequest.emit (events.js:314:20)\n' +
+    '    at Socket.socketErrorListener (_http_client.js:427:9)\n' +
+    '    at Socket.emit (events.js:314:20)\n' +
+    '    at emitErrorNT (internal/streams/destroy.js:92:8)\n' +
+    '    at emitErrorAndCloseNT (internal/streams/destroy.js:60:3)\n' +
+    '    at processTicksAndRejections (internal/process/task_queues.js:84:21)'
+}
+2022-07-26 16:47:41.616 - error: [FS-ERRHD] 
+{
+  message: 'Error: read ECONNRESET',
+  name: 'RequestError',
+  cause: { errno: 'ECONNRESET', code: 'ECONNRESET', syscall: 'read' },
+  error: { '$ref': '$["cause"]' },
+  options: {
+    jar: false,
+    url: 'http://10.8.30.7:14000/road?token=3de82f98-253d-4ebd-a444-eff69920459b',
+    headers: {
+      host: '10.8.30.7:14000',
+      connection: 'keep-alive',
+      'content-length': '83',
+      'sec-ch-ua': '".Not/A)Brand";v="99", "Google Chrome";v="103", "Chromium";v="103"',
+      'sec-ch-ua-mobile': '?0',
+      'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36',
+      'content-type': 'application/json',
+      'cache-control': 'no-cache,no-store,must-revalidate,max-age=-1,private',
+      'x-requested-with': 'XMLHttpRequest',
+      token: '3de82f98-253d-4ebd-a444-eff69920459b',
+      'sec-ch-ua-platform': '"Windows"',
+      expires: '-1',
+      accept: '*/*',
+      origin: 'http://localhost:5000',
+      'sec-fetch-site': 'same-origin',
+      'sec-fetch-mode': 'cors',
+      'sec-fetch-dest': 'empty',
+      referer: 'http://localhost:5000/fillion/transportation',
+      'accept-encoding': 'gzip, deflate, br',
+      'accept-language': 'zh-CN,zh;q=0.9'
+    },
+    encoding: null,
+    followRedirect: true,
+    method: 'PUT',
+    body: '{"routeName":"1","routeCode":"1111","sectionNo":"4444","level":"县","roadId":3275}',
+    simple: false,
+    resolveWithFullResponse: true,
+    callback: [Function: RP$callback],
+    transform: undefined,
+    transform2xxOnly: false
+  },
+  response: undefined,
+  stack: 'RequestError: Error: read ECONNRESET\n' +
+    '    at new RequestError (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\errors.js:14:15)\n' +
+    '    at Request.plumbing.callback (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:87:29)\n' +
+    '    at Request.RP$callback [as _callback] (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:46:31)\n' +
+    '    at self.callback (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request\\request.js:185:22)\n' +
+    '    at Request.emit (events.js:314:20)\n' +
+    '    at Request.onRequestError (C:\\Users\\Administrator\\Desktop\\项目\\sihao\\Highways4Good\\web\\node_modules\\request\\request.js:877:8)\n' +
+    '    at ClientRequest.emit (events.js:314:20)\n' +
+    '    at Socket.socketErrorListener (_http_client.js:427:9)\n' +
+    '    at Socket.emit (events.js:314:20)\n' +
+    '    at emitErrorNT (internal/streams/destroy.js:92:8)\n' +
+    '    at emitErrorAndCloseNT (internal/streams/destroy.js:60:3)\n' +
+    '    at processTicksAndRejections (internal/process/task_queues.js:84:21)'
+}
+2022-07-27 11:00:11.991 - debug: [FS-LOGGER] Init.
+>>>>>>> Stashed changes

web/package.json

@@ -68,7 +68,7 @@
     "@antv/g6": "^4.2.5",
     "@fs/attachment": "^1.0.0",
     "@peace/components": "0.0.35",
-    "@peace/utils": "^0.0.51",
+    "@peace/utils": "0.0.51",
     "antd": "^4.19.2",
     "antd-theme-generator": "^1.2.8",
     "args": "^5.0.1",