dedsudiyu 1 mês atrás
pai
commit
dc80cee5eb

+ 4 - 3
src/components/newSubVideoComponent.vue

@@ -5,8 +5,9 @@
       <div class="sub-video-big-box" v-for="(item,index) in dataList" :key="index">
         <div class="sub-video-box">
           <p class="sub-name-p">{{item.roomNum?item.subName+'('+item.roomNum+')':item.subName}}</p>
-          <mpegts-video :videoProps="item.videoData" ref="mpegtsRef" ></mpegts-video>
-          <!--<H5PlayerVideo class="sub-video-box" :videoProps="item.videoData"></H5PlayerVideo>-->
+          <!--视频组件 自建/海康 -->
+          <!--<mpegts-video :videoProps="item.videoData" ref="mpegtsRef" ></mpegts-video>-->
+          <H5PlayerVideo class="sub-video-box" :videoProps="item.videoData"></H5PlayerVideo>
         </div>
         <div class="sensor-max-box">
           <div class="sensor-box" v-for="(minItem,minIndex) in item.sensorList" :key="minIndex">
@@ -22,7 +23,7 @@
         </div>
       </div>
     </div>
-    <!--<fullH5PlayerVideo v-if="fullVideoType" :fullVideoProps="fullVideoProps"></fullH5PlayerVideo>-->
+    <fullH5PlayerVideo v-if="fullVideoType" :fullVideoProps="fullVideoProps"></fullH5PlayerVideo>
   </div>
 </template>
 <script>

+ 1 - 1
src/views/headerComponent.vue

@@ -147,7 +147,7 @@
     position: absolute;
     top:0;
     left:0;
-    z-index: 51;
+    z-index: 50;
     .top-max-box{
       display: flex;
       .logo-img{

+ 3 - 1
src/views/login.vue

@@ -177,7 +177,9 @@
             localStorage.setItem('fileBrowseEnvironment', urlText + Decrypt(obj.fileBrowseEnvironment))
             localStorage.setItem('fileBrowseEnvironmentExtranet', urlText + Decrypt(obj.fileBrowseEnvironmentExtranet))
           }
-          this.authGetAllToken(token);
+          localStorage.setItem('setCheckIndex', 0);
+          this.getInfo([],token);
+          // this.authGetAllToken(token);
         });
       },
       getCode() {

+ 5 - 4
src/views/videoSurveillance/pageComponent/videoComponent.vue

@@ -13,9 +13,10 @@
       <!--<p class="name-p" style="margin-left:10px;">人</p>-->
     </div>
     <div class="video-max-big-box">
-      <mpegts-video :videoProps="item" ref="mpegtsRef" v-for="(item,index) in videoList" :key="index"></mpegts-video>
-      <!--<H5PlayerVideo style="margin:20px 28px 0 0 ;"-->
-                     <!--v-for="(item,index) in videoList" :key="index" :videoProps="item"></H5PlayerVideo>-->
+      <!--视频组件 自建/海康 -->
+      <!--<mpegts-video :videoProps="item" ref="mpegtsRef" v-for="(item,index) in videoList" :key="index"></mpegts-video>-->
+      <H5PlayerVideo style="margin:20px 28px 0 0 ;"
+                     v-for="(item,index) in videoList" :key="index" :videoProps="item"></H5PlayerVideo>
       <img v-if="!videoList[0]" class="null-img" src="@/assets/ZDimages/null-data-1.png">
     </div>
     <pagination v-show="videoTotal>0"
@@ -26,7 +27,7 @@
                 :limit.sync="videoQueryParams.pageSize"
                 @pagination="videoInitialize"
     />
-    <!--<fullH5PlayerVideo v-if="fullVideoType" :fullVideoProps="fullVideoProps"></fullH5PlayerVideo>-->
+    <fullH5PlayerVideo v-if="fullVideoType" :fullVideoProps="fullVideoProps"></fullH5PlayerVideo>
   </div>
 </template>
 <script>