feat:合并

src/views/projectcenter/TaskPage.vue

@@ -542,7 +542,7 @@
                     :data-source="tabledata"
                     :loading="tableDataTotal === -1 ? true : false"
                     expandRowByClick="true"
-                    :scroll="{ x: 1400, y: 350 }"
+                    :scroll="{ x: 1400 }"
                     @expand="expandTable"
                     :pagination="false"
                     :row-selection="{
@@ -794,7 +794,6 @@
         <a-tab-pane key="5" tab="项目积分">
           <ProjectScore></ProjectScore>
         </a-tab-pane>
-
         <a-tab-pane key="6" tab="排行榜">
           <div class="content6">
             <div class="title">排行榜</div>
@@ -2359,7 +2358,7 @@ export default {
           title: "姓名",
           dataIndex: "name",
           key: "name",
-          width: 50,
+          width: 30,
           align: "left",
           className: "h",
           // scopedSlots: { customRender: "action" }, //引入的插槽
@@ -2396,7 +2395,7 @@ export default {
           title: "部门",
           dataIndex: "bum",
           key: "bum",
-          width: 40,
+          width: 50,
           align: "center",
           className: "h",
         },
@@ -2404,7 +2403,7 @@ export default {
           title: "岗位",
           dataIndex: "gangw",
           key: "gangw",
-          width: 40,
+          width: 50,
           align: "center",
           className: "h",
         },
@@ -2412,7 +2411,7 @@ export default {
           title: "所属小组",
           dataIndex: "group",
           key: "group",
-          width: 40,
+          width: 50,
           align: "center",
           className: "h",
         },