diff --git a/api/app/lib/models/project.js b/api/app/lib/models/project.js
index 8ae65cf0..89138792 100644
--- a/api/app/lib/models/project.js
+++ b/api/app/lib/models/project.js
@@ -141,7 +141,16 @@ module.exports = dc => {
primaryKey: false,
field: "qutity_unit",
autoIncrement: false
- }
+ },
+ roadCodeStart: {
+ type: DataTypes.STRING,
+ allowNull: true,
+ defaultValue: null,
+ comment: "开始的路段编码",
+ primaryKey: false,
+ field: "road_code_start",
+ autoIncrement: false
+ }
}, {
tableName: "project",
comment: "",
diff --git a/scripts/1.3.1/schema/3.alert_project.sql b/scripts/1.3.1/schema/3.alert_project.sql
new file mode 100644
index 00000000..73a77329
--- /dev/null
+++ b/scripts/1.3.1/schema/3.alert_project.sql
@@ -0,0 +1,2 @@
+alter table project
+ add road_code_start varchar(1024);
diff --git a/web/client/src/sections/fillion/actions/infor.js b/web/client/src/sections/fillion/actions/infor.js
index 06afa907..f35bd2a5 100644
--- a/web/client/src/sections/fillion/actions/infor.js
+++ b/web/client/src/sections/fillion/actions/infor.js
@@ -142,7 +142,7 @@ export function getProject(query) {
actionType: 'GET_PROJECT',
url: ApiTable.getProject,
msg: { error: '获取工程信息失败' },
-
+ reducer: { name: 'projectList' }
});
}
export function putProject(query) {
diff --git a/web/client/src/sections/fillion/components/patrolTable.js b/web/client/src/sections/fillion/components/patrolTable.js
index be4f401b..36449bd5 100644
--- a/web/client/src/sections/fillion/components/patrolTable.js
+++ b/web/client/src/sections/fillion/components/patrolTable.js
@@ -95,7 +95,6 @@ const DetailForm = (props) => {
];
const changeBoolean = (bool) => {
- //console.log('bool', bool)
return bool ? '无异常' : '有异常'
}
const renderContent = (data) => {
@@ -616,7 +615,6 @@ const PatrolNameList = (props) => {
}
}
- // console.log('selectedKeys', selectedKeys, selected, selectedNodes, node)
};
@@ -816,14 +814,12 @@ const PatrolTable = (props) => {
}
}
useEffect(() => {
- console.log(anspectionNotificationPhoneList, '数据');
let phoneList = []
if (anspectionNotificationPhoneList && anspectionNotificationPhoneList.length) {
phoneList = anspectionNotificationPhoneList.map(e => {
return e.phone
})
}
- console.log(phoneList, '789789789789');
setPhoneList(phoneList)
}, [anspectionNotificationPhoneList])
@@ -834,7 +830,6 @@ const PatrolTable = (props) => {
const handleOk = () => {
// setIsModalOpen(false);
form.validateFields().then(values => {
- console.log(values, '----------');
dispatch(addAnspectionNotificationPhone(values)).then(res => {
if (res.success) {
setIsModalOpen(false);
@@ -864,7 +859,10 @@ const PatrolTable = (props) => {
sm: { span: 20, offset: 4 },
},
};
+ let routerUrl = window.location.href
+ routerUrl = routerUrl.substring(routerUrl.length - 14)
+ console.log(routerUrl, '=========');
return (
@@ -910,7 +908,10 @@ const PatrolTable = (props) => {
: ''
}
-
+ {
+ routerUrl == 'patrol_anomaly' ? : ''
+ }
+
{/* */}
: ''
@@ -926,7 +927,7 @@ const PatrolTable = (props) => {
diff --git a/web/client/src/sections/fillion/components/project/project.js b/web/client/src/sections/fillion/components/project/project.js
index c6caac02..34fa4e80 100644
--- a/web/client/src/sections/fillion/components/project/project.js
+++ b/web/client/src/sections/fillion/components/project/project.js
@@ -15,7 +15,8 @@ const data = {
"designUnit": "设计单位",
"constructionControlUnit": "监理单位",
//"startTime": "开工时间",
- //"remark": "备注"
+ //"remark": "备注",
+ "roadCodeStart": "起点路段编码",
}
const ProjectModal = (props) => {
const { visible, onVisibleChange, typecard, rewkeys, recortd, dispatch, setRecortd, setDelet, getData } = props
@@ -214,7 +215,7 @@ const ProjectModal = (props) => {
)
}
-function mapStateToProps(state) {
+function mapStateToProps (state) {
const { depMessage } = state;
const pakData = (dep) => {
return dep.map((d) => {
diff --git a/web/client/src/sections/quanju/containers/footer/build/Rightcenter.js b/web/client/src/sections/quanju/containers/footer/build/Rightcenter.js
index 8c62e979..7cc464d5 100644
--- a/web/client/src/sections/quanju/containers/footer/build/Rightcenter.js
+++ b/web/client/src/sections/quanju/containers/footer/build/Rightcenter.js
@@ -27,7 +27,6 @@ const THIRD = "linear-gradient(360deg, rgba(148, 148, 255, 0.1) 0%, rgba(148, 14
const OTHER = "linear-gradient(360deg, rgba(28, 96, 253, 0) 0%, rgba(28, 96, 253, 0.2) 100%)"
let TOTALS = data?.map(({ name, total }, index) => {
let max = Math.max(...data.map(item=>item.total))
- // console.log(data.map(item=>item.total),'好朋友吗')
return {
name,
value: total,
@@ -38,7 +37,6 @@ let new_TOTALS = TOTALS && TOTALS.length > 10 ? TOTALS.slice(0, 10) : TOTALS
function Cell(props) {
const { name, rank, value, percent, style = {},cebg } = props
let bg = RNAKS[rank] || OTHER
- // console.log(percent,'百分比')
return {
- const { dispatch } = props
+ const { dispatch, projectList } = props
let data1 = [
{ name: "县", value: 207 },
{ name: "乡", value: 729 },
@@ -26,8 +28,6 @@ const Build = (props) => {
// {name: '二级公路', value: 17},
// {name: '三级公路', value: 17},
// {name: '四级公路', value: 30},
-
-
// ]
const [buildingnumber, setbuildingnumber] = useState(0)
const [data, setdata] = useState([])
@@ -43,22 +43,17 @@ const Build = (props) => {
const requestbuildingnumber = async () => {
const res = await dispatch(getdaolutongji());
let alltype = Object.keys(res.payload.data?.roadType || {}).map((item) => ({ name: item, value: Number(keepThreeNum(res.payload.data.roadType[item])) }))
- // console.log(alltype,'打他啊')
setdata(alltype.filter(item => item.name === '县' || item.name === "乡" || item.name === '村'))
setbuildingnumber(res.payload.data)
- console.log(res.payload.data, '哈哈哈')
-
}
//获取宣传栏数据
const requestxuanchuanlan = async () => {
const res = await dispatch(getxuanchuan());
-
// setdata(alltype.filter(item=>item.name!=='null'))
setxuandata(res.payload.data || [])
- console.log(res.payload.data, '宣传栏数据')
-
}
+
let t1 = Object.values(buildingnumber?.townRoad || {})
let totalgongli = t1.length !== 0 ? t1.reduce((x, y) => x + y.mileage, 0) : 0 //乡镇道路占比总公里数
@@ -86,7 +81,6 @@ const Build = (props) => {
return b.number - a.number
})
list = list.filter(item => item.name !== "其他")
- // console.log(list,'红红火')
//道路等级数据
let alldengji = Object.keys(buildingnumber?.roadLevel || {}).map((item) => ({ name: item, value: Number(keepThreeNum(buildingnumber.roadLevel[item])) }))
@@ -95,10 +89,8 @@ const Build = (props) => {
onlineproject = onlineproject.sort((a, b) => {
return b.total - a.total
})
- //console.log('onlineproject', onlineproject)
let sunonlineproject = onlineproject?.reduce((x, y) => x + y.total, 0)
let buildingCount = buildingnumber?.buildingCount
- //console.log('projectAll', projectAll)
//let projectAll=
let safetyData = alldengji?.filter(item => item.name === '一级公路' || item.name === '二级公路' || item.name === '三级公路' || item.name === '四级公路' || item.name === '等外公路')
let sundata = data?.reduce((x, y) => x + y.value, 0)
@@ -107,10 +99,13 @@ const Build = (props) => {
useEffect(() => {
requestbuildingnumber();
requestxuanchuanlan()
+ dispatch(getProject())
}, [])
+
useEffect(() => {
lunbo.current.goTo(lunboindex)
}, [lunboindex])
+
const rendercontent = () => {
return (
{list.map(({ name, number, gongli }, index) =>
@@ -128,8 +123,6 @@ const Build = (props) => {
// "enable": true
// }
// ]
- // console.log(localStorage.getItem("qndmn"), '七牛')
- // console.log(xuandata, "宣传")
let videos = []
if (xuandata && xuandata.length) {
@@ -143,7 +136,7 @@ const Build = (props) => {
}
}
}
- console.log(lunboindex)
+
return (
<>
@@ -174,35 +167,75 @@ const Build = (props) => {
:
}
-
- {totalcount && totalcount !== 0 ?
-
-
-
-
-
公路公里数/公里
-
{keepThreeNum(totalgongli)}
+ {
+ totalcount && totalcount !== 0 ?
+
+
+
+
+
+ 公路公里数/公里
+ {keepThreeNum(totalgongli)}
+
+
+
+
+
+ 公路总数/条
+ {totalcount || 0}
+
+
+
+ 乡镇名称
+ 公路数量/条
+ 公里
+
+
-
-
-
-
公路总数/条
-
{totalcount || 0}
+ :
+ }
+ */}
+
+ {
+ totalcount && totalcount !== 0 ?
+
+
+
+ 项目名称
+ 项目规模(公里)
+ 项目投资(万元)
+
+
+ {
+ projectList.map((p, index) => {
+ return (
+
+ {p.entryName}
+ {p.projectMileage}
+ {p.investment}
+
+ )
+ })
+ }
+
+ }
+ containerStyle={{ position: "relative", height: "85%", }}
+ divHeight={"100%"} divId={"chart"}
+ />
-
-
- 乡镇名称
- 公路数量/条
- 公里
-
-
-
:
}
+ :
+ }
{
{/* {
videos.map((v, i) => {
- console.log('first')
return i == lunboMsg.current.index ?