zy1125 1 gadu atpakaļ
vecāks
revīzija
db861faed9

+ 2 - 2
src/assets/css/left.scss

@@ -2,8 +2,8 @@
2 2
 .left {
3 3
      position: absolute;
4 4
      width: 412px;
5
-     height: 900px;
6
-     top: 111px;
5
+     height: 88vh;
6
+     top: 10vh;
7 7
      z-index: 300;
8 8
      flex-shrink: 0;
9 9
      border-radius: 2px;

+ 18 - 3
src/assets/css/right.scss

@@ -1,3 +1,18 @@
1
+::v-deep .el-carousel__indicators{
2
+    display: none;
3
+    // width: 100%;
4
+    // display: flex;
5
+    // justify-content: center;
6
+    // transform: translateX(-50%);
7
+    // height: 20px;
8
+    // transform: translateY(10%);
9
+
10
+}
11
+::v-deep .el-carousel__arrow{
12
+    // display: none;
13
+    display: block;
14
+}
15
+
1 16
 // 通用标题
2 17
 .title {
3 18
     width: 380px;
@@ -28,8 +43,8 @@
28 43
 .right {
29 44
     position: absolute;
30 45
     width: 412px;
31
-    height: 900px;
32
-    top: 111px;
46
+    height: 80vh;
47
+    top: 10vh;
33 48
     z-index: 300;
34 49
     flex-shrink: 0;
35 50
     border-radius: 2px;
@@ -43,7 +58,7 @@
43 58
     box-sizing: border-box;
44 59
     display: flex;
45 60
     flex-direction: column;
46
-    height: 900px;
61
+    height: 88vh;
47 62
     overflow: hidden;
48 63
     padding: 11px 10px 15px 10px;
49 64
 

+ 2 - 1
src/components/UeVideo.vue

@@ -1,6 +1,7 @@
1 1
 
2 2
 <template>
3
-  <div ref="video" id="player"></div>
3
+  <!-- <div  ref="video" id="player"></div> -->
4
+  <div style="background-color: rgba(36, 97, 72, 0.667); width: 100vw;height: 100vh;position: absolute;" ></div>
4 5
   <Login :class="loginShow ? '' : 'hidden'"></Login>
5 6
   <home></home>
6 7
   <!-- <div @click="toUE" style="position: absolute;top: 5%; left: 50%;background-color: darkcyan;z-index: 200">向UE发信息</div> -->

+ 24 - 5
src/components/right.vue

@@ -66,8 +66,11 @@
66 66
                         <div class="interactclass">
67 67
 
68 68
                             <div class="room" v-for="(item, index) in item.activeMonitor.array" :key="index">
69
-                                <span>{{ item.title }}</span>
70
-                                <img :src="deviceImg + 'rb2.png'" alt="" @click="lookVideo(item)">
69
+                                <span style="z-index: 99;">{{ item.title }}</span>
70
+                                <!-- <img :src="deviceImg + 'rb2.png'" alt="" @click="lookVideo(item)"> -->
71
+                                <div @click="lookVideo(item.src)">
72
+                                    <videoPlay  v-bind="videoData" />
73
+                                </div>
71 74
                             </div>
72 75
                         </div>
73 76
 
@@ -75,7 +78,9 @@
75 78
                         <div class="interactclass">
76 79
                             <div class="room" v-for="(item, index) in item.activeMonitor.array1" :key="index">
77 80
                                 <span>{{ item.title }}</span>
78
-                                <img :src="deviceImg + 'rb2.png'" alt="" @click="lookVideo(item.src)">
81
+                                <div @click="lookVideo(item.src)">
82
+                                    <videoPlay  v-bind="videoData" />
83
+                                </div>
79 84
                             </div>
80 85
                         </div>
81 86
                     </el-carousel-item>
@@ -88,6 +93,7 @@
88 93
     <!-- 视频播放弹框 -->
89 94
     <el-dialog class="videoDialog" v-model="videoDialog" :title="dialogTitle" width="60%" align="center" top="4%">
90 95
         <videoPlay v-bind="videoData" />
96
+
91 97
         <!-- {{ videoData.src }} -->
92 98
     </el-dialog>
93 99
 </template>
@@ -98,7 +104,7 @@ import { ElCarousel, ElCarouselItem } from "element-plus";
98 104
 import "vue3-video-play/dist/style.css";
99 105
 import { videoPlay } from "vue3-video-play";
100 106
 import CircleProgress from './CircleProgress.vue';
101
-import { getDevice, getVideoUrl } from '../request/api';
107
+import { getDevice, getVideoUrl,getvideo } from '../request/api';
102 108
 
103 109
 
104 110
 export default ({
@@ -145,6 +151,7 @@ export default ({
145 151
             console.log("点击了播放视频", 12312312, "播放路径", item)
146 152
             getVideoUrl({ "rtsp": item.src }).then((res) => {
147 153
                 console.log("视频处理", res);
154
+                console.log("视频处理2", res.data.httpFlv);
148 155
 
149 156
                 videoData.src = res.data.httpFlv
150 157
             })
@@ -164,6 +171,15 @@ export default ({
164 171
 
165 172
         //获取页面数据
166 173
         const getDeviceData = async () => {
174
+
175
+
176
+            //视频转码
177
+            getvideo({
178
+             "rtsp": "rtsp://admin:admin@10.116.255.67:554",
179
+            }).then((res)=>{
180
+                console.log('sadnuq21',res);
181
+            })
182
+
167 183
             let res = await getDevice()
168 184
             console.log('s12312123',res);
169 185
             if (res.code !== 200) {
@@ -175,7 +191,10 @@ export default ({
175 191
             //截取数组前6项
176 192
             interDevice.value = category.slice(0,6);
177 193
             // 互动教室
178
-            carouselData.value = monitor
194
+            carouselData.value = monitor.slice(0,5)
195
+
196
+            console.log('处理监控视频数据===',monitor).slice(0,1);
197
+
179 198
             //物联设备统计
180 199
             equipmentTotal.value = status
181 200
 

+ 3 - 0
src/request/api.js

@@ -13,6 +13,9 @@ export const getClass = () => service.get("/wisdomClass/classroomStatistic")
13 13
 
14 14
 export const getDevice = () => service.get("/wisdomClass/deviceStatistic")
15 15
 
16
+//视频转码
17
+export const getvideo = (data) => service.post("/camera/getUrl",data)
18
+
16 19
 
17 20
 export const getClassDetail = (deviceCode) => service.get(`/wisdomClass/deviceDetail/${deviceCode}`)
18 21