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

src/views/projectcenter/TaskPage.vue

@@ -353,7 +353,7 @@
                       <div
                         class="operation"
                         style="cursor: pointer"
-                        @click="showAA"
+                        @click="showAA(item.course)"
                         :style="{
                           display:
                             item.course === '直播' || item.course === '活动'
@@ -377,6 +377,10 @@
                         @click="
                           item.course === '面授'
                             ? showCopyModal(item.course)
+                            :  item.course === '直播'
+                            ? showzhibModal(item.course)
+                            : item.course === '活动'
+                            ? showhuodModal(item.course)
                             : null
                         "
                       >
@@ -411,7 +415,8 @@
                 </a-collapse-panel>
               </a-collapse>
               <!-- 无数据创建任务 -->
-              <router-link to="/taskadd"
+              <router-link
+                to="/taskadd"
                 class="taskbox"
                 style="
                   background: linear-gradient(180deg, #ddeaff, #f0f8fe);
@@ -553,7 +558,7 @@
                       onChange: onSelectChange,
                     }"
                   />
-                  <div class="nostu" style="display:block;">
+                  <div class="nostu" style="display: block">
                     <div class="nostuimg"></div>
                   </div>
                   <div class="pa">
@@ -1029,7 +1034,7 @@
     <!-- 面授学员抽屉 -->
     <face-stu v-model:FSvisible="FSvisible" />
     <!-- 活动考勤抽屉 -->
-    <active-attendance v-model:AAvisible="AAvisible" />
+    <active-attendance v-model:AAvisible="AAvisible" :title="showkaoqinText" />
     <!-- 作业管理抽屉 -->
     <work-manage v-model:Wvisible="Wvisible" />
     <!-- 考试管理抽屉 -->
@@ -1572,6 +1577,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>
   </div>
 </template>
 <script>
@@ -1710,6 +1771,10 @@ export default {
       delete_hs: false, //删除弹窗
       copyModal: false, //面授二维码弹窗
       closeCopy: false, //面授二维码关闭图标
+      zhibModal: false, //直播二维码弹窗
+
+      huodModal: false, //活动二维码弹窗
+
       pubproject: false,
       stugroup: false,
       canclestu: false,
@@ -2188,6 +2253,8 @@ export default {
       showTimeText: "",
       //考试、测评页面传递参数
       showTestText: "",
+      //直播、活动页面传递参数
+      showkaoqinText: "",
     });
 
     //学员学员管理渲染
@@ -2310,10 +2377,10 @@ export default {
       state.TaskFaceImpStuvisible = true;
     };
     //新增
-    const showTime = (course, name) => {
+    const showTime = (course) => {
       console.log("点击管理");
       state.visible = true;
-      state.showTimeText = "【" + course + "】" + name;
+      state.showTimeText = "【" + course + "】" + "管理";
       // console.log("state.showTimeText", state.showTimeText);
     };
     //新增
@@ -2336,8 +2403,9 @@ export default {
       state.Lvisible = true;
     };
     //活动考勤的抽屉
-    const showAA = () => {
+    const showAA = (course) => {
       state.AAvisible = true;
+      state.showkaoqinText = "【" + course + "】" + "考勤";
     };
     //作业管理的抽屉
     const showWork = () => {
@@ -2384,6 +2452,18 @@ export default {
         state.radioV2 = "";
       }
     };
+    const showzhibModal = () => {
+      state.zhibModal = true;
+    };
+    const showhuodModal = () => {
+      state.huodModal = true;
+    };
+    const closezhibModal = () => {
+      state.zhibModal = false;
+    };
+    const closehuodModal = () => {
+      state.huodModal = false;
+    };
 
     //学员管理列表操作
     const studentData = () => {
@@ -2603,6 +2683,10 @@ export default {
       cloradio2,
       studentColumns,
       delete_exit,
+      showzhibModal,
+      showhuodModal,
+      closehuodModal,
+      closezhibModal,
     };
   },
 };
@@ -3414,7 +3498,7 @@ export default {
         right: 38px;
         top: 0;
         color: #409eff;
-        background: #FFFFFF;
+        background: #ffffff;
         width: 100px;
         height: 40px;
         border: 1px solid #409eff;
@@ -3964,12 +4048,12 @@ export default {
         > td {
         background: rgba(250, 250, 250, 1);
       }
-      .nostu{
+      .nostu {
         width: 100%;
-        .nostuimg{
-          margin:75px auto;
+        .nostuimg {
+          margin: 75px auto;
           width: 412px;
-          height:212px;
+          height: 212px;
           background-image: url(@/assets/images/taskpage/nostu.png);
           background-size: 100% 100%;
         }