diff --git a/web/client/assets/color.less b/web/client/assets/color.less index 0d45e9f2..a522fd49 100644 --- a/web/client/assets/color.less +++ b/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);} diff --git a/web/client/src/sections/fillion/actions/infor.js b/web/client/src/sections/fillion/actions/infor.js index f9275335..583d9454 100644 --- a/web/client/src/sections/fillion/actions/infor.js +++ b/web/client/src/sections/fillion/actions/infor.js @@ -21,7 +21,7 @@ export function getDepMessage() { // msg: { error: '获取填报信息失败' }, // reducer: { name: 'reportstatistic' } // }); - + // } export function getOperaTional(query) { return dispatch => basicAction({ @@ -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', @@ -121,4 +154,140 @@ export function putProject(query) { msg: { error: '编辑工程信息失败' }, // 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' } + }); } \ No newline at end of file diff --git a/web/client/src/sections/fillion/components/bridgeTable.js b/web/client/src/sections/fillion/components/bridgeTable.js index cd794928..a1c3eded 100644 --- a/web/client/src/sections/fillion/components/bridgeTable.js +++ b/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) }} - >编辑 + >编辑 } }, @@ -1532,9 +1545,9 @@ const BrideTable = (props) => { options: 1, backgroundColor: "#ffffff", fieldProps: { - // onChange: (value, cs) => { - // setSitename(value.currentTarget.value) - // }, + onChange: (value, cs) => { + setSitename(value.currentTarget.value) + }, placeholder: '请输入项目名称进行搜索', getPopupContainer: (triggerNode) => triggerNode.parentNode, }, @@ -1670,7 +1683,16 @@ const BrideTable = (props) => { setTypecard('111') setRecortd(record) }} - >编辑 + >编辑 } }, @@ -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) => {
{ { key: 'tab1', label: { - requestBridge() + setWhichofits('qiaoliang') }}>桥梁{activeKey === 'tab1'}, }, { key: 'tab2', label: { - requestProject() + setWhichofits('gongcheng') }}>工程一览{activeKey === 'tab2'}, }, @@ -1796,12 +1797,7 @@ const BrideTable = (props) => { style={{ width: "100% ", overflow: "auto", height: '760px' }} rowKey='id' onReset={(v) => { - // const { id } = depMessage[0] - // console.log(id) - // setRegionId(id) - // setPlaceType(-1) - // setDay([moment('2022-03-01').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')]) - // setSitename('') + setSitename('') }} rowSelection={{ selectedRowKeys: rowSelected, @@ -1813,16 +1809,33 @@ const BrideTable = (props) => { dataSource={counts || []} request={async (params) => { - const query = { - - } - setRowSelected([]); - const res = await dispatch(getBridge(query)); - setCounts(res.payload.data) - return { - ...res, - total: res.payload.data ? res.payload.data.count : 0 + if(whichofits=='qiaoliang'){ + const query = { + bridgeName:sitename + } + setRowSelected([]); + const res = await dispatch(getBridge(query)); + // console.log(res) + + 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, diff --git a/web/client/src/sections/fillion/components/highways/highwaysdata.js b/web/client/src/sections/fillion/components/highways/highwaysdata.js new file mode 100644 index 00000000..1aab30c7 --- /dev/null +++ b/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 ( + + {/* { + newlysay ? */} + { + 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' ? + + + + + + : + + } + + + {/* : '' + } */} + + + ) +} +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); \ No newline at end of file diff --git a/web/client/src/sections/fillion/components/highwaysTable.js b/web/client/src/sections/fillion/components/highwaysTable.js index af48d670..ce783267 100644 --- a/web/client/src/sections/fillion/components/highwaysTable.js +++ b/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 { getReportStatistic } from "../actions/infor" -import UserModal from './infor/details'; +import { getHighways } from "../actions/infor" +import HightModal from './highways/highwaysdata'; + 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) => { - setModalVisible(true); +const hightModal = (type, record) => { + 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
@@ -99,18 +103,14 @@ const exports = (ids, counts) => {
{ finishedProductTable = c; }} style={{ width: "100% ", overflow: "auto", height: '760px' }} rowKey='id' onReset={(v) => { - const { id } = depMessage[0] - console.log(id) - setRegionId(id) - setPlaceType(-1) - setDay([moment('2022-03-01').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')]) - setSitename('') + 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], - endDate: day[1], - placeType: placeType, - regionId: regionId, - placeName: sitename, - limit: params.pageSize, - offset: ((params.current ? params.current : 1) - 1) * params.pageSize + name:sitename } 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(), - // { props.exports(rowSelected, counts) }}> - // - // - ], - }} - >
- + rewkeys={'highways'} + recortd={recortd} + setRecortd={setRecortd} + /> : ''}
) } diff --git a/web/client/src/sections/fillion/components/infor/details.js b/web/client/src/sections/fillion/components/infor/details.js index fa79c9f5..cd0baa95 100644 --- a/web/client/src/sections/fillion/components/infor/details.js +++ b/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 { putRoadway } from "../../actions/infor" +import { DrawerForm, ProForm, ProFormText, ProFormSelect } from '@ant-design/pro-form'; +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 ( @@ -59,38 +134,104 @@ const UserModal = (props) => { visible={visible} onVisibleChange={onVisibleChange} onFinish={(values) => { - if (rewkeys === 'transportation') { - if (typecard == '111') { - console.log(values) - const query = { ...values, level: sitename, roadId: records?.[0]?.value || '' } - dispatch(putRoadway(query)).then((res) => { - setSuccess(res.success) - }) - return success - } else { - const query = { ...values, level: sitename } - dispatch(putRoadway(query)).then((res) => { - setSuccess(res.success) - }) - return success + console.log(values) + if (Object.values(values).length > 0) { + if (rewkeys === 'transportation') { + if (typecard == '111') { + const query = { ...values, level: sitename, roadId: records?.[0]?.value || '' } + dispatch(putRoadway(query)).then((res) => { + setSuccess(res.success) + }) + return true + } else { + const query = { ...values, level: sitename } + dispatch(putRoadway(query)).then((res) => { + setSuccess(res.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 === 'bridge') { - if (typecard == '111') { - console.log(values) - const query = { ...values, roadId: records?.[0]?.value || '' } - dispatch(putBridge(query)).then((res) => { - setSuccess(res.success) - }) - return success - } else { - const query = { ...values } - dispatch(putBridge(query)).then((res) => { - setSuccess(res.success) - }) - return success + 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 (typecard == '111') { + console.log(values) + const query = { ...values, carId:records?.[0]?.value || '' } + dispatch(putVehicle(query)).then((res) => { + setSuccess(res.success) + }) + return true + } else { + const query = { ...values } + dispatch(putVehicle(query)).then((res) => { + setSuccess(res.success) + }) + return true + } + } + } 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: "必填" }]} /> { tooltip="最长为 24 位" placeholder="请输入名称" value={recordsay?.[1]?.value} - rules={[{ required: true, message: "必填" }]} + // rules={[{ required: true, message: "必填" }]} /> - + {rewkeys === 'yehu' ? + : null + } {newlysay?.map((item, index) => { return { label={newlys?.[0]?.name} tooltip="最长为 24 位" placeholder="请输入名称" - // value={recordssy?.[0]?.value} - rules={[{ required: true, message: "必填" }]} + // value={recordssy?.[0]?.value} + // rules={[{ required: true, message: "必填" }]} /> + {rewkeys === 'yehu' ? + : null + } {newlysay?.map((item, index) => { return { const { dispatch, user, depData, depMessage, depLoading } = props @@ -13,33 +14,19 @@ const OperaTionalTable = (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); const [modalRecord, setModalRecord] = useState(); const [typecard, setTypecard] = useState(); const [activeKey, setActiveKey] = useState('tab1'); - //客运请求 - const requestoperational = () => { - const query = '' - setRowSelected([]); - const res = dispatch(getOperaTional(query)); - setCounts(res.payload.data) - } - //危货出租车请求 - const requestspecificvehicle = (name) => { - const query = name - setRowSelected([]); - const res = dispatch(getSpecificVehicle(query)); - setCounts(res.payload.data) - } - // - const requesthouseholds = () => { - const query = '' - setRowSelected([]); - const res = dispatch(getHouseholds(query)); - setCounts(res.payload.data) - } + const [recortd, setRecortd] = useState() + const [rewkeys, setRewkeys] = useState('keyun') + const [delet, setDelet] = useState() + + const ref = useRef() + useEffect(() => { ref.current.reload() }, [modalVisible, modalVisibleyilan,rewkeys,activeKey,delet]) //打开弹窗 const openModal = (type, record) => { setModalVisible(true); @@ -50,6 +37,16 @@ const OperaTionalTable = (props) => { setModalRecord(null); } } + //打开弹窗 + const hightModal = (type, record) => { + setModalVisibleyilan(true); + // setModalType(type); + if (type == 'edit') { + setModalRecord(record); + } else { + setModalRecord(null); + } + } //批量导出 const exports = (ids, counts) => { // console.log(user); @@ -78,12 +75,13 @@ const OperaTionalTable = (props) => { search: false, fieldProps: { - onChange: (value, cs) => { - setSitename(value.currentTarget.value) - }, + placeholder: '请输入道路名称进行搜索', getPopupContainer: (triggerNode) => triggerNode.parentNode, }, + render: (dom, record) => { + return record.name + }, }, { title: '数量', @@ -93,7 +91,7 @@ const OperaTionalTable = (props) => { fixed: 'left', width: 120, render: (dom, record) => { - return record.address + return record.count }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -109,9 +107,9 @@ const OperaTionalTable = (props) => { render: (dom, record) => { return
@@ -130,10 +128,13 @@ const OperaTionalTable = (props) => { onChange: (value, cs) => { setSitename(value.currentTarget.value) }, - placeholder: '请输入业户名称进行搜索', + placeholder: '请输入业户称进行搜索', getPopupContainer: (triggerNode) => triggerNode.parentNode, }, - }, + render: (dom, record) => { + return record.nameOfBusinessOwner + }, + }, { title: '车籍地', search: false, @@ -142,7 +143,7 @@ const OperaTionalTable = (props) => { fixed: 'left', width: 120, render: (dom, record) => { - return record.address + return record.vehicleRegistry }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -156,7 +157,7 @@ const OperaTionalTable = (props) => { // align: 'right', width: 120, render: (dom, record) => { - return record.address + return record.licensePlateNumber }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -172,7 +173,7 @@ const OperaTionalTable = (props) => { width: 120, render: (dom, record) => { - return record.address + return record.fuelType }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -200,7 +201,7 @@ const OperaTionalTable = (props) => { width: 120, render: (dom, record) => { - return record.address + return record.economicNature }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -214,7 +215,7 @@ const OperaTionalTable = (props) => { width: 120, render: (dom, record) => { - return record.address + return record.approvedPassengerCapacity }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -228,7 +229,7 @@ const OperaTionalTable = (props) => { width: 120, render: (dom, record) => { - return record.address + return record.approvedLoadMass }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -242,7 +243,7 @@ const OperaTionalTable = (props) => { width: 120, render: (dom, record) => { - return record.address + return record.numberOfVehicleAxles }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -257,7 +258,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.vehicleBrand }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -272,7 +273,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.natureOfBusiness }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -287,7 +288,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.vehicleOperationStatus }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -302,7 +303,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.busTypeAndClass }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -317,7 +318,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.annualReviewResults }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -332,7 +333,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.dateOfThisAnnualReview }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -347,13 +348,13 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.dateOfNextAnnualReview }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, } }, { - title: '注册等级日期', + title: '注册登记日期', search: false, dataIndex: 'time9', valueType: 'dateRange', @@ -362,7 +363,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.dateOfRegistration }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -377,7 +378,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.sourceOfTransportationCapacity }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -392,7 +393,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.fromTheExpiryDate }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -407,7 +408,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.expiryDate }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -422,7 +423,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.engineDisplacement }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -437,7 +438,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.engineNumber }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -452,7 +453,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.vehicleEnginePower }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -467,7 +468,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.businessLicenseNo }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -482,7 +483,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.licensePlateColor }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -497,7 +498,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.totalVehicleMass }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -512,7 +513,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.totalQuasiTractionMassOfVehicle }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -527,7 +528,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.roadTransportCertificateNo }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -542,7 +543,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.vehicleHeight }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -557,7 +558,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.vehicleConductor }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -572,7 +573,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.vehicleWidth }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -587,7 +588,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.vehicleType }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -602,7 +603,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.vehicleTypeWithDrivingLicense }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -617,7 +618,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.vehicleWheelbase }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -632,7 +633,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.ratingDate }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -647,7 +648,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.technicalEvaluationGrade }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -662,7 +663,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.nextRatingDate }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -677,7 +678,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.creationDate }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -696,7 +697,16 @@ const OperaTionalTable = (props) => { openModal('edit', record) setTypecard('111') }} - >编辑
+ >编辑 } }, @@ -744,11 +754,13 @@ const OperaTionalTable = (props) => { onChange: (value, cs) => { setSitename(value.currentTarget.value) }, - placeholder: '请输入业户名称进行搜索', + placeholder: '请输入业户称进行搜索', getPopupContainer: (triggerNode) => triggerNode.parentNode, }, - }, - { + render: (dom, record) => { + return record.nameOfBusinessOwner + }, + }, { title: '品名', search: false, dataIndex: 'containers', @@ -756,7 +768,7 @@ const OperaTionalTable = (props) => { fixed: 'left', width: 120, render: (dom, record) => { - return record.address + return record.productName }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -765,12 +777,12 @@ const OperaTionalTable = (props) => { { title: '车籍地', search: false, - dataIndex: 'time2', - valueType: 'dateRange', - // align: 'right', + dataIndex: 'containers', + + fixed: 'left', width: 120, render: (dom, record) => { - return record.address + return record.vehicleRegistry }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -779,28 +791,28 @@ const OperaTionalTable = (props) => { { title: '车牌号', search: false, - dataIndex: 'time3', + dataIndex: 'time2', valueType: 'dateRange', - - - + // align: 'right', width: 120, render: (dom, record) => { - return record.address + return record.licensePlateNumber }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, } - }, { + }, + { title: '燃料类型', search: false, - dataIndex: 'time4', + dataIndex: 'time3', valueType: 'dateRange', + width: 120, render: (dom, record) => { - return record.address + return record.fuelType }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -808,7 +820,7 @@ const OperaTionalTable = (props) => { }, { title: '住址', search: false, - dataIndex: 'time5', + dataIndex: 'time4', valueType: 'dateRange', @@ -822,13 +834,13 @@ const OperaTionalTable = (props) => { }, { title: '经济性质', search: false, - dataIndex: 'time6', + dataIndex: 'time5', valueType: 'dateRange', width: 120, render: (dom, record) => { - return record.address + return record.economicNature }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -836,13 +848,13 @@ const OperaTionalTable = (props) => { }, { title: '核定载客位数', search: false, - dataIndex: 'time7', + dataIndex: 'time6', valueType: 'dateRange', width: 120, render: (dom, record) => { - return record.address + return record.approvedPassengerCapacity }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -850,13 +862,13 @@ const OperaTionalTable = (props) => { }, { title: '核定载质量', search: false, - dataIndex: 'time8', + dataIndex: 'time7', valueType: 'dateRange', width: 120, render: (dom, record) => { - return record.address + return record.approvedLoadMass }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -864,14 +876,13 @@ const OperaTionalTable = (props) => { }, { title: '车辆车轴数', search: false, - dataIndex: 'time9', + dataIndex: 'time8', valueType: 'dateRange', - width: 140, - + width: 120, render: (dom, record) => { - return record.address + return record.numberOfVehicleAxles }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -886,7 +897,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.vehicleBrand }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -901,7 +912,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.natureOfBusiness }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -916,7 +927,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.vehicleOperationStatus }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -931,7 +942,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.busTypeAndClass }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -946,7 +957,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.annualReviewResults }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -961,7 +972,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.dateOfThisAnnualReview }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -976,7 +987,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.dateOfNextAnnualReview }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -991,7 +1002,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.dateOfRegistration }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -1006,7 +1017,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.sourceOfTransportationCapacity }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -1021,7 +1032,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.fromTheExpiryDate }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -1036,7 +1047,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.expiryDate }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -1051,7 +1062,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.engineDisplacement }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -1066,7 +1077,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.engineNumber }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -1081,7 +1092,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.vehicleEnginePower }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -1096,7 +1107,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.businessLicenseNo }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -1111,7 +1122,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.licensePlateColor }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -1126,7 +1137,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.totalVehicleMass }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -1141,7 +1152,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.totalQuasiTractionMassOfVehicle }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -1156,7 +1167,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.roadTransportCertificateNo }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -1171,7 +1182,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.vehicleHeight }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -1186,7 +1197,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.vehicleConductor }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -1201,7 +1212,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.vehicleWidth }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -1216,7 +1227,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.vehicleType }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -1231,7 +1242,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.vehicleTypeWithDrivingLicense }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -1246,7 +1257,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.vehicleWheelbase }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -1261,7 +1272,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.ratingDate }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -1276,7 +1287,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.technicalEvaluationGrade }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -1291,7 +1302,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.nextRatingDate }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -1306,7 +1317,7 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.creationDate }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -1325,7 +1336,17 @@ const OperaTionalTable = (props) => { openModal('edit', record) setTypecard('111') }} - >编辑 + >编辑 + } }, { @@ -1362,7 +1383,7 @@ const OperaTionalTable = (props) => { }, ], tab4: [ { - title: '路线名称', + title: '业户名称', dataIndex: 'placeName', fixed: 'left', width: 120, @@ -1372,40 +1393,43 @@ const OperaTionalTable = (props) => { onChange: (value, cs) => { setSitename(value.currentTarget.value) }, - placeholder: '请输入道路名称进行搜索', + placeholder: '请输入业户称进行搜索', getPopupContainer: (triggerNode) => triggerNode.parentNode, }, + render: (dom, record) => { + return record.nameOfBusinessOwner + }, }, { - title: '路线代码', + title: '品名', search: false, dataIndex: 'containers', fixed: 'left', width: 120, render: (dom, record) => { - return record.address + return record.productName }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, } }, { - title: '路段序号', + title: '信用社会代码', search: false, dataIndex: 'time2', valueType: 'dateRange', // align: 'right', width: 120, render: (dom, record) => { - return record.address + return record.creditSocialCode }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, } }, { - title: '乡镇编码', + title: '行政区划', search: false, dataIndex: 'time3', valueType: 'dateRange', @@ -1414,13 +1438,13 @@ const OperaTionalTable = (props) => { width: 120, render: (dom, record) => { - return record.address + return record.administrativeDivision }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, } }, { - title: '起点地名', + title: '经济性质', search: false, dataIndex: 'time4', valueType: 'dateRange', @@ -1428,13 +1452,13 @@ const OperaTionalTable = (props) => { width: 120, render: (dom, record) => { - return record.address + return record.economicNature }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, } }, { - title: '起点桩号', + title: '地址', search: false, dataIndex: 'time5', valueType: 'dateRange', @@ -1448,7 +1472,7 @@ const OperaTionalTable = (props) => { getPopupContainer: (triggerNode) => triggerNode.parentNode, } }, { - title: '起点分界点类别', + title: '联系电话', search: false, dataIndex: 'time6', valueType: 'dateRange', @@ -1456,13 +1480,13 @@ const OperaTionalTable = (props) => { width: 120, render: (dom, record) => { - return record.address + return record.contactNumber }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, } }, { - title: '止点地名', + title: '电子邮箱', search: false, dataIndex: 'time7', valueType: 'dateRange', @@ -1470,13 +1494,13 @@ const OperaTionalTable = (props) => { width: 120, render: (dom, record) => { - return record.address + return record.email }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, } }, { - title: '止点分界点类别', + title: '法定代表人', search: false, dataIndex: 'time8', valueType: 'dateRange', @@ -1484,13 +1508,13 @@ const OperaTionalTable = (props) => { width: 120, render: (dom, record) => { - return record.address + return record.legalRepresentative }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, } }, { - title: '止点桩号', + title: '法人证件类型', search: false, dataIndex: 'time9', valueType: 'dateRange', @@ -1499,13 +1523,13 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.typeOfLegalPersonCertificate }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, } }, { - title: '路段类型', + title: '运输性质', search: false, dataIndex: 'time9', valueType: 'dateRange', @@ -1514,13 +1538,13 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.natureOfTransportation }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, } }, { - title: '路网调整前路线编码', + title: '法人证件号码', search: false, dataIndex: 'time9', valueType: 'dateRange', @@ -1529,13 +1553,13 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.legalPersonCertificateNumber }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, } }, { - title: '原路段序号', + title: '法定代表人电话', search: false, dataIndex: 'time9', valueType: 'dateRange', @@ -1544,13 +1568,13 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.telephoneNumberOfLegalRepresentative }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, } }, { - title: '原路段起点桩号', + title: '经营业户负责人姓名', search: false, dataIndex: 'time9', valueType: 'dateRange', @@ -1559,13 +1583,13 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.nameOfThePersonInChargeOfTheBusiness }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, } }, { - title: '原路段止点桩号', + title: '经营业户负责人电话号码', search: false, dataIndex: 'time9', valueType: 'dateRange', @@ -1574,13 +1598,13 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.telephoneNumberOfThePersonInChargeOfTheBusiness }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, } }, { - title: '路线等级', + title: '经办人', search: false, dataIndex: 'time9', valueType: 'dateRange', @@ -1589,13 +1613,13 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.handledBy }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, } }, { - title: '路段性质', + title: '经办人电话', search: false, dataIndex: 'time9', valueType: 'dateRange', @@ -1604,28 +1628,28 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.phoneNumberOfHandler }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, } }, { - title: '建成时间', + title: '经营范围', search: false, dataIndex: 'time9', valueType: 'dateRange', - width: 140, + width: 440, render: (dom, record) => { - return record.address + return record.natureOfBusiness }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, } }, { - title: '改建时间', + title: '经营状态', search: false, dataIndex: 'time9', valueType: 'dateRange', @@ -1634,13 +1658,13 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.businessStatus }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, } }, { - title: '建设性质', + title: '经营许可证号', search: false, dataIndex: 'time9', valueType: 'dateRange', @@ -1649,13 +1673,13 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.businessLicenseNo }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, } }, { - title: '最近一次修复养护年度', + title: '有效期起', search: false, dataIndex: 'time9', valueType: 'dateRange', @@ -1664,13 +1688,13 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.fromTheExpiryDate }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, } }, { - title: 'GBM及文明样板路', + title: '有效期止', search: false, dataIndex: 'time9', valueType: 'dateRange', @@ -1679,13 +1703,13 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.expiryDate }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, } }, { - title: '地貌', + title: '发证机构', search: false, dataIndex: 'time9', valueType: 'dateRange', @@ -1694,13 +1718,13 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.issuingAuthority }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, } }, { - title: '收费性质', + title: '核发日期', search: false, dataIndex: 'time9', valueType: 'dateRange', @@ -1709,13 +1733,13 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.dateOfIssuance }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, } }, { - title: '所属收费站', + title: '证照类别', search: false, dataIndex: 'time9', valueType: 'dateRange', @@ -1724,13 +1748,13 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.licenseCategory }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, } }, { - title: '涵洞数量', + title: '证照发放类型', search: false, dataIndex: 'time9', valueType: 'dateRange', @@ -1739,13 +1763,13 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.licenseIssuanceType }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, } }, { - title: '技术等级', + title: '共有车辆数', search: false, dataIndex: 'time9', valueType: 'dateRange', @@ -1754,13 +1778,13 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.numberOfSharedVehicles }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, } }, { - title: '路面类型', + title: '创建日期', search: false, dataIndex: 'time9', valueType: 'dateRange', @@ -1769,764 +1793,69 @@ const OperaTionalTable = (props) => { width: 140, render: (dom, record) => { - return record.address + return record.creationDate }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, } - }, { - title: '面层厚度(厘米)', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - + }, + { + title: '操作', + dataIndex: 'creatTime', + valueType: 'dateTimeRange', + hideInSearch: true, + width: 120, + fixed: 'right', render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '路面宽度', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, + return
- render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, } - }, { - title: '路基宽度', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - + }, + { + key: "direction", + hideInTable: true, + dataIndex: "direction", + order: 6, + renderFormItem: (item, { type, defaultRender, ...rest }, form, record) => { + return ( +
+ +
- width: 140, - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '是否晴雨通车', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '车道特征', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '设计时速', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '是否城管路段', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '管养单位', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '路政管理单位', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '列养情况', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '列养资金来源', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '养护时间', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '可绿化里程', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '已绿化里程', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '重复道路路段类型', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '重复路段序号', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '重复路段路线编码', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划资金类别', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划年度', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划文号', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划项目唯一编码', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划项目路线编码', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划项目名称', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划项目类型', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '完工情况', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '完工年度', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划资金类别', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划年度', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划文号', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划项目唯一编码', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划项目名称', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '完工情况', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '完工年度', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '桩号范围', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '填报单位', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '变更原因', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '变更时间', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '是否按干线公路管理接养', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '备注', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '上年路线编码', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '上年路线名称', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '上年起点桩号', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '上年止点桩号', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '图形里程', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '桩号里程', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '所在区县', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '所在地市', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, - { - title: '操作', - dataIndex: 'creatTime', - valueType: 'dateTimeRange', - hideInSearch: true, - width: 120, - fixed: 'right', - render: (dom, record) => { - return
- - } - }, - { - key: "direction", - hideInTable: true, - dataIndex: "direction", - order: 6, - renderFormItem: (item, { type, defaultRender, ...rest }, form, record) => { - return ( -
- -
- - - ); + ); }, }, ] @@ -2535,6 +1864,7 @@ const OperaTionalTable = (props) => {
{ items: [ { key: 'tab1', - label: requestoperational()}>客运{activeKey === 'tab1'}, + label: { + setRewkeys('keyun') + }}>客运{activeKey === 'tab1'}, }, { key: 'tab2', - label: { requestspecificvehicle('出租车') }}>出租车{activeKey === 'tab2'}, + label: { { + setRewkeys('chuzu') + } }}>出租车{activeKey === 'tab2'}, }, { key: 'tab3', - label: { requestspecificvehicle('危货') }}>危险货运{activeKey === 'tab3'}, + label: { { + setRewkeys('weihuo') + } }}>危险货运{activeKey === 'tab3'}, }, { key: 'tab4', - label: { requesthouseholds() }}>业户{activeKey === 'tab4'}, + label: { + setRewkeys('yehu') + }}>业户{activeKey === 'tab4'}, }, ], @@ -2575,24 +1913,61 @@ const OperaTionalTable = (props) => { setRowSelected(selectedRowKeys); }, }} + onReset={(v) => { + setSitename('') + }} columns={columns[activeKey]} - dataSource={(counts || {}).rows || []} + dataSource={counts || []} request={async (params, sort, filter) => { - const query = '' + if(rewkeys=='keyun'){ + const query = {} setRowSelected([]); const res = await dispatch(getOperaTional(query)); - console.log(res) setCounts(res.payload.data) return { ...res, total: res.payload.data ? res.payload.data.count : 0 - } + }} + if(rewkeys=='chuzu'){ + const query = { + type:'出租车', + nameOfBusinessOwner:sitename + } + setRowSelected([]); + const res = await dispatch(getSpecificVehicle(query)); + setCounts(res.payload.data) + return { + ...res, + total: res.payload.data ? res.payload.data.count : 0 + }} + if(rewkeys=='weihuo'){ + const query = { + type:'危货', + nameOfBusinessOwner:sitename + } + setRowSelected([]); + const res = await dispatch(getSpecificVehicle(query)); + setCounts(res.payload.data) + return { + ...res, + total: res.payload.data ? res.payload.data.count : 0 + }} + if(rewkeys=='yehu'){ + const query = { + nameOfBusinessOwner:sitename + } + setRowSelected([]); + const res = await dispatch(getHouseholds(query)); + setCounts(res.payload.data) + return { + ...res, + total: res.payload.data ? res.payload.data.count : 0 + }} }} search={{ defaultCollapsed: false, optionRender: (searchConfig, formProps, dom) => [ - console.log(dom), ...dom.reverse(), ['tab2','tab3','tab4'].includes(activeKey) ? { props.exports(rowSelected, counts) }}>
- + rewkeys={rewkeys} + data={rewkeys==='yehu'?data:date} + recortd={recortd} + // sitename={sitename} + setRecortd={setRecortd} + /> : ''} + {modalVisibleyilan ? : ''}
) } +const date={ + "nameOfBusinessOwner": "业户名称", + "productName": "品名", + "vehicleRegistry": "车籍地", + "licensePlateNumber": "车牌号", + "fuelType": "燃料类型", + "address": "住址", + "economicNature": "经济性质", + "approvedPassengerCapacity": "核定载客位数", + "approvedLoadMass": "核定载质量", + "numberOfVehicleAxles": "车辆车轴数", + "vehicleBrand": "车辆厂牌", + "natureOfBusiness": "经营范围", + "vehicleOperationStatus": "车辆营运状态", + "busTypeAndClass": "客车类型与等级", + "annualReviewResults": "年审结果", + "dateOfThisAnnualReview": "本次年审日期", + "dateOfNextAnnualReview": "下次年审日期", + "dateOfRegistration": "注册登记日期", + "sourceOfTransportationCapacity": "运力来源", + "fromTheExpiryDate": "有效期起", + "expiryDate": "有效期止", + "engineDisplacement": "发动机排量", + "engineNumber": "发动机号", + "vehicleEnginePower": "车辆发动机功率", + "businessLicenseNo": "经营许可证号", + "licensePlateColor": "车牌颜色", + "totalVehicleMass": "车辆总质量", + "totalQuasiTractionMassOfVehicle": "车辆准牵引总质量", + "roadTransportCertificateNo": "道路运输证号", + "vehicleHeight": "车辆车高", + "vehicleConductor": "车辆车长", + "vehicleWidth": "车辆车宽", + "vehicleType": "车辆类型", + "vehicleTypeWithDrivingLicense": "行驶证车辆类型", + "vehicleWheelbase": "车辆轴距", + "ratingDate": "等级评定日期", + "technicalEvaluationGrade": "技术评定等级", + "nextRatingDate": "下次等级评定日期", + "creationDate": "创建日期" +} +const data={ + "nameOfBusinessOwner": "业户名称", + "productName": "品名", + "creditSocialCode": "信用社会代码", + "administrativeDivision": "行政区划", + "economicNature": "经济性质", + "address": "地址", + "contactNumber": "联系电话", + "email": "电子邮箱", + "legalRepresentative": "法定代表人", + "typeOfLegalPersonCertificate": "法人证件类型", + "natureOfTransportation": "运输性质", + "legalPersonCertificateNumber": "法人证件号码", + "telephoneNumberOfLegalRepresentative": "法定代表人电话", + "nameOfThePersonInChargeOfTheBusiness": "经营业户负责人姓名", + "telephoneNumberOfThePersonInChargeOfTheBusiness": "经营业户负责人电话号码", + "handledBy": "经办人", + "phoneNumberOfHandler": "经办人电话", + "natureOfBusiness": "经营范围", + "businessStatus": "经营状态", + "businessLicenseNo": "经营许可证号", + "fromTheExpiryDate": "有效期起", + "expiryDate": "有效期止", + "issuingAuthority": "发证机构", + "dateOfIssuance": "核发日期", + "licenseCategory": "证照类别", + "licenseIssuanceType": "证照发放类型", + "numberOfSharedVehicles": "共有车辆数", + "creationDate": "创建日期", + 'type':'类型' +} function mapStateToProps(state) { const { auth, depMessage } = state; const pakData = (dep) => { diff --git a/web/client/src/sections/fillion/components/project/project.js b/web/client/src/sections/fillion/components/project/project.js index 819a001e..337b1b16 100644 --- a/web/client/src/sections/fillion/components/project/project.js +++ b/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: "必填" }]} /> { label={newlys?.[1]?.name} tooltip="最长为 24 位" placeholder="请输入名称" - value={recordsay?.[1]?.value} + // value={recordsay?.[1]?.value} rules={[{ required: true, message: "必填" }]} /> { const { dispatch, user, depData, depMessage, depLoading } = 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 [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 [activeKey, setActiveKey] = useState('tab1'); const [modalVisible, setModalVisible] = useState(false); const [modalRecord, setModalRecord] = useState(); const [typecard, setTypecard] = useState(); + const [recortd, setRecortd] = useState() + const [rewkeys, setRewkeys] = useState('xianlu') + const [delet, setDelet] = useState() - - //打开弹窗 - const openModal = (type, record) => { + const ref = useRef() + useEffect(() => { ref.current.reload() }, [modalVisible,delet,rewkeys]) +//xianlu请求 +const requestxianlu = (name) => { + const query = name + setRowSelected([]); + dispatch(getCircuit(query)).then((res)=>{ + setCounts(res.payload.data) + }) +} +//cheliang请求 +const requestcheliang = (name) => { + const query = '' + setRowSelected([]); + dispatch(getVehicle(query)).then((res)=>{ + setCounts(res.payload.data) + }) +} + //打开弹窗 + const openModal = (type, record) => { setModalVisible(true); // setModalType(type); if (type == 'edit') { @@ -51,13 +71,13 @@ const PublicTable = (props) => { tab1: [ { title: '公司', - search: false, + search: false, dataIndex: 'containers', fixed: 'left', width: 120, render: (dom, record) => { - return record.address + return record.company }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -77,6 +97,9 @@ const PublicTable = (props) => { placeholder: '请输入所属车队', getPopupContainer: (triggerNode) => triggerNode.parentNode, }, + render: (dom, record) => { + return record.fleet + }, }, { title: '车队长', @@ -86,7 +109,7 @@ const PublicTable = (props) => { // align: 'right', width: 120, render: (dom, record) => { - return record.address + return record.carCaptain }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -97,12 +120,12 @@ const PublicTable = (props) => { search: false, dataIndex: 'time3', valueType: 'dateRange', - initialValue: day, + width: 120, render: (dom, record) => { - return record.address + return record.assistantCarCaptain }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -112,11 +135,11 @@ const PublicTable = (props) => { search: false, dataIndex: 'time4', valueType: 'dateRange', - initialValue: day, + width: 120, render: (dom, record) => { - return record.address + return record.officeLocation }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -126,11 +149,11 @@ const PublicTable = (props) => { search: false, dataIndex: 'time5', valueType: 'dateRange', - initialValue: day, + width: 120, render: (dom, record) => { - return record.address + return record.lineName }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -140,16 +163,240 @@ const PublicTable = (props) => { search: false, dataIndex: 'time6', valueType: 'dateRange', - initialValue: day, + + + width: 120, + render: (dom, record) => { + return record.lineType + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '线路划分', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + + + width: 120, + render: (dom, record) => { + return record.lineDivision + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: 'GPS编号', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + + + width: 120, + render: (dom, record) => { + return record.gPSNumber + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '起点终点', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + + + width: 120, + render: (dom, record) => { + return record.startingPointEndPoint + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '车辆数', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + + + width: 120, + render: (dom, record) => { + return record.numberOfVehicles + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '全程公里数', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + + + width: 120, + render: (dom, record) => { + return record.totalKilometers + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '票价', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + + + width: 120, + render: (dom, record) => { + return record.ticketPrice + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '开通时间', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + + + width: 120, + render: (dom, record) => { + return record.openingTime + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '运行时间', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + + + width: 120, + render: (dom, record) => { + return record.runningTime + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '开班时间夏令', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + + + width: 120, + render: (dom, record) => { + return record.openingTimeSummer + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '收班时间夏令', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + + + width: 120, + render: (dom, record) => { + return record.shiftClosingTimeSummer + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '开班时间冬令', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + + + width: 120, + render: (dom, record) => { + return record.openingTimeWinter + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '收班时间冬令', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + + + width: 120, + render: (dom, record) => { + return record.shiftClosingTimeWinter + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '沿途站点上行', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + + + width: 420, + render: (dom, record) => { + return record.uplinkOfStationsAlongTheWay + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '沿途站点下行', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + + + width: 420, + render: (dom, record) => { + return record.downlinkOfStationsAlongTheWay + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '所属区域', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + + + width: 120, + render: (dom, record) => { + return record.area + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '备注', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, render: (dom, record) => { - return record.address + return record.remarks }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, } - }, + }, { title: '操作', dataIndex: 'creatTime', @@ -159,11 +406,21 @@ const PublicTable = (props) => { fixed: 'right', render: (dom, record) => { return
+ >删除 } }, @@ -179,7 +436,7 @@ const PublicTable = (props) => { style={{ width: "100px" }} onClick={() => { openModal('edit', record) - setTypecard('') + setTypecard('') }} > 新增 @@ -202,13 +459,13 @@ const PublicTable = (props) => { ], tab2: [ { title: '所属公司', - search: false, + search: false, dataIndex: 'containers', fixed: 'left', width: 120, render: (dom, record) => { - return record.address + return record.company }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -221,9 +478,9 @@ const PublicTable = (props) => { width: 120, options: 1, backgroundColor: "#ffffff", - // render: (dom, record) => { - // return record.address - // }, + render: (dom, record) => { + return record.fleet + }, fieldProps: { onChange: (value, cs) => { setSitename(value.currentTarget.value) @@ -240,7 +497,7 @@ const PublicTable = (props) => { // align: 'right', width: 120, render: (dom, record) => { - return record.address + return record.line }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -251,12 +508,12 @@ const PublicTable = (props) => { search: false, dataIndex: 'time3', valueType: 'dateRange', - initialValue: day, + width: 120, render: (dom, record) => { - return record.address + return record.vehicleNumber }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -266,11 +523,11 @@ const PublicTable = (props) => { search: false, dataIndex: 'time4', valueType: 'dateRange', - initialValue: day, + width: 120, render: (dom, record) => { - return record.address + return record.vehicleLicensePlateNumber }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -280,11 +537,11 @@ const PublicTable = (props) => { search: false, dataIndex: 'time5', valueType: 'dateRange', - initialValue: day, + width: 120, render: (dom, record) => { - return record.address + return record.operationCategory }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, @@ -294,86 +551,639 @@ const PublicTable = (props) => { search: false, dataIndex: 'time6', valueType: 'dateRange', - initialValue: day, - width: 120, render: (dom, record) => { - return record.address + return record.serviceLife }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, } - }, - { - title: '操作', - dataIndex: 'creatTime', - valueType: 'dateTimeRange', - hideInSearch: true, + }, { + title: '发动机型号', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', width: 120, - fixed: 'right', render: (dom, record) => { - return
- - } - }, - { - key: "direction", - hideInTable: true, - dataIndex: "direction", - order: 6, - renderFormItem: (item, { type, defaultRender, ...rest }, form, record) => { - return ( -
- -
- - - ); + return record.engineModel }, - }, - ] + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '车辆型号', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, + render: (dom, record) => { + return record.vehicleModel + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '车辆类别', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, + render: (dom, record) => { + return record.vehicleCategory + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '车辆状态', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, + render: (dom, record) => { + return record.vehicleStatus + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '入户日期', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, + render: (dom, record) => { + return record.dateOfEntry + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '购进日期', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, + render: (dom, record) => { + return record.purchaseDate + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '能耗类型', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, + render: (dom, record) => { + return record.energyConsumptionType + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '标台数', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, + render: (dom, record) => { + return record.numberOfStandardUnits + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '维保单位', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, + render: (dom, record) => { + return record.maintenanceUnit + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '车辆类型', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, + render: (dom, record) => { + return record.vehicleType + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '厂牌型号', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, + render: (dom, record) => { + return record.brandAndModel + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '生产厂家', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, + render: (dom, record) => { + return record.manufacturer + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '行驶证编号', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, + render: (dom, record) => { + return record.drivingLicenseNo + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '发动机编号', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, + render: (dom, record) => { + return record.engineNumber + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '主能耗', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, + render: (dom, record) => { + return record.mainEnergyConsumption + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '副能耗', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, + render: (dom, record) => { + return record.secondaryEnergyConsumption + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '排放标准', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, + render: (dom, record) => { + return record.emissionStandard + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '启用日期', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, + render: (dom, record) => { + return record.startDate + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '最近一次调动日期', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, + render: (dom, record) => { + return record.lastTransferDate + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '车长', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, + render: (dom, record) => { + return record.conductor + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '车宽', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, + render: (dom, record) => { + return record.vehicleWidth + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '车高', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, + render: (dom, record) => { + return record.carHeight + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '核定载客数', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, + render: (dom, record) => { + return record.approvedPassengerCapacity + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '车辆识别号', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, + render: (dom, record) => { + return record.vehicleIdentificationNumber + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '变速箱品牌', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, + render: (dom, record) => { + return record.gearboxBrand + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '人工洗车费', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, + render: (dom, record) => { + return record.manualCarWashingFee + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '劳务费', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, + render: (dom, record) => { + return record.laborCost + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '整备质量', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, + render: (dom, record) => { + return record.curbWeight + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '总质量', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, + render: (dom, record) => { + return record.totalMass + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '空调温度', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, + render: (dom, record) => { + return record.airConditioningTemperature + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '是否空调车', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, + render: (dom, record) => { + return record.airConditionedCarOrNot + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '开空调温度', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, + render: (dom, record) => { + return record.turnOnTheAirConditioningTemperature + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '功率', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, + render: (dom, record) => { + return record.power + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '变速器', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, + render: (dom, record) => { + return record.transmission + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '座位数', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, + render: (dom, record) => { + return record.seatingCapacity + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '空调品牌', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, + render: (dom, record) => { + return record.airConditioningBrand + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '座椅类型', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, + render: (dom, record) => { + return record.seatType + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '轮胎规格', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, + render: (dom, record) => { + return record.tireSpecifications + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '道路运输证号', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, + render: (dom, record) => { + return record.roadTransportCertificateNo + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '停放点', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, + render: (dom, record) => { + return record.parkingPoint + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '洗车类型', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, + render: (dom, record) => { + return record.carWashingType + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '免维护轮端', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, + render: (dom, record) => { + return record.maintenanceFreeWheelEnd + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '首保日期', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, + render: (dom, record) => { + return record.firstGuaranteeDate + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '整修日期', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, + render: (dom, record) => { + return record.dateOfRenovation + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '机动车所有人', + search: false, + dataIndex: 'time6', + valueType: 'dateRange', + width: 120, + render: (dom, record) => { + return record.motorVehicleOwner + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, + { + title: '操作', + dataIndex: 'creatTime', + valueType: 'dateTimeRange', + hideInSearch: true, + width: 120, + fixed: 'right', + render: (dom, record) => { + return
+ + } + }, + { + key: "direction", + hideInTable: true, + dataIndex: "direction", + order: 6, + renderFormItem: (item, { type, defaultRender, ...rest }, form, record) => { + return ( +
+ +
+ + + ); + }, + }, + ] } return (
setActiveKey(key), items: [ { key: 'tab1', - tab: '运营线路', + label: { { + setRewkeys('xianlu') + } }}>运营线路{activeKey === 'tab1'}, + }, { key: 'tab2', - tab: '车辆信息', + label: { { + setRewkeys('cheliang') + } }}>车辆信息{activeKey === 'tab2'}, + } ], }, @@ -384,11 +1194,11 @@ const PublicTable = (props) => { style={{ width: "100% ", overflow: "auto", height: '760px' }} rowKey='id' onReset={(v) => { - const { id } = depMessage[0] - console.log(id) - setRegionId(id) - setPlaceType(-1) - setDay([moment('2022-03-01').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')]) + // const { id } = depMessage[0] + // console.log(id) + // setRegionId(id) + // setPlaceType(-1) + // setDay([moment('2022-03-01').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')]) setSitename('') }} rowSelection={{ @@ -399,24 +1209,33 @@ const PublicTable = (props) => { }} columns={columns[activeKey]} - dataSource={(counts || {}).rows || []} + dataSource={counts || []} request={async (params) => { - const query = { - startDate: day[0], - endDate: day[1], - placeType: placeType, - regionId: regionId, - placeName: sitename, - limit: params.pageSize, - offset: ((params.current ? params.current : 1) - 1) * params.pageSize + if(rewkeys=='xianlu'){ + const query = { + fleet:sitename } setRowSelected([]); - const res = await dispatch(getReportStatistic(query)); + const res = await dispatch(getCircuit(query)); setCounts(res.payload.data) return { ...res, total: res.payload.data ? res.payload.data.count : 0 } + } + if(rewkeys=='cheliang'){ + const query = { + fleet:sitename + } + setRowSelected([]); + const res = await dispatch(getVehicle(query)); + setCounts(res.payload.data) + return { + ...res, + total: res.payload.data ? res.payload.data.count : 0 + } + } + }} search={{ defaultCollapsed: false, @@ -433,15 +1252,98 @@ const PublicTable = (props) => { >
- + rewkeys={rewkeys} + data={rewkeys==='xianlu'?data:date} + recortd={recortd} + // sitename={sitename} + setRecortd={setRecortd} + /> : ''}
) } +const data = { + "company": "公司", + "fleet": "车队", + "carCaptain": "车队长", + "assistantCarCaptain": "副车队长", + "officeLocation": "办公地点", + "lineName": "线路名称", + "lineType": "线路类型", + "lineDivision": "线路划分", + "gPSNumber": "GPS编号", + "startingPointEndPoint": "起点终点", + "numberOfVehicles": "车辆数", + "totalKilometers": "全程公里数", + "ticketPrice": "票价", + "openingTime": "开通时间", + "runningTime": "运行时间", + "openingTimeSummer": "开班时间夏令", + "shiftClosingTimeSummer": "收班时间夏令", + "openingTimeWinter": "开班时间冬令", + "shiftClosingTimeWinter": "收班时间冬令", + "uplinkOfStationsAlongTheWay": "沿途站点上行", + "downlinkOfStationsAlongTheWay": "沿途站点下行", + "area": "所属区域", + "remarks": "备注" +} +const date={ "company": "所属公司", +"fleet": "所属车队", +"line": "所属线路", +"vehicleNumber": "车辆编号", +"vehicleLicensePlateNumber": "车辆牌照号", +"operationCategory": "运营类别", +"serviceLife": "已使用年限", +"engineModel": "发动机型号", +"vehicleModel": "车辆型号", +"vehicleCategory": "车辆类别", +"vehicleStatus": "车辆状态", +"dateOfEntry": "入户日期", +"purchaseDate": "购进日期", +"energyConsumptionType": "能耗类型", +"numberOfStandardUnits": "标台数", +"maintenanceUnit": "维保单位", +"vehicleType": "车辆类型", +"brandAndModel": "厂牌型号", +"manufacturer": "生产厂家", +"drivingLicenseNo": "行驶证编号", +"engineNumber": "发动机编号", +"mainEnergyConsumption": "主能耗", +"secondaryEnergyConsumption": "副能耗", +"emissionStandard": "排放标准", +"startDate": "启用日期", +"lastTransferDate": "最近一次调动日期", +"conductor": "车长", +"vehicleWidth": "车宽", +"carHeight": "车高", +"approvedPassengerCapacity": "核定载客数", +"vehicleIdentificationNumber": "车辆识别号", +"gearboxBrand": "变速箱品牌", +"manualCarWashingFee": "人工洗车费", +"laborCost": "劳务费", +"curbWeight": "整备质量", +"totalMass": "总质量", +"airConditioningTemperature": "空调温度", +"airConditionedCarOrNot": "是否空调车", +"turnOnTheAirConditioningTemperature": "开空调温度", +"power": "功率", +"transmission": "变速器", +"seatingCapacity": "座位数", +"airConditioningBrand": "空调品牌", +"seatType": "座椅类型", +"tireSpecifications": "轮胎规格", +"roadTransportCertificateNo": "道路运输证号", +"parkingPoint": "停放点", +"carWashingType": "洗车类型", +"maintenanceFreeWheelEnd": "免维护轮端", +"firstGuaranteeDate": "首保日期", +"dateOfRenovation": "整修日期", +"motorVehicleOwner": "机动车所有人" +} function mapStateToProps(state) { const { auth, depMessage } = state; const pakData = (dep) => { diff --git a/web/client/src/sections/fillion/components/transportationTable.js b/web/client/src/sections/fillion/components/transportationTable.js index 3727582d..9cec7f80 100644 --- a/web/client/src/sections/fillion/components/transportationTable.js +++ b/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 [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,29 +19,10 @@ const TransporTationTable = (props) => { const [typecard, setTypecard] = useState(); const [activeKey, setActiveKey] = useState('tab1'); const [recortd, setRecortd] = useState() - // const ref = useRef() - //请求数据 - const requestRoadway = (name) => { - const query = { - 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 [whichofits, setWhichofits] = useState('xian') + const [delet, setDelet] = useState() + const ref = useRef() + useEffect(() => { ref.current.reload() }, [modalVisible, modalVisibleyilan, whichofits, delet]) //打开弹窗 const openModal = (type, record) => { setModalVisible(true); @@ -91,9 +69,9 @@ const TransporTationTable = (props) => { options: 1, backgroundColor: "#ffffff", fieldProps: { - // onChange: (value, cs) => { - // setSitename(value.currentTarget.value) - // }, + onChange: (value, cs) => { + 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)) - }} - >编辑 + >编辑 } }, @@ -1245,9 +1229,9 @@ const TransporTationTable = (props) => { options: 1, backgroundColor: "#ffffff", fieldProps: { - // onChange: (value, cs) => { - // setSitename(value.currentTarget.value) - // }, + onChange: (value, cs) => { + setSitename(value.currentTarget.value) + }, placeholder: '请输入道路名称进行搜索', getPopupContainer: (triggerNode) => triggerNode.parentNode, }, @@ -2353,7 +2337,14 @@ const TransporTationTable = (props) => { setRecortd(record) }} - >编辑 + >编辑 } }, @@ -2398,9 +2389,9 @@ const TransporTationTable = (props) => { options: 1, backgroundColor: "#ffffff", fieldProps: { - // onChange: (value, cs) => { - // setSitename(value.currentTarget.value) - // }, + onChange: (value, cs) => { + setSitename(value.currentTarget.value) + }, placeholder: '请输入道路名称进行搜索', getPopupContainer: (triggerNode) => triggerNode.parentNode, }, @@ -3506,7 +3497,15 @@ const TransporTationTable = (props) => { setRecortd(record) }} - >编辑 + >编辑 } }, @@ -3551,9 +3550,9 @@ const TransporTationTable = (props) => { options: 1, backgroundColor: "#ffffff", fieldProps: { - // onChange: (value, cs) => { - // setSitename(value.currentTarget.value) - // }, + onChange: (value, cs) => { + setSitename(value.currentTarget.value) + }, placeholder: '请输入项目名称进行搜索', getPopupContainer: (triggerNode) => triggerNode.parentNode, }, @@ -3689,7 +3688,16 @@ const TransporTationTable = (props) => { setTypecard('111') setRecortd(record) }} - >编辑 + >编辑 } }, @@ -3729,7 +3737,7 @@ const TransporTationTable = (props) => {
{ items: [ { key: 'tab1', - label: requestRoadway('县')}>县道{activeKey === 'tab1'}, + label: { + setWhichofits('xian') + }}>县道{activeKey === 'tab1'}, }, { key: 'tab2', - label: requestRoadway('乡')}>乡道{activeKey === 'tab2'}, + label: { + setWhichofits('xiang') + }}>乡道{activeKey === 'tab2'}, }, { key: 'tab3', - label: requestRoadway('村')}>村道{activeKey === 'tab3'}, + label: { + setWhichofits('cun') + }}>村道{activeKey === 'tab3'}, }, { key: 'tab4', - label: requestProject()}>工程一览{activeKey === 'tab4'}, + label: { + setWhichofits('gongcheng') + }}>工程一览{activeKey === 'tab4'}, }, ], }, @@ -3760,12 +3776,7 @@ const TransporTationTable = (props) => { style={{ width: "100% ", overflow: "auto", height: '760px' }} rowKey='id' onReset={(v) => { - const { id } = depMessage[0] - // console.log(id) - // setRegionId(id) - // setPlaceType(-1) - // setDay([moment('2022-03-01').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')]) - // setSitename('') + setSitename('') }} rowSelection={{ selectedRowKeys: rowSelected, @@ -3774,22 +3785,59 @@ const TransporTationTable = (props) => { }, }} columns={columns[activeKey]} - dataSource={counts || []} request={async (params) => { - const query = { - level: '县' + if (whichofits == 'xian') { + 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('县') - - 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 == 'gongcheng') { + const query = { + type: 'road', + // 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={{ diff --git a/web/client/src/sections/fillion/nav-item.js b/web/client/src/sections/fillion/nav-item.js index 650b5db8..7ff3eedc 100644 --- a/web/client/src/sections/fillion/nav-item.js +++ b/web/client/src/sections/fillion/nav-item.js @@ -20,9 +20,9 @@ export function getNavItem(user, dispatch) { 运政管理 - + {/* 执法管理 - + */} 养护管理 diff --git a/web/client/src/utils/webapi.js b/web/client/src/utils/webapi.js index b3234fc4..6a4e3a3e 100644 --- a/web/client/src/utils/webapi.js +++ b/web/client/src/utils/webapi.js @@ -45,23 +45,24 @@ export const ApiTable = { //运政管理 - getOperaTional: 'vehicle', - getSpecificVehicle: 'vehicle/specific', - getHouseholds: 'vehicle/business', + getOperaTional: 'vehicle',putOperaTional: 'vehicle', + getSpecificVehicle: 'vehicle/specific',putSpecificVehicle: 'vehicle/specific',delSpecificVehicle: 'vehicle/{vehicleId}/specific', + getHouseholds: 'vehicle/business',putHouseholds: 'vehicle/business',delHouseholds: 'vehicle/business/{businessId}', getRoadway: 'road', - // 获取运政统计 - getYunZheng: "transportation/statistic", - //桥梁管理 - getBridge: 'bridge', - //工程数据 - getProject: 'project', - //桥梁管理 - getBridge: 'bridge', - putBridge: 'bridge', - //工程数据 - getProject: 'project', - putProject: 'project', - + // 获取运政统计 + getYunZheng: "transportation/statistic", + //桥梁管理 +getBridge:'bridge', +putBridge:'bridge', +delBridge:'bridge/{bridgeId}', + //工程数据 +getProject:'project', +putProject:'project', +delProject:'project/{projectId}', +//道路数据 +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}', }; diff --git a/web/log/development.txt b/web/log/development.txt index 804c8a35..25844d79 100644 --- a/web/log/development.txt +++ b/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 diff --git a/web/package.json b/web/package.json index 815d79cc..ad7d381b 100644 --- a/web/package.json +++ b/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",