kubbo/dvcp_v2_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev

Browse Source
This commit is contained in:
yanran200730
2022-08-10 11:14:05 +08:00
parent f28e915c4a 3d386d76e4
commit 25ca7f4027
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/conv/AppDeviceConfig/components/eyeList.vue
View File

@@ -33,7 +33,7 @@
<el-table-column slot="options" width="140px" fixed="right" label="操作" align="center"> <el-table-column slot="options" width="140px" fixed="right" label="操作" align="center">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<div class="table-options"> <div class="table-options">
<el-button type="text" @click="edit('编辑设备配置', row)">编辑</el-button> <el-button type="text" @click="add('编辑设备配置', row)">编辑</el-button>
<el-button type="text" @click="refresh(row)">刷新</el-button> <el-button type="text" @click="refresh(row)">刷新</el-button>
<el-button type="text" @click="remove(row.id)">删除</el-button> <el-button type="text" @click="remove(row.id)">删除</el-button>
</div> </div>

4
packages/conv/AppDeviceConfig/components/videoList.vue
View File

@@ -33,7 +33,7 @@
<el-table-column slot="options" width="140px" fixed="right" label="操作" align="center"> <el-table-column slot="options" width="140px" fixed="right" label="操作" align="center">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<div class="table-options"> <div class="table-options">
<el-button type="text" @click="edit('编辑设备配置', row)">编辑</el-button> <el-button type="text" @click="add('编辑设备配置', row)">编辑</el-button>
<el-button type="text" @click="refresh(row)">刷新</el-button> <el-button type="text" @click="refresh(row)">刷新</el-button>
<el-button type="text" @click="remove(row.id)">删除</el-button> <el-button type="text" @click="remove(row.id)">删除</el-button>
</div> </div>
@@ -141,7 +141,7 @@
}, },
methods: { methods: {
getListInit() { getListInit() {
this.search.current = 1 this.search.current = 1
this.getList() this.getList()
}, },
getList () { getList () {

10
packages/device/monitor/components/deviceSlider.vue
View File

@@ -111,10 +111,7 @@ export default {
this.$message.success('更新成功') this.$message.success('更新成功')
this.getDevices() this.getDevices()
} }
this.btnLoading = false }).finally(() => this.btnLoading = false)
}).catch(() => {
this.btnLoading = false
})
}, },
handleNodeClick(data) { handleNodeClick(data) {
this.$emit('select', data) this.$emit('select', data)
@@ -124,13 +121,13 @@ export default {
return !this.search.bind ? true : data.deviceStatus === this.search.bind return !this.search.bind ? true : data.deviceStatus === this.search.bind
} }
return data?.name?.indexOf(v) > -1 && (!this.search.bind ? true : data.deviceStatus === this.search.bind) return data?.name?.indexOf(v) > -1 && (!this.search.bind ? true : data.deviceStatus === this.search.bind)
}, },
handleTreeFilter(v) { handleTreeFilter(v) {
this.$refs.deviceTree?.filter(v) this.$refs.deviceTree?.filter(v)
}, },
onChange () { onChange() {
this.$refs.deviceTree?.filter(this.search.name) this.$refs.deviceTree?.filter(this.search.name)
} }
}, },
@@ -200,6 +197,7 @@ export default {
height: 28px; height: 28px;
background: #3E4A69; background: #3E4A69;
} }
::v-deep .el-button:hover { ::v-deep .el-button:hover {
border: none; border: none;
} }