From 23f67ee126da65d28d34085a0bd96dcba36938af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=B0=91=E5=BA=B7?=
 <zhangshaokang@zhangshaokangdeMacBook-Pro.local>
Date: Fri, 20 Oct 2023 15:39:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=A2=E9=98=9F=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../usercenter/components/dataStatistics.vue       | 41 +++++++++++++++-------
 src/style/index.less                               |  2 +-
 src/views/merchantBack.vue                         |  9 +++--
 3 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/src/components/userinfo/usercenter/components/dataStatistics.vue b/src/components/userinfo/usercenter/components/dataStatistics.vue
index 858c231..5232529 100644
--- a/src/components/userinfo/usercenter/components/dataStatistics.vue
+++ b/src/components/userinfo/usercenter/components/dataStatistics.vue
@@ -43,38 +43,38 @@
           </div>-->
           <!-- <div class="fsa"> -->
           <div>
-            {{totalObj.signUps}}
+            <span class="fwb">{{totalObj.signUps}}</span>
             <div>报名</div>
           </div>
           <div>
-            {{totalObj.arrived}}
+             <span class="fwb">{{totalObj.arrived}}</span>
             <div>到面</div>
           </div>
           <div>
-            {{totalObj.passed}}
+             <span class="fwb">{{totalObj.passed}}</span>
             <div>通过</div>
           </div>
           <div>
-            {{totalObj.entry}}
+             <span class="fwb">{{totalObj.entry}}</span>
             <div>入职</div>
           </div>
           <div class="table_left">
-            {{totalObj.obJob}}
+             <span class="fwb">{{totalObj.obJob}}</span>
             <div>在职人数</div>
           </div>
           <div class="table_left">
-            {{totalObj.entryGPA}}
+             <span class="fwb">{{totalObj.entryGPA}}</span>
             <div>入职绩点</div>
           </div>
           <div>
-            {{totalObj.finshedGPA}}
+             <span class="fwb">{{totalObj.finshedGPA}}</span>
             <div>交付绩点</div>
           </div>
           <!-- </div> -->
         </div>
       </div>
       <div class="content">
-        <a-table :columns="columns" :scroll="{ y: 480 }" class="bb1 dataTable" :data-source="dataList" :pagination="false" @change="onChange" :loading="{ spinning: isspinning, tip: '加载中', wrapperClassName: 'spinstyle', }" :rowKey="(record) => record.index" :expanded-row-keys.sync="expandedRowKeys" childrenColumnName="users">
+        <a-table :columns="columns" :scroll="{ y: tableHeight }" class="dataTable" :data-source="dataList" :pagination="false" @change="onChange" :loading="{ spinning: isspinning, tip: '加载中', wrapperClassName: 'spinstyle', }" :rowKey="(record) => record.index" :expanded-row-keys.sync="expandedRowKeys" childrenColumnName="users">
           <span slot="custom_objob">
             <span class="fw500">在职人数</span>
           </span>
@@ -97,7 +97,7 @@
           <button slot="suffix" @click="onSearch">搜索</button>
         </a-input>-->
       </div>
-      <a-table :columns="billColumns" :scroll="{ x: 1100}" :data-source="billList" class="detailTable" :pagination="false" @change="onChange" :loading="{ spinning: isspinning, tip: '加载中', wrapperClassName: 'spinstyle', }" :rowKey="(record) => record.index">
+      <a-table :columns="billColumns" :scroll="{ x: 1100,y:600}" :data-source="billList" class="detailTable" :pagination="false" @change="onChange" :loading="{ spinning: isspinning, tip: '加载中', wrapperClassName: 'spinstyle', }" :rowKey="(record) => record.index">
         <span slot="storeJobName" slot-scope="text">{{text}}</span>
         <span slot="userName" slot-scope="text">{{text}}1</span>
 
@@ -250,6 +250,7 @@ export default {
       },
       dateType: '',
       dateVal: '',
+	  tableHeight: 300,
     }
   },
   // 计算属性
@@ -505,7 +506,7 @@ export default {
           dataIndex: 'applyUserName',
           key: 'applyUserName',
           ellipsis: true,
-          width: 90,
+          width: 120,
           slots: { title: 'applyUserName' },
           customRender: (text, row, index) => {
             return row.applyUserName
@@ -562,7 +563,13 @@ export default {
    * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
    * 如果 root 实例挂载了一个文档内元素，当 mounted 被调用时 vm.el 也在文档内。
    */
-  mounted() {},
+  mounted() {
+	  
+	  console.log( document.documentElement.clientHeight)
+	  console.log(document.getElementsByClassName("content")[0].offsetTop)
+	  
+	   this.tableHeight = document.documentElement.clientHeight - document.getElementsByClassName("content")[0].offsetTop - 160;
+  },
   // 组件方法
   methods: {
     /**
@@ -869,6 +876,9 @@ export default {
 /deep/ .ant-table-thead > tr > th, /deep/ .ant-table-tbody > tr > td {
    padding: 12px 8px !important;
 	}
+td:empty:before {
+    content: "-";
+}
 
 
 /deep/ .ant-table.ant-table-fixed-header .ant-table-scroll .ant-table-header{
@@ -921,7 +931,7 @@ export default {
   justify-content: center;
   align-items: center;
   font-size: 22px;
-  margin-top: 60px;
+  margin-top: 48px;
   padding-bottom: 32px;
   border-bottom: 1px solid #eee;
   // padding-right: 10px;
@@ -1094,4 +1104,11 @@ export default {
 // /deep/.ant-popover .ant-popover-content .ant-popover-inner-content {
 //   width: 200px !important;
 // }
+</style>
+<style>
+	.ant-modal-close-x{
+		    width: 44px;
+		    height: 44px;
+		    line-height: 44px;
+	}
 </style>
\ No newline at end of file
diff --git a/src/style/index.less b/src/style/index.less
index a114f45..8843a43 100644
--- a/src/style/index.less
+++ b/src/style/index.less
@@ -403,7 +403,7 @@ i {
 }
 .bodyContainer {
 	padding: 16px;
-	height: 97%;
+	// height: 97%;
 	background-color: #fff;
 }
 //通用类名样式结束
diff --git a/src/views/merchantBack.vue b/src/views/merchantBack.vue
index dc9a854..84b97a6 100644
--- a/src/views/merchantBack.vue
+++ b/src/views/merchantBack.vue
@@ -84,11 +84,16 @@
           </div>
         </div>
       </div>
-      <a-layout-content class="trans" style="padding-top: 64px">
+      <a-layout-content class="trans" style="padding-top: 64px;">
         <!-- <div id="littleUse" style="margin-top: 48px"> -->
         <router-view @setTitle="setTitle"></router-view>
         <!-- </div> -->
       </a-layout-content>
+	  
+		<div style="height: 64px;background-color: #f5f5f5;line-height: 64px;color: #999;font-size: 14px;text-align: center;padding-left: 152px;">
+			Copyright © 2015 - 2021 Matripe. All Rights Reserved.
+		</div>
+	  
     </div>
     <!-- <notice @parentPageCallBack="showMessageFromChild" ref="child"></notice> -->
   </div>
@@ -279,7 +284,7 @@ header.header,
 
 .trans {
   -webkit-transition: all 0.2s;
-  height: calc(100vh);
+  height: calc(100vh - 64px);
   // overflow: scroll;
   background-color: #f5f5f5;
   transition: all 0.2s;