Página inicial Explorar Ajuda
Entrar
huliu
/
v3_yyz
Observar 1
Favorito 0
Fork 0
Arquivos Issues 0 Pull Requests 0 Wiki
Ver código fonte

调整样式

zy1125 1 ano atrás
pai
f9c8dac5ab
commit
425d6a7b13
8 arquivos alterados com 26 adições e 14 exclusões
Visão unificada Mostrar estatísticas do Diff
  1. 1 0
      index.html
  2. 1 1
      src/assets/css/home.scss
  3. 1 1
      src/assets/css/left.scss
  4. 1 1
      src/assets/css/right.scss
  5. 11 3
      src/components/home.vue
  6. 3 3
      src/components/left.vue
  7. 7 5
      src/components/right.vue
  8. 1 0
      src/webrtcVideo.js

+ 1 - 0
index.html
Ver arquivo 

@@ -18,6 +18,7 @@
18 
 <body>
 18 
 <body>
19 
   <div id="app"></div>
 19 
   <div id="app"></div>
20 
   <script type="module" src="/src/main.js"></script>
 20 
   <script type="module" src="/src/main.js"></script>
21 
+
21 
 </body>
 22 
 </body>
22
23
23 
 </html>
 24 
 </html>

+ 1 - 1
src/assets/css/home.scss
Ver arquivo 

@@ -36,7 +36,7 @@
36 
     background-color: #ffffff00;
 36 
     background-color: #ffffff00;
37 
     border-radius: 10px;
 37 
     border-radius: 10px;
38 
     backdrop-filter: blur(30.5px);
 38 
     backdrop-filter: blur(30.5px);
39 
-    z-index: 8;
39 
+    z-index: 2007;
40
40
41 
     .model-detail2{
 41 
     .model-detail2{
42 
             border-top-left-radius: 10px;
 42 
             border-top-left-radius: 10px;

+ 1 - 1
src/assets/css/left.scss
Ver arquivo 

@@ -4,7 +4,7 @@
4 
      width: 412px;
 4 
      width: 412px;
5 
      height: 86vh;
 5 
      height: 86vh;
6 
      top: 11.5vh;
 6 
      top: 11.5vh;
7 
-     z-index: 300;
7 
+     z-index: 9;
8 
      flex-shrink: 0;
 8 
      flex-shrink: 0;
9 
      border-radius: 2px;
 9 
      border-radius: 2px;
10 
      background: rgba(125, 125, 125, 0.17);
 10 
      background: rgba(125, 125, 125, 0.17);

+ 1 - 1
src/assets/css/right.scss
Ver arquivo 

@@ -64,7 +64,7 @@
64 
     width: 412px;
 64 
     width: 412px;
65
65
66 
     top: 11.5vh;
 66 
     top: 11.5vh;
67 
-    z-index: 300;
67 
+    z-index: 9;
68 
     flex-shrink: 0;
 68 
     flex-shrink: 0;
69 
     border-radius: 2px;
 69 
     border-radius: 2px;
70 
     background: rgba(125, 125, 125, 0.17);
 70 
     background: rgba(125, 125, 125, 0.17);

+ 11 - 3
src/components/home.vue
Ver arquivo 

@@ -10,7 +10,7 @@
10 
             </div>
 10 
             </div>
11
11
12 
         </el-container>
 12 
         </el-container>
13 
-        <div ref="popoverRef" id="popoverRef" class="modelInfo" >
13 
+        <div ref="popoverRef" id="popoverRef" class="modelInfo">
14 
             <div v-if="orientation=='Left' ||orientation=='Right'" class="model-detail"  >
 14 
             <div v-if="orientation=='Left' ||orientation=='Right'" class="model-detail"  >
15 
                 <div v-for="item in classDeviceInfo" class="listbox" >
 15 
                 <div v-for="item in classDeviceInfo" class="listbox" >
16
16 
                     
@@ -76,6 +76,7 @@ import { getVideoUrl } from '../request/api';
76 
 export default ({
 76 
 export default ({
77 
     name: 'Histogram',
 77 
     name: 'Histogram',
78 
     components: { Login, Left, Right, ElScrollbar, ElPagination, ElDialog, videoPlay, ElCarousel, ElCarouselItem, CircleProgress },
 78 
     components: { Login, Left, Right, ElScrollbar, ElPagination, ElDialog, videoPlay, ElCarousel, ElCarouselItem, CircleProgress },
79 
+
79 
     setup() {
 80 
     setup() {
80 
         const titleDialog = ref("")
 81 
         const titleDialog = ref("")
81 
         const orientation = ref("")
 82 
         const orientation = ref("")
 
@@ -140,6 +141,8 @@ export default ({
140
141
141 
         //视频播放弹框
 142 
         //视频播放弹框
142 
         const videoDialog = ref(false)
 143 
         const videoDialog = ref(false)
144 
+
145 
+
143 
         // 播放视频
 146 
         // 播放视频
144 
         const lookVideo = function () {
 147 
         const lookVideo = function () {
145 
             videoDialog.value = true;
 148 
             videoDialog.value = true;
 
@@ -214,6 +217,8 @@ export default ({
214
217
215 
             console.log('看看这个',clickData.value.direction);
 218 
             console.log('看看这个',clickData.value.direction);
216 
             if (json.deviceCode) {
 219 
             if (json.deviceCode) {
220 
+
221 
+
217 
                 console.log('sadasd',json.deviceCode);
 222 
                 console.log('sadasd',json.deviceCode);
218 
                 let replacedStr = json.deviceCode.replace("/", "A");
 223 
                 let replacedStr = json.deviceCode.replace("/", "A");
219 
                 getClassDetail(replacedStr).then(res => {
 224 
                 getClassDetail(replacedStr).then(res => {
 
@@ -290,7 +295,7 @@ export default ({
290 
             // console.log("监听一下窗口是不是改了--click", lineContainer);
 295 
             // console.log("监听一下窗口是不是改了--click", lineContainer);
291 
             callUIInteraction("windowSize")
 296 
             callUIInteraction("windowSize")
292 
         }
 297 
         }
293 
-
298 
+
294
299
295 
         onMounted(() => {
 300 
         onMounted(() => {
296 
             addResponseEventListener("444", handleResponseFunction);
 301 
             addResponseEventListener("444", handleResponseFunction);
 
@@ -301,6 +306,8 @@ export default ({
301
306
302
307
303 
         })
 308 
         })
309 
+
310 
+
304 
         const headImg = ref('./img/head.png')
 311 
         const headImg = ref('./img/head.png')
305 
         return {
 312 
         return {
306 
             centerDialogVisible,
 313 
             centerDialogVisible,
 
@@ -319,7 +326,8 @@ export default ({
319 
             mouseClick,
 326 
             mouseClick,
320 
             headImg,
 327 
             headImg,
321 
             titleDialog,
 328 
             titleDialog,
322 
-            orientation
329 
+            orientation,
330 
+
323 
         }
 331 
         }
324 
     },
 332 
     },
325 
 })
 333 
 })

+ 3 - 3
src/components/left.vue
Ver arquivo 

@@ -67,7 +67,7 @@
67 
             </div>
 67 
             </div>
68 
         </div>
 68 
         </div>
69 
         <el-popover ref="popoverRef" v-model:visible="popoverVisible" placement="bottom" :width="400"
 69 
         <el-popover ref="popoverRef" v-model:visible="popoverVisible" placement="bottom" :width="400"
70 
-            :virtual-ref="triggerRef" trigger="click" virtual-triggering popper-class="classpopover">
70 
+            :virtual-ref="triggerRef" virtual-triggering popper-class="classpopover">
71 
             <div class="model-detail">
 71 
             <div class="model-detail">
72 
                 <span><span class="title">教室状态: </span>
 72 
                 <span><span class="title">教室状态: </span>
73 
                     <span :class="classInfo.online ? 'green' : 'red'">{{ classInfo &&
 73 
                     <span :class="classInfo.online ? 'green' : 'red'">{{ classInfo &&
 
@@ -188,9 +188,9 @@ export default ({
188
188
189 
             popoverVisible.value = true;
 189 
             popoverVisible.value = true;
190 
             classInfo.value = item;
 190 
             classInfo.value = item;
191 
-            console.log(classInfo.value);
191 
+
192 
             classInfo.value.online = classInfo.value.status == "在用" ? true : false
 192 
             classInfo.value.online = classInfo.value.status == "在用" ? true : false
193 
-
193 
+
194 
             mousemoveHandler(1000, 60)
 194 
             mousemoveHandler(1000, 60)
195 
             callUIInteraction("initRoom")
 195 
             callUIInteraction("initRoom")
196 
             console.log("item", item, item.lat);
 196 
             console.log("item", item, item.lat);

+ 7 - 5
src/components/right.vue
Ver arquivo 

@@ -119,7 +119,7 @@
119 
     </el-aside>
 119 
     </el-aside>
120
120
121 
     <!-- 视频播放弹框 -->
 121 
     <!-- 视频播放弹框 -->
122 
-    <el-dialog class="videoDialog" v-model="videoDialog" :title="dialogTitle" width="54.5%" align="center" top="10%">
122 
+    <el-dialog class="videoDialog" v-model="videoDialog" :title="dialogTitle" width="54%" align="center" top="10%" style="z-index: 2015;">
123 
         <videoPlay v-bind="videoData" />
 123 
         <videoPlay v-bind="videoData" />
124
124
125 
         <!-- {{ videoData.src }} -->
 125 
         <!-- {{ videoData.src }} -->
 
@@ -148,7 +148,7 @@ export default ({
148 
             // src: "https://cdn.jsdelivr.net/gh/xdlumia/files/video-play/IronMan.mp4", //视频源
 148 
             // src: "https://cdn.jsdelivr.net/gh/xdlumia/files/video-play/IronMan.mp4", //视频源
149 
             src: "",
 149 
             src: "",
150 
             type: "m3u8",
 150 
             type: "m3u8",
151 
-            muted: false, //静音
151 
+            muted: true, //静音
152 
             webFullScreen: false,
 152 
             webFullScreen: false,
153 
             // speedRate: ["0.75", "1.0", "1.25", "1.5", "2.0"], //播放倍速
 153 
             // speedRate: ["0.75", "1.0", "1.25", "1.5", "2.0"], //播放倍速
154 
             autoPlay: true, //自动播放
 154 
             autoPlay: true, //自动播放
 
@@ -244,8 +244,9 @@ export default ({
244 
                     "rtsp": array.src,
 244 
                     "rtsp": array.src,
245 
                     }).then((res)=>{
 245 
                     }).then((res)=>{
246 
                         console.log('sadnuq21',res.data);
 246 
                         console.log('sadnuq21',res.data);
247 
-                        console.log('sadnuq21',res.data.httpFlv);
248 
-                        array.src='http://kbs-dokdo.gscdn.com/dokdo_300/_definst_/dokdo_300.stream/playlist.m3u8'
247 
+                        console.log('sadnuq2121',res.data.httpFlv);
248 
+                        // array.src='http://kbs-dokdo.gscdn.com/dokdo_300/_definst_/dokdo_300.stream/playlist.m3u8'
249 
+                        array.src=res.data.httpFlv
249 
                     })
 250 
                     })
250
251
251
252 
                     
@@ -257,7 +258,8 @@ export default ({
257 
                     "rtsp": array1.src,
 258 
                     "rtsp": array1.src,
258 
                     }).then((res)=>{
 259 
                     }).then((res)=>{
259 
                         console.log('sadnuq212123s2',res.data);
 260 
                         console.log('sadnuq212123s2',res.data);
260 
-                        array1.src='http://kbs-dokdo.gscdn.com/dokdo_300/_definst_/dokdo_300.stream/playlist.m3u8'
261 
+                        // array1.src='http://kbs-dokdo.gscdn.com/dokdo_300/_definst_/dokdo_300.stream/playlist.m3u8'
262 
+                        array.src=res.data.httpFlv
261 
                     })
 263 
                     })
262 
                 })
 264 
                 })
263
265

+ 1 - 0
src/webrtcVideo.js
Ver arquivo 

@@ -1422,6 +1422,7 @@ function emitDescriptor(messageType, descriptor) {
1422 
 // streamed UI from the UE4 client.
 1422 
 // streamed UI from the UE4 client.
1423 
 function emitUIInteraction(descriptor) {
 1423 
 function emitUIInteraction(descriptor) {
1424 
     console.log("看一下进入这里没有", descriptor)
 1424 
     console.log("看一下进入这里没有", descriptor)
1425 
+
1425 
     emitDescriptor(MessageType.UIInteraction, descriptor);
 1426 
     emitDescriptor(MessageType.UIInteraction, descriptor);
1426 
 }
 1427 
 }
1427
1428