From db9977073be3c8481a8e87044ab86a6a7875bc3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98lijianhao=E2=80=99?= Date: Thu, 28 Jul 2022 18:58:03 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E5=9B=BE=E7=89=87=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/sections/quanju/actions/example.js | 23 +++++++++++++++++++ .../footer/conserve/chart/pie-chart.js | 2 +- .../containers/footer/conserve/index.js | 15 ++++++------ .../footer/conserve/left/left-center.js | 4 ++-- .../footer/conserve/left/left-top.js | 4 ++-- .../footer/conserve/right/right-center.js | 2 +- .../footer/conserve/right/right-top.js | 2 +- 7 files changed, 38 insertions(+), 14 deletions(-) diff --git a/web/client/src/sections/quanju/actions/example.js b/web/client/src/sections/quanju/actions/example.js index 075e74af..9f1b02df 100644 --- a/web/client/src/sections/quanju/actions/example.js +++ b/web/client/src/sections/quanju/actions/example.js @@ -122,4 +122,27 @@ export function getGodshuju() { // reducer: { name: 'busTier' } // >>>>>>> 385f017aeac33adc39a31e75faf6254a1a881d16 }); +} + +//获取路政列表 +export function getHighwayList() { + return dispatch => basicAction({ + type: 'get', + dispatch: dispatch, + actionType: 'GET_HIGHWAYS', + url: ApiTable.getHighways, + msg: { error: '获取路政列表失败' }, + reducer: { name: 'highways' } + }); +} +//获取道路养护统计及列表 +export function getRoadMaintenanceList() { + return dispatch => basicAction({ + type: 'get', + dispatch: dispatch, + actionType: 'GET_ROAD_MAINTENANCES', + url: ApiTable.getRoadMaintenance, + msg: { error: '获取道路养护列表失败' }, + reducer: { name: 'roadMaintenances' } + }); } \ No newline at end of file diff --git a/web/client/src/sections/quanju/containers/footer/conserve/chart/pie-chart.js b/web/client/src/sections/quanju/containers/footer/conserve/chart/pie-chart.js index f1460b8a..3796a83c 100644 --- a/web/client/src/sections/quanju/containers/footer/conserve/chart/pie-chart.js +++ b/web/client/src/sections/quanju/containers/footer/conserve/chart/pie-chart.js @@ -62,7 +62,7 @@ const PieChart = (props) => { { type: 'image', style: { - image: 'assets/images/quanju/chart-circle.png', + image: '/assets/images/quanju/chart-circle.png', width: 110, height: 110, align: 'center', diff --git a/web/client/src/sections/quanju/containers/footer/conserve/index.js b/web/client/src/sections/quanju/containers/footer/conserve/index.js index 8d6328c1..7a141fe5 100644 --- a/web/client/src/sections/quanju/containers/footer/conserve/index.js +++ b/web/client/src/sections/quanju/containers/footer/conserve/index.js @@ -19,24 +19,25 @@ const Conserve = (props) => { setLoading(false) setRoadData(res.payload.data || {}) }) - dispatch(getHighways()).then(res => { + dispatch(getHighways()).then(res =>{ setHighwaysData(res.payload.data || []) }) - dispatch(getRoadMaintenances()).then(res => { + dispatch(getRoadMaintenances()).then(res =>{ setRoadMaintenances(res.payload.data || []) }) }, []) return ( -
-
- - -
+
+
+ +
+
) } function mapStateToProps(state) { + // const { auth } = state; return { diff --git a/web/client/src/sections/quanju/containers/footer/conserve/left/left-center.js b/web/client/src/sections/quanju/containers/footer/conserve/left/left-center.js index 94ed8fa9..9aa8b9ea 100644 --- a/web/client/src/sections/quanju/containers/footer/conserve/left/left-center.js +++ b/web/client/src/sections/quanju/containers/footer/conserve/left/left-center.js @@ -227,8 +227,8 @@ const LeftCenter = (props) => { - icon - 可绿化里程总数 + icon + 可绿化里程总数 {totalData.toFixed(3) || 0} diff --git a/web/client/src/sections/quanju/containers/footer/conserve/left/left-top.js b/web/client/src/sections/quanju/containers/footer/conserve/left/left-top.js index 5a3fc468..944fdf81 100644 --- a/web/client/src/sections/quanju/containers/footer/conserve/left/left-top.js +++ b/web/client/src/sections/quanju/containers/footer/conserve/left/left-top.js @@ -204,13 +204,13 @@ const LeftTop = (props) => {
- - { { item?.map(i => (
- icon + icon
{i.name}
{`${i.count}个`}
diff --git a/web/client/src/sections/quanju/containers/footer/conserve/right/right-top.js b/web/client/src/sections/quanju/containers/footer/conserve/right/right-top.js index 11ed88f3..44d92965 100644 --- a/web/client/src/sections/quanju/containers/footer/conserve/right/right-top.js +++ b/web/client/src/sections/quanju/containers/footer/conserve/right/right-top.js @@ -46,7 +46,7 @@ const RightTop = (props) => { { item?.map(i => (
- icon + icon
{i.name}
{`${i.count}${i.unit}`}
From 8b26cae36db19e5e02837ab986ef980cbd48e1b0 Mon Sep 17 00:00:00 2001 From: dengyinhuan Date: Thu, 28 Jul 2022 19:14:47 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BB=BA=E8=AE=BE?= =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=95=85=E9=9A=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sections/quanju/containers/footer/build/index.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) 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 aab783e0..679eb3da 100644 --- a/web/client/src/sections/quanju/containers/footer/build/index.js +++ b/web/client/src/sections/quanju/containers/footer/build/index.js @@ -112,7 +112,14 @@ const Build = (props) => {
)}
) } - const xuandata1 = undefined + // const xuandata1 = [ + // { + // "id": 26, + // "name": "111", + // "video":null, + // "enable": true + // } + // ] console.log(localStorage.getItem("qndmn"),'七牛') return (
@@ -193,7 +200,7 @@ const Build = (props) => { }} customize={true}>
{/* */} - +

全面建设好农村公路，切实发挥先行官作用

From 734664351ed0c6bdf99bbf7e59846e7f7dd184e4 Mon Sep 17 00:00:00 2001 From: xingyongchun Date: Thu, 28 Jul 2022 19:43:29 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E6=A3=80=E6=B5=8B=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E7=94=A8=E6=97=B6=E9=97=B4=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/sections/fillion/actions/infor.js | 34 +++---- .../fillion/components/infor/details.js | 98 ++++++++++++------- .../sections/fillion/components/inforTable.js | 2 +- .../fillion/components/operationalTable.js | 1 + .../fillion/components/project/project.js | 1 - .../fillion/components/transportationTable.js | 1 + web/log/development.txt | 7 ++ 7 files changed, 87 insertions(+), 57 deletions(-) diff --git a/web/client/src/sections/fillion/actions/infor.js b/web/client/src/sections/fillion/actions/infor.js index 2fcc0841..faa48253 100644 --- a/web/client/src/sections/fillion/actions/infor.js +++ b/web/client/src/sections/fillion/actions/infor.js @@ -63,7 +63,7 @@ export function putSpecificVehicle(query) { data: query, actionType: 'put_SPECIFIC_VEHICLE', url: ApiTable.putSpecificVehicle, - msg: { error: '编辑车辆信息失败' }, + msg: { option: '编辑车辆信息' }, }); } @@ -74,7 +74,7 @@ export function putHouseholds(query) { data: query, actionType: 'put_HOUSEHOLDS', url: ApiTable.putHouseholds, - msg: { error: '编辑业户信息失败' }, + msg: { option: '编辑业户信息' }, }); } @@ -107,7 +107,7 @@ export function putRoadway(query) { data: query, actionType: 'PUT_ROADWAY', url: ApiTable.putRoadway, - msg: { error: '编辑道路信息失败' }, + msg: { option: '编辑道路信息' }, }); } @@ -129,7 +129,7 @@ export function putBridge(query) { data: query, actionType: 'PUT_BRIDGE', url: ApiTable.putBridge, - msg: { error: '编辑桥梁信息失败' }, + msg: { option: '编辑桥梁信息' }, }); } @@ -151,7 +151,7 @@ export function putProject(query) { data: query, actionType: 'GET_PROJECT', url: ApiTable.putProject, - msg: { error: '编辑工程信息失败' }, + msg: { option: '编辑工程信息' }, }); } @@ -173,7 +173,7 @@ export function putHighways(query) { data: query, actionType: 'GET_HIGHWAYS', url: ApiTable.putHighways, - msg: { error: '编辑路政信息失败' }, + msg: { option: '编辑路政信息' }, }); } @@ -195,7 +195,7 @@ export function putCircuit(query) { data: query, actionType: 'PUT_CIRCUIT', url: ApiTable.putCircuit, - msg: { error: '编辑线路信息失败' }, + msg: { option: '编辑线路信息' }, }); } @@ -217,7 +217,7 @@ export function putVehicle(query) { data: query, actionType: 'PUT_VEHICLE', url: ApiTable.putVehicle, - msg: { error: '编辑车辆信息失败' }, + msg: { option: '编辑车辆信息' }, }); } @@ -227,7 +227,7 @@ export function delRoadway(query) { dispatch: dispatch, actionType: 'DEL_ROADWAY', url: ApiTable.delRoadway.replace("{roadId}", query?.roadId), - msg: { error: '删除车辆信息失败' }, + msg: { option: '删除车辆信息' }, }); } @@ -237,7 +237,7 @@ export function delProject(query) { dispatch: dispatch, actionType: 'DEL_PROJECT', url: ApiTable.delProject.replace("{projectId}", query?.projectId), - msg: { error: '删除工程信息失败' }, + msg: { option: '删除工程信息' }, }); } @@ -247,7 +247,7 @@ export function delBridge(query) { dispatch: dispatch, actionType: 'DEL_BRIDGE', url: ApiTable.delBridge.replace("{bridgeId}", query?.bridgeId), - msg: { error: '删除桥梁信息失败' }, + msg: { option: '删除桥梁信息' }, }); } @@ -257,7 +257,7 @@ export function delSpecificVehicle(query) { dispatch: dispatch, actionType: 'DEL_SPECIFICVENICLE', url: ApiTable.delSpecificVehicle.replace("{vehicleId}", query?.vehicleId), - msg: { error: '删除车辆信息失败' }, + msg: { option: '删除车辆信息' }, }); } @@ -267,7 +267,7 @@ export function delHouseholds(query) { dispatch: dispatch, actionType: 'DEL_HOUSEHOLDS', url: ApiTable.delHouseholds.replace("{businessId}", query?.businessId), - msg: { error: '删除业户信息失败' }, + msg: { option: '删除业户信息' }, }); } @@ -277,7 +277,7 @@ export function delCircuit(query) { dispatch: dispatch, actionType: 'DEL_CIRCUIT', url: ApiTable.delCircuit.replace("{lineId}", query?.lineId), - msg: { error: '删除运营线路信息失败' }, + msg: { option: '删除运营线路信息' }, }); } @@ -287,7 +287,7 @@ export function delVehicle(query) { dispatch: dispatch, actionType: 'DEL_VEHICLE', url: ApiTable.delVehicle.replace("{carId}", query?.carId), - msg: { error: '删除车辆信息失败' }, + msg: { option: '删除车辆信息' }, }); } @@ -310,7 +310,7 @@ export function putPurchase(query) { data: query, actionType: 'PUT_PURCHASE', url: ApiTable.putPurchase, - msg: { error: '获取治超信息失败' }, + msg: { option: '编辑治超信息' }, }); } @@ -320,7 +320,7 @@ export function delPurchase(query) { dispatch: dispatch, actionType: 'DEL_PURCHASE', url: ApiTable.delPurchase.replace("{overspeedId}", query?.overspeedId), - msg: { error: '删除车辆信息失败' }, + msg: { option: '删除车辆信息' }, }); } \ No newline at end of file diff --git a/web/client/src/sections/fillion/components/infor/details.js b/web/client/src/sections/fillion/components/infor/details.js index 73b24c7d..a8a125a7 100644 --- a/web/client/src/sections/fillion/components/infor/details.js +++ b/web/client/src/sections/fillion/components/infor/details.js @@ -1,12 +1,12 @@ import React, { useEffect, useState } from 'react'; import { connect } from 'react-redux'; import { Form, Spin, Table } from 'antd'; -import { DrawerForm, ProForm, ProFormText, ProFormSelect } from '@ant-design/pro-form'; +import { DrawerForm, ProForm, ProFormText, ProFormSelect,ProFormDatePicker } from '@ant-design/pro-form'; import { putRoadway, putSpecificVehicle, putHouseholds, putCircuit, putVehicle, putPurchase } from "../../actions/infor" import { putBridge } from "../../actions/infor" -import _ from 'lodash' +import _ from 'lodash' const UserModal = (props) => { - const { visible, onVisibleChange, typecard, rewkeys, data, recortd, sitename, dispatch, setRecortd, setMonitor,setDelet,whichofits } = props + const { visible, onVisibleChange, typecard, rewkeys, data, recortd, sitename, dispatch, setRecortd, setMonitor, setDelet, whichofits } = props const [newlys, setNewlys] = useState() //必填数据 const [newlysay, setNewlysay] = useState() //处理hou const [records, setRecords] = useState()//处理 @@ -70,6 +70,7 @@ const UserModal = (props) => { array.push({ name: value, type: key }) }); setNewlys(array?.splice(0, 2)) + array?.splice(6, 1) setNewlysay(array) } }, []) @@ -150,54 +151,74 @@ const UserModal = (props) => { onFinish={(values) => { if (Object.values(values).length > 0) { if (rewkeys === 'transportation') { - - if (typecard == '111') { + + if (typecard == '111') { setDelet(values) const query = { ...values, level: whichofits, roadId: records?.[0]?.value || '' } dispatch(putRoadway(query)).then((res) => { - - }) return true + }) } else { setDelet(values) const query = { ...values, level: whichofits } dispatch(putRoadway(query)).then((res) => { - - }) + return true } + } if (rewkeys === 'bridge') { if (typecard == '111') { - setDelet(values) + setDelet(values) const query = { ...values, roadId: records?.[0]?.value || '' } dispatch(putBridge(query)).then((res) => { - + }) return true } else { - setDelet(values) + setDelet(values) const query = { ...values } dispatch(putBridge(query)).then((res) => { - + }) return true } } - if (rewkeys === 'weihuo' || rewkeys === 'chuzu') { + if (rewkeys === 'weihuo') { if (typecard == '111') { + setDelet(values) - const query = { ...values, vehicleId: records?.[0]?.value || '', type: rewkeys == 'chuzu' ? '出租车' : '危货' } + const query = { ...values, vehicleId: records?.[0]?.value || '', type: '危货' } dispatch(putSpecificVehicle(query)).then((res) => { - + }) return true } else { - setDelet(values) - const query = { ...values, type: rewkeys == 'chuzu' ? '出租车' : '危货' } + + setDelet(values) + const query = { ...values, type: '危货' } dispatch(putSpecificVehicle(query)).then((res) => { - + + }) + return true + } + } + if (rewkeys === 'chuzu') { + if (typecard == '111') { + + setDelet(values) + const query = { ...values, vehicleId: records?.[0]?.value || '', type: '出租车' } + dispatch(putSpecificVehicle(query)).then((res) => { + + }) + return true + } else { + + setDelet(values) + const query = { ...values, type: '出租车' } + dispatch(putSpecificVehicle(query)).then((res) => { + }) return true } @@ -205,16 +226,16 @@ const UserModal = (props) => { if (rewkeys === 'yehu') { if (typecard == '111') { setDelet(values) - const query = { ...values, businessId: records?.[0]?.value, type: rewkeys == 'chuzu' ? '出租车' : '危货' } + const query = { ...values, businessId: records?.[0]?.value, type: values.type } dispatch(putHouseholds(query)).then((res) => { - + }) return true } else { - setDelet(values) - const query = { ...values, type: rewkeys === 'chuzu' ? '出租车' : '危货' } + setDelet(values) + const query = { ...values, type: values.type } dispatch(putHouseholds(query)).then((res) => { - + }) return true } @@ -223,14 +244,14 @@ const UserModal = (props) => { setDelet(values) const query = { ...values, lineId: records?.[0]?.value || '' } dispatch(putCircuit(query)).then((res) => { - + }) return true } else { - setDelet(values) + setDelet(values) const query = { ...values } dispatch(putCircuit(query)).then((res) => { - + }) return true } @@ -240,14 +261,14 @@ const UserModal = (props) => { setDelet(values) const query = { ...values, carId: records?.[0]?.value || '' } dispatch(putVehicle(query)).then((res) => { - + }) return true } else { - setDelet(values) + setDelet(values) const query = { ...values } dispatch(putVehicle(query)).then((res) => { - + }) return true } @@ -257,15 +278,15 @@ const UserModal = (props) => { setDelet(values) const query = { ...values, overspeedId: records?.[0]?.value || '' } dispatch(putPurchase(query)).then((res) => { - + setMonitor(res) }) return true } else { - setDelet(values) + setDelet(values) const query = { ...values } dispatch(putPurchase(query)).then((res) => { - + setMonitor(res) }) return true @@ -283,7 +304,6 @@ const UserModal = (props) => { name={newlys?.[0]?.type} width="md" label={newlys?.[0]?.name} - placeholder="请输入名称" value={recordsay?.[0]?.value} // rules={[{ required: true, message: "必填" }]} @@ -291,7 +311,7 @@ const UserModal = (props) => { name={newlys?.[1]?.type} width="md" label={newlys?.[1]?.name} - + placeholder="请输入名称" value={recordsay?.[1]?.value} // rules={[{ required: true, message: "必填" }]} @@ -312,6 +332,7 @@ const UserModal = (props) => { label='类型' /> : null } + {rewkeys === 'zhichao'?:''} {newlysay?.map((item, index) => { return { name={newlys?.[0]?.type} width="md" label={newlys?.[0]?.name} - + placeholder="请输入名称" // value={recordssy?.[0]?.value} // rules={[{ required: true, message: "必填" }]} @@ -333,7 +354,7 @@ const UserModal = (props) => { name={newlys?.[1]?.type} width="md" label={newlys?.[1]?.name} - + placeholder="请输入名称" // value={recordssy?.[1]?.value} // rules={[{ required: true, message: "必填" }]} @@ -354,10 +375,11 @@ const UserModal = (props) => { label='类型' /> : null } + {rewkeys === 'zhichao'?:''} {newlysay?.map((item, index) => { return })} diff --git a/web/client/src/sections/fillion/components/inforTable.js b/web/client/src/sections/fillion/components/inforTable.js index 11b05946..7733ec5b 100644 --- a/web/client/src/sections/fillion/components/inforTable.js +++ b/web/client/src/sections/fillion/components/inforTable.js @@ -213,7 +213,7 @@ const InForTable = (props) => { dataIndex: 'createdAt', valueType: 'date', render: (dom, record) => { - return record.testTime + return record.testTime.slice(0,10) }, fieldProps: { onChange: (value, cs) => { diff --git a/web/client/src/sections/fillion/components/operationalTable.js b/web/client/src/sections/fillion/components/operationalTable.js index 119e1629..259f39de 100644 --- a/web/client/src/sections/fillion/components/operationalTable.js +++ b/web/client/src/sections/fillion/components/operationalTable.js @@ -22,6 +22,7 @@ const OperaTionalTable = (props) => { const [recortd, setRecortd] = useState() const [rewkeys, setRewkeys] = useState('keyun') const [delet, setDelet] = useState() + // const [, setDelet] = useState() const ref = useRef() useEffect(() => { ref.current.reload() }, [rewkeys, activeKey, delet]) diff --git a/web/client/src/sections/fillion/components/project/project.js b/web/client/src/sections/fillion/components/project/project.js index f94b4a48..fc292af8 100644 --- a/web/client/src/sections/fillion/components/project/project.js +++ b/web/client/src/sections/fillion/components/project/project.js @@ -145,7 +145,6 @@ const ProjectModal = (props) => { label: '否', }, ]} - width="xs" name='done' label='是否已完成' rules={[{ required: true, message: "必填" }]} diff --git a/web/client/src/sections/fillion/components/transportationTable.js b/web/client/src/sections/fillion/components/transportationTable.js index 7992b4e7..9bd358e5 100644 --- a/web/client/src/sections/fillion/components/transportationTable.js +++ b/web/client/src/sections/fillion/components/transportationTable.js @@ -3836,6 +3836,7 @@ 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 diff --git a/web/log/development.txt b/web/log/development.txt index a4666e68..048c1b69 100644 --- a/web/log/development.txt +++ b/web/log/development.txt @@ -24236,6 +24236,7 @@ ' at emitErrorCloseNT (internal/streams/destroy.js:68:3)\n' + ' at processTicksAndRejections (internal/process/task_queues.js:84:21)' } +<<<<<<< Updated upstream 2022-07-28 10:08:50.687 - error: [FS-ERRHD] { message: 'Error: read ECONNRESET', @@ -30704,3 +30705,9 @@ } 2022-07-28 16:51:10.270 - debug: [FS-LOGGER] Init. 2022-07-28 16:51:11.180 - info: [Router] Inject api: attachment/index +======= +2022-07-28 15:21:26.802 - debug: [FS-LOGGER] Init. +2022-07-28 15:21:27.251 - info: [Router] Inject api: attachment/index +2022-07-28 17:47:48.855 - debug: [FS-LOGGER] Init. +2022-07-28 17:47:49.287 - info: [Router] Inject api: attachment/index +>>>>>>> Stashed changes From c4c103d98b50e56d545bc27a296ff8625758ad59 Mon Sep 17 00:00:00 2001 From: "gao.zhiyuan" Date: Thu, 28 Jul 2022 19:54:53 +0800 Subject: [PATCH 04/12] /screen/cockpit --- web/client/src/sections/auth/containers/login.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/client/src/sections/auth/containers/login.js b/web/client/src/sections/auth/containers/login.js index d4ea9730..f8a6685f 100644 --- a/web/client/src/sections/auth/containers/login.js +++ b/web/client/src/sections/auth/containers/login.js @@ -25,7 +25,7 @@ const Login = props => { }, [error]) useEffect(() => { - user && user.authorized ? dispatch(push('/quanju')) : null + user && user.authorized ? dispatch(push('/screen/cockpit')) : null }, [user]) const enterHandler = e => { From 5e915675a542198faaa6c218624f1e84686c94b3 Mon Sep 17 00:00:00 2001 From: xingyongchun Date: Thu, 28 Jul 2022 21:13:30 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fillion/components/bridgeTable.js | 21 +++---------- .../fillion/components/highwaysTable.js | 18 +---------- .../sections/fillion/components/inforTable.js | 21 +++---------- .../fillion/components/operationalTable.js | 30 +++++++------------ .../fillion/components/publicTable.js | 16 ---------- .../fillion/components/transportationTable.js | 30 ++++++++----------- .../src/sections/fillion/containers/bridge.js | 28 ++++++++--------- .../sections/fillion/containers/highways.js | 23 +++++--------- .../src/sections/fillion/containers/infor.js | 16 +++------- .../fillion/containers/operational.js | 28 ++++++++--------- .../fillion/containers/promotional.js | 26 ++++++---------- .../src/sections/fillion/containers/public.js | 24 +++++---------- .../fillion/containers/transportation.js | 30 +++++++++---------- 13 files changed, 99 insertions(+), 212 deletions(-) diff --git a/web/client/src/sections/fillion/components/bridgeTable.js b/web/client/src/sections/fillion/components/bridgeTable.js index 2f46b175..cf2e53a8 100644 --- a/web/client/src/sections/fillion/components/bridgeTable.js +++ b/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]) @@ -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 (
@@ -1782,12 +1767,14 @@ const BrideTable = (props) => { key: 'tab1', label: { setWhichofits('qiaoliang') + setDifferentiate('bridge') }}>桥梁{activeKey === 'tab1'}, }, { key: 'tab2', label: { setWhichofits('gongcheng') + setDifferentiate('project') }}>工程一览{activeKey === 'tab2'}, }, @@ -1844,7 +1831,7 @@ const BrideTable = (props) => { defaultCollapsed: false, optionRender: (searchConfig, formProps, dom) => [ ...dom.reverse(), - { props.exports(rowSelected, counts) }}> + { props.exports(rowSelected,differentiate) }}>
)) From 837b438510f39c007d9b8754567612b460ed8ce4 Mon Sep 17 00:00:00 2001 From: wanyiwei Date: Thu, 28 Jul 2022 21:30:37 +0800 Subject: [PATCH 09/12] =?UTF-8?q?*=E5=A4=A7=E5=B1=8F=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=B1=82=E7=BA=A7=E4=B8=AD=E6=9C=89null=E5=80=BC=E7=9A=84key?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/sections/quanju/containers/footer/operation/left.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/client/src/sections/quanju/containers/footer/operation/left.js b/web/client/src/sections/quanju/containers/footer/operation/left.js index 6d870d0e..175efc1e 100644 --- a/web/client/src/sections/quanju/containers/footer/operation/left.js +++ b/web/client/src/sections/quanju/containers/footer/operation/left.js @@ -91,7 +91,7 @@ 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 { From 73e3219c88ae001c6075a69b43698c907931c5c9 Mon Sep 17 00:00:00 2001 From: dengyinhuan Date: Thu, 28 Jul 2022 21:43:26 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BB=BA=E8=AE=BE?= =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=95=85=E9=9A=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/sections/quanju/containers/footer/build/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 679eb3da..66f67e1b 100644 --- a/web/client/src/sections/quanju/containers/footer/build/index.js +++ b/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 (
@@ -200,7 +201,7 @@ const Build = (props) => { }} customize={true}>
{/* */} - +

全面建设好农村公路，切实发挥先行官作用

From e6214053825de88a9d76682c3e2071c569181403 Mon Sep 17 00:00:00 2001 From: xingyongchun Date: Thu, 28 Jul 2022 21:59:36 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=B7=B2=E5=AE=8C=E6=88=90=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fillion/components/bridgeTable.js | 4 +- .../fillion/components/enforceTable.js | 2 +- .../components/highways/highwaysdata.js | 2 +- .../fillion/components/highwaysTable.js | 2 +- .../fillion/components/infor/details.js | 22 ++--- .../sections/fillion/components/inforTable.js | 2 +- .../fillion/components/operationalTable.js | 8 +- .../fillion/components/project/project.js | 90 +++++++++---------- .../fillion/components/publicTable.js | 4 +- .../fillion/components/transportationTable.js | 9 +- 10 files changed, 72 insertions(+), 73 deletions(-) diff --git a/web/client/src/sections/fillion/components/bridgeTable.js b/web/client/src/sections/fillion/components/bridgeTable.js index cf2e53a8..c6761572 100644 --- a/web/client/src/sections/fillion/components/bridgeTable.js +++ b/web/client/src/sections/fillion/components/bridgeTable.js @@ -1507,7 +1507,7 @@ const BrideTable = (props) => { return
@@ -1691,7 +1691,7 @@ const BrideTable = (props) => { return
{ deldatas(record.id) }}> diff --git a/web/client/src/sections/fillion/components/enforceTable.js b/web/client/src/sections/fillion/components/enforceTable.js index 1f239e22..cbeca915 100644 --- a/web/client/src/sections/fillion/components/enforceTable.js +++ b/web/client/src/sections/fillion/components/enforceTable.js @@ -1508,7 +1508,7 @@ const openModal = (type, record) => { return
diff --git a/web/client/src/sections/fillion/components/highways/highwaysdata.js b/web/client/src/sections/fillion/components/highways/highwaysdata.js index 854781da..c5bc3851 100644 --- a/web/client/src/sections/fillion/components/highways/highwaysdata.js +++ b/web/client/src/sections/fillion/components/highways/highwaysdata.js @@ -47,7 +47,7 @@ const HightModal = (props) => { }} initialValues={recortd} > - {typecard == '111' ? + {typecard == 'compile' ? { return
diff --git a/web/client/src/sections/fillion/components/infor/details.js b/web/client/src/sections/fillion/components/infor/details.js index 303e1dd2..4df3a38c 100644 --- a/web/client/src/sections/fillion/components/infor/details.js +++ b/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,7 +169,7 @@ const UserModal = (props) => { } if (rewkeys === 'bridge') { - if (typecard == '111') { + if (typecard == 'compile') { setDelet(values) 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' ? { return
diff --git a/web/client/src/sections/fillion/components/operationalTable.js b/web/client/src/sections/fillion/components/operationalTable.js index 5e88d600..05ec484b 100644 --- a/web/client/src/sections/fillion/components/operationalTable.js +++ b/web/client/src/sections/fillion/components/operationalTable.js @@ -110,7 +110,7 @@ const OperaTionalTable = (props) => { return
@@ -697,7 +697,7 @@ const OperaTionalTable = (props) => { return
{ deldata(record.id) }}> @@ -1330,7 +1330,7 @@ const OperaTionalTable = (props) => { return
{ deldata(record.id) }}> @@ -1800,7 +1800,7 @@ const OperaTionalTable = (props) => { return
{ deldatas(record.id) }}> diff --git a/web/client/src/sections/fillion/components/project/project.js b/web/client/src/sections/fillion/components/project/project.js index fc292af8..9e6f852a 100644 --- a/web/client/src/sections/fillion/components/project/project.js +++ b/web/client/src/sections/fillion/components/project/project.js @@ -1,9 +1,9 @@ import React, { useEffect, useState } from 'react'; import { connect } from 'react-redux'; import { Form, Spin, Table } from 'antd'; -import { DrawerForm, ProForm, ProFormText,ProFormSelect } from '@ant-design/pro-form'; +import { DrawerForm, ProForm, ProFormText, ProFormSelect } from '@ant-design/pro-form'; import { putProject } from "../../actions/infor" -import _ from 'lodash' +import _ from 'lodash' const data = { "entryName": "项目名称", @@ -32,7 +32,7 @@ const ProjectModal = (props) => { setNewlys(array?.splice(0, 2)) setNewlysay(array) // console.log() - + } if (rewkeys === 'bridge') { _.forIn(data, function (value, key) { @@ -41,7 +41,7 @@ const ProjectModal = (props) => { setNewlys(array?.splice(0, 2)) setNewlysay(array) // console.log() - + } }, []) useEffect(() => { @@ -51,7 +51,7 @@ const ProjectModal = (props) => { arr.push({ value: value, type: key }) }); setRecordsay(arr.splice(1, 2)) - + setRecords(arr) } if (rewkeys === 'bridge') { @@ -79,68 +79,68 @@ 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) => { - + }) return true } } 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) => { - + }) return true } } }} - initialValues={recortd} + initialValues={{ ...recortd, done: recortd.done ? 'true' : 'false' }} > - {typecard == '111' ? + {typecard == 'compile' ? { name={newlys?.[0]?.type} width="md" label={newlys?.[0]?.name} - + placeholder="请输入名称" - // value={recordssy?.[0]?.value} - // rules={[{ required: true, message: "必填" }]} + // value={recordssy?.[0]?.value} + // rules={[{ required: true, message: "必填" }]} /> - [ + { + value: 'true', + label: '是', + }, { + value: 'false', + label: '否', + }, + ]} + + name='done' + label='是否已完成' + rules={[{ required: true, message: "必填" }]} /> {newlysay?.map((item, index) => { return })} diff --git a/web/client/src/sections/fillion/components/publicTable.js b/web/client/src/sections/fillion/components/publicTable.js index 23d5b009..66510447 100644 --- a/web/client/src/sections/fillion/components/publicTable.js +++ b/web/client/src/sections/fillion/components/publicTable.js @@ -408,7 +408,7 @@ const PublicTable = (props) => { return
{ deldata(record.id) }}> @@ -1103,7 +1103,7 @@ const PublicTable = (props) => { return
{ deldatas(record.id) }}> diff --git a/web/client/src/sections/fillion/components/transportationTable.js b/web/client/src/sections/fillion/components/transportationTable.js index daca6ac0..53cba191 100644 --- a/web/client/src/sections/fillion/components/transportationTable.js +++ b/web/client/src/sections/fillion/components/transportationTable.js @@ -1178,7 +1178,7 @@ const TransporTationTable = (props) => { onClick={() => { setRecortd(record) openModal('edit', record) - setTypecard('111') + setTypecard('compile') }} >编辑 { deldata(record.id) }}> @@ -3832,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 From 7bd8ad9634d960d18e34bf947b2f93037fb939ec Mon Sep 17 00:00:00 2001 From: "gao.zhiyuan" Date: Thu, 28 Jul 2022 22:04:29 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E5=AE=A3=E4=BC=A0=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BF=9D=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/app/lib/controllers/data/project.js | 18 ++++++++++++++---- .../quanju/containers/footer/build/index.js | 4 ++-- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/api/app/lib/controllers/data/project.js b/api/app/lib/controllers/data/project.js index 7fb0b2a6..b1dec293 100644 --- a/api/app/lib/controllers/data/project.js +++ b/api/app/lib/controllers/data/project.js @@ -3,14 +3,24 @@ async function projectGet (ctx) { try { const models = ctx.fs.dc.models; - const { type } = ctx.query; + const { type, entryName } = ctx.query; - const projectRes = await models.Project.findAll({ + let findOption = { where: { - type + }, order: [['id', 'DESC']] - }) + } + if (type) { + findOption.where.type = type + } + if (entryName) { + findOption.where.entryName = { + $like: `%${entryName}%` + } + } + + const projectRes = await models.Project.findAll(findOption) ctx.status = 200; ctx.body = projectRes 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 679eb3da..fcf232fc 100644 --- a/web/client/src/sections/quanju/containers/footer/build/index.js +++ b/web/client/src/sections/quanju/containers/footer/build/index.js @@ -48,7 +48,7 @@ const Build = (props) => { const res = await dispatch(getxuanchuan()); // setdata(alltype.filter(item=>item.name!=='null')) - setxuandata(res.payload.data) + setxuandata(res.payload.data || []) console.log(res.payload.data,'宣传栏数据') } @@ -200,7 +200,7 @@ const Build = (props) => { }} customize={true}>
{/* */} - +

全面建设好农村公路，切实发挥先行官作用