From 99b8aca186bd89aa68a3f11f533bcbeb9d3e644d Mon Sep 17 00:00:00 2001 From: wenlele Date: Thu, 12 May 2022 17:44:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/assets/images/background/copy1.png | Bin 0 -> 173 bytes .../client/assets/images/background/copy2.png | Bin 0 -> 169 bytes .../images/background/sewage_camera1.png | Bin 0 -> 2358 bytes .../images/background/sewage_camera2.png | Bin 0 -> 1951 bytes .../assets/images/background/store1.png | Bin 0 -> 853 bytes .../assets/images/background/store2.png | Bin 0 -> 1154 bytes .../equipmentWarehouse/actions/nvr.js | 1 + .../components/sideSheet.jsx | 205 ++++++++++++++---- .../equipmentWarehouse/containers/camera.jsx | 4 +- .../equipmentWarehouse/containers/nvr.jsx | 13 +- code/VideoAccess-VCMP/web/package.json | 1 + 11 files changed, 171 insertions(+), 53 deletions(-) create mode 100644 code/VideoAccess-VCMP/web/client/assets/images/background/copy1.png create mode 100644 code/VideoAccess-VCMP/web/client/assets/images/background/copy2.png create mode 100644 code/VideoAccess-VCMP/web/client/assets/images/background/sewage_camera1.png create mode 100644 code/VideoAccess-VCMP/web/client/assets/images/background/sewage_camera2.png create mode 100644 code/VideoAccess-VCMP/web/client/assets/images/background/store1.png create mode 100644 code/VideoAccess-VCMP/web/client/assets/images/background/store2.png 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 0000000000000000000000000000000000000000..80df7ff53d01110d719c52818a52af86639df28c GIT binary patch literal 173 zcmeAS@N?(olHy`uVBq!ia0vp^JV4CH!3HFy_x^nYq!^2X+?^QKos)S97(@i-D5%~0kj3DcB=yPu7f?Z&Lg5q-Moxh)j~uBFzc`(l73~=r;%0fI UPc}HY9%vmdKI;Vst0R1yQJOBUy literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..77b986711edc19cab4eec3f3ed4a9812be712594 GIT binary patch literal 169 zcmeAS@N?(olHy`uVBq!ia0vp^JV4CH!3HFy_x^nYq!^2X+?^QKos)S9r$s(t$`I6CoOx${HdpCo9N64nQz}G`7zvfSYFkj6wGfS zlfXV9_dkMdnB*0j%nsBkM6sNS=}x>@9*AK R$pN&E!PC{xWt~$(695f}IvW50 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e272df9608230d373c6e6fd8f89dcb157971b927 GIT binary patch literal 2358 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..67abdbe058a1c47f32b2b47bfe495f67b99f57d3 GIT binary patch literal 1951 zcmV;Q2VnS#P)Px+SxH1eRA@u(noEcrMHt8bHQh7QJ2N|zolSNVO=3bsAs!6GgBZQ25XESMh>#o% z1V#`PACQX&@%=!fo2&_O5k(MhBI>~hz7g`&1SB`XqnH?T3dC%7O1|p)dcLly?%Aa0 zBFsYQnd+{Zu3!JZXGdZ5X9%bfhnTe2y-N?3%P#vYuU|5@0@R;MBNMXNG0ki&Dg6AL^A|;N75v z%|QtW6hKDNF zz-gt_$w8n7g4p?<-mWx0GB-*}pqu0)KUqHKQ;FTA`^1wCxe&yf5_0DJ5>O4Xb)v35 zS2V)?J9dmk5N#UtP{#hII$UDn4%%+4&Qfly+jZu?W-@QI8 z;f3jzdPZwK2Hg6kO`3emnaXQ zBYn4Ht$Kt;t(*?I9%q>{KL-#$kVXWw#^Uv(G7gPL_%dgs`wN4(XGYH{0^#xIb)17D z2uc}cD07Te(i@8*88BghC9P&0Dy?7X%SWWMWQQv9m2wD7)`40j22b8Ts^D-l!dD&; zY$mgXL2Q}Pb6TOpPgvUYhUMoGmAeK8-H@_3MmI!2Ofkdf6mW4N#QE-6F9GwZ!41j6 z6zdgWstJ%u(E9O1Fp4 z-Bj9FOu4xQ)hcV3#ZHj{BpbJpDftedR>iS)9pC1Fc(bq~3<#?TV{l~r))nPtdlHn) zE@frvOUCHh4Xcgan@D4Pj8Fi_zdgl4?9+3)i;gc{qdW0cl}Tig z^~WNzPJ%!HZd%jx2QCEHMCg0Hg5yia@m&sx*NcM?iZGABszJsn*^i*g)LTS3MOj|2 zV)Z1jrfnmHefmiRvPzJCqEW>!OULoO$26D?fyiy*46Hs~XPHul03$bFv>!p{)2IU1 zP64f2+A*>@nEb>-A`r`B5PV1OzFsQ~BJmMo)2RlCsBrqisK^X2rys#(IvrQEfVE50 zkwZodg3+kr*Qq9c$jK~U9SVpp&|$=hB3v-Sc?}AavbW)DYrtyMx%YbD~;XrM| zMj*x`1LDUVAMwgiKv0UEgiqH`*zXL8ZcJv5ywNM^N5~EpMUQqp1~OLe)i0E(HmW$W zyoH}~e8kJc0pTQ6S*F3+J+aBk7gCTsrqkE>5d{~|C1-l|L@%<8M+t~5AMuh>>h#bu z%S^Knzrfd+vfN3pWmxq#b7dXE&D@MKoeHpZQ$RB=$4^eT@NcI@oKti?Ul@c8pFTy%a4K^PcCOs0F`e(EQx(fv znnCKdfGEs-tvu7i6iTUAao~ZC2E@%7@_(){2(C3ak;=0(nQ+l(R*S4y2dW{XAK^w4 z=Y7iFowukbwAR-F*bZRYxzA^Z0pfrL9-)POPh4(TUgHAeHXbEQNsV$D{Rm3ZXr7rb zI_fs(cw^VCYPb1)t?3QnX4}@Mw~KV!y9>Y9*fOIZ)xd1BG3l4N50oVnC)Y@IqZiqa z@D*=;m2Ze$o!iv=sc5D(sp573zbmDV?h7PBdmXDQ+{|X41yN8cUEs(=;8w_H4T{aMs?AZ1+aVjD_WkFI%BpZJVE-$0FoZu)$3jXlS0 zJEIV3CLvI^K7g`DQiD+pMIC!i1(+`fI29>;^5k9W&&BN^|Ehu2=P-Wc|FFgggnddQ l5F-$2gB>Yiq=>X4{sRm_d^&8H(LDeF002ovPDHLkV1m#-mihny literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..84674e2d8e31231c0ce9f12fd86c31db150c07b9 GIT binary patch literal 853 zcmV-b1FHOqP)>lXf00001b5ch_0Itp) z=>Px&4@pEpR9HvNm(ObxK@`W|o2>+Y5K2%FRU$&u1)&!a`X2~A^r-jZLC^jH9z6ON z=*9j4y?a(c3Tc9b1ltXG3H}HzEp7bKHrbgcvvsz+lkDv5q=KX@w zAlL(difaJn#~6E5tJPk+#*rZ8>a6)~BjV?Rv37}Q-S_=B=Lu4f;mjNnpGb`e0C>e1 zTSvrQ=V%U&M08CE@c;nsOOWRa3k%O2;+&g{WWZjpH&?AzznxoDhd`168;!=L(P*^D zIj<1WjEciKPlZh0hhZ4MGudVNC}$!H5plm%Dz$NAV`B*buB(@75PbmoUOh8`B<=JV zNk1)dJGi;Ixg3UJoC({n&9bx2WD>;lyb$a4`bzRE4NTh%Eq(-j%{mH`SG!VF^N0|$y*EZ`il*Ssr2QRb6E%x{XAza*S3S$ z*kxoTlsmm8&Uw6@C<>lXf00001b5ch_0Itp) z=>Px(JV``BR9HvNSI=uyR}}uvy?5qmBsRp+hIG-D1ZrJaDB{kQ5b%*jX~2chkcHj2 zuoPSr1WOmvy0R4vhyyMJ(S;BQ_y@RlkxjBFiVz95mC(?FPCB=o`|f$U@6LUbnfRl9 z5MJ(^d+z(@JKy=v8N&bMB5UnF06zkl1<)E2R|mjj0N)VNqakA}+Zo6W0O#K15CDGy z_=Jeoc6$y3`2)cCZVw3J=85RmZqH#LcDKP%+zNnShdk>y0QZP!>1_fT5<_MC*9@c! zV1bbVV1)1UItbuP0H+wp_e6B*eZD<@m&0JKog|{?|1pqBT3ECroqagkR2Xk)7;S(| z16l)_@poPWsQpX>20$|__PKa}&JJI23&2YN%k z2IYZg9@qeEzo4s2c3No|V*oj%X^O+#nx99>1Btd`!sVV5~6CExNK~^DqrDwLK}~ z7kT=H!IH5sogVyvDFXelXmdwpqzPd~Udn6Ue!nC+aZGLwF0FzvCGR%C}5WAhOW5Q}!<|I*7N36v7la zAf=D^vJ8d$Y;Aq&?^m5M$-CTH4#tV13!@a2Lh;8kQ2;5RwO?;ce?GA);9}+4gmJDst@I}3~F z%T(#-CgDUezjc}!ZxV_N?*W(vHtxm8(Qw*Ce&0P1+%H`|l z4VgVEoi!}WSTDh7>CTA8gLoKEjiGe9?gb*=qNXAcLj;0sayvz=BJ zCL9-&L$pk2GNi+v@Ox&Q ze%_+-g7O7BqB=O*wHR+In0}qLueS&w|667d``@Fmr5kvey~eWirvZKgz1uDS0(rmI U;%e8?HUIzs07*qoM6N<$g3I+DqW}N^ literal 0 HcmV?d00001 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 ( -
+