Merge branch 'dev' into vite

# Conflicts:
#	examples/router/autoRoutes.js
#	package.json
#	packages/bigscreen/designer/components/Add.vue
#	project/dv/apps/AppGridDV.vue
#	vue.config.js
This commit is contained in:
aixianling
2022-08-23 11:14:38 +08:00
125 changed files with 15445 additions and 4898 deletions

View File

@@ -17,7 +17,10 @@
<el-input v-model="search.name" size="mini" placeholder="设备名称" prefix-icon="el-icon-search"
@change="handleTreeFilter" clearable/>
</div>
<div title>设备列表</div>
<div title>
<div>设备列表</div>
<el-button type="text" icon="iconfont iconResetting" @click="updateDev" size="mini" :loading="btnLoading">刷新</el-button>
</div>
<div fill class="deviceList">
<el-scrollbar>
<el-tree ref="deviceTree" :data="treeData" :props="propsConfig" @node-click="handleNodeClick"
@@ -79,7 +82,8 @@ export default {
name: '',
search: {
bind: ''
}
},
btnLoading: false,
}
},
methods: {
@@ -98,6 +102,17 @@ export default {
}
})
},
updateDev() {
this.btnLoading = true
this.ins.post(`/app/appzyvideoequipment/sync`, null, {
timeout: 1000000
}).then(res => {
if (res.code == 0) {
this.$message.success('更新成功')
this.getDevices()
}
}).finally(() => this.btnLoading = false)
},
handleNodeClick(data) {
this.$emit('select', data)
},
@@ -106,13 +121,13 @@ export default {
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) {
this.$refs.deviceTree?.filter(v)
},
onChange () {
onChange() {
this.$refs.deviceTree?.filter(this.search.name)
}
},
@@ -173,6 +188,19 @@ export default {
background: #3E4A69;
padding: 0 16px;
line-height: 28px;
display: flex;
justify-content: space-between;
align-items: center;
::v-deep .el-button {
padding: 0 4px;
height: 28px;
background: #3E4A69;
}
::v-deep .el-button:hover {
border: none;
}
}
::v-deep.deviceList {