diff --git a/code/VideoAccess-VCMP/web/client/assets/images/background/copy1.png b/code/VideoAccess-VCMP/web/client/assets/images/background/copy1.png new file mode 100644 index 0000000..80df7ff Binary files /dev/null and b/code/VideoAccess-VCMP/web/client/assets/images/background/copy1.png differ diff --git a/code/VideoAccess-VCMP/web/client/assets/images/background/copy2.png b/code/VideoAccess-VCMP/web/client/assets/images/background/copy2.png new file mode 100644 index 0000000..77b9867 Binary files /dev/null and b/code/VideoAccess-VCMP/web/client/assets/images/background/copy2.png differ diff --git a/code/VideoAccess-VCMP/web/client/assets/images/background/sewage_camera1.png b/code/VideoAccess-VCMP/web/client/assets/images/background/sewage_camera1.png new file mode 100644 index 0000000..e272df9 Binary files /dev/null and b/code/VideoAccess-VCMP/web/client/assets/images/background/sewage_camera1.png differ diff --git a/code/VideoAccess-VCMP/web/client/assets/images/background/sewage_camera2.png b/code/VideoAccess-VCMP/web/client/assets/images/background/sewage_camera2.png new file mode 100644 index 0000000..67abdbe Binary files /dev/null and b/code/VideoAccess-VCMP/web/client/assets/images/background/sewage_camera2.png differ diff --git a/code/VideoAccess-VCMP/web/client/assets/images/background/store1.png b/code/VideoAccess-VCMP/web/client/assets/images/background/store1.png new file mode 100644 index 0000000..84674e2 Binary files /dev/null and b/code/VideoAccess-VCMP/web/client/assets/images/background/store1.png differ diff --git a/code/VideoAccess-VCMP/web/client/assets/images/background/store2.png b/code/VideoAccess-VCMP/web/client/assets/images/background/store2.png new file mode 100644 index 0000000..1ccdbb9 Binary files /dev/null and b/code/VideoAccess-VCMP/web/client/assets/images/background/store2.png differ diff --git a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/actions/nvr.js b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/actions/nvr.js index f96c665..f642944 100644 --- a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/actions/nvr.js +++ b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/actions/nvr.js @@ -45,6 +45,7 @@ export function addchangeNvr(data) { dispatch: dispatch, data, actionType: "ADD_CHANGE_NVR", + msg: { option: "添加/修改" }, url: `${ApiTable.nvr}`, }); } 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 722f806..4e55e79 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 @@ -1,10 +1,19 @@ import React, { useState, useEffect } from "react"; import { SideSheet, Tabs, TabPane } from "@douyinfe/semi-ui"; +import copy from "copy-to-clipboard"; function SideSheets(props) { - const { dispatch, actions, user, loading, visible, close, SETUPS ,cameraSetup} = props; - const [checkeds, setCheckeds] = useState([]); - const [check, setCheck] = useState([]); + const { + dispatch, + actions, + user, + loading, + visible, + close, + SETUPS, + cameraSetup, + } = props; + const [clickStyle, setclickStyle] = useState(); const list = [ { name: "项目名称", @@ -38,16 +47,39 @@ function SideSheets(props) { { name: "注册密码:", value: "**********" }, { name: "注册有效期::", value: "3600s" }, { name: "接入识别模块:", value: "sssss" }, - { name: "通道1", value1: "145641201564-1", value2: "哦哦哦我我我喔噢喔喔我" }, + { + name: "通道1", + value1: "145641201564-1", + value2: "哦哦哦我我我喔噢喔喔我", + }, { name: "通道2", value1: "145641201564-2", value2: "哦哦哦哦哦噢噢欧欧哦" }, ]; + const sewage = [ + { name: "设备名称:", value: "消火栓呼呼呼呼" }, + { name: "SIP编号/设备编号:", value: "D50F2049010B" }, + { name: "接入方式:", value: "NJBJ858G68H" }, + { name: "厂商:", value: "哇哇哇哇哇" }, + { name: "添加账号:", value: "Superadmin" }, + { name: "添加时间:", value: "2022-09-09" }, + { + name: "设备安装位置:", + value: "江西省南昌县小蓝经开区江西飞尚科技有限公司", + }, + { name: "HLS地址", value: "" }, + { name: "FLV地址", value: "" }, + { name: "RTMP地址", value: "" }, + { name: "EZOPEN地址", value: "" }, + { name: "ONVIF地址", value: "" }, + { name: "云储存地址", value: "" }, + { name: "本地储存地址", value: "" }, + ]; function pp() { let str = []; - console.log(IFname.length); - for (let i = 0; i < IFname.length; i++) { + for (let i = 0; i < (cameraSetup ? sewage : IFname).length; i++) { if (i === 0) { str.push( -
); } - if (i === 8) { + if (cameraSetup ? i == 7 : i == 8) { str.push(
- 接入信息 + {cameraSetup ? "复制直播地址" : "接入信息"}
); } - if (i === 17) { + if (cameraSetup ? i == 12 : i == 17) { str.push(
- 摄像头信息 + {cameraSetup ? "复制回收地址" : "摄像头信息"}
); } - if ((0 <= i && i < 6) || (i > 7 && i <= 16)) { + if ( + cameraSetup ? 0 <= i && i < 6 : (0 <= i && i < 6) || (i > 7 && i <= 16) + ) { str.push( -
+
- {IFname[i].name} + {(cameraSetup ? sewage : IFname)[i].name} - {IFname[i].value} + {(cameraSetup ? sewage : IFname)[i].value}
); } - if (i > 5 && i < 8) { + if (cameraSetup ? i == 6 : i > 5 && i < 8) { str.push(
- {IFname[i].name} + {(cameraSetup ? sewage : IFname)[i].name} - {IFname[i].value} + {(cameraSetup ? sewage : IFname)[i].value}
); } - if (i > 16) { + if (cameraSetup ? i > 6 && i < 14 : i > 16) { str.push(
{ + copy(sewage[i].name); + // alert("复制成功"); + setclickStyle(sewage[i].name); + } + : "" + } >
- - {IFname[i].name} + +
+ {cameraSetup ? ( + <> + {sewage[i].name} + + + ) : ( + IFname[i].name + )} +
-

{IFname[i].value1}

-

{IFname[i].value2}

+ {cameraSetup ? ( + "" + ) : ( + <> +

{IFname[i].value1}

+

+ {IFname[i].value2} +

+ + )}
); } @@ -171,7 +285,7 @@ function SideSheets(props) { } const styles = { width: 180, - height:64, + height: 64, textAlign: "center", background: "url(/assets/images/background/backGround.png)", backgroundSize: "100% 100%", @@ -179,10 +293,10 @@ function SideSheets(props) { margin: "30px 0 0 10px", lineHeight: "24px", overflow: "hidden", - textOverflow:"ellipsis", + textOverflow: "ellipsis", display: "-webkit-box", - WebkitLineClamp:"2", - WebkitBoxOrient:"vertical", + WebkitLineClamp: "2", + WebkitBoxOrient: "vertical", zIndex: 5, }; @@ -191,7 +305,7 @@ function SideSheets(props) { return ( { @@ -201,7 +315,7 @@ function SideSheets(props) {
- {list.map((item,index) => { + {list.map((item, index) => { return (
- + {item.name}
{item.a}
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 bd2442d..a9b8616 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 @@ -324,7 +324,7 @@ const CameraHeader = (props) => { 在线 离线 - { 飞尚科技2 - + */}
{ render: (_, row) => { // console.log(row); return ( -
+