Merge branch 'dev' of gitlab.suntrayoa.com:geqilin/zhxf_vue into dev

src/pages/ol/demo/query-detail.vue

@@ -77,19 +77,19 @@
       //-   <p class="leftP">线路站点&nbsp;:&nbsp;&nbsp;<span>{{dataForm.lineStation}} </span></p>
       //- </div>
       <div class="quDetailM">
-        <p class="leftP">资源点名称&nbsp;:&nbsp;&nbsp;{{dataForm.name}} 枪机</p>
+        <p class="leftP">资源点名称&nbsp;:&nbsp;&nbsp;{{dataForm.name}} </p>
       </div>
       <div class="quDetailM">
-        <p class="leftP">资源点类型&nbsp;:&nbsp;&nbsp;{{dataForm.typeName}} 枪机</p>
+        <p class="leftP">资源点类型&nbsp;:&nbsp;&nbsp;{{dataForm.typeName}} </p>
       </div>
       <div class="quDetailM">
-        <p class="leftP">资源点编码&nbsp;:&nbsp;&nbsp;{{dataForm.code}} QJ-0002</p>
+        <p class="leftP">资源点编码&nbsp;:&nbsp;&nbsp;{{dataForm.code}}</p>
       </div>
       <div class="quDetailM">
-        <p class="leftP">资源点状态&nbsp;:&nbsp;&nbsp;{{dataForm.status==1?'正常':'异常'}}</p>
+        <p class="leftP">资源点状态&nbsp;:&nbsp;&nbsp;{{dataForm.status==1?'在线':'离线'}}</p>
       </div>
       <div class="quDetailM">
-        <p class="leftP">部署位置&nbsp;:&nbsp;&nbsp;{{dataForm.deployLocation}} 场景一</p>
+        <p class="leftP">部署位置&nbsp;:&nbsp;&nbsp;{{dataForm.deployLocation}}</p>
       </div>
     </div>
   </div>
@@ -200,58 +200,56 @@ export default {
         if (data && data.code === 0) {
           this.dataForm = data.bean
           //如果当前设备摄像头为离线状态，则不加载画面
-					if (data.bean.byx2 == 0 && this.flvPlayer) {
-						//资源点状态(0=离线，1=在线)
-						this.flvPlayer.pause()
-						this.flvPlayer.unload()
-						this.flvPlayer.detachMediaElement()
-						this.flvPlayer.destroy()
-						this.flvPlayer = null
-						return
-					} else if (data.bean.byx2 == 0 && !this.flvPlayer) {
-						return
-					} else if (this.flvPlayer) {
-						this.flvPlayer.pause()
-						this.flvPlayer.unload()
-						this.flvPlayer.detachMediaElement()
-						this.flvPlayer.destroy()
-						this.flvPlayer = null
-					}
-					this.$http({
-						url: this.$http.adornUrlEq('/camera/camerasPlay'),
-						method: 'post',
-						data: {
-							id: data.bean.id,
-							stationId: data.bean.stationId,
-							userId: localStorage.getItem('userId'),
-							levelType: 1,
-							controlType: 3
-						}
-					}).then((data) => {
-						if (data && data.code === 0) {
-							this.videoSrc = data.url
-							//视频连接
-							this.flvPlayer = null
-							if (flvjs.isSupported()) {
-								this.flvPlayer = flvjs.createPlayer({
-									type: 'flv',
-									enableWorker: true, //浏览器端开启flv.js的worker,多进程运行flv.js
-									isLive: true, //直播模式
-									hasAudio: false, //关闭音频
-									hasVideo: true,
-									stashInitialSize: 128,
-									enableStashBuffer: false, //播放flv时，设置是否启用播放缓存，只在直播起作用。
-									url: this.videoSrc
-								})
-								this.$nextTick(function() {
-									this.flvPlayer.attachMediaElement(
-										this.$refs.video
-									)
-									this.flvPlayer.load()
-								})
-							}
-						}
-					})
+          // if (data.bean.byx2 == 0 && this.flvPlayer) {
+          //   //资源点状态(0=离线，1=在线)
+          //   this.flvPlayer.pause()
+          //   this.flvPlayer.unload()
+          //   this.flvPlayer.detachMediaElement()
+          //   this.flvPlayer.destroy()
+          //   this.flvPlayer = null
+          //   return
+          // } else if (data.bean.byx2 == 0 && !this.flvPlayer) {
+          //   return
+          // } else if (this.flvPlayer) {
+          //   this.flvPlayer.pause()
+          //   this.flvPlayer.unload()
+          //   this.flvPlayer.detachMediaElement()
+          //   this.flvPlayer.destroy()
+          //   this.flvPlayer = null
+          // }
+          // this.$http({
+          //   url: this.$http.adornUrlEq('/camera/camerasPlay'),
+          //   method: 'post',
+          //   data: {
+          //     id: data.bean.id,
+          //     stationId: data.bean.stationId,
+          //     userId: localStorage.getItem('userId'),
+          //     levelType: 1,
+          //     controlType: 3
+          //   }
+          // }).then((data) => {
+          //   if (data && data.code === 0) {
+          //     this.videoSrc = data.url
+          //     //视频连接
+          //     this.flvPlayer = null
+          //     if (flvjs.isSupported()) {
+          //       this.flvPlayer = flvjs.createPlayer({
+          //         type: 'flv',
+          //         enableWorker: true, //浏览器端开启flv.js的worker,多进程运行flv.js
+          //         isLive: true, //直播模式
+          //         hasAudio: false, //关闭音频
+          //         hasVideo: true,
+          //         stashInitialSize: 128,
+          //         enableStashBuffer: false, //播放flv时，设置是否启用播放缓存，只在直播起作用。
+          //         url: this.videoSrc
+          //       })
+          //       this.$nextTick(function() {
+          //         this.flvPlayer.attachMediaElement(this.$refs.video)
+          //         this.flvPlayer.load()
+          //       })
+          //     }
+          //   }
+          // })
         }
       })
     },
@@ -357,7 +355,8 @@ export default {
   font-weight: bold;
 }
 .info-video {
- padding: 10px; height: 160px;
+  padding: 10px;
+  height: 160px;
 }
 .info-form {
   padding: 10px;
@@ -369,8 +368,8 @@ export default {
   width: 100%;
 }
 .video {
-  width: 100%;height: 180px;
-
+  width: 100%;
+  height: 180px;
 }
 .animation {
   animation: myfirst 1s;