Browse Source

fix: analysis row type
- fix StandardList radio-group value

Sendya 5 years ago
parent
commit
426a2cc98c
2 changed files with 9 additions and 14 deletions
  1. 3 9
      src/views/dashboard/Analysis.vue
  2. 6 5
      src/views/list/StandardList.vue

+ 3 - 9
src/views/dashboard/Analysis.vue

@@ -100,9 +100,9 @@
     </a-card>
 
     <div class="antd-pro-pages-dashboard-analysis-twoColLayout" :class="isDesktop() ? 'desktop' : ''">
-      <a-row :gutter="24">
+      <a-row :gutter="24" type="flex" :style="{ marginTop: '24px' }">
         <a-col :xl="12" :lg="24" :md="24" :sm="24" :xs="24">
-          <a-card :loading="loading" :bordered="false" title="线上热门搜索" :style="{ marginTop: '24px', minHeight: '500px' }">
+          <a-card :loading="loading" :bordered="false" title="线上热门搜索" :style="{ height: '100%' }">
             <a-dropdown :trigger="['click']" placement="bottomLeft" slot="extra">
               <a class="ant-dropdown-link" href="#">
                 <a-icon type="ellipsis" />
@@ -164,7 +164,7 @@
           </a-card>
         </a-col>
         <a-col :xl="12" :lg="24" :md="24" :sm="24" :xs="24">
-          <a-card class="antd-pro-pages-dashboard-analysis-salesCard" :loading="loading" :bordered="false" title="销售额类别占比" :style="{ marginTop: '24px', minHeight: '500px' }">
+          <a-card class="antd-pro-pages-dashboard-analysis-salesCard" :loading="loading" :bordered="false" title="销售额类别占比" :style="{ height: '100%' }">
             <div slot="extra" style="height: inherit;">
               <!-- style="bottom: 12px;display: inline-block;" -->
               <span class="dashboard-analysis-iconGroup">
@@ -381,12 +381,6 @@ export default {
     display: flex;
     display: block;
     flex-flow: row wrap;
-
-    &.desktop div[class^=ant-col]:last-child {
-      position: absolute;
-      right: 0;
-      height: 100%;
-    }
   }
 
   .antd-pro-pages-dashboard-analysis-salesCard {

+ 6 - 5
src/views/list/StandardList.vue

@@ -20,10 +20,10 @@
       title="标准列表">
 
       <div slot="extra">
-        <a-radio-group>
-          <a-radio-button>全部</a-radio-button>
-          <a-radio-button>进行中</a-radio-button>
-          <a-radio-button>等待中</a-radio-button>
+        <a-radio-group v-model="status">
+          <a-radio-button value="all">全部</a-radio-button>
+          <a-radio-button value="processing">进行中</a-radio-button>
+          <a-radio-button value="waiting">等待中</a-radio-button>
         </a-radio-group>
         <a-input-search style="margin-left: 16px; width: 272px;" />
       </div>
@@ -136,7 +136,8 @@ export default {
   },
   data () {
     return {
-      data
+      data,
+      status: 'all'
     }
   }
 }