Skip to content

Commit 426a2cc

Browse files
committed
fix: analysis row type
- fix StandardList radio-group value
1 parent fd65f41 commit 426a2cc

File tree

2 files changed

+9
-14
lines changed

2 files changed

+9
-14
lines changed

src/views/dashboard/Analysis.vue

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@
100100
</a-card>
101101

102102
<div class="antd-pro-pages-dashboard-analysis-twoColLayout" :class="isDesktop() ? 'desktop' : ''">
103-
<a-row :gutter="24">
103+
<a-row :gutter="24" type="flex" :style="{ marginTop: '24px' }">
104104
<a-col :xl="12" :lg="24" :md="24" :sm="24" :xs="24">
105-
<a-card :loading="loading" :bordered="false" title="线上热门搜索" :style="{ marginTop: '24px', minHeight: '500px' }">
105+
<a-card :loading="loading" :bordered="false" title="线上热门搜索" :style="{ height: '100%' }">
106106
<a-dropdown :trigger="['click']" placement="bottomLeft" slot="extra">
107107
<a class="ant-dropdown-link" href="#">
108108
<a-icon type="ellipsis" />
@@ -164,7 +164,7 @@
164164
</a-card>
165165
</a-col>
166166
<a-col :xl="12" :lg="24" :md="24" :sm="24" :xs="24">
167-
<a-card class="antd-pro-pages-dashboard-analysis-salesCard" :loading="loading" :bordered="false" title="销售额类别占比" :style="{ marginTop: '24px', minHeight: '500px' }">
167+
<a-card class="antd-pro-pages-dashboard-analysis-salesCard" :loading="loading" :bordered="false" title="销售额类别占比" :style="{ height: '100%' }">
168168
<div slot="extra" style="height: inherit;">
169169
<!-- style="bottom: 12px;display: inline-block;" -->
170170
<span class="dashboard-analysis-iconGroup">
@@ -381,12 +381,6 @@ export default {
381381
display: flex;
382382
display: block;
383383
flex-flow: row wrap;
384-
385-
&.desktop div[class^=ant-col]:last-child {
386-
position: absolute;
387-
right: 0;
388-
height: 100%;
389-
}
390384
}
391385
392386
.antd-pro-pages-dashboard-analysis-salesCard {

src/views/list/StandardList.vue

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
title="标准列表">
2121

2222
<div slot="extra">
23-
<a-radio-group>
24-
<a-radio-button>全部</a-radio-button>
25-
<a-radio-button>进行中</a-radio-button>
26-
<a-radio-button>等待中</a-radio-button>
23+
<a-radio-group v-model="status">
24+
<a-radio-button value="all">全部</a-radio-button>
25+
<a-radio-button value="processing">进行中</a-radio-button>
26+
<a-radio-button value="waiting">等待中</a-radio-button>
2727
</a-radio-group>
2828
<a-input-search style="margin-left: 16px; width: 272px;" />
2929
</div>
@@ -136,7 +136,8 @@ export default {
136136
},
137137
data () {
138138
return {
139-
data
139+
data,
140+
status: 'all'
140141
}
141142
}
142143
}

0 commit comments

Comments
 (0)