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

src/components/drawers/ActiveAttendance.vue

@@ -8,7 +8,7 @@
   >
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">【活动】考勤</div>
+        <div class="headerTitle">{{ title }}</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
@@ -304,6 +304,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    title: {
+      type: String,
+      default: "",
+    },
   },
 
   setup(props, ctx) {

src/components/drawers/ProjectScore.vue

@@ -152,7 +152,7 @@
               <div class="content content2">
                 <span>完成【必修/选修】获得 </span><span class="scoretext">{{score1}} </span><span>积分</span>
               </div>
-              <div class="content content3">
+              <div class="content">
                 <span>优秀学员可获得 </span><span class="scoretext">{{score2}}</span><span>积分</span>
               </div>
             </div>
@@ -163,7 +163,7 @@
               <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">
+              <div class="content ">
                 <span>优秀学员可获得 </span><span ><a-input v-model:value="score2" :bordered="false" /></span><span>积分</span>
               </div>
             </div>
@@ -386,6 +386,9 @@ export default {
 .contentscore {
   margin-top: 20px;
   margin-bottom: 100px;
+  .ant-tabs-nav-wrap{
+    border-bottom:1px solid #ededed;
+  }
   .ant-tabs-tab-btn {
     font-size: 18px;
     font-weight: 700;