Bladeren bron

样式调整

chenrui 3 jaren geleden
bovenliggende
commit
a59a2b4043
3 gewijzigde bestanden met toevoegingen van 12 en 9 verwijderingen
  1. 1 0
      src/components/tools/UserMenu.vue
  2. 5 2
      src/layouts/PageView.vue
  3. 6 7
      src/views/salesManagement/salesman/list.vue

+ 1 - 0
src/components/tools/UserMenu.vue

@@ -131,6 +131,7 @@ export default {
 	cursor: pointer;
 	transition: all 0.3s;
 	padding: 0 5px;
+  margin: 0;
 }
 .help-cont:hover {
 	background-color: rgba(0, 0, 0, 0.04);;

+ 5 - 2
src/layouts/PageView.vue

@@ -38,7 +38,7 @@
         </div>
       </div>
     </page-header>
-    <div class="content">
+    <div class="content" :style="{ height: contHeight+'px' }">
       <div class="page-header-index-wide">
         <slot>
           <!-- keep-alive  -->
@@ -94,7 +94,7 @@ export default {
       multiTab: state => state.app.multiTab
     }),
     contHeight () {
-      return window.innerHeight - 80
+      return window.innerHeight - 85
     }
   },
   mounted () {
@@ -131,6 +131,9 @@ export default {
     margin: 12px 12px 0;
     .page-header-index-wide{
       height: 100%;
+      >div{
+        height: 100%;
+      }
     }
     .link {
       margin-top: 16px;

+ 6 - 7
src/views/salesManagement/salesman/list.vue

@@ -44,7 +44,6 @@
         id="salesmanList-add"
         type="primary"
         class="button-error"
-        style="margin-top: 10px;"
         @click="handleEdit()">新增</a-button>
     </div>
     <!-- 列表 -->
@@ -56,7 +55,7 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :scroll="{ x: 1310, y: tableHeight }"
+      :scroll="{ y: tableHeight }"
       bordered>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
@@ -108,12 +107,12 @@ export default {
       tableHeight: 0,
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
+        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
         { title: '姓名', dataIndex: 'name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '性别', dataIndex: 'sexDictValue', width: 200, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '性别', dataIndex: 'sexDictValue', width: 60, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '联系电话', dataIndex: 'mobile', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '入职日期', dataIndex: 'entryDate', width: 200, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '入职日期', dataIndex: 'entryDate', width: 140, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '创建时间', dataIndex: 'createDate', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '状态', dataIndex: 'enableFlagDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
       ],
@@ -199,7 +198,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 235
+      this.tableHeight = window.innerHeight - tableSearchH - 245
     }
   },
   watch: {