1、增开监管端跳转子页面的权限控制

src/pages/Container/BranchCompany/ControlRoom/List/index.js

@@ -9,6 +9,7 @@ import Table from "zy-react-library/components/Table";
 import useDictionary from "zy-react-library/hooks/useDictionary";
 import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
 import useTable from "zy-react-library/hooks/useTable";
+import { FIRE_RESOURCE_PERMISSION_QUERY_KEYS, getPermissionKeyFromSearch } from "~/enumerate/constant/fireResourcePermission";
 import { NS_CONTROL_ROOM } from "~/enumerate/namespace";
 
 function List(props) {
@@ -32,6 +33,18 @@ function List(props) {
     }
   };
   const isFromSupervision = !!query.eqCorpId;
+  const searchParams = new URLSearchParams(props.location?.search || "");
+  const getPermissionValue = (action, defaultKey) => {
+    const queryKey = FIRE_RESOURCE_PERMISSION_QUERY_KEYS[action];
+    const dynamicPermissionKey = queryKey ? searchParams.get(queryKey) : "";
+
+    if (isFromSupervision && dynamicPermissionKey) {
+      return props.permission(dynamicPermissionKey);
+    }
+
+    return props.permission(getPermissionKeyFromSearch(props.location?.search, action, defaultKey));
+  };
+  const hasPermission = (action, defaultKey) => getPermissionValue(action, defaultKey);
   const supervisionBackPath = normalizeBackPath(query.backPath
     || props.location?.state?.backPath
     || window.sessionStorage.getItem("supervisionFireResourceStatsBackPath")
@@ -167,7 +180,7 @@ function List(props) {
       <Table
         toolBarRender={() => (
           <Space>
-            {props.permission("xfkzs-add") && (
+            {hasPermission("add", "xfkzs-add") && (
               <Button
                 type="primary"
                 onClick={() => {
@@ -227,7 +240,7 @@ function List(props) {
             align: "center",
             render: (_, record) => (
               <Space size={8}>
-                {props.permission("xfkzs-info") && (
+                {hasPermission("info", "xfkzs-info") && (
                   <Button
                     type="link"
                     size="small"
@@ -238,7 +251,7 @@ function List(props) {
                     查看
                   </Button>
                 )}
-                {props.permission("xfkzs-update") && (
+                {hasPermission("update", "xfkzs-update") && (
                   <Button
                     type="link"
                     size="small"
@@ -249,7 +262,7 @@ function List(props) {
                     编辑
                   </Button>
                 )}
-                {props.permission("xfkzs-remove") && (
+                {hasPermission("remove", "xfkzs-remove") && (
                   <Button
                     type="link"
                     size="small"

src/pages/Container/BranchCompany/PumpRoom/List/index.js

@@ -9,12 +9,12 @@ import Table from "zy-react-library/components/Table";
 import useDictionary from "zy-react-library/hooks/useDictionary";
 import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
 import useTable from "zy-react-library/hooks/useTable";
+import { FIRE_RESOURCE_PERMISSION_QUERY_KEYS, getPermissionKeyFromSearch } from "~/enumerate/constant/fireResourcePermission";
 import { NS_PUMP_ROOM } from "~/enumerate/namespace";
 
 function List(props) {
   const [form] = Form.useForm();
   const query = useGetUrlQuery();
-
   const normalizeBackPath = (path) => {
     if (!path) return "";
     try {
@@ -30,6 +30,18 @@ function List(props) {
   };
 
   const isFromSupervision = !!query.eqCorpId;
+  const searchParams = new URLSearchParams(props.location?.search || "");
+  const getPermissionValue = (action, defaultKey) => {
+    const queryKey = FIRE_RESOURCE_PERMISSION_QUERY_KEYS[action];
+    const dynamicPermissionKey = queryKey ? searchParams.get(queryKey) : "";
+
+    if (isFromSupervision && dynamicPermissionKey) {
+      return props.permission(dynamicPermissionKey);
+    }
+
+    return props.permission(getPermissionKeyFromSearch(props.location?.search, action, defaultKey));
+  };
+  const hasPermission = (action, defaultKey) => getPermissionValue(action, defaultKey);
   const supervisionBackPath = normalizeBackPath(
     query.backPath
     || props.location?.state?.backPath
@@ -149,7 +161,7 @@ function List(props) {
       <Table
         toolBarRender={() => (
           <Space>
-            {props.permission("xfbf-add") && (
+            {hasPermission("add", "xfbf-add") && (
               <Button type="primary" onClick={() => props.history.push("./add")}>新增</Button>
             )}
           </Space>
@@ -166,13 +178,13 @@ function List(props) {
             align: "center",
             render: (_, record) => (
               <Space size={8}>
-                {props.permission("xfbf-info") && (
+                {hasPermission("info", "xfbf-info") && (
                   <Button type="link" size="small" onClick={() => props.history.push(`./view?id=${record.id}`)}>查看</Button>
                 )}
-                {props.permission("xfbf-update") && (
+                {hasPermission("update", "xfbf-update") && (
                   <Button type="link" size="small" onClick={() => props.history.push(`./add?id=${record.id}`)}>编辑</Button>
                 )}
-                {props.permission("xfbf-remove") && (
+                {hasPermission("remove", "xfbf-remove") && (
                   <Button type="link" size="small" danger onClick={() => onDelete(record.id)}>删除</Button>
                 )}
               </Space>

src/pages/Container/BranchCompany/RescueTeam/List/index.js

@@ -8,12 +8,13 @@ import DictionarySelect from "zy-react-library/components/Select/Dictionary";
 import Table from "zy-react-library/components/Table";
 import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
 import useTable from "zy-react-library/hooks/useTable";
+import { FIRE_RESOURCE_PERMISSION_QUERY_KEYS, getPermissionKeyFromSearch } from "~/enumerate/constant/fireResourcePermission";
 import { NS_RESCUE_TEAM } from "~/enumerate/namespace";
 
+
 function List(props) {
   const [form] = Form.useForm();
   const query = useGetUrlQuery();
-
   const normalizeBackPath = (path) => {
     if (!path) return "";
     try {
@@ -29,6 +30,19 @@ function List(props) {
   };
 
   const isFromSupervision = !!query.eqCorpId;
+  const searchParams = new URLSearchParams(props.location?.search || "");
+  const getPermissionValue = (action, defaultKey) => {
+    const queryKey = FIRE_RESOURCE_PERMISSION_QUERY_KEYS[action];
+    const dynamicPermissionKey = queryKey ? searchParams.get(queryKey) : "";
+
+    if (isFromSupervision && dynamicPermissionKey) {
+      return props.permission(dynamicPermissionKey);
+    }
+
+    return props.permission(getPermissionKeyFromSearch(props.location?.search, action, defaultKey));
+  };
+  const canAdd = getPermissionValue("add", "xfjyd-add");
+  const hasPermission = (action, defaultKey) => getPermissionValue(action, defaultKey);
   const supervisionBackPath = normalizeBackPath(
     query.backPath
     || props.location?.state?.backPath
@@ -131,7 +145,7 @@ function List(props) {
       <Table
         toolBarRender={() => (
           <Space>
-            {props.permission("xfjyd-add") && (
+            {canAdd && (
               <Button type="primary" onClick={() => props.history.push("./add")}>新增</Button>
             )}
           </Space>
@@ -150,13 +164,13 @@ function List(props) {
             align: "center",
             render: (_, record) => (
               <Space size={8}>
-                {props.permission("xfjyd-info") && (
+                {hasPermission("info", "xfjyd-info") && (
                   <Button type="link" size="small" onClick={() => props.history.push(`./view?id=${record.id}`)}>查看</Button>
                 )}
-                {props.permission("xfjyd-update") && (
+                {hasPermission("update", "xfjyd-update") && (
                   <Button type="link" size="small" onClick={() => props.history.push(`./add?id=${record.id}`)}>编辑</Button>
                 )}
-                {props.permission("xfjyd-remove") && (
+                {hasPermission("remove", "xfjyd-remove") && (
                   <Button type="link" size="small" danger onClick={() => onDelete(record.id)}>删除</Button>
                 )}
               </Space>

src/pages/Container/BranchCompany/WaterSource/List/index.js

@@ -9,6 +9,7 @@ import Table from "zy-react-library/components/Table";
 import useDictionary from "zy-react-library/hooks/useDictionary";
 import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
 import useTable from "zy-react-library/hooks/useTable";
+import { FIRE_RESOURCE_PERMISSION_QUERY_KEYS, getPermissionKeyFromSearch } from "~/enumerate/constant/fireResourcePermission";
 import { NS_WATER_SOURCE } from "~/enumerate/namespace";
 
 function List(props) {
@@ -32,6 +33,18 @@ function List(props) {
     }
   };
   const isFromSupervision = !!query.eqCorpId;
+  const searchParams = new URLSearchParams(props.location?.search || "");
+  const getPermissionValue = (action, defaultKey) => {
+    const queryKey = FIRE_RESOURCE_PERMISSION_QUERY_KEYS[action];
+    const dynamicPermissionKey = queryKey ? searchParams.get(queryKey) : "";
+
+    if (isFromSupervision && dynamicPermissionKey) {
+      return props.permission(dynamicPermissionKey);
+    }
+
+    return props.permission(getPermissionKeyFromSearch(props.location?.search, action, defaultKey));
+  };
+  const hasPermission = (action, defaultKey) => getPermissionValue(action, defaultKey);
   const supervisionBackPath = normalizeBackPath(query.backPath
     || props.location?.state?.backPath
     || window.sessionStorage.getItem("supervisionFireResourceStatsBackPath")
@@ -161,7 +174,7 @@ function List(props) {
       <Table
         toolBarRender={() => (
           <Space>
-            {props.permission("xfsy-add") && (
+            {hasPermission("add", "xfsy-add") && (
               <Button
                 type="primary"
                 onClick={() => {
@@ -207,7 +220,7 @@ function List(props) {
             align: "center",
             render: (_, record) => (
               <Space size={8}>
-                {props.permission("xfsy-info") && (
+                {hasPermission("info", "xfsy-info") && (
                   <Button
                     type="link"
                     size="small"
@@ -218,7 +231,7 @@ function List(props) {
                     查看
                   </Button>
                 )}
-                {props.permission("xfsy-update") && (
+                {hasPermission("update", "xfsy-update") && (
                   <Button
                     type="link"
                     size="small"
@@ -229,7 +242,7 @@ function List(props) {
                     编辑
                   </Button>
                 )}
-                {props.permission("xfsy-remove") && (
+                {hasPermission("remove", "xfsy-remove") && (
                   <Button
                     type="link"
                     size="small"

src/pages/Container/Filiale/FireResourceStats/index.js

@@ -5,10 +5,15 @@ import Page from "zy-react-library/components/Page";
 import Search from "zy-react-library/components/Search";
 import Table from "zy-react-library/components/Table";
 import useTable from "zy-react-library/hooks/useTable";
+import {
+  FIRE_RESOURCE_PERMISSION_QUERY_KEYS,
+  FIRE_RESOURCE_SUPERVISION_PERMISSION_MAP,
+} from "~/enumerate/constant/fireResourcePermission";
 import { NS_FIRE_RESOURCE_STATS } from "~/enumerate/namespace";
 
 function FireResourceStats(props) {
   const [form] = Form.useForm();
+  const canViewDetail = props.permission("xfzytj-jgd-detail");
 
   const { tableProps, getData } = useTable(props["fireResourceStatsList"], { form });
 
@@ -24,9 +29,22 @@ function FireResourceStats(props) {
       const corpId = record.corpId || record.companyId || "";
       const backPath = `${props.location?.pathname || window.location.pathname}${props.location?.search || window.location.search || ""}`;
       window.sessionStorage.setItem("supervisionFireResourceStatsBackPath", backPath);
+      const searchParams = new URLSearchParams({
+        eqCorpId: corpId,
+        backPath,
+      });
+      const permissionConfig = FIRE_RESOURCE_SUPERVISION_PERMISSION_MAP[type] || {};
+
+      Object.entries(permissionConfig).forEach(([action, permissionKey]) => {
+        const queryKey = FIRE_RESOURCE_PERMISSION_QUERY_KEYS[action];
+        if (queryKey && permissionKey) {
+          searchParams.set(queryKey, permissionKey);
+        }
+      });
+
       props.history.push({
         pathname: routeMap[type],
-        search: `?eqCorpId=${corpId}&backPath=${encodeURIComponent(backPath)}`,
+        search: `?${searchParams.toString()}`,
         state: { backPath },
       });
     }
@@ -47,6 +65,21 @@ function FireResourceStats(props) {
       return <span style={{ color: "#1677ff", WebkitTextFillColor: "#1677ff" }}>0</span>;
     }
 
+    if (!canViewDetail) {
+      return (
+        <span
+          style={{
+            color: "#bfbfbf",
+            WebkitTextFillColor: "#bfbfbf",
+            fontWeight: 600,
+            cursor: "not-allowed",
+          }}
+        >
+          {count}
+        </span>
+      );
+    }
+
     return (
       <span
         role="button"

src/pages/Container/Supervision/FireResourceStats/index.js

@@ -5,10 +5,15 @@ import Page from "zy-react-library/components/Page";
 import Search from "zy-react-library/components/Search";
 import Table from "zy-react-library/components/Table";
 import useTable from "zy-react-library/hooks/useTable";
+import {
+  FIRE_RESOURCE_PERMISSION_QUERY_KEYS,
+  FIRE_RESOURCE_SUPERVISION_PERMISSION_MAP,
+} from "~/enumerate/constant/fireResourcePermission";
 import { NS_FIRE_RESOURCE_STATS } from "~/enumerate/namespace";
 
 function FireResourceStats(props) {
   const [form] = Form.useForm();
+  const canViewDetail = props.permission("xfzytj-jgd-detail");
 
   const { tableProps, getData } = useTable(props["fireResourceStatsList"], { form });
 
@@ -22,7 +27,17 @@ function FireResourceStats(props) {
 
     if (routeMap[type]) {
       const corpId = record.corpId || record.companyId || "";
-      props.history.push(`${routeMap[type]}?eqCorpId=${corpId}`);
+      const searchParams = new URLSearchParams({ eqCorpId: corpId });
+      const permissionConfig = FIRE_RESOURCE_SUPERVISION_PERMISSION_MAP[type] || {};
+
+      Object.entries(permissionConfig).forEach(([action, permissionKey]) => {
+        const queryKey = FIRE_RESOURCE_PERMISSION_QUERY_KEYS[action];
+        if (queryKey && permissionKey) {
+          searchParams.set(queryKey, permissionKey);
+        }
+      });
+
+      props.history.push(`${routeMap[type]}?${searchParams.toString()}`);
     }
   };
 
@@ -41,6 +56,21 @@ function FireResourceStats(props) {
       );
     }
 
+    if (!canViewDetail) {
+      return (
+        <span
+          style={{
+            color: "#bfbfbf",
+            WebkitTextFillColor: "#bfbfbf",
+            fontWeight: 600,
+            cursor: "not-allowed",
+          }}
+        >
+          {count}
+        </span>
+      );
+    }
+
     return (
       <span
         role="button"