Browse Source

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

release_0.0.4
wangyue 2 years ago
parent
commit
50eb042e00
  1. 4
      api/app/lib/index.js
  2. 2
      weapp/src/config.js
  3. 6
      weapp/src/packages/patrolView/index.jsx
  4. 56
      web/client/src/sections/fillion/actions/infor.js
  5. 194
      web/client/src/sections/fillion/components/enforceTable.js
  6. 1
      web/client/src/sections/fillion/components/highways/highwaysdata.js
  7. 20
      web/client/src/sections/fillion/components/infor/details.js
  8. 67
      web/client/src/sections/fillion/components/inforTable.js
  9. 1
      web/client/src/sections/fillion/components/project/project.js
  10. 14
      web/client/src/sections/fillion/components/promotionalTable.js

4
api/app/lib/index.js

@ -5,7 +5,7 @@ const fs = require('fs');
const path = require('path');
const authenticator = require('./middlewares/authenticator');
// const apiLog = require('./middlewares/api-log');
const businessRest = require('./middlewares/business-rest');
// const businessRest = require('./middlewares/business-rest');
module.exports.entry = function (app, router, opts) {
app.fs.logger.log('info', '[FS-AUTH]', 'Inject auth and api mv into router.');
@ -15,7 +15,7 @@ module.exports.entry = function (app, router, opts) {
app.fs.api.logAttr = app.fs.api.logAttr || {};
router.use(authenticator(app, opts));
router.use(businessRest(app, router, opts));
// router.use(businessRest(app, router, opts));
// router.use(apiLog(app, opts));
router = routes(app, router, opts);

2
weapp/src/config.js

@ -8,7 +8,7 @@ const baseConfig = {
};
const development = {
baseUrl: 'https://3024-117-90-36-177.jp.ngrok.io',
baseUrl: 'https://c5a6-117-90-37-10.ap.ngrok.io',
webUrl: 'https://smartwater.anxinyun.cn',
pcode: 'fce4afe2-5b6a-408a-ab18-a2afa7fa027c',
imgUrl: 'http://test.resources.anxinyun.cn/',

6
weapp/src/packages/patrolView/index.jsx

@ -20,7 +20,7 @@ function Index() {
const { params: { filter } } = router
const [isPatrol, setIsPatrol] = useState(true)
const [datePicker, setDatePicker] = useState(moment().format('YYYY-MM-DD'))
const [datePicker, setDatePicker] = useState('')
const [listData, setListData] = useState([])
const [filterText, setFilterText] = useState('')
const [systemInfo, setSystemInfo] = useState('')
@ -51,8 +51,8 @@ function Index() {
const data = {
limit,
page,
startTime: datePicker + ' 00:00:00',
endTime: datePicker + ' 23:59:59',
startTime: datePicker ? datePicker + ' 00:00:00' : '',
endTime: datePicker ? datePicker + ' 23:59:59' : '',
keyword: filterText,
reportType: isPatrol ? 'patrol' : 'conserve',
userId: filter === 'my' ? userInfo.id : '',

56
web/client/src/sections/fillion/actions/infor.js

@ -31,7 +31,7 @@ export function getOperaTional(query) {
actionType: 'GET_OPERA_TIONAL',
url: ApiTable.getOperaTional,
msg: { error: '获取客运信息失败' },
// reducer: { name: 'reportstatistic' }
});
}
export function putOperaTional(query) {
@ -42,7 +42,7 @@ export function putOperaTional(query) {
actionType: 'PUT_OPERA_TIONAL',
url: ApiTable.putOperaTional,
msg: { error: '获取车辆信息失败' },
// reducer: { name: 'reportstatistic' }
});
}
export function getSpecificVehicle(query) {
@ -53,7 +53,7 @@ export function getSpecificVehicle(query) {
actionType: 'GET_SPECIFIC_VEHICLE',
url: ApiTable.getSpecificVehicle,
msg: { error: '获取车辆信息失败' },
// reducer: { name: 'reportstatistic' }
});
}
export function putSpecificVehicle(query) {
@ -64,7 +64,7 @@ export function putSpecificVehicle(query) {
actionType: 'put_SPECIFIC_VEHICLE',
url: ApiTable.putSpecificVehicle,
msg: { error: '编辑车辆信息失败' },
// reducer: { name: 'reportstatistic' }
});
}
export function putHouseholds(query) {
@ -75,7 +75,7 @@ export function putHouseholds(query) {
actionType: 'put_HOUSEHOLDS',
url: ApiTable.putHouseholds,
msg: { error: '编辑业户信息失败' },
// reducer: { name: 'reportstatistic' }
});
}
export function getHouseholds(query) {
@ -86,7 +86,7 @@ export function getHouseholds(query) {
actionType: 'GET_HOUSEHOLDS',
url: ApiTable.getHouseholds,
msg: { error: '获取业户信息失败' },
// reducer: { name: 'reportstatistic' }
});
}
export function getRoadway(query) {
@ -97,7 +97,7 @@ export function getRoadway(query) {
actionType: 'GET_ROADWAY',
url: ApiTable.getRoadway,
msg: { error: '获取道路信息失败' },
// reducer: { name: 'reportstatistic' }
});
}
export function putRoadway(query) {
@ -108,7 +108,7 @@ export function putRoadway(query) {
actionType: 'PUT_ROADWAY',
url: ApiTable.putRoadway,
msg: { error: '编辑道路信息失败' },
// reducer: { name: 'reportstatistic' }
});
}
export function getBridge(query) {
@ -119,7 +119,7 @@ export function getBridge(query) {
actionType: 'GET_BRIDGE',
url: ApiTable.getBridge,
msg: { error: '获取桥梁信息失败' },
// reducer: { name: 'reportstatistic' }
});
}
export function putBridge(query) {
@ -130,7 +130,7 @@ export function putBridge(query) {
actionType: 'PUT_BRIDGE',
url: ApiTable.putBridge,
msg: { error: '编辑桥梁信息失败' },
// reducer: { name: 'reportstatistic' }
});
}
export function getProject(query) {
@ -141,7 +141,7 @@ export function getProject(query) {
actionType: 'GET_PROJECT',
url: ApiTable.getProject,
msg: { error: '获取工程信息失败' },
// reducer: { name: 'reportstatistic' }
});
}
export function putProject(query) {
@ -152,7 +152,7 @@ export function putProject(query) {
actionType: 'GET_PROJECT',
url: ApiTable.putProject,
msg: { error: '编辑工程信息失败' },
// reducer: { name: 'reportstatistic' }
});
}
export function getHighways(query) {
@ -163,7 +163,7 @@ export function getHighways(query) {
actionType: 'GET_HIGHWAYS',
url: ApiTable.getHighways,
msg: { error: '获取路政信息失败' },
// reducer: { name: 'reportstatistic' }
});
}
export function putHighways(query) {
@ -174,7 +174,7 @@ export function putHighways(query) {
actionType: 'GET_HIGHWAYS',
url: ApiTable.putHighways,
msg: { error: '编辑路政信息失败' },
// reducer: { name: 'reportstatistic' }
});
}
export function getCircuit(query) {
@ -185,7 +185,7 @@ export function getCircuit(query) {
actionType: 'GET_CIRCUIT',
url: ApiTable.getCircuit,
msg: { error: '获取线路信息失败' },
// reducer: { name: 'reportstatistic' }
});
}
export function putCircuit(query) {
@ -196,7 +196,7 @@ export function putCircuit(query) {
actionType: 'PUT_CIRCUIT',
url: ApiTable.putCircuit,
msg: { error: '编辑线路信息失败' },
// reducer: { name: 'reportstatistic' }
});
}
export function getVehicle(query) {
@ -207,7 +207,7 @@ export function getVehicle(query) {
actionType: 'GET_VEHICLE',
url: ApiTable.getVehicle,
msg: { error: '获取车辆信息失败' },
// reducer: { name: 'reportstatistic' }
});
}
export function putVehicle(query) {
@ -218,7 +218,7 @@ export function putVehicle(query) {
actionType: 'PUT_VEHICLE',
url: ApiTable.putVehicle,
msg: { error: '编辑车辆信息失败' },
// reducer: { name: 'reportstatistic' }
});
}
export function delRoadway(query) {
@ -228,7 +228,7 @@ export function delRoadway(query) {
actionType: 'DEL_ROADWAY',
url: ApiTable.delRoadway.replace("{roadId}", query?.roadId),
msg: { error: '删除车辆信息失败' },
// reducer: { name: 'reportstatistic' }
});
}
export function delProject(query) {
@ -238,7 +238,7 @@ export function delProject(query) {
actionType: 'DEL_PROJECT',
url: ApiTable.delProject.replace("{projectId}", query?.projectId),
msg: { error: '删除工程信息失败' },
// reducer: { name: 'reportstatistic' }
});
}
export function delBridge(query) {
@ -248,7 +248,7 @@ export function delBridge(query) {
actionType: 'DEL_BRIDGE',
url: ApiTable.delBridge.replace("{bridgeId}", query?.bridgeId),
msg: { error: '删除桥梁信息失败' },
// reducer: { name: 'reportstatistic' }
});
}
export function delSpecificVehicle(query) {
@ -258,7 +258,7 @@ export function delSpecificVehicle(query) {
actionType: 'DEL_SPECIFICVENICLE',
url: ApiTable.delSpecificVehicle.replace("{vehicleId}", query?.vehicleId),
msg: { error: '删除车辆信息失败' },
// reducer: { name: 'reportstatistic' }
});
}
export function delHouseholds(query) {
@ -268,7 +268,7 @@ export function delHouseholds(query) {
actionType: 'DEL_HOUSEHOLDS',
url: ApiTable.delHouseholds.replace("{businessId}", query?.businessId),
msg: { error: '删除业户信息失败' },
// reducer: { name: 'reportstatistic' }
});
}
export function delCircuit(query) {
@ -278,7 +278,7 @@ export function delCircuit(query) {
actionType: 'DEL_CIRCUIT',
url: ApiTable.delCircuit.replace("{lineId}", query?.lineId),
msg: { error: '删除运营线路信息失败' },
// reducer: { name: 'reportstatistic' }
});
}
export function delVehicle(query) {
@ -288,7 +288,7 @@ export function delVehicle(query) {
actionType: 'DEL_VEHICLE',
url: ApiTable.delVehicle.replace("{carId}", query?.carId),
msg: { error: '删除车辆信息失败' },
// reducer: { name: 'reportstatistic' }
});
}
@ -300,7 +300,7 @@ export function getPurchase(query) {
actionType: 'GET_PURCHASE',
url: ApiTable.getPurchase,
msg: { error: '获取治超信息失败' },
// reducer: { name: 'reportstatistic' }
});
}
export function putPurchase(query) {
@ -311,7 +311,7 @@ export function putPurchase(query) {
actionType: 'PUT_PURCHASE',
url: ApiTable.putPurchase,
msg: { error: '获取治超信息失败' },
// reducer: { name: 'reportstatistic' }
});
}
export function delPurchase(query) {
@ -321,6 +321,6 @@ export function delPurchase(query) {
actionType: 'DEL_PURCHASE',
url: ApiTable.delPurchase.replace("{overspeedId}", query?.overspeedId),
msg: { error: '删除车辆信息失败' },
// reducer: { name: 'reportstatistic' }
});
}

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

@ -10,9 +10,9 @@ import UserModal from './infor/details';
const enforceTable = (props) => {
const { dispatch, user, depData, depMessage, depLoading } = props
const [rowSelected, setRowSelected] = useState([])
const [regionId, setRegionId] = useState()//区域id
const [placeType, setPlaceType] = useState()//场所
const [day, setDay] = useState([moment('2022-03-01').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')])//日期
// const [regionId, setRegionId] = useState()//区域id
// const [placeType, setPlaceType] = useState()//场所
// const [day, setDay] = useState([moment('2022-03-01').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')])//日期
const [sitename, setSitename] = useState()//场所名称
const [counts, setCounts] = useState()//shuju
const [modalVisible, setModalVisible] = useState(false);
@ -95,7 +95,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time3',
valueType: 'dateRange',
initialValue: day,
width: 120,
@ -110,7 +110,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time4',
valueType: 'dateRange',
initialValue: day,
width: 120,
render: (dom, record) => {
@ -124,7 +124,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time5',
valueType: 'dateRange',
initialValue: day,
width: 120,
render: (dom, record) => {
@ -138,7 +138,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time6',
valueType: 'dateRange',
initialValue: day,
width: 120,
render: (dom, record) => {
@ -152,7 +152,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time7',
valueType: 'dateRange',
initialValue: day,
width: 120,
render: (dom, record) => {
@ -166,7 +166,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time8',
valueType: 'dateRange',
initialValue: day,
width: 120,
render: (dom, record) => {
@ -180,7 +180,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -195,7 +195,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -210,7 +210,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -225,7 +225,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -240,7 +240,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -255,7 +255,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -270,7 +270,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -285,7 +285,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -300,7 +300,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -315,7 +315,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -330,7 +330,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -345,7 +345,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -360,7 +360,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -375,7 +375,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -390,7 +390,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -405,7 +405,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -420,7 +420,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -435,7 +435,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -450,7 +450,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -465,7 +465,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -480,7 +480,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -495,7 +495,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -510,7 +510,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -525,7 +525,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -540,7 +540,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -555,7 +555,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -570,7 +570,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -585,7 +585,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -600,7 +600,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -615,7 +615,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -630,7 +630,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -645,7 +645,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -660,7 +660,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -675,7 +675,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -690,7 +690,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -705,7 +705,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -720,7 +720,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -735,7 +735,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -750,7 +750,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -765,7 +765,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -780,7 +780,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -795,7 +795,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -810,7 +810,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -825,7 +825,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -840,7 +840,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -855,7 +855,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -870,7 +870,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -885,7 +885,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -900,7 +900,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -915,7 +915,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -930,7 +930,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -945,7 +945,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -960,7 +960,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -975,7 +975,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -990,7 +990,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -1005,7 +1005,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -1020,7 +1020,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -1035,7 +1035,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -1050,7 +1050,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -1065,7 +1065,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -1080,7 +1080,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -1095,7 +1095,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -1110,7 +1110,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -1125,7 +1125,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -1140,7 +1140,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -1155,7 +1155,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -1171,7 +1171,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -1186,7 +1186,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -1201,7 +1201,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -1216,7 +1216,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -1231,7 +1231,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -1246,7 +1246,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -1261,7 +1261,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -1276,7 +1276,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -1291,7 +1291,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -1306,7 +1306,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -1321,7 +1321,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -1336,7 +1336,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -1351,7 +1351,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -1366,7 +1366,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -1381,7 +1381,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -1396,7 +1396,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -1411,7 +1411,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -1426,7 +1426,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -1441,7 +1441,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -1456,7 +1456,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -1471,7 +1471,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,
@ -1486,7 +1486,7 @@ const openModal = (type, record) => {
search: false,
dataIndex: 'time9',
valueType: 'dateRange',
initialValue: day,
width: 140,

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

@ -3,6 +3,7 @@ import { connect } from 'react-redux';
import { Form, Spin, Table } from 'antd';
import { ModalForm, ProForm, ProFormText,ProFormSelect } from '@ant-design/pro-form';
import { putOperaTional,putHighways } from "../../actions/infor"
import { _ } from 'lodash'
const HightModal = (props) => {
const { visible, onVisibleChange, typecard, rewkeys, recortd, dispatch, setRecortd } = props

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

@ -2,9 +2,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 { putRoadway, putSpecificVehicle, putHouseholds,putCircuit,putVehicle,putPurchase } from "../../actions/infor"
import { putRoadway, putSpecificVehicle, putHouseholds, putCircuit, putVehicle, putPurchase } from "../../actions/infor"
import { putBridge } from "../../actions/infor"
import _ from 'lodash'
const UserModal = (props) => {
const { visible, onVisibleChange, typecard, rewkeys, data, recortd, sitename, dispatch, setRecortd, setMonitor } = props
const [newlys, setNewlys] = useState() //必填数据
@ -52,13 +52,13 @@ const UserModal = (props) => {
setNewlysay(array)
// console.log(array)
}if (rewkeys === 'xianlu') {
} if (rewkeys === 'xianlu') {
_.forIn(data, function (value, key) {
array.push({ name: value, type: key })
});
setNewlys(array?.splice(0, 2))
setNewlysay(array)
}if (rewkeys === 'cheliang') {
} if (rewkeys === 'cheliang') {
_.forIn(data, function (value, key) {
array.push({ name: value, type: key })
});
@ -117,14 +117,14 @@ const UserModal = (props) => {
setRecordsay(arr.splice(1, 2))
// setEstablishment(arr.splice(-1, 1))
setRecords(arr)
}if (rewkeys === 'cheliang') {
} if (rewkeys === 'cheliang') {
_.forIn(recortd, function (value, key) {
arr.push({ value: value, type: key })
});
setRecordsay(arr.splice(1, 2))
// setEstablishment(arr.splice(-1, 1))
setRecords(arr)
}if (rewkeys === 'zhichao') {
} if (rewkeys === 'zhichao') {
_.forIn(recortd, function (value, key) {
arr.push({ value: value, type: key })
});
@ -212,10 +212,10 @@ const UserModal = (props) => {
})
return true
}
}if (rewkeys === 'xianlu') {
} if (rewkeys === 'xianlu') {
if (typecard == '111') {
console.log(values)
const query = { ...values, lineId:records?.[0]?.value || '' }
const query = { ...values, lineId: records?.[0]?.value || '' }
dispatch(putCircuit(query)).then((res) => {
setSuccess(res.success)
})
@ -231,7 +231,7 @@ const UserModal = (props) => {
if (rewkeys === 'cheliang') {
if (typecard == '111') {
console.log(values)
const query = { ...values, carId:records?.[0]?.value || '' }
const query = { ...values, carId: records?.[0]?.value || '' }
dispatch(putVehicle(query)).then((res) => {
setSuccess(res.success)
})
@ -247,7 +247,7 @@ const UserModal = (props) => {
if (rewkeys === 'zhichao') {
if (typecard == '111') {
console.log(values)
const query = { ...values, overspeedId:records?.[0]?.value || '' }
const query = { ...values, overspeedId: records?.[0]?.value || '' }
dispatch(putPurchase(query)).then((res) => {
setSuccess(res.success)
setMonitor(res)

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

@ -1,10 +1,10 @@
import React, { useEffect, useState,useRef } from 'react';
import React, { useEffect, useState, useRef } from 'react';
import { connect } from 'react-redux';
import { Spin, Button, Popconfirm, Col, Input,Row } from 'antd';
import { Spin, Button, Popconfirm, Col, Input, Row } from 'antd';
import ProTable from '@ant-design/pro-table';
import './protable.less'
import moment from 'moment';
import { getPurchase,delPurchase } from "../actions/infor"
import { getPurchase, delPurchase } from "../actions/infor"
import UserModal from './infor/details';
const InForTable = (props) => {
@ -24,7 +24,7 @@ const InForTable = (props) => {
const [overrunRateFloor, setOverrunRateFloor] = useState()//超限率下限
const [testTime, setTestTime] = useState()//超限率下限
const ref = useRef()
useEffect(() => { ref.current.reload() }, [monitor,delet,modalVisible])
useEffect(() => { ref.current.reload() }, [monitor, delet, modalVisible])
//打开弹窗
const openModal = (type, record) => {
setModalVisible(true);
@ -86,7 +86,7 @@ const InForTable = (props) => {
placeholder: '请输入车牌号进行搜索',
getPopupContainer: (triggerNode) => triggerNode.parentNode,
}
},{
}, {
title: '车牌号码',
// search: false,
dataIndex: 'containers444',
@ -138,18 +138,18 @@ const InForTable = (props) => {
return <Input.Group >
<Row gutter={8}>
<Col span={8}>
<Input
onChange={(value)=>{
setOverrunRateUpper(value.currentTarget.value)
}}
placeholder='输入超限率上限'/>
<Input
onChange={(value) => {
setOverrunRateUpper(value.currentTarget.value)
}}
placeholder='输入超限率上限' />
</Col>
<Col span={8}>
<Input
onChange={(value)=>{
setOverrunRateFloor(value.currentTarget.value)
}}
placeholder='输入超限率下限'/>
onChange={(value) => {
setOverrunRateFloor(value.currentTarget.value)
}}
placeholder='输入超限率下限' />
</Col>
</Row>
</Input.Group>
@ -200,15 +200,16 @@ const InForTable = (props) => {
}, {
title: '检测时间',
// search: false,
width: 140,
key: 'since',
dataIndex: 'createdAt',
valueType: 'dateTime',
width: 120,
valueType: 'date',
render: (dom, record) => {
return record.testTime
},
fieldProps: {
onChange: (value, cs) => {
console.log(cs)
setTestTime(cs)
},
getPopupContainer: (triggerNode) => triggerNode.parentNode,
@ -364,14 +365,14 @@ const InForTable = (props) => {
setRecortd(record)
}}
>编辑</Button><Button type="link"
onClick={() => {
const query = {
overspeedId: record.id
}
dispatch(delPurchase(query)).then((res) => {
setDelet(res)
})
}}
onClick={() => {
const query = {
overspeedId: record.id
}
dispatch(delPurchase(query)).then((res) => {
setDelet(res)
})
}}
>删除</Button></div>
}
@ -411,7 +412,7 @@ const InForTable = (props) => {
<Spin spinning={false}>
<div className='protable-transpor'>
<ProTable
actionRef={ref}
actionRef={ref}
scroll={{ x: 800 }}
options={false}
ref={c => { finishedProductTable = c; }}
@ -436,12 +437,12 @@ const InForTable = (props) => {
}}
request={async (params) => {
const query = {
nameOfInspectionPoint:nameOfInspectionPoint,
licensePlate:licensePlate,
numberOfAxles:numberOfAxles,
overrunRateUpper:overrunRateUpper,
overrunRateFloor:overrunRateFloor,
testTime:testTime
nameOfInspectionPoint: nameOfInspectionPoint,
licensePlate: licensePlate,
numberOfAxles: numberOfAxles,
overrunRateUpper: overrunRateUpper,
overrunRateFloor: overrunRateFloor,
testTime: testTime
}
setRowSelected([]);
const res = await dispatch(getPurchase(query));
@ -466,7 +467,7 @@ const InForTable = (props) => {
>
</ProTable></div>
{modalVisible ? <UserModal
{modalVisible ? <UserModal
visible={modalVisible}
onVisibleChange={setModalVisible}
modalRecord={modalRecord}
@ -481,7 +482,7 @@ const InForTable = (props) => {
</Spin >
)
}
const data={
const data = {
"districtcounty": "区/县",
"nameOfInspectionPoint": "检测点名称",
"licensePlate": "车牌号码",

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

@ -3,6 +3,7 @@ import { connect } from 'react-redux';
import { Form, Spin, Table } from 'antd';
import { DrawerForm, ProForm, ProFormText,ProFormSelect } from '@ant-design/pro-form';
import { putProject } from "../../actions/infor"
import { _ } from 'lodash'
const data = {
"entryName": "项目名称",

14
web/client/src/sections/fillion/components/promotionalTable.js

@ -111,13 +111,13 @@ const promotionalTable = (props) => {
dataSource={(counts || {}).rows || []}
request={async (params) => {
const query = {
startDate: day[0],
endDate: day[1],
placeType: placeType,
regionId: regionId,
placeName: sitename,
limit: params.pageSize,
offset: ((params.current ? params.current : 1) - 1) * params.pageSize
// startDate: day[0],
// endDate: day[1],
// placeType: placeType,
// regionId: regionId,
// placeName: sitename,
// limit: params.pageSize,
// offset: ((params.current ? params.current : 1) - 1) * params.pageSize
}
setRowSelected([]);
const res = await dispatch(getReportStatistic(query));

Loading…
Cancel
Save