From 06851ec4130072784bf22903e2746e962ff89239 Mon Sep 17 00:00:00 2001 From: iris_cx Date: Fri, 4 Aug 2023 14:38:38 +0000 Subject: [PATCH 1/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'scripts/1.3.1/data/1?= =?UTF-8?q?=5Finsert=5Freport=5Fdata/Dockerfilenew'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/1.3.1/data/1_insert_report_data/Dockerfilenew | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/1.3.1/data/1_insert_report_data/Dockerfilenew b/scripts/1.3.1/data/1_insert_report_data/Dockerfilenew index 4dbd4baf..281f464c 100644 --- a/scripts/1.3.1/data/1_insert_report_data/Dockerfilenew +++ b/scripts/1.3.1/data/1_insert_report_data/Dockerfilenew @@ -1,5 +1,5 @@ FROM repository.anxinyun.cn/base-images/nodejs12:20.10.12.2 -COPY . /var/app +COPY ./scripts/1.3.1/data/1_insert_report_data /var/app WORKDIR /var/app RUN npm cache clean -f RUN rm -rf package-lock.json From ea1ec2a8448bf2a2b2f6ff2b5447cb940296d19b Mon Sep 17 00:00:00 2001 From: zhaobing Date: Fri, 4 Aug 2023 22:38:43 +0800 Subject: [PATCH 2/6] =?UTF-8?q?feat=EF=BC=9Afix=20bugs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/app/lib/controllers/data/vehicle.js | 4 ++-- .../src/sections/fillion/components/highwaysTable.js | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/api/app/lib/controllers/data/vehicle.js b/api/app/lib/controllers/data/vehicle.js index 59aa5408..8dd38fe0 100644 --- a/api/app/lib/controllers/data/vehicle.js +++ b/api/app/lib/controllers/data/vehicle.js @@ -7,8 +7,8 @@ async function get(ctx) { const { type } = ctx.request.body; const { name } = ctx.query; const sequelize = ctx.fs.dc.orm - const sqlStr = `select sum(p.road_marking) 标线,sum(p.roadside_ditch) 边沟, - sum(p.guardrail) 护栏, sum(p.roadside_trees) 行道树,sum(p.wrong_lane) 错车道 + const sqlStr = `select sum(p.road_marking) "标线(米)",sum(p.roadside_ditch) "边沟（米）", + sum(p.guardrail) "护栏（米）", sum(p.roadside_trees) "行道树（棵）",sum(p.wrong_lane) "错车道（个）" from ( select t.*,row_number() over (partition by t.luduan order by t.time desc ) rn from ( select code_road||'-'||road_section_start||'-'||road_section_end luduan, diff --git a/web/client/src/sections/fillion/components/highwaysTable.js b/web/client/src/sections/fillion/components/highwaysTable.js index 248e503c..af03ffd0 100644 --- a/web/client/src/sections/fillion/components/highwaysTable.js +++ b/web/client/src/sections/fillion/components/highwaysTable.js @@ -270,6 +270,7 @@ const TransporTationTable = (props) => { multipleLine: true, menu: { + type: 'tab', activeKey, onChange: (key) => setActiveKey(key), items: [ @@ -298,7 +299,7 @@ const TransporTationTable = (props) => { options={false} ref={c => { finishedProductTable = c; }} style={{ width: "100% ", overflow: "auto", height: '760px' }} - rowKey='id' + //rowKey='id' onReset={(v) => { setSitename('') }} @@ -317,7 +318,12 @@ const TransporTationTable = (props) => { } setRowSelected([]); const res = await dispatch(getHighways(query)); - let rslt = res.payload.data?.vehicleRes?.filter(item => item.name !== '路牌名') + let rslt = res.payload.data?.vehicleRes?.map(item => { + return { + ...item, + name: item.name + "(个)" + } + }) const additionalProperties = Object.entries(res.payload.data?.conserveData[0]).map(([key, value]) => ({ id: null, name: key, From b2fdc42904151fbe88b30f691126993f2e1a569a Mon Sep 17 00:00:00 2001 From: iris_cx Date: Fri, 4 Aug 2023 15:01:42 +0000 Subject: [PATCH 3/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'scripts/1.3.1/data/1?= =?UTF-8?q?=5Finsert=5Freport=5Fdata/Dockerfilenew'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/1.3.1/data/1_insert_report_data/Dockerfilenew | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/1.3.1/data/1_insert_report_data/Dockerfilenew b/scripts/1.3.1/data/1_insert_report_data/Dockerfilenew index 281f464c..dba16607 100644 --- a/scripts/1.3.1/data/1_insert_report_data/Dockerfilenew +++ b/scripts/1.3.1/data/1_insert_report_data/Dockerfilenew @@ -3,5 +3,5 @@ COPY ./scripts/1.3.1/data/1_insert_report_data /var/app WORKDIR /var/app RUN npm cache clean -f RUN rm -rf package-lock.json -RUN npm install --registry http://10.8.30.22:7000 +RUN npm install --registry https://nexus.ngaiot.com/repository/fs-npm/ CMD ["node", "index.js"] \ No newline at end of file From 3e3ad5f00e8cc8c646dd6c62c6c276a38033b0d7 Mon Sep 17 00:00:00 2001 From: liujiangyong Date: Fri, 4 Aug 2023 23:43:38 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E8=B7=AF=E6=94=BF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B8=AE=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fillion/components/luzhengmodel.js | 101 ++++++++++++------ .../sections/fillion/containers/luzheng.js | 88 ++++++++------- 2 files changed, 116 insertions(+), 73 deletions(-) diff --git a/web/client/src/sections/fillion/components/luzhengmodel.js b/web/client/src/sections/fillion/components/luzhengmodel.js index 651c605e..d2410739 100644 --- a/web/client/src/sections/fillion/components/luzhengmodel.js +++ b/web/client/src/sections/fillion/components/luzhengmodel.js @@ -4,47 +4,78 @@ import { Form, Input, Select, DatePicker, InputNumber, Button, Modal } from 'ant import { unitList } from '../containers/assess' import { getAssess, delAssess, editAssess } from '../actions/assess'; import moment from 'moment'; -import { getRoadadministration,addRoadadministration,delRoadadministration,modifyRoadadministration } from '../actions/luzheng'; -// import Uploads from "../../../../components/Upload/index" -// import Uploads from '../../../components/Upload/index' +import { getRoadadministration, addRoadadministration, delRoadadministration, modifyRoadadministration } from '../actions/luzheng'; +// import Uploads from "../../../../components/Upload/index" +// import Uploads from '../../../components/Upload/index' import Uploads from './uploads' const { Option } = Select; const LuzhengModel = ({ editData, check, visible, onCancel, dispatch }) => { const [form] = Form.useForm(); - console.log(editData,'editData') + // console.log(editData,'editData') return ( { + if (check) { + return onCancel() + } + form.validateFields().then(values => { + if (editData) { + dispatch(modifyRoadadministration(editData?.id, { + ...values + })).then(res => { + if (res.success) { + onCancel() + } + }) + } else { + dispatch(addRoadadministration({ + ...values, + })).then(res => { + if (res.success) { + onCancel() + } + }) + } + + }) + }}> + 确定 + , + + ] : null} onOk={() => { if (check) { return onCancel() } form.validateFields().then(values => { - if(editData){ - dispatch(modifyRoadadministration(editData?.id,{ + if (editData) { + dispatch(modifyRoadadministration(editData?.id, { ...values })).then(res => { if (res.success) { onCancel() } }) - }else{ + } else { dispatch(addRoadadministration({ ...values, })).then(res => { if (res.success) { onCancel() } - }) + }) } - + }) }} onCancel={() => { @@ -66,43 +97,43 @@ const LuzhengModel = ({ editData, check, visible, onCancel, dispatch }) => { }} > - {/* */} - + {/*  */} + - - + + - - + + - + ); }; -function mapStateToProps (state) { +function mapStateToProps(state) { const { auth, assess } = state return { user: auth.user, assess: assess.data || [] } } -export default connect(mapStateToProps)(LuzhengModel); +export default connect(mapStateToProps)(LuzhengModel); \ No newline at end of file diff --git a/web/client/src/sections/fillion/containers/luzheng.js b/web/client/src/sections/fillion/containers/luzheng.js index d09f3825..b2ccd93a 100644 --- a/web/client/src/sections/fillion/containers/luzheng.js +++ b/web/client/src/sections/fillion/containers/luzheng.js @@ -1,10 +1,10 @@ import React, { useState, useEffect } from 'react'; import { connect } from 'react-redux'; import { getAssess, delAssess, editAssess } from '../actions/assess'; -import { getRoadadministration,addRoadadministration,delRoadadministration,modifyRoadadministration } from '../actions/luzheng'; +import { getRoadadministration, addRoadadministration, delRoadadministration, modifyRoadadministration } from '../actions/luzheng'; import ProTable from '@ant-design/pro-table'; import AssessModal from '../components/luzhengmodel'; -import { Form, Space, DatePicker, Button, Select, Popconfirm ,Image} from 'antd' +import { Form, Space, DatePicker, Button, Select, Popconfirm, Image, Tooltip } from 'antd' import moment from 'moment'; import { values } from 'lodash'; @@ -35,13 +35,13 @@ function Assess(props) { const [query, setQuery] = useState({ page: 1, pageSize: 10 }) const [loading, setLoading] = useState(false); const [isCheck, setIsCheck] = useState(false) - const [datasource,setdatasource] = useState([]) + const [datasource, setdatasource] = useState([]) const [dateRange, setDateRange] = useState(['1970-1-1', '2099-12-31']); const { RangePicker } = DatePicker - const [total,settotal]= useState(0) + const [total, settotal] = useState(0) const [editAble, setEditAble] = useState(user?.username !== 'SuperAdmin' && user?.userResources?.find(i => i.resourceId === 'ASSESSMANAGE')?.isshow === "true" ? true : '') useEffect(() => { - + return () => { }; }, []); @@ -51,9 +51,9 @@ function Assess(props) { const getData = () => { setLoading(true) - console.log(query,'query') - dispatch(getRoadadministration({...query})).then(res => { - if(res?.success){ + console.log(query, 'query') + dispatch(getRoadadministration({ ...query })).then(res => { + if (res?.success) { setdatasource(res?.payload?.data?.rows) settotal(res?.payload?.data?.count) setLoading(false) @@ -65,14 +65,16 @@ function Assess(props) {
{ - - setQuery({ ...query, page:1,unit: v.unit,startTime : v?.time && moment(v?.time[0]).startOf('day').format('YYYY-MM-DD HH:mm:ss'), - endTime : v?.time && moment(v?.time[1]).add(1, 'days').endOf('day').format('YYYY-MM-DD HH:mm:ss') }) + + setQuery({ + ...query, page: 1, unit: v.unit, startTime: v?.time && moment(v?.time[0]).startOf('day').format('YYYY-MM-DD HH:mm:ss'), + endTime: v?.time && moment(v?.time[1]).add(1, 'days').endOf('day').format('YYYY-MM-DD HH:mm:ss') + }) }}> - + - { setDateRange(dateString) }} style={{ marginRight: '50px' }} /> + { setDateRange(dateString) }} style={{ marginRight: '50px' }} /> @@ -90,40 +92,50 @@ function Assess(props) { title: '执法日期', dataIndex: 'enforcementdate', key: 'enforcementdate', - render:(t,r)=>{ - return r?.enforcementdate?moment(r?.enforcementdate).format('YYYY-MM-DD'):'--' + render: (t, r) => { + return r?.enforcementdate ? moment(r?.enforcementdate).format('YYYY-MM-DD') : '--' } }, { title: '执法道路', dataIndex: 'roadname', - key: 'roadname' + key: 'roadname', + render: (t, r) => { + return + {r?.roadname && r?.roadname?.length > 20 ? r?.roadname?.substr(0, 20) + '...' : r?.roadname} + + } }, { title: '执法成果', dataIndex: 'enforcementreslt', key: 'enforcementreslt', + render: (t, r) => { + return + {r?.enforcementreslt && r?.enforcementreslt?.length > 20 ? r?.enforcementreslt?.substr(0, 20) + '...' : r?.enforcementreslt} + + } }, { title: '执法图片', dataIndex: 'picfile', key: 'picfile', - render:(t,r)=>{ - if(r?.picfile && r?.picfile?.length!==0){ - return r?.picfile?.map(i=>{ - return - - - }) - }else{ - return '--' - } - - - - - - + render: (t, r) => { + if (r?.picfile && r?.picfile?.length !== 0) { + return r?.picfile?.map(i => { + return + + + }) + } else { + return '--' + } + + + + + + } }, { @@ -139,8 +151,8 @@ function Assess(props) { + + }} disabled={editAble}>编辑 { @@ -148,8 +160,8 @@ function Assess(props) { dispatch(delRoadadministration(record.id)).then(res => { setLoading(false) if (res.success) { - setQuery({...query, page: 1, pageSize: 10, limit: 10}) - // getData(page) + setQuery({ ...query, page: 1, pageSize: 10, limit: 10 }) + // getData(page) } }) }} @@ -167,7 +179,7 @@ function Assess(props) { defaultPageSize: 10, showSizeChanger: false, onChange: (page, pageSize) => { - console.log(page,'page') + console.log(page, 'page') setQuery({ ...query, page, limit: pageSize @@ -179,7 +191,7 @@ function Assess(props) { search={false} /> { - assessModalVisible ? { + assessModalVisible ? { getData() setIsCheck(false) setEditData(null) From e2e5ac1432d51804695ff58b60bc338bca2937bf Mon Sep 17 00:00:00 2001 From: zhaobing Date: Fri, 4 Aug 2023 23:52:38 +0800 Subject: [PATCH 5/6] =?UTF-8?q?feat:=E6=8A=BD=E5=8F=96=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E5=B1=85=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/sections/fillion/containers/maintenanceSpotCheck.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/client/src/sections/fillion/containers/maintenanceSpotCheck.js b/web/client/src/sections/fillion/containers/maintenanceSpotCheck.js index 01390aec..c14e948a 100644 --- a/web/client/src/sections/fillion/containers/maintenanceSpotCheck.js +++ b/web/client/src/sections/fillion/containers/maintenanceSpotCheck.js @@ -479,7 +479,7 @@ const MaintenanceSpotCheck = (props) => { - + From 96492da69f867c6522793b334cb24613e6b9776d Mon Sep 17 00:00:00 2001 From: zhaobing Date: Sat, 5 Aug 2023 00:00:46 +0800 Subject: [PATCH 6/6] feat:fix bugs --- .../containers/footer/leadership/centerleft/qiqoliang.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web/client/src/sections/quanju/containers/footer/leadership/centerleft/qiqoliang.js b/web/client/src/sections/quanju/containers/footer/leadership/centerleft/qiqoliang.js index 39575b3f..ef151f90 100644 --- a/web/client/src/sections/quanju/containers/footer/leadership/centerleft/qiqoliang.js +++ b/web/client/src/sections/quanju/containers/footer/leadership/centerleft/qiqoliang.js @@ -94,7 +94,9 @@ const Right = (props) => { {/*
*/}
-

中小桥梁{isNaN(roads?.["小桥"] + roads?.["中桥"]) ? "" : roads?.["小桥"] + roads?.["中桥"]}座

+

中小桥梁159座

+ + {/*

中小桥梁{isNaN(roads?.["小桥"] + roads?.["中桥"]) ? "" : roads?.["小桥"] + roads?.["中桥"]}座

*/}

占比{isNaN((((roads?.["小桥"] + roads?.["中桥"]) / (roads?.["小桥"] + roads?.["中桥"] + roads?.["大桥"])) * 100).toFixed(2)) ? "" : (((roads?.["小桥"] + roads?.["中桥"]) / (roads?.["小桥"] + roads?.["中桥"] + roads?.["大桥"])) * 100).toFixed(2)}%