From cfe33505dc83ecaff395e9d207139d3b43e5a9b6 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期五, 06 十一月 2020 16:46:14 +0800
Subject: [PATCH] 规则列表加入事件声音;数据栈目录树样式优化;集群目录树关键字搜索框查询修复
---
src/pages/searchForCluster/index/App.vue | 2 +-
src/components/LeftNav.vue | 7 +++++--
src/components/subComponents/LocalVedioList.vue | 7 ++++++-
src/pages/cameraAccess/components/SceneRule.vue | 17 +++++++++++++++--
src/pages/cameraAccess/components/SeparateRules.vue | 2 +-
5 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/src/components/LeftNav.vue b/src/components/LeftNav.vue
index 947c935..575f5ad 100644
--- a/src/components/LeftNav.vue
+++ b/src/components/LeftNav.vue
@@ -238,7 +238,7 @@
size="small"
clearable
@input="querySearchAsync('dir')"
- :style="'width:103px;'"
+ :style="'width:120px;'"
>
<i
class="el-icon-search el-input__icon"
@@ -531,6 +531,9 @@
this.timeout = setTimeout(() => {
if (type === "camera") {
this.TreeDataPool.fetchTreeData();
+ }
+ if(type === "cluster"){
+ this.TreeDataPool.fetchClusterTree();
}
if (type === "dir") {
this.DataStackPool.fetchFiles();
@@ -896,7 +899,7 @@
}
.tree-edit {
- z-index: 1;
+ z-index: 2;
font-size: 16px;
position: absolute;
top: 56px;
diff --git a/src/components/subComponents/LocalVedioList.vue b/src/components/subComponents/LocalVedioList.vue
index 511f87c..5c80dc1 100644
--- a/src/components/subComponents/LocalVedioList.vue
+++ b/src/components/subComponents/LocalVedioList.vue
@@ -76,6 +76,11 @@
height: 100%;
.top-menu {
text-align: left;
+ position: absolute;
+ z-index: 1;
+ top: 54px;
+ background: #fff;
+ width: 100%;
}
.folder {
@@ -98,7 +103,7 @@
}
ul {
- margin: 10px 25px;
+ margin: 25px 25px 10px;
}
li {
width: 100%;
diff --git a/src/pages/cameraAccess/components/SceneRule.vue b/src/pages/cameraAccess/components/SceneRule.vue
index 188db95..ecf6db6 100644
--- a/src/pages/cameraAccess/components/SceneRule.vue
+++ b/src/pages/cameraAccess/components/SceneRule.vue
@@ -108,12 +108,17 @@
</template>
</el-table-column>
<el-table-column label="鏃堕棿娈�" prop="time_name" align="center"></el-table-column>
- <el-table-column label="鎻忚堪" prop="desc" align="center" min-width="150"></el-table-column>
+ <el-table-column label="鎻忚堪" prop="desc" align="center" min-width="120"></el-table-column>
<!-- <el-table-column label="鐘舵��" align="center" width="90">
<template slot-scope="scope">
<el-switch v-model="scope.row.defence_state" @change="updateDefence(scope.row)"></el-switch>
</template>
</el-table-column>-->
+ <el-table-column label="浜嬩欢澹伴煶" align="center">
+ <template slot-scope="scope">
+ <span>{{ getSoundById(scope.row.voiceId) }}</span>
+ </template>
+ </el-table-column>
<el-table-column label="浜嬩欢绛夌骇" align="center">
<template slot-scope="scope">
<span>{{scope.row.alarm_level | alarmLevel }}</span>
@@ -237,6 +242,14 @@
}
},
methods: {
+ getSoundById(id){
+ if(id){
+ let sound = this.soundList.find(item=>item.id == id);
+ return sound.name
+ }else{
+ return ''
+ }
+ },
getSounds() {
getSoundList().then(res => {
if (res.success) {
@@ -426,7 +439,7 @@
.catch(() => { });
},
cellStyle(obj) {
- if (obj.column.label == '绛栫暐') {
+ if (obj.column.label == '绛栫暐'||obj.column.label == '浜嬩欢澹伴煶') {
return 'text-align:left;padding-left:8px;'
}
}
diff --git a/src/pages/cameraAccess/components/SeparateRules.vue b/src/pages/cameraAccess/components/SeparateRules.vue
index d014e4b..6171c5a 100644
--- a/src/pages/cameraAccess/components/SeparateRules.vue
+++ b/src/pages/cameraAccess/components/SeparateRules.vue
@@ -34,7 +34,7 @@
</div>
<div v-if="Camera.analytics" class="flex-box">
- <span class="label">鏅鸿兘璁＄畻鑺傜偣: {{ Camera.runServerName}}</span>
+ <span class="label">SmartAI鑺傜偣: {{ Camera.runServerName}}</span>
</div>
<div v-if="Camera.analytics" class="flex-box">
diff --git a/src/pages/searchForCluster/index/App.vue b/src/pages/searchForCluster/index/App.vue
index ef802ef..aadc4c5 100644
--- a/src/pages/searchForCluster/index/App.vue
+++ b/src/pages/searchForCluster/index/App.vue
@@ -93,7 +93,7 @@
overflow-x: hidden;
}
.resize-bar {
- width: 310px;
+ width: 338px;
height: inherit;
resize: horizontal;
cursor: ew-resize;
--
Gitblit v1.8.0