From eec179f6b5d03f16ad4289bbf424fab9ffdce512 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Thu, 8 Dec 2022 16:56:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E9=9D=A2=E6=8E=88?=
 =?UTF-8?q?=E8=AF=BE=E7=AD=BE=E5=88=B0=E5=92=8C=E8=AF=BE=E7=A8=8B=E4=BA=8C?=
 =?UTF-8?q?=E7=BB=B4=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TwoDimensionalCode.vue        |  2 +-
 src/views/courselibrary/CoursewareManage.vue | 64 +++++++++++++++-----
 src/views/learningpath/LevelAdd.vue          |  2 +-
 3 files changed, 52 insertions(+), 16 deletions(-)

diff --git a/src/components/TwoDimensionalCode.vue b/src/components/TwoDimensionalCode.vue
index 681497fb..78ecfaed 100644
--- a/src/components/TwoDimensionalCode.vue
+++ b/src/components/TwoDimensionalCode.vue
@@ -7,7 +7,7 @@
       :closable="closableQR"
       wrapClassName="codeModal"
       style="margin-top: 400px"
-      :zIndex="999"
+      :zIndex="9999"
       @cancel="qr_exit"
     >
       <div id="qrcode" class="QR">
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index ff0b4b33..f54a2830 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -191,7 +191,7 @@
                     alt=""
                   />
                 </div>
-                
+
                 <span>授课形式</span>
               </div>
               <a-radio-group v-model:value="valueE1">
@@ -221,7 +221,7 @@
                 </div>
               </a-radio-group>
             </div>
-           <!--
+            <!--
             <div class="b_sup" :style="{ display: bs_hs ? 'block' : 'none' }">
               <div class="ofmb_items">
                 <div class="signbox">
@@ -1626,8 +1626,16 @@
                       <a
                         @click="
                           () => {
-                            QR_hs = true;
-                            ftsQR_hs = true;
+                            //QR_hs = true;
+                            //ftsQR_hs = true;
+                            codevisible = true;
+                            codeIndex = 0;
+                            codeType = 0;
+                            codeInfo = {
+                              title: '面授课签到',
+                              name: record.name,
+                              url: codeUrl,
+                            };
                           }
                         "
                       >
@@ -1675,8 +1683,16 @@
                             <a-menu-item
                               @click="
                                 () => {
-                                  QR_hs = true;
-                                  vipftQR_hs = true;
+                                  //QR_hs = true;
+                                  //vipftQR_hs = true;
+                                  codevisible = true;
+                                  codeIndex = 1;
+                                  codeType = 1;
+                                  codeInfo = {
+                                    title: '面授课二维码',
+                                    name: record.name,
+                                    url: codeUrl,
+                                  };
                                 }
                               "
                             >
@@ -2626,6 +2642,15 @@
   <div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
     <a-spin :spinning="addLoading" tip="" />
   </div>
+
+  <!-- 二维码弹窗 -->
+  <two-dimensional-code
+    v-model:codevisible="codevisible"
+    :codeInfo="codeInfo"
+    :index="codeIndex"
+    :type="codeType === 1 ? '课程二维码' : '签到二维码'"
+  />
+  <!-- 二维码弹窗 -->
 </template>
 <script>
 import {
@@ -2687,7 +2712,8 @@ import ProjectManager from "@/components/project/ProjectManagerNew";
 import SeeModal from "./components/seeModal.vue";
 import CourseModal from "./courseModal.vue";
 import * as moment from "moment";
-
+import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
+import { codeUrl } from "../../api/method";
 //列表表格
 const columns1 = [
   {
@@ -3203,6 +3229,7 @@ export default defineComponent({
     //   return attrs.vnodes;
     // },
     addOnlineCourse,
+    TwoDimensionalCode,
   },
   setup() {
     const CourseModalRef = ref(null);
@@ -3471,6 +3498,9 @@ export default defineComponent({
       assessmentId: null,
       assessmentName: "",
       assessmentVisible: false,
+      codevisible: false, //二维码弹窗
+      codeInfo: null, //二维码内容
+      codeUrl: codeUrl,
     });
 
     const showStuAdd = (record) => {
@@ -3977,7 +4007,7 @@ export default defineComponent({
       };
       // console.log("获取学员信息", obj);
       let res = await studentList(obj);
-      // console.log("获取学员列表", res);
+      console.log("获取学员列表", res);
       const { rows, total, pageNo } = res.data.data;
       state.tableDataTotal3 = total;
 
@@ -4102,6 +4132,7 @@ export default defineComponent({
           address: "address",
           starttime: "beginTime",
           createtime: "createTime",
+          createName: "createName",
         },
         true
       );
@@ -4109,6 +4140,7 @@ export default defineComponent({
         itm.pageNo = pageNo;
       });
       state.tableData6 = datas;
+      console.log("state.tableData6", state.tableData6);
     };
 
     const options1 = ref([
@@ -4190,11 +4222,17 @@ export default defineComponent({
       }
     };
     const createft = () => {
-      if(!state.valueE1  || !state.xzinputV1){
+      if (!state.valueE1 || !state.xzinputV1) {
         message.destroy();
         return message.warning("请输入必填项");
       }
-      console.log(" state.valueE1", state.valueE1,!state.bs_hs && state.valueE1 == 2,state.bs_hs,state.valueE1 == 2);
+      console.log(
+        " state.valueE1",
+        state.valueE1,
+        !state.bs_hs && state.valueE1 == 2,
+        state.bs_hs,
+        state.valueE1 == 2
+      );
       if (state.bs_hs && state.valueE1 == 2) {
         state.of_hs = false;
         // state.ft_hs = true;
@@ -4203,10 +4241,10 @@ export default defineComponent({
         state.valueE1 = "";
         state.teacher = "";
         state.teacherName = "";
-       
+
         state.qdms_inputV1 = state.xzinputV1;
         state.xzinputV1 = "";
-        console.log("qdms_inputV1", state.qdms_inputV1 );
+        console.log("qdms_inputV1", state.qdms_inputV1);
         getDictList("faceclassPic");
         getTea();
       }
@@ -4841,8 +4879,6 @@ export default defineComponent({
     };
     //编辑面授课
     const handleEdit = async (itm, type) => {
- 
-
       console.log(45555);
       console.log(itm);
       if (type === "1") {
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index 33f7f6cb..a55a5680 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -1448,7 +1448,7 @@ export default {
       addAuthList: [],
 
       codevisible: false, //二维码是否显示
-      codeInfo: null, //二维码标题
+      codeInfo: null, //二维码内容
     });
 
     const levelList = reactive({