diff --git a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/cascadeCamera.jsx b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/cascadeCamera.jsx
index 2ffe25d..0819e6e 100644
--- a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/cascadeCamera.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/cascadeCamera.jsx
@@ -99,8 +99,8 @@ function cascadeCamera({ dRef, dispatch, actions }) {
               rules={[{ required: true, message: "请选择SIP编号" }]}
             >
               {sip.map((item, index) => (
-                <Form.Select.Option key={index} value={item.streamid}>
-                  {item.streamid}
+                <Form.Select.Option key={index} value={item.sipip}>
+                  {item.sipip}
                 </Form.Select.Option>
               ))}
             </Form.Select>
diff --git a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/fluoriteCamera.jsx b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/fluoriteCamera.jsx
index b246bb4..952e06e 100644
--- a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/fluoriteCamera.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/fluoriteCamera.jsx
@@ -2,484 +2,483 @@ import React, { useState, useRef, useEffect, useImperativeHandle } from "react";
 import { connect } from "react-redux";
 import { Form, Row, Col } from "@douyinfe/semi-ui";
 import "./cameraModal.less";
-function fluoriteCamera({ cRef, CameraKind, CameraAbility, cameraData }) {
-  const { TextArea } = Form;
-  const form = useRef();
-  const [cloud, setcloud] = useState(""); //云台支持
-  const [voice, setvoice] = useState(""); //语音支持
-  const [switching, setSwitching] = useState(""); //高清切换
-  const [memoryList, setMemoryList] = useState([
-    {
-      id: 1,
-      value: "8g",
-    },
-    {
-      id: 2,
-      value: "16g",
-    },
-    {
-      id: 3,
-      value: "32g",
-    },
-    {
-      id: 4,
-      value: "64g",
-    },
-    {
-      id: 5,
-      value: "128g",
-    },
-    {
-      id: 6,
-      value: "256g",
-    },
-    {
-      id: 7,
-      value: ">256g",
-    },
-  ]); //内存卡列表
+function fluoriteCamera ({ cRef, CameraKind, CameraAbility, cameraData }) {
+    const { TextArea } = Form;
+    const form = useRef();
+    const [cloud, setcloud] = useState(""); //云台支持
+    const [voice, setvoice] = useState(""); //语音支持
+    const [switching, setSwitching] = useState(""); //高清切换
+    const [memoryList, setMemoryList] = useState([
+        {
+            id: 1,
+            value: "8g",
+        },
+        {
+            id: 2,
+            value: "16g",
+        },
+        {
+            id: 3,
+            value: "32g",
+        },
+        {
+            id: 4,
+            value: "64g",
+        },
+        {
+            id: 5,
+            value: "128g",
+        },
+        {
+            id: 6,
+            value: "256g",
+        },
+        {
+            id: 7,
+            value: ">256g",
+        },
+    ]); //内存卡列表
 
-  useEffect(() => {
-    setcloud(cameraData.cloudControl || "");
-    setvoice(cameraData.voice || "");
-    setSwitching(cameraData.highDefinition || "");
-  }, []);
-  function handleLocation() {
-    //高德经纬度
-    window.open("https://lbs.amap.com/tools/picker", "_blank");
-  }
-  function positionForm(val) {
-    //安装位置校验
-    let zz = /^(-?\d+)(\.\d+)?$/;
-    if (!val) {
-      return "请输入或拾取高德经纬度坐标";
-    } else if (val.split(",").length != 2) {
-      return "请输入格式为116.354169,39.835452的经纬度坐标";
-    } else if (!zz.test(val.split(",")[0])) {
-      return "只能填写数字";
-    } else if (!zz.test(val.split(",")[1])) {
-      return "只能填写数字";
-    } else {
-      return "";
+    useEffect(() => {
+        setcloud(cameraData.cloudControl || "");
+        setvoice(cameraData.voice || "");
+        setSwitching(cameraData.highDefinition || "");
+    }, []);
+    function handleLocation () {
+        //高德经纬度
+        window.open("https://lbs.amap.com/tools/picker", "_blank");
     }
-  }
-  useImperativeHandle(cRef, () => ({
-    //传给父组件方法
-    //子组件暴露给父组件的方法
-    fluoriteCameraForm: form.current.validate,
-    resetFluoriteCamera: form.current.reset,
-    toempty: empty,
-  }));
-  function empty() {
-    setcloud("");
-    setvoice("");
-    setSwitching("");
-  }
-  return (
-    <>
-      <Form
-        labelPosition="left"
-        labelAlign="left"
-        labelWidth="115px"
-        onValueChange={(values) => console.log(values)}
-        initValues={{
-          name: cameraData ? cameraData.name : "",
-          highDefinition: cameraData ? cameraData.highDefinition : "",
-          memoryCard: cameraData ? cameraData.memoryCard : "",
-          position: cameraData.longitude
-            ? `${cameraData.longitude},${cameraData.latitude}`
-            : "",
-          kindId: cameraData ? cameraData.kindId : "",
-          abilityId: cameraData
-            ? cameraData.cameraAbilities
-              ? cameraData.cameraAbilities.map((item) => item.id)
-              : ""
-            : "",
-          cloudControl: cameraData ? cameraData.cloudControl : "",
-          voice: cameraData ? cameraData.voice : "",
-          serialNo: cameraData ? cameraData.serialNo : "",
-          rtmp: cameraData ? cameraData.rtmp : "",
-        }}
-        getFormApi={(formApi) => (form.current = formApi)}
-      >
-        <Row>
-          <Col span={12}>
-            {/* 设备名称 */}
-            <Form.Input
-              field="name"
-              label="设备名称:"
-              placeholder="请输入设备名称、常用项目或位置定义"
-              style={{ width: 307 }}
-              rules={[{ required: true, message: "请输入设备名称" }]}
-            />
-            {/* 高清切换 */}
-            <Form.RadioGroup
-              label="高清切换:"
-              field="highDefinition"
-              type="pureCard"
-              direction="horizontal"
-              style={{ padding: 0, paddingTop: 1, paddingBottom: 1 }}
-              rules={[{ required: true, message: "请选择高清切换" }]}
-              onChange={(checked) => {
-                if (checked.target.value == true) {
-                  setSwitching(true);
-                } else {
-                  setSwitching(false);
-                }
-              }}
-            >
-              <Form.Radio
-                value={true}
-                style={{
-                  width: 58,
-                  height: 30,
-                  padding: 0,
-                  margin: 0,
-                  background: "#F9F9F9",
-                }}
-              >
-                <div
-                  className="switching"
-                  style={{
-                    width: 58,
-                    height: 30,
-                    textAlign: "center",
-                    lineHeight: "30px",
-                  }}
-                >
-                  支持
-                </div>
-                {switching == true ? (
-                  <div
-                    style={{ position: "absolute", top: "-2px", right: "-1px" }}
-                  >
-                    <img
-                      src="/assets/images/background/formchoose.png"
-                      alt="1"
-                    />
-                  </div>
-                ) : (
-                  ""
-                )}
-              </Form.Radio>
-              <Form.Radio
-                value={false}
-                style={{
-                  width: 58,
-                  height: 30,
-                  padding: 0,
-                  margin: 0,
-                  marginLeft: 18,
-                  background: "#F9F9F9",
+    function positionForm (val) {
+        //安装位置校验
+        let zz = /^(-?\d+)(\.\d+)?$/;
+        if (!val) {
+            return "请输入或拾取高德经纬度坐标";
+        } else if (val.split(",").length != 2) {
+            return "请输入格式为116.354169,39.835452的经纬度坐标";
+        } else if (!zz.test(val.split(",")[0])) {
+            return "只能填写数字";
+        } else if (!zz.test(val.split(",")[1])) {
+            return "只能填写数字";
+        } else {
+            return "";
+        }
+    }
+    useImperativeHandle(cRef, () => ({
+        //传给父组件方法
+        //子组件暴露给父组件的方法
+        fluoriteCameraForm: form.current.validate,
+        resetFluoriteCamera: form.current.reset,
+        toempty: empty,
+    }));
+    function empty () {
+        setcloud("");
+        setvoice("");
+        setSwitching("");
+    }
+    return (
+        <>
+            <Form
+                labelPosition="left"
+                labelAlign="left"
+                labelWidth="115px"
+                onValueChange={(values) => console.log(values)}
+                initValues={{
+                    name: cameraData.name || "",
+                    highDefinition: cameraData.highDefinition || "",
+                    memoryCard: cameraData.memoryCard || "",
+                    position: cameraData.longitude
+                        ? `${cameraData.longitude},${cameraData.latitude}`
+                        : "",
+                    kindId: cameraData.kindId || "",
+                    abilityId: cameraData.cameraAbilities
+                        ? cameraData.cameraAbilities.map((item) => item.id)
+                        : ""
+                    ,
+                    cloudControl: cameraData.cloudControl || "",
+                    voice: cameraData.voice || "",
+                    serialNo: cameraData.serialNo || "",
+                    rtmp: cameraData.rtmp || "",
                 }}
-              >
-                <div
-                  className="switching"
-                  style={{
-                    width: 58,
-                    height: 30,
-                    textAlign: "center",
-                    lineHeight: "30px",
-                  }}
-                >
-                  不支持
-                </div>
-                {switching == false && switching !== "" ? (
-                  <div
-                    style={{ position: "absolute", top: "-2px", right: "-1px" }}
-                  >
-                    <img
-                      src="/assets/images/background/formchoose.png"
-                      alt="1"
-                    />
-                  </div>
-                ) : (
-                  ""
-                )}
-              </Form.Radio>
-            </Form.RadioGroup>
-            {/* 内存 */}
-            <Form.Select
-              label="内存:"
-              field="memoryCard"
-              placeholder="未安装"
-              style={{ width: 307 }}
+                getFormApi={(formApi) => (form.current = formApi)}
             >
-              {memoryList.map((item, index) => (
-                <Form.Select.Option key={index} value={item.value}>
-                  {item.value}
-                </Form.Select.Option>
-              ))}
-            </Form.Select>
-            {/* 安装位置 */}
-            <div style={{ display: "flex" }}>
-              <Form.Input
-                field="position"
-                label="安装位置:"
-                placeholder="请输入或拾取高德经纬度坐标"
-                style={{ width: 270 }}
-                validate={positionForm}
-                rules={[
-                  { required: true, message: "请输入或拾取高德经纬度坐标" },
-                ]}
-              />
-              <div
-                style={{
-                  width: 32,
-                  height: 32,
-                  background: "#1859C1",
-                  marginLeft: 4,
-                  display: "flex",
-                  justifyContent: "center",
-                  alignItems: "center",
-                  cursor: "pointer",
-                  marginTop: 12,
-                  borderRadius: 3 + "px",
-                }}
-                onClick={handleLocation}
-              >
-                <img
-                  src="../../../assets/images/background/location.png"
-                  width={16}
-                  height={20}
-                />
-              </div>
-            </div>
-            {/* 设备类型 */}
+                <Row>
+                    <Col span={12}>
+                        {/* 设备名称 */}
+                        <Form.Input
+                            field="name"
+                            label="设备名称:"
+                            placeholder="请输入设备名称、常用项目或位置定义"
+                            style={{ width: 307 }}
+                            rules={[{ required: true, message: "请输入设备名称" }]}
+                        />
+                        {/* 高清切换 */}
+                        <Form.RadioGroup
+                            label="高清切换:"
+                            field="highDefinition"
+                            type="pureCard"
+                            direction="horizontal"
+                            style={{ padding: 0, paddingTop: 1, paddingBottom: 1 }}
+                            rules={[{ required: true, message: "请选择高清切换" }]}
+                            onChange={(checked) => {
+                                if (checked.target.value == true) {
+                                    setSwitching(true);
+                                } else {
+                                    setSwitching(false);
+                                }
+                            }}
+                        >
+                            <Form.Radio
+                                value={true}
+                                style={{
+                                    width: 58,
+                                    height: 30,
+                                    padding: 0,
+                                    margin: 0,
+                                    background: "#F9F9F9",
+                                }}
+                            >
+                                <div
+                                    className="switching"
+                                    style={{
+                                        width: 58,
+                                        height: 30,
+                                        textAlign: "center",
+                                        lineHeight: "30px",
+                                    }}
+                                >
+                                    支持
+                                </div>
+                                {switching == true ? (
+                                    <div
+                                        style={{ position: "absolute", top: "-2px", right: "-1px" }}
+                                    >
+                                        <img
+                                            src="/assets/images/background/formchoose.png"
+                                            alt="1"
+                                        />
+                                    </div>
+                                ) : (
+                                    ""
+                                )}
+                            </Form.Radio>
+                            <Form.Radio
+                                value={false}
+                                style={{
+                                    width: 58,
+                                    height: 30,
+                                    padding: 0,
+                                    margin: 0,
+                                    marginLeft: 18,
+                                    background: "#F9F9F9",
+                                }}
+                            >
+                                <div
+                                    className="switching"
+                                    style={{
+                                        width: 58,
+                                        height: 30,
+                                        textAlign: "center",
+                                        lineHeight: "30px",
+                                    }}
+                                >
+                                    不支持
+                                </div>
+                                {switching == false && switching !== "" ? (
+                                    <div
+                                        style={{ position: "absolute", top: "-2px", right: "-1px" }}
+                                    >
+                                        <img
+                                            src="/assets/images/background/formchoose.png"
+                                            alt="1"
+                                        />
+                                    </div>
+                                ) : (
+                                    ""
+                                )}
+                            </Form.Radio>
+                        </Form.RadioGroup>
+                        {/* 内存 */}
+                        <Form.Select
+                            label="内存:"
+                            field="memoryCard"
+                            placeholder="未安装"
+                            style={{ width: 307 }}
+                        >
+                            {memoryList.map((item, index) => (
+                                <Form.Select.Option key={index} value={item.value}>
+                                    {item.value}
+                                </Form.Select.Option>
+                            ))}
+                        </Form.Select>
+                        {/* 安装位置 */}
+                        <div style={{ display: "flex" }}>
+                            <Form.Input
+                                field="position"
+                                label="安装位置:"
+                                placeholder="请输入或拾取高德经纬度坐标"
+                                style={{ width: 270 }}
+                                validate={positionForm}
+                                rules={[
+                                    { required: true, message: "请输入或拾取高德经纬度坐标" },
+                                ]}
+                            />
+                            <div
+                                style={{
+                                    width: 32,
+                                    height: 32,
+                                    background: "#1859C1",
+                                    marginLeft: 4,
+                                    display: "flex",
+                                    justifyContent: "center",
+                                    alignItems: "center",
+                                    cursor: "pointer",
+                                    marginTop: 12,
+                                    borderRadius: 3 + "px",
+                                }}
+                                onClick={handleLocation}
+                            >
+                                <img
+                                    src="../../../assets/images/background/location.png"
+                                    width={16}
+                                    height={20}
+                                />
+                            </div>
+                        </div>
+                        {/* 设备类型 */}
 
-            <Form.Select
-              label="设备类型:"
-              field="kindId"
-              placeholder="请选择摄像头类型"
-              style={{ width: 180 }}
-              rules={[{ required: true, message: "请选择摄像头类型" }]}
-            >
-              {CameraKind.map((item, index) => (
-                <Form.Select.Option key={index} value={item.id}>
-                  {item.kind}
-                </Form.Select.Option>
-              ))}
-            </Form.Select>
+                        <Form.Select
+                            label="设备类型:"
+                            field="kindId"
+                            placeholder="请选择摄像头类型"
+                            style={{ width: 180 }}
+                            rules={[{ required: true, message: "请选择摄像头类型" }]}
+                        >
+                            {CameraKind.map((item, index) => (
+                                <Form.Select.Option key={index} value={item.id}>
+                                    {item.kind}
+                                </Form.Select.Option>
+                            ))}
+                        </Form.Select>
 
-            <Form.Select
-              label="设备能力:"
-              multiple
-              maxTagCount={1}
-              field="abilityId"
-              placeholder="请选择能力"
-              style={{ width: 180 }}
-              rules={[{ required: true, message: "请选择能力" }]}
-            >
-              {CameraAbility.map((item, index) => (
-                <Form.Select.Option key={index} value={item.id}>
-                  {item.ability}
-                </Form.Select.Option>
-              ))}
-            </Form.Select>
-          </Col>
-          <Col span={12}>
-            {/* 云台支持 */}
-            <Form.RadioGroup
-              label="云台支持:"
-              field="cloudControl"
-              type="pureCard"
-              direction="horizontal"
-              style={{ padding: 0, paddingTop: 1, paddingBottom: 1 }}
-              rules={[{ required: true, message: "请选择云台支持" }]}
-              onChange={(checked) => {
-                if (checked.target.value == true) {
-                  setcloud(true);
-                } else {
-                  setcloud(false);
-                }
-              }}
-            >
-              <Form.Radio
-                value={true}
-                style={{
-                  width: 58,
-                  height: 30,
-                  padding: 0,
-                  margin: 0,
-                  background: "#F9F9F9",
-                }}
-              >
-                <div
-                  className="cloud"
-                  style={{
-                    width: 58,
-                    height: 30,
-                    textAlign: "center",
-                    lineHeight: "30px",
-                  }}
-                >
-                  支持
-                </div>
-                {cloud == true ? (
-                  <div
-                    style={{ position: "absolute", top: "-2px", right: "-1px" }}
-                  >
-                    <img
-                      src="/assets/images/background/formchoose.png"
-                      alt="1"
-                    />
-                  </div>
-                ) : (
-                  ""
-                )}
-              </Form.Radio>
-              <Form.Radio
-                value={false}
-                style={{
-                  width: 58,
-                  height: 30,
-                  padding: 0,
-                  margin: 0,
-                  marginLeft: 18,
-                  background: "#F9F9F9",
-                }}
-              >
-                <div
-                  className="cloud"
-                  style={{
-                    width: 58,
-                    height: 30,
-                    textAlign: "center",
-                    lineHeight: "30px",
-                  }}
-                >
-                  不支持
-                </div>
-                {cloud == false && cloud !== "" ? (
-                  <div
-                    style={{ position: "absolute", top: "-2px", right: "-1px" }}
-                  >
-                    <img
-                      src="/assets/images/background/formchoose.png"
-                      alt="1"
-                    />
-                  </div>
-                ) : (
-                  ""
-                )}
-              </Form.Radio>
-            </Form.RadioGroup>
-            {/* 语音支持 */}
-            <Form.RadioGroup
-              // labelWidth= '76px'
-              label="语音支持:"
-              field="voice"
-              type="pureCard"
-              direction="horizontal"
-              style={{ padding: 0, paddingTop: 1, paddingBottom: 1 }}
-              onChange={(checked) => {
-                if (checked.target.value == true) {
-                  setvoice(true);
-                } else {
-                  setvoice(false);
-                }
-              }}
-            >
-              <Form.Radio
-                value={true}
-                style={{
-                  width: 58,
-                  height: 30,
-                  padding: 0,
-                  margin: 0,
-                  background: "#F9F9F9",
-                }}
-              >
-                <div
-                  className="voice"
-                  style={{
-                    width: 58,
-                    height: 30,
-                    textAlign: "center",
-                    lineHeight: "30px",
-                  }}
-                >
-                  支持
-                </div>
-                {voice == true ? (
-                  <div
-                    style={{ position: "absolute", top: "-2px", right: "-1px" }}
-                  >
-                    <img
-                      src="/assets/images/background/formchoose.png"
-                      alt="1"
-                    />
-                  </div>
-                ) : (
-                  ""
-                )}
-              </Form.Radio>
-              <Form.Radio
-                value={false}
-                style={{
-                  width: 58,
-                  height: 30,
-                  padding: 0,
-                  margin: 0,
-                  marginLeft: 18,
-                  background: "#F9F9F9",
-                }}
-              >
-                <div
-                  className="voice"
-                  style={{
-                    width: 58,
-                    height: 30,
-                    textAlign: "center",
-                    lineHeight: "30px",
-                  }}
-                >
-                  不支持
-                </div>
-                {voice == false && voice !== "" ? (
-                  <div
-                    style={{ position: "absolute", top: "-2px", right: "-1px" }}
-                  >
-                    <img
-                      src="/assets/images/background/formchoose.png"
-                      alt="1"
-                    />
-                  </div>
-                ) : (
-                  ""
-                )}
-              </Form.Radio>
-            </Form.RadioGroup>
-            {/* 设备名称 */}
-            <Form.Input
-              field="serialNo"
-              label="设备序列号:"
-              placeholder="请输入设备序列号"
-              style={{ width: 307 }}
-              rules={[{ required: true, message: "请输入设备序列号" }]}
-            />
-            {/* RTMP地址接入 */}
-            <TextArea
-              style={{ width: 320, height: 90 }}
-              field="rtmp"
-              label="RTMP地址接入:"
-              placeholder="请输入RTMP地址接入"
-              rules={[{ required: true, message: "请输入RTMP地址接入" }]}
-            />
-          </Col>
-        </Row>
-      </Form>
-    </>
-  );
+                        <Form.Select
+                            label="设备能力:"
+                            multiple
+                            maxTagCount={1}
+                            field="abilityId"
+                            placeholder="请选择能力"
+                            style={{ width: 180 }}
+                            rules={[{ required: true, message: "请选择能力" }]}
+                        >
+                            {CameraAbility.map((item, index) => (
+                                <Form.Select.Option key={index} value={item.id}>
+                                    {item.ability}
+                                </Form.Select.Option>
+                            ))}
+                        </Form.Select>
+                    </Col>
+                    <Col span={12}>
+                        {/* 云台支持 */}
+                        <Form.RadioGroup
+                            label="云台支持:"
+                            field="cloudControl"
+                            type="pureCard"
+                            direction="horizontal"
+                            style={{ padding: 0, paddingTop: 1, paddingBottom: 1 }}
+                            rules={[{ required: true, message: "请选择云台支持" }]}
+                            onChange={(checked) => {
+                                if (checked.target.value == true) {
+                                    setcloud(true);
+                                } else {
+                                    setcloud(false);
+                                }
+                            }}
+                        >
+                            <Form.Radio
+                                value={true}
+                                style={{
+                                    width: 58,
+                                    height: 30,
+                                    padding: 0,
+                                    margin: 0,
+                                    background: "#F9F9F9",
+                                }}
+                            >
+                                <div
+                                    className="cloud"
+                                    style={{
+                                        width: 58,
+                                        height: 30,
+                                        textAlign: "center",
+                                        lineHeight: "30px",
+                                    }}
+                                >
+                                    支持
+                                </div>
+                                {cloud == true ? (
+                                    <div
+                                        style={{ position: "absolute", top: "-2px", right: "-1px" }}
+                                    >
+                                        <img
+                                            src="/assets/images/background/formchoose.png"
+                                            alt="1"
+                                        />
+                                    </div>
+                                ) : (
+                                    ""
+                                )}
+                            </Form.Radio>
+                            <Form.Radio
+                                value={false}
+                                style={{
+                                    width: 58,
+                                    height: 30,
+                                    padding: 0,
+                                    margin: 0,
+                                    marginLeft: 18,
+                                    background: "#F9F9F9",
+                                }}
+                            >
+                                <div
+                                    className="cloud"
+                                    style={{
+                                        width: 58,
+                                        height: 30,
+                                        textAlign: "center",
+                                        lineHeight: "30px",
+                                    }}
+                                >
+                                    不支持
+                                </div>
+                                {cloud == false && cloud !== "" ? (
+                                    <div
+                                        style={{ position: "absolute", top: "-2px", right: "-1px" }}
+                                    >
+                                        <img
+                                            src="/assets/images/background/formchoose.png"
+                                            alt="1"
+                                        />
+                                    </div>
+                                ) : (
+                                    ""
+                                )}
+                            </Form.Radio>
+                        </Form.RadioGroup>
+                        {/* 语音支持 */}
+                        <Form.RadioGroup
+                            // labelWidth= '76px'
+                            label="语音支持:"
+                            field="voice"
+                            type="pureCard"
+                            direction="horizontal"
+                            style={{ padding: 0, paddingTop: 1, paddingBottom: 1 }}
+                            onChange={(checked) => {
+                                if (checked.target.value == true) {
+                                    setvoice(true);
+                                } else {
+                                    setvoice(false);
+                                }
+                            }}
+                        >
+                            <Form.Radio
+                                value={true}
+                                style={{
+                                    width: 58,
+                                    height: 30,
+                                    padding: 0,
+                                    margin: 0,
+                                    background: "#F9F9F9",
+                                }}
+                            >
+                                <div
+                                    className="voice"
+                                    style={{
+                                        width: 58,
+                                        height: 30,
+                                        textAlign: "center",
+                                        lineHeight: "30px",
+                                    }}
+                                >
+                                    支持
+                                </div>
+                                {voice == true ? (
+                                    <div
+                                        style={{ position: "absolute", top: "-2px", right: "-1px" }}
+                                    >
+                                        <img
+                                            src="/assets/images/background/formchoose.png"
+                                            alt="1"
+                                        />
+                                    </div>
+                                ) : (
+                                    ""
+                                )}
+                            </Form.Radio>
+                            <Form.Radio
+                                value={false}
+                                style={{
+                                    width: 58,
+                                    height: 30,
+                                    padding: 0,
+                                    margin: 0,
+                                    marginLeft: 18,
+                                    background: "#F9F9F9",
+                                }}
+                            >
+                                <div
+                                    className="voice"
+                                    style={{
+                                        width: 58,
+                                        height: 30,
+                                        textAlign: "center",
+                                        lineHeight: "30px",
+                                    }}
+                                >
+                                    不支持
+                                </div>
+                                {voice == false && voice !== "" ? (
+                                    <div
+                                        style={{ position: "absolute", top: "-2px", right: "-1px" }}
+                                    >
+                                        <img
+                                            src="/assets/images/background/formchoose.png"
+                                            alt="1"
+                                        />
+                                    </div>
+                                ) : (
+                                    ""
+                                )}
+                            </Form.Radio>
+                        </Form.RadioGroup>
+                        {/* 设备名称 */}
+                        <Form.Input
+                            field="serialNo"
+                            label="设备序列号:"
+                            placeholder="请输入设备序列号"
+                            style={{ width: 307 }}
+                            rules={[{ required: true, message: "请输入设备序列号" }]}
+                        />
+                        {/* RTMP地址接入 */}
+                        <TextArea
+                            style={{ width: 320, height: 90 }}
+                            field="rtmp"
+                            label="RTMP地址接入:"
+                            placeholder="请输入RTMP地址接入"
+                            rules={[{ required: true, message: "请输入RTMP地址接入" }]}
+                        />
+                    </Col>
+                </Row>
+            </Form>
+        </>
+    );
 }
-function mapStateToProps(state) {
-  const { auth, global, members } = state;
-  return {
-    loading: members.isRequesting,
-    user: auth.user,
-    actions: global.actions,
-    members: members.data,
-  };
+function mapStateToProps (state) {
+    const { auth, global, members } = state;
+    return {
+        loading: members.isRequesting,
+        user: auth.user,
+        actions: global.actions,
+        members: members.data,
+    };
 }
 
 export default connect(mapStateToProps)(fluoriteCamera);
diff --git a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/nvrModal.jsx b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/nvrModal.jsx
index c3efa6d..578dda1 100644
--- a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/nvrModal.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/nvrModal.jsx
@@ -46,9 +46,7 @@ function nvrModal(props) {
       form.current
         .validate()
         .then((values) => {
-          //表单校验成功
-          console.log(values);
-
+          //表单校验
           let valuesObj = JSON.parse(JSON.stringify(values));
           valuesObj.longitude = values.position.split(",")[0];
           valuesObj.latitude = values.position.split(",")[1];
@@ -56,7 +54,7 @@ function nvrModal(props) {
           if (nvrData.id) {
             valuesObj.id = nvrData.id;
           }
-          var x = new moment();
+          var front = new moment(); //验证前时间
           setloading(true);
           dispatch(
             actions.equipmentWarehouse.getCheck({
@@ -64,8 +62,8 @@ function nvrModal(props) {
             })
           ).then((res) => {
             console.log(res);
-            var y = new moment();
-            var duration = moment.duration(y.diff(x))._data.milliseconds;
+            var after = new moment();  //验证后时间
+            var duration = moment.duration(after.diff(front))._data.milliseconds;
             if (res.success) {
               setTimeout(
                 () => {
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 cdd3a65..cf4ef15 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
@@ -8,565 +8,563 @@ import PerfectScrollbar from "perfect-scrollbar";
 let projectScrollbar;
 let equipmentScrollbar;
 
-function SideSheets(props) {
-  const {
-    dispatch,
-    actions,
-    user,
-    loading,
-    visible,
-    close,
-    SETUPS,
-    cameraSetup,
-    rowId,
-    venderList,
-    accessType,
-  } = props;
-  const { equipmentWarehouse } = actions;
-  const [clickStyle, setclickStyle] = useState();
-  const [nvrDetails, setNvrDetails] = useState("");
-  const list = ["项目名称", "关联结构物", "关联测点", "关联监测因素"];
-  const information = {
-    nvr: [
-      {
-        name: "基础信息",
-        basics: [
-          { name: "设备名称：", key: "name" },
-          { name: "设备编号：", key: "serialNo" },
-          { name: "接入方式：", key: "accessWay" },
-          { name: "厂商：", key: "venderId" },
-          { name: "添加账号：", key: "createUser" },
-          { name: "添加时间：", key: "createTime" },
-          { name: "行政区划：", key: "regionCode" },
-          {
-            name: "设备安装位置：",
-            key: "latitude",
-            difference: "line",
-          },
+function SideSheets (props) {
+    const {
+        dispatch,
+        actions,
+        user,
+        loading,
+        visible,
+        close,
+        SETUPS,
+        cameraSetup,
+        rowId,
+        venderList,
+        accessType,
+    } = props;
+    const { equipmentWarehouse } = actions;
+    const [clickStyle, setclickStyle] = useState();
+    const [nvrDetails, setNvrDetails] = useState("");
+    const list = ["项目名称", "关联结构物", "关联测点", "关联监测因素"];
+    const information = {
+        nvr: [
+            {
+                name: "基础信息",
+                basics: [
+                    { name: "设备名称：", key: "name" },
+                    { name: "设备编号：", key: "serialNo" },
+                    { name: "接入方式：", key: "accessWay" },
+                    { name: "厂商：", key: "venderId" },
+                    { name: "添加账号：", key: "createUser" },
+                    { name: "添加时间：", key: "createTime" },
+                    { name: "行政区划：", key: "regionCode" },
+                    {
+                        name: "设备安装位置：",
+                        key: "latitude",
+                        difference: "line",
+                    },
+                ],
+            },
+            {
+                name: "接入信息",
+                access: [
+                    { name: "SIP服务编号：", key: "Serial" },
+                    { name: "SIP域：", key: "Realm" },
+                    { name: "SIP端口号：", key: "ListenAddr" },
+                    { name: "通道数量：", key: "channelCount", difference: "difference" },
+                    { name: "心跳周期：", key: "Expires" },
+                    { name: "最大心跳次数：", key: "RemoveBanInterval" },
+                    { name: "注册密码：", key: "Password" },
+                    { name: "注册有效期：", key: "" },
+                    { name: "接入识别模块：", key: "" },
+                ],
+            },
+            {
+                name: "摄像头信息",
+                CameraInformation: [
+                    {
+                        name: "通道1",
+                        value1: "145641201564-1",
+                        value2: "哦哦哦我我我喔噢喔喔我",
+                    },
+                    {
+                        name: "通道2",
+                        value1: "145641201564-2",
+                        value2: "哦哦哦哦哦噢噢欧欧哦",
+                    },
+                ],
+            },
         ],
-      },
-      {
-        name: "接入信息",
-        access: [
-          { name: "SIP服务编号：", key: "1111111111" },
-          { name: "SIP域：", key: "KGU876J87" },
-          { name: "SIP端口号：", key: "port" },
-          { name: "通道数量：", key: "channelCount" },
-          { name: "心跳周期：", key: "3600s" },
-          { name: "最大心跳次数：", key: "3次" },
-          { name: "注册密码：", key: "**********" },
-          { name: "注册有效期：:", key: "3600s" },
-          { name: "接入识别模块：", key: "sssss" },
+        camera: [
+            {
+                name: "基础信息",
+                basics: [
+                    { name: "设备名称：", key: "name" },
+                    {
+                        name: "SIP编号/设备编号：",
+                        key: nvrDetails.serialNo ? "serialNo" : "sip",
+                    },
+                    { name: "接入方式：", key: "type" },
+                    { name: "厂商：", key: "venderId" },
+                    { name: "添加账号：", key: "createUser" },
+                    { name: "添加时间：", key: "createTime" },
+                    {
+                        name: "设备安装位置：",
+                        key: "latitude",
+                        difference: "line",
+                    },
+                ],
+            },
+            {
+                name: "复制直播地址",
+                liveBroadcast: [
+                    { name: "HLS地址", key: "" },
+                    { name: "FLV地址", key: "" },
+                    { name: "RTMP地址", key: "" },
+                    { name: "EZOPEN地址", key: "" },
+                    { name: "ONVIF地址", key: "" },
+                ],
+            },
+            {
+                name: "复制回收地址",
+                recovery: [
+                    { name: "云储存地址", value: "" },
+                    { name: "本地储存地址", value: "" },
+                ],
+            },
         ],
-      },
-      {
-        name: "摄像头信息",
-        CameraInformation: [
-          {
-            name: "通道1",
-            value1: "145641201564-1",
-            value2: "哦哦哦我我我喔噢喔喔我",
-          },
-          {
-            name: "通道2",
-            value1: "145641201564-2",
-            value2: "哦哦哦哦哦噢噢欧欧哦",
-          },
-        ],
-      },
-    ],
-    camera: [
-      {
-        name: "基础信息",
-        basics: [
-          { name: "设备名称：", key: "name" },
-          {
-            name: "SIP编号/设备编号：",
-            key: nvrDetails.serialNo ? "serialNo" : "sip",
-          },
-          { name: "接入方式：", key: "type" },
-          { name: "厂商：", key: "venderId" },
-          { name: "添加账号：", key: "createUser" },
-          { name: "添加时间：", key: "createTime" },
-          {
-            name: "设备安装位置：",
-            key: "latitude",
-            difference: "line",
-          },
-        ],
-      },
-      {
-        name: "复制直播地址",
-        liveBroadcast: [
-          { name: "HLS地址", key: "" },
-          { name: "FLV地址", key: "" },
-          { name: "RTMP地址", key: "" },
-          { name: "EZOPEN地址", key: "" },
-          { name: "ONVIF地址", key: "" },
-        ],
-      },
-      {
-        name: "复制回收地址",
-        recovery: [
-          { name: "云储存地址", value: "" },
-          { name: "本地储存地址", value: "" },
-        ],
-      },
-    ],
-  };
-  const styles = {
-    width: 180,
-    height: 64,
-    textAlign: "center",
-    background: "url(/assets/images/background/backGround.png)",
-    backgroundSize: "100% 100%",
-    padding: "12px 17px 12px 17px",
-    margin: "30px 0 0 10px",
-    lineHeight: "24px",
-    overflow: "hidden",
-    textOverflow: "ellipsis",
-    display: "-webkit-box",
-    WebkitLineClamp: "2",
-    WebkitBoxOrient: "vertical",
-    zIndex: 5,
-  };
+    };
+    const styles = {
+        width: 180,
+        height: 64,
+        textAlign: "center",
+        background: "url(/assets/images/background/backGround.png)",
+        backgroundSize: "100% 100%",
+        padding: "12px 17px 12px 17px",
+        margin: "30px 0 0 10px",
+        lineHeight: "24px",
+        overflow: "hidden",
+        textOverflow: "ellipsis",
+        display: "-webkit-box",
+        WebkitLineClamp: "2",
+        WebkitBoxOrient: "vertical",
+        zIndex: 5,
+    };
 
-  useEffect(() => {
-    dispatch(
-      equipmentWarehouse[cameraSetup ? "getCameraDetails" : "getNvrDetails"](
-        rowId
-      )
-    ).then((res) => {
-      setNvrDetails(res.payload.data);
-      projectScrollbar = new PerfectScrollbar("#project_information", {
-        suppressScrollX: true,
-      });
-      equipmentScrollbar = new PerfectScrollbar("#equipment_information", {
-        suppressScrollX: true,
-      });
-      console.log(nvrDetails);
-    });
-  }, []);
+    useEffect(() => {
+        dispatch(
+            equipmentWarehouse[cameraSetup ? "getCameraDetails" : "getNvrDetails"](
+                rowId
+            )
+        ).then((res) => {
+            setNvrDetails(res.payload.data);
+            console.log(res.payload.data);
+            projectScrollbar = new PerfectScrollbar("#project_information", {
+                suppressScrollX: true,
+            });
+            equipmentScrollbar = new PerfectScrollbar("#equipment_information", {
+                suppressScrollX: true,
+            });
 
-  useEffect(() => {
-    const domProject = document.getElementById("project_information");
-    if (domProject && projectScrollbar) {
-      projectScrollbar.update();
-    }
-    const domEquipment = document.getElementById("equipment_information");
-    if (domEquipment && equipmentScrollbar) {
-      equipmentScrollbar.update();
-    }
-  });
-  return (
-    <SideSheet
-      visible={visible}
-      title={cameraSetup ? "污水管理出出口" : "智慧设备NVR"}
-      style={{ background: "#F9FBFF" }}
-      size="large"
-      onCancel={() => {
-        close();
-      }}
-    >
-      <Tabs type="line">
-        <TabPane tab="项目信息" itemKey="1">
-          <div
-            style={{
-              display: "flex",
-              justifyContent: "space-evenly",
-            }}
-          >
-            {list.map((item, index) => {
-              return (
-                <div
-                  style={{
-                    lineHeight: "32px",
-                    background: "#1859C1",
-                    color: "#FFFFFF",
-                    borderRadius: 3,
-                    textAlign: "center",
-                    width: 200,
-                    margin: "12px 8px",
-                  }}
-                  key={item}
-                >
-                  <img
-                    src={`/assets/images/background/projectIcon${index}.png`}
-                    style={{ marginRight: 10 }}
-                  />
-                  {item}
-                </div>
-              );
-            })}
-          </div>
-          <div
-            id="project_information"
-            style={{
-              height: document.body.clientHeight - 182,
-              position: "relative",
-            }}
-          >
-            {nvrDetails
-              ? nvrDetails.station.map((item, index) => {
-                  return item.structure.projects.map((v, i) => {
-                    return (
-                      <div
-                        key={v.name}
-                        style={{
-                          display: "flex",
-                          justifyContent: "space-evenly",
-                        }}
-                      >
-                        <div style={styles}>{v.name}</div>
-                        <div style={styles}>{item.structure.name}</div>
-                        <div style={styles}>{item.name}</div>
-                        <div style={styles}>{item.factor.name}</div>
-                      </div>
-                    );
-                  });
-                })
-              : ""}
-          </div>
-        </TabPane>
-        <TabPane tab="设备信息" itemKey="2">
-          <div
-            id="equipment_information"
-            style={{
-              height: document.body.clientHeight - 126,
-              position: "relative",
+        });
+    }, []);
+
+
+    useEffect(() => {
+        const domProject = document.getElementById("project_information");
+        if (domProject && projectScrollbar) {
+            projectScrollbar.update();
+        }
+        const domEquipment = document.getElementById("equipment_information");
+        if (domEquipment && equipmentScrollbar) {
+            equipmentScrollbar.update();
+        }
+    });
+    return (
+        <SideSheet
+            visible={visible}
+            title={cameraSetup ? "污水管理出出口" : "智慧设备NVR"}
+            style={{ background: "#F9FBFF" }}
+            size="large"
+            onCancel={() => {
+                close();
             }}
-          >
-            {nvrDetails
-              ? (cameraSetup ? information.camera : information.nvr).map(
-                  (item, index) => {
-                    let str = [];
-                    if (index > 0) {
-                      str.push(
-                        <img
-                          src="/assets/images/background/straightline.png"
-                          key={"img" + index}
-                          alt="无法显示"
-                          style={{
-                            width: 872,
-                            display: "block",
-                            marginTop: 24,
-                          }}
-                        />
-                      );
-                    }
-                    str.push(
-                      <div
-                        key={"name" + index}
+        >
+            <Tabs type="line">
+                <TabPane tab="项目信息" itemKey="1">
+                    <div
                         style={{
-                          fontWeight: "400",
-                          color: "#1859C1",
-                          margin: "15px 0 12px 40px",
+                            display: "flex",
+                            justifyContent: "space-evenly",
                         }}
-                      >
-                        {item.name}
-                        {cameraSetup ? (
-                          index == 1 ? (
-                            <div
-                              style={{
-                                display: "inline-block",
-                                float: "right",
-                                marginRight: 20,
-                              }}
-                            >
-                              <Button style={{ marginRight: 20 }} theme="solid">
-                                高清
-                              </Button>
-                              <Button>标清</Button>
-                            </div>
-                          ) : (
-                            ""
-                          )
-                        ) : (
-                          ""
-                        )}
-                      </div>
-                    );
-                    //基础信息
-                    if (index == 0) {
-                      item.basics.map((item, index) => {
-                        if (item.difference == "line") {
-                          str.push(
-                            <div
-                              key={"basics" + index}
-                              style={{ marginTop: 14 }}
-                            >
-                              <span
-                                style={{
-                                  width: 150,
-                                  display: "inline-block",
-                                  textAlign: "right",
-                                  fontWeight: "400",
-                                  color: "rgba(0, 0, 0, 0.45)",
-                                }}
-                              >
-                                {item.name}
-                              </span>
-                              <span
-                                style={{ fontWeight: "400", color: " #34383E" }}
-                              >
-                                {`${nvrDetails[item.key]},${nvrDetails.longitude}`}
-                              </span>
-                            </div>
-                          );
-                        } else {
-                          str.push(
-                            <div
-                              key={"basics" + index}
-                              style={{
-                                width: "50%",
-                                display: "inline-block",
-                                marginTop: 20,
-                              }}
-                            >
-                              <span
-                                style={{
-                                  width: 150,
-                                  display: "inline-block",
-                                  textAlign: "right",
-                                  fontWeight: "400",
-                                  color: "rgba(0, 0, 0, 0.45)",
-                                }}
-                              >
-                                {item.name}
-                              </span>
-                              <span
-                                style={{ fontWeight: "400", color: " #34383E" }}
-                              >
-                                {item.key == "type"
-                                  ? accessType.find(
-                                      (v) => v.key == nvrDetails.type
-                                    ).name
-                                  : item.key == "venderId"
-                                  ? nvrDetails.venderId
-                                    ? venderList.find(
-                                        (v) => v.id == nvrDetails.venderId
-                                      ).name
-                                    : ""
-                                  : item.key == "createUser"
-                                  ? nvrDetails.createUser.namePresent
-                                  : item.key == "createTime"
-                                  ? moment(nvrDetails.createTime).format(
-                                      "YYYY-MM-DD HH:MM:SS"
-                                    )
-                                  : nvrDetails[item.key]}
-                              </span>
-                            </div>
-                          );
-                        }
-                        return str;
-                      });
-                    }
-                    //接入信息/复制直播地址
-                    if (index == 1) {
-                      (cameraSetup ? item.liveBroadcast : item.access).map(
-                        (item, index) => {
-                          if (cameraSetup) {
-                            str.push(
-                              <div
-                                key={"liveBroadcast" + index}
-                                style={{
-                                  width: 120,
-                                  height: 130,
-                                  display: "inline-block",
-                                  borderRadius: 4,
-                                  border: "1px solid #D9D9D9",
-                                  margin: "20px 0 0 40px",
-                                  textAlign: "center",
-                                  color: clickStyle == item.name ? "white" : "",
-                                  background:
-                                    clickStyle == item.name ? "#1859C1" : "",
-                                }}
-                                onClick={() => {
-                                  copy(item.name);
-                                  // alert("复制成功");
-                                  setclickStyle(item.name);
-                                }}
-                              >
-                                <img
-                                  src={`/assets/images/background/${
-                                    clickStyle == item.name
-                                      ? "sewage_camera2"
-                                      : "sewage_camera1"
-                                  }.png`}
-                                  style={{ margin: "20px 0 8px 0" }}
-                                />
-                                <div>
-                                  {item.name}
-                                  <img
-                                    src={`/assets/images/background/${
-                                      clickStyle == item.name
-                                        ? "copy2"
-                                        : "copy1"
-                                    }.png`}
-                                    style={{
-                                      paddingBottom: 10,
-                                      display: "inline-block",
-                                      width: 10,
-                                      height: 20,
-                                    }}
-                                  />
-                                </div>
-                              </div>
-                            );
-                          } else {
-                            str.push(
-                              <div
-                                key={"access" + index}
-                                style={{
-                                  width: "50%",
-                                  display: "inline-block",
-                                  marginTop: 20,
-                                }}
-                              >
-                                <span
-                                  style={{
-                                    width: 150,
-                                    display: "inline-block",
-                                    textAlign: "right",
-                                    fontWeight: "400",
-                                    color: "rgba(0, 0, 0, 0.45)",
-                                  }}
-                                >
-                                  {item.name}
-                                </span>
-                                <span
-                                  style={{
-                                    fontWeight: "400",
-                                    color: " #34383E",
-                                  }}
-                                >
-                                  {nvrDetails[item.key]}
-                                </span>
-                              </div>
-                            );
-                          }
-                          return str;
-                        }
-                      );
-                    }
-                    //摄像头信息/复制回收地址
-                    if (index == 2) {
-                      (cameraSetup ? item.recovery : nvrDetails.camera).map(
-                        (item, index) => {
-                          if (cameraSetup) {
-                            str.push(
-                              <div
-                                key={"liveBroadcast" + index}
-                                style={{
-                                  width: 120,
-                                  height: 130,
-                                  display: "inline-block",
-                                  borderRadius: 4,
-                                  border: "1px solid #D9D9D9",
-                                  margin: "20px 0 0 40px",
-                                  textAlign: "center",
-                                  color: clickStyle == item.name ? "white" : "",
-                                  background:
-                                    clickStyle == item.name ? "#1859C1" : "",
-                                }}
-                                onClick={() => {
-                                  copy(item.name);
-                                  // alert("复制成功");
-                                  setclickStyle(item.name);
-                                }}
-                              >
-                                <img
-                                  src={`/assets/images/background/${
-                                    clickStyle == item.name
-                                      ? "store2"
-                                      : "store1"
-                                  }.png`}
-                                  style={{ margin: "20px 0 8px 0" }}
-                                />
-                                <div>
-                                  {item.name}
-                                  <img
-                                    src={`/assets/images/background/${
-                                      clickStyle == item.name
-                                        ? "copy2"
-                                        : "copy1"
-                                    }.png`}
-                                    style={{
-                                      paddingBottom: 10,
-                                      display: "inline-block",
-                                      width: 10,
-                                      height: 20,
-                                    }}
-                                  />
-                                </div>
-                              </div>
-                            );
-                          } else {
-                            str.push(
-                              <div
-                                key={"access" + index}
-                                style={{
-                                  width: "40%",
-                                  display: "inline-block",
-                                  borderRadius: 4,
-                                  border: "1px solid rgba(151, 151, 151, 0.2)",
-                                  margin: "16px 0 0 36px",
-                                  color: "rgba(0, 0, 0, 0.85)",
-                                  fontWeight: "400",
-                                }}
-                              >
+                    >
+                        {list.map((item, index) => {
+                            return (
                                 <div
-                                  style={{
-                                    padding: "8px 10px",
-                                    borderBottom:
-                                      "1px solid rgba(151, 151, 151, 0.2)",
-                                  }}
-                                >
-                                  <img
-                                    src={`/assets/images/background/camera.png`}
-                                    style={{ marginRight: 10 }}
-                                  />
-                                  <div
                                     style={{
-                                      display: "inline-block",
+                                        lineHeight: "32px",
+                                        background: "#1859C1",
+                                        color: "#FFFFFF",
+                                        borderRadius: 3,
+                                        textAlign: "center",
+                                        width: 200,
+                                        margin: "12px 8px",
                                     }}
-                                  >
-                                    {item.channelName}
-                                  </div>
+                                    key={item}
+                                >
+                                    <img
+                                        src={`/assets/images/background/projectIcon${index}.png`}
+                                        style={{ marginRight: 10 }}
+                                    />
+                                    {item}
                                 </div>
-                                <p style={{ margin: "16px 0 0 32px " }}>
-                                  {item.id}
-                                </p>
-                                <p style={{ margin: "16px 0 20px 32px " }}>
-                                  {item.name}
-                                </p>
-                              </div>
                             );
-                          }
-                          return str;
-                        }
-                      );
-                    }
+                        })}
+                    </div>
+                    <div
+                        id="project_information"
+                        style={{
+                            height: document.body.clientHeight - 182,
+                            position: "relative",
+                        }}
+                    >
+                        {nvrDetails
+                            ? nvrDetails.station.map((item, index) => {
+                                return item.structure.projects.map((v, i) => {
+                                    return (
+                                        <div
+                                            key={v.name}
+                                            style={{
+                                                display: "flex",
+                                                justifyContent: "space-evenly",
+                                            }}
+                                        >
+                                            <div style={styles}>{v.name}</div>
+                                            <div style={styles}>{item.structure.name}</div>
+                                            <div style={styles}>{item.name}</div>
+                                            <div style={styles}>{item.factor.name}</div>
+                                        </div>
+                                    );
+                                });
+                            })
+                            : ""}
+                    </div>
+                </TabPane>
+                <TabPane tab="设备信息" itemKey="2">
+                    <div
+                        id="equipment_information"
+                        style={{
+                            height: document.body.clientHeight - 126,
+                            position: "relative",
+                        }}
+                    >
+                        {nvrDetails
+                            ? (cameraSetup ? information.camera : information.nvr).map(
+                                (item, index) => {
+                                    let str = [];
+                                    if (index > 0) {
+                                        str.push(
+                                            <img
+                                                src="/assets/images/background/straightline.png"
+                                                key={"img" + index}
+                                                alt="无法显示"
+                                                style={{
+                                                    width: 872,
+                                                    display: "block",
+                                                    marginTop: 24,
+                                                }}
+                                            />
+                                        );
+                                    }
+                                    str.push(
+                                        <div
+                                            key={"name" + index}
+                                            style={{
+                                                fontWeight: "400",
+                                                color: "#1859C1",
+                                                margin: "15px 0 12px 40px",
+                                            }}
+                                        >
+                                            {item.name}
+                                            {cameraSetup ? (
+                                                index == 1 ? (
+                                                    <div
+                                                        style={{
+                                                            display: "inline-block",
+                                                            float: "right",
+                                                            marginRight: 20,
+                                                        }}
+                                                    >
+                                                        <Button style={{ marginRight: 20 }} theme="solid">
+                                                            高清
+                                                        </Button>
+                                                        <Button>标清</Button>
+                                                    </div>
+                                                ) : (
+                                                    ""
+                                                )
+                                            ) : (
+                                                ""
+                                            )}
+                                        </div>
+                                    );
+                                    //基础信息
+                                    if (index == 0) {
+                                        item.basics.map((item, index) => {
+                                            if (item.difference == "line") {
+                                                str.push(
+                                                    <div
+                                                        key={"basics" + index}
+                                                        style={{ marginTop: 14 }}
+                                                    >
+                                                        <span
+                                                            style={{
+                                                                width: 150,
+                                                                display: "inline-block",
+                                                                textAlign: "right",
+                                                                fontWeight: "400",
+                                                                color: "rgba(0, 0, 0, 0.45)",
+                                                            }}
+                                                        >
+                                                            {item.name}
+                                                        </span>
+                                                        <span
+                                                            style={{ fontWeight: "400", color: " #34383E" }}
+                                                        >
+                                                            {`${nvrDetails[item.key]},${nvrDetails.longitude}`}
+                                                        </span>
+                                                    </div>
+                                                );
+                                            } else {
+                                                str.push(
+                                                    <div
+                                                        key={"basics" + index}
+                                                        style={{
+                                                            width: "50%",
+                                                            display: "inline-block",
+                                                            marginTop: 20,
+                                                        }}
+                                                    >
+                                                        <span
+                                                            style={{
+                                                                width: 150,
+                                                                display: "inline-block",
+                                                                textAlign: "right",
+                                                                fontWeight: "400",
+                                                                color: "rgba(0, 0, 0, 0.45)",
+                                                            }}
+                                                        >
+                                                            {item.name}
+                                                        </span>
+                                                        <span
+                                                            style={{ fontWeight: "400", color: " #34383E" }}
+                                                        >
+                                                            {item.key == "type"
+                                                                ? accessType.find(
+                                                                    (v) => v.key == nvrDetails.type
+                                                                ).name
+                                                                : item.key == "venderId"
+                                                                    ? nvrDetails.venderId
+                                                                        ? venderList.find(
+                                                                            (v) => v.id == nvrDetails.venderId
+                                                                        ).name
+                                                                        : ""
+                                                                    : item.key == "createUser"
+                                                                        ? nvrDetails.createUser.namePresent
+                                                                        : item.key == "createTime"
+                                                                            ? moment(nvrDetails.createTime).format(
+                                                                                "YYYY-MM-DD HH:MM:SS"
+                                                                            )
+                                                                            : nvrDetails[item.key]}
+                                                        </span>
+                                                    </div>
+                                                );
+                                            }
+                                            return str;
+                                        });
+                                    }
+                                    //接入信息/复制直播地址
+                                    if (index == 1) {
+                                        (cameraSetup ? item.liveBroadcast : item.access).map(
+                                            (item, index) => {
+                                                if (cameraSetup) {
+                                                    str.push(
+                                                        <div
+                                                            key={"liveBroadcast" + index}
+                                                            style={{
+                                                                width: 120,
+                                                                height: 130,
+                                                                display: "inline-block",
+                                                                borderRadius: 4,
+                                                                border: "1px solid #D9D9D9",
+                                                                margin: "20px 0 0 40px",
+                                                                textAlign: "center",
+                                                                color: clickStyle == item.name ? "white" : "",
+                                                                background:
+                                                                    clickStyle == item.name ? "#1859C1" : "",
+                                                            }}
+                                                            onClick={() => {
+                                                                copy(item.name);
+                                                                // alert("复制成功");
+                                                                setclickStyle(item.name);
+                                                            }}
+                                                        >
+                                                            <img
+                                                                src={`/assets/images/background/${clickStyle == item.name
+                                                                    ? "sewage_camera2"
+                                                                    : "sewage_camera1"
+                                                                    }.png`}
+                                                                style={{ margin: "20px 0 8px 0" }}
+                                                            />
+                                                            <div>
+                                                                {item.name}
+                                                                <img
+                                                                    src={`/assets/images/background/${clickStyle == item.name
+                                                                        ? "copy2"
+                                                                        : "copy1"
+                                                                        }.png`}
+                                                                    style={{
+                                                                        paddingBottom: 10,
+                                                                        display: "inline-block",
+                                                                        width: 10,
+                                                                        height: 20,
+                                                                    }}
+                                                                />
+                                                            </div>
+                                                        </div>
+                                                    );
+                                                } else {
+                                                    str.push(
+                                                        <div
+                                                            key={"access" + index}
+                                                            style={{
+                                                                width: "50%",
+                                                                display: "inline-block",
+                                                                marginTop: 20,
+                                                            }}
+                                                        >
+                                                            <span
+                                                                style={{
+                                                                    width: 150,
+                                                                    display: "inline-block",
+                                                                    textAlign: "right",
+                                                                    fontWeight: "400",
+                                                                    color: "rgba(0, 0, 0, 0.45)",
+                                                                }}
+                                                            >
+                                                                {item.name}
+                                                            </span>
+                                                            <span
+                                                                style={{
+                                                                    fontWeight: "400",
+                                                                    color: " #34383E",
+                                                                }}
+                                                            >
+                                                                {item.difference == "difference" ? nvrDetails[item.key] : nvrDetails.accessInfo[item.key]}
+                                                            </span>
+                                                        </div>
+                                                    );
+                                                }
+                                                return str;
+                                            }
+                                        );
+                                    }
+                                    //摄像头信息/复制回收地址
+                                    if (index == 2) {
+                                        (cameraSetup ? item.recovery : nvrDetails.camera).map(
+                                            (item, index) => {
+                                                if (cameraSetup) {
+                                                    str.push(
+                                                        <div
+                                                            key={"liveBroadcast" + index}
+                                                            style={{
+                                                                width: 120,
+                                                                height: 130,
+                                                                display: "inline-block",
+                                                                borderRadius: 4,
+                                                                border: "1px solid #D9D9D9",
+                                                                margin: "20px 0 0 40px",
+                                                                textAlign: "center",
+                                                                color: clickStyle == item.name ? "white" : "",
+                                                                background:
+                                                                    clickStyle == item.name ? "#1859C1" : "",
+                                                            }}
+                                                            onClick={() => {
+                                                                copy(item.name);
+                                                                // alert("复制成功");
+                                                                setclickStyle(item.name);
+                                                            }}
+                                                        >
+                                                            <img
+                                                                src={`/assets/images/background/${clickStyle == item.name
+                                                                    ? "store2"
+                                                                    : "store1"
+                                                                    }.png`}
+                                                                style={{ margin: "20px 0 8px 0" }}
+                                                            />
+                                                            <div>
+                                                                {item.name}
+                                                                <img
+                                                                    src={`/assets/images/background/${clickStyle == item.name
+                                                                        ? "copy2"
+                                                                        : "copy1"
+                                                                        }.png`}
+                                                                    style={{
+                                                                        paddingBottom: 10,
+                                                                        display: "inline-block",
+                                                                        width: 10,
+                                                                        height: 20,
+                                                                    }}
+                                                                />
+                                                            </div>
+                                                        </div>
+                                                    );
+                                                } else {
+                                                    str.push(
+                                                        <div
+                                                            key={"access" + index}
+                                                            style={{
+                                                                width: "40%",
+                                                                display: "inline-block",
+                                                                borderRadius: 4,
+                                                                border: "1px solid rgba(151, 151, 151, 0.2)",
+                                                                margin: "16px 0 0 36px",
+                                                                color: "rgba(0, 0, 0, 0.85)",
+                                                                fontWeight: "400",
+                                                            }}
+                                                        >
+                                                            <div
+                                                                style={{
+                                                                    padding: "8px 10px",
+                                                                    borderBottom:
+                                                                        "1px solid rgba(151, 151, 151, 0.2)",
+                                                                }}
+                                                            >
+                                                                <img
+                                                                    src={`/assets/images/background/camera.png`}
+                                                                    style={{ marginRight: 10 }}
+                                                                />
+                                                                <div
+                                                                    style={{
+                                                                        display: "inline-block",
+                                                                    }}
+                                                                >
+                                                                    {item.channelName}
+                                                                </div>
+                                                            </div>
+                                                            <p style={{ margin: "16px 0 0 32px " }}>
+                                                                {item.id}
+                                                            </p>
+                                                            <p style={{ margin: "16px 0 20px 32px " }}>
+                                                                {item.name}
+                                                            </p>
+                                                        </div>
+                                                    );
+                                                }
+                                                return str;
+                                            }
+                                        );
+                                    }
 
-                    return str;
-                  }
-                )
-              : ""}
-          </div>
-        </TabPane>
-      </Tabs>
-    </SideSheet>
-  );
+                                    return str;
+                                }
+                            )
+                            : ""}
+                    </div>
+                </TabPane>
+            </Tabs>
+        </SideSheet>
+    );
 }
 
-function mapStateToProps(state) {
-  const { auth, global, members } = state;
-  return {
-    loading: members.isRequesting,
-    user: auth.user,
-    actions: global.actions,
-    global: global,
-    members: members.data,
-  };
+function mapStateToProps (state) {
+    const { auth, global, members } = state;
+    return {
+        loading: members.isRequesting,
+        user: auth.user,
+        actions: global.actions,
+        global: global,
+        members: members.data,
+    };
 }
 export default connect(mapStateToProps)(SideSheets);
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 45525c1..18d472a 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
@@ -35,6 +35,7 @@ const CameraHeader = (props) => {
     const [search, setearch] = useState({}); //搜索条件
     const [rowId, setRowId] = useState(); //表格数据id
     const [cameraData, setCameraData] = useState({}); //表格数据
+    const [deviceClick, setDeviceClick] = useState(false); //设备名称点击的不同效果
 
     const { equipmentWarehouse } = actions;
     const api = useRef();
@@ -63,31 +64,28 @@ const CameraHeader = (props) => {
         dispatch(equipmentWarehouse.getCamera({ ...query, ...search }));
     }
     const equipmentStatus = { ON: "在线", ONLINE: "在线", OFF: "离线", Alarmed: "未知状态" }
+
     const columns = [
         {
             title: "序号",
-            render: (text, record, index) => {
+            dataIndex: "",
+            render: (text, r, index) => {
                 return index + 1;
             },
         },
         {
             title: "设备名称",
             dataIndex: "name",
-            render: (text, record, index) => {
+            render: (_, row) => {
                 return (
                     <div>
-                        <span
-                            style={{
-                                backgroundColor: record.avatarBg,
-                                width: "10px",
-                                height: "10px",
-                                borderRadius: "50%",
-                                display: "inline-block",
-                                marginRight: "10px",
-                            }}
-                        />
-                        {record.name}
-                    </div>
+                        {row.name}
+                        <sapn style={{ color: "blue" }}
+                            onClick={() =>device_(row)}
+                        >
+                            {row.type == "nvr" ? `@${row.nvr.name}` : row.type == "cascade" ? `@${row.externalDomain}` : ""}
+                        </sapn>
+                    </div >
                 );
             },
         },
@@ -191,6 +189,26 @@ const CameraHeader = (props) => {
         },
     ];
 
+    const device_ = (r) => {
+        console.log(deviceClick)
+        if (deviceClick) {
+            // if (r.type == "nvr") {
+            //     console.log(search)
+            //     setearch({ ...search, nvrId: r.nvr.id })
+            // } else {
+            //     setearch({ ...search, externalDomain: r.externalDomain })
+            // }
+            setDeviceClick(false)
+        } else {
+            // if (r.type == "nvr") {
+            //     setearch({ ...search, nvrId: null })
+            // } else {
+            //     setearch({ ...search, externalDomain: null })
+            // }
+            setDeviceClick(true)
+        }
+    }
+
     //获取表格属性设置
     function attribute (data) {
         const arr = localStorage.getItem(CAMERAS)
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 4114ff7..a51ef58 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
@@ -3,16 +3,16 @@ import { connect } from "react-redux";
 import { push } from "react-router-redux";
 import moment from "moment";
 import {
-  Button,
-  Form,
-  Input,
-  Row,
-  Table,
-  Pagination,
-  Skeleton,
-  Popconfirm,
-  Popover,
-  Tag,
+    Button,
+    Form,
+    Input,
+    Row,
+    Table,
+    Pagination,
+    Skeleton,
+    Popconfirm,
+    Popover,
+    Tag,
 } from "@douyinfe/semi-ui";
 import "../style.less";
 import { ApiTable } from "$utils";
@@ -23,418 +23,419 @@ import { skeletonScreen } from "../components/skeletonScreen";
 import { ReminderBox } from "../../../components/index";
 
 export const accessType = [
-  { name: "萤石云平台摄像头", key: "yingshi" },
-  { name: "NVR摄像头", key: "nvr" },
-  { name: "IPC 网络摄像头", key: "ipc" },
-  { name: "不明厂家", key: "cascade" },
+    { name: "萤石云", key: "yingshi" },
+    { name: "NVR", key: "nvr" },
+    { name: "IPC", key: "ipc" },
+    { name: "级联", key: "cascade" },
 ];
 
 const NvrHeader = (props) => {
-  const { dispatch, actions, user, loading, equipmentWarehouseNvr } = props;
-  const { equipmentWarehouse } = actions;
-  // const [loading, setLoading] = useState(false);
-  const [setup, setSetup] = useState(false);
-  const [sideSheet, setSideSheet] = useState(false);
-  const [setupp, setSetupp] = useState([]);
-  const [venderList, setvenderList] = useState([]); //厂商信息
-  const [query, setQuery] = useState({ limit: 10, page: 0 }); //页码信息
-  const [search, setearch] = useState({}); //搜索条件
-  const [rowId, setRowId] = useState(); //表格数据id
-  const [load, setLoad] = useState(); //骨架屏是否显现
-  const [reminder, setReminder] = useState(true); //提醒弹框
-  const api = useRef();
-  const SETUPS = "setups";
+    const { dispatch, actions, user, loading, equipmentWarehouseNvr } = props;
+    const { equipmentWarehouse } = actions;
+    const [setup, setSetup] = useState(false);
+    const [sideSheet, setSideSheet] = useState(false);
+    const [setupp, setSetupp] = useState([]);
+    const [venderList, setvenderList] = useState([]); //厂商信息
+    const [query, setQuery] = useState({ limit: 10, page: 0 }); //页码信息
+    const [search, setearch] = useState({}); //搜索条件
+    const [rowId, setRowId] = useState(); //表格数据id
 
-  useEffect(() => {
-    setLoad(loading);
-    dispatch(actions.equipmentWarehouse.getVender()).then((res) => {
-      setvenderList(res.payload.data);
-      attribute(res.payload.data);
-    });
-    //初始化表格显示设置
-    localStorage.getItem(SETUPS) == null
-      ? localStorage.setItem(
-          SETUPS,
-          JSON.stringify(["manufactor", "passageway", "port", "state"])
-        )
-      : "";
-    // ;
-  }, []);
-  useEffect(() => {
-    equipmentGetNvr();
-  }, [query, search]);
+    const [reminder, setReminder] = useState(true); //提醒弹框
+    const api = useRef();
+    const SETUPS = "setups";
 
-  function equipmentGetNvr() {
-    dispatch(equipmentWarehouse.getNvr({ ...query, ...search }));
-  }
+    useEffect(() => {
+        dispatch(actions.equipmentWarehouse.getVender()).then((res) => {
+            setvenderList(res.payload.data);
+            attribute(res.payload.data);
+        });
+        //初始化表格显示设置
+        localStorage.getItem(SETUPS) == null
+            ? localStorage.setItem(
+                SETUPS,
+                JSON.stringify(["manufactor", "passageway", "port", "state"])
+            )
+            : "";
+        // ;
+    }, []);
 
-  const equipmentStatus = {
-    ON: "在线",
-    ONLINE: "在线",
-    OFF: "离线",
-    Alarmed: "未知",
-  };
-  const colorStatus = {
-    ON: "#04B234",
-    ONLINE: "#04B234",
-    OFF: "rgba(0, 0, 0, 0.45)",
-    Alarmed: "#1859C1",
-  };
-  const columns = [
-    {
-      title: "序号",
-      render: (text, record, index) => {
-        return index + 1;
-      },
-    },
-    {
-      title: "设备名称",
-      dataIndex: "name",
-      render: (text, r, index) => {
-        return r.name;
-      },
-    },
-    {
-      title: "SIP地址",
-      dataIndex: "owner",
-      render: (text, r, index) => {
-        let sipState = r.gbNvr;
-        return sipState ? sipState.sipip : "";
-      },
-    },
-    {
-      title: "操作",
-      width: "20%",
-      dataIndex: "",
-      render: (_, row) => {
-        return (
-          <div style={{ display: "flex" }}>
-            <Button theme="borderless">
-              <NvrModal
-                nvrData={row}
-                modalName="revise"
-                venderList={venderList}
-                close={() => {
-                  equipmentGetNvr();
-                }}
-              />
-            </Button>
-            <Button
-              theme="borderless"
-              onClick={() => {
-                setSideSheet(true);
-                setRowId(row.id);
-              }}
-            >
-              查看
-            </Button>
-            <Popconfirm
-              title="删除NVR会删除端口下的所有摄像头，是否确定删除？"
-              arrowPointAtCenter={false}
-              showArrow={true}
-              position="topRight"
-              onConfirm={() => {
-                dispatch(equipmentWarehouse.delNvr(row.id)).then(() => {
-                  equipmentGetNvr();
-                });
-              }}
-            >
-              <Button theme="borderless">删除</Button>
-            </Popconfirm>
-          </div>
-        );
-      },
-    },
-  ];
+    useEffect(() => {
+        equipmentGetNvr();
+    }, [query, search]);
 
-  //获取表格属性设置
-  function attribute(data) {
-    const arr = localStorage.getItem(SETUPS)
-      ? JSON.parse(localStorage.getItem(SETUPS))
-      : [];
+    function equipmentGetNvr () {
+        dispatch(equipmentWarehouse.getNvr({ ...query, ...search }));
+    }
 
-    const column = [
-      {
-        title: "设备厂家",
-        dataIndex: "venderId",
-        key: "manufactor",
-        render: (_, r, index) => {
-          console.log(r);
-          let manufactorName = data.find((item) => item.id == r.venderId);
-          return manufactorName ? manufactorName.name : "";
-        },
-      },
-      {
-        title: "添加账号",
-        dataIndex: "createUserId",
-        key: "accountNumber",
-        render: (_, r, index) => {
-          let createUserName = r.createUser;
-          return createUserName ? createUserName.name : "";
+    const equipmentStatus = {
+        ON: "在线",
+        ONLINE: "在线",
+        OFF: "离线",
+        Alarmed: "未知",
+    };
+    const colorStatus = {
+        ON: "#04B234",
+        ONLINE: "#04B234",
+        OFF: "rgba(0, 0, 0, 0.45)",
+        Alarmed: "#1859C1",
+    };
+    const columns = [
+        {
+            title: "序号",
+            render: (text, record, index) => {
+                return index + 1;
+            },
         },
-      },
-      {
-        title: "通道数",
-        dataIndex: "channelCount",
-        key: "passageway",
-      },
-      {
-        title: "端口",
-        dataIndex: "port",
-        key: "port",
-      },
-      {
-        title: "设备状态",
-        dataIndex: "size",
-        key: "state",
-        render: (_, r, index) => {
-          let status = r.gbNvr;
-          return (
-            <div>
-              <span
-                style={{
-                  width: 8,
-                  height: 8,
-                  display: "inline-block",
-                  borderRadius: "50%",
-                  backgroundColor: colorStatus[status.online],
-                  margin: "0 8px 0 0",
-                }}
-              />
-              {status ? equipmentStatus[status.online] : ""}
-            </div>
-          );
-        },
-      },
-      {
-        title: "创建时间",
-        dataIndex: "createTime",
-        key: "time",
-        render: (_, r, index) => {
-          return moment(r.createTime).format("YYYY-MM-DD HH:MM:SS");
-        },
-      },
-      {
-        title: "项目名称",
-        dataIndex: "",
-        key: "name",
-        render: (_, r, index) => {
-          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: "设备名称",
+            dataIndex: "name",
+            render: (text, r, index) => {
+                return r.name
+            },
         },
-      },
-      {
-        title: "pcode",
-        dataIndex: "",
-        key: "pcode",
-        render: (_, r, index) => {
-          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"
-                    );
-              });
+        {
+            title: "SIP地址",
+            dataIndex: "owner",
+            render: (text, r, index) => {
+                let sipState = r.gbNvr;
+                return sipState ? sipState.sipip : "";
+            },
         },
-      },
-      {
-        title: "结构物",
-        dataIndex: "",
-        key: "structure",
-        render: (_, r, index) => {
-          return r.station.length == 0
-            ? ""
-            : station(r.station[0].structure.name, r.station, "structure.name");
+        {
+            title: "操作",
+            width: "20%",
+            dataIndex: "",
+            render: (_, row) => {
+                return (
+                    <div style={{ display: "flex" }}>
+                        <Button theme="borderless">
+                            <NvrModal
+                                nvrData={row}
+                                modalName="revise"
+                                venderList={venderList}
+                                close={() => {
+                                    equipmentGetNvr();
+                                }}
+                            />
+                        </Button>
+                        <Button
+                            theme="borderless"
+                            onClick={() => {
+                                setSideSheet(true);
+                                setRowId(row.id);
+                            }}
+                        >
+                            查看
+                        </Button>
+                        <Popconfirm
+                            title="删除NVR会删除端口下的所有摄像头，是否确定删除？"
+                            arrowPointAtCenter={false}
+                            showArrow={true}
+                            position="topRight"
+                            onConfirm={() => {
+                                dispatch(equipmentWarehouse.delNvr(row.id)).then(() => {
+                                    equipmentGetNvr();
+                                });
+                            }}
+                        >
+                            <Button theme="borderless">删除</Button>
+                        </Popconfirm>
+                    </div>
+                );
+            },
         },
-      },
     ];
-    for (let i = 0; i < arr.length; i++) {
-      let colum = column.filter((item) => {
-        return item.key === arr[i];
-      });
-      columns.splice(i + 2, 0, colum[0]);
-    }
-    setSetupp(columns);
-  }
 
-  //表格请求数据中station属性数据的展示
-  function station(first, whole, name) {
-    return (
-      <Popover
-        key="updateTime"
-        position="top"
-        content={
-          <article style={{ padding: 12 }}>
-            {whole.map((v, index) => {
-              let names = "";
-              switch (name) {
-                case "name":
-                  names = v[name];
-                  break;
-                case "url":
-                  names = v[name];
-                  break;
-                case "structure.name":
-                  names = v.structure.name;
-                  break;
-                case "factor.name":
-                  names = v.factor.name;
-                  break;
-                default:
-                  break;
-              }
-              return <div key={index}>{names}</div>;
-            })}
-          </article>
-        }
-      >
-        <Tag>{first}...</Tag>
-      </Popover>
-    );
-  }
+    //获取表格属性设置
+    function attribute (data) {
+        const arr = localStorage.getItem(SETUPS)
+            ? JSON.parse(localStorage.getItem(SETUPS))
+            : [];
 
-  //条件赛选样式
-  const screen = {
-    width: 193,
-    marginRight: 20,
-    marginBottom: 16,
-    color: "rgba(0, 0, 0, 0.65)",
-  };
+        const column = [
+            {
+                title: "设备厂家",
+                dataIndex: "venderId",
+                key: "manufactor",
+                render: (_, r, index) => {
+                    console.log(r);
+                    let manufactorName = data.find((item) => item.id == r.venderId);
+                    return manufactorName ? manufactorName.name : "";
+                },
+            },
+            {
+                title: "添加账号",
+                dataIndex: "createUserId",
+                key: "accountNumber",
+                render: (_, r, index) => {
+                    let createUserName = r.createUser;
+                    return createUserName ? createUserName.name : "";
+                },
+            },
+            {
+                title: "通道数",
+                dataIndex: "channelCount",
+                key: "passageway",
+            },
+            {
+                title: "端口",
+                dataIndex: "port",
+                key: "port",
+            },
+            {
+                title: "设备状态",
+                dataIndex: "size",
+                key: "state",
+                render: (_, r, index) => {
+                    let status = r.gbNvr;
+                    return (
+                        <div>
+                            <span
+                                style={{
+                                    width: 8,
+                                    height: 8,
+                                    display: "inline-block",
+                                    borderRadius: "50%",
+                                    backgroundColor: colorStatus[status.online],
+                                    margin: "0 8px 0 0",
+                                }}
+                            />
+                            {status ? equipmentStatus[status.online] : ""}
+                        </div>
+                    );
+                },
+            },
+            {
+                title: "创建时间",
+                dataIndex: "createTime",
+                key: "time",
+                render: (_, r, index) => {
+                    return moment(r.createTime).format("YYYY-MM-DD HH:MM:SS");
+                },
+            },
+            {
+                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",
+                dataIndex: "",
+                key: "pcode",
+                render: (_, r, index) => {
+                    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"
+                                );
+                        });
+                },
+            },
+            {
+                title: "结构物",
+                dataIndex: "",
+                key: "structure",
+                render: (_, r, index) => {
+                    return r.station.length == 0
+                        ? ""
+                        : station(r.station[0].structure.name, r.station, "structure.name");
+                },
+            },
+        ];
+        for (let i = 0; i < arr.length; i++) {
+            let colum = column.filter((item) => {
+                return item.key === arr[i];
+            });
+            columns.splice(i + 2, 0, colum[0]);
+        }
+        setSetupp(columns);
+    }
 
-  return (
-    <>
-      <div>
-        <video
-          id="nvrBanner"
-          autoPlay
-          loop
-          muted
-          style={{ width: "100%", objectFit: "cover", height: 171 }}
-          src="/assets/video/nvr_banner.mp4"
-          type="video/mp4"
-        />
-        <div style={{ position: "absolute", top: 12 }}>
-          <div
-            style={{
-              fontSize: 22,
-              paddingTop: 15,
-              marginLeft: 21,
-            }}
-          >
-            NVR管理
-          </div>
-          <div
-            style={{
-              fontSize: 14,
-              paddingTop: 18,
-              marginLeft: 20,
-            }}
-          >
-            对NVR（网络硬盘录像机）设备节点的管理
-          </div>
-          <div
-            style={{
-              fontSize: 14,
-              marginTop: 28,
-              marginLeft: 21,
-              width: 89,
-              height: 32,
-              lineHeight: "32px",
-              textAlign: "center",
-              backgroundColor: "#D9EAFF",
-              color: "#1859C1",
-              cursor: "pointer",
-            }}
-          >
-            <NvrModal
-              modalName="add"
-              venderList={venderList}
-              close={() => {
-                equipmentGetNvr();
-              }}
-            />
-          </div>
-        </div>
-      </div>
-      <div
-        style={{
-          width: "100%",
-          background: "#FFFFFF",
-          borderRadius: 3,
-          padding: "8px 20px",
-          marginTop: 20,
-        }}
-      >
-        <div
-          style={{
-            height: 22,
-            fontSize: 16,
-            fontFamily: "PingFangSC-Medium, PingFang SC",
-            fontWeight: "bold",
-            color: " rgba(0, 0, 0, 0.85)",
-            lineHeight: "22px",
-            marginBottom: 16,
-          }}
-        >
-          筛选条件
-        </div>
-        <div style={{ display: "flex" }}>
-          <Form
-            onSubmit={(values) => console.log(values)}
-            // onValueChange={values=>console.log(values)}
-            getFormApi={(formApi) => (api.current = formApi)}
-            layout="horizontal"
-            style={{ position: "relative", width: "100%", flex: 1 }}
-          >
-            <Form.Input
-              label="设备搜索："
-              field="keyword"
-              maxLength="36"
-              placeholder="请输入设备名称"
-              labelPosition="left"
-              style={screen}
-            />
-            <Form.Select
-              label="厂家筛选："
-              labelPosition="left"
-              style={screen}
-              field="venderId"
-              placeholder="全部"
-              showClear
+    //表格请求数据中station属性数据的展示
+    function station (first, whole, name) {
+        return (
+            <Popover
+                key="updateTime"
+                position="top"
+                content={
+                    <article style={{ padding: 12 }}>
+                        {whole.map((v, index) => {
+                            let names = "";
+                            switch (name) {
+                                case "name":
+                                    names = v[name];
+                                    break;
+                                case "url":
+                                    names = v[name];
+                                    break;
+                                case "structure.name":
+                                    names = v.structure.name;
+                                    break;
+                                case "factor.name":
+                                    names = v.factor.name;
+                                    break;
+                                default:
+                                    break;
+                            }
+                            return <div key={index}>{names}</div>;
+                        })}
+                    </article>
+                }
             >
-              {venderList.map((item) => {
-                return (
-                  <Form.Select.Option key={item.id} value={item.id}>
-                    {item.name}
-                  </Form.Select.Option>
-                );
-              })}
-            </Form.Select>
-            <Form.Select
-              label="状态查询："
-              labelPosition="left"
-              field="type2"
-              style={screen}
-              placeholder="全部"
-              showClear
+                <Tag>{first}...</Tag>
+            </Popover>
+        );
+    }
+
+    //条件赛选样式
+    const screen = {
+        width: 193,
+        marginRight: 20,
+        marginBottom: 16,
+        color: "rgba(0, 0, 0, 0.65)",
+    };
+
+    return (
+        <>
+            <div>
+                <video
+                    id="nvrBanner"
+                    autoPlay
+                    loop
+                    muted
+                    style={{ width: "100%", objectFit: "cover", height: 171 }}
+                    src="/assets/video/nvr_banner.mp4"
+                    type="video/mp4"
+                />
+                <div style={{ position: "absolute", top: 12 }}>
+                    <div
+                        style={{
+                            fontSize: 22,
+                            paddingTop: 15,
+                            marginLeft: 21,
+                        }}
+                    >
+                        NVR管理
+                    </div>
+                    <div
+                        style={{
+                            fontSize: 14,
+                            paddingTop: 18,
+                            marginLeft: 20,
+                        }}
+                    >
+                        对NVR（网络硬盘录像机）设备节点的管理
+                    </div>
+                    <div
+                        style={{
+                            fontSize: 14,
+                            marginTop: 28,
+                            marginLeft: 21,
+                            width: 89,
+                            height: 32,
+                            lineHeight: "32px",
+                            textAlign: "center",
+                            backgroundColor: "#D9EAFF",
+                            color: "#1859C1",
+                            cursor: "pointer",
+                        }}
+                    >
+                        <NvrModal
+                            modalName="add"
+                            venderList={venderList}
+                            close={() => {
+                                equipmentGetNvr();
+                            }}
+                        />
+                    </div>
+                </div>
+            </div>
+            <div
+                style={{
+                    width: "100%",
+                    background: "#FFFFFF",
+                    borderRadius: 3,
+                    padding: "8px 20px",
+                    marginTop: 20,
+                }}
             >
-              <Form.Select.Option value="yes">在线</Form.Select.Option>
-              <Form.Select.Option value="no">离线</Form.Select.Option>
-            </Form.Select>
-            {/* <Form.Select
+                <div
+                    style={{
+                        height: 22,
+                        fontSize: 16,
+                        fontFamily: "PingFangSC-Medium, PingFang SC",
+                        fontWeight: "bold",
+                        color: " rgba(0, 0, 0, 0.85)",
+                        lineHeight: "22px",
+                        marginBottom: 16,
+                    }}
+                >
+                    筛选条件
+                </div>
+                <div style={{ display: "flex" }}>
+                    <Form
+                        onSubmit={(values) => console.log(values)}
+                        // onValueChange={values=>console.log(values)}
+                        getFormApi={(formApi) => (api.current = formApi)}
+                        layout="horizontal"
+                        style={{ position: "relative", width: "100%", flex: 1 }}
+                    >
+                        <Form.Input
+                            label="设备搜索："
+                            field="keyword"
+                            maxLength="36"
+                            placeholder="请输入设备名称"
+                            labelPosition="left"
+                            style={screen}
+                        />
+                        <Form.Select
+                            label="厂家筛选："
+                            labelPosition="left"
+                            style={screen}
+                            field="venderId"
+                            placeholder="全部"
+                            showClear
+                        >
+                            {venderList.map((item) => {
+                                return (
+                                    <Form.Select.Option key={item.id} value={item.id}>
+                                        {item.name}
+                                    </Form.Select.Option>
+                                );
+                            })}
+                        </Form.Select>
+                        <Form.Select
+                            label="状态查询："
+                            labelPosition="left"
+                            field="state"
+                            style={screen}
+                            placeholder="全部"
+                            showClear
+                        >
+                            <Form.Select.Option value="ON">在线</Form.Select.Option>
+                            <Form.Select.Option value="OFF">离线</Form.Select.Option>
+                            <Form.Select.Option value="UNKONW">未知</Form.Select.Option>
+                        </Form.Select>
+                        {/* <Form.Select
               label="关联项目："
               labelPosition="left"
               field="type3"
@@ -449,178 +450,178 @@ const NvrHeader = (props) => {
                 飞尚科技2
               </Form.Select.Option>
             </Form.Select> */}
-          </Form>
-          <div
-            style={{
-              width: 150,
-              display: "flex",
-              justifyContent: "flex-end",
-              alignItems: "flex-end",
-            }}
-          >
-            <Button
-              theme="solid"
-              type="primary"
-              style={{
-                width: 65,
-                height: 30,
-                borderRadius: 3,
-                marginBottom: 20,
-                marginRight: 20,
-              }}
-              onClick={() => {
-                api.current.validate().then((v) => {
-                  setearch(v);
-                });
-                equipmentGetNvr();
-              }}
-            >
-              搜素
-            </Button>
-            <Button
-              theme="light"
-              type="primary"
-              style={{
-                width: 65,
-                height: 30,
-                backGround: "#FFFFFF",
-                borderRadius: 3,
-                border: "1px solid #D9D9D9",
-                marginBottom: 20,
-              }}
-              onClick={() => {
-                api.current.reset();
-                setearch({});
-                equipmentGetNvr();
-              }}
-            >
-              重置
-            </Button>
-          </div>
-        </div>
-      </div>
-      <div style={{ background: "#FFFFFF", marginTop: 5 }}>
-        <div
-          style={{
-            width: "100%",
-            display: "flex",
-            justifyContent: "space-between",
-            padding: "13px 20px",
-          }}
-        >
-          <div
-            style={{
-              width: 64,
-              height: 22,
-              fontSize: 16,
-              fontfAmily: "PingFangSC-Medium, PingFang SC",
-              fontWeight: "bold",
-              color: "rgba(0, 0, 0, 0.85)",
-              lineHeight: "22px",
-            }}
-          >
-            设备列表
-          </div>
-          <div>
-            <Button
-              style={{
-                width: 32,
-                height: 32,
-                background: "#D9D9D9",
-                borderadius: 3,
-                marginRight: 20,
-              }}
-              type="primary"
-              key="primary"
-              onClick={() => {
-                setSetup(true);
-              }}
-            >
-              <img
-                src="/assets/images/background/setup.png"
-                alt="设置"
-                style={{ width: 18, height: 18 }}
-              />
-            </Button>
-            <a href={`/_api/${ApiTable.getExport}`}>
-              <Button
-                style={{
-                  width: 65,
-                  height: 32,
-                  background: "#FFFFFF",
-                  borderRadius: 3,
-                  border: "1px solid #1859C1",
-                }}
-              >
-                导出
-              </Button>
-            </a>
-          </div>
-        </div>
-        <Skeleton
-          loading={loading}
-          placeholder={skeletonScreen(8, setupp.length)}
-        >
-          <Table
-            columns={setupp.filter((s) => s)}
-            dataSource={equipmentWarehouseNvr.data}
-            bordered={false}
-            empty="暂无数据"
-            style={{
-              padding: "0px 20px",
-            }}
-            pagination={false}
-          />
-        </Skeleton>
+                    </Form>
+                    <div
+                        style={{
+                            width: 150,
+                            display: "flex",
+                            justifyContent: "flex-end",
+                            alignItems: "flex-end",
+                        }}
+                    >
+                        <Button
+                            theme="solid"
+                            type="primary"
+                            style={{
+                                width: 65,
+                                height: 30,
+                                borderRadius: 3,
+                                marginBottom: 20,
+                                marginRight: 20,
+                            }}
+                            onClick={() => {
+                                api.current.validate().then((v) => {
+                                    setearch(v);
+                                });
+                                equipmentGetNvr();
+                            }}
+                        >
+                            搜素
+                        </Button>
+                        <Button
+                            theme="light"
+                            type="primary"
+                            style={{
+                                width: 65,
+                                height: 30,
+                                backGround: "#FFFFFF",
+                                borderRadius: 3,
+                                border: "1px solid #D9D9D9",
+                                marginBottom: 20,
+                            }}
+                            onClick={() => {
+                                api.current.reset();
+                                setearch({});
+                                equipmentGetNvr();
+                            }}
+                        >
+                            重置
+                        </Button>
+                    </div>
+                </div>
+            </div>
+            <div style={{ background: "#FFFFFF", marginTop: 5 }}>
+                <div
+                    style={{
+                        width: "100%",
+                        display: "flex",
+                        justifyContent: "space-between",
+                        padding: "13px 20px",
+                    }}
+                >
+                    <div
+                        style={{
+                            width: 64,
+                            height: 22,
+                            fontSize: 16,
+                            fontfAmily: "PingFangSC-Medium, PingFang SC",
+                            fontWeight: "bold",
+                            color: "rgba(0, 0, 0, 0.85)",
+                            lineHeight: "22px",
+                        }}
+                    >
+                        设备列表
+                    </div>
+                    <div>
+                        <Button
+                            style={{
+                                width: 32,
+                                height: 32,
+                                background: "#D9D9D9",
+                                borderadius: 3,
+                                marginRight: 20,
+                            }}
+                            type="primary"
+                            key="primary"
+                            onClick={() => {
+                                setSetup(true);
+                            }}
+                        >
+                            <img
+                                src="/assets/images/background/setup.png"
+                                alt="设置"
+                                style={{ width: 18, height: 18 }}
+                            />
+                        </Button>
+                        <a href={`/_api/${ApiTable.getExport}`}>
+                            <Button
+                                style={{
+                                    width: 65,
+                                    height: 32,
+                                    background: "#FFFFFF",
+                                    borderRadius: 3,
+                                    border: "1px solid #1859C1",
+                                }}
+                            >
+                                导出
+                            </Button>
+                        </a>
+                    </div>
+                </div>
+                <Skeleton
+                    loading={loading}
+                    placeholder={skeletonScreen(8, setupp.length)}
+                >
+                    <Table
+                        columns={setupp.filter((s) => s)}
+                        dataSource={equipmentWarehouseNvr.data}
+                        bordered={false}
+                        empty="暂无数据"
+                        style={{
+                            padding: "0px 20px",
+                        }}
+                        pagination={false}
+                    />
+                </Skeleton>
 
-        <div
-          style={{
-            display: "flex",
-            justifyContent: "flex-end",
-            padding: "20px 20px",
-          }}
-        >
-          <span style={{ lineHeight: "30px" }}>
-            共{equipmentWarehouseNvr.total}个设备
-          </span>
-          <Pagination
-            total={equipmentWarehouseNvr.total}
-            showSizeChanger
-            currentPage={query.page + 1}
-            pageSizeOpts={[10, 20, 30, 40]}
-            onChange={(currentPage, pageSize) => {
-              setQuery({ limit: pageSize, page: currentPage - 1 });
-            }}
-          />
-        </div>
+                <div
+                    style={{
+                        display: "flex",
+                        justifyContent: "flex-end",
+                        padding: "20px 20px",
+                    }}
+                >
+                    <span style={{ lineHeight: "30px" }}>
+                        共{equipmentWarehouseNvr.total}个设备
+                    </span>
+                    <Pagination
+                        total={equipmentWarehouseNvr.total}
+                        showSizeChanger
+                        currentPage={query.page + 1}
+                        pageSizeOpts={[10, 20, 30, 40]}
+                        onChange={(currentPage, pageSize) => {
+                            setQuery({ limit: pageSize, page: currentPage - 1 });
+                        }}
+                    />
+                </div>
 
-        {setup ? (
-          <Setup
-            visible={true}
-            SETUPS={SETUPS}
-            close={() => {
-              setSetup(false);
-              attribute(venderList);
-            }}
-          />
-        ) : (
-          ""
-        )}
+                {setup ? (
+                    <Setup
+                        visible={true}
+                        SETUPS={SETUPS}
+                        close={() => {
+                            setSetup(false);
+                            attribute(venderList);
+                        }}
+                    />
+                ) : (
+                    ""
+                )}
 
-        {sideSheet ? (
-          <SideSheets
-            visible={true}
-            rowId={rowId}
-            accessType={accessType}
-            venderList={venderList}
-            close={() => {
-              setSideSheet(false);
-            }}
-          />
-        ) : (
-          []
-        )}
-        {/* <ReminderBox
+                {sideSheet ? (
+                    <SideSheets
+                        visible={true}
+                        rowId={rowId}
+                        accessType={accessType}
+                        venderList={venderList}
+                        close={() => {
+                            setSideSheet(false);
+                        }}
+                    />
+                ) : (
+                    []
+                )}
+                {/* <ReminderBox
           title="是否继续添加NVR摄像头？"
           wait="再等等"
           toadd="去添加"
@@ -630,20 +631,20 @@ const NvrHeader = (props) => {
             setReminder(false)
           }}
         /> */}
-      </div>
-    </>
-  );
+            </div>
+        </>
+    );
 };
 
-function mapStateToProps(state) {
-  const { auth, global, members, equipmentWarehouseNvr } = state;
-  return {
-    loading: equipmentWarehouseNvr.isRequesting && !equipmentWarehouseNvr.data,
-    user: auth.user,
-    actions: global.actions,
-    members: members.data,
-    equipmentWarehouseNvr: equipmentWarehouseNvr.data || {},
-  };
+function mapStateToProps (state) {
+    const { auth, global, members, equipmentWarehouseNvr } = state;
+    return {
+        loading: equipmentWarehouseNvr.isRequesting && !equipmentWarehouseNvr.data,
+        user: auth.user,
+        actions: global.actions,
+        members: members.data,
+        equipmentWarehouseNvr: equipmentWarehouseNvr.data || {},
+    };
 }
 
 export default connect(mapStateToProps)(NvrHeader);