From 3c9b61fef67afc383325295da4a4639f8dc8018b Mon Sep 17 00:00:00 2001
From: dongwug <guoys@dongwu-inc.com>
Date: Tue, 25 Oct 2022 11:43:13 +0800
Subject: [PATCH 01/13] =?UTF-8?q?feat:=E5=85=B3=E8=81=94=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=8A=BD=E5=B1=89=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=E5=AD=A6=E5=91=98=E8=8E=B7=E5=8F=96=E8=AF=A6=E6=83=85=E6=8A=BD?=
 =?UTF-8?q?=E5=B1=89=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/ProjectScore.vue   |  3 ---
 src/components/drawers/StuScoreDetail.vue | 17 +++++------------
 src/views/learningpath/LevelAddDetail.vue |  2 ++
 src/views/projectcenter/TaskPage.vue      |  1 -
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/components/drawers/ProjectScore.vue b/src/components/drawers/ProjectScore.vue
index 5f34c350..14b77a9c 100644
--- a/src/components/drawers/ProjectScore.vue
+++ b/src/components/drawers/ProjectScore.vue
@@ -467,14 +467,11 @@ export default {
       .ant-table-tbody{
      
       .pa {
-        // left: 0;
         margin-top: 15px;
-        width: 100%;
         // height: 20px;
         // background-color: red;
         display: flex;
         justify-content: center;
-        // position: absolute;
         // bottom: 20px;
       }
     } 
diff --git a/src/components/drawers/StuScoreDetail.vue b/src/components/drawers/StuScoreDetail.vue
index a2ca9d54..fef6efa1 100644
--- a/src/components/drawers/StuScoreDetail.vue
+++ b/src/components/drawers/StuScoreDetail.vue
@@ -23,8 +23,6 @@
                       :columns="tablecolumns"
                       :data-source="tabledata"
                       :loading="tableDataTotal === -1 ? true : false"
-        
-                      :scroll="{ x: 900, y: 560 }"
                       @expand="expandTable"
                       :pagination="false"
                     
@@ -218,16 +216,14 @@
       overflow-x: scroll;
       display: flex;
       flex-direction: column;
-  
       .header {
         height: 73px;
         border-bottom: 1px solid #e8e8e8;
         display: flex;
         justify-content: space-between;
         align-items: center;
-        // background-color: red;
         margin-bottom: 20px;
-  
+        flex-shrink: 0;
         .headerTitle {
           font-size: 18px;
           font-weight: 600;
@@ -252,6 +248,7 @@
      
   
         .tableBox {
+          padding-bottom: 100px;
           .ant-table-selection-column {
             padding: 0px !important;
             // padding-left: 45px !important;
@@ -290,15 +287,11 @@
               }
           }
           .pa {
-            // left: 0;
-            margin-top: 15px;
+            margin-top: 20px;
             width: 100%;
-            // height: 20px;
-            // background-color: red;
+            flex:1;
             display: flex;
             justify-content: center;
-            // position: absolute;
-            // bottom: 20px;
           }
         }
       }
@@ -313,7 +306,7 @@
         align-items: center;
         justify-content: center;
         box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
-  
+        background-color: #ffffff;
         .btn1 {
           width: 100px;
           height: 40px;
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index cbed01bb..9128a420 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -1228,6 +1228,7 @@ export default {
       align-items: center;
       // background-color: red;
       margin-bottom: 20px;
+      flex-shrink: 0;
       .headerTitle {
         font-size: 18px;
         font-weight: 600;
@@ -1258,6 +1259,7 @@ export default {
       align-items: center;
       justify-content: center;
       box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
+      background-color: #ffffff;
       .btn1 {
         width: 100px;
         height: 40px;
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 078557c2..f18d9e1c 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -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>

From 4c5ad8824ffedd1c1896aac51500d173ed7bf29d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B2=B3=E4=BD=B3=E9=91=AB?= <yuejx@dongwu-inc.com>
Date: Tue, 25 Oct 2022 12:02:25 +0800
Subject: [PATCH 02/13] =?UTF-8?q?feat:=E6=9F=A5=E7=9C=8B=E5=AD=A6=E5=91=98?=
 =?UTF-8?q?,=E6=9F=A5=E7=9C=8B=E6=9D=83=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/MemberList.vue |   4 +-
 src/components/drawers/QueryRight.vue |   6 +-
 src/components/drawers/SeeStu.vue     | 515 ++++++++++++++++----------
 src/components/drawers/StuAdd.vue     |  11 +-
 src/views/projectcenter/TaskPage.vue  |  10 +-
 5 files changed, 335 insertions(+), 211 deletions(-)

diff --git a/src/components/drawers/MemberList.vue b/src/components/drawers/MemberList.vue
index 06eb35c1..a546f63d 100644
--- a/src/components/drawers/MemberList.vue
+++ b/src/components/drawers/MemberList.vue
@@ -71,7 +71,7 @@
                     :data-source="tabledata"
                     :loading="tableDataTotal === -1 ? true : false"
                     expandRowByClick="true"
-                    :scroll="{ x: 900, y: 560 }"
+                    :scroll="{ x: 900 }"
                     @expand="expandTable"
                     :pagination="false"
                     :row-selection="{
@@ -324,7 +324,7 @@ export default {
       height: 100%;
 
       // background-color: #bfa;
-      // overflow-y: auto;
+      overflow-y: auto;
       .endtime {
         font-size: 16px;
         font-weight: 500;
diff --git a/src/components/drawers/QueryRight.vue b/src/components/drawers/QueryRight.vue
index b4484ffb..b7e26a90 100644
--- a/src/components/drawers/QueryRight.vue
+++ b/src/components/drawers/QueryRight.vue
@@ -69,7 +69,7 @@
                     :data-source="tabledata"
                     :loading="tableDataTotal === -1 ? true : false"
                     expandRowByClick="true"
-                    :scroll="{ x: 500, y: 560 }"
+                    :scroll="{ x: 500}"
                     @expand="expandTable"
                     :pagination="false"
                     :row-selection="{
@@ -148,7 +148,7 @@
                       :data-source="tabledata1"
                       :loading="tableDataTotal === -1 ? true : false"
                       expandRowByClick="true"
-                      :scroll="{ x: 500, y: 560 }"
+                      :scroll="{ x: 500 }"
                       @expand="expandTable"
                       :pagination="false"
                       :row-selection="{
@@ -229,7 +229,7 @@
                     :data-source="tabledata2"
                     :loading="tableDataTotal === -1 ? true : false"
                     expandRowByClick="true"
-                    :scroll="{ x: 500, y: 560 }"
+                    :scroll="{ x: 500 }"
                     @expand="expandTable"
                     :pagination="false"
                     :row-selection="{
diff --git a/src/components/drawers/SeeStu.vue b/src/components/drawers/SeeStu.vue
index b0c37c85..024bca6b 100644
--- a/src/components/drawers/SeeStu.vue
+++ b/src/components/drawers/SeeStu.vue
@@ -17,109 +17,219 @@
       </div>
       <div class="main">
         <div class="stuinfor">
-            <div class="portrait"><img src="../../assets/images/studentimg/character.png"/></div>
-            <div class="stumation">
-                <div class="stuname">王明</div>
-                <div class="stugangw">产研部门 - 产品经理</div>
+          <div class="portrait">
+            <img src="../../assets/images/studentimg/character.png" />
+          </div>
+          <div class="stumation">
+            <div class="stuname">王明</div>
+            <div class="stugangw">产研部门 - 产品经理</div>
+          </div>
+          <div class="sortbox">
+            <div class="sortname">进度排名</div>
+            <div class="sortnub">
+              <span class="nub1">2</span>
+              <span class="total">/10</span>
             </div>
-            <div class="sortbox">
-                <div class="sortname">进度排名</div>
-                <div class="sortnub">
-                    <span class="nub1">2</span>
-                    <span class="total">/10</span>
-                </div>
+          </div>
+          <a-divider
+            type="vertical"
+            style="
+              height: 49px;
+              margin-left: 34px;
+              background-color: rgba(170, 166, 166, 0.3);
+            "
+          />
+          <div class="sortbox" style="margin-left: 34px">
+            <div class="sortname">完成必修</div>
+            <div class="sortnub">
+              <span class="nub1">3</span>
+              <span class="total">/10</span>
             </div>
-            <a-divider type="vertical" style="height: 49px;margin-left: 34px; background-color: rgba(170, 166, 166, 0.3)" />
-            <div class="sortbox" style="margin-left: 34px">
-                <div class="sortname">完成必修</div>
-                <div class="sortnub">
-                    <span class="nub1">3</span>
-                    <span class="total">/10</span>
-                </div>
-            </div>
-            <a-divider type="vertical" style="height: 49px;margin-left: 34px; background-color: rgba(170, 166, 166, 0.3)" />
-            <div class="sortbox" style="margin-left: 34px">
-                <div class="sortname">已修证书</div>
-                <div class="sortnub">
-                    <span class="nub1">1</span>                   
-                </div>
+          </div>
+          <a-divider
+            type="vertical"
+            style="
+              height: 49px;
+              margin-left: 34px;
+              background-color: rgba(170, 166, 166, 0.3);
+            "
+          />
+          <div class="sortbox" style="margin-left: 34px">
+            <div class="sortname">已修证书</div>
+            <div class="sortnub">
+              <span class="nub1">1</span>
             </div>
+          </div>
         </div>
         <div class="secondrow">
-            <div class="rowleft">产品经理管理 - 腾飞班1</div>
-            <div class="rowbox" @click="showProMess">
-                <div class="shuom">说明</div>
-                <div><img src="../../assets/images/studentimg/chak.png"/></div>
-            </div>
+          <div class="rowleft">产品经理管理 - 腾飞班1</div>
+          <div class="rowbox" @click="showProMess">
+            <div class="shuom">说明</div>
+            <div><img src="../../assets/images/studentimg/chak.png" /></div>
+          </div>
         </div>
         <div class="mainbox">
-            <div class="rowtitle">
-                <div class="titleimg"><img src="../../assets/images/studentimg/open.png"/></div>
-                <div class="titletext">阶段1 腾飞班阶段1</div>
+          <div class="rowtitle" @click="changeDown">
+            <div class="titleimg">
+              <img
+                :src="
+                  showDown
+                    ? require('../../assets/images/studentimg/open.png')
+                    : require('../../assets/images/studentimg/close.png')
+                "
+              />
+            </div>
+            <div class="titletext">阶段1 腾飞班阶段1</div>
+          </div>
+          <div :style="{ display: showDown ? 'block' : 'none' }">
+            <div class="rowclass">
+              <div class="leftclass">
+                <div><img src="../../assets/images/leveladd/zai.png" /></div>
+                <div class="text1">在线</div>
+                <div class="text2">如何成为一个产品经理</div>
+              </div>
+              <div class="alreadyclass">
+                <div class="alimg">
+                  <img src="../../assets/images/studentimg/complete.png" />
+                </div>
+                <div class="altext">已完成</div>
+              </div>
             </div>
             <div class="rowclass">
-                <div class="leftclass">
-                    <div><img src="../../assets/images/leveladd/zai.png"/></div>
-                    <div class="text1">在线</div>
-                    <div class="text2">如何成为一个产品经理</div>
-                </div>
-                <div class="alreadyclass">
-                    <div class="alimg"><img src="../../assets/images/studentimg/complete.png"/></div>
-                    <div class="altext">已完成</div>
+              <div class="leftclass">
+                <div><img src="../../assets/images/leveladd/zhi.png" /></div>
+                <div class="text1">直播</div>
+                <div class="text2">管理者播课</div>
+              </div>
+              <div class="alreadyclass">
+                <div class="alimg">
+                  <img src="../../assets/images/studentimg/complete.png" />
                 </div>
+                <div class="altext">已完成</div>
+              </div>
             </div>
             <div class="rowclass">
-                <div class="leftclass">
-                    <div><img src="../../assets/images/leveladd/zhi.png"/></div>
-                    <div class="text1">直播</div>
-                    <div class="text2">管理者播课</div>
-                </div>
-                <div class="alreadyclass">
-                    <div class="alimg"><img src="../../assets/images/studentimg/complete.png"/></div>
-                    <div class="altext">已完成</div>
+              <div class="leftclass">
+                <div><img src="../../assets/images/leveladd/mian.png" /></div>
+                <div class="text1">面授</div>
+                <div class="text2">管理面授课</div>
+              </div>
+              <div class="alreadyclass">
+                <div class="alimg">
+                  <img src="../../assets/images/studentimg/notice.png" />
                 </div>
+                <div class="altext">未完成</div>
+              </div>
             </div>
             <div class="rowclass">
-                <div class="leftclass">
-                    <div><img src="../../assets/images/leveladd/mian.png"/></div>
-                    <div class="text1">面授</div>
-                    <div class="text2">管理面授课</div>
-                </div>
-                <div class="alreadyclass">
-                    <div class="alimg"><img src="../../assets/images/studentimg/notice.png"/></div>
-                    <div class="altext">未完成</div>
+              <div class="leftclass">
+                <div><img src="../../assets/images/leveladd/huo.png" /></div>
+                <div class="text1">活动</div>
+                <div class="text2">管理者活动</div>
+              </div>
+              <div class="alreadyclass">
+                <div class="alimg">
+                  <img src="../../assets/images/studentimg/notice.png" />
                 </div>
+                <div class="altext">未完成</div>
+              </div>
             </div>
             <div class="rowclass">
-                <div class="leftclass">
-                    <div><img src="../../assets/images/leveladd/huo.png"/></div>
-                    <div class="text1">活动</div>
-                    <div class="text2">管理者活动</div>
-                </div>
-                <div class="alreadyclass">
-                    <div class="alimg"><img src="../../assets/images/studentimg/notice.png"/></div>
-                    <div class="altext">未完成</div>
-                </div>
-            </div>
-            <div class="rowclass">
-                <div class="leftclass">
-                    <div><img src="../../assets/images/leveladd/zuo.png"/></div>
-                    <div class="text1">作业</div>
-                    <div class="text2">管理者作业</div>
-                </div>
-                <div class="alreadyclass">
-                    <div class="alimg"><img src="../../assets/images/studentimg/notice.png"/></div>
-                    <div class="altext">未完成</div>
+              <div class="leftclass">
+                <div><img src="../../assets/images/leveladd/zuo.png" /></div>
+                <div class="text1">作业</div>
+                <div class="text2">管理者作业</div>
+              </div>
+              <div class="alreadyclass">
+                <div class="alimg">
+                  <img src="../../assets/images/studentimg/notice.png" />
                 </div>
+                <div class="altext">未完成</div>
+              </div>
             </div>
+          </div>
         </div>
-        <div class="mainbox" style="margin-top: 15px; height: 56px">
-            <div class="rowtitle">
-                <div class="titleimg"><img src="../../assets/images/studentimg/close.png"/></div>
-                <div class="titletext">阶段2 腾飞班阶段2</div>
+        <div class="mainbox">
+          <div class="rowtitle" @click="changeDown1">
+            <div class="titleimg">
+              <img
+                :src="
+                  showDown1
+                    ? require('../../assets/images/studentimg/open.png')
+                    : require('../../assets/images/studentimg/close.png')
+                "
+              />
             </div>
+            <div class="titletext">阶段2 腾飞班阶段2</div>
+          </div>
+          <div :style="{ display: showDown1 ? 'block' : 'none' }">
+            <div class="rowclass">
+              <div class="leftclass">
+                <div><img src="../../assets/images/leveladd/zai.png" /></div>
+                <div class="text1">在线</div>
+                <div class="text2">如何成为一个产品经理</div>
+              </div>
+              <div class="alreadyclass">
+                <div class="alimg">
+                  <img src="../../assets/images/studentimg/complete.png" />
+                </div>
+                <div class="altext">已完成</div>
+              </div>
+            </div>
+            <div class="rowclass">
+              <div class="leftclass">
+                <div><img src="../../assets/images/leveladd/zhi.png" /></div>
+                <div class="text1">直播</div>
+                <div class="text2">管理者播课</div>
+              </div>
+              <div class="alreadyclass">
+                <div class="alimg">
+                  <img src="../../assets/images/studentimg/complete.png" />
+                </div>
+                <div class="altext">已完成</div>
+              </div>
+            </div>
+            <div class="rowclass">
+              <div class="leftclass">
+                <div><img src="../../assets/images/leveladd/mian.png" /></div>
+                <div class="text1">面授</div>
+                <div class="text2">管理面授课</div>
+              </div>
+              <div class="alreadyclass">
+                <div class="alimg">
+                  <img src="../../assets/images/studentimg/notice.png" />
+                </div>
+                <div class="altext">未完成</div>
+              </div>
+            </div>
+            <div class="rowclass">
+              <div class="leftclass">
+                <div><img src="../../assets/images/leveladd/huo.png" /></div>
+                <div class="text1">活动</div>
+                <div class="text2">管理者活动</div>
+              </div>
+              <div class="alreadyclass">
+                <div class="alimg">
+                  <img src="../../assets/images/studentimg/notice.png" />
+                </div>
+                <div class="altext">未完成</div>
+              </div>
+            </div>
+            <div class="rowclass">
+              <div class="leftclass">
+                <div><img src="../../assets/images/leveladd/zuo.png" /></div>
+                <div class="text1">作业</div>
+                <div class="text2">管理者作业</div>
+              </div>
+              <div class="alreadyclass">
+                <div class="alimg">
+                  <img src="../../assets/images/studentimg/notice.png" />
+                </div>
+                <div class="altext">未完成</div>
+              </div>
+            </div>
+          </div>
         </div>
-        
       </div>
       <div class="btnn">
         <button class="btn2">关闭</button>
@@ -144,6 +254,8 @@ export default {
   setup(props, ctx) {
     const state = reactive({
         Provisible: false,
+        showDown: true,
+        showDown1: false,
     });
     const closeDrawer = () => {
       ctx.emit("update:Seevisible", false);
@@ -155,12 +267,19 @@ export default {
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
     };
-
+    const changeDown = () => {
+      state.showDown = !state.showDown;
+    };
+    const changeDown1 = () => {
+      state.showDown1 = !state.showDown1;
+    };
     return {
       ...toRefs(state),
       afterVisibleChange,
       closeDrawer,
       showProMess,
+      changeDown,
+      changeDown1,
       // change,
     };
   },
@@ -192,6 +311,7 @@ export default {
       align-items: center;
       // background-color: red;
       margin-bottom: 20px;
+      flex-shrink: 0;
       .headerTitle {
         font-size: 18px;
         font-weight: 600;
@@ -201,144 +321,147 @@ export default {
       }
     }
     .main {
-       display: flex;
-       flex-direction: column;
-       .stuinfor {
-          display: flex;
-          align-items: center;
-          height: 133px;
-          margin-top: 20px;
-          margin-right: 37px;
-          background-image: url("../../assets/images/studentimg/bgimg.png");
-          background-repeat: no-repeat;
-          background-position: right;
-          .stumation {
-            margin-left: 24px;
-            .stuname {
-                color: #333333;
-                font-size: 18px;
-            }
-            .stugangw {
-                color: #999999;
-                font-size: 16px;
-                margin-top: 7px;
-            }
+      display: flex;
+      flex-direction: column;
+      overflow-y: auto;
+      padding-bottom: 80px;
+      .stuinfor {
+        display: flex;
+        align-items: center;
+        height: 133px;
+        margin-top: 20px;
+        margin-right: 37px;
+        background-image: url("../../assets/images/studentimg/bgimg.png");
+        background-repeat: no-repeat;
+        background-position: right;
+        .stumation {
+          margin-left: 24px;
+          .stuname {
+            color: #333333;
+            font-size: 18px;
           }
-          .sortbox {
-            display: flex;
-            flex-direction: column;
-            justify-content: center;
-            margin-left: 114px;
-            .sortname {
-                color: #666660;
-                font-size: 14px;
-            }
-            .sortnub {
-                display: flex;
-                justify-content: center;
-                margin-top: 7px;
-                .nub1 {
-                    color: #0060FF;
-                    font-size: 22px;
-                }
-                .total {
-                    color: #999999;
-                    font-size: 22px;
-                }
-            }
-          }
-       }
-       .secondrow {
-         margin-top: 32px;
-         display: flex;
-         .rowleft {
-            color: rgba(51, 51, 51, 1);
+          .stugangw {
+            color: #999999;
             font-size: 16px;
-         }
-         .rowbox {
-            width: 64px;
-            height: 24px;
+            margin-top: 7px;
+          }
+        }
+        .sortbox {
+          display: flex;
+          flex-direction: column;
+          justify-content: center;
+          margin-left: 114px;
+          .sortname {
+            color: #666660;
+            font-size: 14px;
+          }
+          .sortnub {
             display: flex;
             justify-content: center;
-            align-items: center;
-            margin-left: 24px;
-            border: 1px solid rgba(64, 158, 255, 1);
-            background: rgba(64, 158, 255, 0.1);
-            cursor: pointer;
-            .shuom {
-                color: rgba(64, 158, 255, 1);
-                font-size: 14px;
-                line-height: 20px;
-                margin-right: 5px;
+            margin-top: 7px;
+            .nub1 {
+              color: #0060ff;
+              font-size: 22px;
             }
-         }
-       }
-       .mainbox {
-        height: 463px;
+            .total {
+              color: #999999;
+              font-size: 22px;
+            }
+          }
+        }
+      }
+      .secondrow {
+        margin-top: 32px;
+        display: flex;
+        .rowleft {
+          color: rgba(51, 51, 51, 1);
+          font-size: 16px;
+        }
+        .rowbox {
+          width: 64px;
+          height: 24px;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          margin-left: 24px;
+          border: 1px solid rgba(64, 158, 255, 1);
+          background: rgba(64, 158, 255, 0.1);
+          cursor: pointer;
+          .shuom {
+            color: rgba(64, 158, 255, 1);
+            font-size: 14px;
+            line-height: 20px;
+            margin-right: 5px;
+          }
+        }
+      }
+      .mainbox {
+        // height: 463px;
         margin-right: 37px;
         margin-top: 32px;
         border: 1px solid rgba(221, 238, 255, 1);
         border-radius: 6px;
         .rowtitle {
-            height: 56px;
-            background: rgba(240, 246, 252, 1);
-            display: flex;
-            align-items: center;
-            .titleimg {
-                width: 20px;
-                height: 20px;
-                margin-left: 23px;
-            }
-            .titletext {
-                color: rgba(51, 51, 51, 1);
-                font-size: 16px;
-                font-weight: 500;
-                margin-left: 16px;
-            }
+          height: 56px;
+          background: rgba(240, 246, 252, 1);
+          display: flex;
+          align-items: center;
+          .titleimg {
+            width: 20px;
+            height: 20px;
+            margin-left: 23px;
+          }
+          .titletext {
+            color: rgba(51, 51, 51, 1);
+            font-size: 16px;
+            font-weight: 500;
+            margin-left: 16px;
+          }
         }
         .rowclass {
-            height: 81px;
-            border-bottom: 1px solid rgba(221, 238, 255, 1);
+          height: 81px;
+          border-bottom: 1px solid rgba(221, 238, 255, 1);
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          .leftclass {
             display: flex;
-            justify-content: space-between;
+            margin-left: 25px;
             align-items: center;
-            .leftclass {
-                display: flex;
-                margin-left: 25px;
-                align-items: center;
-                .text1 {
-                    color: #000000;
-                    font-size: 14px;
-                    font-weight: 500;
-                    margin-left: 25px;
-                }
-                .text2 {
-                    color: rgba(51, 51, 51, 0.8);
-                    font-size: 14px;
-                    margin-left: 65px;
-                }
+            .text1 {
+              color: #000000;
+              font-size: 14px;
+              font-weight: 500;
+              margin-left: 25px;
             }
-            .alreadyclass {
-                display: flex;
-                margin-right: 57px;
-                .alimg {
-                    height: 16px;
-                    width: 16px;
-                }
-                .altext {
-                    color: rgba(56, 125, 247, 1);
-                    font-size: 14px;
-                    margin-left: 16px;
-                }
+            .text2 {
+              color: rgba(51, 51, 51, 0.8);
+              font-size: 14px;
+              margin-left: 65px;
             }
+          }
+          .alreadyclass {
+            display: flex;
+            margin-right: 57px;
+            .alimg {
+              height: 16px;
+              width: 16px;
+            }
+            .altext {
+              color: rgba(56, 125, 247, 1);
+              font-size: 14px;
+              margin-left: 16px;
+            }
+          }
         }
-       }
+      }
     }
     .btnn {
       height: 72px;
       width: 100%;
       position: absolute;
       bottom: 0;
+      background-color: #fff;
       left: 0;
       display: flex;
       align-items: center;
diff --git a/src/components/drawers/StuAdd.vue b/src/components/drawers/StuAdd.vue
index 01ae2c16..41c5d31b 100644
--- a/src/components/drawers/StuAdd.vue
+++ b/src/components/drawers/StuAdd.vue
@@ -72,7 +72,7 @@
                       :data-source="tabledata"
                       :loading="tableDataTotal === -1 ? true : false"
                       expandRowByClick="true"
-                      :scroll="{ x: 500, y: 560 }"
+                      :scroll="{ x: 500 }"
                       @expand="expandTable"
                       :pagination="false"
                       :row-selection="{
@@ -156,7 +156,7 @@
                         :data-source="tabledata1"
                         :loading="tableDataTotal === -1 ? true : false"
                         expandRowByClick="true"
-                        :scroll="{ x: 500, y: 560 }"
+                        :scroll="{ x: 500}"
                         @expand="expandTable"
                         :pagination="false"
                         :row-selection="{
@@ -246,7 +246,7 @@
                       :data-source="tabledata2"
                       :loading="tableDataTotal === -1 ? true : false"
                       expandRowByClick="true"
-                      :scroll="{ x: 500, y: 560 }"
+                      :scroll="{ x: 500 }"
                       @expand="expandTable"
                       :pagination="false"
                       :row-selection="{
@@ -1073,7 +1073,7 @@ export default {
     }
     .main {
       display: flex;
-      // height: 80%;
+      //height: 80%;
       margin-bottom: 72px;
       overflow-y: auto;
       .left {
@@ -1274,7 +1274,8 @@ export default {
               // bottom: 20px;
               .ant-pagination-item,
               .ant-pagination-prev,
-              .ant-pagination-next {
+              .ant-pagination-next,
+              .ant-pagination-options {
                 margin-bottom: 10px;
               }
             }
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 078557c2..6e3db51f 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/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="{
@@ -2358,7 +2358,7 @@ export default {
           title: "姓名",
           dataIndex: "name",
           key: "name",
-          width: 50,
+          width: 30,
           align: "left",
           className: "h",
           // scopedSlots: { customRender: "action" }, //引入的插槽
@@ -2395,7 +2395,7 @@ export default {
           title: "部门",
           dataIndex: "bum",
           key: "bum",
-          width: 40,
+          width: 50,
           align: "center",
           className: "h",
         },
@@ -2403,7 +2403,7 @@ export default {
           title: "岗位",
           dataIndex: "gangw",
           key: "gangw",
-          width: 40,
+          width: 50,
           align: "center",
           className: "h",
         },
@@ -2411,7 +2411,7 @@ export default {
           title: "所属小组",
           dataIndex: "group",
           key: "group",
-          width: 40,
+          width: 50,
           align: "center",
           className: "h",
         },

From 4e0937050835d2633d54d11176563f9f06ab6e09 Mon Sep 17 00:00:00 2001
From: dongwug <guoys@dongwu-inc.com>
Date: Tue, 25 Oct 2022 12:11:44 +0800
Subject: [PATCH 03/13] =?UTF-8?q?feat:=E5=AD=A6=E4=B9=A0=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E5=9B=BE=E6=B7=BB=E5=8A=A0=E5=AD=A6=E5=91=98=E7=9A=84=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=AD=A6=E5=91=98=E5=92=8C=E5=AF=BC=E5=85=A5=E5=AD=A6?=
 =?UTF-8?q?=E5=91=98=E5=8A=9F=E8=83=BD=20=E5=AF=BC=E5=85=A5=E5=AD=A6?=
 =?UTF-8?q?=E5=91=98=E7=9A=84=E5=BC=B9=E7=AA=97=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddLevelImportStu.vue |   1 +
 src/components/drawers/ImportStu.vue         |   1 +
 src/views/learningpath/LevelAddDetail.vue    | 638 ++++++++++---------
 3 files changed, 331 insertions(+), 309 deletions(-)

diff --git a/src/components/drawers/AddLevelImportStu.vue b/src/components/drawers/AddLevelImportStu.vue
index fdf9464d..ce7767bb 100644
--- a/src/components/drawers/AddLevelImportStu.vue
+++ b/src/components/drawers/AddLevelImportStu.vue
@@ -143,6 +143,7 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
+      flex-shrink: 0;
       // background-color: red;
       margin-bottom: 20px;
       .headerTitle {
diff --git a/src/components/drawers/ImportStu.vue b/src/components/drawers/ImportStu.vue
index b1d7c751..a0a89d66 100644
--- a/src/components/drawers/ImportStu.vue
+++ b/src/components/drawers/ImportStu.vue
@@ -145,6 +145,7 @@ export default {
       align-items: center;
       // background-color: red;
       margin-bottom: 20px;
+      flex-shrink: 0;
       .headerTitle {
         font-size: 18px;
         font-weight: 600;
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 9128a420..09a7a8d3 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -368,80 +368,80 @@
       </div>
       <div class="boom">
         <div class="boomcen">
-        <div class="xwid">
-          <div class="xin">
-            <div class="xheadb">
-              <button class="addx">添加学员</button>
-              <!-- 点击抽屉组件在LevelAdd，此处没添加showAddStu、showImpStu -->
-              <button class="addd">导入学员</button>
-              <button class="addd">批量删除</button>
-            </div>
-            <div class="talk">
-              <img class="im" src="../../assets/images/leveladd/gan.png" />
-              <div class="xu">
-                <span class="yi">已选择</span>
-                <div style="width: 5px; display: inline-block"></div>
-                <span class="th">3</span>
-                <div style="width: 5px; display: inline-block"></div>
-                <span class="yi">项</span>
-                <span class="zon">列表选项总数：</span>
-                <span class="yi">5</span>
-                <span class="yi">条</span>
+          <div class="xwid">
+            <div class="xin">
+              <div class="xheadb">
+                <button class="addx" @click="showAddStu">添加学员</button>
+                <!-- 点击抽屉组件在LevelAdd，此处没添加showAddStu、showImpStu -->
+                <button class="addd" @click="showImpStu">导入学员</button>
+                <button class="addd">批量删除</button>
               </div>
-            </div>
-            <div class="tableBox" style="margin-top: 30px">
-              <a-table
-                style="border: 1px solid #f2f6fe"
-                :columns="tableDataFunc2()"
-                :scroll="{ y: 235 }"
-                :data-source="tableData2"
-                :loading="tableDataTotal === -1 ? true : false"
-                expandRowByClick="true"
-                @expand="expandTable"
-                :pagination="false"
-                :row-selection="{
-                  columnWidth: 30,
-                  selectedRowKeys: selectedRowKeys,
-                  onChange: onSelectChange,
-                }"
-              />
-              <div class="pa">
-                <a-pagination
-                  showSizeChanger="true"
-                  showQuickJumper="true"
-                  hideOnSinglePage="true"
-                  :pageSize="pageSize"
-                  :current="currentPage"
-                  :total="tableDataTotal"
-                  class="pagination"
-                />
-              </div>
-              <!-- 无数据样式 -->
-              <div
-                class="notable"
-                :style="{ display: stm_hs ? 'block' : 'none' }"
-              >
-                <div class="notablebox">
-                  <div class="boxbody">
-                    <div class="boximg"></div>
-                    <div class="boxtitle">
-                      <span style="color: #ffb64e; font-size: 20px"
-                        >无学员</span
-                      >
-                    </div>
-                    <div class="boxtitle2">
-                      <span style="color: #878b92">请添加学员或导入学员</span>
-                    </div>
-                  </div>
-                  <div class="smallleft"></div>
-                  <div class="smallright"></div>
+              <div class="talk">
+                <img class="im" src="../../assets/images/leveladd/gan.png" />
+                <div class="xu">
+                  <span class="yi">已选择</span>
+                  <div style="width: 5px; display: inline-block"></div>
+                  <span class="th">3</span>
+                  <div style="width: 5px; display: inline-block"></div>
+                  <span class="yi">项</span>
+                  <span class="zon">列表选项总数：</span>
+                  <span class="yi">5</span>
+                  <span class="yi">条</span>
                 </div>
               </div>
-              <!-- 无数据样式 -->
+              <div class="tableBox" style="margin-top: 30px">
+                <a-table
+                  style="border: 1px solid #f2f6fe"
+                  :columns="tableDataFunc2()"
+                  :scroll="{ y: 235 }"
+                  :data-source="tableData2"
+                  :loading="tableDataTotal === -1 ? true : false"
+                  expandRowByClick="true"
+                  @expand="expandTable"
+                  :pagination="false"
+                  :row-selection="{
+                    columnWidth: 30,
+                    selectedRowKeys: selectedRowKeys,
+                    onChange: onSelectChange,
+                  }"
+                />
+                <div class="pa">
+                  <a-pagination
+                    showSizeChanger="true"
+                    showQuickJumper="true"
+                    hideOnSinglePage="true"
+                    :pageSize="pageSize"
+                    :current="currentPage"
+                    :total="tableDataTotal"
+                    class="pagination"
+                  />
+                </div>
+                <!-- 无数据样式 -->
+                <div
+                  class="notable"
+                  :style="{ display: stm_hs ? 'block' : 'none' }"
+                >
+                  <div class="notablebox">
+                    <div class="boxbody">
+                      <div class="boximg"></div>
+                      <div class="boxtitle">
+                        <span style="color: #ffb64e; font-size: 20px"
+                          >无学员</span
+                        >
+                      </div>
+                      <div class="boxtitle2">
+                        <span style="color: #878b92">请添加学员或导入学员</span>
+                      </div>
+                    </div>
+                    <div class="smallleft"></div>
+                    <div class="smallright"></div>
+                  </div>
+                </div>
+                <!-- 无数据样式 -->
+              </div>
             </div>
+            <div class="pad"></div>
           </div>
-          <div class="pad"></div>
-        </div>
         </div>
       </div>
       <div class="footbtn">
@@ -455,11 +455,17 @@
         </div>
       </div>
     </div>
+    <!-- 添加学员抽屉 -->
+    <add-stu v-model:AddSvisible="AddSvisible" />
+    <!-- 导入学员抽屉 -->
+    <imp-stu v-model:AddImpStuvisible="AddImpStuvisible" />
   </div>
 </template>
 
 <script>
 import { reactive, toRefs, onMounted, onUnmounted } from "vue";
+import AddStu from "../../components/drawers/AddLevelAddStu";
+import ImpStu from "../../components/drawers/AddLevelImportStu";
 const drawercolumns = [
   {
     title: "项目名称",
@@ -500,6 +506,10 @@ const drawercolumns = [
 ];
 export default {
   name: "LevelAddDetail",
+  components: {
+    AddStu,
+    ImpStu,
+  },
   setup() {
     const state = reactive({
       level: [
@@ -784,6 +794,8 @@ export default {
       tableDataTotal: 100,
       pageSize: 10,
       visible: false,
+      AddSvisible: false, //添加学员抽屉
+      AddImpStuvisible: false, //导入学员抽屉
       modal: false,
       clos: false,
       stm_hs: false,
@@ -808,6 +820,12 @@ export default {
     const afterVisibleChange = (bool) => {
       console.log("visible", bool);
     };
+    const showAddStu = () => {
+      state.AddSvisible = true;
+    };
+    const showImpStu = () => {
+      state.AddImpStuvisible = true;
+    };
     const tableDataFunc = () => {
       const columns = [
         {
@@ -1051,6 +1069,8 @@ export default {
       showModal,
       closeModal,
       afterVisibleChange,
+      showAddStu,
+      showImpStu,
       drawercolumns,
       onSelectChange,
       changebgc,
@@ -1648,275 +1668,275 @@ export default {
           }
         }
         .xwid {
-        position: relative;
-        margin-top: 30px;
-        display: flex;
-        margin-bottom: 20px;
-        .xin {
-          width: 100%;
-          .xheadb {
-            display: flex;
-            .addx {
-              width: 130px;
-              height: 40px;
-              background: #4ea6ff;
-              border-radius: 8px;
-              color: #fff;
-              border: 0;
-              cursor: pointer;
-              margin-right: 20px;
-            }
-            .addd {
-              width: 130px;
-              height: 40px;
-              background: #fff;
-              border-radius: 8px;
-              border: 1px solid #4ea6ff;
-              color: #4ea6ff;
-              cursor: pointer;
-              margin-right: 20px;
-            }
-            .select {
-              .ant-select {
-                //
-                // border: 0 !important;
-                border-radius: 11px;
-                .ant-select-selector {
-                  border: 1px solid #4ea6ff !important;
-                  .ant-select-selection-placeholder {
-                    padding-left: 15px;
-                    color: #4ea6ff;
+          position: relative;
+          margin-top: 30px;
+          display: flex;
+          margin-bottom: 20px;
+          .xin {
+            width: 100%;
+            .xheadb {
+              display: flex;
+              .addx {
+                width: 130px;
+                height: 40px;
+                background: #4ea6ff;
+                border-radius: 8px;
+                color: #fff;
+                border: 0;
+                cursor: pointer;
+                margin-right: 20px;
+              }
+              .addd {
+                width: 130px;
+                height: 40px;
+                background: #fff;
+                border-radius: 8px;
+                border: 1px solid #4ea6ff;
+                color: #4ea6ff;
+                cursor: pointer;
+                margin-right: 20px;
+              }
+              .select {
+                .ant-select {
+                  //
+                  // border: 0 !important;
+                  border-radius: 11px;
+                  .ant-select-selector {
+                    border: 1px solid #4ea6ff !important;
+                    .ant-select-selection-placeholder {
+                      padding-left: 15px;
+                      color: #4ea6ff;
+                    }
                   }
                 }
               }
             }
-          }
-          .talk {
-            margin-top: 24px;
-            margin-bottom: 11px;
-            width: 100%;
-            height: 50px;
-            background: #f5faff;
-            border: 1px solid #4ea6ff;
-            // opacity: 0.22;
-            display: flex;
-            align-items: center;
-            .im {
-              width: 14px;
-              height: 15px;
-              margin-left: 27px;
-              margin-top: -3px;
-            }
-            .xu {
-              height: 100%;
-              line-height: 50px;
-              margin-left: 13px;
-              .yi {
-                color: #4f5156;
-                font-size: 14px;
-              }
-              .zon {
-                color: #999ba3;
-                font-size: 14px;
-                margin-left: 34px;
-              }
-              .th {
-                color: #4ea6ff;
-              }
-            }
-          }
-          .tableBox {
-            margin-bottom: 80px;
-
-            .classify {
-              margin-left: 11px !important;
-              padding-left: 9px !important;
-            }
-            .ant-checkbox-wrapper {
-              align-items: center;
-              margin-top: -2px;
-            }
-            .ant-table-selection-column {
-              padding: 0px !important;
-              padding-left: 38px !important;
-            }
-            .ant-table-thead > tr > th {
-              background-color: rgba(239, 244, 252, 1);
-            }
-            th.h {
-              background-color: #eff4fc !important;
-            }
-
-            .ant-table-tbody
-              > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
-              > td {
-              background: #f6f9fd;
-            }
-            .pa {
-              left: 0;
+            .talk {
+              margin-top: 24px;
+              margin-bottom: 11px;
               width: 100%;
-              // height: 20px;
-              // background-color: red;
+              height: 50px;
+              background: #f5faff;
+              border: 1px solid #4ea6ff;
+              // opacity: 0.22;
               display: flex;
-              justify-content: center;
-              position: absolute;
-              bottom: 0px;
-            }
-          }
-        }
-      }
-      .Gcon {
-        display: flex;
-        .pad {
-          height: 100%;
-          width: 40px;
-        }
-        .Gin {
-          // background-color: #bfa;
-          margin-top: 30px;
-          .headone {
-            // background-color: red;
-            display: flex;
-            text-align: center;
-            .box {
-              width: 4px;
-              height: 20px;
-              background-color: #4ea6ff;
-              border-radius: 2px;
-            }
-            .onetitle {
-              margin-left: 15px;
-              color: #333333;
-              font-size: 14px;
-            }
-            .oneedi {
-              margin-left: 15px;
-              color: #4ea6ff;
-              cursor: pointer;
-            }
-            .twobtn {
-              display: flex;
-              .btnone {
-                width: 42px;
-                height: 24px;
-                border: 1px solid rgba(64, 158, 255, 1);
-                border-radius: 4px;
-                color: rgba(64, 158, 255, 1);
-                margin-left: 20px;
-                cursor: pointer;
+              align-items: center;
+              .im {
+                width: 14px;
+                height: 15px;
+                margin-left: 27px;
+                margin-top: -3px;
               }
-              .btntwo {
-                width: 42px;
-                height: 24px;
-                border: 1px solid rgba(64, 158, 255, 1);
-                border-radius: 4px;
-                color: #ffffff;
-                margin-left: 20px;
-                background: #409eff;
-                cursor: pointer;
-              }
-            }
-          }
-          .onemain {
-            margin-top: 20px;
-            margin-left: 55px;
-            color: #6f6f6f;
-            font-size: 14px;
-            .checkcon {
-              position: relative;
-              .in {
-                position: absolute;
-                // margin-top: 10px;
-                left: 0;
-                top: 3px;
-              }
-              .yulan {
-                // color: yellow;
-                margin-left: 22px;
-                // display: inline-block;
-              }
-              .yulan2 {
-                margin-left: 22px;
-              }
-              .ant-input-number {
-                height: 24px;
-                width: 24px;
-                margin: 10px;
-                border-radius: 4px;
-                border: 1px solid #6d7584;
-                .ant-input-number-input {
-                  width: 100%;
-                  height: 100%;
+              .xu {
+                height: 100%;
+                line-height: 50px;
+                margin-left: 13px;
+                .yi {
+                  color: #4f5156;
                   font-size: 14px;
-                  padding: 0;
-                  color: #409eff;
-                  text-align: center;
+                }
+                .zon {
+                  color: #999ba3;
+                  font-size: 14px;
+                  margin-left: 34px;
+                }
+                .th {
+                  color: #4ea6ff;
                 }
               }
             }
-          }
-          .twomain {
-            margin-left: 20px;
-            margin-top: 20px;
-            .ant-switch-checked {
-              background-color: #5dc988;
+            .tableBox {
+              margin-bottom: 80px;
+
+              .classify {
+                margin-left: 11px !important;
+                padding-left: 9px !important;
+              }
+              .ant-checkbox-wrapper {
+                align-items: center;
+                margin-top: -2px;
+              }
+              .ant-table-selection-column {
+                padding: 0px !important;
+                padding-left: 38px !important;
+              }
+              .ant-table-thead > tr > th {
+                background-color: rgba(239, 244, 252, 1);
+              }
+              th.h {
+                background-color: #eff4fc !important;
+              }
+
+              .ant-table-tbody
+                > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+                > td {
+                background: #f6f9fd;
+              }
+              .pa {
+                left: 0;
+                width: 100%;
+                // height: 20px;
+                // background-color: red;
+                display: flex;
+                justify-content: center;
+                position: absolute;
+                bottom: 0px;
+              }
             }
-            .info {
-              margin-left: 10px;
+          }
+        }
+        .Gcon {
+          display: flex;
+          .pad {
+            height: 100%;
+            width: 40px;
+          }
+          .Gin {
+            // background-color: #bfa;
+            margin-top: 30px;
+            .headone {
+              // background-color: red;
+              display: flex;
+              text-align: center;
+              .box {
+                width: 4px;
+                height: 20px;
+                background-color: #4ea6ff;
+                border-radius: 2px;
+              }
+              .onetitle {
+                margin-left: 15px;
+                color: #333333;
+                font-size: 14px;
+              }
+              .oneedi {
+                margin-left: 15px;
+                color: #4ea6ff;
+                cursor: pointer;
+              }
+              .twobtn {
+                display: flex;
+                .btnone {
+                  width: 42px;
+                  height: 24px;
+                  border: 1px solid rgba(64, 158, 255, 1);
+                  border-radius: 4px;
+                  color: rgba(64, 158, 255, 1);
+                  margin-left: 20px;
+                  cursor: pointer;
+                }
+                .btntwo {
+                  width: 42px;
+                  height: 24px;
+                  border: 1px solid rgba(64, 158, 255, 1);
+                  border-radius: 4px;
+                  color: #ffffff;
+                  margin-left: 20px;
+                  background: #409eff;
+                  cursor: pointer;
+                }
+              }
+            }
+            .onemain {
+              margin-top: 20px;
+              margin-left: 55px;
               color: #6f6f6f;
               font-size: 14px;
-              // margin-top: 10px;
-            }
-            .infor {
-              margin-left: 38px;
-              margin-top: 10px;
-              color: #c7cbd2;
-              font-size: 14px;
-            }
-            .chooseshow {
-              // background-color: red;
-              margin-left: 38px;
-              margin-top: 12px;
-              .fane {
-                color: #6f6f6f;
-                font-size: 14px;
+              .checkcon {
+                position: relative;
+                .in {
+                  position: absolute;
+                  // margin-top: 10px;
+                  left: 0;
+                  top: 3px;
+                }
+                .yulan {
+                  // color: yellow;
+                  margin-left: 22px;
+                  // display: inline-block;
+                }
+                .yulan2 {
+                  margin-left: 22px;
+                }
+                .ant-input-number {
+                  height: 24px;
+                  width: 24px;
+                  margin: 10px;
+                  border-radius: 4px;
+                  border: 1px solid #6d7584;
+                  .ant-input-number-input {
+                    width: 100%;
+                    height: 100%;
+                    font-size: 14px;
+                    padding: 0;
+                    color: #409eff;
+                    text-align: center;
+                  }
+                }
               }
             }
-            .choo {
-              display: none;
-            }
-            .btm {
-              margin-left: 38px;
+            .twomain {
+              margin-left: 20px;
               margin-top: 20px;
-              .bmo {
+              .ant-switch-checked {
+                background-color: #5dc988;
+              }
+              .info {
+                margin-left: 10px;
                 color: #6f6f6f;
                 font-size: 14px;
+                // margin-top: 10px;
               }
-              .bmt {
+              .infor {
+                margin-left: 38px;
+                margin-top: 10px;
                 color: #c7cbd2;
                 font-size: 14px;
-                margin-top: 3px;
               }
-              .chosecon {
-                display: flex;
-                margin-top: 6px;
-                margin-bottom: 20px;
-                .chose {
-                  position: relative;
-                  .inl {
-                    position: absolute;
-                    top: 2px;
-                  }
-                  .sh {
-                    margin-left: 23px;
-                    color: #6f6f6f;
+              .chooseshow {
+                // background-color: red;
+                margin-left: 38px;
+                margin-top: 12px;
+                .fane {
+                  color: #6f6f6f;
+                  font-size: 14px;
+                }
+              }
+              .choo {
+                display: none;
+              }
+              .btm {
+                margin-left: 38px;
+                margin-top: 20px;
+                .bmo {
+                  color: #6f6f6f;
+                  font-size: 14px;
+                }
+                .bmt {
+                  color: #c7cbd2;
+                  font-size: 14px;
+                  margin-top: 3px;
+                }
+                .chosecon {
+                  display: flex;
+                  margin-top: 6px;
+                  margin-bottom: 20px;
+                  .chose {
+                    position: relative;
+                    .inl {
+                      position: absolute;
+                      top: 2px;
+                    }
+                    .sh {
+                      margin-left: 23px;
+                      color: #6f6f6f;
+                    }
                   }
                 }
               }
             }
           }
         }
-      }
         .notable {
           width: 100%;
           height: 100%;

From ea09652967b525bb27c5248cdb99cb3b1bf7568c Mon Sep 17 00:00:00 2001
From: dongwug <guoys@dongwu-inc.com>
Date: Tue, 25 Oct 2022 14:56:03 +0800
Subject: [PATCH 04/13] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E5=85=B3=E5=8D=A1=E9=87=8C=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddLevelImportStu.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/drawers/AddLevelImportStu.vue b/src/components/drawers/AddLevelImportStu.vue
index ce7767bb..4327fe2e 100644
--- a/src/components/drawers/AddLevelImportStu.vue
+++ b/src/components/drawers/AddLevelImportStu.vue
@@ -3,7 +3,7 @@
     :visible="AddImpStuvisible"
     class="drawerStyle AddLevelImpStu"
     placement="right"
-    width="40%"
+    width="800px"
     @after-visible-change="afterVisibleChange"
   >
     <div class="drawerMain">
@@ -132,9 +132,8 @@ export default {
 <style lang="scss" >
 .AddLevelImpStu {
   .drawerMain {
-    min-width: 600px;
+    min-width: 450px;
     margin: 0px 32px 0px 32px;
-    overflow-x: scroll;
     display: flex;
     flex-direction: column;
     .header {
@@ -155,6 +154,7 @@ export default {
       }
     }
     .main {
+    overflow: scroll;
       .minatitl {
         display: flex;
         .up1 {
@@ -176,6 +176,7 @@ export default {
           font-size: 14px;
           font-weight: 400;
           color: #333333;
+          white-space: nowrap;
         }
         .right {
           margin-left: 6px;

From 7558631bb4fae411d5d66ef432ba470c541ad5d9 Mon Sep 17 00:00:00 2001
From: dongwug <guoys@dongwu-inc.com>
Date: Tue, 25 Oct 2022 14:57:56 +0800
Subject: [PATCH 05/13] =?UTF-8?q?feat:=E5=88=9B=E5=BB=BA=E5=85=B3=E5=8D=A1?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddCase.vue        |   6 +-
 src/views/learningpath/LevelAddDetail.vue | 155 +++++++++++++++++++++-
 2 files changed, 156 insertions(+), 5 deletions(-)

diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue
index bb2481a0..86eec845 100644
--- a/src/components/drawers/AddCase.vue
+++ b/src/components/drawers/AddCase.vue
@@ -79,11 +79,11 @@
   const columns1 = [
     {
       title: "案例标题",
-      width: "35%",
+      width: "40%",
       dataIndex: "title",
       key: "num",
       align: "center",
-    ellipsis: true,
+      ellipsis: true,
     },
     {
       title: "作者",
@@ -94,7 +94,7 @@
     },
     {
       title: "导入时间",
-      width: "40%",
+      width: "35%",
       dataIndex: "time",
       key: "time",
       align: "center",
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 09a7a8d3..3f8642c4 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -247,7 +247,7 @@
               </div>
               <div class="btn btn2">
                 <div class="imgIcon"></div>
-                <div class="btnText">批量删除</div>
+                <div class="btnText" @click="showDeleteALLModal">批量删除</div>
               </div>
             </div>
           </div>
@@ -374,7 +374,7 @@
                 <button class="addx" @click="showAddStu">添加学员</button>
                 <!-- 点击抽屉组件在LevelAdd，此处没添加showAddStu、showImpStu -->
                 <button class="addd" @click="showImpStu">导入学员</button>
-                <button class="addd">批量删除</button>
+                <button class="addd"  @click="showDeleteALLModal">批量删除</button>
               </div>
               <div class="talk">
                 <img class="im" src="../../assets/images/leveladd/gan.png" />
@@ -459,6 +459,36 @@
     <add-stu v-model:AddSvisible="AddSvisible" />
     <!-- 导入学员抽屉 -->
     <imp-stu v-model:AddImpStuvisible="AddImpStuvisible" />
+    <!-- 批量删除学员弹窗 -->
+    <a-modal
+      v-model:visible="deleteAll"
+      :footer="null"
+      :closable="closeDeleteAll"
+      wrapClassName="CopyModal"
+      centered="true"
+    >
+      <div class="delete">
+        <div class="del_header"></div>
+        <div class="del_main">
+          <div class="header">
+            <div class="icon"></div>
+            <span>提示</span>
+            <div class="close_exit" @click="delete_exit"></div>
+          </div>
+          <div class="body">
+            <span>请确认是否批量删除学员</span>
+          </div>
+          <div class="del_btnbox">
+            <div class="del_btn btn1">
+              <div class="btnText" @click="delete_exit">取消</div>
+            </div>
+            <div class="del_btn btn2">
+              <div class="btnText" @click="delete_exit">确定</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </a-modal>
   </div>
 </template>
 
@@ -799,6 +829,8 @@ export default {
       modal: false,
       clos: false,
       stm_hs: false,
+      deleteAll: false,
+      closeDeleteAll: false,
       value1: "",
       value2: "",
       selectedRowKeys: [],
@@ -1060,6 +1092,12 @@ export default {
     const gqxy_hShow = () => {
       state.gqxy_hs = !state.gqxy_hs;
     };
+    const showDeleteALLModal = () => {
+      state.deleteAll = true;
+    };
+    const delete_exit = () => {
+      state.deleteAll = false
+    }
     return {
       ...toRefs(state),
       tableDataFunc,
@@ -1075,6 +1113,8 @@ export default {
       onSelectChange,
       changebgc,
       gqxy_hShow,
+      showDeleteALLModal,
+      delete_exit,
     };
   },
 };
@@ -2088,4 +2128,115 @@ export default {
     }
   }
 }
+.CopyModal {
+  .ant-modal {
+    width: 424px !important;
+    height: 258px !important;
+    .ant-modal-content {
+      width: 424px !important;
+      height: 258px !important;
+      .ant-modal-body {
+        width: 424px !important;
+        height: 258px !important;
+        padding: 0 !important;
+        .delete {
+          z-index: 999;
+          width: 424px;
+          height: 258px;
+          background: #ffffff;
+          box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
+          border-radius: 4px;
+          // position: absolute;
+          // left: 50%;
+          // top: 10%;
+          // transform: translate(-50%, -50%);
+          .del_header {
+            position: absolute;
+            width: calc(100%);
+            height: 40px;
+            background: linear-gradient(
+              rgba(78, 166, 255, 0.2) 0%,
+              rgba(78, 166, 255, 0) 100%
+            );
+          }
+          .del_main {
+            width: 100%;
+            position: relative;
+            .header {
+              display: flex;
+              align-items: center;
+              padding-top: 20px;
+              padding-left: 26px;
+              font-size: 16px;
+              .icon {
+                width: 16px;
+                height: 16px;
+                margin-right: 10px;
+                background-image: url(@/assets/images/coursewareManage/QR.png);
+                background-size: 100% 100%;
+              }
+              .close_exit {
+                position: absolute;
+                right: 42px;
+                cursor: pointer;
+                width: 20px;
+                height: 20px;
+                background-image: url(@/assets/images/coursewareManage/close.png);
+                background-size: 100% 100%;
+              }
+            }
+            .body {
+              width: 100%;
+              margin: 34px auto 56px auto;
+              display: flex;
+              justify-content: center;
+              align-items: center;
+              flex-direction: column;
+              // background-color: red;
+              position: relative;
+              .back {
+                position: absolute;
+                top: 30px;
+                font-size: 12px;
+                font-weight: 400;
+                color: #666666;
+              }
+            }
+            .del_btnbox {
+              display: flex;
+              margin: 30px auto;
+              justify-content: center;
+              .del_btn {
+                width: 100px;
+                height: 40px;
+                background: rgba(64, 158, 255, 0);
+                border-radius: 8px;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+
+                flex-shrink: 0;
+                cursor: pointer;
+                .btnText {
+                  font-size: 14px;
+                  font-weight: 400;
+                  line-height: 40px;
+                }
+              }
+              .btn1 {
+                border: 1px solid rgba(64, 158, 255, 1);
+                color: #4ea6ff;
+                margin-right: 14px;
+              }
+              .btn2 {
+                background-color: #4ea6ff;
+                color: #ffffff;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
 </style>

From 6f8c9074567b5ac7f419b738c8e70a26b8a5fa22 Mon Sep 17 00:00:00 2001
From: dongwug <guoys@dongwu-inc.com>
Date: Tue, 25 Oct 2022 15:15:33 +0800
Subject: [PATCH 06/13] =?UTF-8?q?feat:=E5=AD=A6=E4=B9=A0=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=85=B3=E5=8D=A1bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/learningpath/LevelAddDetail.vue | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 3f8642c4..c43cc039 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -9,25 +9,25 @@
         </div>
         <div class="maincon" style="background-color: #fff">
           <div
-            class="item"
+            class="items"
             :class="{ active: isActive == true }"
             @click="changebgc"
             v-for="item in level"
             :key="item.id"
           >
             <div class="items1">
-              <div class="box_left">
+              <div class="boxs_left">
                 <div class="script">
                   <span style="font-size: 12px; color: #ffffff">说明</span>
                 </div>
                 <div class="imgIcon"></div>
               </div>
-              <div class="box_right">
+              <div class="boxs_right">
                 <div class="imgIcon"></div>
               </div>
             </div>
             <div class="items2">
-              <div class="name">{{ item.name }}</div>
+              <div class="nname">{{ item.name }}</div>
             </div>
             <!-- <div class="itemle">
               <div class="tit">{{ item.tit }}</div>
@@ -1399,9 +1399,9 @@ export default {
         display: flex;
         flex-direction: column;
         align-items: center;
-        .item {
+        .items {
           width: 171px;
-          height: 83px;
+          // height: 83px;
           background: rgba(255, 182, 78, 0.1);
           border: 1px solid #ffb64e;
           opacity: 0.45;
@@ -1414,9 +1414,9 @@ export default {
           .items1 {
             margin-bottom: 12px;
             display: flex;
+            justify-content: space-between;
             align-items: center;
-            .box_left {
-              width: 140px;
+            .boxs_left {
               display: flex;
               align-items: center;
               .script {
@@ -1437,7 +1437,7 @@ export default {
                 background-size: 100% 100%;
               }
             }
-            .box_right {
+            .boxs_right {
               .imgIcon {
                 width: 14px;
                 height: 14px;
@@ -1447,7 +1447,7 @@ export default {
             }
           }
           .items2 {
-            .name {
+            .nname {
               width: 100px;
               overflow: hidden;
               text-overflow: ellipsis;

From 46fad31cc07be23046fe9db38fc86eb7420ca6f0 Mon Sep 17 00:00:00 2001
From: songwc <songwc@dongwu-inc.com>
Date: Tue, 25 Oct 2022 15:31:03 +0800
Subject: [PATCH 07/13] =?UTF-8?q?style=EF=BC=9A=E4=BF=AE=E6=94=B9=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=E7=AE=A1=E7=90=86=E4=B8=AD=E5=90=84=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=20=E8=80=83=E5=8B=A4=20=E4=BD=9C=E4=B8=9A=E8=AF=A6=E6=83=85=20?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=AD=A6=E5=91=98=20=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=AD=A6=E5=91=98=E7=AE=A1=E7=90=86=E4=B8=AD=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=20=20=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E4=B8=AD=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/assets/images/leveladd/done.png          | Bin 0 -> 391 bytes
 src/assets/images/leveladd/edit.png          | Bin 0 -> 368 bytes
 src/assets/images/leveladd/info.png          | Bin 0 -> 331 bytes
 src/assets/images/leveladd/nodone.png        | Bin 0 -> 368 bytes
 src/components/drawers/ActiveAttendance.vue  | 529 ++++++++++---------
 src/components/drawers/AddLevelImportStu.vue |  78 ++-
 src/components/drawers/EntryScores.vue       | 158 +-----
 src/components/drawers/FaceManage.vue        |   3 +-
 src/components/drawers/TestManage.vue        |  71 ++-
 src/components/drawers/TimeManage.vue        |  19 +-
 src/components/drawers/WorkDetail.vue        |  45 +-
 src/components/drawers/WorkManage.vue        |  49 +-
 src/views/learningpath/LevelAdd.vue          | 155 +++---
 src/views/projectcenter/TaskPage.vue         |  13 +
 14 files changed, 605 insertions(+), 515 deletions(-)
 create mode 100644 src/assets/images/leveladd/done.png
 create mode 100644 src/assets/images/leveladd/edit.png
 create mode 100644 src/assets/images/leveladd/info.png
 create mode 100644 src/assets/images/leveladd/nodone.png

diff --git a/src/assets/images/leveladd/done.png b/src/assets/images/leveladd/done.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d07bbb0747f55526fe26f423ff530caecc8cefd
GIT binary patch
literal 391
zcmV;20eJq2P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px$K}keGR5(wilRZlVK@>&Ln>BU@6a-o9w6oDNBv@G4q)CW^rM<n4BIYMp>krT*
z2r9NBvDU&;yATCILTp0f&XZlTX7eey52l*AXYPG(Mu=H5s4v_v%zMV{31k(P{C$B}
zg)7I}lZ*BDkEo^(kbhXrTlLNaNscn6Xw!(ZTTa)?;r=hc7c2H0#Y{{kSix+CkO1J@
z{x<S5?&d+D?_|pAvL7b^<f`s5aPUVzI|e<n$PTaq6f2qfVF1Wi-A9Gh34ji&+s^FU
zjn{DRfRw;fIa6N?9W;TNF@UJJ1Z2DCzABk|au{GJqNGtafN^4<(F62F5Gj1N6W4Qz
zb_vzfuI=c}fq}sY(I&R6V{(_N+HK*PX|Lf9iMtVcO&l@CmKfbvE1Q77`f6y5!6f25
lq!1tLDTk0)pXon8`v*a>uMs2E%Mbtn002ovPDHLkV1h!(t$qLi

literal 0
HcmV?d00001

diff --git a/src/assets/images/leveladd/edit.png b/src/assets/images/leveladd/edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..8e9227db58d2cee32db70d8888413f09b64344e7
GIT binary patch
literal 368
zcmV-$0gwKPP)<h;3K|Lk000e1NJLTq000jF000jN1^@s6JJyv-00001b5ch_0Itp)
z=>Px$DoI2^R5(wa(@iTyQ544U|0Cp15T8KC1{Xsk19=%JrF4fk12d&CxC2IJQc4EW
z9bur13>2xGPvArN0F31A(K`3sI*D^m_T=n#`?vQxYp*5S-M}=k1PlXjv_}`v0!}1-
zrfbQ^_8>4M+mpaK@C3X7y%~HD>`VIifgj?Mz(>HSq}l9-zvi}&fi++y@D<P}X}$>C
z-UW7mx};{{vm}0LE)UzT1E;`-q=VR73fo=)u7QT6z0M_t*!C0<2|ARto{cUS+nxY!
zfLlqm4zwN5SSiBGz#_0J={1AL;&}_h{w;}VM6Lhg@#I%*UjY4*BBP~-?J95=_!1b9
zG*e2pYkLHE47?3&rH%2NHbmYz??6;zBXD#`6NuW5jD8hF5M9^<Y<>f2=7}I$)>`}k
O0000<MNUMnLSTZSe4M=i

literal 0
HcmV?d00001

diff --git a/src/assets/images/leveladd/info.png b/src/assets/images/leveladd/info.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3d0708e07a07abbc4005f2640b3dca6db7c243b
GIT binary patch
literal 331
zcmV-R0kr;!P)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H00001b5ch_0Itp)
z=>Px$1xZ9fR5(wi(!VQ5aTLb!*H_AqMfo{c6&XyFMN!z5QC5S$$ZA%0KjIHC$RK1i
zAV0DoQ93%Gy5HMX%3W@^^SsY}I?vP6{`6uBW9ZA#3$Ag7*CKCKxDYSm66bi#SwAK*
zfrDJ4fB`LF7Y_*x;S<mKJ%|+?1sq`5TgOfX3hi)$PZd`IuVOpES#;yLBA7;qPH|hi
zLpXa2a1DF7uLwplgBzUGz!5A3xQVT_Rn^SJ<_5468~*~s>OSsjmVWzV9BsKArzg)G
zY)2L#virbQ$u1Yq<Gm@4F2pbv#Pfy2e7D6B!=?h%od3krR)8WXmAlBwmEZ@ma^p>v
dEAXF7{tfo5LLpF|<Rbt8002ovPDHLkV1nU`iXQ*~

literal 0
HcmV?d00001

diff --git a/src/assets/images/leveladd/nodone.png b/src/assets/images/leveladd/nodone.png
new file mode 100644
index 0000000000000000000000000000000000000000..6663dfd10a70e3496bbd843113f2344b8c095a5f
GIT binary patch
literal 368
zcmV-$0gwKPP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px$DoI2^R5(wilQB=iKorM+uLC3y*<>enM?VFVlZj!1;NA^J9PCK9?h+VHoSgU+
z%1U%(av;G#0z=QVM{7$DHEE~o-TVLU{oi{h6#V2^uN>!`a@hf{fs4cW2k^pf=Zo)u
zrZpLW8Vqg-f=5JZ#>A9bV_A1H8a>D72_O<H^#oXnxKh!}?KaH|5V?&Z5g<ytRC>?c
zECR!!7P>Ad^#chr+3)Spjt2Dm55OThby>Hoe<l-?BUe1{J_fu3mzk(~9U2W-tzfY*
z0p7&(u42F%ILk!YHniKYT*7#40(^<*)lLIKNw24c{{ZAI{0+!h$QQ9%g-%CjFrC6?
zb8I73L{l4^O=z{WXf}iS{B#?mR+<LMR658HQXE%kloLpi$7Ig<_uX&yoP-glPd&5%
O0000<MNUMnLSTZE2AaYE

literal 0
HcmV?d00001

diff --git a/src/components/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue
index 2110c4fe..9c40b824 100644
--- a/src/components/drawers/ActiveAttendance.vue
+++ b/src/components/drawers/ActiveAttendance.vue
@@ -505,293 +505,294 @@ export default {
     }
     .ant-drawer-body {
       padding: 0;
-    }
-  }
-  .drawerMain {
-    min-width: 600px;
-    margin: 0px 32px 0px 32px;
-    overflow-x: scroll;
-    display: flex;
-    flex-direction: column;
-    .header {
-      height: 73px;
-      border-bottom: 1px solid #e8e8e8;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      // background-color: red;
-      margin-bottom: 20px;
-      .headerTitle {
-        font-size: 18px;
-        font-weight: 600;
-        color: #333333;
-        line-height: 25px;
-        // margin-left: 24px;
-      }
-    }
-    .main {
-      width: 100%;
-      height: 100%;
-      // background-color: #bfa;
-      overflow-y: auto;
-
-      .titl {
+      .drawerMain {
+        min-width: 600px;
+        margin: 0px 32px 0px 32px;
+        // overflow-x: scroll;
         display: flex;
-        .endtime {
-          font-size: 16px;
-          font-weight: 500;
-          color: #333333;
-          white-space: nowrap;
-        }
-      }
-      .search {
-        width: 100%;
-        display: flex;
-        flex-wrap: wrap;
-        margin-top: 20px;
-        justify-content: space-between;
-        .leftchoose {
+        flex-direction: column;
+        .header {
+          height: 73px;
+          border-bottom: 1px solid #e8e8e8;
           display: flex;
-          margin-right: 20px;
-          flex-wrap: wrap;
-          .namecon {
-            display: flex;
-            flex-wrap: nowrap;
-            margin-bottom: 10px;
-            .name {
-              margin-top: 8px;
-              white-space: nowrap;
-            }
-            // .name {
-            //   margin-top: 8px;
-
-            //   color: rgba(0, 0, 0, 0.85);
-            //   font-size: 14px;
-            //   font-weight: 400;
-            // }
+          justify-content: space-between;
+          align-items: center;
+          // background-color: red;
+          margin-bottom: 20px;
+          flex-shrink: 0;
+          .headerTitle {
+            font-size: 18px;
+            font-weight: 600;
+            color: #333333;
+            line-height: 25px;
+            // margin-left: 24px;
           }
         }
+        .main {
+          width: 100%;
+          height: 100%;
+          background-color: #bfa;
+          overflow-y: auto;
 
-        .btns {
-          display: flex;
-          flex-wrap: nowrap;
+          .titl {
+            display: flex;
+            .endtime {
+              font-size: 16px;
+              font-weight: 500;
+              color: #333333;
+              white-space: nowrap;
+            }
+          }
+          .search {
+            width: 100%;
+            display: flex;
+            flex-wrap: wrap;
+            margin-top: 20px;
+            justify-content: space-between;
+            .leftchoose {
+              display: flex;
+              margin-right: 20px;
+              flex-wrap: wrap;
+              .namecon {
+                display: flex;
+                flex-wrap: nowrap;
+                margin-bottom: 10px;
+                .name {
+                  margin-top: 8px;
+                  white-space: nowrap;
+                }
+                // .name {
+                //   margin-top: 8px;
 
-          .btn {
-            cursor: pointer;
-            width: 100px;
+                //   color: rgba(0, 0, 0, 0.85);
+                //   font-size: 14px;
+                //   font-weight: 400;
+                // }
+              }
+            }
+
+            .btns {
+              display: flex;
+              flex-wrap: nowrap;
+
+              .btn {
+                cursor: pointer;
+                width: 100px;
+                height: 40px;
+                border-radius: 8px;
+                display: flex;
+                justify-content: center;
+                align-items: center;
+                .img1 {
+                  width: 15px;
+                  height: 17px;
+                  background-image: url(../../assets/images/courseManage/search0.png);
+                  background-size: 100% 100%;
+                  margin-right: 7px;
+                }
+                .img2 {
+                  width: 16px;
+                  height: 18px;
+                  background-image: url(../../assets/images/courseManage/reset1.png);
+                  background-size: 100% 100%;
+                  margin-right: 7px;
+                }
+              }
+
+              .btn1 {
+                background: #388be1;
+
+                color: #ffffff;
+              }
+              .btn2 {
+                background: #ffffff;
+
+                color: #388be1;
+                border: 1px solid #388be1;
+              }
+            }
+          }
+          .btnss {
+            display: flex;
+            flex-wrap: nowrap;
+
+            .btn {
+              cursor: pointer;
+              width: 130px;
+              height: 40px;
+              border-radius: 8px;
+              display: flex;
+              justify-content: center;
+              align-items: center;
+              .img1 {
+                width: 15px;
+                height: 17px;
+                background-image: url(../../assets/images/courseManage/search0.png);
+                background-size: 100% 100%;
+                margin-right: 7px;
+              }
+              .img2 {
+                width: 17px;
+                height: 16px;
+                background-image: url(../../assets/images/coursewareManage/export.png);
+                background-size: 100% 100%;
+                margin-right: 7px;
+              }
+            }
+
+            .btn1 {
+              background: #388be1;
+              margin-right: 20px;
+              color: #ffffff;
+            }
+            .btn2 {
+              background: #ffffff;
+              margin-right: 20px;
+              color: #388be1;
+              border: 1px solid #388be1;
+            }
+          }
+          .line {
+            width: 100%;
             height: 40px;
-            border-radius: 8px;
+            background-color: #e9f6fe;
             display: flex;
             justify-content: center;
             align-items: center;
-            .img1 {
-              width: 15px;
-              height: 17px;
-              background-image: url(../../assets/images/courseManage/search0.png);
-              background-size: 100% 100%;
-              margin-right: 7px;
-            }
-            .img2 {
-              width: 16px;
-              height: 18px;
-              background-image: url(../../assets/images/courseManage/reset1.png);
-              background-size: 100% 100%;
-              margin-right: 7px;
+            margin-top: 20px;
+            border: 1px solid #c3e6fc;
+            .inline {
+              width: 95%;
+              height: 100%;
+              display: flex;
+              justify-content: space-between;
+              // background-color: #bfa;
+              .left {
+                height: 100%;
+                display: flex;
+                align-items: center;
+                .img {
+                  width: 14px;
+                  height: 15px;
+                  background-image: url(../../assets/images/leveladd/gan.png);
+                  background-size: 100% 100%;
+                }
+                .text {
+                  color: #999ba3;
+                }
+                .text2 {
+                  color: #4ea6ff;
+                  margin-left: 5px;
+                  margin-right: 5px;
+                }
+                .text3 {
+                  color: #999ba3;
+                  margin-left: 20px;
+                }
+              }
+              .right {
+                font-size: 14px;
+                font-weight: 400;
+                color: #387df7;
+                height: 100%;
+                display: flex;
+                align-items: center;
+                cursor: pointer;
+              }
             }
           }
-
-          .btn1 {
-            background: #388be1;
-
-            color: #ffffff;
+          .pad {
+            width: 96%;
+            height: 10px;
+            background-color: #fff;
+            position: absolute;
           }
-          .btn2 {
-            background: #ffffff;
+          .tableBox {
+            // margin-bottom: 80px;
 
-            color: #388be1;
-            border: 1px solid #388be1;
+            .classify {
+              // margin-left: 11px !important;
+              // padding-left: 9px !important;
+              padding-left: 0px !important;
+            }
+            .ant-checkbox-wrapper {
+              align-items: center;
+              margin-top: -2px;
+            }
+            .ant-table-selection-column {
+              padding: 0px !important;
+              // padding-left: 45px !important;
+            }
+            .ant-table-thead > tr > th {
+              background-color: rgba(239, 244, 252, 1);
+            }
+            th.h {
+              background-color: #eff4fc !important;
+            }
+
+            .ant-table-tbody
+              > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+              > td {
+              background: #f6f9fd;
+            }
+            .opa {
+              background-color: #bfa;
+            }
           }
+          // .tab {
+          //   .ant-table-thead > tr > th {
+          //     background-color: rgba(239, 244, 252, 1) !important;
+          //   }
+
+          //   th.h {
+          //     background-color: #eff4fc !important;
+          //   }
+
+          //   .ant-table-tbody
+          //     > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+          //     > td {
+          //     background: #f6f9fd;
+          //   }
+          // }
         }
       }
-      .btnss {
+      .botm {
+        width: 100%;
+        height: 90px;
+        // background-color: red;
+        // flex-shrink: 1;
+      }
+      .btnn {
+        height: 72px;
+        width: 100%;
+        position: absolute;
+        background-color: #fff;
+        bottom: 0;
+        left: 0;
         display: flex;
-        flex-wrap: nowrap;
-
-        .btn {
-          cursor: pointer;
-          width: 130px;
-          height: 40px;
-          border-radius: 8px;
-          display: flex;
-          justify-content: center;
-          align-items: center;
-          .img1 {
-            width: 15px;
-            height: 17px;
-            background-image: url(../../assets/images/courseManage/search0.png);
-            background-size: 100% 100%;
-            margin-right: 7px;
-          }
-          .img2 {
-            width: 17px;
-            height: 16px;
-            background-image: url(../../assets/images/coursewareManage/export.png);
-            background-size: 100% 100%;
-            margin-right: 7px;
-          }
-        }
-
+        align-items: center;
+        justify-content: center;
+        box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
         .btn1 {
-          background: #388be1;
-          margin-right: 20px;
-          color: #ffffff;
+          width: 100px;
+          height: 40px;
+          border: 1px solid #4ea6ff;
+          border-radius: 8px;
+          color: #4ea6ff;
+          background-color: #fff;
+          cursor: pointer;
         }
         .btn2 {
-          background: #ffffff;
-          margin-right: 20px;
-          color: #388be1;
-          border: 1px solid #388be1;
+          cursor: pointer;
+          width: 100px;
+          height: 40px;
+          background: #4ea6ff;
+          border-radius: 8px;
+          border: 0;
+          margin-left: 15px;
+          color: #fff;
         }
       }
-      .line {
-        width: 100%;
-        height: 40px;
-        background-color: #e9f6fe;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        margin-top: 20px;
-        border: 1px solid #c3e6fc;
-        .inline {
-          width: 95%;
-          height: 100%;
-          display: flex;
-          justify-content: space-between;
-          // background-color: #bfa;
-          .left {
-            height: 100%;
-            display: flex;
-            align-items: center;
-            .img {
-              width: 14px;
-              height: 15px;
-              background-image: url(../../assets/images/leveladd/gan.png);
-              background-size: 100% 100%;
-            }
-            .text {
-              color: #999ba3;
-            }
-            .text2 {
-              color: #4ea6ff;
-              margin-left: 5px;
-              margin-right: 5px;
-            }
-            .text3 {
-              color: #999ba3;
-              margin-left: 20px;
-            }
-          }
-          .right {
-            font-size: 14px;
-            font-weight: 400;
-            color: #387df7;
-            height: 100%;
-            display: flex;
-            align-items: center;
-            cursor: pointer;
-          }
-        }
-      }
-      .pad {
-        width: 96%;
-        height: 10px;
-        background-color: #fff;
-        position: absolute;
-      }
-      .tableBox {
-        // margin-bottom: 80px;
-
-        .classify {
-          // margin-left: 11px !important;
-          // padding-left: 9px !important;
-          padding-left: 0px !important;
-        }
-        .ant-checkbox-wrapper {
-          align-items: center;
-          margin-top: -2px;
-        }
-        .ant-table-selection-column {
-          padding: 0px !important;
-          // padding-left: 45px !important;
-        }
-        .ant-table-thead > tr > th {
-          background-color: rgba(239, 244, 252, 1);
-        }
-        th.h {
-          background-color: #eff4fc !important;
-        }
-
-        .ant-table-tbody
-          > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
-          > td {
-          background: #f6f9fd;
-        }
-        .opa {
-          background-color: #bfa;
-        }
-      }
-      // .tab {
-      //   .ant-table-thead > tr > th {
-      //     background-color: rgba(239, 244, 252, 1) !important;
-      //   }
-
-      //   th.h {
-      //     background-color: #eff4fc !important;
-      //   }
-
-      //   .ant-table-tbody
-      //     > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
-      //     > td {
-      //     background: #f6f9fd;
-      //   }
-      // }
-    }
-  }
-  .botm {
-    width: 100%;
-    height: 90px;
-    // background-color: red;
-    // flex-shrink: 1;
-  }
-  .btnn {
-    height: 72px;
-    width: 100%;
-    position: absolute;
-    background-color: #fff;
-    bottom: 0;
-    left: 0;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
-    .btn1 {
-      width: 100px;
-      height: 40px;
-      border: 1px solid #4ea6ff;
-      border-radius: 8px;
-      color: #4ea6ff;
-      background-color: #fff;
-      cursor: pointer;
-    }
-    .btn2 {
-      cursor: pointer;
-      width: 100px;
-      height: 40px;
-      background: #4ea6ff;
-      border-radius: 8px;
-      border: 0;
-      margin-left: 15px;
-      color: #fff;
     }
   }
 }
diff --git a/src/components/drawers/AddLevelImportStu.vue b/src/components/drawers/AddLevelImportStu.vue
index fdf9464d..295da0ae 100644
--- a/src/components/drawers/AddLevelImportStu.vue
+++ b/src/components/drawers/AddLevelImportStu.vue
@@ -63,12 +63,18 @@
                   </div>
                   <div class="curloading">
                     <div class="cur">55%</div>
-                    <div class="cancel" style="margin-left: 20px">暂停</div>
+                    <div class="cancel" style="margin-left: 20px">重传</div>
                     <div class="cancel" style="margin-left: 15px">取消</div>
                   </div>
-                  <div class="defeat">下载失败数据</div>
+                  <div class="defeat">
+                    <div class="detext">下载失败数据</div>
+                  </div>
                 </div>
               </div>
+              <div class="defeatbox">
+                <div class="lefimg"></div>
+                <div class="tacl">20条数据导入成功，5条数据导入失败</div>
+              </div>
               <div class="loadborder">
                 <div class="content">
                   <div class="img"></div>
@@ -87,6 +93,10 @@
                   </div>
                 </div>
               </div>
+              <div class="succebox">
+                <div class="lefimg"></div>
+                <div class="tacl">20条数据导入成功，5条数据导入失败</div>
+              </div>
             </div>
           </div>
         </div>
@@ -132,7 +142,7 @@ export default {
 <style lang="scss" >
 .AddLevelImpStu {
   .drawerMain {
-    min-width: 600px;
+    min-width: 500px;
     margin: 0px 32px 0px 32px;
     overflow-x: scroll;
     display: flex;
@@ -218,7 +228,8 @@ export default {
               height: 173px;
               border-radius: 4px;
               border: 1px dashed #eaeaea;
-              margin-bottom: 30px;
+              margin-bottom: 10px;
+              margin-top: 10px;
               display: flex;
               align-items: center;
               .content {
@@ -228,10 +239,22 @@ export default {
                 .defeat {
                   position: absolute;
                   left: 46px;
-                  top: 38px;
+                  top: 42px;
                   font-size: 14px;
                   font-weight: 500;
-                  color: #ff7474;
+                  width: 120px;
+                  height: 32px;
+                  border-radius: 2px;
+                  border: 1px solid #387df7;
+                  display: flex;
+                  justify-content: center;
+                  align-items: center;
+                  cursor: pointer;
+                  .detext {
+                    font-size: 14px;
+                    font-weight: 400;
+                    color: #387df7;
+                  }
                 }
                 .img {
                   width: 30px;
@@ -314,6 +337,49 @@ export default {
                 }
               }
             }
+            .defeatbox {
+              width: 500px;
+              height: 40px;
+              background: rgba(255, 116, 116, 0.1);
+              border: 1px solid #ff7474;
+              display: flex;
+              align-items: center;
+              .lefimg {
+                width: 14px;
+                height: 14px;
+                margin-left: 17px;
+                margin-right: 8px;
+                background-image: url(../../assets/images/leveladd/nodone.png);
+                background-size: 100%;
+              }
+              .tacl {
+                font-size: 14px;
+                font-weight: 400;
+                color: #ff7474;
+              }
+            }
+            .succebox {
+              width: 500px;
+              height: 40px;
+              background: rgba(53, 174, 105, 0.1);
+              border: 1px solid #35ae69;
+              display: flex;
+              align-items: center;
+              .lefimg {
+                width: 14px;
+                height: 14px;
+                margin-left: 17px;
+                margin-right: 8px;
+                background-image: url(../../assets/images/leveladd/done.png);
+                background-size: 100%;
+              }
+              .tacl {
+                font-size: 14px;
+                font-weight: 400;
+
+                color: rgba(0, 0, 0, 0.65);
+              }
+            }
           }
         }
       }
diff --git a/src/components/drawers/EntryScores.vue b/src/components/drawers/EntryScores.vue
index 293861f2..fef7f769 100644
--- a/src/components/drawers/EntryScores.vue
+++ b/src/components/drawers/EntryScores.vue
@@ -66,155 +66,6 @@ export default {
     const state = reactive({
       value: 1, //成绩是否合格的单选
       score: null, //录入的成绩
-      pageSize: 10,
-      currentPage: 1,
-      tableDataTotal: 100,
-      projectNameList: [
-        {
-          id: 1,
-          value: "项目一",
-          label: "项目一",
-        },
-        {
-          id: 2,
-          value: "项目二",
-          label: "项目二",
-        },
-        {
-          id: 3,
-          value: "项目三",
-          label: "项目三",
-        },
-        {
-          id: 4,
-          value: "项目四",
-          label: "项目四",
-        },
-      ],
-      tabledata: [
-        {
-          key: 1,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          time: "-",
-          state: "未完成",
-        },
-        {
-          key: 2,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          time: "2022-10-31  23:12:00",
-          state: "未完成",
-        },
-        {
-          key: 3,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          time: "2022-10-31  23:12:00",
-          state: "未完成",
-        },
-        {
-          key: 4,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          time: "2022-10-31  23:12:00",
-          state: "未完成",
-        },
-        {
-          key: 5,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          time: "2022-10-31  23:12:00",
-          state: "未完成",
-        },
-        {
-          key: 6,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          time: "2022-10-31  23:12:00",
-          state: "未完成",
-        },
-        {
-          key: 7,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          time: "2022-10-31  23:12:00",
-          state: "未完成",
-        },
-        {
-          key: 8,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          time: "2022-10-31  23:12:00",
-          state: "未完成",
-        },
-        {
-          key: 9,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          time: "2022-10-31  23:12:00",
-          state: "未完成",
-        },
-        {
-          key: 10,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          time: "2022-10-31  23:12:00",
-          state: "未完成",
-        },
-      ],
-      tablecolumns: [
-        {
-          title: "姓名",
-          dataIndex: "name",
-          key: "name",
-          width: 50,
-          align: "center",
-          className: "h",
-        },
-        {
-          title: "所在部门",
-          dataIndex: "bum",
-          key: "bum",
-          width: 50,
-          align: "center",
-          className: "h",
-        },
-        {
-          title: "所在岗位",
-          dataIndex: "gangw",
-          key: "gangw",
-          width: 50,
-          align: "center",
-          className: "h",
-        },
-        {
-          title: "完成时间",
-          dataIndex: "time",
-          key: "time",
-          width: 50,
-          align: "center",
-          className: "h",
-        },
-        {
-          title: "任务状态",
-          dataIndex: "state",
-          key: "state",
-          width: 50,
-          align: "center",
-          className: "h",
-        },
-      ],
     });
     const selectProjectName = (value, index) => {
       console.log("value", value, index);
@@ -246,9 +97,9 @@ export default {
 // }
 .EntryScores {
   .drawerMain {
-    min-width: 600px;
+    min-width: 400px;
     margin: 0px 32px 0px 32px;
-    overflow-x: scroll;
+    // overflow-x: scroll;
     display: flex;
     flex-direction: column;
     .header {
@@ -269,7 +120,9 @@ export default {
     }
     .main {
       width: 100%;
-      height: 100%;
+      // height: 100%;
+      overflow-y: auto;
+      margin-bottom: 70px;
       .sta {
         width: 10px;
         height: 10px;
@@ -309,6 +162,7 @@ export default {
       position: absolute;
       bottom: 0;
       left: 0;
+      background-color: #fff;
       display: flex;
       align-items: center;
       justify-content: center;
diff --git a/src/components/drawers/FaceManage.vue b/src/components/drawers/FaceManage.vue
index 7d7c5936..a651eb65 100644
--- a/src/components/drawers/FaceManage.vue
+++ b/src/components/drawers/FaceManage.vue
@@ -87,7 +87,7 @@
             :data-source="tabledata"
             :loading="tableDataTotal === -1 ? true : false"
             expandRowByClick="true"
-            :scroll="{ x: 900, y: 350 }"
+            :scroll="{ x: 900 }"
             @expand="expandTable"
             :pagination="false"
             :row-selection="{
@@ -514,6 +514,7 @@ export default {
 
       // background-color: #bfa;
       overflow: auto;
+      padding-right: 10px;
       .endtime {
         font-size: 16px;
         font-weight: 500;
diff --git a/src/components/drawers/TestManage.vue b/src/components/drawers/TestManage.vue
index 61506af6..cbda107b 100644
--- a/src/components/drawers/TestManage.vue
+++ b/src/components/drawers/TestManage.vue
@@ -54,7 +54,11 @@
           </div>
         </div>
         <div class="btnss" style="margin-top: 20px">
-          <div class="btn btn1" @click="showopen" style="margin-right: 20px; cursor: pointer">
+          <div
+            class="btn btn1"
+            @click="showopen"
+            style="margin-right: 20px; cursor: pointer"
+          >
             <div class="img2"></div>
             <div class="wz">催促考试</div>
           </div>
@@ -70,10 +74,22 @@
             :data-source="tabledata"
             :loading="tableDataTotal === -1 ? true : false"
             expandRowByClick="true"
-            :scroll="{ x: 900, y: 500 }"
+            :scroll="{ x: 900 }"
             @expand="expandTable"
             :pagination="false"
           />
+          <div class="pa">
+            <a-pagination
+              showSizeChanger="true"
+              showQuickJumper="true"
+              hideOnSinglePage="true"
+              :pageSize="pageSize"
+              :current="currentPage"
+              :total="tableDataTotal"
+              class="pagination"
+              @change="onChange"
+            />
+          </div>
         </div>
       </div>
       <div class="btnn">
@@ -81,16 +97,15 @@
         <button class="btn2">确定</button>
       </div>
       <div class="noticebox" v-show="open">
-        <div><img src="../../assets/images/taskpage/check.png"/></div>
+        <div><img src="../../assets/images/taskpage/check.png" /></div>
         <div class="notext">催促学员成功</div>
       </div>
     </div>
   </a-drawer>
-  
 </template>
 
 <script>
-import { toRefs, reactive, onMounted, onUnmounted} from "vue";
+import { toRefs, reactive, onMounted, onUnmounted } from "vue";
 export default {
   name: "TestManage",
   props: {
@@ -108,6 +123,9 @@ export default {
     const state = reactive({
       name: null,
       open: false,
+      pageSize: 10,
+      currentPage: 1,
+      tableDataTotal: 100,
       projectNameList: [
         {
           id: 1,
@@ -297,16 +315,19 @@ export default {
     const closeDrawer = () => {
       ctx.emit("update:TMvisible", false);
     };
-    const showopen=()=>{
-        state.open = true;
+    const showopen = () => {
+      state.open = true;
+    };
+    const onChange = (pageNumber) => {
+      console.log("Page: ", pageNumber);
     };
     let timer;
-    onMounted(()=> {
-      timer = setInterval(()=>{
+    onMounted(() => {
+      timer = setInterval(() => {
         state.open = false;
-      },3000);
+      }, 3000);
     });
-    onUnmounted(()=>{
+    onUnmounted(() => {
       clearInterval(timer);
     });
     return {
@@ -316,6 +337,7 @@ export default {
       showopen,
       onMounted,
       onUnmounted,
+      onChange,
     };
   },
 };
@@ -339,9 +361,9 @@ export default {
 //作业管理弹窗
 .TestManage {
   .drawerMain {
-    min-width: 600px;
+    min-width: 520px;
     margin: 0px 32px 0px 32px;
-    overflow-x: scroll;
+    // overflow-x: scroll;
     display: flex;
     flex-direction: column;
     position: relative;
@@ -382,7 +404,8 @@ export default {
       width: 100%;
       height: 100%;
       // background-color: #bfa;
-      // overflow-y: auto;
+      overflow-y: auto;
+      padding-right: 10px;
       .endtime {
         font-size: 16px;
         font-weight: 500;
@@ -397,12 +420,14 @@ export default {
 
         .sealeft {
           display: flex;
+          flex-wrap: wrap;
           .namecon {
             display: flex;
             flex-wrap: nowrap;
             margin-bottom: 10px;
             .name {
               margin-top: 8px;
+              white-space: nowrap;
             }
           }
         }
@@ -497,6 +522,23 @@ export default {
           > td {
           background: #f6f9fd;
         }
+        .pa {
+          // left: 0;
+          margin-top: 15px;
+          width: 100%;
+          // height: 20px;
+          // background-color: red;
+          display: flex;
+          justify-content: center;
+          // position: absolute;
+          // bottom: 20px;
+          .ant-pagination-prev,
+          .ant-pagination-next,
+          .ant-pagination-item,
+          .ant-pagination-options {
+            margin-bottom: 10px;
+          }
+        }
       }
     }
 
@@ -509,6 +551,7 @@ export default {
       display: flex;
       align-items: center;
       justify-content: center;
+      background-color: #fff;
       box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
       .btn1 {
         width: 100px;
diff --git a/src/components/drawers/TimeManage.vue b/src/components/drawers/TimeManage.vue
index 78cbd2d2..6ff7d02a 100644
--- a/src/components/drawers/TimeManage.vue
+++ b/src/components/drawers/TimeManage.vue
@@ -70,7 +70,7 @@
             :data-source="tabledata"
             :loading="tableDataTotal === -1 ? true : false"
             expandRowByClick="true"
-            :scroll="{ x: 900, y: 350 }"
+            :scroll="{ x: 900 }"
             @expand="expandTable"
             :pagination="false"
           />
@@ -83,6 +83,7 @@
               :current="currentPage"
               :total="tableDataTotal"
               class="pagination"
+              @change="onChange"
             />
           </div>
         </div>
@@ -277,6 +278,9 @@ export default {
     const showopen = () => {
       state.open = true;
     };
+    const onChange = (pageNumber) => {
+      console.log("Page: ", pageNumber);
+    };
     let timer;
     onMounted(() => {
       timer = setInterval(() => {
@@ -293,6 +297,7 @@ export default {
       showopen,
       onMounted,
       onUnmounted,
+      onChange,
     };
   },
 };
@@ -313,7 +318,7 @@ export default {
 .TimeManage {
   // overflow-x: scroll;
   .drawerMain {
-    min-width: 600px;
+    min-width: 550px;
     margin: 0px 32px 0px 32px;
     overflow-x: scroll;
     display: flex;
@@ -356,7 +361,8 @@ export default {
       width: 100%;
       height: 100%;
       // background-color: #bfa;
-      overflow: auto;
+      overflow-y: auto;
+      padding-right: 10px;
       .endtime {
         font-size: 16px;
         font-weight: 500;
@@ -371,6 +377,7 @@ export default {
 
         .sealeft {
           display: flex;
+          flex-wrap: wrap;
           .namecon {
             display: flex;
             flex-wrap: nowrap;
@@ -482,6 +489,12 @@ export default {
           justify-content: center;
           // position: absolute;
           // bottom: 20px;
+          .ant-pagination-prev,
+          .ant-pagination-next,
+          .ant-pagination-item,
+          .ant-pagination-options {
+            margin-bottom: 10px;
+          }
         }
       }
     }
diff --git a/src/components/drawers/WorkDetail.vue b/src/components/drawers/WorkDetail.vue
index d1f5268f..d5256d52 100644
--- a/src/components/drawers/WorkDetail.vue
+++ b/src/components/drawers/WorkDetail.vue
@@ -29,8 +29,26 @@
         <div class="workInfo">
           <div class="infotit">作业信息：</div>
           <div class="workImgCon">
+            <!-- <a-image-preview-group>
+              <a-image
+                style="margin-right: 40px"
+                :height="240"
+                :width="240"
+                :src="item"
+              ></a-image>
+              <a-image :height="240" :width="240" :src="item" />
+              <a-image :height="240" :width="240" :src="item" />
+            </a-image-preview-group> -->
+            <div class="img">
+              <div class="download"></div>
+            </div>
+            <div class="img">
+              <div class="download"></div>
+            </div>
+            <div class="img">
+              <div class="download"></div>
+            </div>
             <div class="img">
-              <div class="see"></div>
               <div class="download"></div>
             </div>
           </div>
@@ -57,9 +75,7 @@ export default {
 
   setup(props, ctx) {
     const state = reactive({
-      pageSize: 10,
-      currentPage: 1,
-      tableDataTotal: 100,
+      item: require("../../assets/px.jpg"),
     });
 
     const closeDrawer = () => {
@@ -88,7 +104,7 @@ export default {
 // }
 .WorkDetail {
   .drawerMain {
-    min-width: 600px;
+    min-width: 450px;
     margin: 0px 32px 0px 32px;
     overflow-x: scroll;
     display: flex;
@@ -101,6 +117,7 @@ export default {
       align-items: center;
       // background-color: red;
       margin-bottom: 20px;
+      flex-shrink: 0;
       .headerTitle {
         font-size: 18px;
         font-weight: 600;
@@ -111,8 +128,9 @@ export default {
     }
     .main {
       width: 100%;
-      height: 100%;
-
+      // height: 100%;
+      overflow-y: auto;
+      margin-bottom: 40px;
       .cj {
         font-size: 16px;
         font-weight: 400;
@@ -149,6 +167,9 @@ export default {
           display: flex;
           flex-wrap: wrap;
           margin-top: 16px;
+          .it {
+            margin-right: 40px;
+          }
           .img {
             width: 240px;
             height: 240px;
@@ -157,6 +178,10 @@ export default {
             display: flex;
             align-items: center;
             justify-content: center;
+            margin-right: 40px;
+            margin-bottom: 40px;
+            position: relative;
+            cursor: pointer;
             .see {
               width: 50px;
               height: 50px;
@@ -169,8 +194,11 @@ export default {
               height: 50px;
               background-image: url(../../assets/images/basicinfo/download.png);
               background-size: 100% 100%;
-              margin-left: 40px;
+              // margin-left: 40px;
               cursor: pointer;
+              position: absolute;
+              right: 10px;
+              bottom: 10px;
             }
           }
         }
@@ -184,6 +212,7 @@ export default {
       bottom: 0;
       left: 0;
       display: flex;
+      background-color: #fff;
       align-items: center;
       justify-content: center;
       box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
diff --git a/src/components/drawers/WorkManage.vue b/src/components/drawers/WorkManage.vue
index ee1ae6c6..ead81ad6 100644
--- a/src/components/drawers/WorkManage.vue
+++ b/src/components/drawers/WorkManage.vue
@@ -54,15 +54,11 @@
           </div>
         </div>
         <div class="btnss" style="margin-top: 20px">
-          <div
-            class="btn btn1"
-            style="margin-right: 20px; cursor: pointer"
-            @click="showModal"
-          >
+          <div class="btn btn1" style="margin-right: 20px; cursor: pointer">
             <div class="img1"></div>
             <div class="wz">导出数据</div>
           </div>
-          <div class="btn btn2">
+          <div class="btn btn2" @click="showModal">
             <div class="wz">导出作业</div>
           </div>
         </div>
@@ -73,10 +69,22 @@
             :data-source="tabledata"
             :loading="tableDataTotal === -1 ? true : false"
             expandRowByClick="true"
-            :scroll="{ x: 900, y: 500 }"
+            :scroll="{ x: 900 }"
             @expand="expandTable"
             :pagination="false"
           />
+          <div class="pa">
+            <a-pagination
+              showSizeChanger="true"
+              showQuickJumper="true"
+              hideOnSinglePage="true"
+              :pageSize="pageSize"
+              :current="currentPage"
+              :total="tableDataTotal"
+              class="pagination"
+              @change="onChange"
+            />
+          </div>
         </div>
       </div>
       <div class="btnn">
@@ -131,6 +139,9 @@ export default {
       visible: false, //导出数据弹窗
       close: false, //导出弹窗的关闭按钮
       WDvisible: false, //作业详情
+      pageSize: 10,
+      currentPage: 1,
+      tableDataTotal: 100,
       projectNameList: [
         {
           id: 1,
@@ -336,6 +347,9 @@ export default {
     const showWorkDetail = () => {
       state.WDvisible = true;
     };
+    const onChange = (pageNumber) => {
+      console.log("Page: ", pageNumber);
+    };
     return {
       ...toRefs(state),
       selectProjectName,
@@ -343,6 +357,7 @@ export default {
       showModal,
       closeModal,
       showWorkDetail,
+      onChange,
     };
   },
 };
@@ -418,7 +433,8 @@ export default {
           flex-direction: column;
           // justify-content: center;
           align-items: center;
-          overflow: auto;
+          overflow-y: auto;
+          padding-right: 10px;
           .check {
             width: 40px;
             height: 40px;
@@ -601,6 +617,23 @@ export default {
           > td {
           background: #f6f9fd;
         }
+        .pa {
+          // left: 0;
+          margin-top: 15px;
+          width: 100%;
+          // height: 20px;
+          // background-color: red;
+          display: flex;
+          justify-content: center;
+          // position: absolute;
+          // bottom: 20px;
+          .ant-pagination-prev,
+          .ant-pagination-next,
+          .ant-pagination-item,
+          .ant-pagination-options {
+            margin-bottom: 10px;
+          }
+        }
       }
     }
 
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index 0b5b397f..a4dbdd28 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -208,7 +208,7 @@
         </a-tab-pane>
         <a-tab-pane key="2" tab="路径管理">
           <div class="split"></div>
-          <div class="cont">
+          <!-- <div class="cont">
             <div class="pad"></div>
             <div class="sametab">
               <div class="Lhead">
@@ -236,50 +236,50 @@
               </div>
               <div class="Lbom">
                 <div>
-                  <div class="create">
-                    <div
-                      class="taskbox"
-                      style="
-                        background: linear-gradient(180deg, #e5f6ec, #eef9f3);
-                      "
-                    >
-                      <div class="leftt">
-                        <img src="../../assets/images/taskpage/left3.png" />
-                      </div>
-                      <div class="photo">
-                        <img src="../../assets/images/taskpage/picture3.png" />
-                      </div>
-                      <div class="rightt">
-                        <img src="../../assets/images/taskpage/right3.png" />
-                      </div>
-                      <div
-                        class="centerbox"
-                        style="color: rgba(93, 201, 136, 1)"
-                      >
-                        创建关卡
-                      </div>
-                      <div class="centermain">点击创建关卡任务</div>
-                    </div>
-                  </div>
+                  <div class="create"></div>
                 </div>
               </div>
             </div>
             <div class="pad"></div>
-          </div>
+          </div> -->
 
-          <!-- 有数据时的路径管理 -->
+          <!-- 路径管理 -->
           <div style="flex: 1">
             <div class="onerow">
               <div class="taskmain">任务大纲</div>
 
-              <router-link to="/leveladddetail" class="edit">
+              <router-link to="/leveladddetail" class="editright">
                 <img
                   class="editimg"
-                  src="../../assets/images/projectadd/edit.png"
+                  src="../../assets/images/leveladd/edit.png"
                 />
-                <span class="editext">编辑</span>
+                <span class="editextb">编辑</span>
               </router-link>
             </div>
+            <!-- 无数据显示快速创建 -->
+            <router-link to="/leveladddetail">
+              <div
+                class="taskbox"
+                style="background: linear-gradient(180deg, #fef3dd, #fffaf0)"
+              >
+                <div class="leftt">
+                  <img src="../../assets/images/taskpage/left1.png" />
+                </div>
+                <div class="photo">
+                  <img src="../../assets/images/taskpage/picture1.png" />
+                </div>
+                <div class="rightt">
+                  <img src="../../assets/images/taskpage/right1.png" />
+                </div>
+                <div class="centerbox" style="color: rgba(255, 182, 78, 1)">
+                  添加关卡
+                </div>
+                <div class="centermain">快速创建关卡任务</div>
+              </div>
+            </router-link>
+            <!-- 无数据显示快速创建 -->
+
+            <!-- 有数据-->
             <div class="taskSyllabus">
               <a-collapse v-model:activeKey="taskSyllabusActive" accordion>
                 <template #expandIcon="{ isActive }">
@@ -457,6 +457,7 @@
                 </a-collapse-panel>
               </a-collapse>
             </div>
+            <!-- 有数据-->
             <div style="display: flex; height: 20px"></div>
           </div>
         </a-tab-pane>
@@ -680,7 +681,7 @@
           </div>
           <div class="mid">
             <div class="inher">
-              <div class="cur">当前关卡：</div>
+              <div class="cur">当前关卡：关卡2</div>
               <div class="select">
                 <a-select
                   v-model:value="curLevel"
@@ -878,16 +879,11 @@ export default {
       projectNameList4: [
         {
           id: 1,
-          value: "请选择关卡",
-          label: "请选择关卡",
-        },
-        {
-          id: 2,
           value: "关卡1",
           label: "关卡1",
         },
         {
-          id: 3,
+          id: 2,
           value: "关卡2",
           label: "关卡2",
         },
@@ -895,7 +891,7 @@ export default {
       //任务大纲列表
       taskSyllabus: [
         {
-          text: "阶段1腾飞班阶段1",
+          text: "关卡1  初级产品经理",
           children: [
             {
               course: "在线",
@@ -954,7 +950,7 @@ export default {
           ],
         },
         {
-          text: "阶段2腾飞班阶段2",
+          text: "关卡2  中级产品经理",
           children: [
             {
               course: "讨论",
@@ -1224,7 +1220,7 @@ export default {
                   </span>
                   <span
                     onClick={() => {
-                      state.visible = true;
+                      state.visiblene = true;
                       console.log(text.record.cur);
                     }}
                     style="color:#4EA6FF;margin-right:25px;cursor:pointer"
@@ -1254,7 +1250,7 @@ export default {
       state.visible = true;
     };
     const closeChangeModal = () => {
-      state.visible = false;
+      state.visiblene = false;
     };
     const showAddStu = () => {
       state.AddSvisible = true;
@@ -1833,34 +1829,35 @@ export default {
         color: #ffffff;
         cursor: pointer;
       }
-      .edit {
+      .editright {
         position: absolute;
         right: 38px;
         top: 0;
-        color: #409eff;
-        width: 100px;
+        width: 110px;
         height: 40px;
-        border: 1px solid #409eff;
+        background: #409eff;
         border-radius: 8px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+
         .editimg {
           width: 15px;
           height: 15px;
-          margin-top: -2px;
-          margin-left: 25px;
-          margin-right: 5px;
         }
-        .editext {
-          line-height: 40px;
-        }
-      }
-      .edit:hover {
-        color: #ffffff;
-        background-color: #409eff;
-        cursor: pointer;
-        .editimg {
-          background-image: url("../../assets/images/projectadd/edit1.png");
+        .editextb {
+          color: #fff;
+          margin-left: 10px;
         }
       }
+      // .edit:hover {
+      //   color: #ffffff;
+      //   background-color: #409eff;
+      //   cursor: pointer;
+      //   .editimg {
+      //     background-image: url("../../assets/images/projectadd/edit1.png");
+      //   }
+      // }
     }
     .second {
       display: flex;
@@ -2357,6 +2354,46 @@ export default {
         }
       }
     }
+    .taskbox {
+      width: 412px;
+      height: 160px;
+      border-radius: 10px;
+      position: relative;
+      margin-left: 40px;
+      margin-bottom: 10px;
+      margin-top: 10px;
+      cursor: pointer;
+      .leftt {
+        position: absolute;
+        top: 18px;
+        left: 0;
+      }
+      .photo {
+        position: absolute;
+        top: 42px;
+        left: 37px;
+      }
+      .rightt {
+        position: absolute;
+        top: 69px;
+        right: 26px;
+      }
+      .centerbox {
+        position: absolute;
+        top: 52px;
+        left: 145px;
+        font-size: 20px;
+        font-weight: 700;
+        //line-height: 36px;
+      }
+      .centermain {
+        color: rgba(135, 139, 146, 1);
+        font-size: 14px;
+        position: absolute;
+        left: 144px;
+        bottom: 49px;
+      }
+    }
     .taskSyllabus {
       // flex: 1;
       overflow-x: auto;
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 078557c2..4cedd9e2 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -839,6 +839,7 @@
                 <div class="rankhead">
                   <div class="inhead">
                     <div class="left">进度排行 Top10</div>
+                    <div class="icon"></div>
                     <div class="right">
                       <a-select
                         v-model:value="valuestu1"
@@ -4160,6 +4161,9 @@ export default {
           display: flex;
           justify-content: center;
           align-items: center;
+          .ant-select-selector {
+            color: #388be1 !important;
+          }
           .inhead {
             width: 374px;
             // background-color: lightblue;
@@ -4167,6 +4171,15 @@ export default {
             justify-content: space-between;
             align-items: center;
             margin-top: 10px;
+            position: relative;
+            .icon {
+              position: absolute;
+              width: 14px;
+              height: 14px;
+              background-image: url(../../assets/images/leveladd/info.png);
+              background-size: 100%;
+              left: 120px;
+            }
             .left {
               font-size: 16px;
               font-weight: 500;

From 6e6e753ba4c661c1f725570e971235443c88ab70 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Tue, 25 Oct 2022 15:32:24 +0800
Subject: [PATCH 08/13] =?UTF-8?q?style:=E8=8E=B7=E5=8F=96=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/ProjectScore.vue | 131 +++++++++++++++---------
 1 file changed, 84 insertions(+), 47 deletions(-)

diff --git a/src/components/drawers/ProjectScore.vue b/src/components/drawers/ProjectScore.vue
index 5f34c350..f553a5dc 100644
--- a/src/components/drawers/ProjectScore.vue
+++ b/src/components/drawers/ProjectScore.vue
@@ -129,26 +129,43 @@
       <a-tab-pane key="3" tab="获取规则">
         <div class="projectscore">
           <div class="pjc_body">
-            <div class="pjcb_header">
-              <span>规则</span>
-              <div class="btns">
-                <div class="edit_btn1">
-                  <div class="btnText">取消</div>
-                </div>
-                <div class="edit_btn2">
-                  <div class="btnText">确定</div>
-                </div>
+            <div class="groupright">
+              <div class="spandiv"><span class="spantext">规则</span></div>
+              <div v-if="edit" class="btns">
+                <div class="btn1" @click="edit=!edit">
+                <img src="../../assets/images/projectadd/edit1.png" />
+                <span class="btn1text">编辑</span>
+              </div>
+            
+              </div>
+              <div v-else class="btns">
+                <div class="btn1" @click="edit=!edit">
+                
+                <span class="btn1text">保存</span>
+              </div>
               </div>
             </div>
-            <div class="pjcb_content">
+
+            <div v-if="edit" class="pjcb_content">
               <div class="content content1">
-                <span>当前设计下，学员可以获得 10 积分</span>
+                <span>当前设计下，学员可以获得 </span><span class="scoretext">{{scoresum}}</span><span>积分</span>
               </div>
               <div class="content content2">
-                <span>完成【必修/选修】获得 5 积分</span>
+                <span>完成【必修/选修】获得 </span><span class="scoretext">{{score1}} </span><span>积分</span>
               </div>
               <div class="content content3">
-                <span>优秀学员可获得 5 积分</span>
+                <span>优秀学员可获得 </span><span class="scoretext">{{score2}}</span><span>积分</span>
+              </div>
+            </div>
+            <div v-else class="pjcb_content">
+              <div class="content content1">
+                <span>当前设计下，学员可以获得 </span><span class="scoretext">{{scoresum}}</span><span>积分</span>
+              </div>
+              <div class="content content2">
+                <span>完成【必修/选修】获得 </span><span ><a-input v-model:value="score1" :bordered="false" @change="getScore"/> </span><span>积分</span>
+              </div>
+              <div class="content content3">
+                <span>优秀学员可获得 </span><span ><a-input v-model:value="score2" :bordered="false" /></span><span>积分</span>
               </div>
             </div>
           </div>
@@ -326,6 +343,10 @@ export default {
       tableDataTotal: 30,
       stuValue: false,
       Svisible:false,
+      score1:5,
+      score2:5,
+      edit:true,
+     
       
       
     });
@@ -351,12 +372,18 @@ export default {
       state.tabledataStu = datas;
     };
     getTableData();
-   
+  
     return {
       ...toRefs(state),
      
     };
   },
+  computed: {
+    // 计算属性的 getter
+    scoresum: function () {
+        return Number(this.score1)+Number(this.score2);
+      }
+    }
 };
 </script>
 <style lang="scss">
@@ -572,60 +599,70 @@ export default {
   .pjc_body {
     margin-left: 34px;
     margin-right: 34px;
-    .pjcb_header {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      margin: 24px auto;
-      .btns {
+    .spandiv{
+      position: relative;
+      /* height: 100%; */
+      width: 40px;
+      .spantext{
+        position: absolute;
+        left: 0;
+        bottom: 0px;
+      }
+      }
+    
+    .groupright {
         display: flex;
-        .edit_btn1 {
+        justify-content: space-between;
+        .btn1 {
           width: 100px;
-          // padding: 0px 26px 0px 26px;
-          height: 38px;
-          margin-left: 15px;
-          border-radius: 8px;
-          border: 1px solid rgba(64, 158, 255, 1);
+          height: 40px;
           display: flex;
           align-items: center;
           justify-content: center;
-          flex-shrink: 0;
+          margin-right: 16px;
+          border: 1px solid #409eff;
+          border-radius: 8px;
+          background: #409eff;
           cursor: pointer;
-          background-color: rgb(255, 255, 255);
-          .btnText {
-            font-size: 14px;
-            font-weight: 400;
-            color: rgb(64, 158, 255);
-            line-height: 36px;
+          .btn1text {
+            color: #ffffff;
             margin-left: 5px;
+            font-size: 14px;
           }
         }
-        .edit_btn2 {
+        .btn2 {
           width: 100px;
-          // padding: 0px 26px 0px 26px;
-          height: 38px;
-          margin-left: 15px;
-          border-radius: 8px;
-          border: 1px solid rgba(64, 158, 255, 1);
+          height: 40px;
           display: flex;
           align-items: center;
           justify-content: center;
-          flex-shrink: 0;
+          margin-right: 32px;
+          border: 1px solid #409eff;
+          border-radius: 8px;
           cursor: pointer;
-          background-color: rgb(64, 158, 255);        
-          .btnText {
-            font-size: 14px;
-            font-weight: 400;
-            color: rgb(255, 255, 255);
-            line-height: 36px;
+          background: #ffffff;
+          .btn2text {
+            color: #409eff;
             margin-left: 5px;
+            font-size: 14px;
           }
         }
       }
-    }
     .pjcb_content {
       border: 1px solid #409eff;
       padding: 32px;
+      margin-top: 10px;
+      .ant-input{
+          width: 46px;
+          font-size: 16px;
+          color: #409eff;
+        }
+      .scoretext{
+        color: #409eff;
+        font-size: 16px;
+        margin-left: 3px;
+        margin-right: 4px;
+      }
       .pjcb_content :last-child {
         margin-bottom: 0px;
       }

From af18d027ea397132b22af86851609df0bf2914fa Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Tue, 25 Oct 2022 15:54:07 +0800
Subject: [PATCH 09/13] =?UTF-8?q?style:=E8=8E=B7=E5=8F=96=E8=A7=84?=
 =?UTF-8?q?=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/ProjectScore.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/drawers/ProjectScore.vue b/src/components/drawers/ProjectScore.vue
index 6ba17b26..9d7d77bc 100644
--- a/src/components/drawers/ProjectScore.vue
+++ b/src/components/drawers/ProjectScore.vue
@@ -647,7 +647,7 @@ export default {
       }
     .pjcb_content {
       border: 1px solid #409eff;
-      padding: 32px;
+      padding: 20px;
       margin-top: 10px;
       .ant-input{
           width: 46px;
@@ -664,7 +664,9 @@ export default {
         margin-bottom: 0px;
       }
       .content {
-        margin-bottom: 24px;
+        align-items: center;
+        height: 50px;
+        display: flex;
       }
       margin-bottom: 130px;
     }

From 949892dc9fe162ecac27f3ea752507b09a9108bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B2=B3=E4=BD=B3=E9=91=AB?= <yuejx@dongwu-inc.com>
Date: Tue, 25 Oct 2022 15:56:45 +0800
Subject: [PATCH 10/13] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE,=E8=B0=83=E7=A0=94=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectcenter/ProjectAdd.vue    | 27 +++++++++++--
 src/views/projectcenter/ProjectManage.vue | 48 +++++++++++++----------
 src/views/projectcenter/TaskPage.vue      |  2 +
 src/views/research/ResearchManage.vue     |  8 +---
 4 files changed, 55 insertions(+), 30 deletions(-)

diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index c83ddd74..9032fd8a 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -19,7 +19,8 @@
             <div class="inname">项目名称</div>
           </div>
           <div class="in">
-            <a-input v-model:value="valueE" placeholder="请输入项目名称" />
+            <a-input v-model:value="valueE" placeholder="请输入项目名称" show-count
+                :maxlength="30"/>
           </div>
         </div>
         <div class="name">
@@ -75,6 +76,7 @@
           <div class="in">
             <a-range-picker
               separator="至"
+              :placeholder="['      开始时间', '        结束时间']"
               style="width: 100%; height: 40px; border-radius: 5px"
               show-time
             />
@@ -120,7 +122,8 @@
             <a-textarea
               v-model:value="valuei"
               style="height: 80px"
-              placeholder="请输入项目说明"
+              placeholder="请输入说明"
+              show-count :maxlength="200"
             />
           </div>
         </div>
@@ -395,12 +398,25 @@ export default {
           flex: 1;
           // .ant-radio-wrapper {
           // }
+          .ant-input-textarea-show-count {
+              position: relative;
+              height: 88px;
+            }
+            .ant-input-textarea-show-count::after {
+              position: absolute;
+              right: 10px;
+              bottom: 0px;
+            } 
           .ant-input {
-            border-radius: 5px;
+            border-radius: 8px;
             // height: 120%;
             width: 100%;
             height: 40px;
           }
+          .ant-input-affix-wrapper {
+            padding: 0 11px;
+            border-radius: 8px;
+          }
           .ant-select-selector {
             border-radius: 5px;
             // height: 120%;
@@ -435,6 +451,11 @@ export default {
       .name2 {
         display: flex;
         align-items: flex-start;
+        .ant-input-textarea {
+            .ant-input {
+                height: 88px;
+            }
+        }
       }
     }
     .template {
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index bffcaf1a..e32aefe4 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -142,11 +142,6 @@
             display: flex;
             align-items: center;
             justify-content: space-between;
-            background: linear-gradient(
-              0deg,
-              rgba(78, 166, 255, 0) 0%,
-              rgba(78, 166, 255, 0.2) 100%
-            );
           "
         >
           <div class="headerLeft" style="margin-left: 32px">
@@ -228,11 +223,6 @@
               display: flex;
               align-items: center;
               justify-content: space-between;
-              background: linear-gradient(
-                0deg,
-                rgba(78, 166, 255, 0) 0%,
-                rgba(78, 166, 255, 0.2) 100%
-              );
             "
           >
             <div class="headerLeft" style="margin-left: 32px">
@@ -324,11 +314,6 @@
             display: flex;
             align-items: center;
             justify-content: space-between;
-            background: linear-gradient(
-              0deg,
-              rgba(78, 166, 255, 0) 0%,
-              rgba(78, 166, 255, 0.2) 100%
-            );
           "
         >
           <div class="headerLeft" style="margin-left: 32px">
@@ -437,11 +422,6 @@
             display: flex;
             align-items: center;
             justify-content: space-between;
-            background: linear-gradient(
-              0deg,
-              rgba(78, 166, 255, 0) 0%,
-              rgba(78, 166, 255, 0.2) 100%
-            );
           "
         >
           <div class="headerLeft" style="margin-left: 32px">
@@ -2535,6 +2515,13 @@ export default {
 .doublesonpro {
   .ant-modal {
     .ant-modal-body {
+      .modalHeader {
+        background: linear-gradient(
+              0deg,
+              rgba(78, 166, 255, 0) 0%,
+              rgba(78, 166, 255, 0.2) 100%
+            );
+      }
       padding: 0;
       .modalMain {
         display: flex;
@@ -2617,6 +2604,13 @@ export default {
 .doublepro {
   .ant-modal {
     .ant-modal-body {
+      .modalHeader {
+        background: linear-gradient(
+              0deg,
+              rgba(78, 166, 255, 0) 0%,
+              rgba(78, 166, 255, 0.2) 100%
+            );
+      }
       padding: 0;
       .modalMain {
         display: flex;
@@ -2699,6 +2693,13 @@ export default {
   .ant-modal {
     .ant-modal-body {
       padding: 0 !important;
+      .modalHeader {
+        background: linear-gradient(
+              0deg,
+              rgba(78, 166, 255, 0) 0%,
+              rgba(78, 166, 255, 0.2) 100%
+            );
+      }
       .modalMain {
         display: flex;
         justify-content: center;
@@ -2750,6 +2751,13 @@ export default {
   .ant-modal {
     .ant-modal-body {
       padding: 0 !important;
+      .modalHeader {
+        background: linear-gradient(
+                0deg,
+                rgba(78, 166, 255, 0) 0%,
+                rgba(78, 166, 255, 0.2) 100%
+              );
+      }
       .modalMain {
         display: flex;
         flex-direction: column;
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 45eb1d2a..1d169846 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -1039,6 +1039,7 @@
         @ok="closeModal"
         :footer="null"
         :closable="false"
+        :centered="true"
         wrapClassName="pubproject"
         width="679px"
         height="437px"
@@ -1114,6 +1115,7 @@
         @ok="closeModal2"
         :footer="null"
         :closable="false"
+        :centered="true"
         wrapClassName="doublepro"
         width="624px"
         height="332px"
diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue
index 6debe957..2f34de7d 100644
--- a/src/views/research/ResearchManage.vue
+++ b/src/views/research/ResearchManage.vue
@@ -37,7 +37,7 @@
           <a-range-picker
             v-model:value="value2"
             separator="至"
-            :placeholder="['开始时间', '结束时间']"
+            :placeholder="['      开始时间', '        结束时间']"
           />
         </div>
       </div>
@@ -101,12 +101,6 @@
         </div>
         <div class="mid clearfix">
           <div class="name">
-            <div class="d" style="margin-top: -4px">
-              <img
-                style="width: 10px; height: 10px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-            </div>
             <div class="inname">调研名称</div>
             <div class="in">
               <a-input

From 4e1bf6fa41867d8908534e948aedad97b5b3c311 Mon Sep 17 00:00:00 2001
From: dongwug <guoys@dongwu-inc.com>
Date: Tue, 25 Oct 2022 16:05:03 +0800
Subject: [PATCH 11/13] =?UTF-8?q?feat=EF=BC=9A=E8=B0=83=E7=A0=94=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=A1=86=E6=A0=B7=E5=BC=8F=20=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E8=B0=83=E7=A0=94=E6=A0=B7=E5=BC=8F=20=E8=B0=83=E7=A0=94?=
 =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E5=88=A0=E9=99=A4=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=20=E9=9D=A2=E6=8E=88=E8=AF=BE=E5=AD=97=E4=BD=93?=
 =?UTF-8?q?=E9=A2=9C=E8=89=B2=20=E5=BC=80=E8=AF=BE=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=93=8D=E4=BD=9C=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/courselibrary/CoursewareManage.vue | 38 ++++++++++++--------
 src/views/research/ResearchAdd.vue           |  2 +-
 src/views/research/ResearchManage.vue        | 25 ++-----------
 3 files changed, 27 insertions(+), 38 deletions(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 3d1a37e9..8bdff2ff 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -121,7 +121,7 @@
             </div>
             <div class="b_sub">
               <div class="bs_header">
-                <div class="b_left">课程命名规则</div>
+                <div class="b_left"><span style="color:#999BA3;">课程命名规则</span></div>
                 <div class="b_right" @click="hideShow" style="cursor: pointer">
                   <div
                     class="b_zk"
@@ -313,7 +313,7 @@
                 </div>
                 <div class="i2_cz">
                   <div class="i2_top">
-                    <div class="i2_left">课程命名规则</div>
+                    <div class="i2_left"><span style="color:#999BA3;">课程命名规则</span></div>
                     <div
                       class="i2_right"
                       @click="hideShow"
@@ -1404,19 +1404,21 @@
                       class="btn4_sup"
                       :style="{ display: hideshow ? 'none' : 'block' }"
                     >
+                    <div class="btnsbox">
                       <div class="btn4_tit">
                         <span style="color: #4ea6ff">批量录入成绩</span>
                       </div>
                       <div class="btn4_op1">
-                        <span style="margin: 10px auto">批量结业</span>
+                        <span >批量结业</span>
                       </div>
                       <div class="btn4_op2">
-                        <span style="margin: 10px auto">批量通过</span>
+                        <span >批量通过</span>
                       </div>
                       <div class="btn4_op3">
-                        <span style="margin: 10px auto">批量拒绝</span>
+                        <span>批量拒绝</span>
                       </div>
                     </div>
+                    </div>
                   </div>
                   <div class="stmm_btn btn5">
                     <div class="export"></div>
@@ -4977,6 +4979,7 @@ export default defineComponent({
                   }
                   .btn4 {
                     display: flex;
+                    width: 130px;
                     flex-direction: column;
                     position: relative;
                     .btn4_sub {
@@ -4998,21 +5001,26 @@ export default defineComponent({
                     }
                     .btn4_sup {
                       width: 100%;
-                      display: flex;
-                      flex-direction: column;
                       background-color: #ffffff;
                       box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
                       position: absolute;
                       top: 40px;
                       z-index: 999;
-                      .btn4_tit {
-                        margin-top: 8px;
-                        margin-left: 8px;
-                      }
-                      .btn4_op1,
-                      .btn4_op2,
-                      .btn4_op3 {
-                        margin-left: 20px;
+                      .btnsbox{
+                        display: flex;
+                        flex-direction: column;
+                        justify-content: center;
+                        align-items: center;
+                        .btn4_tit {
+                          margin: 10px auto;
+                          white-space: nowrap;
+                        }
+                        .btn4_op1,
+                        .btn4_op2,
+                        .btn4_op3 {
+                          margin-bottom:10px;
+                          white-space: nowrap;
+                        }
                       }
                     }
                   }
diff --git a/src/views/research/ResearchAdd.vue b/src/views/research/ResearchAdd.vue
index 1384fded..a59b2e1e 100644
--- a/src/views/research/ResearchAdd.vue
+++ b/src/views/research/ResearchAdd.vue
@@ -440,7 +440,7 @@ export default {
       cursor: pointer;
       margin-top: 32px;
       margin-left: 20px;
-      float: right;
+      // float: right;
       color: #4ea6ff;
       font-size: 14px;
     }
diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue
index 6debe957..42749d9d 100644
--- a/src/views/research/ResearchManage.vue
+++ b/src/views/research/ResearchManage.vue
@@ -37,7 +37,7 @@
           <a-range-picker
             v-model:value="value2"
             separator="至"
-            :placeholder="['开始时间', '结束时间']"
+            :placeholder="['        开始时间', '        结束时间']"
           />
         </div>
       </div>
@@ -65,7 +65,7 @@
         :data-source="tableData"
         :loading="tableDataTotal === -1 ? true : false"
         expandRowByClick="true"
-        :scroll="{ x: 1500, y: 800 }"
+        :scroll="{ x: 1500 }"
         @expand="expandTable"
         :pagination="false"
       />
@@ -102,10 +102,6 @@
         <div class="mid clearfix">
           <div class="name">
             <div class="d" style="margin-top: -4px">
-              <img
-                style="width: 10px; height: 10px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
             </div>
             <div class="inname">调研名称</div>
             <div class="in">
@@ -287,12 +283,6 @@ export default {
           width: 100,
           align: "center",
           className: "h",
-          // ellipsis: true,
-          // scopedSlots: { customRender: "action" }, //引入的插槽
-          // customRender: (text, record) => {
-          //   console.log(text, record);
-          //   return <span>{text.text}</span>;
-          // },
         },
         {
           title: "名称",
@@ -487,10 +477,9 @@ export default {
   width: 680px;
   // height: 525px;
   background-color: #fff;
-
   box-shadow: 0 0 10px rgba(118, 136, 166, 0.21);
   left: 50%;
-  top: 20%;
+  top: 50%;
   transform: translate(-50%, -50%);
   .top {
     width: 100%;
@@ -587,9 +576,7 @@ export default {
   height: 100%;
   display: flex;
   flex-direction: column;
-  //align-items: center;
   position: relative;
-  // position: relative;
   .filter {
     margin-left: 38px;
     margin-right: 38px;
@@ -607,7 +594,6 @@ export default {
     }
     .btns {
       display: flex;
-      // flex-wrap: wrap;
       .btn {
         padding: 0px 26px 0px 26px;
         height: 38px;
@@ -686,7 +672,6 @@ export default {
     margin: 20px 38px 30px;
     display: flex;
     flex: 1;
-    //position: relative;
     flex-direction: column;
 
     th.h {
@@ -701,11 +686,8 @@ export default {
   }
   .pa {
     width: 100%;
-    // height: 20px;
-    // background-color: red;
     display: flex;
     justify-content: center;
-    //position: absolute;
     margin-bottom: 20px;
     .pagination {
       margin-bottom: 20px;
@@ -770,7 +752,6 @@ export default {
                   height: 16px;
                   position: relative;
                   margin-right: 10px;
-                // background-image: url(@/assets/images/coursewareManage/notice.png);
                 img{
                   width: 100%;
                   height: 100%;

From b0eb77870b7475e7677901163713062549898d40 Mon Sep 17 00:00:00 2001
From: songwc <songwc@dongwu-inc.com>
Date: Tue, 25 Oct 2022 16:26:29 +0800
Subject: [PATCH 12/13] =?UTF-8?q?style=EF=BC=9A=E4=BF=AE=E6=94=B9=E4=BA=8C?=
 =?UTF-8?q?=E7=BB=B4=E7=A0=81=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/ActiveAttendance.vue |  85 ++++++++++-
 src/components/drawers/FaceManage.vue       |   9 ++
 src/components/drawers/WorkManage.vue       |   1 +
 src/views/learningpath/LevelAdd.vue         | 158 ++++++++++++++++----
 4 files changed, 222 insertions(+), 31 deletions(-)

diff --git a/src/components/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue
index 9c40b824..30d27840 100644
--- a/src/components/drawers/ActiveAttendance.vue
+++ b/src/components/drawers/ActiveAttendance.vue
@@ -76,11 +76,11 @@
           </div>
         </div>
         <div class="btnss" style="margin-top: 20px">
-          <div class="btn btn1">
+          <div class="btn btn1" @click="showqdModal">
             <div class="wz">批量签到</div>
           </div>
-          <div class="btn btn2">
-            <div class="wz" @click="showEntryScore">批量签退</div>
+          <div class="btn btn2" @click="showqtModal">
+            <div class="wz">批量签退</div>
           </div>
           <div class="btn btn2">
             <div class="img2"></div>
@@ -145,6 +145,66 @@
       <button class="btn2">确定</button>
     </div>
   </a-drawer>
+  <!-- 批量签到弹窗 -->
+  <a-modal
+    v-model:visible="qdModal"
+    :footer="null"
+    :closable="closeCopy"
+    wrapClassName="CopyModal"
+    centered="true"
+  >
+    <div class="delete">
+      <div class="del_header"></div>
+      <div class="del_main">
+        <div class="header">
+          <div class="icon"></div>
+          <span>提示</span>
+          <div class="close_exit" @click="closeqdModal"></div>
+        </div>
+        <div class="body">
+          <span>您确定要批量签到吗</span>
+        </div>
+        <div class="del_btnbox">
+          <div class="del_btn btn1">
+            <div class="btnText" @click="delete_exit">取消</div>
+          </div>
+          <div class="del_btn btn2">
+            <div class="btnText" @click="delete_exit">确定</div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </a-modal>
+  <!-- 批量签退弹窗 -->
+  <a-modal
+    v-model:visible="qtModal"
+    :footer="null"
+    :closable="closeCopy"
+    wrapClassName="CopyModal"
+    centered="true"
+  >
+    <div class="delete">
+      <div class="del_header"></div>
+      <div class="del_main">
+        <div class="header">
+          <div class="icon"></div>
+          <span>提示</span>
+          <div class="close_exit" @click="closeqtModal"></div>
+        </div>
+        <div class="body">
+          <span>您确定要批量签退吗</span>
+        </div>
+        <div class="del_btnbox">
+          <div class="del_btn btn1">
+            <div class="btnText" @click="delete_exit">取消</div>
+          </div>
+          <div class="del_btn btn2">
+            <div class="btnText" @click="delete_exit">确定</div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </a-modal>
 </template>
 
 <script>
@@ -168,6 +228,9 @@ export default {
       currentPage: 1,
       tableDataTotal: 100,
       selectedRowKeys: [],
+      qtModal: false, //批量签退
+      qdModal: false, //批量签到
+      closeCopy: false,
       projectNameList: [
         {
           id: 1,
@@ -476,6 +539,18 @@ export default {
       ];
       return columns;
     };
+    const showqdModal = () => {
+      state.qdModal = true;
+    };
+    const showqtModal = () => {
+      state.qtModal = true;
+    };
+    const closeqdModal = () => {
+      state.qdModal = false;
+    };
+    const closeqtModal = () => {
+      state.qtModal = false;
+    };
     return {
       ...toRefs(state),
       selectProjectName,
@@ -484,6 +559,10 @@ export default {
       onSelectChange,
       showEntryScore,
       tableDataFunc,
+      showqdModal,
+      showqtModal,
+      closeqtModal,
+      closeqdModal,
     };
   },
 };
diff --git a/src/components/drawers/FaceManage.vue b/src/components/drawers/FaceManage.vue
index a651eb65..96e009e2 100644
--- a/src/components/drawers/FaceManage.vue
+++ b/src/components/drawers/FaceManage.vue
@@ -164,6 +164,7 @@ export default {
       pageSize: 10,
       currentPage: 1,
       tableDataTotal: 100,
+      showdonemodal: false,
       selectedRowKeys: [],
       projectNameList: [
         {
@@ -334,6 +335,12 @@ export default {
     const showEntryScore = () => {
       state.Evisible = true;
     };
+    const showdoneModal = () => {
+      state.showdonemodal = true;
+    };
+    const closedoneModal = () => {
+      state.showdonemodal = false;
+    };
     const onSelectChange = (selectedRowKeys) => {
       console.log("selectedRowKeys changed: ", selectedRowKeys);
       showModal();
@@ -354,6 +361,8 @@ export default {
       showModal,
       closeModal,
       showEntryScore,
+      showdoneModal,
+      closedoneModal,
     };
   },
 };
diff --git a/src/components/drawers/WorkManage.vue b/src/components/drawers/WorkManage.vue
index ead81ad6..3a258372 100644
--- a/src/components/drawers/WorkManage.vue
+++ b/src/components/drawers/WorkManage.vue
@@ -97,6 +97,7 @@
         :closable="close"
         :footer="null"
         wrapClassName="WorkManage"
+        centered="true"
       >
         <div class="header">
           <div class="inheader">
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index 4f1f4742..38391eaa 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -423,6 +423,10 @@
                         @click="
                           item.course === '面授'
                             ? showCopyModal(item.course)
+                            : item.course === '直播'
+                            ? showzhibModal(item.course)
+                            : item.course === '活动'
+                            ? showhuodModal(item.course)
                             : null
                         "
                       >
@@ -541,8 +545,9 @@
                 </div>
               </div>
             </div>
-            <div class="pad"></div></div>
-          </a-tab-pane>
+            <div class="pad"></div>
+          </div>
+        </a-tab-pane>
         <a-tab-pane key="4" tab="设置">
           <div class="split"></div>
           <div class="sametab">
@@ -552,7 +557,9 @@
                 <div class="headone">
                   <div class="box"></div>
                   <div class="onetitle">关卡内容可见可学设置</div>
-                  <div class="oneedi" @click="showbtn" v-show="twobtn">编辑</div>
+                  <div class="oneedi" @click="showbtn" v-show="twobtn">
+                    编辑
+                  </div>
                   <div v-show="twobtnn" class="twobtn">
                     <div class="btnone" @click="closebtn">取消</div>
                     <div class="btntwo" @click="closebtn">确定</div>
@@ -568,17 +575,27 @@
                     />
                     <span class="yulan">预览其他关卡</span><br />
                     <div style="width: 10px; height: 4px"></div>
-                    <div style="display: flex;align-items: center;">
-                        <span class="yulan2">学员可预览第</span
-                          >
-                            <span style="color: #4ea6ff" v-show="number">1</span>
-                            <a-input-number v-model:value="nubvalue" v-show="inputbox" :controls="false" :autofocus="true" :min="1" />
-                            <span>关-第</span
-                          ><span style="color: #4ea6ff" v-show="number">4</span>
-                            <a-input-number v-model:value="nubvalue1" v-show="inputbox" :controls="false" :autofocus="true" :min="1"/>
-                        <span>关内容</span>
+                    <div style="display: flex; align-items: center">
+                      <span class="yulan2">学员可预览第</span>
+                      <span style="color: #4ea6ff" v-show="number">1</span>
+                      <a-input-number
+                        v-model:value="nubvalue"
+                        v-show="inputbox"
+                        :controls="false"
+                        :autofocus="true"
+                        :min="1"
+                      />
+                      <span>关-第</span
+                      ><span style="color: #4ea6ff" v-show="number">4</span>
+                      <a-input-number
+                        v-model:value="nubvalue1"
+                        v-show="inputbox"
+                        :controls="false"
+                        :autofocus="true"
+                        :min="1"
+                      />
+                      <span>关内容</span>
                     </div>
-                    
                   </div>
                   <div class="checkcon" style="margin-top: 20px">
                     <input
@@ -589,15 +606,26 @@
                     />
                     <span class="yulan">学习其他关卡</span><br />
                     <div style="width: 10px; height: 4px"></div>
-                    <div style="display: flex;align-items: center;">
-                        <span class="yulan2">学员可预览第</span
-                          >
-                            <span style="color: #4ea6ff" v-show="number">1</span>
-                            <a-input-number v-model:value="nubvalue2" v-show="inputbox" :controls="false" :autofocus="true" :min="1"/>
-                            <span>关-第</span
-                          ><span style="color: #4ea6ff" v-show="number">4</span>
-                            <a-input-number v-model:value="nubvalue3" v-show="inputbox" :controls="false" :autofocus="true" :min="1"/>
-                        <span>关内容</span>
+                    <div style="display: flex; align-items: center">
+                      <span class="yulan2">学员可预览第</span>
+                      <span style="color: #4ea6ff" v-show="number">1</span>
+                      <a-input-number
+                        v-model:value="nubvalue2"
+                        v-show="inputbox"
+                        :controls="false"
+                        :autofocus="true"
+                        :min="1"
+                      />
+                      <span>关-第</span
+                      ><span style="color: #4ea6ff" v-show="number">4</span>
+                      <a-input-number
+                        v-model:value="nubvalue3"
+                        v-show="inputbox"
+                        :controls="false"
+                        :autofocus="true"
+                        :min="1"
+                      />
+                      <span>关内容</span>
                     </div>
                   </div>
                   <br />
@@ -779,6 +807,62 @@
           </div>
         </div>
       </a-modal>
+      <!-- 直播管理二维码 -->
+      <a-modal
+        v-model:visible="zhibModal"
+        :footer="null"
+        :closable="closeCopy"
+        wrapClassName="facemanageModal"
+        centered="true"
+      >
+        <div class="delete">
+          <div class="del_header"></div>
+          <div class="del_main">
+            <div class="header">
+              <div class="icon"></div>
+              <span>直播管理</span>
+              <div class="close_exit" @click="closezhibModal"></div>
+            </div>
+            <div class="body">
+              <div><img src="../../assets/images/taskpage/erweima.png" /></div>
+            </div>
+            <div class="footerr">
+              <div class="onload">下载二维码</div>
+              <div class="onloadpx">200*200</div>
+              <div class="onloadpx">400*400</div>
+              <div class="onloadpx">800*800</div>
+            </div>
+          </div>
+        </div>
+      </a-modal>
+      <!-- 活动管理二维码 -->
+      <a-modal
+        v-model:visible="huodModal"
+        :footer="null"
+        :closable="closeCopy"
+        wrapClassName="facemanageModal"
+        centered="true"
+      >
+        <div class="delete">
+          <div class="del_header"></div>
+          <div class="del_main">
+            <div class="header">
+              <div class="icon"></div>
+              <span>活动管理</span>
+              <div class="close_exit" @click="closehuodModal"></div>
+            </div>
+            <div class="body">
+              <div><img src="../../assets/images/taskpage/erweima.png" /></div>
+            </div>
+            <div class="footerr">
+              <div class="onload">下载二维码</div>
+              <div class="onloadpx">200*200</div>
+              <div class="onloadpx">400*400</div>
+              <div class="onloadpx">800*800</div>
+            </div>
+          </div>
+        </div>
+      </a-modal>
       <!-- 添加学员抽屉 -->
       <add-stu v-model:AddSvisible="AddSvisible" />
       <!-- 导入学员抽屉 -->
@@ -838,6 +922,8 @@ export default {
       twobtnn: false,
       inputbox: false,
       Wvisible: false, //作业管理
+      huodModal: false,
+      zhibModal: false,
       projectNameListt: [
         {
           id: 1,
@@ -1293,13 +1379,13 @@ export default {
       state.twobtnn = true;
       state.number = false;
       state.inputbox = true;
-    }
+    };
     const closebtn = () => {
       state.twobtnn = false;
       state.twobtn = true;
       state.number = true;
       state.inputbox = false;
-    }
+    };
     const showCopyModal = () => {
       state.copyModal = true;
     };
@@ -1336,6 +1422,18 @@ export default {
     const showWork = () => {
       state.Wvisible = true;
     };
+    const showzhibModal = () => {
+      state.zhibModal = true;
+    };
+    const showhuodModal = () => {
+      state.huodModal = true;
+    };
+    const closezhibModal = () => {
+      state.zhibModal = false;
+    };
+    const closehuodModal = () => {
+      state.huodModal = false;
+    };
     return {
       ...toRefs(state),
       selectProjectName,
@@ -1361,6 +1459,10 @@ export default {
       showTest,
       showFace,
       showWork,
+      showzhibModal,
+      showhuodModal,
+      closehuodModal,
+      closezhibModal,
     };
   },
 };
@@ -2819,9 +2921,9 @@ export default {
               height: 24px;
               border: 1px solid rgba(64, 158, 255, 1);
               border-radius: 4px;
-              color: #FFFFFF;
+              color: #ffffff;
               margin-left: 20px;
-              background: #409EFF;
+              background: #409eff;
               cursor: pointer;
             }
           }
@@ -2852,13 +2954,13 @@ export default {
               width: 24px;
               margin: 10px;
               border-radius: 4px;
-              border: 1px solid #6D7584;
+              border: 1px solid #6d7584;
               .ant-input-number-input {
                 width: 100%;
                 height: 100%;
                 font-size: 14px;
                 padding: 0;
-                color: #409EFF;
+                color: #409eff;
                 text-align: center;
               }
             }

From d75b4b37010584de5791e9874e6101b9c9424c63 Mon Sep 17 00:00:00 2001
From: songwc <songwc@dongwu-inc.com>
Date: Tue, 25 Oct 2022 16:34:01 +0800
Subject: [PATCH 13/13] =?UTF-8?q?style=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=AD=A6?=
 =?UTF-8?q?=E4=B9=A0=E8=B7=AF=E5=BE=84=E6=9D=83=E9=99=90=E5=90=8D=E5=8D=95?=
 =?UTF-8?q?=20=E5=BD=92=E5=B1=9E=E6=9D=83=20=E6=9F=A5=E7=9C=8B=E6=9D=83=20?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=9D=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/ManageRight.vue |  2 +-
 src/components/drawers/Ownership.vue   |  2 +-
 src/components/drawers/PowerList.vue   | 16 ++++++++++------
 src/components/drawers/QueryRight.vue  |  4 ++--
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/components/drawers/ManageRight.vue b/src/components/drawers/ManageRight.vue
index b978e012..a4c117dc 100644
--- a/src/components/drawers/ManageRight.vue
+++ b/src/components/drawers/ManageRight.vue
@@ -823,7 +823,7 @@ export default {
 <style lang="scss">
 .ManageRight {
   .drawerMain {
-    min-width: 600px;
+    min-width: 550px;
     margin: 0px 32px 0px 32px;
     // overflow-y: scroll;
     display: flex;
diff --git a/src/components/drawers/Ownership.vue b/src/components/drawers/Ownership.vue
index ef808712..d25072b0 100644
--- a/src/components/drawers/Ownership.vue
+++ b/src/components/drawers/Ownership.vue
@@ -778,7 +778,7 @@ export default {
 <style lang="scss">
 .Ownership {
   .drawerMain {
-    min-width: 600px;
+    min-width: 550px;
     margin: 0px 32px 0px 32px;
     // overflow-y: scroll;
     display: flex;
diff --git a/src/components/drawers/PowerList.vue b/src/components/drawers/PowerList.vue
index ea5feb08..09056061 100644
--- a/src/components/drawers/PowerList.vue
+++ b/src/components/drawers/PowerList.vue
@@ -48,7 +48,7 @@
             :loading="tableDataTotal === -1 ? true : false"
             expandRowByClick="true"
             @expand="expandTable"
-            :scroll="{ x: 900}"
+            :scroll="{ x: 900 }"
             :pagination="false"
             :row-selection="{
               columnWidth: 30,
@@ -456,7 +456,7 @@ export default {
   }
   .drawerMain {
     // overflow: auto;
-    min-width: 550px;
+    min-width: 500px;
     margin: 0px 32px 0px 32px;
     overflow-x: scroll;
     display: flex;
@@ -467,6 +467,7 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
+      flex-shrink: 0;
       // background-color: red;
       margin-bottom: 20px;
       .headerTitle {
@@ -482,6 +483,7 @@ export default {
       // height: 100%;
       // background-color: #bfa;
       overflow-y: auto;
+      margin-bottom: 80px;
       .search {
         width: 100%;
         display: flex;
@@ -538,15 +540,15 @@ export default {
           }
 
           .btn1 {
-            background: #409EFF;
+            background: #409eff;
 
             color: #ffffff;
           }
           .btn2 {
             background: #ffffff;
 
-            color: #409EFF;
-            border: 1px solid #409EFF;
+            color: #409eff;
+            border: 1px solid #409eff;
           }
         }
       }
@@ -599,7 +601,9 @@ export default {
         // position: absolute;
         // bottom: 20px;
         // margin-bottom: 20px;
-        .ant-pagination-prev, .ant-pagination-next,.ant-pagination-options {
+        .ant-pagination-prev,
+        .ant-pagination-next,
+        .ant-pagination-options {
           margin-bottom: 10px;
         }
         .ant-pagination-item {
diff --git a/src/components/drawers/QueryRight.vue b/src/components/drawers/QueryRight.vue
index b7e26a90..11e4a5df 100644
--- a/src/components/drawers/QueryRight.vue
+++ b/src/components/drawers/QueryRight.vue
@@ -69,7 +69,7 @@
                     :data-source="tabledata"
                     :loading="tableDataTotal === -1 ? true : false"
                     expandRowByClick="true"
-                    :scroll="{ x: 500}"
+                    :scroll="{ x: 500 }"
                     @expand="expandTable"
                     :pagination="false"
                     :row-selection="{
@@ -778,7 +778,7 @@ export default {
 <style lang="scss">
 .QueryRight {
   .drawerMain {
-    min-width: 600px;
+    min-width: 550px;
     margin: 0px 32px 0px 32px;
     // overflow-y: scroll;
     display: flex;