Browse Source

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

release_0.0.4^2
巴林闲侠 3 years ago
parent
commit
398015c39f
  1. 25
      web/client/src/sections/fillion/components/bridgeTable.js
  2. 2
      web/client/src/sections/fillion/components/enforceTable.js
  3. 2
      web/client/src/sections/fillion/components/highways/highwaysdata.js
  4. 18
      web/client/src/sections/fillion/components/highwaysTable.js
  5. 22
      web/client/src/sections/fillion/components/infor/details.js
  6. 23
      web/client/src/sections/fillion/components/inforTable.js
  7. 36
      web/client/src/sections/fillion/components/operationalTable.js
  8. 20
      web/client/src/sections/fillion/components/project/project.js
  9. 20
      web/client/src/sections/fillion/components/publicTable.js
  10. 39
      web/client/src/sections/fillion/components/transportationTable.js
  11. 24
      web/client/src/sections/fillion/containers/bridge.js
  12. 17
      web/client/src/sections/fillion/containers/highways.js
  13. 16
      web/client/src/sections/fillion/containers/infor.js
  14. 24
      web/client/src/sections/fillion/containers/operational.js
  15. 26
      web/client/src/sections/fillion/containers/promotional.js
  16. 16
      web/client/src/sections/fillion/containers/public.js
  17. 24
      web/client/src/sections/fillion/containers/transportation.js
  18. 3
      web/client/src/sections/quanju/containers/footer/build/index.js
  19. 36
      web/client/src/sections/quanju/containers/footer/operation/left.js
  20. 8
      web/client/src/sections/quanju/containers/footer/operation/right.js

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

@ -24,6 +24,7 @@ const BrideTable = (props) => {
const [recortd, setRecortd] = useState()
const [whichofits, setWhichofits] = useState('qiaoliang')
const [delet, setDelet] = useState()
const [differentiate, setDifferentiate] = useState('bridge')
const ref = useRef()
useEffect(() => { ref.current.reload() }, [whichofits, delet])
@ -1506,7 +1507,7 @@ const BrideTable = (props) => {
return <div><Button type="link"
onClick={() => {
openModal('edit', record)
setTypecard('111')
setTypecard('compile')
setRecortd(record)
}}
>编辑</Button>
@ -1690,7 +1691,7 @@ const BrideTable = (props) => {
return <div><Button type="link"
onClick={() => {
yilanModal('edit', record)
setTypecard('111')
setTypecard('compile')
setRecortd(record)
}}
>编辑</Button><Popconfirm title='' onConfirm={() => { deldatas(record.id) }}>
@ -1750,22 +1751,6 @@ const BrideTable = (props) => {
setModalRecord(null);
}
}
//批量导出
const exports = (ids, counts) => {
// console.log(user);
let reportIds = [];
if (ids.length)
reportIds = ids
else
reportIds = (counts || {}).ids || [];
superagent.post('/_report/http')
.send({ id: reportIds.map(i => Number(i)) }).end((err, res) => {
const resTextIs = res.text.split('/').pop()
window.open(
'/_api/' +
`attachments?src=files/${resTextIs}&filename=${encodeURIComponent(resTextIs)}&token=${user.token}`)
})
}
return (
<Spin spinning={false}>
<div className='protable-transpor'>
@ -1782,12 +1767,14 @@ const BrideTable = (props) => {
key: 'tab1',
label: <span onClick={() => {
setWhichofits('qiaoliang')
setDifferentiate('bridge')
}}>桥梁{activeKey === 'tab1'}</span>,
},
{
key: 'tab2',
label: <span onClick={() => {
setWhichofits('gongcheng')
setDifferentiate('project')
}}>工程一览{activeKey === 'tab2'}</span>,
},
@ -1844,7 +1831,7 @@ const BrideTable = (props) => {
defaultCollapsed: false,
optionRender: (searchConfig, formProps, dom) => [
...dom.reverse(),
<Popconfirm title="确认导出?" onConfirm={() => { props.exports(rowSelected, counts) }}>
<Popconfirm title="确认导出?" onConfirm={() => { props.exports(rowSelected,differentiate) }}>
<Button
>
导出

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

@ -1508,7 +1508,7 @@ const openModal = (type, record) => {
return <div><Button type="link"
onClick={() => {
openModal('edit', record)
setTypecard('111')
setTypecard('compile')
}}
>编辑</Button><Button type="link"></Button></div>

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

@ -47,7 +47,7 @@ const HightModal = (props) => {
}}
initialValues={recortd}
>
{typecard == '111' ?
{typecard == 'compile' ?
<ProForm.Group
>
<ProFormText

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

@ -29,22 +29,6 @@ const hightModal = (type, record) => {
} else {
setModalRecord(null);
}
}
//批量导出
const exports = (ids, counts) => {
// console.log(user);
let reportIds = [];
if (ids.length)
reportIds = ids
else
reportIds = (counts || {}).ids || [];
superagent.post('/_report/http')
.send({ id: reportIds.map(i => Number(i)) }).end((err, res) => {
const resTextIs = res.text.split('/').pop()
window.open(
'/_api/' +
`attachments?src=files/${resTextIs}&filename=${encodeURIComponent(resTextIs)}&token=${user.token}`)
})
}
const columns =
[
@ -91,7 +75,7 @@ const exports = (ids, counts) => {
return <div><Button type="link"
onClick={() => {
hightModal('edit', record)
setTypecard('111')
setTypecard('compile')
setRecortd(record)
}}
>编辑</Button></div>

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

@ -152,12 +152,12 @@ const UserModal = (props) => {
if (Object.values(values).length > 0) {
if (rewkeys === 'transportation') {
if (typecard == '111') {
if (typecard == 'compile') {
setDelet(values)
const query = { ...values, level: whichofits, roadId: records?.[0]?.value || '' }
dispatch(putRoadway(query)).then((res) => {
return true
})
return true
} else {
setDelet(values)
const query = { ...values, level: whichofits }
@ -169,9 +169,9 @@ const UserModal = (props) => {
}
if (rewkeys === 'bridge') {
if (typecard == '111') {
if (typecard == 'compile') {
setDelet(values)
const query = { ...values, roadId: records?.[0]?.value || '' }
const query = { ...values, bridgeId: records?.[0]?.value || '' }
dispatch(putBridge(query)).then((res) => {
})
@ -186,7 +186,7 @@ const UserModal = (props) => {
}
}
if (rewkeys === 'weihuo') {
if (typecard == '111') {
if (typecard == 'compile') {
setDelet(values)
const query = { ...values, vehicleId: records?.[0]?.value || '', type: '危货' }
@ -205,7 +205,7 @@ const UserModal = (props) => {
}
}
if (rewkeys === 'chuzu') {
if (typecard == '111') {
if (typecard == 'compile') {
setDelet(values)
const query = { ...values, vehicleId: records?.[0]?.value || '', type: '出租车' }
@ -224,7 +224,7 @@ const UserModal = (props) => {
}
}
if (rewkeys === 'yehu') {
if (typecard == '111') {
if (typecard == 'compile') {
setDelet(values)
const query = { ...values, businessId: records?.[0]?.value, type: values.type }
dispatch(putHouseholds(query)).then((res) => {
@ -240,7 +240,7 @@ const UserModal = (props) => {
return true
}
} if (rewkeys === 'xianlu') {
if (typecard == '111') {
if (typecard == 'compile') {
setDelet(values)
const query = { ...values, lineId: records?.[0]?.value || '' }
dispatch(putCircuit(query)).then((res) => {
@ -257,7 +257,7 @@ const UserModal = (props) => {
}
}
if (rewkeys === 'cheliang') {
if (typecard == '111') {
if (typecard == 'compile') {
setDelet(values)
const query = { ...values, carId: records?.[0]?.value || '' }
dispatch(putVehicle(query)).then((res) => {
@ -274,7 +274,7 @@ const UserModal = (props) => {
}
}
if (rewkeys === 'zhichao') {
if (typecard == '111') {
if (typecard == 'compile') {
setDelet(values)
const query = { ...values, overspeedId: records?.[0]?.value || '' }
dispatch(putPurchase(query)).then((res) => {
@ -297,7 +297,7 @@ const UserModal = (props) => {
}}
initialValues={recortd}
>
{typecard == '111' ?
{typecard == 'compile' ?
<ProForm.Group
>
<ProFormText

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

@ -35,22 +35,6 @@ const InForTable = (props) => {
setModalRecord(null);
}
}
//批量导出
const exports = (ids, counts) => {
// console.log(user);
let reportIds = [];
if (ids.length)
reportIds = ids
else
reportIds = (counts || {}).ids || [];
superagent.post('/_report/http')
.send({ id: reportIds.map(i => Number(i)) }).end((err, res) => {
const resTextIs = res.text.split('/').pop()
window.open(
'/_api/' +
`attachments?src=files/${resTextIs}&filename=${encodeURIComponent(resTextIs)}&token=${user.token}`)
})
}
const deldata = (id) => { // 治超删除
const query = {
overspeedId: id
@ -369,7 +353,7 @@ const InForTable = (props) => {
return <div><Button type="link"
onClick={() => {
openModal('edit', record)
setTypecard('111')
setTypecard('compile')
setRecortd(record)
}}
>编辑</Button>
@ -463,7 +447,10 @@ const InForTable = (props) => {
defaultCollapsed: false,
optionRender: (searchConfig, formProps, dom) => [
...dom.reverse(),
<Popconfirm title="确认导出?" onConfirm={() => { props.exports(rowSelected, counts) }}>
<Popconfirm title="确认导出?" onConfirm={() => {
console.log(rowSelected)
props.exports(rowSelected, counts) }}>
<Button
>
导出

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

@ -22,7 +22,9 @@ const OperaTionalTable = (props) => {
const [recortd, setRecortd] = useState()
const [rewkeys, setRewkeys] = useState('keyun')
const [delet, setDelet] = useState()
// const [, setDelet] = useState()
const [differentiate, setDifferentiate] = useState()
const [genre, setGenre] = useState()
const ref = useRef()
useEffect(() => { ref.current.reload() }, [rewkeys, activeKey, delet])
@ -63,22 +65,6 @@ const OperaTionalTable = (props) => {
setModalRecord(null);
}
}
//批量导出
const exports = (ids, counts) => {
// console.log(user);
let reportIds = [];
if (ids.length)
reportIds = ids
else
reportIds = (counts || {}).ids || [];
superagent.post('/_report/http')
.send({ id: reportIds.map(i => Number(i)) }).end((err, res) => {
const resTextIs = res.text.split('/').pop()
window.open(
'/_api/' +
`attachments?src=files/${resTextIs}&filename=${encodeURIComponent(resTextIs)}&token=${user.token}`)
})
}
const columns = {
tab1: [
{
@ -124,7 +110,7 @@ const OperaTionalTable = (props) => {
return <div><Button type="link"
onClick={() => {
hightModal('edit', record)
setTypecard('111')
setTypecard('compile')
setRecortd(record)
}}
>编辑</Button></div>
@ -711,7 +697,7 @@ const OperaTionalTable = (props) => {
return <div><Button type="link"
onClick={() => {
openModal('edit', record)
setTypecard('111')
setTypecard('compile')
setRecortd(record)
}}
>编辑</Button> <Popconfirm title='' onConfirm={() => { deldata(record.id) }}>
@ -1344,7 +1330,7 @@ const OperaTionalTable = (props) => {
return <div><Button type="link"
onClick={() => {
openModal('edit', record)
setTypecard('111')
setTypecard('compile')
setRecortd(record)
}}
>编辑</Button> <Popconfirm title='' onConfirm={() => { deldata(record.id) }}>
@ -1814,7 +1800,7 @@ const OperaTionalTable = (props) => {
return <div><Button type="link"
onClick={() => {
openModal('edit', record)
setTypecard('111')
setTypecard('compile')
setRecortd(record)
}}
>编辑</Button><Popconfirm title='' onConfirm={() => { deldatas(record.id) }}>
@ -1881,6 +1867,8 @@ const OperaTionalTable = (props) => {
label: <span onClick={() => {
{
setRewkeys('chuzu')
setDifferentiate('vehicle')
setGenre('出租车')
}
}}>出租车{activeKey === 'tab2'}</span>,
@ -1890,12 +1878,16 @@ const OperaTionalTable = (props) => {
label: <span onClick={() => {
{
setRewkeys('weihuo')
setDifferentiate('vehicle')
setGenre('危货')
}
}}>危险货运{activeKey === 'tab3'}</span>,
}, {
key: 'tab4',
label: <span onClick={() => {
setDifferentiate('business')
setRewkeys('yehu')
}}>业户{activeKey === 'tab4'}</span>,
@ -1974,7 +1966,7 @@ const OperaTionalTable = (props) => {
defaultCollapsed: false,
optionRender: (searchConfig, formProps, dom) => [
...dom.reverse(),
['tab2', 'tab3', 'tab4'].includes(activeKey) ? <Popconfirm title="确认导出?" onConfirm={() => { props.exports(rowSelected, counts) }}>
['tab2', 'tab3', 'tab4'].includes(activeKey) ? <Popconfirm title="确认导出?" onConfirm={() => { props.exports(rowSelected,differentiate,genre) }}>
<Button
>
导出

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

@ -79,16 +79,16 @@ const ProjectModal = (props) => {
onFinish={(values) => {
console.log(values)
if (rewkeys === 'road') {
if (typecard == '111') {
if (typecard == 'compile') {
setDelet(values)
const query = { ...values, type:rewkeys,projectId:records?.[0]?.value || '' }
const query = { ...values, type: rewkeys, projectId: records?.[0]?.value || '', done: values.done === 'true' ? true : false }
dispatch(putProject(query)).then((res) => {
})
return true
} else {
setDelet(values)
const query = { ...values, type:rewkeys }
const query = { ...values, type: rewkeys,done: values.done === 'true' ? true : false }
dispatch(putProject(query)).then((res) => {
})
@ -96,16 +96,16 @@ const ProjectModal = (props) => {
}
}
if (rewkeys === 'bridge') {
if (typecard == '111') {
if (typecard == 'compile') {
setDelet(values)
const query = { ...values, type:rewkeys,projectId:records?.[0]?.value || '' }
const query = { ...values, type: rewkeys, projectId: records?.[0]?.value || '',done: values.done === 'true' ? true : false }
dispatch(putProject(query)).then((res) => {
})
return true
} else {
setDelet(values)
const query = { ...values, type:rewkeys }
const query = { ...values, type: rewkeys,done: values.done === 'true' ? true : false }
dispatch(putProject(query)).then((res) => {
})
@ -113,9 +113,9 @@ const ProjectModal = (props) => {
}
}
}}
initialValues={recortd}
initialValues={{ ...recortd, done: recortd.done ? 'true' : 'false' }}
>
{typecard == '111' ?
{typecard == 'compile' ?
<ProForm.Group
>
<ProFormText
@ -176,7 +176,7 @@ const ProjectModal = (props) => {
// rules={[{ required: true, message: "必填" }]}
/>
<ProFormSelect
options={[
request={async () => [
{
value: 'true',
label: '是',
@ -185,7 +185,7 @@ const ProjectModal = (props) => {
label: '否',
},
]}
width="xs"
name='done'
label='是否已完成'
rules={[{ required: true, message: "必填" }]}

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

@ -51,22 +51,6 @@ const PublicTable = (props) => {
setModalRecord(null);
}
}
//批量导出
const exports = (ids, counts) => {
// console.log(user);
let reportIds = [];
if (ids.length)
reportIds = ids
else
reportIds = (counts || {}).ids || [];
superagent.post('/_report/http')
.send({ id: reportIds.map(i => Number(i)) }).end((err, res) => {
const resTextIs = res.text.split('/').pop()
window.open(
'/_api/' +
`attachments?src=files/${resTextIs}&filename=${encodeURIComponent(resTextIs)}&token=${user.token}`)
})
}
const deldata = (id) => { // 线路
const query = {
lineId: id
@ -424,7 +408,7 @@ const PublicTable = (props) => {
return <div><Button type="link"
onClick={() => {
openModal('edit', record)
setTypecard('111')
setTypecard('compile')
setRecortd(record)
}}
>编辑</Button><Popconfirm title='' onConfirm={() => { deldata(record.id) }}>
@ -1119,7 +1103,7 @@ const PublicTable = (props) => {
return <div><Button type="link"
onClick={() => {
openModal('edit', record)
setTypecard('111')
setTypecard('compile')
setRecortd(record)
}}
>编辑</Button><Popconfirm title='' onConfirm={() => { deldatas(record.id) }}>

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

@ -21,6 +21,8 @@ const TransporTationTable = (props) => {
const [recortd, setRecortd] = useState()
const [whichofits, setWhichofits] = useState('县')
const [delet, setDelet] = useState()
const [differentiate, setDifferentiate] = useState('road')
const [grade, setGrade] = useState('县')
const ref = useRef()
useEffect(() => { ref.current.reload() }, [whichofits, delet])
//打开弹窗
@ -60,22 +62,6 @@ const TransporTationTable = (props) => {
setDelet(res)
})
}
//批量导出
const exports = (ids, counts) => {
// console.log(user);
let reportIds = [];
if (ids.length)
reportIds = ids
else
reportIds = (counts || {}).ids || [];
superagent.post('/_report/http')
.send({ id: reportIds.map(i => Number(i)) }).end((err, res) => {
const resTextIs = res.text.split('/').pop()
window.open(
'/_api/' +
`attachments?src=files/${resTextIs}&filename=${encodeURIComponent(resTextIs)}&token=${user.token}`)
})
}
const columns = {
tab1: [
{
@ -1192,7 +1178,7 @@ const TransporTationTable = (props) => {
onClick={() => {
setRecortd(record)
openModal('edit', record)
setTypecard('111')
setTypecard('compile')
}}
>编辑</Button>
<Popconfirm title='是否确认删除' onConfirm={() => { deldata(record.id) }}><Button type="link"
@ -2348,7 +2334,7 @@ const TransporTationTable = (props) => {
return <div><Button type="link"
onClick={() => {
openModal('edit', record)
setTypecard('111')
setTypecard('compile')
setRecortd(record)
}}
@ -3505,7 +3491,7 @@ const TransporTationTable = (props) => {
return <div><Button type="link"
onClick={() => {
openModal('edit', record)
setTypecard('111')
setTypecard('compile')
setRecortd(record)
}}
@ -3692,7 +3678,7 @@ const TransporTationTable = (props) => {
return <div><Button type="link"
onClick={() => {
yilanModal('edit', record)
setTypecard('111')
setTypecard('compile')
setRecortd(record)
}}
>编辑</Button>
@ -3750,23 +3736,33 @@ const TransporTationTable = (props) => {
key: 'tab1',
label: <span onClick={() => {
setWhichofits('县')
setDifferentiate('road')
setGrade('县')
}}>县道{activeKey === 'tab1'}</span>,
},
{
key: 'tab2',
label: <span onClick={() => {
setWhichofits('乡')
setGrade('乡')
setDifferentiate('road')
}}>乡道{activeKey === 'tab2'}</span>,
},
{
key: 'tab3',
label: <span onClick={() => {
setWhichofits('村')
setDifferentiate('road')
setGrade('村')
}}>村道{activeKey === 'tab3'}</span>,
}, {
key: 'tab4',
label: <span onClick={() => {
setWhichofits('gongcheng')
setDifferentiate('project')
}}>工程一览{activeKey === 'tab4'}</span>,
},
],
@ -3836,7 +3832,6 @@ const TransporTationTable = (props) => {
setRowSelected([]);
const res = await dispatch(getProject(query));
setCounts(res.payload.data)
console.log(res)
return {
...res,
total: res.payload.data ? res.payload.data.count : 0
@ -3847,7 +3842,7 @@ const TransporTationTable = (props) => {
defaultCollapsed: false,
optionRender: (searchConfig, formProps, dom) => [
...dom.reverse(),
<Popconfirm title="确认导出?" onConfirm={() => { props.exports(rowSelected, counts) }}>
<Popconfirm title="确认导出?" onConfirm={() => { props.exports(rowSelected,grade,differentiate) }}>
<Button
>
导出

24
web/client/src/sections/fillion/containers/bridge.js

@ -12,21 +12,17 @@ const bridge = (props) => {
setData(props)
}, []);
//批量导出
const exports = (ids, counts) => {
// console.log(user);
let reportIds = [];
if (ids.length)
reportIds = ids
else
reportIds = (counts || {}).ids || [];
superagent.post('/_report/http')
.send({ id: reportIds.map(i => Number(i)) }).end((err, res) => {
const resTextIs = res.text.split('/').pop()
const exports = (ids, differentiate) => {
let idas = ids.toString()
if (differentiate == 'bridge') {
window.open(
'/_api/' +
`attachments?src=files/${resTextIs}&filename=${encodeURIComponent(resTextIs)}&token=${user.token}`)
})
'/_api/' + `data/export/?ids=${idas || ''}&exp=${differentiate}&token=${user.token}`)
}if(differentiate=='project'){
window.open(
'/_api/' + `data/export/?ids=${idas || ''}&exp=${differentiate}&token=${user.token}`)
}
}
return (
<> <BridgeTable data={data} exports={exports} />

17
web/client/src/sections/fillion/containers/highways.js

@ -12,21 +12,12 @@ const highways = (props) => {
setData(props)
}, []);
//批量导出
const exports = (ids,counts) => {
// console.log(user);
let reportIds = [];
if (ids.length)
reportIds = ids
else
reportIds = (counts || {}).ids || [];
superagent.post('/_report/http')
.send({ id: reportIds.map(i => Number(i)) }).end((err, res) => {
const resTextIs = res.text.split('/').pop()
console.log(counts);
let idas=ids.toString()
window.open(
'/_api/' +
`attachments?src=files/${resTextIs}&filename=${encodeURIComponent(resTextIs)}&token=${user.token}`)
})
'/_api/'+`data/export/?ids=${idas||''}&exp=${'overspeed'}&token=${user.token}`)
}
return (
<> <HighwaysTable data={data} exports={exports} />

16
web/client/src/sections/fillion/containers/infor.js

@ -26,19 +26,11 @@ const infor = (props) => {
// }
//批量导出
const exports = (ids,counts) => {
// console.log(user);
let reportIds = [];
if (ids.length)
reportIds = ids
else
reportIds = (counts || {}).ids || [];
superagent.post('/_report/http')
.send({ id: reportIds.map(i => Number(i)) }).end((err, res) => {
const resTextIs = res.text.split('/').pop()
console.log(counts);
let idas=ids.toString()
window.open(
'/_api/' +
`attachments?src=files/${resTextIs}&filename=${encodeURIComponent(resTextIs)}&token=${user.token}`)
})
'/_api/'+`data/export/?ids=${idas||''}&exp=${'overspeed'}&token=${user.token}`)
}
return (
<> <InForTable data={data} exports={exports} />

24
web/client/src/sections/fillion/containers/operational.js

@ -12,21 +12,17 @@ const operational = (props) => {
setData(props)
}, []);
//批量导出
const exports = (ids, counts) => {
// console.log(user);
let reportIds = [];
if (ids.length)
reportIds = ids
else
reportIds = (counts || {}).ids || [];
superagent.post('/_report/http')
.send({ id: reportIds.map(i => Number(i)) }).end((err, res) => {
const resTextIs = res.text.split('/').pop()
const exports = (ids,differentiate,genre) => {
let idas=ids.toString()
if(differentiate=='vehicle'){
window.open(
'/_api/' +
`attachments?src=files/${resTextIs}&filename=${encodeURIComponent(resTextIs)}&token=${user.token}`)
})
'/_api/'+`data/export/?ids=${idas||''}&exp=${differentiate}&municipalType=${genre}&token=${user.token}`)
}if(differentiate=='business'){
window.open(
'/_api/'+`data/export/?ids=${idas||''}&exp=${differentiate}&token=${user.token}`)
}
}
return (
<> <OperaTionalTable data={data} exports={exports} />

26
web/client/src/sections/fillion/containers/promotional.js

@ -13,24 +13,16 @@ const promotional = (props) => {
setData(props)
}, []);
// //批量导出
// const exports = (ids, counts) => {
// // console.log(user);
// let reportIds = [];
// if (ids.length)
// reportIds = ids
// else
// reportIds = (counts || {}).ids || [];
// superagent.post('/_report/http')
// .send({ id: reportIds.map(i => Number(i)) }).end((err, res) => {
// const resTextIs = res.text.split('/').pop()
// window.open(
// '/_api/' +
// `attachments?src=files/${resTextIs}&filename=${encodeURIComponent(resTextIs)}&token=${user.token}`)
// })
// }
//批量导出
const exports = (ids,counts) => {
console.log(counts);
let idas=ids.toString()
window.open(
'/_api/'+`data/export/?ids=${idas||''}&exp=${'overspeed'}&token=${user.token}`)
}
return (
<> <PromoTionalTable data={data} />
<> <PromoTionalTable data={data} exports={exports}/>
</>
)
}

16
web/client/src/sections/fillion/containers/public.js

@ -14,19 +14,11 @@ const Public = (props) => {
}, []);
//批量导出
const exports = (ids,counts) => {
// console.log(user);
let reportIds = [];
if (ids.length)
reportIds = ids
else
reportIds = (counts || {}).ids || [];
superagent.post('/_report/http')
.send({ id: reportIds.map(i => Number(i)) }).end((err, res) => {
const resTextIs = res.text.split('/').pop()
console.log(counts);
let idas=ids.toString()
window.open(
'/_api/' +
`attachments?src=files/${resTextIs}&filename=${encodeURIComponent(resTextIs)}&token=${user.token}`)
})
'/_api/'+`data/export/?ids=${idas||''}&exp=${'overspeed'}&token=${user.token}`)
}
return (
<> <PublicTable data={data} exports={exports} />

24
web/client/src/sections/fillion/containers/transportation.js

@ -13,20 +13,18 @@ const transportation = (props) => {
setData(props)
}, []);
//批量导出
const exports = (ids, counts) => {
// console.log(user);
let reportIds = [];
if (ids.length)
reportIds = ids
else
reportIds = (counts || {}).ids || [];
superagent.post('/_report/http')
.send({ id: reportIds.map(i => Number(i)) }).end((err, res) => {
const resTextIs = res.text.split('/').pop()
const exports = (ids,grade,differentiate) => {
console.log(differentiate);
let idas=ids.toString()
if(differentiate=='road'){
window.open(
'/_api/' +
`attachments?src=files/${resTextIs}&filename=${encodeURIComponent(resTextIs)}&token=${user.token}`)
})
'/_api/'+`data/export/?ids=${idas||''}&exp=${differentiate}&roadLevel=${grade||''}&token=${user.token}`)
}if(differentiate=='project'){
window.open(
'/_api/'+`data/export/?ids=${idas||''}&exp=${differentiate}&token=${user.token}`)
}
}
return (
<> <TransporTationTable data={data} exports={exports} />

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

@ -121,6 +121,7 @@ const Build = (props) => {
// }
// ]
console.log(localStorage.getItem("qndmn"),'七牛')
console.log(xuandata,"宣传")
return (
<div className='bgbuild'>
<div className='bgbuild-left'>
@ -200,7 +201,7 @@ const Build = (props) => {
}} customize={true}>
<div className='build-right-top'>
{/* <img src='/assets/images/quanju/xuanchuanlan.jpg'></img> */}
<video src={xuandata && xuandata.length?`${localStorage.getItem("qndmn")}/${xuandata[0].video!==null&&xuandata[0].video?xuandata[0].video[0]:""}`:"#"} autoPlay="autoplay" loop></video>
<video src={xuandata&&xuandata!==null&&xuandata.length!==0?`${localStorage.getItem("qndmn")}/${xuandata[0].video!==null&&xuandata[0].video?xuandata[0].video[0]:""}`:"#"} autoPlay="autoplay" loop></video>
<h2>全面建设好农村公路切实发挥先行官作用</h2>
</div>
</Module>

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

@ -5,8 +5,6 @@ import Module from '../../public/module'
import { getBusTierList } from '../../../actions/example'
import './style.less'
const Left = (props) => {
const [treeData, setTreeData] = useState([])
const [treeDataList, setTreeDataList] = useState([])
@ -29,12 +27,12 @@ const Left = (props) => {
const onChange = (e) => {
const { value } = e.target;
let keys = []
const newExpandedKeys = treeDataList.filter(e => e.key.match(value))
let titles = []
const newExpandedKeys = treeDataList.filter(e => e.title != null && e.title.match(value))
newExpandedKeys.forEach(e => {
keys.push(e.key)
titles.push(e.title)
})
setExpandedKeys(keys);
setExpandedKeys(titles);
setSearchValue(value);
setAutoExpandParent(true);
};
@ -78,11 +76,13 @@ const Left = (props) => {
let busTierOpen = []
let dataList = []
let busTierNewList = []
if (busTier && busTier.data && busTier.data.length > 0) {
busTierNewList.push(busTier && busTier.data && busTier.data[0])
}
if (busTierNewList.length > 0) {
busTierNewList.forEach((e, index) => {
// Math.ceil(Math.random() * 100);
// if (busTier && busTier.data && busTier.data.length > 0) {
// busTierNewList.push(busTier && busTier.data && busTier.data[0])
// }
// if (busTierNewList.length > 0) {
// }
busTier && busTier.data && busTier.data.forEach((e, index) => {
if (index == 0) {
busTierOpen.push(e.name)
}
@ -91,18 +91,19 @@ const Left = (props) => {
title: e.name,
children: e.child.map(s => {
return {
key: s.name,
key: s.name == '--' || s.name == null ? Math.ceil(Math.random() * 100) : s.name,
title: s.name,
children: s.child.map(i => {
return {
key: i.name,
key: i.name == '--' || i.name == null ? Math.ceil(Math.random() * 100) : i.name,
title: i.name,
children: i.child.map(x => {
return {
key: x.name,
title: x.name,
key: x.name == '--' || x.name == null ? Math.ceil(Math.random() * 100) : x.name,
title: x.name == null ? '--' : x.name,
}
})
}
})
}
@ -110,7 +111,7 @@ const Left = (props) => {
})
})
})
busTierNewList.forEach(e => {
busTier && busTier.data && busTier.data.forEach(e => {
e.child.forEach(i => {
i.child.forEach(s => {
s.child.forEach(x => {
@ -122,7 +123,6 @@ const Left = (props) => {
})
})
})
}
setTreeData(busTierList)
setExpandedKeys(busTierOpen)
setTreeDataList(dataList)
@ -132,7 +132,7 @@ const Left = (props) => {
<Module style={style} customize={true} title={"公交车辆信息"}>
<div style={{ width: '90%', height: '96%', margin: '2% 5%', overflow: 'hidden' }}>
<div style={{ border: '1px solid rgba(10, 114, 255, 1)', backgroundColor: 'rgba(10, 114, 255, 0.1)' }}>
<img src='assets/images/quanju/search.png' style={{ width: '5%', margin: '0 1.5% 1% 3.5%' }} />
<img src='/assets/images/quanju/search.png' style={{ width: '5%', margin: '0 1.5% 1% 3.5%' }} />
<Input
style={{
width: '90%',

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

@ -37,7 +37,7 @@ const Right = () => {
dataLists.map((data, index) => (
<div key={index} style={{width:'100%',height:'40%'}}>
<div className='busInformation'>
<img src='assets/images/quanju/theBus.png' style={{ width: '15%', display:'block',float:'left' }} />
<img src='/assets/images/quanju/theBus.png' style={{ width: '15%', display:'block',float:'left' }} />
<span>
<h3>所属线路</h3>
<h4>{data.route}</h4>
@ -49,15 +49,15 @@ const Right = () => {
<div style={{
width:'98%',margin:'1% 1%',height:152,display:'block',float:'left',boxShadow: '0px 1px 5px 0px #1C60FE',
border:'1px solid #1C60FE'
}}><img src='assets/images/quanju/busVideo.png' style={{width:'100%',height:'100%'}} /></div>
}}><img src='/assets/images/quanju/busVideo.png' style={{width:'100%',height:'100%'}} /></div>
<div style={{
width:'48%',margin:'1% 1%',height:100,display:'block',float:'left',boxShadow: '0px 1px 5px 0px #1C60FE',
border:'1px solid #1C60FE'
}}><img src='assets/images/quanju/busVideo.png' style={{width:'100%',height:'100%'}} /></div>
}}><img src='/assets/images/quanju/busVideo.png' style={{width:'100%',height:'100%'}} /></div>
<div style={{
width:'48%',margin:'1% 1%',height:100,display:'block',float:'left',boxShadow: '0px 1px 5px 0px #1C60FE',
border:'1px solid #1C60FE'
}}><img src='assets/images/quanju/busVideo.png' style={{width:'100%',height:'100%'}} /></div>
}}><img src='/assets/images/quanju/busVideo.png' style={{width:'100%',height:'100%'}} /></div>
</div>
</div>
))

Loading…
Cancel
Save