free-sun
/
Highways4Good
14
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
Browse Source

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

release_0.0.4
巴林闲侠 3 years ago
parent
eeead59378 06063067ea
commit
7c7677dff7
14 changed files with 202 additions and 141 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      web/client/src/sections/fillion/components/bridgeTable.js
  2. 13
      web/client/src/sections/fillion/components/highways/highwaysdata.js
  3. 18
      web/client/src/sections/fillion/components/highwaysTable.js
  4. 40
      web/client/src/sections/fillion/components/infor/details.js
  5. 8
      web/client/src/sections/fillion/components/inforTable.js
  6. 87
      web/client/src/sections/fillion/components/operationalTable.js
  7. 20
      web/client/src/sections/fillion/components/project/project.js
  8. 3
      web/client/src/sections/fillion/components/publicTable.js
  9. 15
      web/client/src/sections/fillion/components/transportationTable.js
  10. 12
      web/client/src/sections/quanju/actions/example.js
  11. 82
      web/client/src/sections/quanju/containers/footer/leadership/left/echarts/lefttopecharts.js
  12. 34
      web/client/src/sections/quanju/containers/footer/leadership/left/left-top.js
  13. 2
      web/client/src/sections/quanju/containers/footer/leadership/right/right-bottom.js
  14. 3
      web/client/src/utils/webapi.js

4
web/client/src/sections/fillion/components/bridgeTable.js
View File

@ -26,7 +26,7 @@ const BrideTable = (props) => {
const [delet, setDelet] = useState() const [delet, setDelet] = useState()
const ref = useRef() const ref = useRef()
useEffect(() => { ref.current.reload() }, [modalVisible, modalVisibleyilan,whichofits,delet]) useEffect(() => { ref.current.reload() }, [whichofits,delet])
const columns = { const columns = {
tab1: [ tab1: [
{ {
@ -1861,6 +1861,7 @@ const BrideTable = (props) => {
rewkeys={'bridge'} rewkeys={'bridge'}
data={date} data={date}
recortd={recortd} recortd={recortd}
setDelet={setDelet}
// sitename={sitename} // sitename={sitename}
setRecortd={setRecortd} setRecortd={setRecortd}
/> : ''} /> : ''}
@ -1870,6 +1871,7 @@ const BrideTable = (props) => {
modalRecord={modalRecord} modalRecord={modalRecord}
typecard={typecard} typecard={typecard}
rewkeys={'bridge'} rewkeys={'bridge'}
setDelet={setDelet}
recortd={recortd} recortd={recortd}
setRecortd={setRecortd} setRecortd={setRecortd}
/> : ''} /> : ''}

13
web/client/src/sections/fillion/components/highways/highwaysdata.js
View File

@ -6,7 +6,7 @@ import { putOperaTional,putHighways } from "../../actions/infor"
import { _ } from 'lodash' import { _ } from 'lodash'
const HightModal = (props) => { const HightModal = (props) => {
const { visible, onVisibleChange, typecard, rewkeys, recortd, dispatch, setRecortd } = props const { visible, onVisibleChange, typecard, rewkeys, recortd, dispatch, setRecortd,setDelet } = props
const [success,setSuccess]=useState() const [success,setSuccess]=useState()
useEffect(() => { useEffect(() => {
@ -25,8 +25,7 @@ const HightModal = (props) => {
onVisibleChange={onVisibleChange} onVisibleChange={onVisibleChange}
onFinish={(values) => { onFinish={(values) => {
if (rewkeys === 'passenger') { if (rewkeys === 'passenger') {
setDelet(values)
console.log(values)
const query = { ...values, id:recortd?.id } const query = { ...values, id:recortd?.id }
dispatch(putOperaTional(query)).then((res) => { dispatch(putOperaTional(query)).then((res) => {
setSuccess(res.success) setSuccess(res.success)
@ -35,8 +34,8 @@ const HightModal = (props) => {
} }
if (rewkeys === 'highways') { if (rewkeys === 'highways') {
setDelet(values)
console.log(values)
const query = { ...values, id:recortd?.id } const query = { ...values, id:recortd?.id }
dispatch(putHighways(query)).then((res) => { dispatch(putHighways(query)).then((res) => {
setSuccess(res.success) setSuccess(res.success)
@ -55,7 +54,7 @@ const HightModal = (props) => {
name='name' name='name'
width="md" width="md"
label='类型' label='类型'
tooltip="最长为 24 位"
placeholder="请输入名称" placeholder="请输入名称"
// value={recortd?.[0]?.value} // value={recortd?.[0]?.value}
disabled disabled
@ -65,7 +64,7 @@ const HightModal = (props) => {
name='count' name='count'
width="md" width="md"
label='数量' label='数量'
tooltip="最长为 24 位"
placeholder="请输入数量" placeholder="请输入数量"
rules={[ rules={[
{required: true, {required: true,
@ -86,7 +85,7 @@ const HightModal = (props) => {
name={newlys?.[0]?.type} name={newlys?.[0]?.type}
width="md" width="md"
label={newlys?.[0]?.name} label={newlys?.[0]?.name}
tooltip="最长为 24 位"
placeholder="请输入名称" placeholder="请输入名称"
/> */} /> */}
</ProForm.Group>} </ProForm.Group>}

18
web/client/src/sections/fillion/components/highwaysTable.js
View File

@ -16,9 +16,10 @@ const HigwaysTable = (props) => {
const [typecard, setTypecard] = useState(); const [typecard, setTypecard] = useState();
const [recortd, setRecortd] = useState() const [recortd, setRecortd] = useState()
const [sitename, setSitename] = useState()//桥梁名称 const [sitename, setSitename] = useState()//桥梁名称
const [delet, setDelet] = useState()
const ref = useRef() const ref = useRef()
useEffect(() => { ref.current.reload() }, [ modalVisibleyilan]) useEffect(() => { ref.current.reload() }, [ delet])
//打开弹窗 //打开弹窗
const hightModal = (type, record) => { const hightModal = (type, record) => {
setModalVisibleyilan(true); setModalVisibleyilan(true);
@ -106,18 +107,18 @@ const exports = (ids, counts) => {
actionRef={ref} actionRef={ref}
scroll={{ x: 800 }} scroll={{ x: 800 }}
options={false} options={false}
ref={c => { finishedProductTable = c; }} // ref={c => { finishedProductTable = c; }}
style={{ width: "100% ", overflow: "auto", height: '760px' }} style={{ width: "100% ", overflow: "auto", height: '760px' }}
rowKey='id' rowKey='id'
onReset={(v) => { onReset={(v) => {
setSitename('') setSitename('')
}} }}
rowSelection={{ // rowSelection={{
selectedRowKeys: rowSelected, // selectedRowKeys: rowSelected,
onChange: (selectedRowKeys) => { // onChange: (selectedRowKeys) => {
setRowSelected(selectedRowKeys); // setRowSelected(selectedRowKeys);
}, // },
}} // }}
columns={columns} columns={columns}
dataSource={counts || []} dataSource={counts || []}
@ -143,6 +144,7 @@ const exports = (ids, counts) => {
rewkeys={'highways'} rewkeys={'highways'}
recortd={recortd} recortd={recortd}
setRecortd={setRecortd} setRecortd={setRecortd}
setDelet={setDelet}
/> : ''} /> : ''}
</Spin > </Spin >
) )

40
web/client/src/sections/fillion/components/infor/details.js
View File

@ -6,7 +6,7 @@ import { putRoadway, putSpecificVehicle, putHouseholds, putCircuit, putVehicle,
import { putBridge } from "../../actions/infor" import { putBridge } from "../../actions/infor"
import _ from 'lodash' import _ from 'lodash'
const UserModal = (props) => { const UserModal = (props) => {
const { visible, onVisibleChange, typecard, rewkeys, data, recortd, sitename, dispatch, setRecortd, setMonitor } = props const { visible, onVisibleChange, typecard, rewkeys, data, recortd, sitename, dispatch, setRecortd, setMonitor,setDelet,whichofits } = props
const [newlys, setNewlys] = useState() //必填数据 const [newlys, setNewlys] = useState() //必填数据
const [newlysay, setNewlysay] = useState() //处理hou const [newlysay, setNewlysay] = useState() //处理hou
const [records, setRecords] = useState()//处理 const [records, setRecords] = useState()//处理
@ -148,32 +148,37 @@ const UserModal = (props) => {
visible={visible} visible={visible}
onVisibleChange={onVisibleChange} onVisibleChange={onVisibleChange}
onFinish={(values) => { onFinish={(values) => {
console.log(values)
if (Object.values(values).length > 0) { if (Object.values(values).length > 0) {
if (rewkeys === 'transportation') { if (rewkeys === 'transportation') {
if (typecard == '111') { if (typecard == '111') {
const query = { ...values, level: sitename, roadId: records?.[0]?.value || '' } setDelet(values)
const query = { ...values, level: whichofits, roadId: records?.[0]?.value || '' }
dispatch(putRoadway(query)).then((res) => { dispatch(putRoadway(query)).then((res) => {
setSuccess(res.success) setSuccess(res.success)
}) })
return true return true
} else { } else {
const query = { ...values, level: sitename } setDelet(values)
const query = { ...values, level: whichofits }
dispatch(putRoadway(query)).then((res) => { dispatch(putRoadway(query)).then((res) => {
setSuccess(res.success) setSuccess(res.success)
}) })
return true return true
} }
} }
if (rewkeys === 'bridge') { if (rewkeys === 'bridge') {
if (typecard == '111') { if (typecard == '111') {
console.log(values) setDelet(values)
const query = { ...values, roadId: records?.[0]?.value || '' } const query = { ...values, roadId: records?.[0]?.value || '' }
dispatch(putBridge(query)).then((res) => { dispatch(putBridge(query)).then((res) => {
setSuccess(res.success) setSuccess(res.success)
}) })
return true return true
} else { } else {
setDelet(values)
const query = { ...values } const query = { ...values }
dispatch(putBridge(query)).then((res) => { dispatch(putBridge(query)).then((res) => {
setSuccess(res.success) setSuccess(res.success)
@ -183,13 +188,14 @@ const UserModal = (props) => {
} }
if (rewkeys === 'weihuo' || rewkeys === 'chuzu') { if (rewkeys === 'weihuo' || rewkeys === 'chuzu') {
if (typecard == '111') { if (typecard == '111') {
console.log(values) setDelet(values)
const query = { ...values, vehicleId: records?.[0]?.value || '', type: rewkeys === 'chuzu' ? '出租车' : '危货' } const query = { ...values, vehicleId: records?.[0]?.value || '', type: rewkeys === 'chuzu' ? '出租车' : '危货' }
dispatch(putSpecificVehicle(query)).then((res) => { dispatch(putSpecificVehicle(query)).then((res) => {
setSuccess(res.success) setSuccess(res.success)
}) })
return true return true
} else { } else {
setDelet(values)
const query = { ...values, type: rewkeys } const query = { ...values, type: rewkeys }
dispatch(putSpecificVehicle(query)).then((res) => { dispatch(putSpecificVehicle(query)).then((res) => {
setSuccess(res.success) setSuccess(res.success)
@ -199,13 +205,14 @@ const UserModal = (props) => {
} }
if (rewkeys === 'yehu') { if (rewkeys === 'yehu') {
if (typecard == '111') { if (typecard == '111') {
console.log(values) setDelet(values)
const query = { ...values, businessId: records?.[0]?.value, type: rewkeys == 'chuzu' ? '出租车' : '危货' } const query = { ...values, businessId: records?.[0]?.value, type: rewkeys == 'chuzu' ? '出租车' : '危货' }
dispatch(putHouseholds(query)).then((res) => { dispatch(putHouseholds(query)).then((res) => {
setSuccess(res.success) setSuccess(res.success)
}) })
return true return true
} else { } else {
setDelet(values)
const query = { ...values, type: rewkeys === 'chuzu' ? '出租车' : '危货' } const query = { ...values, type: rewkeys === 'chuzu' ? '出租车' : '危货' }
dispatch(putHouseholds(query)).then((res) => { dispatch(putHouseholds(query)).then((res) => {
setSuccess(res.success) setSuccess(res.success)
@ -214,13 +221,14 @@ const UserModal = (props) => {
} }
} if (rewkeys === 'xianlu') { } if (rewkeys === 'xianlu') {
if (typecard == '111') { if (typecard == '111') {
console.log(values) setDelet(values)
const query = { ...values, lineId: records?.[0]?.value || '' } const query = { ...values, lineId: records?.[0]?.value || '' }
dispatch(putCircuit(query)).then((res) => { dispatch(putCircuit(query)).then((res) => {
setSuccess(res.success) setSuccess(res.success)
}) })
return true return true
} else { } else {
setDelet(values)
const query = { ...values } const query = { ...values }
dispatch(putCircuit(query)).then((res) => { dispatch(putCircuit(query)).then((res) => {
setSuccess(res.success) setSuccess(res.success)
@ -230,13 +238,14 @@ const UserModal = (props) => {
} }
if (rewkeys === 'cheliang') { if (rewkeys === 'cheliang') {
if (typecard == '111') { if (typecard == '111') {
console.log(values) setDelet(values)
const query = { ...values, carId: records?.[0]?.value || '' } const query = { ...values, carId: records?.[0]?.value || '' }
dispatch(putVehicle(query)).then((res) => { dispatch(putVehicle(query)).then((res) => {
setSuccess(res.success) setSuccess(res.success)
}) })
return true return true
} else { } else {
setDelet(values)
const query = { ...values } const query = { ...values }
dispatch(putVehicle(query)).then((res) => { dispatch(putVehicle(query)).then((res) => {
setSuccess(res.success) setSuccess(res.success)
@ -246,7 +255,7 @@ const UserModal = (props) => {
} }
if (rewkeys === 'zhichao') { if (rewkeys === 'zhichao') {
if (typecard == '111') { if (typecard == '111') {
console.log(values) setDelet(values)
const query = { ...values, overspeedId: records?.[0]?.value || '' } const query = { ...values, overspeedId: records?.[0]?.value || '' }
dispatch(putPurchase(query)).then((res) => { dispatch(putPurchase(query)).then((res) => {
setSuccess(res.success) setSuccess(res.success)
@ -254,6 +263,7 @@ const UserModal = (props) => {
}) })
return true return true
} else { } else {
setDelet(values)
const query = { ...values } const query = { ...values }
dispatch(putPurchase(query)).then((res) => { dispatch(putPurchase(query)).then((res) => {
setSuccess(res.success) setSuccess(res.success)
@ -274,7 +284,7 @@ const UserModal = (props) => {
name={newlys?.[0]?.type} name={newlys?.[0]?.type}
width="md" width="md"
label={newlys?.[0]?.name} label={newlys?.[0]?.name}
tooltip="最长为 24 位"
placeholder="请输入名称" placeholder="请输入名称"
value={recordsay?.[0]?.value} value={recordsay?.[0]?.value}
// rules={[{ required: true, message: "必填" }]} // rules={[{ required: true, message: "必填" }]}
@ -282,7 +292,7 @@ const UserModal = (props) => {
name={newlys?.[1]?.type} name={newlys?.[1]?.type}
width="md" width="md"
label={newlys?.[1]?.name} label={newlys?.[1]?.name}
tooltip="最长为 24 位"
placeholder="请输入名称" placeholder="请输入名称"
value={recordsay?.[1]?.value} value={recordsay?.[1]?.value}
// rules={[{ required: true, message: "必填" }]} // rules={[{ required: true, message: "必填" }]}
@ -316,7 +326,7 @@ const UserModal = (props) => {
name={newlys?.[0]?.type} name={newlys?.[0]?.type}
width="md" width="md"
label={newlys?.[0]?.name} label={newlys?.[0]?.name}
tooltip="最长为 24 位"
placeholder="请输入名称" placeholder="请输入名称"
// value={recordssy?.[0]?.value} // value={recordssy?.[0]?.value}
// rules={[{ required: true, message: "必填" }]} // rules={[{ required: true, message: "必填" }]}
@ -324,7 +334,7 @@ const UserModal = (props) => {
name={newlys?.[1]?.type} name={newlys?.[1]?.type}
width="md" width="md"
label={newlys?.[1]?.name} label={newlys?.[1]?.name}
tooltip="最长为 24 位"
placeholder="请输入名称" placeholder="请输入名称"
// value={recordssy?.[1]?.value} // value={recordssy?.[1]?.value}
// rules={[{ required: true, message: "必填" }]} // rules={[{ required: true, message: "必填" }]}
@ -348,7 +358,7 @@ const UserModal = (props) => {
{newlysay?.map((item, index) => { {newlysay?.map((item, index) => {
return <ProFormText width="md" return <ProFormText width="md"
name={item?.type} label={newlysay[index]?.name} placeholder="请输入名称" key={index} name={item?.type} label={newlysay[index]?.name} placeholder="请输入名称" key={index}
tooltip="最长为 24 位"
/> />
})} })}

8
web/client/src/sections/fillion/components/inforTable.js
View File

@ -24,7 +24,7 @@ const InForTable = (props) => {
const [overrunRateFloor, setOverrunRateFloor] = useState()//超限率下限 const [overrunRateFloor, setOverrunRateFloor] = useState()//超限率下限
const [testTime, setTestTime] = useState()//超限率下限 const [testTime, setTestTime] = useState()//超限率下限
const ref = useRef() const ref = useRef()
useEffect(() => { ref.current.reload() }, [monitor, delet, modalVisible]) useEffect(() => { ref.current.reload() }, [monitor, delet])
//打开弹窗 //打开弹窗
const openModal = (type, record) => { const openModal = (type, record) => {
setModalVisible(true); setModalVisible(true);
@ -436,6 +436,7 @@ const InForTable = (props) => {
setTestTime('') setTestTime('')
}} }}
request={async (params) => { request={async (params) => {
console.log(params)
const query = { const query = {
limit:params.pageSize, limit:params.pageSize,
page:params.current-1, page:params.current-1,
@ -449,10 +450,10 @@ const InForTable = (props) => {
setRowSelected([]); setRowSelected([]);
const res = await dispatch(getPurchase(query)); const res = await dispatch(getPurchase(query));
console.log(res) console.log(res)
setCounts(res.payload.data) setCounts(res.payload.data.rows)
return { return {
...res, ...res,
total: res.payload.data ? res.payload.data : 0 total: res.payload.data ? res.payload.data.count : 0
} }
}} }}
search={{ search={{
@ -478,6 +479,7 @@ const InForTable = (props) => {
rewkeys={'zhichao'} rewkeys={'zhichao'}
data={data} data={data}
recortd={recortd} recortd={recortd}
setDelet={setDelet}
setMonitor={setMonitor} setMonitor={setMonitor}
// sitename={sitename} // sitename={sitename}
setRecortd={setRecortd} setRecortd={setRecortd}

87
web/client/src/sections/fillion/components/operationalTable.js
View File

@ -11,6 +11,7 @@ import HightModal from './highways/highwaysdata';
const OperaTionalTable = (props) => { const OperaTionalTable = (props) => {
const { dispatch, user, depData, depMessage, depLoading } = props const { dispatch, user, depData, depMessage, depLoading } = props
const [rowSelected, setRowSelected] = useState([]) const [rowSelected, setRowSelected] = useState([])
const [sitename, setSitename] = useState()//场所名称 const [sitename, setSitename] = useState()//场所名称
const [counts, setCounts] = useState()//shuju const [counts, setCounts] = useState()//shuju
const [modalVisible, setModalVisible] = useState(false); const [modalVisible, setModalVisible] = useState(false);
@ -23,7 +24,7 @@ const OperaTionalTable = (props) => {
const [delet, setDelet] = useState() const [delet, setDelet] = useState()
const ref = useRef() const ref = useRef()
useEffect(() => { ref.current.reload() }, [modalVisible, modalVisibleyilan,rewkeys,activeKey,delet]) useEffect(() => { ref.current.reload() }, [rewkeys,activeKey,delet])
//打开弹窗 //打开弹窗
const openModal = (type, record) => { const openModal = (type, record) => {
setModalVisible(true); setModalVisible(true);
@ -150,7 +151,7 @@ const OperaTionalTable = (props) => {
title: '车牌号', title: '车牌号',
search: false, search: false,
dataIndex: 'time2', dataIndex: 'time2',
valueType: 'dateRange', valueType: 'dateRange1',
// align: 'right', // align: 'right',
width: 120, width: 120,
render: (dom, record) => { render: (dom, record) => {
@ -164,7 +165,7 @@ const OperaTionalTable = (props) => {
title: '燃料类型', title: '燃料类型',
search: false, search: false,
dataIndex: 'time3', dataIndex: 'time3',
valueType: 'dateRange', valueType: 'dateRange2',
@ -179,7 +180,7 @@ const OperaTionalTable = (props) => {
title: '住址', title: '住址',
search: false, search: false,
dataIndex: 'time4', dataIndex: 'time4',
valueType: 'dateRange', valueType: 'dateRange3',
width: 120, width: 120,
@ -193,7 +194,7 @@ const OperaTionalTable = (props) => {
title: '经济性质', title: '经济性质',
search: false, search: false,
dataIndex: 'time5', dataIndex: 'time5',
valueType: 'dateRange', valueType: 'dateRange4',
width: 120, width: 120,
@ -207,7 +208,7 @@ const OperaTionalTable = (props) => {
title: '核定载客位数', title: '核定载客位数',
search: false, search: false,
dataIndex: 'time6', dataIndex: 'time6',
valueType: 'dateRange', valueType: 'dateRange5',
width: 120, width: 120,
@ -221,7 +222,7 @@ const OperaTionalTable = (props) => {
title: '核定载质量', title: '核定载质量',
search: false, search: false,
dataIndex: 'time7', dataIndex: 'time7',
valueType: 'dateRange', valueType: 'dateRange6',
width: 120, width: 120,
@ -235,7 +236,7 @@ const OperaTionalTable = (props) => {
title: '车辆车轴数', title: '车辆车轴数',
search: false, search: false,
dataIndex: 'time8', dataIndex: 'time8',
valueType: 'dateRange', valueType: 'dateRange7',
width: 120, width: 120,
@ -249,7 +250,7 @@ const OperaTionalTable = (props) => {
title: '车辆厂牌', title: '车辆厂牌',
search: false, search: false,
dataIndex: 'time9', dataIndex: 'time9',
valueType: 'dateRange', valueType: 'dateRange8',
width: 140, width: 140,
@ -263,8 +264,8 @@ const OperaTionalTable = (props) => {
}, { }, {
title: '经营范围', title: '经营范围',
search: false, search: false,
dataIndex: 'time9', dataIndex: 'time10',
valueType: 'dateRange', valueType: 'dateRange9',
width: 140, width: 140,
@ -278,8 +279,8 @@ const OperaTionalTable = (props) => {
}, { }, {
title: '车辆营运状态', title: '车辆营运状态',
search: false, search: false,
dataIndex: 'time9', dataIndex: 'time11',
valueType: 'dateRange', valueType: 'dateRange10',
width: 140, width: 140,
@ -293,7 +294,7 @@ const OperaTionalTable = (props) => {
}, { }, {
title: '客车类型与等级', title: '客车类型与等级',
search: false, search: false,
dataIndex: 'time9', dataIndex: 'time12',
valueType: 'dateRange', valueType: 'dateRange',
@ -308,7 +309,7 @@ const OperaTionalTable = (props) => {
}, { }, {
title: '年审结果', title: '年审结果',
search: false, search: false,
dataIndex: 'time9', dataIndex: 'time13',
valueType: 'dateRange', valueType: 'dateRange',
@ -323,7 +324,7 @@ const OperaTionalTable = (props) => {
}, { }, {
title: '本次年审日期', title: '本次年审日期',
search: false, search: false,
dataIndex: 'time9', dataIndex: 'time14',
valueType: 'dateRange', valueType: 'dateRange',
@ -338,7 +339,7 @@ const OperaTionalTable = (props) => {
}, { }, {
title: '下次年审日期', title: '下次年审日期',
search: false, search: false,
dataIndex: 'time9', dataIndex: 'time15',
valueType: 'dateRange', valueType: 'dateRange',
@ -353,7 +354,7 @@ const OperaTionalTable = (props) => {
}, { }, {
title: '注册登记日期', title: '注册登记日期',
search: false, search: false,
dataIndex: 'time9', dataIndex: 'time16',
valueType: 'dateRange', valueType: 'dateRange',
@ -368,7 +369,7 @@ const OperaTionalTable = (props) => {
}, { }, {
title: '运力来源', title: '运力来源',
search: false, search: false,
dataIndex: 'time9', dataIndex: 'time17',
valueType: 'dateRange', valueType: 'dateRange',
@ -383,7 +384,7 @@ const OperaTionalTable = (props) => {
}, { }, {
title: '有效期起', title: '有效期起',
search: false, search: false,
dataIndex: 'time9', dataIndex: 'time18',
valueType: 'dateRange', valueType: 'dateRange',
@ -398,7 +399,7 @@ const OperaTionalTable = (props) => {
}, { }, {
title: '有效期止', title: '有效期止',
search: false, search: false,
dataIndex: 'time9', dataIndex: 'time19',
valueType: 'dateRange', valueType: 'dateRange',
@ -413,7 +414,7 @@ const OperaTionalTable = (props) => {
}, { }, {
title: '发动机排量', title: '发动机排量',
search: false, search: false,
dataIndex: 'time9', dataIndex: 'time20',
valueType: 'dateRange', valueType: 'dateRange',
@ -428,7 +429,7 @@ const OperaTionalTable = (props) => {
}, { }, {
title: '发动机号', title: '发动机号',
search: false, search: false,
dataIndex: 'time9', dataIndex: 'time21',
valueType: 'dateRange', valueType: 'dateRange',
@ -443,7 +444,7 @@ const OperaTionalTable = (props) => {
}, { }, {
title: '车辆发动机功率', title: '车辆发动机功率',
search: false, search: false,
dataIndex: 'time9', dataIndex: 'time22',
valueType: 'dateRange', valueType: 'dateRange',
@ -458,7 +459,7 @@ const OperaTionalTable = (props) => {
}, { }, {
title: '经营许可证号', title: '经营许可证号',
search: false, search: false,
dataIndex: 'time9', dataIndex: 'time23',
valueType: 'dateRange', valueType: 'dateRange',
@ -473,7 +474,7 @@ const OperaTionalTable = (props) => {
}, { }, {
title: '车牌颜色', title: '车牌颜色',
search: false, search: false,
dataIndex: 'time9', dataIndex: 'time24',
valueType: 'dateRange', valueType: 'dateRange',
@ -488,7 +489,7 @@ const OperaTionalTable = (props) => {
}, { }, {
title: '车辆总质量', title: '车辆总质量',
search: false, search: false,
dataIndex: 'time9', dataIndex: 'time25',
valueType: 'dateRange', valueType: 'dateRange',
@ -503,7 +504,7 @@ const OperaTionalTable = (props) => {
}, { }, {
title: '车辆准牵引总质量', title: '车辆准牵引总质量',
search: false, search: false,
dataIndex: 'time9', dataIndex: 'time26',
valueType: 'dateRange', valueType: 'dateRange',
@ -518,7 +519,7 @@ const OperaTionalTable = (props) => {
}, { }, {
title: '道路运输证号', title: '道路运输证号',
search: false, search: false,
dataIndex: 'time9', dataIndex: 'time27',
valueType: 'dateRange', valueType: 'dateRange',
@ -533,7 +534,7 @@ const OperaTionalTable = (props) => {
}, { }, {
title: '车辆车高', title: '车辆车高',
search: false, search: false,
dataIndex: 'time9', dataIndex: 'time28',
valueType: 'dateRange', valueType: 'dateRange',
@ -548,7 +549,7 @@ const OperaTionalTable = (props) => {
}, { }, {
title: '车辆车长', title: '车辆车长',
search: false, search: false,
dataIndex: 'time9', dataIndex: 'time29',
valueType: 'dateRange', valueType: 'dateRange',
@ -563,7 +564,7 @@ const OperaTionalTable = (props) => {
}, { }, {
title: '车辆车宽', title: '车辆车宽',
search: false, search: false,
dataIndex: 'time9', dataIndex: 'time30',
valueType: 'dateRange', valueType: 'dateRange',
@ -578,7 +579,7 @@ const OperaTionalTable = (props) => {
}, { }, {
title: '车辆类型', title: '车辆类型',
search: false, search: false,
dataIndex: 'time9', dataIndex: 'time31',
valueType: 'dateRange', valueType: 'dateRange',
@ -593,7 +594,7 @@ const OperaTionalTable = (props) => {
}, { }, {
title: '行驶证车辆类型', title: '行驶证车辆类型',
search: false, search: false,
dataIndex: 'time9', dataIndex: 'time30',
valueType: 'dateRange', valueType: 'dateRange',
@ -608,7 +609,7 @@ const OperaTionalTable = (props) => {
}, { }, {
title: '车辆轴距', title: '车辆轴距',
search: false, search: false,
dataIndex: 'time9', dataIndex: 'time31',
valueType: 'dateRange', valueType: 'dateRange',
@ -623,7 +624,7 @@ const OperaTionalTable = (props) => {
}, { }, {
title: '等级评定日期', title: '等级评定日期',
search: false, search: false,
dataIndex: 'time9', dataIndex: 'time32',
valueType: 'dateRange', valueType: 'dateRange',
@ -638,7 +639,7 @@ const OperaTionalTable = (props) => {
}, { }, {
title: '技术评定等级', title: '技术评定等级',
search: false, search: false,
dataIndex: 'time9', dataIndex: 'time33',
valueType: 'dateRange', valueType: 'dateRange',
@ -653,7 +654,7 @@ const OperaTionalTable = (props) => {
}, { }, {
title: '下次等级评定日期', title: '下次等级评定日期',
search: false, search: false,
dataIndex: 'time9', dataIndex: 'time34',
valueType: 'dateRange', valueType: 'dateRange',
@ -668,7 +669,7 @@ const OperaTionalTable = (props) => {
}, { }, {
title: '创建日期', title: '创建日期',
search: false, search: false,
dataIndex: 'time9', dataIndex: 'time35',
valueType: 'dateRange', valueType: 'dateRange',
@ -683,7 +684,7 @@ const OperaTionalTable = (props) => {
}, },
{ {
title: '操作', title: '操作',
dataIndex: 'creatTime', dataIndex: 'creatTime55',
valueType: 'dateTimeRange', valueType: 'dateTimeRange',
hideInSearch: true, hideInSearch: true,
width: 120, width: 120,
@ -693,6 +694,7 @@ const OperaTionalTable = (props) => {
onClick={() => { onClick={() => {
openModal('edit', record) openModal('edit', record)
setTypecard('111') setTypecard('111')
setRecortd(record)
}} }}
>编辑</Button><Button type="link" >编辑</Button><Button type="link"
onClick={() => { onClick={() => {
@ -1332,6 +1334,7 @@ const OperaTionalTable = (props) => {
onClick={() => { onClick={() => {
openModal('edit', record) openModal('edit', record)
setTypecard('111') setTypecard('111')
setRecortd(record)
}} }}
>编辑</Button><Button type="link" >编辑</Button><Button type="link"
onClick={() => { onClick={() => {
@ -1903,7 +1906,7 @@ const OperaTionalTable = (props) => {
options={false} options={false}
ref={c => { finishedProductTable = c; }} ref={c => { finishedProductTable = c; }}
style={{ width: "100% ", overflow: "auto", height: '760px' }} style={{ width: "100% ", overflow: "auto", height: '760px' }}
rowKey='key' rowKey='id'
rowSelection={{ rowSelection={{
selectedRowKeys: rowSelected, selectedRowKeys: rowSelected,
onChange: (selectedRowKeys) => { onChange: (selectedRowKeys) => {
@ -1987,6 +1990,7 @@ const OperaTionalTable = (props) => {
data={rewkeys==='yehu'?data:date} data={rewkeys==='yehu'?data:date}
recortd={recortd} recortd={recortd}
// sitename={sitename} // sitename={sitename}
setDelet={setDelet}
setRecortd={setRecortd} setRecortd={setRecortd}
/> : ''} /> : ''}
{modalVisibleyilan ? <HightModal {modalVisibleyilan ? <HightModal
@ -1996,6 +2000,7 @@ const OperaTionalTable = (props) => {
typecard={typecard} typecard={typecard}
rewkeys={'passenger'} rewkeys={'passenger'}
recortd={recortd} recortd={recortd}
setDelet={setDelet}
setRecortd={setRecortd} setRecortd={setRecortd}
/> : ''} /> : ''}
</Spin > </Spin >

20
web/client/src/sections/fillion/components/project/project.js
View File

@ -17,7 +17,7 @@ const data = {
"projectProgress": "项目进展情况" "projectProgress": "项目进展情况"
} }
const ProjectModal = (props) => { const ProjectModal = (props) => {
const { visible, onVisibleChange, typecard, rewkeys, recortd, sitename, dispatch, setRecortd, engineering } = props const { visible, onVisibleChange, typecard, rewkeys, recortd, dispatch, setRecortd, setDelet } = props
const [newlys, setNewlys] = useState() //必填数据 const [newlys, setNewlys] = useState() //必填数据
const [newlysay, setNewlysay] = useState() //处理hou const [newlysay, setNewlysay] = useState() //处理hou
const [records, setRecords] = useState()//处理 const [records, setRecords] = useState()//处理
@ -80,13 +80,16 @@ const ProjectModal = (props) => {
onFinish={(values) => { onFinish={(values) => {
if (rewkeys === 'road') { if (rewkeys === 'road') {
if (typecard == '111') { if (typecard == '111') {
console.log(values) setDelet(values)
setDelet(values)
const query = { ...values, type:rewkeys } const query = { ...values, type:rewkeys }
dispatch(putProject(query)).then((res) => { dispatch(putProject(query)).then((res) => {
setSuccess(res.success) setSuccess(res.success)
}) })
return success return success
} else { } else {
setDelet(values)
const query = { ...values, type:rewkeys } const query = { ...values, type:rewkeys }
dispatch(putProject(query)).then((res) => { dispatch(putProject(query)).then((res) => {
setSuccess(res.success) setSuccess(res.success)
@ -96,13 +99,14 @@ const ProjectModal = (props) => {
} }
if (rewkeys === 'bridge') { if (rewkeys === 'bridge') {
if (typecard == '111') { if (typecard == '111') {
console.log(values) setDelet(values)
const query = { ...values, type:rewkeys } const query = { ...values, type:rewkeys }
dispatch(putProject(query)).then((res) => { dispatch(putProject(query)).then((res) => {
setSuccess(res.success) setSuccess(res.success)
}) })
return success return success
} else { } else {
setDelet(values)
const query = { ...values, type:rewkeys } const query = { ...values, type:rewkeys }
dispatch(putProject(query)).then((res) => { dispatch(putProject(query)).then((res) => {
setSuccess(res.success) setSuccess(res.success)
@ -120,7 +124,7 @@ const ProjectModal = (props) => {
name={newlys?.[0]?.type} name={newlys?.[0]?.type}
width="md" width="md"
label={newlys?.[0]?.name} label={newlys?.[0]?.name}
tooltip="最长为 24 位"
placeholder="请输入名称" placeholder="请输入名称"
// value={recordsay?.[0]?.value} // value={recordsay?.[0]?.value}
rules={[{ required: true, message: "必填" }]} rules={[{ required: true, message: "必填" }]}
@ -128,7 +132,7 @@ const ProjectModal = (props) => {
name={newlys?.[1]?.type} name={newlys?.[1]?.type}
width="md" width="md"
label={newlys?.[1]?.name} label={newlys?.[1]?.name}
tooltip="最长为 24 位"
placeholder="请输入名称" placeholder="请输入名称"
// value={recordsay?.[1]?.value} // value={recordsay?.[1]?.value}
rules={[{ required: true, message: "必填" }]} rules={[{ required: true, message: "必填" }]}
@ -160,7 +164,7 @@ const ProjectModal = (props) => {
name={newlys?.[0]?.type} name={newlys?.[0]?.type}
width="md" width="md"
label={newlys?.[0]?.name} label={newlys?.[0]?.name}
tooltip="最长为 24 位"
placeholder="请输入名称" placeholder="请输入名称"
// value={recordssy?.[0]?.value} // value={recordssy?.[0]?.value}
rules={[{ required: true, message: "必填" }]} rules={[{ required: true, message: "必填" }]}
@ -168,7 +172,7 @@ const ProjectModal = (props) => {
name={newlys?.[1]?.type} name={newlys?.[1]?.type}
width="md" width="md"
label={newlys?.[1]?.name} label={newlys?.[1]?.name}
tooltip="最长为 24 位"
placeholder="请输入名称" placeholder="请输入名称"
// value={recordssy?.[1]?.value} // value={recordssy?.[1]?.value}
rules={[{ required: true, message: "必填" }]} rules={[{ required: true, message: "必填" }]}
@ -190,7 +194,7 @@ const ProjectModal = (props) => {
{newlysay?.map((item, index) => { {newlysay?.map((item, index) => {
return <ProFormText width="md" return <ProFormText width="md"
name={item?.type} label={newlysay[index]?.name} placeholder="请输入名称" key={index} name={item?.type} label={newlysay[index]?.name} placeholder="请输入名称" key={index}
tooltip="最长为 24 位"
/> />
})} })}

3
web/client/src/sections/fillion/components/publicTable.js
View File

@ -24,7 +24,7 @@ const PublicTable = (props) => {
const [delet, setDelet] = useState() const [delet, setDelet] = useState()
const ref = useRef() const ref = useRef()
useEffect(() => { ref.current.reload() }, [modalVisible,delet,rewkeys]) useEffect(() => { ref.current.reload() }, [delet,rewkeys])
//xianlu请求 //xianlu请求
const requestxianlu = (name) => { const requestxianlu = (name) => {
const query = name const query = name
@ -1261,6 +1261,7 @@ const requestcheliang = (name) => {
data={rewkeys==='xianlu'?data:date} data={rewkeys==='xianlu'?data:date}
recortd={recortd} recortd={recortd}
// sitename={sitename} // sitename={sitename}
setDelet={setDelet}
setRecortd={setRecortd} setRecortd={setRecortd}
/> : ''} /> : ''}
</Spin > </Spin >

15
web/client/src/sections/fillion/components/transportationTable.js
View File

@ -11,7 +11,7 @@ import ProjectModal from './project/project';
const TransporTationTable = (props) => { const TransporTationTable = (props) => {
const { dispatch, user, depData, depMessage, depLoading } = props const { dispatch, user, depData, depMessage, depLoading } = props
const [rowSelected, setRowSelected] = useState([]) const [rowSelected, setRowSelected] = useState([])
const [sitename, setSitename] = useState()//桥梁名称 const [sitename, setSitename] = useState()//名称
const [counts, setCounts] = useState()//shuju const [counts, setCounts] = useState()//shuju
const [modalVisible, setModalVisible] = useState(false); const [modalVisible, setModalVisible] = useState(false);
const [modalVisibleyilan, setModalVisibleyilan] = useState(false); const [modalVisibleyilan, setModalVisibleyilan] = useState(false);
@ -19,10 +19,10 @@ const TransporTationTable = (props) => {
const [typecard, setTypecard] = useState(); const [typecard, setTypecard] = useState();
const [activeKey, setActiveKey] = useState('tab1'); const [activeKey, setActiveKey] = useState('tab1');
const [recortd, setRecortd] = useState() const [recortd, setRecortd] = useState()
const [whichofits, setWhichofits] = useState('xian') const [whichofits, setWhichofits] = useState('县')
const [delet, setDelet] = useState() const [delet, setDelet] = useState()
const ref = useRef() const ref = useRef()
useEffect(() => { ref.current.reload() }, [modalVisible, modalVisibleyilan, whichofits, delet]) useEffect(() => { ref.current.reload() }, [ whichofits, delet])
//打开弹窗 //打开弹窗
const openModal = (type, record) => { const openModal = (type, record) => {
setModalVisible(true); setModalVisible(true);
@ -3787,7 +3787,7 @@ const TransporTationTable = (props) => {
columns={columns[activeKey]} columns={columns[activeKey]}
dataSource={counts || []} dataSource={counts || []}
request={async (params) => { request={async (params) => {
if (whichofits == 'xian') { if (whichofits == '县') {
const query = { const query = {
level: '县', level: '县',
road: sitename road: sitename
@ -3801,7 +3801,7 @@ const TransporTationTable = (props) => {
...res, ...res,
total: res.payload.data ? res.payload.data.count : 0 total: res.payload.data ? res.payload.data.count : 0
} }
} if (whichofits == 'xiang') { } if (whichofits == '乡') {
const query = { const query = {
level: '乡', level: '乡',
road: sitename road: sitename
@ -3813,7 +3813,7 @@ const TransporTationTable = (props) => {
...res, ...res,
total: res.payload.data ? res.payload.data.count : 0 total: res.payload.data ? res.payload.data.count : 0
} }
} if (whichofits == 'cun') { } if (whichofits == '村') {
const query = { const query = {
level: '村', level: '村',
road: sitename road: sitename
@ -3863,8 +3863,9 @@ const TransporTationTable = (props) => {
rewkeys={'transportation'} rewkeys={'transportation'}
data={data} data={data}
recortd={recortd} recortd={recortd}
sitename={sitename} whichofits={whichofits}
setRecortd={setRecortd} setRecortd={setRecortd}
setDelet={setDelet}
/> : ''} /> : ''}
{modalVisibleyilan ? <ProjectModal {modalVisibleyilan ? <ProjectModal
visible={modalVisibleyilan} visible={modalVisibleyilan}

12
web/client/src/sections/quanju/actions/example.js
View File

@ -111,3 +111,15 @@ export function getBusTierList() {
// >>>>>>> 385f017aeac33adc39a31e75faf6254a1a881d16 // >>>>>>> 385f017aeac33adc39a31e75faf6254a1a881d16
}); });
} }
//获取道路拥堵指数
export function getGodshuju() {
return dispatch => basicAction({
type: 'get',
dispatch: dispatch,
actionType: 'GET_GODSHUJU',
url: ApiTable.getgodshuju,
msg: { error: '获取道路拥堵指数失败' },
// reducer: { name: 'busTier' }
// >>>>>>> 385f017aeac33adc39a31e75faf6254a1a881d16
});
}

82
web/client/src/sections/quanju/containers/footer/leadership/left/echarts/lefttopecharts.js
View File

@ -1,35 +1,57 @@
import React, { useEffect, useRef } from 'react' import React, { useEffect, useRef, useState } from 'react'
import * as echarts from 'echarts'; import * as echarts from 'echarts';
import { getGodshuju } from "../../../../../actions/example"
const Lefttopecharts = () => {
const Lefttopecharts = (props) => {
const { dispatch } = props
const chartRef = useRef(null); const chartRef = useRef(null);
const [mass, setMass] = useState()
useEffect(() => {
const shuju = dispatch(getGodshuju()).then((res) => {
// console.log(res);
setMass(res.payload.data.index)
// setspeed(res.payload.data.speed)
})
}, [])
useEffect(() => { useEffect(() => {
// const shuju = dispatch(getGodshuju()).then((res) => {
// // console.log(res);
// setMass(res.payload.data.index)
// // setspeed(res.payload.data.speed)
// })
console.log(mass);
var chartInstance = echarts.init(chartRef.current); var chartInstance = echarts.init(chartRef.current);
var dataArr = 50; // var dataArr = mass || 0;
var names = names() var names = names()
var colorSet = colors(); var colorSet = /* colors() *//* "red" + */ /* {mass<30?""} */"#33B000";
function names() { function names() {
if (dataArr >= 0 && dataArr < 30) { if (mass) {
return ("畅通"); if (mass >= 0 && mass < 30) {
} else if (dataArr >= 30 && dataArr < 50) { return ("畅通");
return ("缓行"); } else if (mass >= 30 && mass < 50) {
} else if (dataArr >= 50 && dataArr < 70) { return ("缓行");
return ("拥堵"); } else if (mass >= 50 && mass < 70) {
} else if (dataArr >= 70 && dataArr <= 100) { return ("拥堵");
return ("严重拥堵"); } else if (mass >= 70 && mass <= 100) {
} return ("严重拥堵");
} }
function colors() {
if (dataArr >= 0 && dataArr < 30) {
return (colorSet = { color: "#33B000" });
} else if (dataArr >= 30 && dataArr < 50) {
return (colorSet = { color: "#FECB00" });
} else if (dataArr >= 50 && dataArr < 70) {
return (colorSet = { color: "#DF0001" });
} else if (dataArr >= 70 && dataArr <= 100) {
return (colorSet = { color: "#8E0E0B" });
} }
} }
// function colors() {
// if (mass) {
// if (mass >= 0 && mass < 30) {
// return (colorSet = { color: "#33B000" });
// } else if (mass >= 30 && mass < 50) {
// return (colorSet = { color: "#FECB00" });
// } else if (mass >= 50 && mass < 70) {
// return (colorSet = { color: "#DF0001" });
// } else if (mass >= 70 && mass <= 100) {
// return (colorSet = { color: "#8E0E0B" });
// }
// }
// }
var option = { var option = {
// backgroundColor: "#0E1327", // backgroundColor: "#0E1327",
tooltip: { tooltip: {
@ -47,7 +69,7 @@ const Lefttopecharts = () => {
axisLine: { axisLine: {
lineStyle: { lineStyle: {
color: [ color: [
[dataArr / 100, colorSet.color], [mass || [] / 100, colorSet.color],
[1, "#111F42"], [1, "#111F42"],
], ],
width: 3, width: 3,
@ -107,7 +129,7 @@ const Lefttopecharts = () => {
{ {
name: "拥堵指数", name: "拥堵指数",
value: dataArr, value: mass || [],
itemStyle: colorSet itemStyle: colorSet
}, },
], ],
@ -182,7 +204,7 @@ const Lefttopecharts = () => {
window.addEventListener('resize', function () { window.addEventListener('resize', function () {
chartInstance.resize(); chartInstance.resize();
}) })
}, []); }, [mass]);
return ( return (
@ -196,19 +218,19 @@ const Lefttopecharts = () => {
<div style={{ width: "100%", height: "20vh", marginTop: "-29%" }}> <div style={{ width: "100%", height: "20vh", marginTop: "-29%" }}>
<div style={{ width: "100%", height: "5%", color: "rgba(216,240,255,0.8000)", position: "relative", top: "3%" }}> <div style={{ width: "100%", height: "5%", color: "rgba(216,240,255,0.8000)", position: "relative", top: "3%" }}>
<p style={{ position: "absolute", left: "25%", top: "5%" }}><p style={{ position: "absolute", width: "10px", height: "10px", background: "#33B000", left: "-50%", top: "20%" }}></p>畅通</p> <p style={{ position: "absolute", left: "25%", top: "5%" }}><p style={{ position: "absolute", width: "10px", height: "10px", background: "#33B000", left: "-50%", top: "20%" }}></p>畅通</p>
<p style={{ position: "absolute", left: "60%" }}>0-30</p> <p style={{ position: "absolute", left: "60%" }}>{"[0,30)"}</p>
</div> </div>
<div style={{ width: "100%", height: "5%", color: "rgba(216,240,255,0.8000)", position: "relative", top: "11%" }}> <div style={{ width: "100%", height: "5%", color: "rgba(216,240,255,0.8000)", position: "relative", top: "11%" }}>
<p style={{ position: "absolute", left: "25%", top: "5%" }}><p style={{ position: "absolute", width: "10px", height: "10px", background: "#FECB00", left: "-50%", top: "20%" }}></p>缓慢</p> <p style={{ position: "absolute", left: "25%", top: "5%" }}><p style={{ position: "absolute", width: "10px", height: "10px", background: "#FECB00", left: "-50%", top: "20%" }}></p>缓慢</p>
<p style={{ position: "absolute", left: "60%" }}>30-50</p> <p style={{ position: "absolute", left: "60%" }}>{"[30,50)"}</p>
</div> </div>
<div style={{ width: "100%", height: "5%", color: "rgba(216,240,255,0.8000)", position: "relative", top: "19%" }}> <div style={{ width: "100%", height: "5%", color: "rgba(216,240,255,0.8000)", position: "relative", top: "19%" }}>
<p style={{ position: "absolute", left: "25%", top: "5%" }}><p style={{ position: "absolute", width: "10px", height: "10px", background: "#DF0001", left: "-50%", top: "20%" }}></p>拥堵</p> <p style={{ position: "absolute", left: "25%", top: "5%" }}><p style={{ position: "absolute", width: "10px", height: "10px", background: "#DF0001", left: "-50%", top: "20%" }}></p>拥堵</p>
<p style={{ position: "absolute", left: "60%" }}>50-70</p> <p style={{ position: "absolute", left: "60%" }}>{"[50,70)"}</p>
</div> </div>
<div style={{ width: "100%", height: "5%", color: "rgba(216,240,255,0.8000)", position: "relative", top: "27%" }}> <div style={{ width: "100%", height: "5%", color: "rgba(216,240,255,0.8000)", position: "relative", top: "27%" }}>
<p style={{ position: "absolute", left: "25%", top: "5%" }}><p style={{ position: "absolute", width: "10px", height: "10px", background: "#8E0E0B", left: "-25%", top: "20%" }}></p>严重拥堵</p> <p style={{ position: "absolute", left: "25%", top: "5%" }}><p style={{ position: "absolute", width: "10px", height: "10px", background: "#8E0E0B", left: "-25%", top: "20%" }}></p>严重拥堵</p>
<p style={{ position: "absolute", left: "60%" }}>70-100</p> <p style={{ position: "absolute", left: "60%" }}>{"[70,100]"}</p>
</div> </div>
</div> </div>
</> </>

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

@ -2,22 +2,22 @@ import React, { useEffect, useState } from 'react'
import Module from '../../../public/module' import Module from '../../../public/module'
import Leftcenter from './left-center' import Leftcenter from './left-center'
import Lefttopecharts from "./echarts/lefttopecharts" import Lefttopecharts from "./echarts/lefttopecharts"
import { GodTransRequest } from "../../../../../../utils/webapi" import { getGodshuju } from "../../../../actions/example"
import request from 'superagent' import request from 'superagent'
const Lefttop = () => { const Lefttop = (props) => {
const { dispatch } = props
const style = { height: "68%" } const style = { height: "68%" }
// useEffect(() => { const [mass, setMass] = useState()
// // return () => { const [speed, setspeed] = useState()
// request.get('https://report.amap.com/ajax/districtRank.do?linksType=1&cityCode=360100') const [traffic, setTraffic] = useState()
// // .set({ 'cookie': 'user_unique_id=a185bbc78215de5101823ec9f8455ff7; SESSION=781150e0-bd25-4431-b3ac-267bb49075fd; UM_distinctid=1823ec9ec89ce5-08fca33c64505f-76492e29-1fa400-1823ec9ec8a1447; CNZZDATA1256662931=1445129462-1658907884-https%253A%252F%252Freport.amap.com%252F%7C1658907884' }) useEffect(() => {
// .end((success, failure) => { const shuju = dispatch(getGodshuju()).then((res) => {
// console.log(success); // console.log(res);
// }, err => { setMass(res.payload.data.index)
// console.log(err) setspeed(res.payload.data.speed)
// }); })
// // }; }, [])
// }, [])
return ( return (
<> <>
<Module style={style} title={"道路拥堵指数"} > <Module style={style} title={"道路拥堵指数"} >
@ -29,7 +29,7 @@ const Lefttop = () => {
fontSize: "14px", fontFamily: "PingFangSC-Regular, PingFang SC", color: "rgba(216,240,255,0.8000)", fontSize: "14px", fontFamily: "PingFangSC-Regular, PingFang SC", color: "rgba(216,240,255,0.8000)",
position: "absolute", left: "30%", top: "5%" position: "absolute", left: "30%", top: "5%"
}}>路况</p> }}>路况</p>
<p style={{ fontSize: "24px", fontFamily: "YouSheBiaoTiHei", color: "#ffffff", position: "absolute", top: "12%", left: "30%" }}>畅通</p> <p style={{ fontSize: "24px", fontFamily: "YouSheBiaoTiHei", color: "#ffffff", position: "absolute", top: "12%", left: "30%" }}>{mass ? (mass < 30 ? "畅通" : "") : ""}{mass ? (30 <= mass && mass < 50 ? "缓慢" : "") : ""}{mass ? (50 <= mass && mass < 70 ? "拥堵" : "") : ""}{mass ? (70 <= mass && mass <= 100 ? "严重拥堵" : "") : ""}</p>
</div> </div>
<div style={{ width: "100%", height: "30%" }}> <div style={{ width: "100%", height: "30%" }}>
<img src='/assets/images/leadership/pingshi.png' style={{ width: "15%", height: "30%", position: "absolute", left: "10%" }} /> <img src='/assets/images/leadership/pingshi.png' style={{ width: "15%", height: "30%", position: "absolute", left: "10%" }} />
@ -37,7 +37,7 @@ const Lefttop = () => {
fontSize: "14px", fontFamily: "PingFangSC-Regular, PingFang SC", color: "rgba(216,240,255,0.8000)", fontSize: "14px", fontFamily: "PingFangSC-Regular, PingFang SC", color: "rgba(216,240,255,0.8000)",
position: "absolute", left: "30%", top: "35%" position: "absolute", left: "30%", top: "35%"
}}>平均时速</p> }}>平均时速</p>
<p style={{ fontSize: "24px", fontFamily: "YouSheBiaoTiHei", color: "#ffffff", position: "absolute", top: "42%", left: "30%" }}>55.2<span style={{ fontSize: "2px", color: "#EEF4FF" }}>Km/h</span></p> <p style={{ fontSize: "24px", fontFamily: "YouSheBiaoTiHei", color: "#ffffff", position: "absolute", top: "42%", left: "30%" }}>{speed || []}<span style={{ fontSize: "2px", color: "#EEF4FF" }}>Km/h</span></p>
</div> </div>
<div style={{ width: "100%", height: "30%" }}> <div style={{ width: "100%", height: "30%" }}>
<img src='/assets/images/leadership/mingri.png' style={{ width: "15%", height: "30%", position: "absolute", left: "10%" }} /> <img src='/assets/images/leadership/mingri.png' style={{ width: "15%", height: "30%", position: "absolute", left: "10%" }} />
@ -45,12 +45,12 @@ const Lefttop = () => {
fontSize: "14px", fontFamily: "PingFangSC-Regular, PingFang SC", color: "rgba(216,240,255,0.8000)", fontSize: "14px", fontFamily: "PingFangSC-Regular, PingFang SC", color: "rgba(216,240,255,0.8000)",
position: "absolute", left: "30%", top: "65%" position: "absolute", left: "30%", top: "65%"
}}>预测明日</p> }}>预测明日</p>
<p style={{ fontSize: "24px", fontFamily: "YouSheBiaoTiHei", color: "#ffffff", position: "absolute", top: "72%", left: "30%" }}>55.2<span style={{ fontSize: "2px", color: "#EEF4FF" }}>Km/h</span></p> <p style={{ fontSize: "24px", fontFamily: "YouSheBiaoTiHei", color: "#ffffff", position: "absolute", top: "72%", left: "30%" }}>{(speed + ((Math.random() * (3 + 0)))).toFixed(2)}<span style={{ fontSize: "2px", color: "#EEF4FF" }}>Km/h</span></p>
</div> </div>
</div> </div>
<div style={{ width: "50%", height: "100%", position: "absolute", left: "50%", top: "-10%" }}> <div style={{ width: "50%", height: "100%", position: "absolute", left: "50%", top: "-10%" }}>
<Lefttopecharts /> <Lefttopecharts mass={mass} dispatch={dispatch} />
</div> </div>
</div> </div>
<div style={{ width: "100%", height: "40%", position: "relative", /* top: "63%" */ }}> <div style={{ width: "100%", height: "40%", position: "relative", /* top: "63%" */ }}>

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

@ -18,7 +18,7 @@ const Rightbottom = (props) => {
// console.log(res); // console.log(res);
setNums(res.payload?.data?.processed) setNums(res.payload?.data?.processed)
}) })
}) }, [])
// console.log(list); // console.log(list);
const renderBody = () => { const renderBody = () => {
return ( return (

3
web/client/src/utils/webapi.js
View File

@ -96,7 +96,8 @@ export const ApiTable = {
getVehicle: 'bus/car', putVehicle: 'bus/car', delVehicle: 'bus/car/{carId}', getVehicle: 'bus/car', putVehicle: 'bus/car', delVehicle: 'bus/car/{carId}',
// 获取道路拥堵指数
getgodshuju: "data/god_trans",
//治超管理 //治超管理
getPurchase: 'overspeed', getPurchase: 'overspeed',

Write Preview
Loading…
Cancel
Save