测试置灰完成

code/VideoAccess-VCMP/web/client/src/layout/components/sider/index.jsx

@@ -45,6 +45,7 @@ const Sider = props => {
             }
          }
       }
+      console.log(nextItems)
       setItems(nextItems)
 
       const { selectedKeys, openKeys } = initKeys(
@@ -74,16 +75,52 @@ const Sider = props => {
       }
    }, [])
 
+   useEffect(()=>{
+       console.log(1)
+       let pathname_ = pathname == '/' ? homePath : pathname
+      const initKeys = (items, lastKeys) => {
+         for (let it of items) {
+            if (it.to && it.to == pathname_) {
+               lastKeys.selectedKeys.push(it.itemKey)
+               return lastKeys
+            } else if (it.items && it.items.length) {
+               const preLastKeys = JSON.parse(JSON.stringify(lastKeys))
+               preLastKeys.openKeys.push(it.itemKey)
+               const nextKeys = initKeys(it.items, JSON.parse(JSON.stringify(preLastKeys)))
+               if (nextKeys.selectedKeys.length > preLastKeys.selectedKeys.length || nextKeys.openKeys.length > preLastKeys.openKeys.length) {
+                  return nextKeys
+               }
+            }
+         }
+         return lastKeys
+         return {
+            selectedKeys: [],
+            openKeys: []
+         }
+      }
+    const lastSelectedKeys = localStorage.getItem('vcmp_selected_sider')
+    console.log(lastSelectedKeys)
+    if (lastSelectedKeys) {
+       setSelectedKeys(JSON.parse(lastSelectedKeys))
+    }
+    const lastOpenKeys = localStorage.getItem('vcmp_open_sider')
+    if (lastOpenKeys) {
+       setOpenKeys(JSON.parse(lastOpenKeys))
+    }
+   },[window.localStorage.vcmp_open_sider,window.localStorage.vcmp_selected_sider])
+
    useEffect(() => {
       if (scrollbar) {
          scrollbar.update();
       }
    })
-
+console.log(selectedKeys,openKeys)
    return (
       <div id={'page-slider'} style={{ height: clientHeight, position: 'relative' }}>
          <Nav
             style={{}}
+            // defaultOpenKeys={openKeys}
+            // defaultSelectedKeys	={selectedKeys}
             selectedKeys={selectedKeys}
             openKeys={openKeys}
             onSelect={({ selectedItems, selectedKeys, }) => {

code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/cameraModal.jsx

@@ -35,6 +35,7 @@ function cameraModal (props) {
     const [loadingTip, setloadingTip] = useState("测试中..."); //loading tip的值
     const [okText, setokText] = useState("确定"); //ok弹框text  右边
     const [cancelText, setcancelText] = useState("取消"); //取消弹框text  左边
+    const [ash, setAsh] = useState(false); //置灰
     const testComplete = useRef(false)  //测试完成
     const [clickNum, setclickNum] = useState(
         cameraData.type == "yingshi"
@@ -72,6 +73,7 @@ function cameraModal (props) {
                     break
             }
         }
+        cameraData.id ? setAsh(true) : ""
     }, []);
     const cameraList = [
         //循环摄像头列表
@@ -540,6 +542,7 @@ function cameraModal (props) {
                                         border: "1px solid #1859C1",
                                         borderRadius: "3px",
                                         color: "#1859C1",
+                                        backgroundColor: ash ? "" : "rgba(151, 151, 151, .2)",
                                         display: "flex",
                                         justifyContent: "center",
                                         alignItems: "center",
@@ -567,6 +570,8 @@ function cameraModal (props) {
                                     CameraKind={CameraKind}
                                     CameraAbility={CameraAbility}
                                     cameraData={cameraData}
+                                    ashTrue={() => setAsh(true)}
+                                    ashFalse={() => setAsh(false)}
                                 />
                             </Spin>
                         ) : clickNum == 2 ? (
@@ -581,11 +586,21 @@ function cameraModal (props) {
                                     CameraAbility={CameraAbility}
                                     venderList={venderList}
                                     cameraData={cameraData}
+                                    ashTrue={() => setAsh(true)}
+                                    ashFalse={() => setAsh(false)}
                                 />
                             </Spin>
                         ) : (
                             <Spin tip={loadingTip} spinning={isloading}>
-                                <CascadeCamera dRef={cascadeRef} cameraData={cameraData} parentCamera={parentCamera} testComplete={testComplete.current} close={()=>testComplete.current = false} />
+                                <CascadeCamera
+                                    dRef={cascadeRef}
+                                    cameraData={cameraData}
+                                    parentCamera={parentCamera}
+                                    testComplete={testComplete.current}
+                                    close={() => testComplete.current = false}
+                                    ashTrue={() => setAsh(true)}
+                                    ashFalse={() => setAsh(false)}
+                                />
                             </Spin>
                         )}
                     </div>

code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/cascadeCamera.jsx

@@ -6,7 +6,7 @@ import "./cameraModal.less";
 import PerfectScrollbar from "perfect-scrollbar";
 let equipmentScrollbar;
 
-function cascadeCamera ({ dRef, dispatch, actions, cameraData, parentCamera, testComplete, close }) {
+function cascadeCamera ({ dRef, dispatch, actions, cameraData, parentCamera, testComplete, close, ashTrue, ashFalse }) {
     const form = useRef();
     const { equipmentWarehouse } = actions;
     const [sip, setSip] = useState([]);
@@ -14,11 +14,11 @@ function cascadeCamera ({ dRef, dispatch, actions, cameraData, parentCamera, tes
     const [CheckList, setCheckList] = useState([]); //nvr视频流多选
     const [isAllChoose, setIsAllChoose] = useState(false); //全选
     const [formData, setFormData] = useState() //表单数据
-
+    console.log(cameraData.externalDomain)
     useEffect(() => {
         dispatch(equipmentWarehouse.getCascadeSIP()).then((res) => {
             setSip(res.payload.data);
-            if (cameraData) {
+            if (cameraData.id) {
                 let sip = res.payload.data.find((item) => item.streamid == cameraData.topSerialNo)
                 dispatch(equipmentWarehouse.getCascadeStream({ sip: sip.sipip })).then((res) => {
                     let oneData = res.payload.data[0];
@@ -155,7 +155,7 @@ function cascadeCamera ({ dRef, dispatch, actions, cameraData, parentCamera, tes
         e.stopPropagation();
     }
     function onDisabled (id) {
-        if (id == cameraData.gbId||!cameraData.gbId) {
+        if (id == cameraData.gbId || !cameraData.gbId) {
             return false;
         } else {
             return true;
@@ -177,15 +177,27 @@ function cascadeCamera ({ dRef, dispatch, actions, cameraData, parentCamera, tes
     return (
         <>
             <Form
-                allowEmpty
                 labelPosition="left"
                 labelAlign="left"
                 labelWidth="115px"
                 onValueChange={(values) => {
-                    console.log(values);
+                    console.log(values)
                     setFormData(values)
+                    let setting = ["externalDomain", "cascadeType", "sip"]
+                    let b = {}
+                    setting.map((item) => {
+                        if (values.hasOwnProperty(item)) {
+                            return b.true = values.hasOwnProperty(item)
+                        } else {
+                            return b.false = values.hasOwnProperty(item)
+                        }
+                    })
+                    Object.keys(b).length == 1 ? ashTrue() : ashFalse()
 
                 }}
+                initValues={{
+                    externalDomain: cameraData.externalDomain || ""
+                }}
                 getFormApi={(formApi) => (form.current = formApi)}
             >
                 <Row>
@@ -194,7 +206,6 @@ function cascadeCamera ({ dRef, dispatch, actions, cameraData, parentCamera, tes
                             field="externalDomain"
                             label="外域名称:"
                             maxLength="36"
-                            initValue={cameraData.externalDomain || ""}
                             placeholder="请输入外域 名称，例如“xxx市级平台”"
                             style={{ width: 307 }}
                             rules={[{ required: true, message: "请输入外域名称" }]}

code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/fluoriteCamera.jsx

@@ -1,8 +1,8 @@
 import React, { useState, useRef, useEffect, useImperativeHandle } from "react";
 import { connect } from "react-redux";
-import { Form, Row, Col,Spin } from "@douyinfe/semi-ui";
+import { Form, Row, Col, Spin } from "@douyinfe/semi-ui";
 import "./cameraModal.less";
-function fluoriteCamera ({ cRef, CameraKind, CameraAbility, cameraData }) {
+function fluoriteCamera ({ cRef, CameraKind, CameraAbility, cameraData, ashTrue, ashFalse }) {
     const { TextArea } = Form;
     const form = useRef();
     const [cloud, setcloud] = useState(""); //云台支持
@@ -81,7 +81,18 @@ function fluoriteCamera ({ cRef, CameraKind, CameraAbility, cameraData }) {
                 labelPosition="left"
                 labelAlign="left"
                 labelWidth="115px"
-                onValueChange={(values) => console.log(values)}
+                onValueChange={(values) => {
+                    let setting = ["abilityId", "cloudControl", "highDefinition", "kindId", "name", "position", "rtmp", "serialNo",]
+                    let b = {}
+                    setting.map((item) => {
+                        if (values.hasOwnProperty(item)) {
+                            return b.true = values.hasOwnProperty(item)
+                        } else {
+                            return b.false = values.hasOwnProperty(item)
+                        }
+                    })
+                    Object.keys(b).length == 1 ? ashTrue() : ashFalse()
+                }}
                 initValues={{
                     name: cameraData.name || "",
                     highDefinition: cameraData.highDefinition || "",

code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/ipcCamera.jsx

@@ -2,411 +2,427 @@ 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 ipcCamera({
-  aRef,
-  CameraKind,
-  CameraAbility,
-  venderList,
-  cameraData,
+function ipcCamera ({
+    aRef,
+    CameraKind,
+    CameraAbility,
+    venderList,
+    cameraData,
+    ashTrue,
+    ashFalse
 }) {
-  const { TextArea } = Form;
-  const form = useRef();
-  const [cloud, setcloud] = useState(""); //云台支持
-  const [voice, setvoice] = 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",
-    },
-  ]); //内存卡列表
+    const { TextArea } = Form;
+    const form = useRef();
+    const [cloud, setcloud] = useState(""); //云台支持
+    const [voice, setvoice] = 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 || "");
-  }, []);
-  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 || "");
+    }, []);
+    function handleLocation () {
+        //高德经纬度
+        window.open("https://lbs.amap.com/tools/picker", "_blank");
     }
-  }
-  useImperativeHandle(aRef, () => ({
-    //传给父组件方法
-    //子组件暴露给父组件的方法
-    ipcCameraForm: form.current.validate,
-    resetIpcCamera: form.current.reset,
-    toempty: empty,
-  }));
-  function empty() {
-    setcloud(null);
-    setvoice(null);
-  }
-  return (
-    <>
-      <Form
-        labelPosition="left"
-        labelAlign="left"
-        labelWidth="115px"
-        onValueChange={(values) => console.log(values)}
-        initValues={{
-          name: cameraData ? cameraData.name : "",
-          venderId: cameraData ? cameraData.venderId : "",
-          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="设备名称:"
-              maxLength="36"
-              placeholder="请输入设备名称、常用项目或位置定义"
-              style={{ width: 307 }}
-              rules={[{ required: true, message: "请输入设备名称" }]}
-            />
-            <Form.Select
-              field="venderId"
-              label="设备厂家:"
-              placeholder="请选择设备厂家"
-              style={{ width: 307 }}
-            >
-              {venderList.map((item, index) => (
-                <Form.Select.Option key={index} value={item.id}>
-                  {item.name}
-                </Form.Select.Option>
-              ))}
-            </Form.Select>
-            <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="安装位置:"
-                maxLength="39"
-                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>
+    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(aRef, () => ({
+        //传给父组件方法
+        //子组件暴露给父组件的方法
+        ipcCameraForm: form.current.validate,
+        resetIpcCamera: form.current.reset,
+        toempty: empty,
+    }));
+    function empty () {
+        setcloud(null);
+        setvoice(null);
+    }
+    return (
+        <>
+            <Form
+                labelPosition="left"
+                labelAlign="left"
+                labelWidth="115px"
+                onValueChange={(values) => {
+                    let setting = ["abilityId", "cloudControl", "highDefinition", "kindId", "name", "position", "rtmp", "serialNo"]
+                    let b = {}
+                    setting.map((item) => {
+                        if (values.hasOwnProperty(item)) {
+                            return b.true = values.hasOwnProperty(item)
+                        } else {
+                            return b.false = values.hasOwnProperty(item)
+                        }
+                    })
+                    Object.keys(b).length == 1 ? ashTrue() : ashFalse()
 
-            <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) => {
-                console.log(checked.target.value);
-                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",
+                initValues={{
+                    name: cameraData ? cameraData.name : "",
+                    venderId: cameraData ? cameraData.venderId : "",
+                    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 : "",
                 }}
-              >
-                <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
-              label="语音支持:"
-              field="voice"
-              type="pureCard"
-              direction="horizontal"
-              style={{ padding: 0 }}
-              onChange={(checked) => {
-                if (checked.target.value == true) {
-                  setvoice(true);
-                } else {
-                  setvoice(false);
-                }
-              }}
+                getFormApi={(formApi) => (form.current = formApi)}
             >
-              <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>
-            <div>
-              <Form.Input
-                field="serialNo"
-                label="设备编号接入:"
-                maxLength="39"
-                placeholder="请输入设备编号"
-                style={{ width: 307 }}
-              />
-            </div>
-            <TextArea
-              style={{ width: 320, height: 90 }}
-              field="rtmp"
-              label="RTMP地址接入:"
-              placeholder="请输入RTMP地址接入"
-            />
-          </Col>
-          {/* <Col span={18}>
+                <Row>
+                    <Col span={12}>
+                        <Form.Input
+                            field="name"
+                            label="设备名称:"
+                            maxLength="36"
+                            placeholder="请输入设备名称、常用项目或位置定义"
+                            style={{ width: 307 }}
+                            rules={[{ required: true, message: "请输入设备名称" }]}
+                        />
+                        <Form.Select
+                            field="venderId"
+                            label="设备厂家:"
+                            placeholder="请选择设备厂家"
+                            style={{ width: 307 }}
+                        >
+                            {venderList.map((item, index) => (
+                                <Form.Select.Option key={index} value={item.id}>
+                                    {item.name}
+                                </Form.Select.Option>
+                            ))}
+                        </Form.Select>
+                        <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="安装位置:"
+                                maxLength="39"
+                                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="设备能力:"
+                            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) => {
+                                console.log(checked.target.value);
+                                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
+                            label="语音支持:"
+                            field="voice"
+                            type="pureCard"
+                            direction="horizontal"
+                            style={{ padding: 0 }}
+                            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>
+                        <div>
+                            <Form.Input
+                                field="serialNo"
+                                label="设备编号接入:"
+                                maxLength="39"
+                                placeholder="请输入设备编号"
+                                style={{ width: 307 }}
+                                rules={[{ required: true, message: "请输入设备编号" }]}
+                            />
+                        </div>
+                        <TextArea
+                            style={{ width: 320, height: 90 }}
+                            field="rtmp"
+                            label="RTMP地址接入:"
+                            placeholder="请输入RTMP地址接入"
+                            rules={[{ required: true, message: "请输入RTMP地址" }]}
+                        />
+                    </Col>
+                    {/* <Col span={18}>
               
             </Col> */}
-        </Row>
-      </Form>
-    </>
-  );
+                </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)(ipcCamera);

code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/sideSheet.jsx

@@ -393,6 +393,8 @@ function SideSheets (props) {
                                         });
                                     }
                                     //接入信息/复制直播地址
+                                    let broadcast=nvrDetails.gbCamera?nvrDetails.gbCamera.playUrl?nvrDetails.gbCamera.playUrl.liveUrl:"":""
+                                    console.log(broadcast)
                                     if (index == 1) {
                                         (cameraSetup ? item.liveBroadcast : item.access).map(
                                             (item, index) => {

code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/camera.jsx

@@ -46,7 +46,6 @@ const CameraHeader = (props) => {
     const CAMERAS = "cameras";
 
     useEffect(() => {
-        console.log(props)
         //安心云传参
         let isAxyData = props.location.search
         if (isAxyData) {
@@ -119,7 +118,7 @@ const CameraHeader = (props) => {
                 return (
                     <div>
                         {row.name}
-                        <sapn style={{ color: "blue" }}
+                        <span style={{ color: "blue" }}
                             onClick={() => {
                                 if (deviceClickb.current) {
                                     if (row.type == "nvr") {
@@ -139,7 +138,7 @@ const CameraHeader = (props) => {
                             }}
                         >
                             {row.type == "nvr" ? `@${row.nvr.name}` : row.type == "cascade" ? `@${row.externalDomain}` : ""}
-                        </sapn>
+                        </span>
                     </div >
                 );
             },
@@ -149,7 +148,6 @@ const CameraHeader = (props) => {
             width: "20%",
             dataIndex: "",
             render: (_, row) => {
-                console.log(row)
                 return (
                     <div style={{ display: "flex" }}>
                         <Button

code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/nvr.jsx

@@ -109,7 +109,6 @@ const NvrHeader = (props) => {
             width: "20%",
             dataIndex: "",
             render: (_, row) => {
-                console.log(row)
                 return (
                     <div style={{ display: "flex" }}>
                         <Button theme="borderless">
@@ -599,6 +598,7 @@ const NvrHeader = (props) => {
                     USER={USER}
                     onOk={() => {
                         history.push({ pathname: '/equipmentWarehouse/camera', query: { addNvr: true, serialNo: nvrRef.current.nvrNumber() } });
+                        localStorage.setItem('vcmp_selected_sider', JSON.stringify("camera"))
                         setReminder(false)
                     }}
                     close={() => {