zcloud_gbs
/
zcloud-gbs-primeport-react
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改 人员 车辆 进出港记录

master
853931625@qq.com 2026-08-13 13:45:32 +08:00
parent 958d461505
commit 2ba1b5b087
15 changed files with 77 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/branchPersonnelAndVehicles/index.js
View File

@ -4,3 +4,7 @@ export const branchPersonnelAndVehiclesList = declareRequest(
"branchPersonnelAndVehiclesLoading",
`Get > /primeport/vehicleApply/fgsCount`,
);
export const residentCorpAccessCount = declareRequest(
"branchPersonnelAndVehiclesLoading",
`Post > /primeport/vehicleApply/residentCorpAccessCount`,
);

4
src/api/enclosedPersonnelAndVehicleStatistics/index.js
View File

@ -7,7 +7,7 @@ export const enclosedPersonnelAndVehicleStatisticsList = declareRequest(
export const enclosedPersonnelAndVehicleStatisticsVehicleEntryAndExitRecordsList
= declareRequest(
"enclosedPersonnelAndVehicleStatisticsLoading",
`Post > @/primeport/`,
`Post > @/primeport/dahuaVehicleAccessRecord/list`,
);
export const enclosedPersonnelAndVehicleStatisticsPersonnelEntryAndExitRecordsList
= declareRequest(
@ -17,5 +17,5 @@ export const enclosedPersonnelAndVehicleStatisticsPersonnelEntryAndExitRecordsLi
export const eVehicleArrivalDepartureInfoList
= declareRequest(
"enclosedPersonnelAndVehicleStatisticsLoading",
`Post > @/primeport/eVehicleArrivalDepartureInfo/list`,
`Post > @/primeport/dahuaVehicleAccessRecord/list`,
);

2
src/api/stockPersonnelAndVehicles/index.js
View File

@ -25,5 +25,5 @@ export const stockPersonnelAndVehiclesVehicleManagementVehicleRecordsList
export const mkmjSwipeCardRecordList = declareRequest(
"stockPersonnelAndVehiclesLoading",
`Post > @/primeport/mkmjSwipeCardRecord/list`,
`Post > @/primeport/dahuaAccessRecord/list`,
)

2
src/api/vehicleApply/index.js
View File

@ -43,5 +43,5 @@ export const inspectDepartmentVehiclesUpdate = declareRequest(
export const eVehicleArrivalDepartureInfoList
= declareRequest(
"vehicleApplyLoading",
`Post > @/primeport/eVehicleArrivalDepartureInfo/list`,
`Post > @/primeport/dahuaVehicleAccessRecord/list`,
);

2
src/pages/Container/Enterprise/EnclosedArea/EnterprisePersonnelPermissions/List/index.js
View File

@ -125,7 +125,7 @@ function List(props) {
<Button
type="link"
onClick={() => {
props.history.push(`./personnelRecords?userCard=${ record.userIdCard ? atob(record.userIdCard) : "" }`);
props.history.push(`./personnelRecords?userCard=${record.id}`);
}}
>
人员进出记录

8
src/pages/Container/Enterprise/EnclosedArea/EnterprisePersonnelPermissions/PersonnelRecords/index.js
View File

@ -22,7 +22,7 @@ function PersonnelRecords(props) {
transform: values => ({
swingTimeStart: values.time?.[0] ? `${values.time?.[0]} 00:00:00` : undefined,
swingTimeEnd: values.time?.[1] ? `${values.time?.[1]} 23:59:59` : undefined,
cardNo: query.userCard
userId: query.userCard
// cardNo: window.btoa("130302197401180816")
}),
@ -33,7 +33,7 @@ function PersonnelRecords(props) {
<Search
options={[
{ name: "time", label: "进出港时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE },
{ name: "likeDeviceName", label: "口门名称" },
{ name: "mkmjName", label: "口门名称" },
]}
onFinish={getData}
form={form}
@ -42,8 +42,8 @@ function PersonnelRecords(props) {
columns={[
{ title: "姓名", dataIndex: "personName" },
{ title: "进出港时间", dataIndex: "swingTime" },
{ title: "口门名称", dataIndex: "deviceName" },
{ title: "开门类型", dataIndex: "openTypeStr" },
{ title: "口门名称", dataIndex: "mkmjName" },
{ title: "开门类型", dataIndex: "enterOrExit",render:(_, record) => (record.enterOrExit ===1?"进":record.enterOrExit ===2?"出":record.enterOrExit ===3?"进出":"") },
]}
{...tableProps}
/>

35
src/pages/Container/Stakeholder/FirstLevelDoor/VehicleApplication/Add/index.js
View File

@ -39,7 +39,6 @@ function Add(props) {
const getApprovalUserListAll = async () => {
const { data } = await props["approvalUserListAll"]({ vehiclePermissionFlag: 1 });
console
setApprovalUserListAll(data);
};
@ -181,23 +180,23 @@ function Add(props) {
),
},
{ name: "area", label: "访问港区", onlyForLabel: true },
{
name: "mkmjId",
label: "访问口门名称",
render: FORM_ITEM_RENDER_ENUM.SELECT,
items: firstLevelDoorInfoListAll,
itemsField: { labelKey: "mkmjName", valueKey: "id" },
componentProps: {
onChange: event =>
form.setFieldValue("mkmjName", getLabelName({
list: firstLevelDoorInfoListAll,
status: event,
idKey: "id",
nameKey: "mkmjName",
})),
},
},
{ name: "mkmjName", label: "访问口门名称", onlyForLabel: true },
// {
// name: "mkmjId",
// label: "访问口门名称",
// render: FORM_ITEM_RENDER_ENUM.SELECT,
// items: firstLevelDoorInfoListAll,
// itemsField: { labelKey: "mkmjName", valueKey: "id" },
// componentProps: {
// onChange: event =>
// form.setFieldValue("mkmjName", getLabelName({
// list: firstLevelDoorInfoListAll,
// status: event,
// idKey: "id",
// nameKey: "mkmjName",
// })),
// },
// },
// { name: "mkmjName", label: "访问口门名称", onlyForLabel: true },
{
name: "drivingUserId",
label: "驾驶人员",

1
src/pages/Container/Supervision/EnclosedArea/PersonnelAndVehicleStatistics/List/index.js
View File

@ -30,6 +30,7 @@ function List(props) {
form,
params: { parentId: urlState.parentId },
manual: true,
});
useEffect(() => {

34
src/pages/Container/Supervision/EnclosedArea/PersonnelAndVehicleStatistics/VehicleEntryAndExitRecords/index.js
View File

@ -22,32 +22,36 @@ function VehicleEntryAndExitRecords(props) {
const { tableProps, getData } = useTable(props["enclosedPersonnelAndVehicleStatisticsVehicleEntryAndExitRecordsList"], {
form,
params: { id: query.id },
transform: values => ({
startVehicleArrivalTime: values.time?.[0] ? `${values.vehicleArrivalTime?.[0]} 00:00:00` : undefined,
endVehicleArrivalTime: values.time?.[1] ? `${values.vehicleArrivalTime?.[1]} 23:59:59` : undefined,
startVehicleDepartureTime: values.time?.[0] ? `${values.vehicleDepartureTime?.[0]} 00:00:00` : undefined,
endVehicleDepartureTime: values.time?.[1] ? `${values.vehicleDepartureTime?.[1]} 23:59:59` : undefined,
}),
});
return (
<Page headerTitle="车辆进出记录">
<Page headerTitle="车辆进出记录1">
<Search
options={[
{ name: "todo1", label: "车牌号" },
{ name: "todo2", label: "时间范围", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE },
{ name: "todo3", label: "车辆属性", render: FORM_ITEM_RENDER_ENUM.SELECT, items: CATEGORY_ENUM },
{ name: "vehiclePlateNumber", label: "车牌号" },
{ name: "vehicleArrivalTime", label: "进场时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE },
{ name: "vehicleDepartureTime", label: "出场时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE },
// { name: "todo3", label: "车辆属性", render: FORM_ITEM_RENDER_ENUM.SELECT, items: CATEGORY_ENUM },
]}
form={form}
onFinish={getData}
/>
<Table
columns={[
{ title: "车辆类型", dataIndex: "todo1" },
{ title: "车牌号", dataIndex: "todo2" },
{
title: "车辆属性",
dataIndex: "todo3",
render: (_, record) => getLabelName({ list: CATEGORY_ENUM, status: record.todo3 }),
},
{ title: "姓名", dataIndex: "todo4" },
{ title: "手机号", dataIndex: "todo5" },
{ title: "口门名称", dataIndex: "todo6" },
{ title: "记录时间", dataIndex: "todo7" },
{ title: "车辆类型", dataIndex: "carTypeName" },
{ title: "进场车牌号", dataIndex: "carNum" },
{ title: "出场车牌号", dataIndex: "exitCarNum" },
{ title: "停车场名称", dataIndex: "parkingLotName" },
{ title: "进场通道名称", dataIndex: "enterSluiceChannelName" },
{ title: "进场通道名称", dataIndex: "exitSluiceChannelName" },
{ title: "进场时间", dataIndex: "enterTime" },
{ title: "出场时间", dataIndex: "exitTime" },
{ title: "出入动作", dataIndex: "todo8" },
]}
{...tableProps}

8
src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/InspectDepartmentVehicles/List/index.js
View File

@ -1,6 +1,7 @@
import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Descriptions, Divider, message, Modal, Space } from "antd";
import dayjs from "dayjs";
import { useState } from "react";
import FormBuilder from "zy-react-library/components/FormBuilder";
import AddIcon from "zy-react-library/components/Icon/AddIcon";
@ -113,7 +114,7 @@ function List(props) {
<Button
type="link"
onClick={() => {
props.history.push(`./vehicleRecords?vehicleId=${record.id}`);
props.history.push(`./vehicleRecords?licenceNo=${record.licenceNo}`);
}}
>
车辆进出记录
@ -175,6 +176,7 @@ const AddModalComponent = (props) => {
let outsideSuccess = false;
const submitInspectCarList = (values.inspectCarList || []).map((item) => ({
...item,
visitStartTime: formatSubmitDate(item.visitStartTime),
visitEndTime: formatSubmitDate(item.visitEndTime),
}));
const submitValues = {
@ -222,13 +224,15 @@ const AddModalComponent = (props) => {
span={24}
labelCol={{ span: 10 }}
values={{
remarks: info.checkDepartmentName,
checkDepartmentName: info.checkDepartmentName,
inspectCarList: [{
licenceType: info.licenceType,
licenceTypeName: info.licenceTypeName,
licenceNo: info.licenceNo,
vehicleType: info.vehicleType,
vehicleTypeName: info.vehicleTypeName,
visitStartTime: info.visitStartTime ? dayjs(info.visitStartTime) : undefined,
visitEndTime: info.visitEndTime ? dayjs(info.visitEndTime) : undefined,
}],
}}
options={[

6
src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/PortBasedUnitsPersonnelAndVehicles/List/index.js
View File

@ -9,7 +9,7 @@ import { NS_BRANCH_PERSONNEL_AND_VEHICLES } from "~/enumerate/namespace";
function List(props) {
const [form] = Search.useForm();
const { tableProps, getData } = useTable(props["branchPersonnelAndVehiclesList"], {
const { tableProps, getData } = useTable(props["residentCorpAccessCount"], {
form,
params: { corpType: 2 },
});
@ -26,8 +26,8 @@ function List(props) {
<Table
columns={[
{ title: "驻港单位名称", dataIndex: "corpName" },
{ title: "人员进出数", dataIndex: "userCount" },
{ title: "人员车辆进出数", dataIndex: "priCarCount" },
{ title: "人员进出数", dataIndex: "personAccessCount" },
{ title: "人员车辆进出数", dataIndex: "vehicleAccessCount" },
{
title: "操作",
width: 150,

2
src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StockPersonnelAndVehicles/List/index.js
View File

@ -119,7 +119,7 @@ function List(props) {
type="link"
onClick={() => {
// TODO
props.history.push(`./personnelRecords?userCard=${record.userCard}`);
props.history.push(`./personnelRecords?userCard=${record.id}`);
}}
>
人员进出记录

8
src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StockPersonnelAndVehicles/PersonnelRecords/index.js
View File

@ -23,7 +23,7 @@ function PersonnelRecords(props) {
transform: values => ({
swingTimeStart: values.time?.[0] ? `${values.time?.[0]} 00:00:00` : undefined,
swingTimeEnd: values.time?.[1] ? `${values.time?.[1]} 23:59:59` : undefined,
cardNo: query.userCard,
userId: query.userCard,
// cardNo: window.btoa("130302197401180816")
}),
@ -34,7 +34,7 @@ function PersonnelRecords(props) {
<Search
options={[
{ name: "time", label: "进出港时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE },
{ name: "likeDeviceName", label: "口门名称" },
{ name: "mkmjName", label: "口门名称" },
]}
onFinish={getData}
form={form}
@ -43,8 +43,8 @@ function PersonnelRecords(props) {
columns={[
{ title: "姓名", dataIndex: "personName" },
{ title: "进出港时间", dataIndex: "swingTime" },
{ title: "口门名称", dataIndex: "deviceName" },
{ title: "开门类型", dataIndex: "openTypeStr" },
{ title: "口门名称", dataIndex: "mkmjName" },
{ title: "开门类型", dataIndex: "enterOrExit",render:(_, record) => (record.enterOrExit ===1?"进":record.enterOrExit ===2?"出":record.enterOrExit ===3?"进出":"") },
]}
{...tableProps}
/>

2
src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StockPersonnelAndVehicles/VehicleManagement/List/index.js
View File

@ -148,7 +148,7 @@ function List(props) {
type="link"
danger
onClick={() => {
onDelete(record.id);
onDelete(record);
}}
>
删除

24
src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StockVehicles/VehicleRecords/index.js
View File

@ -17,12 +17,12 @@ function VehicleRecords(props) {
form,
usePermission:false,
transform: values => ({
startVehicleArrivalTime: values.time?.[0] ? `${values.time?.[0]} 00:00:00` : undefined,
endVehicleArrivalTime: values.time?.[1] ? `${values.time?.[1]} 23:59:59` : undefined,
startVehicleDepartureTime: values.vehicleDepartureTime?.[0] ? `${values.vehicleDepartureTime?.[0]} 00:00:00` : undefined,
endVehicleDepartureTime: values.vehicleDepartureTime?.[1] ? `${values.vehicleDepartureTime?.[1]} 23:59:59` : undefined,
enterTimeStart: values.time?.[0] ? `${values.time?.[0]} 00:00:00` : undefined,
enterTimeEnd: values.time?.[1] ? `${values.time?.[1]} 23:59:59` : undefined,
exitTimeStart: values.vehicleDepartureTime?.[0] ? `${values.vehicleDepartureTime?.[0]} 00:00:00` : undefined,
exitTimeEnd: values.vehicleDepartureTime?.[1] ? `${values.vehicleDepartureTime?.[1]} 23:59:59` : undefined,
}),
params: { vehiclePlateNumber: "冀CDF5665" }// query.licenceNo
params: { carNum: query.licenceNo }
});
return (
@ -38,16 +38,16 @@ function VehicleRecords(props) {
/>
<Table
columns={[
{ title: "车辆所属人", dataIndex: "vehicleContactName" },
{ title: "车牌号", dataIndex: "vehiclePlateNumber" },
{ title: "车辆所属人", dataIndex: "vehicleOwnerName" },
{ title: "车牌号", dataIndex: "carNum" },
{
title: "车辆在港状态",
dataIndex: "vehicleArrivalStatus",
dataIndex: "vehiclePortStatus",
},
{ title: "入港闸口", dataIndex: "vehicleArrivalBarrier" },
{ title: "进港时间", dataIndex: "vehicleArrivalTime" },
{ title: "离港闸口", dataIndex: "vehicleDepartureBarrier" },
{ title: "离港时间", dataIndex: "vehicleDepartureTime" },
{ title: "入港闸口", dataIndex: "enterSluiceChannelName" },
{ title: "进港时间", dataIndex: "enterTime" },
{ title: "离港闸口", dataIndex: "exitTime" },
{ title: "离港时间", dataIndex: "exitSluiceChannelName" },
]}
{...tableProps}
/>