diff --git a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/actions/camera.js b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/actions/camera.js
index c3c2450..08c2e2c 100644
--- a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/actions/camera.js
+++ b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/actions/camera.js
@@ -16,7 +16,7 @@ export function getCamera(query) {
     });
 }
 
-export function putForbidden(data) {
+export function putForbidden(data, forbidden) {
   return (dispatch) =>
     basicAction({
       type: "put",
@@ -24,7 +24,7 @@ export function putForbidden(data) {
       actionType: "PUT_FORBIDDEN",
       data,
       url: `${ApiTable.putForbidden}`,
-      msg: { option: "" }, //禁用摄像头
+      msg: { option: forbidden ?  "启用":"禁用"  }, //禁用摄像头
       reducer: {},
     });
 }
diff --git a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/actions/nvr.js b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/actions/nvr.js
index f8af572..7b47f41 100644
--- a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/actions/nvr.js
+++ b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/actions/nvr.js
@@ -46,7 +46,10 @@ export function delNvr(orgId) {
       dispatch: dispatch,
       actionType: "DEL_NVR",
       url: `${ApiTable.delNvr.replace("{nvrId}", orgId)}`,
-      msg: { option: "删除NVR" },
+      msg: {
+        option:
+          "删除成 功！被删除的设备会被存放在“设备回收站”中。并植入“设备回收站”路径。",
+      },
       reducer: { name: "" },
     });
 }
diff --git a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/sideSheet.jsx b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/sideSheet.jsx
index 8429b8c..6621c77 100644
--- a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/sideSheet.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/sideSheet.jsx
@@ -340,7 +340,7 @@ function SideSheets(props) {
                               <span
                                 style={{ fontWeight: "600", color: " #34383E" }}
                               >
-                                {item.key == "typ"  ////////////////////////////////要改
+                                {item.key == "type" 
                                   ? accessType.find(
                                       (v) => v.key == nvrDetails.type
                                     ).name
diff --git a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/camera.jsx b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/camera.jsx
index deb3e4b..4fab222 100644
--- a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/camera.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/camera.jsx
@@ -11,6 +11,7 @@ import {
   Popover,
   Tag,
   Skeleton,
+  Popconfirm,
 } from "@douyinfe/semi-ui";
 import "../style.less";
 import CameraModal from "../components/cameraModal";
@@ -116,30 +117,62 @@ const CameraHeader = (props) => {
             >
               查看
             </Button>
-            <Button theme="borderless">播放</Button>
-            <Button
-              theme="borderless"
-              onClick={() => {
-                dispatch(
-                  equipmentWarehouse.putForbidden({
-                    cameraId: row.id,
-                    forbidden: !row.forbidden,
-                  })
-                );
-                equipmentGetCamera();
-              }}
-            >
-              {row.forbidden ? "启用" : "禁用"}
-            </Button>
-            <Button
-              theme="borderless"
-              onClick={() => {
-                dispatch(equipmentWarehouse.delNvr(row.id));
-                equipmentGetCamera();
+            {row.forbidden ? (
+              <Button
+                theme="borderless"
+                onClick={() => {
+                  dispatch(
+                    equipmentWarehouse.putForbidden(
+                      {
+                        cameraId: row.id,
+                        forbidden: !row.forbidden,
+                      },
+                      row.forbidden
+                    )
+                  ).then(() => {
+                    equipmentGetCamera();
+                  });
+                }}
+              >
+                启用
+              </Button>
+            ) : (
+              <Popconfirm
+                title="禁用后下级业务系统将无法获取该视频流的所有信息。"
+                arrowPointAtCenter={false}
+                showArrow={true}
+                position="topRight"
+                onConfirm={() => {
+                  dispatch(
+                    equipmentWarehouse.putForbidden(
+                      {
+                        cameraId: row.id,
+                        forbidden: !row.forbidden,
+                      },
+                      row.forbidden
+                    )
+                  ).then(() => {
+                    equipmentGetCamera();
+                  });
+                }}
+              >
+                <Button theme="borderless">禁用</Button>
+              </Popconfirm>
+            )}
+
+            <Popconfirm
+              title="删除NVR会删除端口下的所有摄像头，是否确定删除？"
+              arrowPointAtCenter={false}
+              showArrow={true}
+              position="topRight"
+              onConfirm={() => {
+                dispatch(equipmentWarehouse.delNvr(row.id)).then(() => {
+                  equipmentGetCamera();
+                });
               }}
             >
-              删除
-            </Button>
+              <Button theme="borderless">删除</Button>
+            </Popconfirm>
           </div>
         );
       },
@@ -204,13 +237,17 @@ const CameraHeader = (props) => {
         dataIndex: "updateTime",
         key: "name",
         render: (_, r, index) => {
-          return r.station.map((item, index) =>
-            station(
-              item.structure.projects[0].name,
-              item.structure.projects,
-              "name"
-            )
-          );
+          return r.station.length == 0
+            ? ""
+            : r.station.map((item, index) => {
+                return item.structure.projects.length == 0
+                  ? ""
+                  : station(
+                      r.station[0].structure.projects[0].name,
+                      item.structure.projects,
+                      "name"
+                    );
+              });
         },
       },
       {
@@ -218,13 +255,17 @@ const CameraHeader = (props) => {
         dataIndex: "updateTime",
         key: "pcode",
         render: (_, r, index) => {
-          return r.station.map((item, index) =>
-            station(
-              item.structure.projects[0].url,
-              item.structure.projects,
-              "url"
-            )
-          );
+          return r.station.length == 0
+            ? ""
+            : r.station.map((item, index) => {
+                return item.structure.projects.length == 0
+                  ? ""
+                  : station(
+                      r.station[0].structure.projects[0].url,
+                      item.structure.projects,
+                      "url"
+                    );
+              });
         },
       },
       {
@@ -232,11 +273,9 @@ const CameraHeader = (props) => {
         dataIndex: "updateTime",
         key: "structure",
         render: (_, r, index) => {
-          return station(
-            r.station[0].structure.name,
-            r.station,
-            "structure.name"
-          );
+          return r.station.length == 0
+            ? ""
+            : station(r.station[0].structure.name, r.station, "structure.name");
         },
       },
       {
@@ -244,7 +283,9 @@ const CameraHeader = (props) => {
         dataIndex: "updateTime",
         key: "measuringPoint",
         render: (_, r, index) => {
-          return station(r.station[0].name, r.station, "name");
+          return r.station.length == 0
+            ? ""
+            : station(r.station[0].name, r.station, "name");
         },
       },
       {
@@ -252,7 +293,9 @@ const CameraHeader = (props) => {
         dataIndex: "updateTime",
         key: "factor",
         render: (_, r, index) => {
-          return station(r.station[0].factor.name, r.station, "factor.name");
+          return r.station.length == 0
+            ? ""
+            : station(r.station[0].factor.name, r.station, "factor.name");
         },
       },
     ];
@@ -565,14 +608,22 @@ const CameraHeader = (props) => {
           </div>
         </div>
         <Skeleton
-          loading={loading}
+          loading={!loading}
           placeholder={
             <Table
               columns={setupp.filter((s) => s)}
-              dataSource={[{ name: "" },{ key: "" },{ name: "" },{ name: "" },{ name: "" },{ name: "" },{ name: "" }]}
+              // dataSource={[
+              //   { name: "" },
+              //   { key: "" },
+              //   { name: "" },
+              //   { name: "" },
+              //   { name: "" },
+              //   { name: "" },
+              //   { name: "" },
+              // ]}
               pagination={false}
               style={{ background: "rgba(217, 216, 216, 1)" }}
-              empty=""
+              empty=" "
             />
           }
         >
diff --git a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/nvr.jsx b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/nvr.jsx
index aae9ee5..897d61e 100644
--- a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/nvr.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/nvr.jsx
@@ -9,6 +9,7 @@ import {
   Table,
   Pagination,
   Skeleton,
+  Popconfirm,
 } from "@douyinfe/semi-ui";
 import "../style.less";
 import NvrModal from "../components/nvrModal";
@@ -19,7 +20,7 @@ export const accessType = [
   { name: "萤石云平台摄像头", key: "yingshi" },
   { name: "NVR摄像头", key: "nvr" },
   { name: "IPC 网络摄像头", key: "ipc" },
-  { name: "级联摄像头", key: "cascade" },
+  { name: "不明厂家", key: "cascade" },
 ];
 
 const NvrHeader = (props) => {
@@ -116,16 +117,19 @@ const NvrHeader = (props) => {
             >
               查看
             </Button>
-            <Button
-              theme="borderless"
-              onClick={() => {
+            <Popconfirm
+              title="删除NVR会删除端口下的所有摄像头，是否确定删除？"
+              arrowPointAtCenter={false}
+              showArrow={true}
+              position="topRight"
+              onConfirm={() => {
                 dispatch(equipmentWarehouse.delNvr(row.id)).then(() => {
                   equipmentGetNvr();
                 });
               }}
             >
-              删除
-            </Button>
+              <Button theme="borderless">删除</Button>
+            </Popconfirm>
           </div>
         );
       },
@@ -172,7 +176,7 @@ const NvrHeader = (props) => {
         title: "创建时间",
         dataIndex: "createTime",
         key: "time",
-        render: (text, r, index) => {
+        render: (_, r, index) => {
           return moment(r.createTime).format("YYYY-MM-DD HH:MM:SS");
         },
       },
@@ -180,6 +184,20 @@ const NvrHeader = (props) => {
         title: "项目名称",
         dataIndex: "",
         key: "name",
+        // render: (_, r, index) => {
+        //   console.log(r);
+        //   return r.station.length == 0
+        //     ? ""
+        //     : r.station.map((item, index) => {
+        //         return item.structure.projects.length == 0
+        //           ? ""
+        //           : station(
+        //               r.station[0].structure.projects[0].name,
+        //               item.structure.projects,
+        //               "name"
+        //             );
+        //       });
+        // },
       },
       {
         title: "pcode",
@@ -450,15 +468,24 @@ const NvrHeader = (props) => {
           </div>
         </div>
         <Skeleton
-          loading={loading}
+          loading={!loading}
           placeholder={
-            <Table
-              columns={setupp.filter((s) => s)}
-              dataSource={[{ name: "" },{ key: "" },{ name: "" },{ name: "" },{ name: "" },{ name: "" },{ name: "" }]}
-              pagination={false}
-              style={{ background: "rgba(217, 216, 216, 1)" }}
-              empty=""
-            />
+            // <Table
+            //   columns={setupp.filter((s) => s)}
+            //   dataSource={[
+            //     { name: "" },
+            //     { key: "" },
+            //     { name: "" },
+            //     { name: "" },
+            //     { name: "" },
+            //     { name: "" },
+            //     { name: "" },
+            //   ]}
+            //   pagination={false}
+            //   style={{ background: "rgba(217, 216, 216, 1)" }}
+            //   empty=""
+            // />
+            <><div style></div></>
           }
         >
           <Table