Merge remote-tracking branch 'origin/develop' into develop

src/components/drawers/ExportScore.vue

@@ -38,6 +38,7 @@
                 :data="{
                   type: type,
                   taskId: Number(id),
+                  workId: datesource.info.id,
                   targetId: Number(id),
                 }"
               >
@@ -149,8 +150,7 @@
                   display: flex;
                   align-items: center;
                   width: 500px;
-                  height: 40px;
+                  height: 40px;"
-                "
                 :style="{
                   background: errNum
                     ? 'rgba(255, 116, 116, 0.1)'
@@ -200,6 +200,12 @@ export default {
       type: Boolean,
       default: false,
     },
+    datesource: {
+      type: Object,
+      default: function () {
+        return {};
+      },
+    },
     //type=3:面授课
     type: {
       type: String,
@@ -241,6 +247,7 @@ export default {
 
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
+      console.log(props.datesource)
     };
 
     //上传文件

src/components/drawers/MemberList.vue

@@ -8,7 +8,7 @@
   >
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">组员名单</div>
+        <div class="headerTitle">组员名单1</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
@@ -323,6 +323,7 @@ export default {
     };
     //点击确认批量删除弹窗
     const sureDeModal = () => {
+      debugger
       let obj = {
         projectGroupId: props.chooseGroupId,
         projectId: props.projectId,

src/components/drawers/project/ProjectHomeWorkManage.vue

@@ -135,6 +135,7 @@
     :type="1"
     :id="projectTaskInfo?.id"
     :pid="projectTaskInfo?.projectId"
+    :datesource="projectTaskInfo"
     v-model:searchTaskList="searchTaskList"
   />
   <!-- 查看作业抽屉 -->

src/views/learningpath/LevelAdd.vue

@@ -144,8 +144,8 @@
                 <div>
                   <span class="nub1" style="color: #5dc988">{{
                     routerInfoOverview.onlineCourseCnt
-                  }}</span
+                  }}</span>
-                  ><span style="color: #5dc988; font-size: 14px">%</span>
+                  <!-- <span style="color: #5dc988; font-size: 14px"></span> -->
                 </div>
                 <div class="nub2">在线课程数</div>
               </div>
@@ -153,8 +153,8 @@
                 <div>
                   <span class="nub1" style="color: #ff90ae">{{
                     routerInfoOverview.offLineCourseCnt
-                  }}</span
+                  }}</span>
-                  ><span style="color: #ff90ae; font-size: 14px">%</span>
+                  <!-- <span style="color: #ff90ae; font-size: 14px">%</span> -->
                 </div>
                 <div class="nub2">面授课程数</div>
               </div>
@@ -2236,6 +2236,7 @@ export default {
             levelList.routerInfoOverview[item] =
               res.data.data.routerInfoOverview[item] || 0;
           });
+          console.log("学习路径图概览数据获取1", levelList);
           Object.keys(res.data.data.chapterOverviewList).forEach((item) => {
             levelList.chapterOverviewList[item] =
               res.data.data.chapterOverviewList[item] || 0;

src/views/projectcenter/TaskAdd.vue

@@ -250,19 +250,19 @@
                         ">
                         <div class="opa">
                           <div class="opacation">
-														<span v-if="element.type !== 5" style="
+								<span  style="
                                 color: #4ea6ff;
                                 margin-right: 25px;
                                 cursor: pointer;
                               " @click="editTaskForType(element,index)">
 															编辑
 														</span>
-                            <span v-else style="
+                            <!--<span v-else style="-->
-															color: #4ea6ff;
+															<!--color: #4ea6ff;-->
-															margin-right: 55px;
+															<!--margin-right: 55px;-->
-															cursor: pointer;
+															<!--cursor: pointer;-->
-															">
+															<!--">-->
-														</span>
+														<!--</span>-->
                             <span style="color: #4ea6ff; cursor: pointer" @click="showDelete(index)">
 															删除
 														</span>

src/views/projectcenter/TaskPage.vue

@@ -291,8 +291,8 @@
                 <div>
                   <span class="nub1" style="color: #5dc988">{{
                     projectInfoOverview.onlineCourseCnt
-                  }}</span
+                  }}</span>
-                  ><span style="color: #5dc988; font-size: 14px">%</span>
+                  <!-- <span style="color: #5dc988; font-size: 14px">%</span> -->
                 </div>
                 <div class="nub2">在线课程数</div>
               </div>
@@ -300,8 +300,8 @@
                 <div>
                   <span class="nub1" style="color: #ff90ae">{{
                     projectInfoOverview.offLineCourseCnt
-                  }}</span
+                  }}</span>
-                  ><span style="color: #ff90ae; font-size: 14px">%</span>
+                  <!-- <span style="color: #ff90ae; font-size: 14px">%</span> -->
                 </div>
                 <div class="nub2">面授课程数</div>
               </div>