Merge branch 'dev_trial' of https://gitea.anxinyun.cn/free-sun/FS-IOT into dev_trial

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,
    })

code/VideoAccess-VCMP/web/client/src/sections/openness/components/videoScreen.jsx

@@ -590,7 +590,7 @@ const VideoScreen = ({ treeData, filterGroup, videoPlay, template, headerName, s
                      </div>
                      {/* 视频设置 */}
                      <div style={{
-                        width: 64, height: 476, background: mould('#01185F', ' linear-gradient(197deg, rgba(255,255,255,0.65) 0%, #E4E4E4 100%)', 'linear-gradient(197deg, rgba(38,38,38,0.65) 0%, #101010 100%)'), boxShadow: `inset 0px 0px 5px 1px ${mould('rgba(28,96,254,0.4000)', 'rgba(97,94,94,0.5)', 'rgba(132,132,132,0.5)')}`, borderRadius: ' 1px', textAlign: 'center',
+                       marginTop:5, width: 64, height: 476, background: mould('#01185F', ' linear-gradient(197deg, rgba(255,255,255,0.65) 0%, #E4E4E4 100%)', 'linear-gradient(197deg, rgba(38,38,38,0.65) 0%, #101010 100%)'), boxShadow: `inset 0px 0px 5px 1px ${mould('rgba(28,96,254,0.4000)', 'rgba(97,94,94,0.5)', 'rgba(132,132,132,0.5)')}`, borderRadius: ' 1px', textAlign: 'center',
                      }}>
                         {[{ 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: '轮询设置', },

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;
   }