From fd063e6ff4382501a89d897820ca343520388a61 Mon Sep 17 00:00:00 2001
From: songwc <songwc@dongwu-inc.com>
Date: Thu, 20 Oct 2022 09:29:11 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=AE=8C=E6=88=90=E5=9F=BA?=
 =?UTF-8?q?=E7=A1=80=E4=BF=A1=E6=81=AF=E6=8E=92=E8=A1=8C=E6=A6=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectcenter/TaskPage.vue | 306 ++++++++++++++++++++++++++-
 1 file changed, 304 insertions(+), 2 deletions(-)

diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 0179b6c1..1182f276 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -896,6 +896,17 @@
                     </div>
                   </div>
                 </div>
+                <div class="tab">
+                  <a-table
+                    :columns="jindutablecolumns"
+                    :data-source="jindutabledata"
+                    :loading="tableDataTotal === -1 ? true : false"
+                    expandRowByClick="true"
+                    :scroll="{ y: 330 }"
+                    @expand="expandTable"
+                    :pagination="false"
+                  />
+                </div>
               </div>
               <div class="rank">
                 <div class="rankhead">
@@ -910,6 +921,17 @@
                     </div>
                   </div>
                 </div>
+                <div class="tab">
+                  <a-table
+                    :columns="xuefentablecolumns"
+                    :data-source="xuefentabledata"
+                    :loading="tableDataTotal === -1 ? true : false"
+                    expandRowByClick="true"
+                    :scroll="{ y: 330 }"
+                    @expand="expandTable"
+                    :pagination="false"
+                  />
+                </div>
               </div>
               <div class="rank">
                 <div class="rankhead">
@@ -924,6 +946,17 @@
                     </div>
                   </div>
                 </div>
+                <div class="tab">
+                  <a-table
+                    :columns="xueshitablecolumns"
+                    :data-source="xueshitabledata"
+                    :loading="tableDataTotal === -1 ? true : false"
+                    expandRowByClick="true"
+                    :scroll="{ y: 330 }"
+                    @expand="expandTable"
+                    :pagination="false"
+                  />
+                </div>
               </div>
             </div>
           </div>
@@ -933,7 +966,9 @@
             <div class="set_tit">
               <span>基本信息</span>
             </div>
-            <hr color="#E8E8E8" />
+            <!-- <hr color="#E8E8E8" />
+             -->
+            <div class="line"></div>
             <div class="set_body">
               <div class="edit">
                 <div class="img"></div>
@@ -1387,6 +1422,250 @@ export default {
       valueDate: "", //排行榜输入日期
       noticeChecked: true,
       noticeContent: "请输入要发布的公告",
+
+      //进度排行表
+      jindutabledata: [
+        {
+          rank: "1",
+          name: "哈哈",
+          jd: "80%",
+        },
+
+        {
+          rank: "2",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "3",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "4",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "5",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "6",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "7",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "8",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "9",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "10",
+          name: "哈哈",
+          jd: "70%",
+        },
+      ],
+      jindutablecolumns: [
+        {
+          title: "排名",
+          dataIndex: "rank",
+          key: "rank",
+          width: 50,
+          align: "center",
+          className: "h",
+        },
+        {
+          title: "名称",
+          dataIndex: "name",
+          key: "name",
+          width: 50,
+          align: "center",
+          className: "h",
+        },
+
+        {
+          title: "进度",
+          dataIndex: "jd",
+          key: "jd",
+          width: 50,
+          align: "center",
+          className: "h",
+        },
+      ],
+      //学分排行表
+      xuefentabledata: [
+        {
+          rank: "1",
+          name: "哈哈",
+          jd: "80%",
+        },
+
+        {
+          rank: "2",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "3",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "4",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "5",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "6",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "7",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "8",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "9",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "10",
+          name: "哈哈",
+          jd: "70%",
+        },
+      ],
+      xuefentablecolumns: [
+        {
+          title: "排名",
+          dataIndex: "rank",
+          key: "rank",
+          width: 50,
+          align: "center",
+          className: "h",
+        },
+        {
+          title: "名称",
+          dataIndex: "name",
+          key: "name",
+          width: 50,
+          align: "center",
+          className: "h",
+        },
+
+        {
+          title: "进度",
+          dataIndex: "jd",
+          key: "jd",
+          width: 50,
+          align: "center",
+          className: "h",
+        },
+      ],
+      //学识排行表
+      xueshitabledata: [
+        {
+          rank: "1",
+          name: "哈哈",
+          jd: "80%",
+        },
+
+        {
+          rank: "2",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "3",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "4",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "5",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "6",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "7",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "8",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "9",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "10",
+          name: "哈哈",
+          jd: "70%",
+        },
+      ],
+      xueshitablecolumns: [
+        {
+          title: "排名",
+          dataIndex: "rank",
+          key: "rank",
+          width: 50,
+          align: "center",
+          className: "h",
+        },
+        {
+          title: "名称",
+          dataIndex: "name",
+          key: "name",
+          width: 50,
+          align: "center",
+          className: "h",
+        },
+
+        {
+          title: "进度",
+          dataIndex: "jd",
+          key: "jd",
+          width: 50,
+          align: "center",
+          className: "h",
+        },
+      ],
     });
     const showModal = () => {
       state.pubproject = true;
@@ -2539,7 +2818,7 @@ export default {
   .content6 {
     width: 100%;
     height: 100%;
-    background-color: #bfa;
+    // background-color: #bfa;
     .title {
       font-size: 18px;
       font-weight: 500;
@@ -2633,6 +2912,7 @@ export default {
         background: #ffffff;
         border-radius: 2px;
         border: 1px solid rgba(125, 125, 125, 0.39);
+        margin-bottom: 20px;
         .rankhead {
           height: 75px;
           width: 100%;
@@ -2664,6 +2944,22 @@ export default {
             }
           }
         }
+        .tab {
+          // margin-top: 20px;
+          // margin-left: 24px;
+          border-radius: 4px 4px 0px 0px;
+          border: 1px solid #e9e9e9;
+          margin: 20px 24px 0 24px;
+          th.h {
+            background-color: #eff4fc !important;
+          }
+
+          .ant-table-tbody
+            > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+            > td {
+            background: #f6f9fd;
+          }
+        }
       }
     }
   }
@@ -2674,6 +2970,12 @@ export default {
       font-weight: 500;
       color: #232425;
     }
+    .line {
+      width: 100%;
+      height: 1px;
+      background-color: #e8e8e8;
+      margin-top: 10px;
+    }
     .set_body {
       margin-left: 34px;
       margin-right: 34px;