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

修改BUG

master
853931625@qq.com 2026-05-27 10:54:45 +08:00
parent ffd2b24659
commit 0abc3c3881
16 changed files with 105 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jjb.config.js
View File

@ -20,13 +20,14 @@ module.exports = {
},
},
// 应用唯一标识符
appIdentifier: "primeport-h5",
appIdentifier: "primeport",
// 应用上下文注入全局变量
contextInject: {
// 应用Key
appKey: "",
// fileUrl: "http://192.168.20.240:9787/mnt/",
fileUrl: "https://jpfz.qhdsafety.com/gbsFileTest/",
// fileUrl: "https://jpfz.qhdsafety.com/gbsFileTest/",
fileUrl: "https://skqhdg.porthebei.com:9004/file/uploadFiles2/",
},
// public/index.html注入全局变量
windowInject: {

4
package.json
View File

@ -6,8 +6,8 @@
"license": "MIT",
"main": "index.js",
"scripts": {
"serve": "node node_modules/@cqsjjb/scripts/webpack.dev.server.js",
"build": "node node_modules/@cqsjjb/scripts/webpack.build.js",
"serve": "node node_modules/@cqsjjb/scripts/rspack.dev.server.js",
"build": "node node_modules/@cqsjjb/scripts/rspack.build.js",
"push": "jjb-cmd push java production",
"clean-cache": "rimraf node_modules/.cache/webpack",
"serve:development": "cross-env NODE_ENV=development npm run serve",

5
src/api/approverUser/index.js
View File

@ -24,3 +24,8 @@ export const approvalUserAdd = declareRequest(
"approvalUserLoading",
`Post > @/primeport/mkmjApprovalUser/save`,
);
export const checkExistByUserId = declareRequest(
"approvalUserLoading",
`Get > /primeport/mkmjApprovalUser/checkExistByUserId/{userId}`,
);

34
src/pages/Container/Stakeholder/FirstLevelDoor/PersonnelApplication/Add/index.js
View File

@ -176,23 +176,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 },
{
customizeRender: true,
span: 24,

9
src/pages/Container/Stakeholder/FirstLevelDoor/PersonnelApplication/List/index.js
View File

@ -32,7 +32,7 @@ function List(props) {
<Search
labelCol={{ span: 4 }}
options={[
{ name: "todo1", label: "姓名" },
{ name: "employeePersonUserName", label: "姓名" },
{ name: "projectName", label: "项目名称" },
{
name: "auditFlag",
@ -209,10 +209,17 @@ const ViewModalComponent = (props) => {
{ label: "项目人员数", children: info.personApplyList?.length },
{ label: "申请时间", children: info.applyTime },
{ label: "申请状态", children: getLabelName({ list: ENCLOSED_AREA_AUDIT_STATUS_ENUM, status: info.auditFlag }) },
...(
info.auditFlag === 3 ? [
{ label: "驳回原因", children: info.reasonsRefusal },
] :[]
),
{ label: "申请人签字", children: (<PreviewImg files={info.informSignFile} />) },
]}
/>
<Divider orientation="left">人员信息</Divider>
<Table
options={false}
disabledResizer={true}

6
src/pages/Container/Stakeholder/FirstLevelDoor/VehicleApplication/List/index.js
View File

@ -142,6 +142,7 @@ function List(props) {
}
const ViewRejectReasonModal = (props) => {
return (
<Modal
open
@ -167,11 +168,12 @@ const ViewRejectReasonModal = (props) => {
const ViewModalComponent = (props) => {
const [info, setInfo] = useState({});
console.log(props);
const { loading: getFileLoading, getFile } = useGetFile();
const getData = async () => {
const { data } = await props["vehicleApplyInfo"]({ vehicleApplyId: props.id });
const { data } = await props["vehicleApplyInfo"]({ id: props.id });
const drivingLicenseFile = await getFile({
eqType: UPLOAD_FILE_TYPE_ENUM[601],
eqForeignKey: data.drivingLicenseId,

12
src/pages/Container/Supervision/FirstLevelDoor/ApproverUser/index.js
View File

@ -12,6 +12,7 @@ import Table from "zy-react-library/components/Table";
import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
import useTable from "zy-react-library/hooks/useTable";
import { NS_APPROVER_USER } from "~/enumerate/namespace";
import {checkExistByUserId} from "~/api/approverUser";
function ApproverUser(props) {
const [addModalVisible, setAddModalVisible] = useState(false);
@ -115,6 +116,7 @@ function ApproverUser(props) {
setAddModalVisible(false);
setCurrentId("");
}}
checkExistByUserId={props[checkExistByUserId]}
id={currentId}
getData={getData}
/>
@ -191,6 +193,8 @@ function AddModalComponent(props) {
form.setFieldValue("deptName", label);
}}
onChange={() => {
form.setFieldValue("userId", "");
form.setFieldValue("userName", "");
form.setFieldValue("corpId", "");
@ -213,6 +217,14 @@ function AddModalComponent(props) {
form.setFieldValue("userName", label);
}}
onGetOption={(option) => {
props.checkExistByUserId({userId:option.id}).then((res) => {
if(res.data){
if(!res.data.available){
form.setFieldValue("userId", undefined);
message.warning(res.data.availableMessage)
}
}
})
form.setFieldValue("corpId", option.corpinfoId);
form.setFieldValue("corpName", option.corpinfoName);
form.setFieldValue("postId", option.postId);

4
src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/Camera/BatchPlay/index.js
View File

@ -11,8 +11,8 @@ import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
import { buildPlayableVideoSource } from "~/utils/video";
const IS_ONLINE_ENUM = [
{ name: "否", bianma: "0" },
{ name: "是", bianma: "1" },
{ name: "离线", bianma: "0" },
{ name: "在线", bianma: "1" },
];
// 巡屏页：
// 1. 左侧树控制参与巡屏的视频范围

4
src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/Camera/List/index.js
View File

@ -13,7 +13,7 @@ import useTable from "zy-react-library/hooks/useTable";
import { getLabelName } from "zy-react-library/utils";
import { NS_FIRST_LEVEL_DOOR_INFO } from "~/enumerate/namespace";
import VideoPlayModal from "./components/VideoPlay";
import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
const IS_ONLINE_ENUM = [
{ name: "否", bianma: "0" },
{ name: "是", bianma: "1" },
@ -92,6 +92,8 @@ function List(props) {
onFinish={getData}
options={[
{ name: "videoResourceName", label: "视频名称" },
{ name: "eqIsOnline", label: "是否在线", render:FORM_ITEM_RENDER_ENUM.SELECT,items:IS_ONLINE_ENUM },
]}
/>
<Table

12
src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/Channel/FareGate/index.js
View File

@ -301,14 +301,14 @@ const InfoModalComponent = (props) => {
{
label: "地理位置",
children: (
<div style={{ display: "flex", alignItems: "center", gap: "8px" }}>
<Button type="text" style={{ display: "flex", alignItems: "center", gap: "8px" }} onClick={() => {
setMapVisible(true);
}}>
<span>{info.longitude}</span>
<span>--</span>
<span>{info.latitude}</span>
<LocationIcon onClick={() => {
setMapVisible(true);
}}
/>
</div>
</Button>
),
},
{ label: "闸机状态", children: getLabelName({ list: FARE_GATE_STATUS_ENUM, status: info.gateStatus }) },

14
src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/Channel/List/index.js
View File

@ -227,7 +227,7 @@ const AddModalComponent = (props) => {
label: "通道类型",
render: (
<DictionarySelect
dictValue="HGKM_MKMJ_PASSAGE_TYPE"
dictValue="HGKM_MKMJ_TYPE"
onGetLabel={label => form.setFieldValue("passageTypeName", label)}
/>
),
@ -276,14 +276,14 @@ const InfoModalComponent = (props) => {
{
label: "地理位置",
children: (
<div style={{ display: "flex", alignItems: "center", gap: "8px" }}>
<Button type="text" style={{ display: "flex", alignItems: "center", gap: "8px" }} onClick={() => {
setMapVisible(true);
}}>
<span>{info.longitude}</span>
<span>--</span>
<span>{info.latitude}</span>
<LocationIcon onClick={() => {
setMapVisible(true);
}}
/>
</div>
</Button>
),
},
]}

12
src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/List/index.js
View File

@ -308,14 +308,14 @@ function InfoModalComponent(props) {
{
label: "位置",
children: (
<div style={{ display: "flex", alignItems: "center", gap: "8px" }}>
<Button type="text" style={{ display: "flex", alignItems: "center", gap: "8px" }} onClick={() => {
setMapVisible(true);
}}>
<span>{info.longitude}</span>
<span>--</span>
<span>{info.latitude}</span>
<LocationIcon onClick={() => {
setMapVisible(true);
}}
/>
</div>
</Button>
),
},
]}

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

@ -152,6 +152,19 @@ function List(props) {
);
}
const formatSubmitDate = (value) => {
if (!value) {
return value;
}
if (typeof value === "string") {
return value.includes("T") ? value.split("T")[0] : value;
}
if (typeof value?.format === "function") {
return value.format("YYYY-MM-DD");
}
return value;
};
const AddModalComponent = (props) => {
const { info } = props;
const isEdit = !!info.id;
@ -160,9 +173,17 @@ const AddModalComponent = (props) => {
const onSubmit = async (values) => {
let outsideSuccess = false;
const submitInspectCarList = (values.inspectCarList || []).map((item) => ({
...item,
visitEndTime: formatSubmitDate(item.visitEndTime),
}));
const submitValues = {
...values,
inspectCarList: submitInspectCarList,
};
if (!isEdit) {
const { success } = await props["inspectDepartmentVehiclesAdd"]({
...values,
...submitValues,
vehicleBelongType: 7,
});
outsideSuccess = success;
@ -170,8 +191,8 @@ const AddModalComponent = (props) => {
else {
const { success } = await props["inspectDepartmentVehiclesUpdate"]({
id: info.id,
...values,
...values.inspectCarList[0],
...submitValues,
...submitInspectCarList[0],
vehicleBelongType: 7,
});
outsideSuccess = success;
@ -191,11 +212,11 @@ const AddModalComponent = (props) => {
width={600}
onCancel={props.onCancel}
onOk={form.submit}
// confirmLoading={props.vehicleApply.vehicleApplyLoading}
confirmLoading={props.vehicleApply.vehicleApplyLoading}
>
<FormBuilder
form={form}
// loading={props.vehicleApply.vehicleApplyLoading}
loading={props.vehicleApply.vehicleApplyLoading}
showActionButtons={false}
onFinish={onSubmit}
span={24}

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

@ -123,7 +123,7 @@ function List(props) {
重新申请
</Button>
)}
{props.permission(props.delBtn || "jgd-io-personal-vehicle-del") && (
{(props.permission(props.delBtn || "jgd-io-personal-vehicle-del") && record.auditFlag ===2) && (
<Button
type="link"
danger

3
src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StakeholderPersonnelAndVehicles/List/index.js
View File

@ -18,8 +18,7 @@ function List(props) {
<Search
labelCol={{ span: 4 }}
options={[
{ name: "name", label: "姓名" },
{ name: "projectName", label: "项目名称" },
{ name: "name", label: "相关方名称" },
]}
onFinish={getData}
form={form}

4
src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/PersonnelApproval/RelatedPersonnel/index.js
View File

@ -39,8 +39,8 @@ function RelatedPersonnel(props) {
form={form}
onFinish={getData}
options={[
{ name: "todo1", label: "姓名" },
{ name: "todo2", label: "项目名称" },
{ name: "employeePersonUserName", label: "姓名" },
{ name: "projectName", label: "项目名称" },
]}
/>
<Table