From 98a44e94ecc76abd72b9817648ca4b91469b936a Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期六, 08 八月 2020 16:04:16 +0800
Subject: [PATCH] 添加退出登录,布局调整
---
src/pages/cameraAccess/components/LinkageRule.vue | 54 +++++++++++++++---------------------------------------
1 files changed, 15 insertions(+), 39 deletions(-)
diff --git a/src/pages/cameraAccess/components/LinkageRule.vue b/src/pages/cameraAccess/components/LinkageRule.vue
index 2d5e609..c48517a 100644
--- a/src/pages/cameraAccess/components/LinkageRule.vue
+++ b/src/pages/cameraAccess/components/LinkageRule.vue
@@ -4,29 +4,8 @@
<p style="text-align:left;margin-bottom: 14px;">
<b style="font-size: 14px;line-height: 18px;">宸查�夌畻娉�</b>
</p>
- <!-- <swiper :options="swiperTaskOption" class="swiper-box-container swiper-no-swiping">
- <span class="task-tip" v-show="tableRuleList.length == 0 ">鏆傛棤绠楁硶锛岃鍦ㄧ嫭绔嬭鍒欎腑閫夋嫨绠楁硶</span>
- <swiper-slide v-for="(item, index) in tableRuleList" :key="index">
- <div class="item-card">
- <p style="text-align: right; width:100%; height:25px"></p>
- <p style="color: #0066EB;padding-top: 20px;'">
- <b>{{ item.scene_name }}</b>
- </p>
- </div>
- </swiper-slide>
- </swiper>
- <div class="pre-border" v-show="tableRuleList.length > 4 ">
- <div class="icon-btn" slot="button-prev">
- <i class="iconfont iconzuo"></i>
- </div>
- </div>
- <div class="next-border" v-show="tableRuleList.length > 4 ">
- <div class="icon-btn" slot="button-next">
- <i class="iconfont iconyou1"></i>
- </div>
- </div>-->
- <div>
+ <div class="clearfix">
<div class="slide-scene">
<span class="task-tip" v-if="tableRuleList.length == 0 ">鏆傛棤绠楁硶锛岃鍦ㄧ嫭绔嬭鍒欎腑閫夋嫨绠楁硶</span>
<slide-scene :sceneData="tableRuleList"></slide-scene>
@@ -36,7 +15,7 @@
<div class="top-right">
<sysinfo
v-if="showSysInfo"
- style="margin-left: 25px;margin-top: -10px;"
+ style="margin-left: 10px;margin-top: -10px;"
:ShowLocalVedio="this.TreeDataPool.treeActiveName !== 'camera'"
:showRealPoll="this.TreeDataPool.treeActiveName == 'camera'"
/>
@@ -45,9 +24,7 @@
</div>
<div class="bottom">
- <div
- style="width: calc(100% + 80px);height: 10px;background-color: #E9EBF2;p;position:relative;left:-50px"
- ></div>
+ <div class="devide"></div>
<div class="bottom-right">
<div class="draw-and-time-box">
<div class="draw-box">
@@ -298,12 +275,17 @@
<style lang="scss">
.s-linkage-rules {
width: 100%;
- height: 100%;
+ //height: 100%;
+ padding: 13px 0 20px;
position: relative;
+ .devide{
+ height: 10px;
+ background: #E9EBF2;
+ }
.top {
width: 100%;
- height: 174px;
- position: relative;
+ padding: 10px 20px;
+ box-sizing: border-box;
top: 0;
.swiper-box {
height: 100%;
@@ -412,9 +394,7 @@
.bottom {
width: 100%;
- height: calc(100% - 190px);
- position: absolute;
- top: 190px;
+
.bottom-side {
height: 100%;
width: 250px;
@@ -440,14 +420,10 @@
}
}
.bottom-right {
- width: calc(100% + 30px);
- height: 100%;
- float: left;
- overflow: auto;
- padding: 10px 0px;
+ padding: 10px 20px 20px;
box-sizing: border-box;
.draw-and-time-box {
- height: 430px;
+ height: 410px;
width: 100%;
.draw-box,
.time-box {
@@ -583,7 +559,7 @@
</style>
<style lang="scss" scoped>
.el-loading-spinner {
- background: url("../../../assets/gif/loading.gif") no-repeat;
+ background: url("/images/cameraAccess/loading.gif") no-repeat;
top: 50%;
margin-top: -21px;
width: calc(100% - 260px) !important;
--
Gitblit v1.8.0