From d81c27d411422d42ef8c16e3f4da4ea6c07787e7 Mon Sep 17 00:00:00 2001
From: "peng.peng" <peng.peng@free-sun.com.cn>
Date: Mon, 25 Dec 2023 14:30:33 +0800
Subject: [PATCH] =?UTF-8?q?(*)=E5=A4=A7=E5=B1=8F=20=E8=BF=90=E8=90=A5?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E8=A7=86=E9=A2=91=E6=92=AD=E6=94=BE?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quanju/containers/public/olMap.js         | 31 ++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/web/client/src/sections/quanju/containers/public/olMap.js b/web/client/src/sections/quanju/containers/public/olMap.js
index c8844f76..1f5e9983 100644
--- a/web/client/src/sections/quanju/containers/public/olMap.js
+++ b/web/client/src/sections/quanju/containers/public/olMap.js
@@ -677,6 +677,7 @@ const OlMap = (props) => {
                                                     : '-'
                                         }
                                     </div>
+
                                 </div>
                             )
                         })
@@ -700,6 +701,34 @@ const OlMap = (props) => {
                             }}>上报记录</a>
                             : ''
                     }
+                    <div>
+                        <div style={{ marginTop: 20, marginBottom: 10 }}>监控视频</div>
+                        <iframe
+                            allowFullScreen
+                            src={`https://mediaconsole.ngaiot.com/video_play_cross?videoObj=${encodeURIComponent(JSON.stringify({
+                                channelNo: 1,
+                                // content: [vide.o.location],
+                                // serialNo: "F61.504020",
+                                type: "yingshi",
+                                id: 'myPlayer',
+                                yingshiToken: 'at',
+                                // type: 'nvr',
+                                cloudControl: false,
+                                serialNo: 1, // 设备序列号 必须
+                                // topSerialNo: '34020000001320000001', // 设备顶级序列号 必须
+                                // audio: true,
+                                // highDefinition: true,
+                                // cloudControl: true,
+                                // playUrlSd: 'wss://221.230.55.27:8082/jessica/34020000001110000079/34020000001310000003.flv', // 必须
+                                // playUrlSd: 'wss://221.230.55.27:8082/jessica/34020000001110000075/34020000001110000073.flv', // 必须
+                            }))}`}
+                            style={{ height: 300, width: 400 }}
+                            frameBorder={0}
+                        >
+                            <p>你的浏览器不支持 iframe。</p>
+                        </iframe>
+
+                    </div>
                 </div>
             </div>
             <div slot="overlays" style={{ display: 'none', }}>
@@ -908,7 +937,7 @@ const OlMap = (props) => {
     )
 }
 
-function mapStateToProps (state) {
+function mapStateToProps(state) {
     const { auth, global, busRunTime, busLine, projectList } = state;
     return {
         user: auth.user,