From fd803c21ec5d36758d4914b4dfdc46314e33d6be Mon Sep 17 00:00:00 2001
From: 648540858 <18010473990@163.com>
Date: 星期日, 08 八月 2021 09:10:58 +0800
Subject: [PATCH] 修复前端登录
---
web_src/src/components/DeviceList.vue | 60 +++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 39 insertions(+), 21 deletions(-)
diff --git a/web_src/src/components/DeviceList.vue b/web_src/src/components/DeviceList.vue
index 40d2146..8a21211 100644
--- a/web_src/src/components/DeviceList.vue
+++ b/web_src/src/components/DeviceList.vue
@@ -13,23 +13,14 @@
</div>
<!-- <devicePlayer ref="devicePlayer"></devicePlayer> -->
<!--璁惧鍒楄〃-->
- <el-table :data="deviceList" border style="width: 100%" :height="winHeight">
- <el-table-column prop="name" label="鍚嶇О" width="180" align="center">
+ <el-table :data="deviceList" border style="width: 100%;font-size: 12px;" :height="winHeight">
+ <el-table-column prop="name" label="鍚嶇О" align="center">
</el-table-column>
- <el-table-column prop="deviceId" label="璁惧缂栧彿" width="240" align="center">
- </el-table-column>
- <el-table-column label="鍦板潃" width="180" align="center">
- <template slot-scope="scope">
- <div slot="reference" class="name-wrapper">
- <el-tag size="medium">{{ scope.row.hostAddress }}</el-tag>
- </div>
- </template>
+ <el-table-column prop="deviceId" label="璁惧缂栧彿" width="180" align="center">
</el-table-column>
<el-table-column prop="manufacturer" label="鍘傚" align="center">
</el-table-column>
- <el-table-column prop="model" label="鍥轰欢鐗堟湰" align="center">
- </el-table-column>
- <el-table-column label="娴佷紶杈撴ā寮�" align="center" width="160">
+ <el-table-column label="娴佷紶杈撴ā寮�" align="center" width="120">
<template slot-scope="scope">
<el-select size="mini" @change="transportChange(scope.row)" v-model="scope.row.streamMode" placeholder="璇烽�夋嫨">
<el-option key="UDP" label="UDP" value="UDP"></el-option>
@@ -40,7 +31,7 @@
</el-table-column>
<el-table-column prop="channelCount" label="閫氶亾鏁�" align="center">
</el-table-column>
- <el-table-column label="鐘舵��" width="80" align="center">
+ <el-table-column label="鐘舵��" width="120" align="center">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<el-tag size="medium" v-if="scope.row.online == 1">鍦ㄧ嚎</el-tag>
@@ -48,14 +39,29 @@
</div>
</template>
</el-table-column>
-
+ <el-table-column prop="keepaliveTime" label="鏈�杩戝績璺�" align="center" width="140">
+ </el-table-column>
+ <el-table-column prop="registerTime" label="鏈�杩戞敞鍐�" align="center" width="140">
+ </el-table-column>
+ <el-table-column prop="updateTime" label="鏇存柊鏃堕棿" align="center" width="140">
+ </el-table-column>
+ <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" align="center" width="140">
+ </el-table-column>
+ <el-table-column label="鍦板潃" width="180" align="center">
+ <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 label="鎿嶄綔" width="360" align="center" fixed="right">
<template slot-scope="scope">
- <el-button size="mini" :ref="scope.row.deviceId + 'refbtn' " icon="el-icon-refresh" @click="refDevice(scope.row)">鍒锋柊</el-button>
+ <el-button size="mini" :ref="scope.row.deviceId + 'refbtn' " v-if="scope.row.online!=0" icon="el-icon-refresh" @click="refDevice(scope.row)">鍒锋柊</el-button>
<el-button-group>
- <el-button size="mini" icon="el-icon-video-camera-solid" v-bind:disabled="scope.row.online==0" type="primary" @click="showChannelList(scope.row)">閫氶亾</el-button>
- <el-button size="mini" icon="el-icon-location" v-bind:disabled="scope.row.online==0" type="primary" @click="showDevicePosition(scope.row)">瀹氫綅</el-button>
- <el-button size="mini" icon="el-icon-s-tools" v-bind:disabled="scope.row.online==0" type="primary">鎺у埗</el-button>
+ <el-button size="mini" icon="el-icon-video-camera-solid" v-bind:disabled="scope.row.online==0" type="primary" @click="showChannelList(scope.row)">閫氶亾</el-button>
+ <el-button size="mini" icon="el-icon-location" v-bind:disabled="scope.row.online==0" type="primary" @click="showDevicePosition(scope.row)">瀹氫綅</el-button>
+ <el-button size="mini" icon="el-icon-s-tools" v-bind:disabled="scope.row.online==0" type="primary">鎺у埗</el-button>
+ <el-button size="mini" icon="el-icon-delete" type="danger" v-if="scope.row.online==0" @click="deleteDevice(scope.row)">鍒犻櫎</el-button>
</el-button-group>
</template>
</el-table-column>
@@ -155,6 +161,18 @@
});
},
+ deleteDevice: function(row) {
+ let that = this;
+ this.$axios({
+ method: 'delete',
+ url:`/api/device/query/devices/${row.deviceId}/delete`
+ }).then((res)=>{
+ this.getDeviceList();
+ }).catch((error) =>{
+ console.log(error);
+ });
+
+ },
showChannelList: function(row) {
console.log(JSON.stringify(row))
this.$router.push(`/channelList/${row.deviceId}/0/15/1`);
@@ -215,8 +233,8 @@
console.log(`淇敼浼犺緭鏂瑰紡涓� ${row.streamMode}锛�${row.deviceId} `);
let that = this;
this.$axios({
- method: 'get',
- url: '/api/device/query/transport' + row.deviceId + '/' + row.streamMode
+ method: 'post',
+ url: '/api/device/query/transport/' + row.deviceId + '/' + row.streamMode
}).then(function(res) {
}).catch(function(e) {
--
Gitblit v1.8.0