萤石，级联，ipc添加修改时通过接口测试的功能完成

code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/actions/camera.js

@@ -161,3 +161,38 @@ export function getParentCamera(query) {
         msg: { option: "" }, //获取级联摄像头父级设备
       });
   }
+
+export function getVerifyYingshi(data) {
+    return (dispatch) =>
+      basicAction({
+        type: "post",
+        dispatch: dispatch,
+        data,
+        actionType: "POST_VERIFY_YINGSHI",
+        url: `${ApiTable.getVerifyYingshi}`,
+        msg: { option: "" }, //获取级联摄像头父级设备
+      });
+  }
+
+  export function getVerifyIpc(data) {
+    return (dispatch) =>
+      basicAction({
+        type: "post",
+        dispatch: dispatch,
+        data,
+        actionType: "POST_VERIFY_IPC",
+        url: `${ApiTable.getVerifyIpc}`,
+        msg: { option: "" }, //获取级联摄像头父级设备
+      });
+  }
+  export function getVerifyCascade(data) {
+    return (dispatch) =>
+      basicAction({
+        type: "post",
+        dispatch: dispatch,
+        data,
+        actionType: "POST_VERIFY_CASCADE",
+        url: `${ApiTable.getVerifyCascade}`,
+        msg: { option: "" }, //获取级联摄像头父级设备
+      });
+  }

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

@@ -2,6 +2,7 @@ import React, { useState, useRef, useEffect } from "react";
 import { connect } from "react-redux";
 import { Modal, Spin } from "@douyinfe/semi-ui";
 import { IconChevronLeft, IconChevronRight } from "@douyinfe/semi-icons";
+import moment from "moment";
 import FluoriteCamera from "./fluoriteCamera";
 import NvrCamera from "./nvrCamera";
 import IpcCamera from "./ipcCamera";
@@ -30,7 +31,7 @@ function cameraModal (props) {
     const cascadeRef = useRef();
     const nvrRef = useRef();
     const [isloading, setloading] = useState(false); //是否显示loading
-    const [loadingTip, setloadingTip] = useState("获取中...请稍后..."); //loading tip的值
+    const [loadingTip, setloadingTip] = useState("测试进行中..."); //loading tip的值
     const [okText, setokText] = useState("确定"); //ok弹框text  右边
     const [cancelText, setcancelText] = useState("取消"); //取消弹框text  左边
 
@@ -199,13 +200,40 @@ function cameraModal (props) {
         }
     }
 
+    //表单验证
     function toTest () {
         if (clickNum == 1) {
             fluoriteRef.current
                 .fluoriteCameraForm()
                 .then((values) => {
                     //表单校验成功
-                    console.log("111111111", values);
+                    var front = new moment(); //验证前时间
+                    setloading(true);
+                    dispatch(
+                        equipmentWarehouse.getVerifyYingshi({
+                            serialNo: values.serialNo,
+                        })
+                    ).then((res) => {
+                        var after = new moment();  //验证后时间
+                        var duration = moment.duration(after.diff(front))._data.milliseconds;
+                        if (res.success) {
+                            setTimeout(() => {
+                                setloadingTip("校验成功");
+                                setTimeout(() => {
+                                    setloading(false);
+                                    setloadingTip("测试进行中...");
+                                }, 800);
+                            }, duration > 2000 ? 0 : 2000 - duration)
+                        } else {
+                            setTimeout(() => {
+                                setloadingTip("校验失败");
+                                setTimeout(() => {
+                                    setloading(false);
+                                    setloadingTip("测试进行中...");
+                                }, 800);
+                            }, duration > 2000 ? 0 : 2000 - duration)
+                        }
+                    })
                 })
                 .catch((errors) => {
                     //表单校验失败
@@ -216,54 +244,72 @@ function cameraModal (props) {
                 .ipcCameraForm()
                 .then((values) => {
                     //表单校验成功
-                    console.log("111111111", values);
+                    console.log(values);
+                    var front = new moment(); //验证前时间
+                    setloading(true);
+                    dispatch(
+                        equipmentWarehouse.getVerifyIpc({
+                            serialNo: values.serialNo,
+                        })
+                    ).then((res) => {
+                        var after = new moment();  //验证后时间
+                        var duration = moment.duration(after.diff(front))._data.milliseconds;
+                        if (res.success) {
+                            setTimeout(() => {
+                                setloadingTip("校验成功");
+                                setTimeout(() => {
+                                    setloading(false);
+                                    setloadingTip("测试进行中...");
+                                }, 800);
+                            }, duration > 2000 ? 0 : 2000 - duration)
+                        } else {
+                            setTimeout(() => {
+                                setloadingTip("校验失败");
+                                setTimeout(() => {
+                                    setloading(false);
+                                    setloadingTip("测试进行中...");
+                                }, 800);
+                            }, duration > 2000 ? 0 : 2000 - duration)
+                        }
+                    })
                 })
                 .catch((errors) => {
                     //表单校验失败
-                    console.log("errors", errors);
+                    console.log();
                 });
         } else if (clickNum == 4) {
             cascadeRef.current
                 .cascadeCameraForm()
                 .then((values) => {
-                    //表单校验成功
+                    console.log(values);
-                    let chooseList = [];
+                    var front = new moment(); //验证前时间
-                    let nvrCameraList = [
+                    setloading(true);
-                        {
+                    dispatch(
-                            id: 10,
+                        equipmentWarehouse.getVerifyCascade({
-                            name: "南昌县1",
+                            sip: values.sip,
-                            number: "111111111111111111",
+                        })
-                            support: false,
+                    ).then((res) => {
-                            change: false,
+                        var after = new moment();  //验证后时间
-                        },
+                        var duration = moment.duration(after.diff(front))._data.milliseconds;
-                        {
+                        if (res.success) {
-                            id: 20,
+                            setTimeout(() => {
-                            name: "南昌县2",
+                                setloadingTip("校验成功");
-                            number: "222222222222222222",
+                                setTimeout(() => {
-                            support: false,
+                                    setloading(false);
-                            change: false,
+                                    setloadingTip("测试进行中...");
-                        },
+                                }, 800);
-                        {
+                            }, duration > 2000 ? 0 : 2000 - duration)
-                            id: 30,
+                        } else {
-                            name: "南昌县3",
+                            setTimeout(() => {
-                            number: "333333333333333333",
+                                setloadingTip("校验失败");
-                            support: false,
+                                setTimeout(() => {
-                            change: false,
+                                    setloading(false);
-                        },
+                                    setloadingTip("测试进行中...");
-                        {
+                                }, 800);
-                            id: 40,
+                            }, duration > 2000 ? 0 : 2000 - duration)
-                            name: "南昌县4",
-                            number: "444444444444444444",
-                            support: false,
-                            change: false,
-                        },
-                    ];
-                    cascadeRef.current.setNVRcameraList(nvrCameraList);
-                    for (let index = 0; index < nvrCameraList.length; index++) {
-                        chooseList.push(nvrCameraList[index].id);
                         }
-                    cascadeRef.current.setNvrCheckList(chooseList);
+                    })
-                    cascadeRef.current.setIsAllChoose(true);
+
                 })
                 .catch((errors) => {
                     //表单校验失败
@@ -284,7 +330,7 @@ function cameraModal (props) {
                 afterClose={handleAfterClose}
                 onCancel={handleCancel}
             >
-                <Spin tip={loadingTip} spinning={isloading}>
+                <>
                     <div
                         style={{ marginLeft: "-24px", marginRight: "-24px", marginTop: 8 }}
                     >
@@ -484,15 +530,20 @@ function cameraModal (props) {
                     </div>
                     <div>
                         {clickNum == 1 ? (
+                            <Spin tip={loadingTip} spinning={isloading}>
                                 <FluoriteCamera
                                     cRef={fluoriteRef}
                                     CameraKind={CameraKind}
                                     CameraAbility={CameraAbility}
                                     cameraData={cameraData}
                                 />
+                            </Spin>
                         ) : clickNum == 2 ? (
+                            <Spin tip={loadingTip} spinning={isloading}>
                                 <NvrCamera nvrRef={nvrRef} cameraData={cameraData} addNvr={addNvr} nvrNumber={nvrNumber} />
+                            </Spin>
                         ) : clickNum == 3 ? (
+                            <Spin tip={loadingTip} spinning={isloading}>
                                 <IpcCamera
                                     aRef={ipcRef}
                                     CameraKind={CameraKind}
@@ -500,11 +551,14 @@ function cameraModal (props) {
                                     venderList={venderList}
                                     cameraData={cameraData}
                                 />
+                            </Spin>
                         ) : (
+                            <Spin tip={loadingTip} spinning={isloading}>
                                 <CascadeCamera dRef={cascadeRef} cameraData={cameraData} parentCamera={parentCamera} />
+                            </Spin>
                         )}
                     </div>
-                </Spin>
+                </>
             </Modal>
         </>
     );

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

@@ -1,6 +1,6 @@
 import React, { useState, useRef, useEffect, useImperativeHandle } from "react";
 import { connect } from "react-redux";
-import { Form, Row, Col } from "@douyinfe/semi-ui";
+import { Form, Row, Col,Spin } from "@douyinfe/semi-ui";
 import "./cameraModal.less";
 function fluoriteCamera ({ cRef, CameraKind, CameraAbility, cameraData }) {
     const { TextArea } = Form;

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

@@ -52,7 +52,6 @@ function nvrCamera ({ dispatch, actions, nvrRef, cameraData, addNvr, nvrNumber }
                     streamId: cameraDataNvr.serialNo,
                 })
             ).then((res) => {
-                console.log(res)
                 let oneData = res.payload.data[0];
                 let modifyData = res.payload.data.find(
                     (item) => item.camera == null ? false : item.camera.name == cameraData.name

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

@@ -73,12 +73,22 @@ const NvrHeader = (props) => {
         OFF: "离线",
         Alarmed: "未知",
     };
+
     const colorStatus = {
         ON: "#04B234",
         ONLINE: "#04B234",
         OFF: "rgba(0, 0, 0, 0.45)",
         Alarmed: "#1859C1",
     };
+    // function colorStatus (data) {
+    //     switch (data) {
+    //         case ON || ONLINE:
+    //             break;
+    //         default:
+    //             break;
+    //     }
+
+    // }
     const columns = [
         {
             title: "序号",

code/VideoAccess-VCMP/web/client/src/utils/webapi.js

@@ -31,6 +31,9 @@ export const ApiTable = {
    getCascadeSIP: "camera/sip_list/cascade",  //获取级联摄像头sip列表
    postAddCascade: "camera/create/cascade",  //添加级联摄像头
    getParentCamera:"camera/cascade_device",    //获取级联摄像头父级设备
+   getVerifyYingshi:"camera/verify/yingshi",   //验证萤石摄像头信息
+   getVerifyIpc:"camera/verify/ipc",  //验证IPC摄像头信息
+   getVerifyCascade:"camera/verify/cascade",  //验证级联摄像头信息
 
 };