From 929cf4c7be11bfd1e134d0cb0d7cbbe94772ebdf Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期一, 07 九月 2020 15:35:14 +0800
Subject: [PATCH] 摄像机树增加导入功能
---
src/pages/cameraAccess/components/SeparateRules.vue | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/src/pages/cameraAccess/components/SeparateRules.vue b/src/pages/cameraAccess/components/SeparateRules.vue
index b9580df..cd82320 100644
--- a/src/pages/cameraAccess/components/SeparateRules.vue
+++ b/src/pages/cameraAccess/components/SeparateRules.vue
@@ -106,7 +106,7 @@
:showRealPoll="cameraType === 'camera'"
:ShowLocalVedio="cameraType === 'dataStack'"
v-if="showSysInfo"
- style="margin-left: 10px;margin-top:-10px"
+ style="margin-top:-10px"
/>
</div>
</div>
@@ -253,7 +253,8 @@
};
},
mounted() {
- this.mockAsync()
+ this.mockAsync();
+ this.PollData.statistics();
},
methods: {
@@ -320,6 +321,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 +329,10 @@
type: "success",
message: "绛栫暐淇濆瓨鎴愬姛锛�"
});
+ //鍒锋柊宸︿晶鏍�
+ debugger
+ _this.$root.$children[0].$children[0].querySearchAsync('camera')
+
}
});
},
@@ -470,7 +476,7 @@
<style lang="scss">
.s-separate-rules {
width: 100%;
-
+ padding: 13px 0 20px;
.ai {
//width: calc(100% + 76px);
// height: 38px;
@@ -520,14 +526,14 @@
.swiper-box {
height: 100%;
float: left;
- width: 48%;
+ width: 46%;
margin-top: -10px;
position: relative;
}
.swiper-container {
position: initial;
min-width: 472px;
- width: 80%;
+ width: 86%;
// height: 124px;
}
@@ -613,8 +619,17 @@
}
.top-right {
float: right;
- width: 52%;
+ width: 54%;
height: 144px;
+ .card-box{
+ width: 54%!important;
+ }
+ .eCharts-box{
+ width: 45%;
+ canvas{
+ width: 98%!important;
+ }
+ }
}
.task-css {
text-align: left;
@@ -623,7 +638,7 @@
}
.bottom {
width: 100%;
-
+ margin-bottom: 15px;
.bottom-side {
height: 100%;
width: 250px;
--
Gitblit v1.8.0