@@ -216,14 +217,14 @@ const DetailList = (props) => {
key: 'projectType',
dataIndex: 'projectType',
align: 'center',
- render: (text, record) => {
- return record.projectType?.length > 0 ? reportTypeText(text) : (record.codeRoad && record.codeRoad.length > 0)
- ? record.codeRoad[0] === 'X'
- ? '县道'
- : record.codeRoad[0] === 'Y'
- ? '乡道'
- : '村道'
- : ''
+ render: (text, record) => {
+ return record.projectType?.length > 0 ? reportTypeText(text) : (record.codeRoad && record.codeRoad.length > 0)
+ ? record.codeRoad[0] === 'X'
+ ? '县道'
+ : record.codeRoad[0] === 'Y'
+ ? '乡道'
+ : '村道'
+ : ''
}
}, {
title: '所属道路',
@@ -648,7 +649,7 @@ const MaintenanceTable = (props) => {
);
};
-function mapStateToProps (state) {
+function mapStateToProps(state) {
const { auth, depMessage, userList, reportList, reportDetail, depUser, global, allDepUsers } = state;
const pakData = (dep) => {
return dep.map((d) => {
diff --git a/web/client/src/sections/fillion/components/patrolTable.js b/web/client/src/sections/fillion/components/patrolTable.js
index 36449bd5..efbb9d50 100644
--- a/web/client/src/sections/fillion/components/patrolTable.js
+++ b/web/client/src/sections/fillion/components/patrolTable.js
@@ -45,7 +45,7 @@ const DetailForm = (props) => {
const keyList = [
// { key: '编号', name: 'id' },
// isPatrol ?'巡查管理详情' :isRoad ? '建设上报详情' : '异常反馈详情'
- { key: '工程类型', name: 'projectType', skip: isPatrol },
+ { key: '工程类型', name: 'projectType', skip: !isPatrol },
{ key: '反馈类型', name: 'projectType', skip: !isAnomaly },
{ key: '工程名称', name: 'projectName', skip: !isRoad },
{ key: '所在路段', name: 'road', skip: isPatrol },
@@ -53,6 +53,7 @@ const DetailForm = (props) => {
{ key: '巡查内容', name: 'content', skip: isPatrol },
{ key: '路线代码', name: 'codeRoad', skip: !isAnomaly && isPatrol },
{ key: '现场照片', name: 'scenePic', skip: isPatrol },
+ { key: '处理意见', name: 'handleOpinions', skip: !isAnomaly },
{ key: '处理详情', name: 'handleContent', skip: !isAnomaly },
{ key: '处理图片', name: 'handlePic', skip: !isAnomaly },
{ key: '处理人', name: 'performerName', skip: !isAnomaly },
@@ -89,6 +90,7 @@ const DetailForm = (props) => {
{ key: '巡查内容', name: 'content' },
{ key: '路线代码', name: 'codeRoad', skip: !isAnomaly && !isPatrol },
{ key: '现场照片', name: 'scenePic' },
+ { key: '处理意见', name: 'handleOpinions', skip: !isAnomaly },
{ key: '处理详情', name: 'handleContent', skip: !isAnomaly },
{ key: '处理图片', name: 'handlePic', skip: !isAnomaly },
{ key: '处理人', name: 'performerName', skip: !isAnomaly }
@@ -112,7 +114,7 @@ const DetailForm = (props) => {
{obj.key}
{
- obj.name != 'scenePic' && obj.name != 'roadSectionStart' && obj.name != 'videoUrl' && obj.name.indexOf('conserve') == -1 ?
+ obj.name != 'handlePic' && obj.name != 'scenePic' && obj.name != 'roadSectionStart' && obj.name != 'videoUrl' && obj.name.indexOf('conserve') == -1 ?
{
const [differentiate, setDifferentiate] = useState('road')
const [grade, setGrade] = useState('县')
const [departmentInfo, setDepartment] = useState('')
+ const [roadData, setRoadData] = useState([])//道路数据
const [editAble, setEditAble] = useState(user?.username !== 'SuperAdmin' && user?.userResources?.filter(i => i.resourceId === 'ROADMANAGE')[0].isshow === "true" ? true : '')
const ref = useRef()
useEffect(() => { ref.current.reload() }, [whichofits, delet])
@@ -3761,6 +3762,7 @@ const TransporTationTable = (props) => {
setWhichofits('县')
setDifferentiate('road')
setGrade('县')
+ setRoadData([])
}}>县道{activeKey === 'tab1'},
},
{
@@ -3769,6 +3771,7 @@ const TransporTationTable = (props) => {
setWhichofits('乡')
setGrade('乡')
setDifferentiate('road')
+ setRoadData([])
}}>乡道{activeKey === 'tab2'},
},
@@ -3778,6 +3781,7 @@ const TransporTationTable = (props) => {
setWhichofits('村')
setDifferentiate('road')
setGrade('村')
+ setRoadData([])
}}>村道{activeKey === 'tab3'},
},
@@ -3819,8 +3823,8 @@ const TransporTationTable = (props) => {
}
setRowSelected([]);
const res = await dispatch(getRoadway(query));
- // console.log(res)
-
+ const uniqueArray = [...new Set(res.payload.data?.map(item => item.routeName))];
+ setRoadData(uniqueArray)
setCounts(departmentInfo ? res.payload.data.filter((item) => {
return item.townshipCode === departmentInfo.areaCode
}) : res.payload.data)
@@ -3836,6 +3840,8 @@ const TransporTationTable = (props) => {
}
setRowSelected([]);
const res = await dispatch(getRoadway(query));
+ const uniqueArray = [...new Set(res.payload.data?.map(item => item.routeName))];
+ setRoadData(uniqueArray)
setCounts(departmentInfo ? res.payload.data.filter((item) => {
return item.townshipCode === departmentInfo.areaCode
}) : res.payload.data)
@@ -3849,7 +3855,9 @@ const TransporTationTable = (props) => {
road: sitename
}
setRowSelected([]);
- const res = await dispatch(getRoadway(query));
+ const res = await dispatch(getRoadway(query))
+ const uniqueArray = [...new Set(res.payload.data?.map(item => item.routeName))];
+ setRoadData(uniqueArray)
setCounts(departmentInfo ? res.payload.data.filter((item) => {
return item.townshipCode === departmentInfo.areaCode
}) : res.payload.data)
@@ -3864,8 +3872,8 @@ const TransporTationTable = (props) => {
entryName: sitename
}
setRowSelected([]);
- const res = await dispatch(getProject(query));
- setCounts(res.payload.data)
+ const res = await dispatch(getProject(query))
+ console.log('56666666', res)
return {
...res,
total: res.payload.data ? res.payload.data.count : 0
@@ -3875,6 +3883,7 @@ const TransporTationTable = (props) => {
search={{
defaultCollapsed: false,
optionRender: (searchConfig, formProps, dom) => [
+
{`共有${whichofits}道:${roadData.length || 0}条`},
...dom.reverse(),
{ props.exports(rowSelected, grade, differentiate) }}
disabled={user?.username !== 'SuperAdmin' && user?.userResources?.filter(i => i.resourceId === 'ROADMANAGE')[0].isshow === "true" ? true : ''}
@@ -3884,7 +3893,7 @@ const TransporTationTable = (props) => {
>
导出
-
+ ,
],
}}
>
diff --git a/web/client/src/sections/fillion/containers/maintenanceSpotCheck.js b/web/client/src/sections/fillion/containers/maintenanceSpotCheck.js
index 4fcbd1aa..28d119a7 100644
--- a/web/client/src/sections/fillion/containers/maintenanceSpotCheck.js
+++ b/web/client/src/sections/fillion/containers/maintenanceSpotCheck.js
@@ -61,6 +61,7 @@ const DetailForm = (props) => {
{ key: '修复端头(块)', name: 'endHeadRepair' },
{ key: '其他养护内容', name: 'otherDescription' },
{ key: '养护前图片', name: 'conserveBeforePic' },
+ { key: '养护中图片', name: 'conserveUnderwayPic' },
{ key: '养护后图片', name: 'conserveAfterPic' },
{ key: '上报视频', name: 'videoUrl' },
diff --git a/web/client/src/sections/quanju/containers/footer/build/Leftbottom.js b/web/client/src/sections/quanju/containers/footer/build/Leftbottom.js
index ceb389b5..c2d5009f 100644
--- a/web/client/src/sections/quanju/containers/footer/build/Leftbottom.js
+++ b/web/client/src/sections/quanju/containers/footer/build/Leftbottom.js
@@ -17,9 +17,15 @@ function Leftbottom(props) {
"rgba(4,251,240,0.5)",
]
const safetyData = [
- {name: '县道', value: 72},
- {name: '乡道', value: 17},
- {name: '村道', value: 4},
+ { name: '县道', value: 72 },
+ { name: '乡道', value: 17 },
+ { name: '村道', value: 4 },
+ ]
+ //写死数据
+ const dataNo = [
+ { name: '县', value: 207.8 },
+ { name: '乡', value: 680.5 },
+ { name: '村', value: 1800.7 },
]
const chartTitle = '道路总公里';
const title = '基础设施安全监测版块';
@@ -34,7 +40,7 @@ function Leftbottom(props) {
value: d.value
})
})
-
+
// let safetyOption = {
// tooltip: {
// show: true,
@@ -63,7 +69,7 @@ function Leftbottom(props) {
// // fontSize: 12,
// // fontWeight:500,
// // color:'#E9F7FF',
-
+
// // }
// // },
// legend: [
@@ -141,60 +147,60 @@ function Leftbottom(props) {
},
formatter: (values) => `${values.seriesName}
${values.marker} ${values.name}
${values.value}公里`,
},
-// title: {
-// text:total,//主标题文本
-// left:'20%',
-// // top:'35%',
-// subtext:chartTitle,//副标题文本
-// textStyle:{
-// fontFamily : "YouSheBiaoTiHei",
-// fontSize: 20,
-// color:'#FFFFFF',
-// marginLeft:'20%',
-// align:'center'
-// },
-// subtextStyle:{
-// fontFamily : "PingFangSC-Medium PingFang SC",
-// fontSize: 12,
-// fontWeight:500,
-// color:'#E9F7FF',
-// align:'center'
+ // title: {
+ // text:total,//主标题文本
+ // left:'20%',
+ // // top:'35%',
+ // subtext:chartTitle,//副标题文本
+ // textStyle:{
+ // fontFamily : "YouSheBiaoTiHei",
+ // fontSize: 20,
+ // color:'#FFFFFF',
+ // marginLeft:'20%',
+ // align:'center'
+ // },
+ // subtextStyle:{
+ // fontFamily : "PingFangSC-Medium PingFang SC",
+ // fontSize: 12,
+ // fontWeight:500,
+ // color:'#E9F7FF',
+ // align:'center'
-// }
-// },
-legend: {
- orient: "vertical",
- itemWidth: 10,
- itemHeight: 10,
- // right: '30%',
- right: '10%',
- top: 'center',
- align: 'left',
- data: name,
- formatter: (name) => {
- for (let i = 0; i < option.series[1].data.length; i += 1) {
- if (name === option.series[1].data[i].name) {
- let arr = [`{a|${name}}`, `{b|${option.series[1].data[i].value}}`]
- return arr.join('\t');
- }
- }
- },
- textStyle: {
- rich: {
- a: {
- color: '#E9F7FF',
- fontSize: 14,
- padding:[0,10]
- },
- b: {
- fontSize: 16,
- fontFamily: 'YouSheBiaoTiHei',
- color: '#fff',
- padding:[0,0,0,12]
+ // }
+ // },
+ legend: {
+ orient: "vertical",
+ itemWidth: 10,
+ itemHeight: 10,
+ // right: '30%',
+ right: '10%',
+ top: 'center',
+ align: 'left',
+ data: name,
+ formatter: (name) => {
+ for (let i = 0; i < option.series[1].data.length; i += 1) {
+ if (name === option.series[1].data[i].name) {
+ let arr = [`{a|${name}}`, `{b|${option.series[1].data[i].value}}`]
+ return arr.join('\t');
+ }
+ }
},
- }
- }
-},
+ textStyle: {
+ rich: {
+ a: {
+ color: '#E9F7FF',
+ fontSize: 14,
+ padding: [0, 10]
+ },
+ b: {
+ fontSize: 16,
+ fontFamily: 'YouSheBiaoTiHei',
+ color: '#fff',
+ padding: [0, 0, 0, 12]
+ },
+ }
+ }
+ },
grid: {
left: '10%'
},
@@ -229,7 +235,8 @@ legend: {
label: {
show: false
},
- data: data,
+ data: dataNo,
+ // data: data,
},
],
};
@@ -262,23 +269,24 @@ legend: {
// highlightPie();
// }
// let changePieInterval = setInterval(selectPie, 1000);
-
+
myChart.onChartReady = (instance) => {
chartRef.current.safetyChart = instance;
}
myChart.setOption(option);
- return ()=>{
+ return () => {
// clearInterval(changePieInterval)
}
-}, [data]);
+ }, [data]);
return (
-
公里
-
-
{total}
+
公里
+
+
2689.00
+ {/* {total}
*/}
道路总公里
-
+
diff --git a/web/client/src/sections/quanju/containers/footer/build/Rightbottom.js b/web/client/src/sections/quanju/containers/footer/build/Rightbottom.js
index fdc5d7ea..f057bbc5 100644
--- a/web/client/src/sections/quanju/containers/footer/build/Rightbottom.js
+++ b/web/client/src/sections/quanju/containers/footer/build/Rightbottom.js
@@ -4,7 +4,7 @@ import { Col, Progress, Row } from 'antd';
import React, { useEffect, useRef, useState } from 'react';
// import ReactEcharts from 'echarts-for-react';
import * as echarts from 'echarts';
-function Rightbottom (props) {
+function Rightbottom(props) {
const { width, height, total, data, text } = props
const chartRef = useRef(null);
const [shuzu, setShuzu] = useState()
@@ -208,16 +208,17 @@ function Rightbottom (props) {
return (
-
-
-
- ► 三级及以上
-
-
{sanji[2] + sanji[3] + sanji[4]}
-
+
+
+
+ ► 三级及以上
+
+
{sanji[2] + sanji[3] + sanji[4]}
+
{/*
段 */}
-
{total || 0}
+ {/* {total || 0}
*/}
+ 2689.00
道路总公里
{/*
@@ -226,16 +227,16 @@ function Rightbottom (props) {
-
-
+
+
-
-
-
-
► 四级
+
+
+
+ ► 四级
+
+
{siji[0] + siji[1]}
-
{siji[0] + siji[1]}
-
);
diff --git a/web/client/src/sections/quanju/containers/footer/build/index.js b/web/client/src/sections/quanju/containers/footer/build/index.js
index 54a0ef62..42bb3d79 100644
--- a/web/client/src/sections/quanju/containers/footer/build/index.js
+++ b/web/client/src/sections/quanju/containers/footer/build/index.js
@@ -246,6 +246,7 @@ const Build = (props) => {
width='100%'
height='100%'
text='道路总公里'
+ //total={keepThreeNum(sundata)}
total={keepThreeNum(sundata)}
// colorList={colorList}
// underColorList={underColorList}
diff --git a/web/client/src/sections/quanju/containers/footer/leadership/centerleft/daolu.js b/web/client/src/sections/quanju/containers/footer/leadership/centerleft/daolu.js
index d4cf5fdd..8ef8046d 100644
--- a/web/client/src/sections/quanju/containers/footer/leadership/centerleft/daolu.js
+++ b/web/client/src/sections/quanju/containers/footer/leadership/centerleft/daolu.js
@@ -104,8 +104,9 @@ const Right = (props) => {