Merge branch 'master' into dev/数据库统合

# Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/service/IDeviceChannelService.java # src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/control/cmd/DeviceControlQueryMessageHandler.java # src/main/java/com/genersoft/iot/vmp/streamProxy/service/impl/StreamProxyPlayServiceImpl.java # web_src/src/components/DeviceList.vue
2025-03-10 21:36:52 +08:00
parent 158fbaac9c b6a6144bf2
commit 33abdb1db6
50 changed files with 8656 additions and 479 deletions
--- a/web_src/src/components/ChannelEdit.vue
+++ b/web_src/src/components/ChannelEdit.vue
@@ -2,9 +2,7 @@
  <div id="ChannelEdit" v-loading="locading" style="width: 100%">
    <div class="page-header">
      <div class="page-title">
-        <el-button icon="el-icon-back" size="mini" style="font-size: 20px; color: #000;" type="text" @click="close" ></el-button>
-        <el-divider direction="vertical"></el-divider>
-        编辑通道
+        <el-page-header @back="close" content="编辑通道"></el-page-header>
      </div>
      <div class="page-header-btn">
        <div style="display: inline;">
--- a/web_src/src/components/CloudRecord.vue
+++ b/web_src/src/components/CloudRecord.vue
@@ -44,7 +44,7 @@
      </div>
    </div>
    <!--设备列表-->
-    <el-table size="medium"  :data="recordList" style="width: 100%" :height="winHeight">
+    <el-table size="medium"  :data="recordList" style="width: 100%" :height="$tableHeght">
      <el-table-column
        type="selection"
        width="55">
--- a/web_src/src/components/DeviceList.vue
+++ b/web_src/src/components/DeviceList.vue
@@ -22,7 +22,7 @@
      </div>
    </div>
    <!--设备列表-->
-    <el-table size="medium" :data="deviceList" style="width: 100%;font-size: 12px;" :height="winHeight" header-row-class-name="table-header">
+    <el-table size="medium" :data="deviceList" style="width: 100%;font-size: 12px;" :height="$tableHeght" header-row-class-name="table-header">
      <el-table-column prop="name" label="名称" min-width="160">
      </el-table-column>
      <el-table-column prop="deviceId" label="设备编号" min-width="160" >
@@ -143,7 +143,6 @@ export default {
      videoComponentList: [],
      updateLooper: 0, //数据刷新轮训标志
      currentDeviceChannelsLength: 0,
-      winHeight: window.innerHeight - 200,
      currentPage: 1,
      count: 15,
      total: 0,
--- a/web_src/src/components/PlatformEdit.vue
+++ b/web_src/src/components/PlatformEdit.vue
@@ -2,9 +2,7 @@
  <div id="PlatformEdit" style="width: 100%">
    <div class="page-header">
      <div class="page-title">
-        <el-button icon="el-icon-back" size="mini" style="font-size: 20px; color: #000;" type="text" @click="close" ></el-button>
-        <el-divider direction="vertical"></el-divider>
-        添加上级平台
+        <el-page-header @back="close" content="添加上级平台"></el-page-header>
      </div>
      <div class="page-header-btn">
        <div style="display: inline;">
--- a/web_src/src/components/PlatformList.vue
+++ b/web_src/src/components/PlatformList.vue
@@ -15,7 +15,7 @@
      </div>

      <!--设备列表-->
-      <el-table size="medium" :data="platformList" style="width: 100%" :height="winHeight" :loading="loading">
+      <el-table size="medium" :data="platformList" style="width: 100%" :height="$tableHeght" :loading="loading">
        <el-table-column prop="name" label="名称"></el-table-column>
        <el-table-column prop="serverGBId" label="平台编号" min-width="200"></el-table-column>
        <el-table-column label="是否启用" min-width="80">
@@ -115,7 +115,6 @@ export default {
      defaultPlatform: null,
      platform: null,
      pushChannelLoading: false,
-      winHeight: window.innerHeight - 260,
      searchSrt: "",
      currentPage: 1,
      count: 15,
--- a/web_src/src/components/RecordPLan.vue
+++ b/web_src/src/components/RecordPLan.vue
@@ -16,7 +16,7 @@
          </div>
        </div>
      </div>
-      <el-table size="medium" ref="recordPlanListTable" :data="recordPlanList" :height="winHeight" style="width: 100%"
+      <el-table size="medium" ref="recordPlanListTable" :data="recordPlanList" :height="$tableHeght" style="width: 100%"
                header-row-class-name="table-header" >
        <el-table-column type="selection" width="55" >
        </el-table-column>
@@ -67,7 +67,6 @@ export default {
    return {
      recordPlanList: [],
      searchSrt: "",
-      winHeight: window.innerHeight - 180,
      currentPage: 1,
      count: 15,
      total: 0,
--- a/web_src/src/components/StreamProxyEdit.vue
+++ b/web_src/src/components/StreamProxyEdit.vue
@@ -2,9 +2,7 @@
  <div id="StreamProxyEdit" style="width: 100%">
    <div class="page-header">
      <div class="page-title">
-        <el-button icon="el-icon-back" size="mini" style="font-size: 20px; color: #000;" type="text" @click="close" ></el-button>
-        <el-divider direction="vertical"></el-divider>
-        编辑拉流代理信息
+        <el-page-header @back="close" content="编辑拉流代理信息"></el-page-header>
      </div>
      <div class="page-header-btn">
        <div style="display: inline;">
--- a/web_src/src/components/StreamProxyList.vue
+++ b/web_src/src/components/StreamProxyList.vue
@@ -32,7 +32,7 @@
        </div>
      </div>
      <devicePlayer ref="devicePlayer"></devicePlayer>
-      <el-table size="medium"  :data="streamProxyList" style="width: 100%" :height="winHeight">
+      <el-table size="medium"  :data="streamProxyList" style="width: 100%" :height="$tableHeght" >
        <el-table-column prop="app" label="流应用名" min-width="120" show-overflow-tooltip/>
        <el-table-column prop="stream" label="流ID" min-width="120" show-overflow-tooltip/>
        <el-table-column label="流地址" min-width="250"  show-overflow-tooltip >
@@ -131,7 +131,6 @@
 				currentPusher: {}, //当前操作设备对象
 				updateLooper: 0, //数据刷新轮训标志
 				currentDeviceChannelsLenth:0,
-				winHeight: window.innerHeight - 250,
 				currentPage:1,
 				count:15,
 				total:0,
--- a/web_src/src/components/StreamPushEdit.vue
+++ b/web_src/src/components/StreamPushEdit.vue
@@ -2,9 +2,7 @@
  <div id="ChannelEdit" style="width: 100%">
    <div class="page-header">
      <div class="page-title">
-        <el-button icon="el-icon-back" size="mini" style="font-size: 20px; color: #000;" type="text" @click="close" ></el-button>
-        <el-divider direction="vertical"></el-divider>
-        编辑推流信息
+        <el-page-header @back="close" content="编辑推流信息"></el-page-header>
      </div>
      <div class="page-header-btn">
        <div style="display: inline;">
--- a/web_src/src/components/StreamPushList.vue
+++ b/web_src/src/components/StreamPushList.vue
@@ -40,7 +40,7 @@
          <el-button icon="el-icon-refresh-right" circle size="mini" @click="refresh()"></el-button>
        </div>
      </div>
-      <el-table size="medium"  ref="pushListTable" :data="pushList" style="width: 100%" :height="winHeight" :loading="loading"
+      <el-table size="medium"  ref="pushListTable" :data="pushList" style="width: 100%" :height="$tableHeght" :loading="loading"
                @selection-change="handleSelectionChange" :row-key="(row)=> row.app + row.stream">
        <el-table-column  type="selection" :reserve-selection="true" min-width="55">
        </el-table-column>
@@ -135,7 +135,6 @@ export default {
      currentPusher: {}, //当前操作设备对象
      updateLooper: 0, //数据刷新轮训标志
      currentDeviceChannelsLenth: 0,
-      winHeight: window.innerHeight - 250,
      mediaServerObj: new MediaServer(),
      currentPage: 1,
      count: 15,
--- a/web_src/src/components/UserManager.vue
+++ b/web_src/src/components/UserManager.vue
@@ -8,11 +8,10 @@
        <el-button icon="el-icon-plus" size="mini" style="margin-right: 1rem;" type="primary" @click="addUser">
          添加用户
        </el-button>
-
      </div>
    </div>
    <!--用户列表-->
-    <el-table size="medium"  :data="userList" style="width: 100%;font-size: 12px;" :height="winHeight"
+    <el-table size="medium"  :data="userList" style="width: 100%;font-size: 12px;" :height="$tableHeght"
              header-row-class-name="table-header">
      <el-table-column prop="username" label="用户名" min-width="160"/>
      <el-table-column prop="pushKey" label="pushkey" min-width="160"/>
@@ -69,7 +68,6 @@ export default {
      videoComponentList: [],
      updateLooper: 0, //数据刷新轮训标志
      currentUserLenth: 0,
-      winHeight: window.innerHeight - 200,
      currentPage: 1,
      count: 15,
      total: 0,
--- a/web_src/src/components/channelList.vue
+++ b/web_src/src/components/channelList.vue
@@ -1,175 +1,168 @@
 <template>
  <div id="channelList" style="width: 100%">
-    <div v-if="!editId" class="page-header">
-      <div class="page-title">
-        <el-button icon="el-icon-back" size="mini" style="font-size: 20px; color: #000;" type="text" @click="showDevice" ></el-button>
-        <el-divider direction="vertical"></el-divider>
-        通道列表
-      </div>
-      <div class="page-header-btn">
-        <div v-if="!showTree" style="display: inline;">
-          搜索:
-          <el-input @input="search" style="margin-right: 1rem; width: auto;" size="mini" placeholder="关键字"
-                    prefix-icon="el-icon-search" v-model="searchSrt" clearable></el-input>
-
-          通道类型:
-          <el-select size="mini" @change="search" style="width: 8rem; margin-right: 1rem;" v-model="channelType" placeholder="请选择"
-                     default-first-option>
-            <el-option label="全部" value=""></el-option>
-            <el-option label="设备" value="false"></el-option>
-            <el-option label="子目录" value="true"></el-option>
-          </el-select>
-          在线状态:
-          <el-select size="mini" style="width: 8rem; margin-right: 1rem;" @change="search" v-model="online" placeholder="请选择"
-                     default-first-option>
-            <el-option label="全部" value=""></el-option>
-            <el-option label="在线" value="true"></el-option>
-            <el-option label="离线" value="false"></el-option>
-          </el-select>
-          码流类型重置:
-          <el-select size="mini" style="width: 16rem; margin-right: 1rem;" @change="subStreamChange" v-model="subStream"
-                     placeholder="请选择码流类型" default-first-option >
-            <el-option label="stream:0(主码流)" value="stream:0"></el-option>
-            <el-option label="stream:1(子码流)" value="stream:1"></el-option>
-            <el-option label="streamnumber:0(主码流-2022)" value="streamnumber:0"></el-option>
-            <el-option label="streamnumber:1(子码流-2022)" value="streamnumber:1"></el-option>
-            <el-option label="streamprofile:0(主码流-大华)" value="streamprofile:0"></el-option>
-            <el-option label="streamprofile:1(子码流-大华)" value="streamprofile:1"></el-option>
-            <el-option label="streamMode:main(主码流-水星+TP-LINK)" value="streamMode:main"></el-option>
-            <el-option label="streamMode:sub(子码流-水星+TP-LINK)" value="streamMode:sub"></el-option>
-          </el-select>
+    <div v-if="!editId">
+      <div class="page-header">
+        <div class="page-title">
+          <el-page-header @back="showDevice" content="通道列表"></el-page-header>
        </div>
-        <el-button icon="el-icon-refresh-right" circle size="mini" @click="refresh()"></el-button>
-      </div>
-    </div>
-    <devicePlayer ref="devicePlayer"></devicePlayer>
-    <el-container v-if="!editId" v-loading="isLoging" style="height: 82vh;">
-      <el-aside width="auto" style="height: 82vh; background-color: #ffffff; overflow: auto" v-if="showTree">
-        <DeviceTree ref="deviceTree" :device="device" :onlyCatalog="true" :clickEvent="treeNodeClickEvent"></DeviceTree>
-      </el-aside>
-      <el-main style="padding: 5px;">
-        <el-table size="medium"  ref="channelListTable" :data="deviceChannelList" :height="winHeight" style="width: 100%"
-                  header-row-class-name="table-header">
-          <el-table-column prop="name" label="名称" min-width="180">
-          </el-table-column>
-          <el-table-column prop="deviceId" label="编号" min-width="180">
-          </el-table-column>
-          <el-table-column label="快照" min-width="100">
-            <template v-slot:default="scope">
-              <el-image
-                :src="getSnap(scope.row)"
-                :preview-src-list="getBigSnap(scope.row)"
-                @error="getSnapErrorEvent(scope.row.deviceId, scope.row.channelId)"
-                :fit="'contain'"
-                style="width: 60px">
-                <div slot="error" class="image-slot">
-                  <i class="el-icon-picture-outline"></i>
-                </div>
-              </el-image>
-            </template>
-          </el-table-column>
-<!--          <el-table-column prop="subCount" label="子节点数" min-width="100">-->
-<!--          </el-table-column>-->
-          <el-table-column prop="manufacturer" label="厂家" min-width="100">
-          </el-table-column>
-          <el-table-column label="位置信息" min-width="120">
-            <template v-slot:default="scope">
-              <span size="medium" v-if="scope.row.longitude && scope.row.latitude">{{scope.row.longitude}}<br/>{{scope.row.latitude}}</span>
-              <span size="medium" v-if="!scope.row.longitude || !scope.row.latitude">无</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="ptzType" label="云台类型" min-width="100">
-            <template v-slot:default="scope">
-              <div >{{ scope.row.ptzTypeText }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column label="开启音频" min-width="100">
-            <template v-slot:default="scope">
-              <el-switch @change="updateChannel(scope.row)" v-model="scope.row.hasAudio" active-color="#409EFF">
-              </el-switch>
-            </template>
-          </el-table-column>
-          <el-table-column label="码流类型" min-width="180">
-            <template v-slot:default="scope">
-              <el-select size="mini" style="margin-right: 1rem;" @change="channelSubStreamChange(scope.row)" v-model="scope.row.streamIdentification"
-                         placeholder="请选择码流类型" default-first-option >
-                <el-option label="stream:0(主码流)" value="stream:0"></el-option>
-                <el-option label="stream:1(子码流)" value="stream:1"></el-option>
-                <el-option label="streamnumber:0(主码流-2022)" value="streamnumber:0"></el-option>
-                <el-option label="streamnumber:1(子码流-2022)" value="streamnumber:1"></el-option>
-                <el-option label="streamprofile:0(主码流-大华)" value="streamprofile:0"></el-option>
-                <el-option label="streamprofile:1(子码流-大华)" value="streamprofile:1"></el-option>
-                <el-option label="streamMode:main(主码流-水星+TP-LINK)" value="streamMode:main"></el-option>
-                <el-option label="streamMode:sub(子码流-水星+TP-LINK)" value="streamMode:sub"></el-option>
-              </el-select>
-            </template>
-          </el-table-column>
-          <el-table-column label="状态" min-width="100">
-            <template v-slot:default="scope">
-              <div slot="reference" class="name-wrapper">
-                <el-tag size="medium" v-if="scope.row.status === 'ON'">在线</el-tag>
-                <el-tag size="medium" type="info" v-if="scope.row.status !== 'ON'">离线</el-tag>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" min-width="340" fixed="right">
-            <template v-slot:default="scope">
-              <el-button size="medium" v-bind:disabled="device == null || device.online === 0" icon="el-icon-video-play"
-                         type="text" @click="sendDevicePush(scope.row)">播放
-              </el-button>
-              <el-button size="medium" v-bind:disabled="device == null || device.online === 0"
-                         icon="el-icon-switch-button"
-                         type="text" style="color: #f56c6c" v-if="!!scope.row.streamId"
-                         @click="stopDevicePush(scope.row)">停止
-              </el-button>
-              <el-divider direction="vertical"></el-divider>
-              <el-button
-                size="medium"
-                type="text"
-                icon="el-icon-edit"
-                @click="handleEdit(scope.row)"
-              >
-                编辑
-              </el-button>
-              <el-divider direction="vertical"></el-divider>
-              <el-button size="medium" icon="el-icon-s-open" type="text"
-                         v-if="scope.row.subCount > 0 || scope.row.parental === 1 || scope.row.deviceId.length <= 8"
-                         @click="changeSubchannel(scope.row)">查看
-              </el-button>
-              <el-divider v-if="scope.row.subCount > 0 || scope.row.parental === 1 || scope.row.deviceId.length <= 8" direction="vertical"></el-divider>
-              <el-dropdown @command="(command)=>{moreClick(command, scope.row)}">
-                <el-button size="medium" type="text" >
-                  更多<i class="el-icon-arrow-down el-icon--right"></i>
-                </el-button>
-                <el-dropdown-menu>
-                  <el-dropdown-item command="records" v-bind:disabled="device == null || device.online === 0">
-                    设备录像</el-dropdown-item>
-                  <el-dropdown-item command="cloudRecords" v-bind:disabled="device == null || device.online === 0" >
-                    云端录像</el-dropdown-item>
-                  <el-dropdown-item command="record" v-bind:disabled="device == null || device.online === 0" >
-                    设备录像控制-开始</el-dropdown-item>
-                  <el-dropdown-item command="stopRecord" v-bind:disabled="device == null || device.online === 0" >
-                    设备录像控制-停止</el-dropdown-item>
-                </el-dropdown-menu>
+        <div class="page-header-btn">
+          <div v-if="!showTree" style="display: inline;">
+            搜索:
+            <el-input @input="search" style="margin-right: 1rem; width: auto;" size="mini" placeholder="关键字"
+                      prefix-icon="el-icon-search" v-model="searchSrt" clearable></el-input>

-              </el-dropdown>
-            </template>
-          </el-table-column>
-        </el-table>
-        <el-pagination
-          style="text-align: right"
-          @size-change="handleSizeChange"
-          @current-change="currentChange"
-          :current-page="currentPage"
-          :page-size="count"
-          :page-sizes="[15, 25, 35, 50]"
-          layout="total, sizes, prev, pager, next"
-          :total="total">
-        </el-pagination>
-      </el-main>
-    </el-container>
+            通道类型:
+            <el-select size="mini" @change="search" style="width: 8rem; margin-right: 1rem;" v-model="channelType" placeholder="请选择"
+                       default-first-option>
+              <el-option label="全部" value=""></el-option>
+              <el-option label="设备" value="false"></el-option>
+              <el-option label="子目录" value="true"></el-option>
+            </el-select>
+            在线状态:
+            <el-select size="mini" style="width: 8rem; margin-right: 1rem;" @change="search" v-model="online" placeholder="请选择"
+                       default-first-option>
+              <el-option label="全部" value=""></el-option>
+              <el-option label="在线" value="true"></el-option>
+              <el-option label="离线" value="false"></el-option>
+            </el-select>
+            码流类型重置:
+            <el-select size="mini" style="width: 16rem; margin-right: 1rem;" @change="subStreamChange" v-model="subStream"
+                       placeholder="请选择码流类型" default-first-option >
+              <el-option label="stream:0(主码流)" value="stream:0"></el-option>
+              <el-option label="stream:1(子码流)" value="stream:1"></el-option>
+              <el-option label="streamnumber:0(主码流-2022)" value="streamnumber:0"></el-option>
+              <el-option label="streamnumber:1(子码流-2022)" value="streamnumber:1"></el-option>
+              <el-option label="streamprofile:0(主码流-大华)" value="streamprofile:0"></el-option>
+              <el-option label="streamprofile:1(子码流-大华)" value="streamprofile:1"></el-option>
+              <el-option label="streamMode:main(主码流-水星+TP-LINK)" value="streamMode:main"></el-option>
+              <el-option label="streamMode:sub(子码流-水星+TP-LINK)" value="streamMode:sub"></el-option>
+            </el-select>
+          </div>
+          <el-button icon="el-icon-refresh-right" circle size="mini" @click="refresh()"></el-button>
+        </div>
+      </div>
+      <el-table size="medium"  ref="channelListTable" :data="deviceChannelList" :height="$tableHeght"
+                header-row-class-name="table-header">
+        <el-table-column prop="name" label="名称" min-width="180">
+        </el-table-column>
+        <el-table-column prop="deviceId" label="编号" min-width="180">
+        </el-table-column>
+        <el-table-column label="快照" min-width="100">
+          <template v-slot:default="scope">
+            <el-image
+              :src="getSnap(scope.row)"
+              :preview-src-list="getBigSnap(scope.row)"
+              @error="getSnapErrorEvent(scope.row.deviceId, scope.row.channelId)"
+              :fit="'contain'"
+              style="width: 60px">
+              <div slot="error" class="image-slot">
+                <i class="el-icon-picture-outline"></i>
+              </div>
+            </el-image>
+          </template>
+        </el-table-column>
+        <!--          <el-table-column prop="subCount" label="子节点数" min-width="100">-->
+        <!--          </el-table-column>-->
+        <el-table-column prop="manufacturer" label="厂家" min-width="100">
+        </el-table-column>
+        <el-table-column label="位置信息" min-width="120">
+          <template v-slot:default="scope">
+            <span size="medium" v-if="scope.row.longitude && scope.row.latitude">{{scope.row.longitude}}<br/>{{scope.row.latitude}}</span>
+            <span size="medium" v-if="!scope.row.longitude || !scope.row.latitude">无</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="ptzType" label="云台类型" min-width="100">
+          <template v-slot:default="scope">
+            <div >{{ scope.row.ptzTypeText }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="开启音频" min-width="100">
+          <template v-slot:default="scope">
+            <el-switch @change="updateChannel(scope.row)" v-model="scope.row.hasAudio" active-color="#409EFF">
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="码流类型" min-width="180">
+          <template v-slot:default="scope">
+            <el-select size="mini" style="margin-right: 1rem;" @change="channelSubStreamChange(scope.row)" v-model="scope.row.streamIdentification"
+                       placeholder="请选择码流类型" default-first-option >
+              <el-option label="stream:0(主码流)" value="stream:0"></el-option>
+              <el-option label="stream:1(子码流)" value="stream:1"></el-option>
+              <el-option label="streamnumber:0(主码流-2022)" value="streamnumber:0"></el-option>
+              <el-option label="streamnumber:1(子码流-2022)" value="streamnumber:1"></el-option>
+              <el-option label="streamprofile:0(主码流-大华)" value="streamprofile:0"></el-option>
+              <el-option label="streamprofile:1(子码流-大华)" value="streamprofile:1"></el-option>
+              <el-option label="streamMode:main(主码流-水星+TP-LINK)" value="streamMode:main"></el-option>
+              <el-option label="streamMode:sub(子码流-水星+TP-LINK)" value="streamMode:sub"></el-option>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" min-width="100">
+          <template v-slot:default="scope">
+            <div slot="reference" class="name-wrapper">
+              <el-tag size="medium" v-if="scope.row.status === 'ON'">在线</el-tag>
+              <el-tag size="medium" type="info" v-if="scope.row.status !== 'ON'">离线</el-tag>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" min-width="340" fixed="right">
+          <template v-slot:default="scope">
+            <el-button size="medium" v-bind:disabled="device == null || device.online === 0" icon="el-icon-video-play"
+                       type="text" @click="sendDevicePush(scope.row)">播放
+            </el-button>
+            <el-button size="medium" v-bind:disabled="device == null || device.online === 0"
+                       icon="el-icon-switch-button"
+                       type="text" style="color: #f56c6c" v-if="!!scope.row.streamId"
+                       @click="stopDevicePush(scope.row)">停止
+            </el-button>
+            <el-divider direction="vertical"></el-divider>
+            <el-button
+              size="medium"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleEdit(scope.row)"
+            >
+              编辑
+            </el-button>
+            <el-divider direction="vertical"></el-divider>
+            <el-button size="medium" icon="el-icon-s-open" type="text"
+                       v-if="scope.row.subCount > 0 || scope.row.parental === 1 || scope.row.deviceId.length <= 8"
+                       @click="changeSubchannel(scope.row)">查看
+            </el-button>
+            <el-divider v-if="scope.row.subCount > 0 || scope.row.parental === 1 || scope.row.deviceId.length <= 8" direction="vertical"></el-divider>
+            <el-dropdown @command="(command)=>{moreClick(command, scope.row)}">
+              <el-button size="medium" type="text" >
+                更多<i class="el-icon-arrow-down el-icon--right"></i>
+              </el-button>
+              <el-dropdown-menu>
+                <el-dropdown-item command="records" v-bind:disabled="device == null || device.online === 0">
+                  设备录像</el-dropdown-item>
+                <el-dropdown-item command="cloudRecords" v-bind:disabled="device == null || device.online === 0" >
+                  云端录像</el-dropdown-item>
+                <el-dropdown-item command="record" v-bind:disabled="device == null || device.online === 0" >
+                  设备录像控制-开始</el-dropdown-item>
+                <el-dropdown-item command="stopRecord" v-bind:disabled="device == null || device.online === 0" >
+                  设备录像控制-停止</el-dropdown-item>
+              </el-dropdown-menu>
+
+            </el-dropdown>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        style="text-align: right"
+        @size-change="handleSizeChange"
+        @current-change="currentChange"
+        :current-page="currentPage"
+        :page-size="count"
+        :page-sizes="[15, 25, 35, 50]"
+        layout="total, sizes, prev, pager, next"
+        :total="total">
+      </el-pagination>
+    </div>
+
+    <devicePlayer ref="devicePlayer"></devicePlayer>
    <channel-edit v-if="editId" :id="editId" :closeEdit="closeEdit"></channel-edit>
-    <!--设备列表-->

  </div>
 </template>
--- a/web_src/src/components/common/h265web.vue
+++ b/web_src/src/components/common/h265web.vue
@@ -1,31 +1,36 @@
 <template>
  <div ref="container" @dblclick="fullscreenSwich" style="width:100%;height:100%;background-color: #000000;margin:0 auto;">
+    <div id="glplayer" style="width: 100%; height: 100%; display: flex"></div>
    <div class="buttons-box" id="buttonsBox">
      <div class="buttons-box-left">
-        <i v-if="!playing" class="iconfont icon-play jessibuca-btn" @click="playBtnClick"></i>
-        <i v-if="playing" class="iconfont icon-pause jessibuca-btn" @click="pause"></i>
-        <i class="iconfont icon-stop jessibuca-btn" @click="destroy"></i>
-        <i v-if="isNotMute" class="iconfont icon-audio-high jessibuca-btn" @click="mute()"></i>
-        <i v-if="!isNotMute" class="iconfont icon-audio-mute jessibuca-btn" @click="cancelMute()"></i>
+        <i v-if="!playing" class="iconfont icon-play h265web-btn" @click="unPause"></i>
+        <i v-if="playing" class="iconfont icon-pause h265web-btn" @click="pause"></i>
+        <i class="iconfont icon-stop h265web-btn" @click="destroy"></i>
+        <i v-if="isNotMute" class="iconfont icon-audio-high h265web-btn" @click="mute()"></i>
+        <i v-if="!isNotMute" class="iconfont icon-audio-mute h265web-btn" @click="cancelMute()"></i>
      </div>
      <div class="buttons-box-right">
-        <span class="jessibuca-btn">{{ kBps }} kb/s</span>
-        <!--          <i class="iconfont icon-file-record1 jessibuca-btn"></i>-->
-        <!--          <i class="iconfont icon-xiangqing2 jessibuca-btn" ></i>-->
-        <i class="iconfont icon-camera1196054easyiconnet jessibuca-btn" @click="jessibuca.screenshot('截图','png',0.5)"
+        <!--          <i class="iconfont icon-file-record1 h265web-btn"></i>-->
+        <!--          <i class="iconfont icon-xiangqing2 h265web-btn" ></i>-->
+        <i class="iconfont icon-camera1196054easyiconnet h265web-btn" @click="screenshot"
           style="font-size: 1rem !important"></i>
-        <i class="iconfont icon-shuaxin11 jessibuca-btn" @click="playBtnClick"></i>
-        <i v-if="!fullscreen" class="iconfont icon-weibiaoti10 jessibuca-btn" @click="fullscreenSwich"></i>
-        <i v-if="fullscreen" class="iconfont icon-weibiaoti11 jessibuca-btn" @click="fullscreenSwich"></i>
+        <i class="iconfont icon-shuaxin11 h265web-btn" @click="playBtnClick"></i>
+        <i v-if="!fullscreen" class="iconfont icon-weibiaoti10 h265web-btn" @click="fullscreenSwich"></i>
+        <i v-if="fullscreen" class="iconfont icon-weibiaoti11 h265web-btn" @click="fullscreenSwich"></i>
      </div>
    </div>
  </div>
 </template>

 <script>
-let jessibucaPlayer = {};
+let h265webPlayer = {};
+/**
+ * 从github上复制的
+ * @see https://github.com/numberwolf/h265web.js/blob/master/example_normal/index.js
+ */
+const token = "base64:QXV0aG9yOmNoYW5neWFubG9uZ3xudW1iZXJ3b2xmLEdpdGh1YjpodHRwczovL2dpdGh1Yi5jb20vbnVtYmVyd29sZixFbWFpbDpwb3JzY2hlZ3QyM0Bmb3htYWlsLmNvbSxRUTo1MzEzNjU4NzIsSG9tZVBhZ2U6aHR0cDovL3h2aWRlby52aWRlbyxEaXNjb3JkOm51bWJlcndvbGYjODY5NCx3ZWNoYXI6bnVtYmVyd29sZjExLEJlaWppbmcsV29ya0luOkJhaWR1";
 export default {
-  name: 'jessibuca',
+  name: 'h265web',
  data() {
    return {
      playing: false,
@@ -34,7 +39,6 @@ export default {
      fullscreen: false,
      loaded: false, // mute
      speed: 0,
-      performance: "", // 工作情况
      kBps: 0,
      btnDom: null,
      videoInfo: null,
@@ -88,182 +92,94 @@ export default {
    create() {
      let options = {};
      console.log("hasAudio  " + this.hasAudio)
-
-      jessibucaPlayer[this._uid] = new window.Jessibuca(Object.assign(
+      h265webPlayer[this._uid] = new window.new265webjs(this.videoUrl, Object.assign(
        {
-          container: this.$refs.container,
-          videoBuffer: 0.2, // 最大缓冲时长，单位秒
-          isResize: true,
-          decoder: "static/js/jessibuca/decoder.js",
-          useMSE: false,
-          showBandwidth: false,
-          isFlv: true,
-          // text: "WVP-PRO",
-          // background: "static/images/zlm-logo.png",
-          loadingText: "加载中",
-          hasAudio: typeof (this.hasAudio) == "undefined" ? true : this.hasAudio,
-          debug: false,
-          supportDblclickFullscreen: false, // 是否支持屏幕的双击事件，触发全屏，取消全屏事件。
-          operateBtns: {
-            fullscreen: false,
-            screenshot: false,
-            play: false,
-            audio: false,
-            recorder: false,
-          },
-          record: "record",
-          vod: this.vod,
-          forceNoOffscreen: this.forceNoOffscreen,
-          isNotMute: this.isNotMute,
+          player: "glplayer", // 播放器容器id
+          width: 960,
+          height: 540,
+          token : token,
+          extInfo : {
+            coreProbePart : 0.4,
+            probeSize : 8192,
+            ignoreAudio : 0
+          }
        },
        options
      ));
-      let jessibuca = jessibucaPlayer[this._uid];
-      let _this = this;
-      jessibuca.on("load", function () {
-        console.log("on load init");
-      });
-
-      jessibuca.on("log", function (msg) {
-        console.log("on log", msg);
-      });
-      jessibuca.on("record", function (msg) {
-        console.log("on record:", msg);
-      });
-      jessibuca.on("pause", function () {
-        _this.playing = false;
-      });
-      jessibuca.on("play", function () {
-        _this.playing = true;
-      });
-      jessibuca.on("fullscreen", function (msg) {
-        console.log("on fullscreen", msg);
-        _this.fullscreen = msg
-      });
-
-      jessibuca.on("mute", function (msg) {
-        console.log("on mute", msg);
-        _this.isNotMute = !msg;
-      });
-      jessibuca.on("audioInfo", function (msg) {
-        // console.log("audioInfo", msg);
-      });
-
-      jessibuca.on("videoInfo", function (msg) {
-        // this.videoInfo = msg;
-        console.log("videoInfo", msg);
-
-      });
-
-      jessibuca.on("bps", function (bps) {
-        // console.log('bps', bps);
-
-      });
-      let _ts = 0;
-      jessibuca.on("timeUpdate", function (ts) {
-        // console.log('timeUpdate,old,new,timestamp', _ts, ts, ts - _ts);
-        _ts = ts;
-      });
-
-      jessibuca.on("videoInfo", function (info) {
-        console.log("videoInfo", info);
-      });
-
-      jessibuca.on("error", function (error) {
-        console.log("error", error);
-      });
-
-      jessibuca.on("timeout", function () {
-        console.log("timeout");
-      });
-
-      jessibuca.on('start', function () {
-        console.log('start');
-      })
-
-      jessibuca.on("performance", function (performance) {
-        let show = "卡顿";
-        if (performance === 2) {
-          show = "非常流畅";
-        } else if (performance === 1) {
-          show = "流畅";
-        }
-        _this.performance = show;
-      });
-      jessibuca.on('buffer', function (buffer) {
-        // console.log('buffer', buffer);
-      })
-
-      jessibuca.on('stats', function (stats) {
-        // console.log('stats', stats);
-      })
-
-      jessibuca.on('kBps', function (kBps) {
-        _this.kBps = Math.round(kBps);
-      });
-
-      // 显示时间戳 PTS
-      jessibuca.on('videoFrame', function () {
-
-      })
-
-      //
-      jessibuca.on('metadata', function () {
-
-      });
+      let h265web = h265webPlayer[this._uid];
+      h265web.onOpenFullScreen = () => {
+        this.fullscreen = true
+      }
+      h265web.onCloseFullScreen = () => {
+        this.fullscreen = false
+      }
+      h265web.onReadyShowDone = () => {
+        // 准备好显示了，尝试自动播放
+        const result = h265web.play()
+        this.playing = result;
+      }
+      h265web.onLoadFinish = () => {
+        this.loaded = true;
+        // 可以获取mediaInfo
+        // @see https://github.com/numberwolf/h265web.js/blob/8b26a31ffa419bd0a0f99fbd5111590e144e36a8/example_normal/index.js#L252C9-L263C11
+        // mediaInfo = playerObj.mediaInfo();
+      }
+      h265web.onPlayTime = (...args) => {
+        console.log(args)
+      }
+      h265web.do()
+    },
+    screenshot: function () {
+      if (h265webPlayer[this._uid]) {
+        h265webPlayer[this._uid].screenshot();
+      }
    },
    playBtnClick: function (event) {
      this.play(this.videoUrl)
    },
    play: function (url) {
      console.log(url)
-      if (jessibucaPlayer[this._uid]) {
+      if (h265webPlayer[this._uid]) {
        this.destroy();
      }
      this.create();
-      jessibucaPlayer[this._uid].on("play", () => {
-        this.playing = true;
-        this.loaded = true;
-        this.quieting = jessibuca.quieting;
-      });
-      if (jessibucaPlayer[this._uid].hasLoaded()) {
-        jessibucaPlayer[this._uid].play(url);
-      } else {
-        jessibucaPlayer[this._uid].on("load", () => {
-          console.log("load 播放")
-          jessibucaPlayer[this._uid].play(url);
-        });
+    },
+    unPause: function () {
+      if (h265webPlayer[this._uid]) {
+        h265webPlayer[this._uid].play();
      }
+      this.playing = h265webPlayer[this._uid].isPlaying();
+      this.err = "";
    },
    pause: function () {
-      if (jessibucaPlayer[this._uid]) {
-        jessibucaPlayer[this._uid].pause();
+      if (h265webPlayer[this._uid]) {
+        h265webPlayer[this._uid].pause();
      }
-      this.playing = false;
+      this.playing = h265webPlayer[this._uid].isPlaying();
      this.err = "";
-      this.performance = "";
    },
    mute: function () {
-      if (jessibucaPlayer[this._uid]) {
-        jessibucaPlayer[this._uid].mute();
+      if (h265webPlayer[this._uid]) {
+        h265webPlayer[this._uid].setVoice(0.0);
+        this.isNotMute = false;
      }
    },
    cancelMute: function () {
-      if (jessibucaPlayer[this._uid]) {
-        jessibucaPlayer[this._uid].cancelMute();
+      if (h265webPlayer[this._uid]) {
+        h265webPlayer[this._uid].setVoice(1.0);
+        this.isNotMute = true;
      }
    },
    destroy: function () {
-      if (jessibucaPlayer[this._uid]) {
-        jessibucaPlayer[this._uid].destroy();
+      if (h265webPlayer[this._uid]) {
+        h265webPlayer[this._uid].release();
      }
      if (document.getElementById("buttonsBox") == null) {
        this.$refs.container.appendChild(this.btnDom)
      }
-      jessibucaPlayer[this._uid] = null;
+      h265webPlayer[this._uid] = null;
      this.playing = false;
      this.err = "";
-      this.performance = "";

    },
    eventcallbacK: function (type, message) {
@@ -273,7 +189,11 @@ export default {
    },
    fullscreenSwich: function () {
      let isFull = this.isFullscreen()
-      jessibucaPlayer[this._uid].setFullscreen(!isFull)
+      if (isFull) {
+        h265webPlayer[this._uid].closeFullScreen()
+      } else {
+        h265webPlayer[this._uid].fullScreen()
+      }
      this.fullscreen = !isFull;
    },
    isFullscreen: function () {
@@ -284,12 +204,11 @@ export default {
    }
  },
  destroyed() {
-    if (jessibucaPlayer[this._uid]) {
-      jessibucaPlayer[this._uid].destroy();
+    if (h265webPlayer[this._uid]) {
+      h265webPlayer[this._uid].destroy();
    }
    this.playing = false;
    this.loaded = false;
-    this.performance = "";
  },
 }
 </script>
@@ -309,7 +228,7 @@ export default {
  z-index: 10;
 }

-.jessibuca-btn {
+.h265web-btn {
  width: 20px;
  color: rgb(255, 255, 255);
  line-height: 27px;
--- a/web_src/src/components/common/mediaInfo.vue
+++ b/web_src/src/components/common/mediaInfo.vue
@@ -33,11 +33,12 @@ export default {
  props: [ 'app', 'stream', 'mediaServerId'],
  components: {},
  created() {
-    this.getMediaInfo()
+    this.getMediaInfo();
  },
  data() {
    return {
-      info: {}
+      info: {},
+      task: null,
    };
  },
  methods: {
@@ -61,6 +62,16 @@ export default {
        console.log(error);
      });
    },
+    startTask: function () {
+     this.task = setInterval(this.getMediaInfo, 1000)
+    },
+    stopTask: function () {
+      if (this.task) {
+        window.clearInterval(this.task);
+        this.task = null;
+      }
+
+    },
    formatByteSpeed: function (){
      let bytesSpeed = this.info.bytesSpeed
      let num = 1024.0 //byte
--- a/web_src/src/components/dialog/devicePlayer.vue
+++ b/web_src/src/components/dialog/devicePlayer.vue
@@ -15,7 +15,11 @@
                        :videoUrl="videoUrl" :error="videoError" :message="videoError" height="100px"
                        :hasAudio="hasAudio" fluent autoplay live></rtc-player>
          </el-tab-pane>
-          <el-tab-pane label="h265web">h265web敬请期待</el-tab-pane>
+          <el-tab-pane label="h265web" name="h265web">
+            <h265web v-if="activePlayer === 'h265web'" ref="h265web"
+                    :videoUrl="videoUrl" :error="videoError" :message="videoError" height="100px"
+                    :hasAudio="hasAudio" fluent autoplay live></h265web>
+          </el-tab-pane>
        </el-tabs>
        <jessibucaPlayer v-if="Object.keys(this.player).length == 1 && this.player.jessibuca" ref="jessibuca"
                         :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError"
@@ -23,7 +27,9 @@
        <rtc-player v-if="Object.keys(this.player).length == 1 && this.player.webRTC" ref="jessibuca"
                    :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError"
                    height="100px" :hasAudio="hasAudio" fluent autoplay live></rtc-player>
-
+        <h265web v-if="Object.keys(this.player).length == 1 && this.player.h265web" ref="jessibuca"
+                    :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError"
+                    height="100px" :hasAudio="hasAudio" fluent autoplay live></h265web>
      </div>
      <div id="shared" style="text-align: right; margin-top: 1rem;">

@@ -231,14 +237,19 @@
              </div>
            </div>
          </el-tab-pane>
-          <el-tab-pane label="编码信息" name="codec" v-loading="tracksLoading">
-            <mediaInfo :app="app" :stream="streamId" :mediaServerId="mediaServerId"></mediaInfo>
+          <el-tab-pane label="编码信息" name="codec" >
+            <mediaInfo ref="mediaInfo" :app="app" :stream="streamId" :mediaServerId="mediaServerId"></mediaInfo>
          </el-tab-pane>
          <el-tab-pane label="语音对讲" name="broadcast">
            <div style="padding: 0 10px">
-              <el-switch v-model="broadcastMode" :disabled="broadcastStatus !== -1" active-color="#409EFF"
-                         active-text="喊话(Broadcast)"
-                         inactive-text="对讲(Talk)"></el-switch>
+<!--              <el-switch v-model="broadcastMode" :disabled="broadcastStatus !== -1" active-color="#409EFF"-->
+<!--                         active-text="喊话(Broadcast)"-->
+<!--                         inactive-text="对讲(Talk)"></el-switch>-->
+
+              <el-radio-group v-model="broadcastMode" :disabled="broadcastStatus !== -1">
+                <el-radio :label="true" >喊话(Broadcast)</el-radio>
+                <el-radio :label="false" >对讲(Talk)</el-radio>
+              </el-radio-group>
            </div>
            <div class="trank" style="text-align: center;">
              <el-button @click="broadcastStatusClick()" :type="getBroadcastStatus()" :disabled="broadcastStatus === -2"
@@ -270,11 +281,13 @@ import ptzScan from "../common/ptzScan.vue";
 import ptzWiper from "../common/ptzWiper.vue";
 import ptzSwitch from "../common/ptzSwitch.vue";
 import mediaInfo from "../common/mediaInfo.vue";
+import H265web from "../common/h265web.vue";

 export default {
  name: 'devicePlayer',
  props: {},
  components: {
+    H265web,
    PtzPreset,PtzCruising,ptzScan,ptzWiper,ptzSwitch,mediaInfo,
    LivePlayer, jessibucaPlayer, rtcPlayer,
  },
@@ -304,6 +317,7 @@ export default {
      player: {
        jessibuca: ["ws_flv", "wss_flv"],
        webRTC: ["rtc", "rtcs"],
+        h265web: ["ws_flv", "wss_flv"],
      },
      showVideoDialog: false,
      streamId: '',
@@ -329,10 +343,8 @@ export default {
      scanSpeed: 100,
      scanGroup: 0,
      tracks: [],
-      tracksLoading: false,
      showPtz: true,
      showRrecord: true,
-      tracksNotLoaded: false,
      sliderTime: 0,
      seekTime: 0,
      recordStartTime: 0,
@@ -346,28 +358,11 @@ export default {
  methods: {
    tabHandleClick: function (tab, event) {
      console.log(tab)
-      var that = this;
-      that.tracks = [];
-      that.tracksLoading = true;
-      that.tracksNotLoaded = false;
+      this.tracks = [];
      if (tab.name === "codec") {
-        this.$axios({
-          method: 'get',
-          url: '/zlm/' + this.mediaServerId + '/index/api/getMediaInfo?vhost=__defaultVhost__&schema=rtsp&app=' + this.app + '&stream=' + this.streamId
-        }).then(function (res) {
-          that.tracksLoading = false;
-          if (res.data.code == 0 && res.data.tracks) {
-            that.tracks = res.data.tracks;
-          } else {
-            that.tracksNotLoaded = true;
-            that.$message({
-              showClose: true,
-              message: '获取编码信息失败,',
-              type: 'warning'
-            });
-          }
-        }).catch(function (e) {
-        });
+        this.$refs.mediaInfo.startTask()
+      }else {
+        this.$refs.mediaInfo.stopTask()
      }
    },
    changePlayer: function (tab) {
@@ -430,27 +425,27 @@ export default {

    },

-        playFromStreamInfo: function (realHasAudio, streamInfo) {
-          this.showVideoDialog = true;
-          this.hasaudio = realHasAudio && this.hasaudio;
-          if (this.$refs[this.activePlayer]) {
-            this.$refs[this.activePlayer].play(this.getUrlByStreamInfo(streamInfo))
-          }else {
-            this.$nextTick(() => {
-              this.$refs[this.activePlayer].play(this.getUrlByStreamInfo(streamInfo))
-            });
-          }
-        },
-        close: function () {
-            console.log('关闭视频');
-            if (!!this.$refs[this.activePlayer]){
-              this.$refs[this.activePlayer].pause();
-            }
-            this.videoUrl = '';
-            this.coverPlaying = false;
-            this.showVideoDialog = false;
-            this.stopBroadcast()
-        },
+    playFromStreamInfo: function (realHasAudio, streamInfo) {
+      this.showVideoDialog = true;
+      this.hasaudio = realHasAudio && this.hasaudio;
+      if (this.$refs[this.activePlayer]) {
+        this.$refs[this.activePlayer].play(this.getUrlByStreamInfo(streamInfo))
+      }else {
+        this.$nextTick(() => {
+          this.$refs[this.activePlayer].play(this.getUrlByStreamInfo(streamInfo))
+        });
+      }
+    },
+    close: function () {
+        console.log('关闭视频');
+        if (!!this.$refs[this.activePlayer]){
+          this.$refs[this.activePlayer].pause();
+        }
+        this.videoUrl = '';
+        this.coverPlaying = false;
+        this.showVideoDialog = false;
+        this.stopBroadcast()
+    },

    copySharedInfo: function (data) {
      console.log('复制内容：' + data);
--- a/web_src/src/components/group.vue
+++ b/web_src/src/components/group.vue
@@ -5,7 +5,7 @@
        <GroupTree ref="groupTree" :show-header="true" :edit="true" :clickEvent="treeNodeClickEvent"
                   :onChannelChange="onChannelChange" :enableAddChannel="true" :addChannelToGroup="addChannelToGroup"></GroupTree>
      </el-aside>
-      <el-main style="padding: 5px;">
+      <el-main style="padding: 0 0 0 5px;">
        <div class="page-header">
          <div class="page-title">
            <el-breadcrumb separator="/" v-if="regionParents.length > 0">
@@ -46,7 +46,7 @@
            </div>
          </div>
        </div>
-        <el-table size="medium" ref="channelListTable" :data="channelList" :height="winHeight" style="width: 100%"
+        <el-table size="medium" ref="channelListTable" :data="channelList" :height="$tableHeght" style="width: 100%"
                  header-row-class-name="table-header" @selection-change="handleSelectionChange"
                  @row-dblclick="rowDblclick">
          <el-table-column type="selection" width="55" >
@@ -113,7 +113,6 @@ export default {
      channelType: "",
      online: "",
      hasGroup: "false",
-      winHeight: window.innerHeight - 180,
      currentPage: 1,
      count: 15,
      total: 0,
--- a/web_src/src/components/region.vue
+++ b/web_src/src/components/region.vue
@@ -5,7 +5,7 @@
        <RegionTree ref="regionTree" :showHeader=true :edit="true" :clickEvent="treeNodeClickEvent"
                    :onChannelChange="onChannelChange" :enableAddChannel="true" :addChannelToCivilCode="addChannelToCivilCode"></RegionTree>
      </el-aside>
-      <el-main style="padding: 5px;">
+      <el-main style="padding: 0 0 0 5px;">
        <div class="page-header">
          <div class="page-title">
            <el-breadcrumb separator="/" v-if="regionParents.length > 0">
@@ -45,7 +45,7 @@
            </div>
          </div>
        </div>
-        <el-table size="medium" ref="channelListTable" :data="channelList" :height="winHeight" style="width: 100%"
+        <el-table size="medium" ref="channelListTable" :data="channelList" :height="$tableHeght" style="width: 100%"
                  header-row-class-name="table-header" @selection-change="handleSelectionChange"
                  @row-dblclick="rowDblclick">
          <el-table-column type="selection" width="55">
@@ -109,7 +109,6 @@ export default {
      searchSrt: "",
      channelType: "",
      online: "",
-      winHeight: window.innerHeight - 180,
      currentPage: 1,
      count: 15,
      total: 0,