From bac88851a75f3d3582773ab2e8cf9682a452e1c7 Mon Sep 17 00:00:00 2001 From: deartibers <947466799@qq.com> Date: Wed, 20 Jul 2022 17:05:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=A0=81=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/src/sections/offline/containers/statuscode.jsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/VideoAccess-VCMP/web/client/src/sections/offline/containers/statuscode.jsx b/code/VideoAccess-VCMP/web/client/src/sections/offline/containers/statuscode.jsx index e92f8de..e14f667 100644 --- a/code/VideoAccess-VCMP/web/client/src/sections/offline/containers/statuscode.jsx +++ b/code/VideoAccess-VCMP/web/client/src/sections/offline/containers/statuscode.jsx @@ -92,7 +92,7 @@ const Statuscode = (props) => { }, }, { - title: "释义", + title: "官方释义", dataIndex: "paraphrase", render: (_, r, index) => { return r.paraphrase @@ -133,7 +133,7 @@ const Statuscode = (props) => { ) : ( { label="释义搜索:" field="keyword" maxLength="36" - placeholder="请输入错误描述、释义或自定义释义" + placeholder="请输入错误描述、释义" labelPosition="left" style={screen} /> @@ -339,7 +339,7 @@ const Statuscode = (props) => { 禁用 Date: Thu, 21 Jul 2022 08:42:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B3=A8=E9=87=8Ahttp=E8=BD=AC=E5=8C=96?= =?UTF-8?q?=E6=88=90https=E7=9A=84=E9=99=90=E5=88=B6=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/VideoAccess-VCMP/web/client/index.html | 2 +- .../web/client/src/components/videoPlayer/videoPlay.jsx | 4 ++-- .../src/sections/equipmentWarehouse/containers/camera.jsx | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/VideoAccess-VCMP/web/client/index.html b/code/VideoAccess-VCMP/web/client/index.html index e181401..e67994b 100644 --- a/code/VideoAccess-VCMP/web/client/index.html +++ b/code/VideoAccess-VCMP/web/client/index.html @@ -4,7 +4,7 @@ - + diff --git a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx index 7fe6048..0d2d470 100644 --- a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx +++ b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx @@ -251,7 +251,7 @@ const VideoPlay = ({ // console.log(err); // }) - const inviteRes_ = await request.get(`${iotVideoServer}/api/gb28181/invite?id=${videoObj.topSerialNo}&channel=${videoObj.serialNo}`) + const inviteRes_ = await request.get(`${iotVideoServer}/api/gb28181/invite?id=${videoObj.topSerialNo}&channel=${videoObj.serialNo}`) } catch (error) { console.log(error.response); } @@ -267,7 +267,7 @@ const VideoPlay = ({ debug: true, showBandwidth: false, // 显示网速 operateBtns: { - fullscreen: false, + fullscreen: true, screenshot: false, play: false, audio: false, 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 022a9db..5e0a0e9 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 @@ -225,6 +225,7 @@ const CameraHeader = (props) => { yingshiToken: row.secretYingshi?.token, playUrlSd: row.gbCamera?.playUrl?.liveUrl?.sd?.ezopen, playUrlHd: row.gbCamera?.playUrl?.liveUrl?.hd?.ezopen, + replayUrl:row.gbCamera?.playUrl?.replayUrl?.cloud, content:data, }) } else {