From ba50073d4aeda7a1e30243e6469be9c2cec472b3 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期六, 08 十月 2022 18:17:25 +0800
Subject: [PATCH] 修改检索显示的摄像机地址,调整上报页面的查询
---
src/views/dataPush/components/device.vue | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/views/dataPush/components/device.vue b/src/views/dataPush/components/device.vue
index 41f078d..0d6b90f 100644
--- a/src/views/dataPush/components/device.vue
+++ b/src/views/dataPush/components/device.vue
@@ -3,7 +3,7 @@
<div class="search">
<div class="left">
<div class="id">
- 璁惧鍚嶇О
+ 璁惧鍚嶇О/IP/缂栫爜
<el-input v-model="inputText" placeholder="璇疯緭鍏�" clearable></el-input>
</div>
</div>
@@ -26,19 +26,19 @@
ref="multipleTable"
:data="dataList"
:fit="true"
- :default-sort="{ prop: 'createTime', order: 'descending' }"
+ :default-sort="{ prop: 'devCode', order: 'ascending' }"
>
<el-table-column prop="devName" label="璁惧鍚嶇О" show-overflow-tooltip></el-table-column>
<!-- <el-table-column prop="devId" label="璁惧ID" show-overflow-tooltip></el-table-column> -->
<el-table-column prop="devIp" label="璁惧IP" show-overflow-tooltip></el-table-column>
<el-table-column prop="devCode" label="璁惧缂栫爜" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="companyCode" label="浼佷笟缂栫爜" show-overflow-tooltip></el-table-column>
<el-table-column prop="state" label="鐘舵��" show-overflow-tooltip>
<template slot-scope="scope">
- <div v-if="scope.row.state == 0" class="status green">绂荤嚎</div>
- <div v-else class="status">鍦ㄧ嚎</div>
+ <div v-if="scope.row.state == 0" class="status">绂荤嚎</div>
+ <div v-else class="status green">鍦ㄧ嚎</div>
</template>
</el-table-column>
- <el-table-column prop="companyCode" label="浼佷笟缂栫爜" show-overflow-tooltip></el-table-column>
<el-table-column label="鎿嶄綔" align="center" width="100px">
<template slot-scope="scope">
@@ -159,7 +159,7 @@
},
delUser(row) {
console.log(row, "row")
- this.$confirm("纭瑕佸垹闄よ鐢ㄦ埛鍚�, 鏄惁缁х画?", "鎻愮ず", {
+ this.$confirm("纭瑕佸垹闄よ澶囧悧, 鏄惁缁х画?", "鎻愮ず", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
type: "warning"
@@ -226,6 +226,7 @@
message: res.data
})
this.goback()
+ this.fetchDevicesList()
}
})
} else if (this.tip === 2) {
@@ -248,6 +249,7 @@
message: res.msg
})
this.goback()
+ this.fetchDevicesList()
}
})
}
@@ -259,7 +261,7 @@
goback() {
this.isShowAdd = false
},
- async editUser(row) {
+ editUser(row) {
this.tip = 2
this.isShowAdd = true
this.ruleForm.devName = row.devName
--
Gitblit v1.8.0