diff --git a/primeport.zip b/primeport.zip index 4d45a27..95d4448 100644 Binary files a/primeport.zip and b/primeport.zip differ diff --git a/src/main.js b/src/main.js index fe06365..3fe6ca0 100644 --- a/src/main.js +++ b/src/main.js @@ -9,8 +9,6 @@ getFileUrlFromServer(); require("antd/dist/reset.css"); require("zy-react-library/css/common.less"); -window.mapLongitude = "119.69457721306945"; -window.mapLatitude = "39.940504336846665"; dayjs.locale("zh-cn"); setJJBCommonAntdMessage(message); diff --git a/src/pages/Container/Supervision/EnclosedArea/AreaAndEntrance/EnclosedAreaDoor/List/index.js b/src/pages/Container/Supervision/EnclosedArea/AreaAndEntrance/EnclosedAreaDoor/List/index.js index dc18ea6..3af1cf7 100644 --- a/src/pages/Container/Supervision/EnclosedArea/AreaAndEntrance/EnclosedAreaDoor/List/index.js +++ b/src/pages/Container/Supervision/EnclosedArea/AreaAndEntrance/EnclosedAreaDoor/List/index.js @@ -346,7 +346,7 @@ const AddModalComponent = (props) => { }, { name: "mkmjTypeName", label: "口门类型名称", onlyForLabel: true }, { name: "remarks", label: "口门位置" }, - { customizeRender: true, span: 24, render: }, + { name: "map", customizeRender: true, span: 24, render: }, { name: "mkmjStatus", label: "口门状态", render: FORM_ITEM_RENDER_ENUM.SELECT, items: AREA_STATUS_ENUM }, { name: "inDirectionArea", diff --git a/src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/Channel/FareGate/index.js b/src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/Channel/FareGate/index.js index 2e6c024..7ceb355 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/Channel/FareGate/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/Channel/FareGate/index.js @@ -256,7 +256,7 @@ const AddModalComponent = (props) => { { name: "gateCategoryName", label: "闸机类别名称", onlyForLabel: true }, { name: "gateModel", label: "闸机型号" }, { name: "gatePosition", label: "闸机位置" }, - { key: "map", customizeRender: true, render: }, + { name: "map", customizeRender: true, render: }, { name: "gateStatus", label: "闸机状态", render: FORM_ITEM_RENDER_ENUM.SELECT, items: FARE_GATE_STATUS_ENUM }, ]} /> diff --git a/src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/Channel/List/index.js b/src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/Channel/List/index.js index d4cc8fe..0eea017 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/Channel/List/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/Channel/List/index.js @@ -234,7 +234,7 @@ const AddModalComponent = (props) => { }, { name: "passageTypeName", label: "通道类型名称", onlyForLabel: true }, { name: "passageStatus", label: "通道状态", render: FORM_ITEM_RENDER_ENUM.SELECT, items: CHANNEL_STATUS_ENUM }, - { key: "map", customizeRender: true, render: }, + { name: "map", customizeRender: true, render: }, ]} /> diff --git a/src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/List/index.js b/src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/List/index.js index 90c25f2..3d0c27f 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/List/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/List/index.js @@ -262,7 +262,7 @@ function AddModalComponent(props) { }, { name: "mkmjTypeName", label: "口门类型名称", onlyForLabel: true }, { name: "remarks", label: "口门位置" }, - { key: "map", customizeRender: true, render: }, + { name: "map", customizeRender: true, render: }, { name: "mkmjStatus", label: "口门状态", render: FORM_ITEM_RENDER_ENUM.SELECT, items: AREA_STATUS_ENUM }, ]} /> diff --git a/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryPersonnel/List/index.js b/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryPersonnel/List/index.js index 5d92a26..21e7741 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryPersonnel/List/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryPersonnel/List/index.js @@ -221,7 +221,10 @@ const ReviewModalComponent = (props) => { const getData = async () => { const { data } = await props["temporaryPersonnelInfo"]({ id: props.id }); - const informSignFile = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM[611], eqForeignKey: data.informSignId }); + let informSignFile = [] + if(data.informSignId){ + informSignFile = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM[611], eqForeignKey: data.informSignId }); + } setInfo({ ...data, informSignFile, @@ -263,7 +266,7 @@ const ReviewModalComponent = (props) => { items={[ { label: "访问人姓名", children: info.personApplyList?.[0].employeePersonUserName }, { label: "手机号", children: info.personApplyList?.[0].userPhone }, - { label: "身份证号", children: info.personApplyList?.[0].userCard }, + { label: "身份证号", children: info.personApplyList?.[0].userCard ? atob(info.personApplyList?.[0].userCard) : "" }, { label: "访问开始时间", children: info.visitStartTime }, { label: "访问结束时间", children: info.visitEndTime }, { diff --git a/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryPersonnel/View/index.js b/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryPersonnel/View/index.js index 58d20fe..f88cc30 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryPersonnel/View/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryPersonnel/View/index.js @@ -22,7 +22,12 @@ function View(props) { const getData = async () => { const { data } = await props["temporaryPersonnelInfo"]({ id: query.id }); - const informSignFile = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM[611], eqForeignKey: data.informSignId }); + let informSignFile = [] + + if(data.informSignId){ + informSignFile = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM[611], eqForeignKey: data.informSignId }); + } + setInfo({ ...data, informSignFile, @@ -44,7 +49,7 @@ function View(props) { items={[ { label: "访问人姓名", children: info.personApplyList?.[0].employeePersonUserName, span: 2 }, { label: "手机号", children: info.personApplyList?.[0].userPhone }, - { label: "身份证号", children: info.personApplyList?.[0].userCard }, + { label: "身份证号", children: info.personApplyList?.[0].userCard ? atob(info.personApplyList?.[0].userCard) : "" }, { label: "访问开始时间", children: info.visitStartTime }, { label: "访问结束时间", children: info.visitEndTime }, { label: "访问港区", children: info.gateLevelAuthArea && JSON.parse(info.gateLevelAuthArea).area.map(item => item.value).join("、") },