Showing
3 changed files
with
16 additions
and
5 deletions
@@ -124,5 +124,14 @@ | @@ -124,5 +124,14 @@ | ||
124 | justify-content: end; | 124 | justify-content: end; |
125 | align-items: center; | 125 | align-items: center; |
126 | } | 126 | } |
127 | +.select-div-flex{ | ||
128 | + display: flex; | ||
129 | + align-items: center; | ||
130 | + font-size: 12px; | ||
131 | + justify-content: end; | ||
132 | +} | ||
133 | +.pie-date-range{ | ||
134 | + flex:1; | ||
135 | + } | ||
127 | 136 | ||
128 | /* //End LSQ 2022/1/17*/ | 137 | /* //End LSQ 2022/1/17*/ |
1 | <el-row class="dataRange-container"> | 1 | <el-row class="dataRange-container"> |
2 | <el-col :span="24"> | 2 | <el-col :span="24"> |
3 | <div class="tabs-div date-flex-div-around"> | 3 | <div class="tabs-div date-flex-div-around"> |
4 | - <el-col :span="18"> | ||
5 | - <el-date-picker | 4 | + <el-col :span="16" class="select-div-flex"> |
5 | + 时间范围:<el-date-picker | ||
6 | class="picker-div" | 6 | class="picker-div" |
7 | v-model="dateValue" | 7 | v-model="dateValue" |
8 | type="datetimerange" | 8 | type="datetimerange" |
@@ -17,8 +17,8 @@ | @@ -17,8 +17,8 @@ | ||
17 | > | 17 | > |
18 | </el-date-picker> | 18 | </el-date-picker> |
19 | </el-col> | 19 | </el-col> |
20 | - <el-col :span="6" class="select-div"> | ||
21 | - <el-select v-model="checkedId" class="m-2" placeholder="聚合频率" size="small" @change="changeItem" | 20 | + <el-col :span="8" class="select-div-flex"> |
21 | + 聚合频率:<el-select v-model="checkedId" class="m-2" placeholder="聚合频率" size="small" @change="changeItem" | ||
22 | > | 22 | > |
23 | <el-option | 23 | <el-option |
24 | v-for="item in frequencyData" | 24 | v-for="item in frequencyData" |
@@ -7,7 +7,9 @@ | @@ -7,7 +7,9 @@ | ||
7 | <el-row class="detail-content-title"> | 7 | <el-row class="detail-content-title"> |
8 | <el-col :span="8"></el-col> | 8 | <el-col :span="8"></el-col> |
9 | <el-col :span="16" class="pie-flex-end"> | 9 | <el-col :span="16" class="pie-flex-end"> |
10 | - <cm-date-range v-if="interval=='custom'" @callbacksure="getOptionData" @callbacktime="callbacktime" @callbackrate="callbackrate"></cm-date-range> | 10 | + <div class="pie-date-range"> |
11 | + <cm-date-range v-if="interval=='custom'" @callbacksure="getOptionData" @callbacktime="callbacktime" @callbackrate="callbackrate"></cm-date-range> | ||
12 | + </div> | ||
11 | <div class="line-filter pie-line-filter"> | 13 | <div class="line-filter pie-line-filter"> |
12 | <div class="linechartfrequency line-filter-content"> | 14 | <div class="linechartfrequency line-filter-content"> |
13 | <div v-if="interval!='custom'" @click="changeInterval('DAY')" :class="['line-filter-item', {'active':interval=='DAY'}]" data-value="DAY" >一天</div> | 15 | <div v-if="interval!='custom'" @click="changeInterval('DAY')" :class="['line-filter-item', {'active':interval=='DAY'}]" data-value="DAY" >一天</div> |
-
Please register or login to post a comment