From 0be8da99a56e3b1ca125a878424e0eb16f224d1d Mon Sep 17 00:00:00 2001
From: dongwug <guoys@dongwu-inc.com>
Date: Wed, 26 Oct 2022 16:45:18 +0800
Subject: [PATCH 1/5] =?UTF-8?q?feat:=E5=BC=80=E8=AF=BE=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E4=B8=AD=E5=A4=8D=E5=88=B6=E5=BC=95=E8=B5=B7?=
 =?UTF-8?q?=E7=9A=84=E5=88=A0=E9=99=A4=E5=BC=B9=E7=AA=97=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/courselibrary/CoursewareManage.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 55496484..adb2c537 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -1565,7 +1565,7 @@
       <div
         class="delete"
         :style="{
-          display: delete_hs || copy_hs || nouse_hs ? 'block' : 'none',
+          display: del_hs || copy_hs || nouse_hs ? 'block' : 'none',
         }"
       >
         <div class="del_header"></div>
@@ -2714,6 +2714,7 @@ export default defineComponent({
                       >
                         <div
                           onClick={() => {
+                            state.delete_hs = true;
                             state.copy_hs = true;
                           }}
                         >

From 365e9b1748ac7f67fe0c0423e2dfd2bcd8d1a315 Mon Sep 17 00:00:00 2001
From: dongwug <guoys@dongwu-inc.com>
Date: Wed, 26 Oct 2022 17:03:30 +0800
Subject: [PATCH 2/5] =?UTF-8?q?feat:=E8=AF=BE=E7=A8=8B=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=B0=8F=E5=BC=B9=E7=AA=97zindex=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/courselibrary/CoursewareManage.vue | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index adb2c537..00fbe135 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -1361,6 +1361,7 @@
       :closable="closableQR"
       wrapClassName="QRModal"
       style="margin-top: 400px"
+      :zIndex="9999"
       @cancel="qr_exit"
     >
       <div class="QR" :style="{ display: QR_hs ? 'block' : 'none' }">
@@ -1403,6 +1404,7 @@
       :closable="closableQR"
       wrapClassName="recgradeModal"
       style="margin-top: 400px"
+      :zIndex="9999"
       @cancel="rg_exit"
     >
       <div class="recordgrade" :style="{ display: rg_hs ? 'block' : 'none' }">
@@ -1453,6 +1455,7 @@
       :closable="closableQR"
       wrapClassName="graModal"
       style="margin-top: 400px"
+      :zIndex="9999"
       @cancel="graduate_exit"
     >
       <div
@@ -1560,6 +1563,7 @@
       :closable="closableQR"
       wrapClassName="DelModal"
       style="margin-top: 400px"
+      :zIndex="9999"
       @cancel="delete_exit"
     >
       <div
@@ -3900,7 +3904,6 @@ export default defineComponent({
         }
         .onlinemanage {
           display: none;
-          z-index: 999;
           min-width: 1000px;
           background: #ffffff;
           .om_main {
@@ -4338,7 +4341,6 @@ export default defineComponent({
           }
         }
         .givepower {
-          z-index: 999;
           min-width: 1000px;
           background: #ffffff;
           .gp_main {
@@ -4455,7 +4457,6 @@ export default defineComponent({
           }
         }
         .schooltime {
-          z-index: 999;
           min-width: 1000px;
           background: #ffffff;
           .st_main {
@@ -4677,7 +4678,6 @@ export default defineComponent({
           }
         }
         .studentsmanage {
-          z-index: 1000;
           min-width: 1000px;
           background: #ffffff;
           .stm_main {
@@ -4923,7 +4923,6 @@ export default defineComponent({
         }
         .modalMain {
           .ftsturecord {
-            z-index: 999;
             min-width: 1000px;
             background: #ffffff;
             .ftsr_main {
@@ -4965,7 +4964,6 @@ export default defineComponent({
       width: 424px !important;
       .ant-modal-body {
         .delete {
-          z-index: 99999;
           width: 424px;
           background: #ffffff;
           box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);

From 7a5eb152f9faf16d3592cc0f7d703bd4fa428c25 Mon Sep 17 00:00:00 2001
From: songwc <songwc@dongwu-inc.com>
Date: Wed, 26 Oct 2022 17:39:21 +0800
Subject: [PATCH 3/5] =?UTF-8?q?style=EF=BC=9A=E4=BF=AE=E6=94=B9=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=E5=9B=BE=E9=A6=96=E9=A1=B5=E6=98=BE=E7=A4=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/learningpath/LearningPath.vue | 49 ++++++++++++++-----------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue
index fa1ce109..deba1aef 100644
--- a/src/views/learningpath/LearningPath.vue
+++ b/src/views/learningpath/LearningPath.vue
@@ -40,7 +40,7 @@
             :placeholder="['      开始时间', '        结束时间']"
           />
         </div>
-        <div style="display: flex;margin-bottom: 20px">
+        <div style="display: flex; margin-bottom: 20px">
           <div class="btn btn1">
             <div class="search"></div>
             <div class="btnText">搜索</div>
@@ -50,7 +50,6 @@
             <div class="btnText">重置</div>
           </div>
         </div>
-        
       </div>
       <div class="btns">
         <!-- <router-link to="/projectadd">
@@ -68,17 +67,23 @@
     <!-- 搜索框及按钮 -->
     <!-- 无数据 -->
     <div class="datanull" style="display: none">
-        <div class="nodata_box">
-            <div class="left"><img src="../../assets/images/taskpage/left1.png"/></div>
-            <div class="center"><img src="../../assets/images/leveladd/picture.png"/></div>
-            <div class="text1">无数据</div>
-            <div class="text2">请添加路径</div>
-            <div class="right"><img src="../../assets/images/leveladd/right.png"/></div>
+      <div class="nodata_box">
+        <div class="left">
+          <img src="../../assets/images/taskpage/left1.png" />
         </div>
+        <div class="center">
+          <img src="../../assets/images/leveladd/picture.png" />
+        </div>
+        <div class="text1">无数据</div>
+        <div class="text2">请添加路径</div>
+        <div class="right">
+          <img src="../../assets/images/leveladd/right.png" />
+        </div>
+      </div>
     </div>
     <!-- 无数据 -->
     <!-- 表格 -->
-    <div class="tableBox" style="padding-bottom: 160px; position: relative">
+    <div class="tableBox" style="padding-bottom: 0px; position: relative">
       <a-table
         style="border: 1px solid #f2f6fe"
         :columns="tableDataFunc()"
@@ -89,6 +94,8 @@
         @expand="expandTable"
         :pagination="false"
       />
+    </div>
+    <div class="tableBox">
       <div class="pa">
         <a-pagination
           showSizeChanger="true"
@@ -1647,11 +1654,7 @@ export default {
       width: 412px;
       height: 212px;
       position: relative;
-      background: linear-gradient(
-              180deg,
-              #FEF3DD,
-             #FFFAF0
-            );
+      background: linear-gradient(180deg, #fef3dd, #fffaf0);
       border-radius: 10px;
       .left {
         position: absolute;
@@ -1668,7 +1671,7 @@ export default {
         top: 128px;
         left: 178px;
         font-size: 20px;
-        color: #FFB64E;
+        color: #ffb64e;
         font-weight: 500;
       }
       .text2 {
@@ -1676,7 +1679,7 @@ export default {
         bottom: 32px;
         left: 174px;
         font-size: 14px;
-        color: #878B92;
+        color: #878b92;
         font-weight: 500;
       }
       .right {
@@ -1687,8 +1690,8 @@ export default {
     }
   }
   .filter {
-    margin-left: 38px;
-    margin-right: 38px;
+    margin-left: 35px;
+    margin-right: 35px;
     margin-top: 30px;
     display: flex;
     justify-content: space-between;
@@ -1828,7 +1831,8 @@ export default {
     }
   }
   .tableBox {
-    margin: 20px 38px 30px;
+    // margin: 20px 38px 30px;
+    margin: 20px 35px 0px 35px;
 
     th.h {
       background-color: #eff4fc !important;
@@ -1839,6 +1843,8 @@ export default {
       > td {
       background: #f6f9fd;
     }
+  }
+  .tableBox {
     .pa {
       left: 0;
       width: 100%;
@@ -1846,8 +1852,9 @@ export default {
       // background-color: red;
       display: flex;
       justify-content: center;
-      position: absolute;
-      bottom: 20px;
+      margin-bottom: 10px;
+      // position: absolute;
+      // bottom: -40px;
     }
   }
   .operation {

From dac5cc006c6f39d9976e58ff227a6e7d72b518b4 Mon Sep 17 00:00:00 2001
From: dongwug <guoys@dongwu-inc.com>
Date: Wed, 26 Oct 2022 18:29:18 +0800
Subject: [PATCH 4/5] =?UTF-8?q?feat:=E5=AD=A6=E4=B9=A0=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=B3=E5=8D=A1=E5=BE=AA=E7=8E=AF=E6=B8=B2?=
 =?UTF-8?q?=E6=9F=93=E7=94=9F=E6=88=90=E7=9A=84=E7=BB=84=E4=BB=B6=E5=8D=95?=
 =?UTF-8?q?=E7=8B=AC=E6=B7=BB=E5=8A=A0=E6=96=B9=E6=B3=95=E5=92=8C=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/courselibrary/CoursewareManage.vue |  1 -
 src/views/learningpath/LevelAddDetail.vue    | 14 +++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 00fbe135..1b8ce665 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -4557,7 +4557,6 @@ export default defineComponent({
                 justify-content: center;
                 text-align: center;
                 margin: 77px auto 109px auto;
-                cursor: pointer;
                 position: relative;
                 .smallleft {
                   position: absolute;
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 026e820a..e510b77c 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -8,12 +8,19 @@
           <div class="btnText" @click="showModal">添加关卡</div>
         </div>
         <div class="maincon" style="background-color: #fff">
-          <div
+          <!-- <div
             class="items"
             :class="{ active: isActive == true }"
             @click="changebgc"
             v-for="item in level"
             :key="item.id"
+          > -->
+          <div
+            class="items"
+            :class=" isactive == index ? 'active' : '' "
+            @click="changebgc(index)"
+            v-for="( item , index ) in level"
+            :key="item.id"
           >
             <div class="items1">
               <div class="boxs_left">
@@ -798,7 +805,7 @@ export default {
       selectedRowKeys: [],
       isActive: false,
       gqxy_hs: true,
-
+      isactive: -1,
       projectChecked: null, //项目单选框
     });
     const showDrawer = () => {
@@ -1126,7 +1133,8 @@ export default {
       document.getElementsByTagName("main")[0].style.boxShadow =
         "0px 1px 35px 0px rgba(118, 136, 166, 0.07)";
     });
-    const changebgc = () => {
+    const changebgc = (index) => {
+      state.isactive = index;
       state.isActive = !state.isActive;
     };
     const gqxy_hShow = () => {

From 31d7e99f89f9d5c2116b98b49c9481061c452440 Mon Sep 17 00:00:00 2001
From: dongwug <guoys@dongwu-inc.com>
Date: Thu, 27 Oct 2022 11:27:38 +0800
Subject: [PATCH 5/5] =?UTF-8?q?feat:=E5=88=9B=E5=BB=BA=E9=9D=A2=E6=8E=88?=
 =?UTF-8?q?=E8=AF=BE=E6=9D=A1=E4=BB=B6=E5=88=A4=E6=96=AD=E4=B8=8D=E5=AE=8C?=
 =?UTF-8?q?=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/courselibrary/CoursewareManage.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 1b8ce665..5ec964d0 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -2933,7 +2933,7 @@ export default defineComponent({
       }
     };
     const createft = () => {
-      if (state.bs_hs == false) {
+      if (state.bs_hs == false && state.valueE1 != "") {
         state.of_hs = false;
         state.ft_hs = true;
         state.valueE1 = "";
@@ -2972,9 +2972,11 @@ export default defineComponent({
       state.sm_hs = false;
       state.hideshow = true;
     };
-    const clear_valueE1 = () => {
+    const clear_valueE1 = (value) => {
       state.bs_hs = false;
-      state.valueE1 = "";
+      if (value != "") {
+        state.valueE1 = "";
+      }
     };
     const clear_valueE2 = () => {
       state.valueE2 = "";