Merge branch 'master' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage

src/components/drawers/ActiveAttendance.vue

@@ -505,12 +505,10 @@ export default {
     }
     .ant-drawer-body {
       padding: 0;
-    }
-  }
       .drawerMain {
         min-width: 600px;
         margin: 0px 32px 0px 32px;
-    overflow-x: scroll;
+        // overflow-x: scroll;
         display: flex;
         flex-direction: column;
         .header {
@@ -521,6 +519,7 @@ export default {
           align-items: center;
           // background-color: red;
           margin-bottom: 20px;
+          flex-shrink: 0;
           .headerTitle {
             font-size: 18px;
             font-weight: 600;
@@ -532,7 +531,7 @@ export default {
         .main {
           width: 100%;
           height: 100%;
-      // background-color: #bfa;
+          background-color: #bfa;
           overflow-y: auto;
 
           .titl {
@@ -795,4 +794,6 @@ export default {
         }
       }
     }
+  }
+}
 </style>

src/components/drawers/AddCase.vue

@@ -79,7 +79,7 @@
   const columns1 = [
     {
       title: "案例标题",
-      width: "35%",
+      width: "40%",
       dataIndex: "title",
       key: "num",
       align: "center",
@@ -94,7 +94,7 @@
     },
     {
       title: "导入时间",
-      width: "40%",
+      width: "35%",
       dataIndex: "time",
       key: "time",
       align: "center",

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">
@@ -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,9 +142,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 {
@@ -143,6 +152,7 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
+      flex-shrink: 0;
       // background-color: red;
       margin-bottom: 20px;
       .headerTitle {
@@ -154,6 +164,7 @@ export default {
       }
     }
     .main {
+      overflow: scroll;
       .minatitl {
         display: flex;
         .up1 {
@@ -175,6 +186,7 @@ export default {
           font-size: 14px;
           font-weight: 400;
           color: #333333;
+          white-space: nowrap;
         }
         .right {
           margin-left: 6px;
@@ -218,7 +230,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 +241,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 +339,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);
+              }
+            }
           }
         }
       }

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;

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;

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;

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">
+            <div class="groupright">
-              <span>规则</span>
+              <div class="spandiv"><span class="spantext">规则</span></div>
-              <div class="btns">
+              <div v-if="edit" class="btns">
-                <div class="edit_btn1">
+                <div class="btn1" @click="edit=!edit">
-                  <div class="btnText">取消</div>
+                <img src="../../assets/images/projectadd/edit1.png" />
+                <span class="btn1text">编辑</span>
               </div>
-                <div class="edit_btn2">
+            
-                  <div class="btnText">确定</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,
+     
       
       
     });
@@ -357,6 +378,12 @@ export default {
      
     };
   },
+  computed: {
+    // 计算属性的 getter
+    scoresum: function () {
+        return Number(this.score1)+Number(this.score2);
+      }
+    }
 };
 </script>
 <style lang="scss">
@@ -569,65 +596,77 @@ export default {
   .pjc_body {
     margin-left: 34px;
     margin-right: 34px;
-    .pjcb_header {
+    .spandiv{
+      position: relative;
+      /* height: 100%; */
+      width: 40px;
+      .spantext{
+        position: absolute;
+        left: 0;
+        bottom: 0px;
+      }
+      }
+    
+    .groupright {
         display: flex;
         justify-content: space-between;
-      align-items: center;
+        .btn1 {
-      margin: 24px auto;
-      .btns {
-        display: flex;
-        .edit_btn1 {
           width: 100px;
-          // padding: 0px 26px 0px 26px;
+          height: 40px;
-          height: 38px;
-          margin-left: 15px;
-          border-radius: 8px;
-          border: 1px solid rgba(64, 158, 255, 1);
           display: flex;
           align-items: center;
           justify-content: center;
-          flex-shrink: 0;
+          margin-right: 16px;
-          cursor: pointer;
+          border: 1px solid #409eff;
-          background-color: rgb(255, 255, 255);
-          .btnText {
-            font-size: 14px;
-            font-weight: 400;
-            color: rgb(64, 158, 255);
-            line-height: 36px;
-            margin-left: 5px;
-          }
-        }
-        .edit_btn2 {
-          width: 100px;
-          // padding: 0px 26px 0px 26px;
-          height: 38px;
-          margin-left: 15px;
           border-radius: 8px;
-          border: 1px solid rgba(64, 158, 255, 1);
+          background: #409eff;
+          cursor: pointer;
+          .btn1text {
+            color: #ffffff;
+            margin-left: 5px;
+            font-size: 14px;
+          }
+        }
+        .btn2 {
+          width: 100px;
+          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);        
+          background: #ffffff;
-          .btnText {
+          .btn2text {
-            font-size: 14px;
+            color: #409eff;
-            font-weight: 400;
-            color: rgb(255, 255, 255);
-            line-height: 36px;
             margin-left: 5px;
-          }
+            font-size: 14px;
           }
         }
       }
     .pjcb_content {
       border: 1px solid #409eff;
-      padding: 32px;
+      padding: 20px;
+      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;
       }
       .content {
-        margin-bottom: 24px;
+        align-items: center;
+        height: 50px;
+        display: flex;
       }
       margin-bottom: 130px;
     }

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">
@@ -86,7 +102,6 @@
       </div>
     </div>
   </a-drawer>
-  
 </template>
 
 <script>
@@ -108,6 +123,9 @@ export default {
     const state = reactive({
       name: null,
       open: false,
+      pageSize: 10,
+      currentPage: 1,
+      tableDataTotal: 100,
       projectNameList: [
         {
           id: 1,
@@ -300,6 +318,9 @@ export default {
     const showopen = () => {
       state.open = true;
     };
+    const onChange = (pageNumber) => {
+      console.log("Page: ", pageNumber);
+    };
     let timer;
     onMounted(() => {
       timer = setInterval(() => {
@@ -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;

src/components/drawers/TimeManage.vue

@@ -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;
+          }
         }
       }
     }

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,
+      item: require("../../assets/px.jpg"),
-      currentPage: 1,
-      tableDataTotal: 100,
     });
 
     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);

src/components/drawers/WorkManage.vue

@@ -54,15 +54,11 @@
           </div>
         </div>
         <div class="btnss" style="margin-top: 20px">
-          <div
+          <div class="btn btn1" style="margin-right: 20px; cursor: pointer">
-            class="btn btn1"
-            style="margin-right: 20px; cursor: pointer"
-            @click="showModal"
-          >
             <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;
+          }
+        }
       }
     }
 

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="create"></div>
-                    <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>
               </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>
@@ -699,7 +700,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"
@@ -901,16 +902,11 @@ export default {
       projectNameList4: [
         {
           id: 1,
-          value: "请选择关卡",
-          label: "请选择关卡",
-        },
-        {
-          id: 2,
           value: "关卡1",
           label: "关卡1",
         },
         {
-          id: 3,
+          id: 2,
           value: "关卡2",
           label: "关卡2",
         },
@@ -918,7 +914,7 @@ export default {
       //任务大纲列表
       taskSyllabus: [
         {
-          text: "阶段1腾飞班阶段1",
+          text: "关卡1  初级产品经理",
           children: [
             {
               course: "在线",
@@ -977,7 +973,7 @@ export default {
           ],
         },
         {
-          text: "阶段2腾飞班阶段2",
+          text: "关卡2  中级产品经理",
           children: [
             {
               course: "讨论",
@@ -1251,7 +1247,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"
@@ -1281,7 +1277,7 @@ export default {
       state.visible = true;
     };
     const closeChangeModal = () => {
-      state.visible = false;
+      state.visiblene = false;
     };
     const showAddStu = () => {
       state.AddSvisible = true;
@@ -1874,34 +1870,35 @@ export default {
         color: #ffffff;
         cursor: pointer;
       }
-      .edit {
+      .editright {
         position: absolute;
         right: 38px;
         top: 0;
-        color: #409eff;
+        width: 110px;
-        width: 100px;
         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 {
+        .editextb {
-          line-height: 40px;
+          color: #fff;
-        }
+          margin-left: 10px;
-      }
-      .edit:hover {
-        color: #ffffff;
-        background-color: #409eff;
-        cursor: pointer;
-        .editimg {
-          background-image: url("../../assets/images/projectadd/edit1.png");
         }
       }
+      // .edit:hover {
+      //   color: #ffffff;
+      //   background-color: #409eff;
+      //   cursor: pointer;
+      //   .editimg {
+      //     background-image: url("../../assets/images/projectadd/edit1.png");
+      //   }
+      // }
     }
     .second {
       display: flex;
@@ -2398,6 +2395,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;

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>
@@ -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>
@@ -371,10 +371,10 @@
           <div class="xwid">
             <div class="xin">
               <div class="xheadb">
-              <button class="addx">添加学员</button>
+                <button class="addx" @click="showAddStu">添加学员</button>
                 <!-- 点击抽屉组件在LevelAdd，此处没添加showAddStu、showImpStu -->
-              <button class="addd">导入学员</button>
+                <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" />
@@ -455,11 +455,47 @@
         </div>
       </div>
     </div>
+    <!-- 添加学员抽屉 -->
+    <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>
 
 <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 +536,10 @@ const drawercolumns = [
 ];
 export default {
   name: "LevelAddDetail",
+  components: {
+    AddStu,
+    ImpStu,
+  },
   setup() {
     const state = reactive({
       level: [
@@ -784,9 +824,13 @@ export default {
       tableDataTotal: 100,
       pageSize: 10,
       visible: false,
+      AddSvisible: false, //添加学员抽屉
+      AddImpStuvisible: false, //导入学员抽屉
       modal: false,
       clos: false,
       stm_hs: false,
+      deleteAll: false,
+      closeDeleteAll: false,
       value1: "",
       value2: "",
       selectedRowKeys: [],
@@ -808,6 +852,12 @@ export default {
     const afterVisibleChange = (bool) => {
       console.log("visible", bool);
     };
+    const showAddStu = () => {
+      state.AddSvisible = true;
+    };
+    const showImpStu = () => {
+      state.AddImpStuvisible = true;
+    };
     const tableDataFunc = () => {
       const columns = [
         {
@@ -1042,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,
@@ -1051,10 +1107,14 @@ export default {
       showModal,
       closeModal,
       afterVisibleChange,
+      showAddStu,
+      showImpStu,
       drawercolumns,
       onSelectChange,
       changebgc,
       gqxy_hShow,
+      showDeleteALLModal,
+      delete_exit,
     };
   },
 };
@@ -1339,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;
@@ -1354,9 +1414,9 @@ export default {
           .items1 {
             margin-bottom: 12px;
             display: flex;
+            justify-content: space-between;
             align-items: center;
-            .box_left {
+            .boxs_left {
-              width: 140px;
               display: flex;
               align-items: center;
               .script {
@@ -1377,7 +1437,7 @@ export default {
                 background-size: 100% 100%;
               }
             }
-            .box_right {
+            .boxs_right {
               .imgIcon {
                 width: 14px;
                 height: 14px;
@@ -1387,7 +1447,7 @@ export default {
             }
           }
           .items2 {
-            .name {
+            .nname {
               width: 100px;
               overflow: hidden;
               text-overflow: ellipsis;
@@ -2068,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>

src/views/projectcenter/TaskPage.vue

@@ -838,6 +838,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"
@@ -4161,6 +4162,9 @@ export default {
           display: flex;
           justify-content: center;
           align-items: center;
+          .ant-select-selector {
+            color: #388be1 !important;
+          }
           .inhead {
             width: 374px;
             // background-color: lightblue;
@@ -4168,6 +4172,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;