From 9a36cd91069dfc67f0fe11bcf52e9c174c5d5903 Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Wed, 17 Apr 2024 15:23:03 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/router/RouterFaceStu.vue | 2 +-
 src/views/courselibrary/CoursewareManage.vue    | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/drawers/router/RouterFaceStu.vue b/src/components/drawers/router/RouterFaceStu.vue
index 2203721c..a03cb60a 100644
--- a/src/components/drawers/router/RouterFaceStu.vue
+++ b/src/components/drawers/router/RouterFaceStu.vue
@@ -512,7 +512,7 @@ const qrcodeVisibleSign = () => {
       courseName: props.courseName,
       createName: data.value[coursePlanIndex.value].offteachers.map(teacher => teacher.teacherName).join(', '),
       name: signName + '课程签到',
-      url: `${location.protocol}//${location.host}${process.env.VUE_APP_BASE_API}/admin/student/studentSign?taskId=${taskId}&taskType=${2}&type=${3}`,
+      url: `${location.protocol}//${location.host}${process.env.VUE_APP_BASE_API}/admin/student/studentSign?taskId=${taskId}&taskType=${2}&type=${3}&openCourseId=${taskId}`,
     });
   }
 //   qrCode({
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index d6d7ce2d..f43b2915 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -5118,7 +5118,9 @@ function onFocusEnd(){
             : process.env.VUE_APP_BASE_API +
               `/admin/student/studentSign?taskId=${
                 record.id
-              }&taskType=${2}&type=${3}`,
+              }&taskType=${2}&type=${3}&openCourseId=${
+                record.id
+              }`,
       };
       console.log("codeInfo", state.codeInfo, record);
       state.codeIndex = 0;

From 4d3a54c15f4e1f5f7002252d2d7029582d9123b2 Mon Sep 17 00:00:00 2001
From: joshen <445497689@qq.com>
Date: Fri, 24 May 2024 23:39:11 +0800
Subject: [PATCH 2/6] tranningManager down loading add

---
 src/utils/zipdownload.js                |  3 ++-
 src/views/report/TrainingNewManager.vue | 28 ++++++++++++++++---------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/utils/zipdownload.js b/src/utils/zipdownload.js
index 710a8c3d..af64a373 100644
--- a/src/utils/zipdownload.js
+++ b/src/utils/zipdownload.js
@@ -19,7 +19,7 @@ export function downLoadZip(str, filename) {
   })
 }
 const baseUrlManage = process.env.VUE_APP_BASE_API
-export function downLoadZipManage(str, filename) {
+export function downLoadZipManage(str, filename,fun) {
   var url = baseUrlManage + str
   axios({
     method: 'get',
@@ -28,6 +28,7 @@ export function downLoadZipManage(str, filename) {
     headers: { 'Authorization': 'Bearer ' + getCookieForName("token") }
   }).then(res => {
     resolveBlob(res, mimeMap.xlsx,filename)
+    if(fun) fun()
   })
 }
 /**
diff --git a/src/views/report/TrainingNewManager.vue b/src/views/report/TrainingNewManager.vue
index db40fcb8..7aa79012 100644
--- a/src/views/report/TrainingNewManager.vue
+++ b/src/views/report/TrainingNewManager.vue
@@ -1,11 +1,13 @@
 <template>
-  <div class="train_newman">
-    <div class="title">新任管理者线下学习项目定制报表</div>
-    <div class="btn" @click="downReport" v-if="uploadAdmin('training-admin')||adminType?.length>0">
-      <div class="img"></div>
-      <div class="text">报表下载</div>
-    </div>
-  </div>
+   <a-spin :spinning="spinning" tip="报表生成中...">
+      <div class="train_newman">
+        <div class="title">新任管理者线下学习项目定制报表</div>
+        <div class="btn" @click="downReport" v-if="uploadAdmin('training-admin')||adminType?.length>0">
+          <div class="img"></div>
+          <div class="text">报表下载</div>
+        </div>
+      </div>
+    </a-spin>
 </template>
 
 <script setup>
@@ -14,14 +16,18 @@ import { useStore } from "vuex";
 import { reportOrgs } from "@/api/indexProject";
 import {downLoadZipManage} from "@/utils/zipdownload";
   const downReport = () => {
-    console.log('下载报表')
+    spinning.value = true
     if(uploadAdmin('training-admin')){
-      downLoadZipManage(`/admin/project/report/data`,'新任管理者培训数据')
+      downLoadZipManage(`/admin/project/report/data`,'新任管理者培训数据',function(){
+        spinning.value = false
+      })
       return
     }
     if(adminType?.value.length>0){
       let orgs = adminType.value.join(',')
-      downLoadZipManage(`/admin/project/report/data?orgs=${orgs}`,'新任管理者培训数据')
+      downLoadZipManage(`/admin/project/report/data?orgs=${orgs}`,'新任管理者培训数据',function(){
+        spinning.value = false
+      })
     }
   }
   const userInfo = computed(() => store.state.userInfo);
@@ -30,6 +36,7 @@ import {downLoadZipManage} from "@/utils/zipdownload";
   })
   const store = useStore();
   const adminType = ref()
+  const spinning = ref(false)
   const getReportOrgs = () => {
     reportOrgs({workNum: userInfo.value.userNo}).then((res) => {
       console.log(res,'res')
@@ -46,6 +53,7 @@ import {downLoadZipManage} from "@/utils/zipdownload";
 
 <style lang="scss" scoped>
 .train_newman{
+  width: calc(100vw - 300px);
   margin: 40px 0 0 50px;
   .title{
     color: #000000;

From 3fc08da06925a8c960108a5d7cfd54ff9f2a7d57 Mon Sep 17 00:00:00 2001
From: joshen <445497689@qq.com>
Date: Sat, 25 May 2024 19:14:47 +0800
Subject: [PATCH 3/6] projectManagerNew options object edit

---
 src/components/project/ProjectManagerNew.vue        | 6 +++---
 src/components/project/ProjectManagerNewTeacher.vue | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/project/ProjectManagerNew.vue b/src/components/project/ProjectManagerNew.vue
index 027e2f02..89168346 100644
--- a/src/components/project/ProjectManagerNew.vue
+++ b/src/components/project/ProjectManagerNew.vue
@@ -62,9 +62,9 @@ const {data: userList, loading} = useThrottlePage(USER_LIST, memberParam.value,
 
 const options = computed(() => userList.value.filter(e => !(props.value + '').includes(e.id)).map(e => ({
   label: e.realName + e.userNo,
-  value: e.id,
-  ...e,
-  audienceList: null
+  value: e.id //,
+  // ...e,
+  // audienceList: null
 })))
 
 watch(props, init)
diff --git a/src/components/project/ProjectManagerNewTeacher.vue b/src/components/project/ProjectManagerNewTeacher.vue
index 70e0393f..d2736958 100644
--- a/src/components/project/ProjectManagerNewTeacher.vue
+++ b/src/components/project/ProjectManagerNewTeacher.vue
@@ -62,9 +62,9 @@ const {data: userList, loading} = useThrottlePage(USER_LIST, memberParam.value,
 
 const options = computed(() => userList.value.filter(e => !(props.value + '').includes(e.id)).map(e => ({
   label: e.realName + e.userNo,
-  value: e.id,
-  ...e,
-  audienceList: null
+  value: e.id // ,
+  // ...e,
+  // audienceList: null
 })))
 
 watch(props, init)

From eeee84a35732482f530b8ad655e704b39b3b227b Mon Sep 17 00:00:00 2001
From: joshen <445497689@qq.com>
Date: Tue, 18 Jun 2024 14:11:46 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E8=AF=BE=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddOnline.vue    |  2 +-
 src/components/drawers/CreateOnline.vue | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue
index 84b462ec..1654dc33 100644
--- a/src/components/drawers/AddOnline.vue
+++ b/src/components/drawers/AddOnline.vue
@@ -17,7 +17,7 @@
       </div>
       <div>
         <div class="contentMain" style="padding:20px">
-          <CreateOnline ref="onlineRef" :id="props.courseSyncFlag?'':props.id" :type="props.courseSyncFlag?'':props.infoType">
+          <CreateOnline ref="onlineRef" :id="props.courseSyncFlag?'':props.id" :type="props.courseSyncFlag?'':props.infoType" :couresIds="props.taskList" :isSystemAdmin="props.courseSyncFlag">
             <a-button type="primary" style="border-radius: 4px">{{
                 taskIndex === -1 ? "选择/新建课程" : "重新选择"
               }}
diff --git a/src/components/drawers/CreateOnline.vue b/src/components/drawers/CreateOnline.vue
index 3c070bc0..0e987a1a 100644
--- a/src/components/drawers/CreateOnline.vue
+++ b/src/components/drawers/CreateOnline.vue
@@ -14,7 +14,7 @@
     <iframe
       id="iframe"
       style="width: 100%; height: 600px"
-      :src="`${iframeUrl}/course/manages?f=choose&refId=${props.id}&refType=${props.type}`"
+      :src="`${iframeUrl}/course/manages?f=choose&refId=${props.id}&refType=${props.type}&couresIds=${couresIdArray}&isSystemAdmin=${props.isSystemAdmin}`"
       name="myframe"
       security="restricted"
       sandbox="allow-forms allow-downloads allow-scripts allow-same-origin allow-popups"
@@ -26,12 +26,23 @@ import {defineProps, ref} from "vue";
 import {iframeUrl} from "@/api/method";
 
 const visible = ref(false);
-
+const couresIdArray = ref();
 const props = defineProps({
   type: Number,
   id: Number,
+  couresIds: Array,
+  isSystemAdmin: Boolean
 });
-
+// 把任务列表里类型为在线课的课程ID放到数组里
+if(props.couresIds && props.couresIds.length){
+  var arr = []
+  for(var i = 0;i<props.couresIds.length;i++){
+    if(props.couresIds[i].type === 1){
+      arr.push(props.couresIds[i].courseId)
+    }
+  }
+  couresIdArray.value = arr
+}
 function openModal() {
   visible.value = true;
 }

From d5440edc5990b0b5c322990db44a9e413400fbc9 Mon Sep 17 00:00:00 2001
From: joshen <445497689@qq.com>
Date: Wed, 19 Jun 2024 16:12:42 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E8=AF=BE=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E5=8F=82=E6=95=B0=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddOnline.vue    |  2 +-
 src/components/drawers/CreateOnline.vue | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue
index 1654dc33..bb233e23 100644
--- a/src/components/drawers/AddOnline.vue
+++ b/src/components/drawers/AddOnline.vue
@@ -17,7 +17,7 @@
       </div>
       <div>
         <div class="contentMain" style="padding:20px">
-          <CreateOnline ref="onlineRef" :id="props.courseSyncFlag?'':props.id" :type="props.courseSyncFlag?'':props.infoType" :couresIds="props.taskList" :isSystemAdmin="props.courseSyncFlag">
+          <CreateOnline ref="onlineRef" :id="props.courseSyncFlag?'':props.id" :type="props.courseSyncFlag?'':props.infoType" :courseIds="props.taskList" :isSystemAdmin="props.courseSyncFlag">
             <a-button type="primary" style="border-radius: 4px">{{
                 taskIndex === -1 ? "选择/新建课程" : "重新选择"
               }}
diff --git a/src/components/drawers/CreateOnline.vue b/src/components/drawers/CreateOnline.vue
index 0e987a1a..9a65e3dc 100644
--- a/src/components/drawers/CreateOnline.vue
+++ b/src/components/drawers/CreateOnline.vue
@@ -14,7 +14,7 @@
     <iframe
       id="iframe"
       style="width: 100%; height: 600px"
-      :src="`${iframeUrl}/course/manages?f=choose&refId=${props.id}&refType=${props.type}&couresIds=${couresIdArray}&isSystemAdmin=${props.isSystemAdmin}`"
+      :src="`${iframeUrl}/course/manages?f=choose&refId=${props.id}&refType=${props.type}&courseIds=${couresIdArray}&isSystemAdmin=${props.isSystemAdmin}`"
       name="myframe"
       security="restricted"
       sandbox="allow-forms allow-downloads allow-scripts allow-same-origin allow-popups"
@@ -30,15 +30,15 @@ const couresIdArray = ref();
 const props = defineProps({
   type: Number,
   id: Number,
-  couresIds: Array,
+  courseIds: Array,
   isSystemAdmin: Boolean
 });
 // 把任务列表里类型为在线课的课程ID放到数组里
-if(props.couresIds && props.couresIds.length){
+if(props.courseIds && props.courseIds.length){
   var arr = []
-  for(var i = 0;i<props.couresIds.length;i++){
-    if(props.couresIds[i].type === 1){
-      arr.push(props.couresIds[i].courseId)
+  for(var i = 0;i<props.courseIds.length;i++){
+    if(props.courseIds[i].type === 1){
+      arr.push(props.courseIds[i].courseId)
     }
   }
   couresIdArray.value = arr

From 37a16bc7c63cc7303b963a35d7e966c7e02e5c9d Mon Sep 17 00:00:00 2001
From: joshen <445497689@qq.com>
Date: Fri, 21 Jun 2024 16:18:40 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=9C=A8=E7=BA=BF?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E9=80=BB=E8=BE=91=E6=95=B0=E6=8D=AE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddOnline.vue    | 4 ++--
 src/components/drawers/CreateOnline.vue | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue
index bb233e23..c9485506 100644
--- a/src/components/drawers/AddOnline.vue
+++ b/src/components/drawers/AddOnline.vue
@@ -17,7 +17,7 @@
       </div>
       <div>
         <div class="contentMain" style="padding:20px">
-          <CreateOnline ref="onlineRef" :id="props.courseSyncFlag?'':props.id" :type="props.courseSyncFlag?'':props.infoType" :courseIds="props.taskList" :isSystemAdmin="props.courseSyncFlag">
+          <CreateOnline ref="onlineRef" :id="props.courseSyncFlag?'':props.id" :type="props.courseSyncFlag?'':props.infoType" :courseIds="props.taskList" :projectId="props.id">
             <a-button type="primary" style="border-radius: 4px">{{
                 taskIndex === -1 ? "选择/新建课程" : "重新选择"
               }}
@@ -53,6 +53,7 @@ const props = defineProps({
   taskList: [],
   chapterList: []
 });
+
 const visible = ref(false);
 const onlineRef = ref(false);
 const taskIndex = ref(-1);
@@ -137,7 +138,6 @@ function confirm() {
 }
 
 function selectCourse(row) {
-  console.log(row);
   if (!props.courseSyncFlag && row.refId != props.id) {
     message.warning("请新建本项目在线课！");
     return;
diff --git a/src/components/drawers/CreateOnline.vue b/src/components/drawers/CreateOnline.vue
index 9a65e3dc..d8460433 100644
--- a/src/components/drawers/CreateOnline.vue
+++ b/src/components/drawers/CreateOnline.vue
@@ -14,7 +14,7 @@
     <iframe
       id="iframe"
       style="width: 100%; height: 600px"
-      :src="`${iframeUrl}/course/manages?f=choose&refId=${props.id}&refType=${props.type}&courseIds=${couresIdArray}&isSystemAdmin=${props.isSystemAdmin}`"
+      :src="`${iframeUrl}/course/manages?f=choose&refId=${props.id}&refType=${props.type}&courseIds=${couresIdArray}&projectId=${props.projectId}`"
       name="myframe"
       security="restricted"
       sandbox="allow-forms allow-downloads allow-scripts allow-same-origin allow-popups"
@@ -31,7 +31,7 @@ const props = defineProps({
   type: Number,
   id: Number,
   courseIds: Array,
-  isSystemAdmin: Boolean
+  projectId: String
 });
 // 把任务列表里类型为在线课的课程ID放到数组里
 if(props.courseIds && props.courseIds.length){