bug:16182、16148
parent
56692a4cb9
commit
62bcd55408
|
|
@ -6,8 +6,8 @@
|
|||
"license": "MIT",
|
||||
"main": "index.js",
|
||||
"scripts": {
|
||||
"serve": "node node_modules/@cqsjjb/scripts/rspack.dev.server.js",
|
||||
"build": "node node_modules/@cqsjjb/scripts/rspack.build.js",
|
||||
"serve": "node node_modules/@cqsjjb/scripts/webpack.dev.server.js",
|
||||
"build": "node node_modules/@cqsjjb/scripts/webpack.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",
|
||||
|
|
@ -34,12 +34,12 @@
|
|||
"react": "^18.2.0",
|
||||
"react-dom": "^18.2.0",
|
||||
"react-signature-canvas": "^1.1.0-alpha.2",
|
||||
"zy-react-library": "^1.3.5"
|
||||
"zy-react-library": "^1.3.18"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@antfu/eslint-config": "^5.4.1",
|
||||
"@babel/plugin-proposal-decorators": "^7.19.3",
|
||||
"@cqsjjb/scripts": "latest",
|
||||
"@cqsjjb/scripts": "2.0.0",
|
||||
"@eslint-react/eslint-plugin": "^2.2.2",
|
||||
"cross-env": "^7.0.3",
|
||||
"eslint": "^9.37.0",
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@ import Page from "zy-react-library/components/Page";
|
|||
import Search from "zy-react-library/components/Search";
|
||||
import DictionarySelect from "zy-react-library/components/Select/Dictionary";
|
||||
import BasicSelectTree from "zy-react-library/components/SelectTree/Basic";
|
||||
import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj";
|
||||
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 { getLabelName } from "zy-react-library/utils";
|
||||
import { AREA_STATUS_ENUM } from "~/enumerate/constant";
|
||||
import { NS_ENCLOSED_AREA, NS_FIRST_LEVEL_DOOR_INFO } from "~/enumerate/namespace";
|
||||
import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj";
|
||||
|
||||
const mkmjLevel = 2;
|
||||
|
||||
|
|
@ -202,7 +202,7 @@ const AddModalComponent = (props) => {
|
|||
};
|
||||
|
||||
const getClosedAreaList = async () => {
|
||||
const { data } = await props["enclosedAreaDetailListTree"]({ jurisdictionalCorpId:mkmjAreaJurisdictionalCorpId });
|
||||
const { data } = await props["enclosedAreaDetailListTree"]({ jurisdictionalCorpId: mkmjAreaJurisdictionalCorpId });
|
||||
setClosedAreaListTree(data);
|
||||
};
|
||||
|
||||
|
|
@ -275,12 +275,11 @@ const AddModalComponent = (props) => {
|
|||
label: "所属区域",
|
||||
render: (
|
||||
<DictionarySelect
|
||||
dictValue="HG_AUTH_AREA"
|
||||
onGetLabel={label => {
|
||||
form.setFieldValue("hgAuthAreaName", label)
|
||||
dictValue="primeport_fbkmqy"
|
||||
onGetLabel={(label) => {
|
||||
form.setFieldValue("hgAuthAreaName", label);
|
||||
form.setFieldValue("inDirectionArea", undefined);
|
||||
form.setFieldValue("outDirectionArea", undefined);
|
||||
|
||||
}}
|
||||
/>
|
||||
),
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ import { Button, Descriptions, message, Modal, Space } from "antd";
|
|||
import { useEffect, useState } from "react";
|
||||
import FormBuilder from "zy-react-library/components/FormBuilder";
|
||||
import AddIcon from "zy-react-library/components/Icon/AddIcon";
|
||||
import LocationIcon from "zy-react-library/components/Icon/LocationIcon";
|
||||
import Map from "zy-react-library/components/Map";
|
||||
import MapSelector from "zy-react-library/components/Map/MapSelector";
|
||||
import Page from "zy-react-library/components/Page";
|
||||
|
|
@ -227,7 +226,7 @@ function AddModalComponent(props) {
|
|||
label: "所属区域",
|
||||
render: (
|
||||
<DictionarySelect
|
||||
dictValue="HG_AUTH_AREA"
|
||||
dictValue="primeport_fbkmqy"
|
||||
onGetLabel={label => form.setFieldValue("hgAuthAreaName", label)}
|
||||
/>
|
||||
),
|
||||
|
|
@ -308,9 +307,13 @@ function InfoModalComponent(props) {
|
|||
{
|
||||
label: "位置",
|
||||
children: (
|
||||
<Button type="text" style={{ display: "flex", alignItems: "center", gap: "8px" }} onClick={() => {
|
||||
setMapVisible(true);
|
||||
}}>
|
||||
<Button
|
||||
type="text"
|
||||
style={{ display: "flex", alignItems: "center", gap: "8px" }}
|
||||
onClick={() => {
|
||||
setMapVisible(true);
|
||||
}}
|
||||
>
|
||||
<span>{info.longitude}</span>
|
||||
<span>--</span>
|
||||
<span>{info.latitude}</span>
|
||||
|
|
|
|||
Loading…
Reference in New Issue