修改地图依赖
parent
232180c28d
commit
538d2b1485
BIN
primeport.zip
BIN
primeport.zip
Binary file not shown.
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -346,7 +346,7 @@ const AddModalComponent = (props) => {
|
|||
},
|
||||
{ name: "mkmjTypeName", label: "口门类型名称", onlyForLabel: true },
|
||||
{ name: "remarks", label: "口门位置" },
|
||||
{ customizeRender: true, span: 24, render: <Map type="cesium" /> },
|
||||
{ name: "map", customizeRender: true, span: 24, render: <Map type="cesium" /> },
|
||||
{ name: "mkmjStatus", label: "口门状态", render: FORM_ITEM_RENDER_ENUM.SELECT, items: AREA_STATUS_ENUM },
|
||||
{
|
||||
name: "inDirectionArea",
|
||||
|
|
|
|||
|
|
@ -256,7 +256,7 @@ const AddModalComponent = (props) => {
|
|||
{ name: "gateCategoryName", label: "闸机类别名称", onlyForLabel: true },
|
||||
{ name: "gateModel", label: "闸机型号" },
|
||||
{ name: "gatePosition", label: "闸机位置" },
|
||||
{ key: "map", customizeRender: true, render: <Map type="cesium" /> },
|
||||
{ name: "map", customizeRender: true, render: <Map type="cesium" /> },
|
||||
{ name: "gateStatus", label: "闸机状态", render: FORM_ITEM_RENDER_ENUM.SELECT, items: FARE_GATE_STATUS_ENUM },
|
||||
]}
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -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: <Map type="cesium" /> },
|
||||
{ name: "map", customizeRender: true, render: <Map type="cesium" /> },
|
||||
]}
|
||||
/>
|
||||
</Modal>
|
||||
|
|
|
|||
|
|
@ -262,7 +262,7 @@ function AddModalComponent(props) {
|
|||
},
|
||||
{ name: "mkmjTypeName", label: "口门类型名称", onlyForLabel: true },
|
||||
{ name: "remarks", label: "口门位置" },
|
||||
{ key: "map", customizeRender: true, render: <Map type="cesium" /> },
|
||||
{ name: "map", customizeRender: true, render: <Map type="cesium" /> },
|
||||
{ name: "mkmjStatus", label: "口门状态", render: FORM_ITEM_RENDER_ENUM.SELECT, items: AREA_STATUS_ENUM },
|
||||
]}
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -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 },
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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("、") },
|
||||
|
|
|
|||
Loading…
Reference in New Issue