From 4f7fdd5a3db038084b84a021796345f0317aea28 Mon Sep 17 00:00:00 2001 From: deartibers <947466799@qq.com> Date: Wed, 31 Aug 2022 18:19:34 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=97=AE=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/openness/components/videoScreen.less | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/VideoAccess-VCMP/web/client/src/sections/openness/components/videoScreen.less b/code/VideoAccess-VCMP/web/client/src/sections/openness/components/videoScreen.less index a851280..ad836d3 100644 --- a/code/VideoAccess-VCMP/web/client/src/sections/openness/components/videoScreen.less +++ b/code/VideoAccess-VCMP/web/client/src/sections/openness/components/videoScreen.less @@ -93,6 +93,9 @@ .semi-select-selection-placeholder { color: black; } + .semi-icon-tree_triangle_down{ + color: #fff !important; + } .semi-icon { color: black; } From 4ebb23c85a95d617d272db18e47c7da0d93b58ee Mon Sep 17 00:00:00 2001 From: deartibers <947466799@qq.com> Date: Wed, 31 Aug 2022 18:30:27 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=97=B4=E8=B7=9D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/client/src/sections/openness/components/videoScreen.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/VideoAccess-VCMP/web/client/src/sections/openness/components/videoScreen.jsx b/code/VideoAccess-VCMP/web/client/src/sections/openness/components/videoScreen.jsx index e47e922..e5077a4 100644 --- a/code/VideoAccess-VCMP/web/client/src/sections/openness/components/videoScreen.jsx +++ b/code/VideoAccess-VCMP/web/client/src/sections/openness/components/videoScreen.jsx @@ -588,7 +588,7 @@ const VideoScreen = ({ treeData, filterGroup, videoPlay, template, headerName, s {/* 视频设置 */}
{[{ img: mould('blueGongge', 'whiteGongge', 'blackGongge'), value: '宫格设置', screen: [{ img: mould('blueScreen1', 'whiteScreen1', 'blackScreen1'), value: '单屏' }, { img: mould('blueScreen4', 'whiteScreen4', 'blackScreen4'), value: '4分屏' }, { img: mould('blueScreen6', 'whiteScreen6', 'blackScreen6'), value: '6分屏' }, { img: mould('blueScreen12', 'whiteScreen12', 'blackScreen12'), value: '12分屏' },] }, { img: mould('bluePolling', 'whitePolling', 'blackPolling'), value: '轮询设置', }, From 26f79c69675c4433949780ff15629c57605f8080 Mon Sep 17 00:00:00 2001 From: "gao.zhiyuan" Date: Wed, 31 Aug 2022 20:32:41 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=90=A4=E7=9F=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../script/1.3.1/data/1_sync_camera_data/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/VideoAccess-VCMP/script/1.3.1/data/1_sync_camera_data/index.js b/code/VideoAccess-VCMP/script/1.3.1/data/1_sync_camera_data/index.js index ab4dcd6..c508ff1 100644 --- a/code/VideoAccess-VCMP/script/1.3.1/data/1_sync_camera_data/index.js +++ b/code/VideoAccess-VCMP/script/1.3.1/data/1_sync_camera_data/index.js @@ -9,7 +9,7 @@ try { const vcmpPool = new Pool({ user: 'FashionAdmin', host: '10.8.40.223', - database: 'video-access-test', + database: 'video-access', password: 'Fas123_', port: 5432, })