Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial

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

@@ -3,7 +3,7 @@ import { connect } from "react-redux";
 import { Form, Row, Col } from "@douyinfe/semi-ui";
 
 import "./cameraModal.less";
-function cascadeCamera({ dRef, dispatch, actions }) {
+function cascadeCamera({ dRef, dispatch, actions ,cameraData}) {
   const form = useRef();
   const { equipmentWarehouse } = actions;
   const [sip, setSip] = useState([]);
@@ -71,7 +71,7 @@ function cascadeCamera({ dRef, dispatch, actions }) {
             <Form.Input
               field="externalDomain"
               label="外域名称:"
-              initValue={""}v
+              initValue={cameraData.externalDomain||""}v
               placeholder="请输入外域名称"
               style={{ width: 307 }}
               rules={[{ required: true, message: "请输入外域名称" }]}
@@ -81,7 +81,7 @@ function cascadeCamera({ dRef, dispatch, actions }) {
             <Form.Select
               label="级联方式:"
               field="cascadeType"
-              initValue="上级域"
+              initValue={cameraData.cascadeType||"上级域"}
               style={{ width: 307 }}
               rules={[{ required: true, message: "请选择输入级联方式" }]}
             >
@@ -94,6 +94,7 @@ function cascadeCamera({ dRef, dispatch, actions }) {
             <Form.Select
               label="SIP编号:"
               field="sip"
+              initValue={cameraData.cascadeType||""}
               placeholder="请选择SIP编号"
               style={{ width: 307 }}
               rules={[{ required: true, message: "请选择SIP编号" }]}

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

@@ -35,10 +35,10 @@ 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();
+    const searchb = useRef(search)
+    const deviceClickb = useRef(true)
     const CAMERAS = "cameras";
 
     useEffect(() => {
@@ -81,7 +81,24 @@ const CameraHeader = (props) => {
                     <div>
                         {row.name}
                         <sapn style={{ color: "blue" }}
-                            onClick={() =>device_(row)}
+                            onClick={() => {
+                                if (deviceClickb.current) {
+
+                                    if (row.type == "nvr") {
+                                        setearch({ ...searchb.current, nvrId: row.nvr.id })
+                                    } else {
+                                        setearch({ ...searchb.current, externalDomain: row.externalDomain })
+                                    }
+                                    deviceClickb.current=false
+                                } else {
+                                    if (row.type == "nvr") {
+                                        setearch({ ...searchb.current, nvrId: null })
+                                    } else {
+                                        setearch({ ...searchb.current, externalDomain: null })
+                                    }
+                                    deviceClickb.current=true
+                                }
+                            }}
                         >
                             {row.type == "nvr" ? `@${row.nvr.name}` : row.type == "cascade" ? `@${row.externalDomain}` : ""}
                         </sapn>
@@ -190,7 +207,7 @@ const CameraHeader = (props) => {
     ];
 
     const device_ = (r) => {
-        console.log(deviceClick)
+        console.log(searchb)
         if (deviceClick) {
             // if (r.type == "nvr") {
             //     console.log(search)
@@ -222,7 +239,7 @@ const CameraHeader = (props) => {
                 key: "manufactor",
                 render: (_, r, index) => {
                     let manufactorName = data.find((item) => item.id == r.venderId);
-                    return manufactorName ? manufactorName.name : "";
+                    return manufactorName ? manufactorName.name : "未知";
                 },
             },
             {
@@ -556,6 +573,7 @@ const CameraHeader = (props) => {
                             onClick={() => {
                                 api.current.validate().then((v) => {
                                     setearch(v);
+                                    searchb.current = v
                                 });
                                 equipmentGetCamera();
                             }}