Merge branch 'qxh-master' of http://git.keliuyun.com:55676/jiaxiuc123/miniProject into qxh-master

h5/src/views/pc/pcdemo.vue

@@ -2,7 +2,7 @@
   <div>
     <!-- 添加视频测试 -->
       <div>
-        <el-button type="primary" @click="addPlayer({gateUnid: '85de1326-5775-11ee-94ed-00163e143ecd'})">河南分公司--办公室--办公室监控</el-button>
+        <el-button type="primary" @click="addPlayer({gateUnid: '85de13a8-5775-11ee-94ed-00163e143ecd'})">河南分公司--办公室--办公室监控</el-button>
         <el-button type="primary" @click="addPlayer({gateUnid: '85de1326-5775-11ee-94ed-00163e143ecd',watermarkText:'Demo Store'})">Demo Store--客流相机-入口1</el-button>
       </div>
 			<indexPlayer ref="iframe"></indexPlayer>
@@ -29,9 +29,9 @@ export default {
 			isShowTime:true,// 是否显示时间操作区，默认为true
 			height:'',// 设置组件高度
 			isShowJT:false,// 是否显示截图按钮，默认为false
-			isShowSplit:false,// 是否支持四分屏，默认为true
-			controlAutoHide:false,// 是否显示视频操作区，默认为true
-			showPtz:false,// 是否显示视频操作区中的云台控制，默认为true
+			isShowSplit:true,// 是否支持四分屏，默认为true
+			controlAutoHide:true,// 是否显示视频操作区，默认为true
+			showPtz:true,// 是否显示视频操作区中的云台控制，默认为true
 		})
 	},
   methods: {

h5/src/views/pc/timeline-canvas.vue

@@ -187,14 +187,14 @@ export default {
         //"横屏";
       }
       //有时屏幕尺寸变化了，而容器的尺寸还未改变的情况下的处理
-      if (this.canvas.style.width === this.canvas.parentElement.clientWidth + "px") {
-        setTimeout(() => {
-          this.resize();
-        }, 10);
-      } else {
-        //重新初始化
-        this.init();
-      }
+      // if (this.canvas.style.width === this.canvas.parentElement.clientWidth + "px") {
+      //   setTimeout(() => {
+      //     this.resize();
+      //   }, 10);
+      // } else {
+      //   //重新初始化
+      //   this.init();
+      // }
     },
     //进度条停止播放
     stop() {

h5/src/views/pc/videoTime.vue

@@ -52,8 +52,8 @@
             </el-dropdown>
             <i class="el-icon-arrow-right"></i>
           </div>
-          <span @click="fullScreen" class="fullScreen" v-if="!isFullScreen"><i class="el-icon-full-screen"></i></span>
-          <span @click="exitFullScreen" class="fullScreen" v-if="isFullScreen"><i class="el-icon-full-screen"></i></span>
+          <!-- <span @click="fullScreen" class="fullScreen" v-if="!isFullScreen"><i class="el-icon-full-screen"></i></span> -->
+          <!-- <span @click="exitFullScreen" class="fullScreen" v-if="isFullScreen"><i class="el-icon-full-screen"></i></span> -->
           <!-- 播放时间显示 -->
           <!-- <div class="play-time-show">{{nowPlayTime}}</div> -->
           <!-- 返回实时按钮 -->
@@ -134,13 +134,13 @@ export default {
 	},
 	mounted() {
 		let that = this
-		window.addEventListener('resize', function () {
-				if (!that.isFullScreenFun()) {
-				 // 非全屏状态
-				 //业务逻辑
-						that.exitFullScreen()
-			 }
-		});
+		// window.addEventListener('resize', function () {
+		// 		if (!that.isFullScreenFun()) {
+		// 		 // 非全屏状态
+		// 		 //业务逻辑
+		// 				that.exitFullScreen()
+		// 	 }
+		// });
 		window.addEventListener('keydown', this.timeInputKeyCode)
 		this.timeRange = [moment().format('YYYY-MM-DD 00:00:00'), moment().format('YYYY-MM-DD 23:59:59')]
 		// this.markTime = [{
@@ -160,7 +160,7 @@ export default {
 		this.initDay()
 	},
 	beforeDestroy() {
-			window.removeEventListener("resize", this.isFullScreenFun, true);
+			// window.removeEventListener("resize", this.isFullScreenFun, true);
 			window.removeEventListener("keydown", this.timeInputKeyCode, true);
 		this.stopPlay()
 	},