Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0

mk1990

2022-04-26 c88b0a8bd61546651c71734f299028acf692901b

 web_src/src/components/live.vue

@@ -1,36 +1,24 @@
<template>
  <div id="devicePosition" style="height: 100%;width: 100%">
    <el-container v-loading="loading" element-loading-text="拼命加载中">
  <div id="devicePosition" style="width:100vw; height: 91vh">
    <el-container v-loading="loading" style="height: 91vh;" element-loading-text="拼命加载中">
      <el-aside width="300px" style="background-color: #ffffff">
        <div style="text-align: center;padding-top: 20px;">设备列表</div>
        <el-menu  v-loading="loading">
          <el-submenu v-for="device in deviceList" :key="device.deviceId" :index="device.deviceId" @click="sendDevicePush(item)">
            <template slot="title" >
              <i class="el-icon-location-outline"></i>
              {{device.name}}
            </template>
            <ChannelTree :device="device" @sendDevicePush="sendDevicePush"></ChannelTree>
          </el-submenu>
        </el-menu>
        <DeviceTree :clickEvent="clickEvent" :contextMenuEvent="contextMenuEvent"></DeviceTree>
      </el-aside>
      <el-container>
        <!-- <LivePlay></LivePlay> -->
        <el-header height="40px" style="text-align: left;font-size: 17px;line-height: 40px;">
        <el-header height="5vh" style="text-align: left;font-size: 17px;line-height:5vh">
          分屏:
          <i class="el-icon-full-screen btn" :class="{active:spilt==1}" @click="spilt=1"/>
          <i class="el-icon-menu btn" :class="{active:spilt==4}" @click="spilt=4"/>
          <i class="el-icon-s-grid btn" :class="{active:spilt==9}" @click="spilt=9"/>
        </el-header>
        <el-main>
          <div style="width: 100%;height: calc( 100vh - 150px );display: flex;flex-wrap: wrap;background-color: #000;">
        <el-main style="padding: 0;">
          <div style="width: 99%;height: 85vh;display: flex;flex-wrap: wrap;background-color: #000;">
            <div v-for="i in spilt" :key="i" class="play-box"
                 :style="liveStyle" :class="{redborder:playerIdx == (i-1)}"
                 @click="playerIdx = (i-1)"
            >
              <div v-if="!videoUrl[i-1]" style="color: #ffffff;font-size: 30px;font-weight: bold;">{{i}}</div>
              <player v-else :ref="'player'+i" :videoUrl="videoUrl[i-1]"  fluent autoplay :height="true"
                      :containerId="'player'+i" @screenshot="shot" @destroy="destroy"></player>
              <!-- <player v-else ref="'player'+i" :idx="'player'+i" :visible.sync="showVideoDialog" :videoUrl="videoUrl[i-1]"  :height="true" :hasAudio="hasAudio" fluent autoplay live ></player> -->
              <player v-else :videoUrl="videoUrl[i-1]" fluent autoplay @screenshot="shot" @destroy="destroy"/>
            </div>
          </div>
        </el-main>
@@ -41,45 +29,29 @@

<script>
  import uiHeader from "../layout/UiHeader.vue";
  import player from './dialog/jessibuca.vue'
  import ChannelTree from './channelTree.vue'
import player from './common/jessibuca.vue'
import DeviceTree from './common/DeviceTree.vue'

  export default {
    name: "live",
    components: {
      uiHeader, player, ChannelTree
    uiHeader, player, DeviceTree
    },
    data() {
      return {
        showVideoDialog: true,
        hasAudio: false,
        videoUrl:[''],
        spilt:1,//分屏
        playerIdx:0,//激活播放器

        deviceList: [], //设备列表
        currentDevice: {}, //当前操作设备对象

        videoComponentList: [],
        updateLooper: 0, //数据刷新轮训标志
        currentDeviceChannelsLenth:0,
        winHeight: window.innerHeight - 200,
        currentPage:1,
        count:15,
        total:0,
        getDeviceListLoading: false,

        //channel
        searchSrt: "",
        channelType: "",
        online: "",
        channelTotal:0,
        deviceChannelList:[],
        loading:false
      };
    },
    mounted() {
      this.initData();

    },
    created(){
@@ -122,33 +94,17 @@
      clearTimeout(this.updateLooper);
    },
    methods: {
      initData: function () {
        this.getDeviceList();

      },
      destroy(idx) {
        console.log(idx);
        this.clear(idx.substring(idx.length-1))
      },
      getDeviceList: function() {
        let that = this;
        this.$axios({
          method: 'get',
          url:`/api/device/query/devices`,
          params: {
            page: that.currentPage,
            count: that.count
    clickEvent: function (data) {
      if (data.channelId && data.subCount == 0) {
        this.sendDevicePush(data)
          }
        }).then(function (res) {
          console.log(res.data.list);
          that.total = res.data.total;
    },
    contextMenuEvent: function (data) {

          that.deviceList = res.data.list.map(item=>{return {deviceChannelList:[],...item}});
          that.getDeviceListLoading = false;
        }).catch(function (error) {
          console.log(error);
          that.getDeviceListLoading = false;
        });
      },
      //通知设备上传媒体流
      sendDevicePush: function (itemData) {
@@ -196,13 +152,6 @@
          this.sendDevicePush({deviceId,channelId})
        }
      },
      convertImageToCanvas(image) {
        var canvas = document.createElement("canvas");
        canvas.width = image.width;
        canvas.height = image.height;
        canvas.getContext("2d").drawImage(image, 0, 0);
        return canvas;
      },
      shot(e){
        // console.log(e)
        // send({code:'image',data:e})
@@ -240,17 +189,6 @@
        console.log(data);
        window.localStorage.setItem('playData',JSON.stringify(data))
      },
      loadAndPlay(){
        let dataStr = window.localStorage.getItem('playData') || '[]'
        let data = JSON.parse(dataStr);

        data.forEach((item,i)=>{
          if(item){
            this.playerIdx = i
            this.sendDevicePush(item)
          }
        })
      }
    }
  };
</script>
@@ -259,16 +197,20 @@
    margin: 0 10px;

  }

  .btn:hover{
      color: #409EFF;
  }

  .btn.active{
    color: #409EFF;

  }

  .redborder{
    border: 2px solid red !important;
  }

  .play-box{
    background-color: #000000;
    border: 2px solid #505050;
@@ -346,6 +288,7 @@
  .baidumap > .BMap_cpyCtrl {
    display: none !important;
  }

  .baidumap > .anchorBL {
    display: none !important;
  }