From 98710e70bb52e761a1769c6454a290040b610aee Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期三, 07 四月 2021 18:20:46 +0800
Subject: [PATCH] 在请求index.js时添加参数,解决缓存的问题
---
src/pages/shuohuangMonitorAnalyze/components/guideIndex.vue | 81 ++++++++++++++++++++++++++++++++++------
1 files changed, 68 insertions(+), 13 deletions(-)
diff --git a/src/pages/shuohuangMonitorAnalyze/components/guideIndex.vue b/src/pages/shuohuangMonitorAnalyze/components/guideIndex.vue
index 67cb70e..d528eb6 100644
--- a/src/pages/shuohuangMonitorAnalyze/components/guideIndex.vue
+++ b/src/pages/shuohuangMonitorAnalyze/components/guideIndex.vue
@@ -76,6 +76,7 @@
<div class="val">99%</div>
<div class="trend">
<el-progress
+ class="defined-progress"
:percentage="99"
stroke-linecap="square"
color="#1890ff"
@@ -99,13 +100,14 @@
</el-card>
</div>
<div class="part">
- <div class="header-width-tab">
+ <div class="part-top">
+ <div class="header-width-tab">
<el-tabs class="tab-menu" v-model="actHiddanderTab" @tab-click="initTabContent">
<el-tab-pane label="闅愭偅浜嬩欢缁熻" name="hidDanderStatistic"></el-tab-pane>
<el-tab-pane label="闅愭偅浜嬩欢瓒嬪娍" name="hidDanderTrend"></el-tab-pane>
</el-tabs>
<div class="rt">
- <time-shortcut @actPickerChange="timeShortChange"></time-shortcut>
+ <time-shortcut actPicker="week" @actPickerChange="timeShortChange"></time-shortcut>
<el-date-picker
v-model="searchHidDanderTime"
type="datetimerange"
@@ -167,6 +169,7 @@
</div>
</div>
</div>
+ </div>
</div>
<div class="statics flex-box">
<div class="lt">
@@ -238,12 +241,13 @@
<el-radio-button label="hc">浼氳溅</el-radio-button>
<el-radio-button label="lsmx">涓存椂鎱㈣</el-radio-button>
</el-radio-group>
+
<Pie :options="optionsOfIrregularEventPie" style="padding-top:20px;"></Pie>
</div>
</div>
</div>
</div>
- <div class="part">
+ <div class="part-bottom" >
<div class="tab-swiper">
<swipe-tabs @checkTab="checkTabInSwipe"></swipe-tabs>
</div>
@@ -1109,12 +1113,18 @@
</script>
<style lang="scss">
+
.guide-index {
+ background-color: #f0f2f5;
+ .tab-menu {
+ background-color: #fff;
+ height: 60px;
+ }
.el-progress-bar__outer {
- border-radius: 5px;
+ border-radius: 2px;
}
.el-progress-bar__inner {
- border-radius: 5px;
+ border-radius: 2px;
}
.triangle {
width: 0;
@@ -1133,6 +1143,27 @@
border-right-color: transparent;
}
}
+ .defined-progress{
+ position: relative;
+ &:before{
+ content: '';
+ position: absolute;
+ width: 2px;
+ height: 4px;
+ background: #1890ff;
+ top: -6px;
+ right: -5px;
+ }
+ &:after{
+ content: '';
+ position: absolute;
+ width: 2px;
+ height: 4px;
+ background: #1890ff;
+ bottom: -6px;
+ right: -5px;
+ }
+ }
.tab-menu {
.el-tabs__item {
padding: 0 30px !important;
@@ -1141,10 +1172,14 @@
}
}
.tab-content {
+ // padding: 18px 12px;
padding: 20px;
+
.card-view {
display: flex;
- margin-right: -20px;
+ margin-right: -20px;
+
+ // margin-left: -2px;
.el-card {
flex: 1;
margin-right: 20px;
@@ -1201,21 +1236,37 @@
}
}
.part {
- padding: 20px 0;
+ padding:20px 0;
margin-bottom: 20px;
+ .part-top{
+ background-color: #fff;
+ }
+ .part-bottom{
+ background-color: #fff;
+ // padding: 0 30px 30px 30px;
+ padding: 0 0 25px 0;
+
+ .tab-detail{
+ margin: 0 25px;
+ }
+ }
.header-width-tab {
display: flex;
justify-content: space-between;
+ margin-bottom: 12px;
+
.rt {
display: flex;
padding-top: 20px;
+ margin-right: 25px;
+
}
}
.statics {
display: flex;
- padding: 0 10px;
+ // padding: 0 10px;
min-height: 400px;
- margin-bottom: 30px;
+ margin-bottom: 20px;
.statics-header {
height: 50px;
display: flex;
@@ -1256,10 +1307,15 @@
.lt {
text-align: left;
flex: 1;
- padding-right: 40px;
+ padding: 3px 15px 15px 18px;
+ background-color: #fff;
+ margin-right: 18px;
+
}
.rt {
text-align: left;
+ background-color: #fff;
+ padding: 3px 15px 15px 18px;
width: 400px;
.header {
display: flex;
@@ -1317,12 +1373,11 @@
.gt {
flex: 1;
width: auto;
- //padding: 0 20px;
}
}
.tab-swiper {
- width: calc(100vw - 340px);
- margin-bottom: 20px;
+ width: calc(100vw - 367px);
+ margin: 0 0 20px 20px;
}
}
.general-view {
--
Gitblit v1.8.0