Browse Source

修改bug

柳香萍 6 years ago
parent
commit
6929f486ed
2 changed files with 7 additions and 5 deletions
  1. 1 1
      src/xt_pages/data/components/tableson.vue
  2. 6 4
      src/xt_pages/data/index.vue

+ 1 - 1
src/xt_pages/data/components/tableson.vue View File

@@ -4,7 +4,7 @@
4 4
       <el-button style="float: right;" class="filter-item" size="small" :disabled="addState"  @click="handleCreate" type="primary" icon="el-icon-circle-plus-outline">{{$t('table.add')}}</el-button>
5 5
     </div>
6 6
     <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :key='tableKey' :data="list" v-loading="listLoading" border fit highlight-current-row
7
-      style="width: 100%;">
7
+      >
8 8
       <el-table-column  align="center" label="名称">
9 9
         <template slot-scope="scope">
10 10
           <span @click="handleUpdate(scope.row)">{{scope.row.name}}</span>

+ 6 - 4
src/xt_pages/data/index.vue View File

@@ -5,11 +5,13 @@
5 5
   </div>
6 6
   <div class="app-container">
7 7
     <el-tabs  v-model="activeName" >
8
-      <el-tab-pane v-for="item in tabMapOptions" :label="item.label" :key='item.key' :name="item.key" style="display:flex;">
8
+      <el-tab-pane v-for="item in tabMapOptions" :label="item.label" :key='item.key' :name="item.key" >
9 9
         <keep-alive>
10
-          <div style="display:flex;width:100%;">
11
-          <tab-pane v-if='activeName==item.key' :type='item.key' style="flex:1;"></tab-pane>
12
-          <tableson v-if='activeName==item.key' :type='item.key' style="flex:1;"></tableson>
10
+          <div >
11
+         <el-row :gutter="24">
12
+           <el-col :span="12"><tab-pane v-if='activeName==item.key' :type='item.key' ></tab-pane></el-col>
13
+           <el-col :span="12"><tableson v-if='activeName==item.key' :type='item.key' ></tableson></el-col>
14
+         </el-row>
13 15
           </div>
14 16
         </keep-alive>
15 17
       </el-tab-pane>