From b23a2a35a14b010a3b97a1b61a02ec179dfab924 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期五, 04 九月 2020 17:25:14 +0800
Subject: [PATCH] feat: sort camera tree
---
src/pages/cameraAccess/components/SeparateRules.vue | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/src/pages/cameraAccess/components/SeparateRules.vue b/src/pages/cameraAccess/components/SeparateRules.vue
index 807cc3b..358ad1a 100644
--- a/src/pages/cameraAccess/components/SeparateRules.vue
+++ b/src/pages/cameraAccess/components/SeparateRules.vue
@@ -61,7 +61,7 @@
v-if="Camera.analytics"
class="flex-box"
>
- <span >绠楁硶蹇�熼�氶亾</span>
+ <span class="label">绠楁硶蹇�熼�氶亾</span>
<div class="channel flex-box" >
<el-tooltip
effect="dark"
@@ -95,7 +95,7 @@
<div class="devide"></div>
- <div class="top" style="top:60px;">
+ <div class="top" >
<p class="task-css">
<b style="font-size: 14px; line-height: 18px;">鍦烘櫙</b>
</p>
@@ -106,7 +106,7 @@
:showRealPoll="cameraType === 'camera'"
:ShowLocalVedio="cameraType === 'dataStack'"
v-if="showSysInfo"
- style="margin-left: 25px;margin-top:-10px"
+ style="margin-left: 10px;margin-top:-10px"
/>
</div>
</div>
@@ -320,6 +320,7 @@
saveSceneRule(groupRule) {
const payload = { ...groupRule }
payload.cameraIds = [this.Camera.cameraId];
+ let _this = this;
saveCameraScene(payload).then(rsp => {
if (rsp && rsp.success) {
this.Camera.update();
@@ -327,6 +328,10 @@
type: "success",
message: "绛栫暐淇濆瓨鎴愬姛锛�"
});
+ //鍒锋柊宸︿晶鏍�
+ debugger
+ _this.$root.$children[0].$children[0].querySearchAsync('camera')
+
}
});
},
@@ -470,7 +475,7 @@
<style lang="scss">
.s-separate-rules {
width: 100%;
-
+ padding: 13px 0 20px;
.ai {
//width: calc(100% + 76px);
// height: 38px;
@@ -484,8 +489,18 @@
-webkit-box-sizing: border-box;
box-sizing: border-box;
.ai-select{
+ text-align: left;
line-height: 30px;
height: 30px;
+ .flex-box{
+ .label{
+ &+label,&+div{
+ margin-left: 10px;
+ line-height: 1;
+ }
+
+ }
+ }
}
.ai-select>div{
display: inline-block;
@@ -494,6 +509,7 @@
.channel{
display: inline-block;
+ vertical-align: middle;
}
}
}
@@ -612,7 +628,7 @@
}
.bottom {
width: 100%;
-
+ margin-bottom: 15px;
.bottom-side {
height: 100%;
width: 250px;
--
Gitblit v1.8.0