From 41616f726dafafe7c015bf4f3e02a7aa9488a3a2 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 07 三月 2022 10:47:06 +0800
Subject: [PATCH] 修复导入通道时无平台关联时的bug
---
web_src/src/components/DeviceList.vue | 92 ++++++++++++++++++++++++++++++++--------------
1 files changed, 64 insertions(+), 28 deletions(-)
diff --git a/web_src/src/components/DeviceList.vue b/web_src/src/components/DeviceList.vue
index e05855f..7922a93 100644
--- a/web_src/src/components/DeviceList.vue
+++ b/web_src/src/components/DeviceList.vue
@@ -13,15 +13,19 @@
</div>
<!-- <devicePlayer ref="devicePlayer"></devicePlayer> -->
<!--璁惧鍒楄〃-->
- <el-table :data="deviceList" border style="width: 100%" :height="winHeight">
+ <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="180" 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>
<el-table-column prop="manufacturer" label="鍘傚" align="center">
- </el-table-column>
- <el-table-column prop="model" label="鍥轰欢鐗堟湰" align="center" width="120">
</el-table-column>
<el-table-column label="娴佷紶杈撴ā寮�" align="center" width="120">
<template slot-scope="scope">
@@ -46,21 +50,19 @@
</el-table-column>
<el-table-column prop="registerTime" 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 prop="updateTime" label="鏇存柊鏃堕棿" align="center" width="140">
</el-table-column>
- <el-table-column label="鎿嶄綔" width="360" align="center" fixed="right">
+ <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" align="center" width="140">
+ </el-table-column>
+
+ <el-table-column label="鎿嶄綔" width="450" align="center" fixed="right">
<template slot-scope="scope">
<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-delete" type="danger" v-if="scope.row.online==0" @click="deleteDevice(scope.row)">鍒犻櫎</el-button>
+ <el-button size="mini" icon="el-icon-edit" type="primary" @click="edit(scope.row)">缂栬緫</el-button>
+ <el-button size="mini" icon="el-icon-delete" type="danger" @click="deleteDevice(scope.row)">鍒犻櫎</el-button>
</el-button-group>
</template>
</el-table-column>
@@ -75,7 +77,7 @@
layout="total, sizes, prev, pager, next"
:total="total">
</el-pagination>
-
+ <deviceEdit ref="deviceEdit" ></deviceEdit>
</el-main>
</el-container>
</div>
@@ -83,10 +85,12 @@
<script>
import uiHeader from './UiHeader.vue'
+ import deviceEdit from './dialog/deviceEdit.vue'
export default {
name: 'app',
components: {
- uiHeader
+ uiHeader,
+ deviceEdit
},
data() {
return {
@@ -161,15 +165,29 @@
},
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);
- });
+ let msg = "纭畾鍒犻櫎姝よ澶囷紵"
+ if (row.online !== 0) {
+ msg = "鍦ㄧ嚎璁惧鍒犻櫎鍚庝粛鍙�氳繃娉ㄥ唽鍐嶆涓婄嚎銆�<br/>濡傞渶褰诲簳鍒犻櫎璇峰厛灏嗚澶囩绾裤��<br/><strong>纭畾鍒犻櫎姝よ澶囷紵</strong>"
+ }
+ this.$confirm(msg, '鎻愮ず', {
+ dangerouslyUseHTMLString : true,
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ center: true,
+ type: 'warning'
+ }).then(() => {
+ this.$axios({
+ method: 'delete',
+ url:`/api/device/query/devices/${row.deviceId}/delete`
+ }).then((res)=>{
+ this.getDeviceList();
+ }).catch((error) =>{
+ console.log(error);
+ });
+ }).catch(() => {
+
+ });
+
},
showChannelList: function(row) {
@@ -192,16 +210,16 @@
url: '/api/device/query/devices/' + itemData.deviceId + '/sync'
}).then(function(res) {
console.log("鍒锋柊璁惧缁撴灉锛�"+JSON.stringify(res));
- if (!res.data.deviceId) {
+ if (res.data.code !==0) {
that.$message({
showClose: true,
- message: res.data,
+ message: res.data.msg,
type: 'error'
});
}else{
that.$message({
showClose: true,
- message: '璇锋眰鎴愬姛',
+ message: res.data.msg,
type: 'success'
});
}
@@ -209,8 +227,13 @@
that.$refs[itemData.deviceId + 'refbtn' ].loading = false;
}).catch(function(e) {
console.error(e)
+ that.$message({
+ showClose: true,
+ message: e,
+ type: 'error'
+ });
that.$refs[itemData.deviceId + 'refbtn' ].loading = false;
- });;
+ });
},
//閫氱煡璁惧涓婁紶濯掍綋娴�
sendDevicePush: function(itemData) {
@@ -238,6 +261,19 @@
}).catch(function(e) {
});
+ },
+ edit: function (row) {
+ console.log(row);
+ this.$refs.deviceEdit.openDialog(row, ()=>{
+ this.$refs.deviceEdit.close();
+ this.$message({
+ showClose: true,
+ message: "璁惧淇敼鎴愬姛锛岄�氶亾瀛楃闆嗗皢鍦ㄤ笅娆℃洿鏂扮敓鏁�",
+ type: "success",
+ });
+ setTimeout(this.getDeviceList, 200)
+
+ })
}
}
--
Gitblit v1.8.0