改BUG

jjb.config.js

@@ -46,7 +46,7 @@ module.exports = {
   // 开发服务
   server: {
     // 监听端口号
-    port: "8033",
+    port: "8053",
     // 服务地址
     host: "127.0.0.1",
     // 是否自动打开浏览器

package.json

@@ -33,7 +33,7 @@
     "lodash-es": "^4.17.21",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "zy-react-library": "^1.2.39"
+    "zy-react-library": "^1.3.14"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^5.4.1",

src/api/emergencyAddressBook/index.js

@@ -4,6 +4,10 @@ export const emergencyAddressBookList = declareRequest(
   "emergencyAddressBookLoading",
   "Post > @/emergencyRescue/emergencyContactGroup/list",
 );
+export const emergencyAddressBookListTree = declareRequest(
+  "emergencyAddressBookLoading",
+  "Post > @/emergencyRescue/emergencyContactGroup/listTree",
+);
 export const emergencyAddressBookInfo = declareRequest(
   "emergencyAddressBookLoading",
   "Get > /emergencyRescue/emergencyContactGroup/{id}",

src/pages/Container/Enterprise/EmergencyOrganization/EmergencyAddressBook/List/index.js

@@ -31,10 +31,10 @@ function List(props) {
 
   const query = useGetUrlQuery();
 
-  const { tableProps, getData } = useTable(props["emergencyAddressBookList"], {
+  const { tableProps, getData } = useTable(props["emergencyAddressBookListTree"], {
     form,
     params: { corpId: query.corpinfoId },
-    usePagination: false,
+    // usePagination: false,
   });
 
   const onDelete = (record) => {
@@ -61,6 +61,7 @@ function List(props) {
         onFinish={getData}
       />
       <Table
+        defaultExpandAllRows
         toolBarRender={() => (
           <Space>
             {(!props.isRecord && props.permission("qyd-enterprise-emergency-address-book-add")) && (

src/pages/Container/Enterprise/EmergencyOrganization/EmergencyExpertTeam/ExpertEmergencyRescueTeam/View/index.js

@@ -15,7 +15,7 @@ function View(props) {
       return;
 
     const { data } = await props["expertEmergencyRescueTeamInfo"]({ id: query.id || query.id });
-    setInfo(data);
+    setInfo(data || {});
   };
 
   useEffect(() => {

src/pages/Container/Enterprise/EmergencyOrganization/EmergencyManagementOrganization/EnterpriseEmergencyOrganization/View/index.js

@@ -15,7 +15,7 @@ function View(props) {
       return;
 
     const { data } = await props["enterpriseEmergencyOrganizationInfo"]({ id: props.id || query.id });
-    setInfo(data);
+    setInfo(data || {});
   };
 
   useEffect(() => {

src/pages/Container/Enterprise/EmergencyOrganization/ProfessionalGuaranteeOrganization/CommunicationGuaranteeOrganization/View/index.js

@@ -15,7 +15,7 @@ function View(props) {
       return;
 
     const { data } = await props["communicationGuaranteeOrganizationInfo"]({ id: props.id || query.id });
-    setInfo(data);
+    setInfo(data || {});
   };
 
   useEffect(() => {

src/pages/Container/Enterprise/EmergencyOrganization/ProfessionalGuaranteeOrganization/MedicalGuaranteeOrganization/View/index.js

@@ -15,7 +15,7 @@ function View(props) {
       return;
 
     const { data } = await props["medicalGuaranteeOrganizationInfo"]({ id: props.id || query.id });
-    setInfo(data);
+    setInfo(data || {});
   };
 
   useEffect(() => {

src/pages/Container/Enterprise/EmergencyOrganization/ProfessionalGuaranteeOrganization/TechnicalSupportGuaranteeOrganization/View/index.js

@@ -15,7 +15,7 @@ function View(props) {
       return;
 
     const { data } = await props["technicalSupportGuaranteeOrganizationInfo"]({ id: props.id || query.id });
-    setInfo(data);
+    setInfo(data || {});
   };
 
   useEffect(() => {

src/pages/Container/Enterprise/EmergencyOrganization/ProfessionalGuaranteeOrganization/TransportGuaranteeOrganization/View/index.js

@@ -15,7 +15,7 @@ function View(props) {
       return;
 
     const { data } = await props["transportGuaranteeOrganizationInfo"]({ id: props.id || query.id });
-    setInfo(data);
+    setInfo(data || {});
   };
 
   useEffect(() => {

src/pages/Container/Enterprise/EmergencyRescue/Rescue/Command/components/Cesium/index.js

@@ -85,8 +85,8 @@ function Cesium(props) {
 }
 
 const MarkModal = (props) => {
-  const info = props.info;
+  const info = props.info || {};
-  const id = props.info.id;
+  const id = info.id;
   const type = props.type;
 
   return (

src/pages/Container/Enterprise/EmergencyResource/ClosedCardPort/View/index.js

@@ -15,7 +15,7 @@ function View(props) {
       return;
 
     const { data } = await props["closedCardPortInfo"]({ id: props.id || query.id });
-    setInfo(data);
+    setInfo(data || {});
   };
 
   useEffect(() => {

src/pages/Container/Enterprise/EmergencyResource/DrainageWell/View/index.js

@@ -15,7 +15,7 @@ function View(props) {
       return;
 
     const { data } = await props["drainageWellInfo"]({ id: props.id || query.id });
-    setInfo(data);
+    setInfo(data || {});
   };
 
   useEffect(() => {

src/pages/Container/Enterprise/EmergencyResource/EmergencyShelter/View/index.js

@@ -15,7 +15,7 @@ function View(props) {
       return;
 
     const { data } = await props["emergencyShelterInfo"]({ id: props.id || query.id });
-    setInfo(data);
+    setInfo(data || {});
   };
 
   useEffect(() => {

src/pages/Container/Enterprise/EmergencyResource/MaterialEquipment/View/index.js

@@ -15,7 +15,7 @@ function View(props) {
       return;
 
     const { data } = await props["materialEquipmentInfo"]({ id: props.id || query.id });
-    setInfo(data);
+    setInfo(data || {});
   };
 
   useEffect(() => {