From 5fae9a7b34cc096d6becc514f3dd6e6fa6606451 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 15 六月 2022 10:40:45 +0800
Subject: [PATCH] 优化列表展示效果
---
web_src/src/components/DeviceList.vue | 41 ++++----
web_src/src/components/channelList.vue | 61 +++++-------
web_src/src/components/StreamProxyList.vue | 50 +++++----
web_src/src/components/ParentPlatformList.vue | 32 +++--
web_src/src/components/PushVideoList.vue | 51 +++++----
src/main/java/com/genersoft/iot/vmp/service/impl/GbStreamServiceImpl.java | 3
web_src/src/components/CloudRecord.vue | 16 +-
7 files changed, 127 insertions(+), 127 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/GbStreamServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/GbStreamServiceImpl.java
index a7a5528..c813b11 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/GbStreamServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/GbStreamServiceImpl.java
@@ -106,7 +106,8 @@
deviceChannel.setStatus(1);
deviceChannel.setParentId(catalogId ==null?gbStream.getCatalogId():catalogId);
deviceChannel.setRegisterWay(1);
- if (catalogId.length() <= 10) { // 鐖惰妭鐐规槸琛屾斂鍖哄垝,鍒欒缃瓹ivilCode浣跨敤姝よ鏀垮尯鍒�
+ if (catalogId.length() > 0 && catalogId.length() <= 10) {
+ // 鐖惰妭鐐规槸琛屾斂鍖哄垝,鍒欒缃瓹ivilCode浣跨敤姝よ鏀垮尯鍒�
deviceChannel.setCivilCode(catalogId);
}else {
deviceChannel.setCivilCode(platform.getAdministrativeDivision());
diff --git a/web_src/src/components/CloudRecord.vue b/web_src/src/components/CloudRecord.vue
index 1d0819b..897e142 100644
--- a/web_src/src/components/CloudRecord.vue
+++ b/web_src/src/components/CloudRecord.vue
@@ -18,19 +18,17 @@
<div v-if="!recordDetail">
<!--璁惧鍒楄〃-->
- <el-table :data="recordList" border style="width: 100%" :height="winHeight">
- <el-table-column prop="app" label="搴旂敤鍚�" align="center">
+ <el-table :data="recordList" style="width: 100%" :height="winHeight">
+ <el-table-column prop="app" label="搴旂敤鍚�" >
</el-table-column>
- <el-table-column prop="stream" label="娴両D" align="center">
+ <el-table-column prop="stream" label="娴両D" >
</el-table-column>
- <el-table-column prop="time" label="鏃堕棿" align="center">
+ <el-table-column prop="time" label="鏃堕棿" >
</el-table-column>
- <el-table-column label="鎿嶄綔" width="360" align="center" fixed="right">
+ <el-table-column label="鎿嶄綔" width="360" fixed="right">
<template slot-scope="scope">
- <el-button-group>
- <el-button size="mini" icon="el-icon-video-camera-solid" type="primary" @click="showRecordDetail(scope.row)">鏌ョ湅</el-button>
- <!-- <el-button size="mini" icon="el-icon-delete" type="danger" @click="deleteRecord(scope.row)">鍒犻櫎</el-button>-->
- </el-button-group>
+ <el-button size="medium" icon="el-icon-folder-opened" type="text" @click="showRecordDetail(scope.row)">鏌ョ湅</el-button>
+ <!-- <el-button size="mini" icon="el-icon-delete" type="danger" @click="deleteRecord(scope.row)">鍒犻櫎</el-button>-->
</template>
</el-table-column>
</el-table>
diff --git a/web_src/src/components/DeviceList.vue b/web_src/src/components/DeviceList.vue
index d268b8a..c974274 100644
--- a/web_src/src/components/DeviceList.vue
+++ b/web_src/src/components/DeviceList.vue
@@ -7,34 +7,33 @@
@click="getDeviceList()"></el-button>
</div>
</div>
- <!-- <devicePlayer ref="devicePlayer"></devicePlayer> -->
<!--璁惧鍒楄〃-->
<el-table :data="deviceList" style="width: 100%;font-size: 12px;" :height="winHeight" header-row-class-name="table-header">
- <el-table-column prop="name" label="鍚嶇О" >
+ <el-table-column prop="name" label="鍚嶇О" min-width="160">
</el-table-column>
- <el-table-column prop="deviceId" label="璁惧缂栧彿" width="180" >
+ <el-table-column prop="deviceId" label="璁惧缂栧彿" min-width="200" >
</el-table-column>
- <el-table-column label="鍦板潃" width="180" >
+ <el-table-column label="鍦板潃" min-width="160" >
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<el-tag size="medium">{{ scope.row.hostAddress }}</el-tag>
</div>
</template>
</el-table-column>
- <el-table-column prop="manufacturer" label="鍘傚" >
+ <el-table-column prop="manufacturer" label="鍘傚" min-width="120" >
</el-table-column>
- <el-table-column label="娴佷紶杈撴ā寮�" width="120">
+ <el-table-column label="娴佷紶杈撴ā寮�" min-width="160" >
<template slot-scope="scope">
- <el-select size="mini" @change="transportChange(scope.row)" v-model="scope.row.streamMode" placeholder="璇烽�夋嫨">
+ <el-select size="mini" @change="transportChange(scope.row)" v-model="scope.row.streamMode" placeholder="璇烽�夋嫨" style="width: 120px">
<el-option key="UDP" label="UDP" value="UDP"></el-option>
<el-option key="TCP-ACTIVE" label="TCP涓诲姩妯″紡" :disabled="true" value="TCP-ACTIVE"></el-option>
<el-option key="TCP-PASSIVE" label="TCP琚姩妯″紡" value="TCP-PASSIVE"></el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column prop="channelCount" label="閫氶亾鏁�" >
+ <el-table-column prop="channelCount" label="閫氶亾鏁�" min-width="120" >
</el-table-column>
- <el-table-column label="鐘舵��" width="120" >
+ <el-table-column label="鐘舵��" min-width="120">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<el-tag size="medium" v-if="scope.row.online == 1">鍦ㄧ嚎</el-tag>
@@ -42,32 +41,32 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="keepaliveTime" label="鏈�杩戝績璺�" width="140">
+ <el-table-column prop="keepaliveTime" label="鏈�杩戝績璺�" min-width="160" >
</el-table-column>
- <el-table-column prop="registerTime" label="鏈�杩戞敞鍐�" width="140">
+ <el-table-column prop="registerTime" label="鏈�杩戞敞鍐�" min-width="160">
</el-table-column>
- <el-table-column prop="updateTime" label="鏇存柊鏃堕棿" width="140">
- </el-table-column>
- <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" width="140">
- </el-table-column>
+<!-- <el-table-column prop="updateTime" label="鏇存柊鏃堕棿" width="140">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" width="140">-->
+<!-- </el-table-column>-->
- <el-table-column label="鎿嶄綔" width="450" fixed="right">
+ <el-table-column label="鎿嶄綔" min-width="450" fixed="right">
<template slot-scope="scope">
- <el-button type="text" size="mini" v-bind:disabled="scope.row.online==0" icon="el-icon-refresh" @click="refDevice(scope.row)"
+ <el-button type="text" size="medium" v-bind:disabled="scope.row.online==0" icon="el-icon-refresh" @click="refDevice(scope.row)"
@mouseover="getTooltipContent(scope.row.deviceId)">鍒锋柊
</el-button>
<el-divider direction="vertical"></el-divider>
- <el-button type="text" size="mini" icon="el-icon-video-camera-solid" v-bind:disabled="scope.row.online==0"
+ <el-button type="text" size="medium" icon="el-icon-video-camera-solid" v-bind:disabled="scope.row.online==0"
@click="showChannelList(scope.row)">閫氶亾
</el-button>
<el-divider direction="vertical"></el-divider>
- <el-button size="mini" icon="el-icon-location" v-bind:disabled="scope.row.online==0" type="text"
+ <el-button size="medium" icon="el-icon-location" v-bind:disabled="scope.row.online==0" type="text"
@click="showDevicePosition(scope.row)">瀹氫綅
</el-button>
<el-divider direction="vertical"></el-divider>
- <el-button size="mini" icon="el-icon-edit" type="text" @click="edit(scope.row)">缂栬緫</el-button>
+ <el-button size="medium" icon="el-icon-edit" type="text" @click="edit(scope.row)">缂栬緫</el-button>
<el-divider direction="vertical"></el-divider>
- <el-button size="mini" icon="el-icon-delete" type="text" @click="deleteDevice(scope.row)" style="color: #f56c6c">鍒犻櫎</el-button>
+ <el-button size="medium" icon="el-icon-delete" type="text" @click="deleteDevice(scope.row)" style="color: #f56c6c">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
diff --git a/web_src/src/components/ParentPlatformList.vue b/web_src/src/components/ParentPlatformList.vue
index 20a3e82..3ae0b65 100644
--- a/web_src/src/components/ParentPlatformList.vue
+++ b/web_src/src/components/ParentPlatformList.vue
@@ -4,14 +4,15 @@
<div class="page-title">涓婄骇骞冲彴鍒楄〃</div>
<div class="page-header-btn">
<el-button icon="el-icon-plus" size="mini" style="margin-right: 1rem;" type="primary" @click="addParentPlatform">娣诲姞</el-button>
+ <el-button icon="el-icon-refresh-right" circle size="mini" @click="refresh()"></el-button>
</div>
</div>
<!--璁惧鍒楄〃-->
- <el-table :data="platformList" border style="width: 100%" :height="winHeight">
- <el-table-column prop="name" label="鍚嶇О" align="center"></el-table-column>
- <el-table-column prop="serverGBId" label="骞冲彴缂栧彿" align="center"></el-table-column>
- <el-table-column label="鏄惁鍚敤" width="120" align="center">
+ <el-table :data="platformList" style="width: 100%" :height="winHeight">
+ <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" >
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<el-tag size="medium" v-if="scope.row.enable">宸插惎鐢�</el-tag>
@@ -19,7 +20,7 @@
</div>
</template>
</el-table-column>
- <el-table-column label="鐘舵��" width="120" align="center">
+ <el-table-column label="鐘舵��" min-width="80" >
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<el-tag size="medium" v-if="scope.row.status">鍦ㄧ嚎</el-tag>
@@ -27,17 +28,17 @@
</div>
</template>
</el-table-column>
- <el-table-column label="鍦板潃" width="180" align="center">
+ <el-table-column label="鍦板潃" min-width="160" >
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<el-tag size="medium">{{ scope.row.serverIP}}:{{scope.row.serverPort }}</el-tag>
</div>
</template>
</el-table-column>
- <el-table-column prop="deviceGBId" label="璁惧鍥芥爣缂栧彿" width="200" align="center"></el-table-column>
- <el-table-column prop="transport" label="淇′护浼犺緭妯″紡" width="120" align="center"></el-table-column>
- <el-table-column prop="channelCount" label="閫氶亾鏁�" width="120" align="center"></el-table-column>
- <el-table-column label="璁㈤槄淇℃伅" width="240" align="center" fixed="right">
+ <el-table-column prop="deviceGBId" label="璁惧鍥芥爣缂栧彿" min-width="200" ></el-table-column>
+ <el-table-column prop="transport" label="淇′护浼犺緭妯″紡" min-width="120" ></el-table-column>
+ <el-table-column prop="channelCount" label="閫氶亾鏁�" min-width="120" ></el-table-column>
+ <el-table-column label="璁㈤槄淇℃伅" min-width="120" fixed="right">
<template slot-scope="scope">
<i v-if="scope.row.alarmSubscribe" style="font-size: 20px" title="鎶ヨ璁㈤槄" class="iconfont icon-gbaojings subscribe-on " ></i>
<i v-if="!scope.row.alarmSubscribe" style="font-size: 20px" title="鎶ヨ璁㈤槄" class="iconfont icon-gbaojings subscribe-off " ></i>
@@ -48,11 +49,11 @@
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" width="300" align="center" fixed="right">
+ <el-table-column label="鎿嶄綔" min-width="240" fixed="right">
<template slot-scope="scope">
- <el-button size="mini" icon="el-icon-edit" @click="editPlatform(scope.row)">缂栬緫</el-button>
- <el-button size="mini" icon="el-icon-share" type="primary" @click="chooseChannel(scope.row)">閫夋嫨閫氶亾</el-button>
- <el-button size="mini" icon="el-icon-delete" type="danger" @click="deletePlatform(scope.row)">鍒犻櫎</el-button>
+ <el-button size="medium" icon="el-icon-edit" type="text" @click="editPlatform(scope.row)">缂栬緫</el-button>
+ <el-button size="medium" icon="el-icon-share" type="text" @click="chooseChannel(scope.row)">閫夋嫨閫氶亾</el-button>
+ <el-button size="medium" icon="el-icon-delete" type="text" style="color: #f56c6c" @click="deletePlatform(scope.row)">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -168,6 +169,9 @@
console.log(error);
});
+ },
+ refresh: function (){
+ this.initData();
}
}
diff --git a/web_src/src/components/PushVideoList.vue b/web_src/src/components/PushVideoList.vue
index 7b5a406..678d13f 100644
--- a/web_src/src/components/PushVideoList.vue
+++ b/web_src/src/components/PushVideoList.vue
@@ -34,52 +34,54 @@
<el-button icon="el-icon-delete" size="mini" style="margin-right: 1rem;"
:disabled="multipleSelection.length === 0" type="danger" @click="batchDel">鎵归噺绉婚櫎
</el-button>
+ <el-button icon="el-icon-refresh-right" circle size="mini" @click="refresh()"></el-button>
</div>
</div>
<devicePlayer ref="devicePlayer"></devicePlayer>
<addStreamTOGB ref="addStreamTOGB"></addStreamTOGB>
- <el-table ref="pushListTable" :data="pushList" border style="width: 100%" :height="winHeight"
+ <el-table ref="pushListTable" :data="pushList" style="width: 100%" :height="winHeight"
@selection-change="handleSelectionChange" :row-key="(row)=> row.app + row.stream">
- <el-table-column align="center" type="selection" :reserve-selection="true" width="55">
+ <el-table-column type="selection" :reserve-selection="true" min-width="55">
</el-table-column>
- <el-table-column prop="name" label="鍚嶇О" align="center">
+ <el-table-column prop="name" label="鍚嶇О" min-width="200">
</el-table-column>
- <el-table-column prop="app" label="APP" align="center">
+ <el-table-column prop="app" label="APP" min-width="200">
</el-table-column>
- <el-table-column prop="stream" label="娴両D" align="center">
+ <el-table-column prop="stream" label="娴両D" min-width="200">
</el-table-column>
- <el-table-column prop="gbId" label="鍥芥爣缂栫爜" width="200" align="center">
+ <el-table-column prop="gbId" label="鍥芥爣缂栫爜" min-width="200" >
</el-table-column>
- <el-table-column prop="mediaServerId" label="娴佸獟浣�" width="200" align="center">
+ <el-table-column prop="mediaServerId" label="娴佸獟浣�" min-width="200" >
</el-table-column>
- <el-table-column label="寮�濮嬫椂闂�" align="center" width="200">
+ <el-table-column label="寮�濮嬫椂闂�" min-width="200">
<template slot-scope="scope">
<el-button-group>
{{ dateFormat(parseInt(scope.row.createStamp)) }}
</el-button-group>
</template>
</el-table-column>
- <el-table-column label="姝ｅ湪鎺ㄦ祦" align="center" width="100">
+ <el-table-column label="姝ｅ湪鎺ㄦ祦" min-width="100">
<template slot-scope="scope">
{{ (scope.row.status == false && scope.row.gbId == null) || scope.row.status ? '鏄�' : '鍚�' }}
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" width="360" align="center" fixed="right">
+ <el-table-column label="鎿嶄綔" min-width="360" fixed="right">
<template slot-scope="scope">
- <el-button-group>
- <el-button size="mini" icon="el-icon-video-play"
- v-if="(scope.row.status == false && scope.row.gbId == null) || scope.row.status"
- @click="playPush(scope.row)">鎾斁
- </el-button>
- <el-button size="mini" icon="el-icon-delete" type="danger" @click="stopPush(scope.row)">绉婚櫎</el-button>
- <el-button size="mini" icon="el-icon-position" type="primary" v-if="!!!scope.row.gbId"
- @click="addToGB(scope.row)">鍔犲叆鍥芥爣
- </el-button>
- <el-button size="mini" icon="el-icon-position" type="primary" v-if="!!scope.row.gbId"
- @click="removeFromGB(scope.row)">绉诲嚭鍥芥爣
- </el-button>
- </el-button-group>
+ <el-button size="medium" icon="el-icon-video-play"
+ v-if="(scope.row.status == false && scope.row.gbId == null) || scope.row.status"
+ @click="playPush(scope.row)" type="text">鎾斁
+ </el-button>
+ <el-divider direction="vertical"></el-divider>
+ <el-button size="medium" icon="el-icon-delete" type="text" @click="stopPush(scope.row)" style="color: #f56c6c" >绉婚櫎</el-button>
+ <el-divider direction="vertical"></el-divider>
+ <el-button size="medium" icon="el-icon-position" type="text" v-if="!!!scope.row.gbId"
+ @click="addToGB(scope.row)">鍔犲叆鍥芥爣
+ </el-button>
+ <el-divider v-if="!!!scope.row.gbId" direction="vertical"></el-divider>
+ <el-button size="medium" icon="el-icon-position" type="text" v-if="!!scope.row.gbId"
+ @click="removeFromGB(scope.row)">绉诲嚭鍥芥爣
+ </el-button>
</template>
</el-table-column>
</el-table>
@@ -284,6 +286,9 @@
handleSelectionChange: function (val) {
this.multipleSelection = val;
},
+ refresh: function () {
+ this.initData();
+ },
}
};
</script>
diff --git a/web_src/src/components/StreamProxyList.vue b/web_src/src/components/StreamProxyList.vue
index d553392..9f7ed61 100644
--- a/web_src/src/components/StreamProxyList.vue
+++ b/web_src/src/components/StreamProxyList.vue
@@ -5,14 +5,15 @@
<div class="page-header-btn">
<el-button icon="el-icon-plus" size="mini" style="margin-right: 1rem;" type="primary" @click="addStreamProxy">娣诲姞浠ｇ悊</el-button>
<el-button v-if="false" icon="el-icon-search" size="mini" style="margin-right: 1rem;" type="primary" @click="addOnvif">鎼滅储ONVIF</el-button>
+ <el-button icon="el-icon-refresh-right" circle size="mini" @click="refresh()"></el-button>
</div>
</div>
<devicePlayer ref="devicePlayer"></devicePlayer>
- <el-table :data="streamProxyList" border style="width: 100%" :height="winHeight">
- <el-table-column prop="name" label="鍚嶇О" align="center" show-overflow-tooltip/>
- <el-table-column prop="app" label="娴佸簲鐢ㄥ悕" align="center" show-overflow-tooltip/>
- <el-table-column prop="stream" label="娴両D" align="center" show-overflow-tooltip/>
- <el-table-column label="娴佸湴鍧�" width="400" align="center" show-overflow-tooltip >
+ <el-table :data="streamProxyList" style="width: 100%" :height="winHeight">
+ <el-table-column prop="name" label="鍚嶇О" min-width="120" show-overflow-tooltip/>
+ <el-table-column prop="app" label="娴佸簲鐢ㄥ悕" min-width="120" show-overflow-tooltip/>
+ <el-table-column prop="stream" label="娴両D" min-width="120" show-overflow-tooltip/>
+ <el-table-column label="娴佸湴鍧�" min-width="400" show-overflow-tooltip >
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
@@ -27,8 +28,8 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="mediaServerId" label="娴佸獟浣�" width="150" align="center"></el-table-column>
- <el-table-column label="绫诲瀷" width="100" align="center">
+ <el-table-column prop="mediaServerId" label="娴佸獟浣�" min-width="180" ></el-table-column>
+ <el-table-column label="绫诲瀷" width="100" >
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<el-tag size="medium">{{scope.row.type}}</el-tag>
@@ -36,8 +37,8 @@
</template>
</el-table-column>
- <el-table-column prop="gbId" label="鍥芥爣缂栫爜" width="180" align="center" show-overflow-tooltip/>
- <el-table-column label="鐘舵��" width="120" align="center">
+ <el-table-column prop="gbId" label="鍥芥爣缂栫爜" min-width="180" show-overflow-tooltip/>
+ <el-table-column label="鐘舵��" min-width="120" >
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<el-tag size="medium" v-if="scope.row.status">鍦ㄧ嚎</el-tag>
@@ -45,7 +46,7 @@
</div>
</template>
</el-table-column>
- <el-table-column label="鍚敤" width="120" align="center">
+ <el-table-column label="鍚敤" min-width="120" >
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<el-tag size="medium" v-if="scope.row.enable">宸插惎鐢�</el-tag>
@@ -53,8 +54,8 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" align="center" width="150" show-overflow-tooltip/>
- <el-table-column label="杞琀LS" width="120" align="center">
+ <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" min-width="150" show-overflow-tooltip/>
+ <el-table-column label="杞琀LS" min-width="120" >
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<el-tag size="medium" v-if="scope.row.enable_hls">宸插惎鐢�</el-tag>
@@ -62,7 +63,7 @@
</div>
</template>
</el-table-column>
- <el-table-column label="MP4褰曞埗" width="120" align="center">
+ <el-table-column label="MP4褰曞埗" min-width="120" >
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<el-tag size="medium" v-if="scope.row.enable_mp4">宸插惎鐢�</el-tag>
@@ -70,7 +71,7 @@
</div>
</template>
</el-table-column>
- <el-table-column label="鏃犱汉瑙傜湅鑷姩鍒犻櫎" width="160" align="center">
+ <el-table-column label="鏃犱汉瑙傜湅鑷姩鍒犻櫎" min-width="160" >
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<el-tag size="medium" v-if="scope.row.enable_remove_none_reader">宸插惎鐢�</el-tag>
@@ -80,14 +81,15 @@
</el-table-column>
- <el-table-column label="鎿嶄綔" width="360" align="center" fixed="right">
+ <el-table-column label="鎿嶄綔" width="360" fixed="right">
<template slot-scope="scope">
- <el-button-group>
- <el-button size="mini" icon="el-icon-video-play" v-if="scope.row.enable" @click="play(scope.row)">鎾斁</el-button>
- <el-button size="mini" icon="el-icon-close" type="success" v-if="scope.row.enable" @click="stop(scope.row)">鍋滅敤</el-button>
- <el-button size="mini" icon="el-icon-check" type="primary" :loading="startBtnLaoding" v-if="!scope.row.enable" @click="start(scope.row)">鍚敤</el-button>
- <el-button size="mini" icon="el-icon-delete" type="danger" @click="deleteStreamProxy(scope.row)">鍒犻櫎</el-button>
- </el-button-group>
+ <el-button size="medium" icon="el-icon-video-play" type="text" v-if="scope.row.enable" @click="play(scope.row)">鎾斁</el-button>
+ <el-divider direction="vertical"></el-divider>
+ <el-button size="medium" icon="el-icon-switch-button" type="text" v-if="scope.row.enable" @click="stop(scope.row)">鍋滅敤</el-button>
+ <el-divider direction="vertical"></el-divider>
+ <el-button size="medium" icon="el-icon-check" type="text" :loading="startBtnLaoding" v-if="!scope.row.enable" @click="start(scope.row)">鍚敤</el-button>
+ <el-divider v-if="!scope.row.enable" direction="vertical"></el-divider>
+ <el-button size="medium" icon="el-icon-delete" type="text" style="color: #f56c6c" @click="deleteStreamProxy(scope.row)">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -305,8 +307,10 @@
console.log(error);
that.getListLoading = false;
});
- }
-
+ },
+ refresh: function (){
+ this.initData();
+ }
}
};
</script>
diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue
index f0888c1..7828678 100644
--- a/web_src/src/components/channelList.vue
+++ b/web_src/src/components/channelList.vue
@@ -2,10 +2,8 @@
<div id="channelList" style="width: 100%">
<div class="page-header">
<div class="page-title">
- <el-button icon="el-icon-arrow-left" size="mini" style="margin-right: 1rem;" type="primary" @click="showDevice">
- 杩斿洖
- </el-button>
- 閫氶亾鍒楄〃({{ parentChannelId == 0 ? deviceId : parentChannelId }})</div>
+ <el-button icon="el-icon-back" size="mini" style="font-size: 20px; color: #000;" type="text" @click="showDevice" ></el-button>
+ 閫氶亾鍒楄〃</div>
<div class="page-header-btn">
鎼滅储:
<el-input @input="search" style="margin-right: 1rem; width: auto;" size="mini" placeholder="鍏抽敭瀛�"
@@ -25,73 +23,73 @@
<el-option label="鍦ㄧ嚎" value="true"></el-option>
<el-option label="绂荤嚎" value="false"></el-option>
</el-select>
- <el-checkbox size="mini" v-model="autoList" @change="autoListChange">
- 鑷姩鍒锋柊
- </el-checkbox>
+ <el-button icon="el-icon-refresh-right" circle size="mini" @click="refresh()"></el-button>
</div>
</div>
<devicePlayer ref="devicePlayer" v-loading="isLoging"></devicePlayer>
<!--璁惧鍒楄〃-->
<el-table ref="channelListTable" :data="deviceChannelList" :height="winHeight" style="width: 100%" header-row-class-name="table-header">
- <el-table-column prop="channelId" label="閫氶亾缂栧彿" width="200">
+ <el-table-column prop="channelId" label="閫氶亾缂栧彿" min-width="200">
</el-table-column>
- <el-table-column prop="name" label="閫氶亾鍚嶇О" >
+ <el-table-column prop="deviceId" label="璁惧缂栧彿" min-width="200">
</el-table-column>
- <el-table-column label="蹇収" width="80">
+ <el-table-column prop="name" label="閫氶亾鍚嶇О" min-width="200">
+ </el-table-column>
+ <el-table-column label="蹇収" min-width="120">
<template slot-scope="scope">
<el-image
:src="getSnap(scope.row)"
:preview-src-list="getBigSnap(scope.row)"
@error="getSnapErrorEvent(scope.row.deviceId, cope.row.channelId)"
- :fit="'contain'">
+ :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="瀛愯妭鐐规暟" width="120">
+ <el-table-column prop="subCount" label="瀛愯妭鐐规暟" min-width="120">
</el-table-column>
- <el-table-column prop="manufacture" label="鍘傚" width="120">
+ <el-table-column prop="manufacture" label="鍘傚" min-width="120">
</el-table-column>
- <el-table-column label="浣嶇疆淇℃伅" width="180">
+ <el-table-column label="浣嶇疆淇℃伅" min-width="200">
<template slot-scope="scope">
<span v-if="scope.row.longitude*scope.row.latitude > 0">{{ scope.row.longitude }},<br>{{ scope.row.latitude }}</span>
<span v-if="scope.row.longitude*scope.row.latitude === 0">鏃�</span>
</template>
</el-table-column>
- <el-table-column prop="ptztypeText" label="浜戝彴绫诲瀷" width="120" />
- <el-table-column label="寮�鍚煶棰�" >
+ <el-table-column prop="ptztypeText" label="浜戝彴绫诲瀷" min-width="120"/>
+ <el-table-column label="寮�鍚煶棰�" min-width="120">
<template slot-scope="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="鐘舵��" width="240" >
+ <el-table-column label="鐘舵��" min-width="120">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
- <el-tag size="medium" v-if="scope.row.status == 1">寮�鍚�</el-tag>
- <el-tag size="medium" type="info" v-if="scope.row.status == 0">鍏抽棴</el-tag>
+ <el-tag size="medium" v-if="scope.row.status == 1">鍦ㄧ嚎</el-tag>
+ <el-tag size="medium" type="info" v-if="scope.row.status == 0">绂荤嚎</el-tag>
</div>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" width="280" fixed="right">
+ <el-table-column label="鎿嶄綔" min-width="280" fixed="right">
<template slot-scope="scope">
<!-- <el-button size="mini" icon="el-icon-video-play" v-if="scope.row.parental == 0" @click="sendDevicePush(scope.row)">鎾斁</el-button> -->
- <el-button size="mini" icon="el-icon-video-play" type="text" @click="sendDevicePush(scope.row)">鎾斁</el-button>
- <el-button size="mini" icon="el-icon-switch-button" type="text" style="color: #f56c6c" v-if="!!scope.row.streamId"
+ <el-button size="medium" icon="el-icon-video-play" type="text" @click="sendDevicePush(scope.row)">鎾斁</el-button>
+ <el-button size="medium" 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="mini" icon="el-icon-s-open" type="text" v-if="scope.row.subCount > 0 || scope.row.parental === 1"
+ <el-button size="medium" icon="el-icon-s-open" type="text" v-if="scope.row.subCount > 0 || scope.row.parental === 1"
@click="changeSubchannel(scope.row)">鏌ョ湅
</el-button>
<el-divider v-if="scope.row.subCount > 0 || scope.row.parental === 1" direction="vertical"></el-divider>
- <el-button size="mini" icon="el-icon-video-camera" type="text" @click="queryRecords(scope.row)">璁惧褰曞儚
+ <el-button size="medium" icon="el-icon-video-camera" type="text" @click="queryRecords(scope.row)">璁惧褰曞儚
</el-button>
- <!-- <el-button size="mini" @click="sendDevicePush(scope.row)">褰曞儚鏌ヨ</el-button> -->
</template>
</el-table-column>
</el-table>
@@ -130,17 +128,12 @@
total: 0,
beforeUrl: "/deviceList",
isLoging: false,
- autoList: true,
loadSnap: {}
};
},
mounted() {
this.initData();
- if (this.autoList) {
- this.updateLooper = setInterval(this.initData, 5000);
- }
-
},
destroyed() {
this.$destroy('videojs');
@@ -342,12 +335,8 @@
console.log(JSON.stringify(res));
});
},
- autoListChange: function () {
- if (this.autoList) {
- this.updateLooper = setInterval(this.initData, 1500);
- } else {
- window.clearInterval(this.updateLooper);
- }
+ refresh: function () {
+ this.initData();
}
}
--
Gitblit v1.8.0