From 818433c3720705be0bd7cb6e74debde5b811799c Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Thu, 23 Mar 2023 17:43:54 +0800
Subject: [PATCH 01/12] fix

---
 src/components/drawers/CheckAnsware.vue                  | 6 +++++-
 src/components/drawers/project/ProjectFaceTaskManage.vue | 7 ++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/components/drawers/CheckAnsware.vue b/src/components/drawers/CheckAnsware.vue
index 4c77c7b4..4290ae04 100644
--- a/src/components/drawers/CheckAnsware.vue
+++ b/src/components/drawers/CheckAnsware.vue
@@ -21,7 +21,7 @@
                 <iframe
                     id="iframe"
                     style="width: 100%; height: 100%;"
-                    :src="iframeUrl + '/exam/viewanswer?id=' + datasource.answerId "
+                    :src="iframeUrl + '/exam/viewanswer?id=' + answerId?answerId:datasource.answerId "
                     frameborder="0"
                     name="myframe"
                     security="restricted"
@@ -54,6 +54,10 @@ export default {
             default: function () {
                 return {};
             },
+        },
+        answerId:{
+            type: String,
+            default: "",
         }
     },
     setup(props,ctx){
diff --git a/src/components/drawers/project/ProjectFaceTaskManage.vue b/src/components/drawers/project/ProjectFaceTaskManage.vue
index 7843fb64..f4deaa43 100644
--- a/src/components/drawers/project/ProjectFaceTaskManage.vue
+++ b/src/components/drawers/project/ProjectFaceTaskManage.vue
@@ -121,7 +121,7 @@
       </div>
     </div>
   </a-drawer>
-  <CheckAnsware v-model:CAvisible="CAvisible" :datasource="answerDatasource"/>
+  <CheckAnsware v-model:CAvisible="CAvisible" :datasource="answerDatasource" :answerId="answerId"/>
   <!-- 查看作业抽屉 -->
   <CKWork
     v-model:CWvisible="CWvisible"
@@ -340,10 +340,11 @@ const batchFinish = () => {
 };
 
 const answerDatasource = ref(props.datasource);
-
+const answerId = ref('');
 const showExamAnswer = (answerId) => {
-  console.log(answerDatasource.value)
+  console.log(answerDatasource.value,answerId)
   answerDatasource.value.answerId = answerId;
+  answerId.value = answerId;
   CAvisible.value = true;
 };
 

From 3c4e94941b7491f2036d97a25409c9918cd875e7 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Thu, 23 Mar 2023 17:58:20 +0800
Subject: [PATCH 02/12] fix:reset data

---
 src/components/student/CommonStudent.vue | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index 30af809a..8bc4b930 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -374,7 +374,7 @@ const member = ref(false);
 const dept = ref(false);
 const projectStuTableRef = ref();
 const stuTableRef = ref();
-const projectParams = ref({ pid: props.infoId, type: props.infoType });
+const projectParams = ref({ pid: props.infoId, type: props.infoType, studentName:"" });
 
 const getProjectStu = () => projectStuTableRef.value.fetch();
 const resetProjectStu = () => {
@@ -544,6 +544,8 @@ const orgRowSelection = computed(() => ({
 
 const closeDrawer = () => {
   deleteDepSelect();
+  audienceName.value.keyword = "";
+  auditTableRef.value.reset({ keyword: "" })
   projectParams.value.studentName = "";
   projectStuTableRef.value.reset();
   visiable.value = false;
@@ -607,9 +609,16 @@ function onOrgSelectChange(e, l) {
   deptList.value = l.selectedNodes;
 }
 
-const resetStu = () => stuTableRef.value.reset({ keyword: "", departId: null });
+const resetStu = () => {
+  nameSearch.value.keyword = "";
+  stuTableRef.value.reset({ keyword: "", departId: null })
+};
 //清空选择部门信息
 const deleteDepSelect = () => {
+  projectParams.value.studentName = "";
+  projectStuTableRef.value.reset();
+  audienceName.value.keyword = "";
+  auditTableRef.value.reset({ keyword: "" })
   selectedOrgKeys.value = [];
   projectSelectKeys.value = [];
 };
@@ -618,7 +627,10 @@ const resetOrg = () => {
   searchOrgName.value = { keyword: "", page: 1, pageSize: 10 };
 };
 //重置受众
-const resetAudienceInfo = () => auditTableRef.value.reset({ keyword: "" });
+const resetAudienceInfo = () => {
+  audienceName.value.keyword = "";
+  auditTableRef.value.reset({ keyword: "" })
+};
 
 //确定添加授权
 const submitAuth = () => {

From f304a64636c0a664032e1852a5ba0220593601a0 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Thu, 23 Mar 2023 18:16:23 +0800
Subject: [PATCH 03/12] =?UTF-8?q?fix:=E8=AE=A8=E8=AE=BA=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=8B=BE=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddDiscuss.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue
index d3243b68..31d64ded 100644
--- a/src/components/drawers/AddDiscuss.vue
+++ b/src/components/drawers/AddDiscuss.vue
@@ -65,7 +65,7 @@
               <span style="margin-right: 3px">讨论设置：</span>
             </div>
             <div class="btnbox">
-              <a-checkbox v-model:checked="formData.discussSettings" @click="formData.discussSettings = !formData.discussSettings">允许评论</a-checkbox>
+              <a-checkbox v-model:checked="formData.discussSettings" @click="discussSettings">允许评论</a-checkbox>
             </div>
           </div>
         </div>
@@ -136,10 +136,14 @@ function openDrawer(i, row) {
   console.log(i,row)
   row && (formData.value = {...row.info});
   (i >= 0) && (taskIndex.value = i);
-  row && (formData.value.discussSettings = row.info.discussSettings === "false" ? false : true);
+  row && (formData.value.discussSettings = row.info.discussSettings === "false" || row.info.discussSettings === false ? false : true);
   visible.value = true
 }
 
+const discussSettings = () => {
+  formData.value.discussSettings = !formData.value.discussSettings;
+}
+
 defineExpose({openDrawer})
 </script>
 <style lang="scss">

From 9d1c778e77ba10894c27e1c74425b901ab0d9fcb Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Thu, 23 Mar 2023 19:42:08 +0800
Subject: [PATCH 04/12] =?UTF-8?q?fix:=E5=AF=BC=E5=85=A5=E6=88=90=E5=8A=9F?=
 =?UTF-8?q?=E5=90=8E=E5=88=B7=E6=96=B0=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/router/RouterFaceStu.vue | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/drawers/router/RouterFaceStu.vue b/src/components/drawers/router/RouterFaceStu.vue
index 7af72f88..a6e35ff7 100644
--- a/src/components/drawers/router/RouterFaceStu.vue
+++ b/src/components/drawers/router/RouterFaceStu.vue
@@ -103,7 +103,7 @@
               添加学员
             </a-button>
           </CommonStudent>
-          <CommonImport title="导入学员" :template-url="stuTemplateUrl" :data="{ targetId: offcoursePlanId, type:3 }" :url="`/admin/student/importStudent`" name="uploadFile">
+          <CommonImport @change="change" title="导入学员" :template-url="stuTemplateUrl" :data="{ targetId: offcoursePlanId, type:3 }" :url="`/admin/student/importStudent`" name="uploadFile">
             <div class="btn btn1" style="margin-right: 20px;margin-left: 20px">
               <div class="img1"></div>
               <div class="wz">导入学员</div>
@@ -377,6 +377,14 @@ const qrcodeVisible = () => {
   });
 };
 
+const change = (e) => {
+  console.log(e)
+  if(e==="end"){
+    // 请求刷新数据
+    tableRef.value.fetch();
+  }
+}
+
 </script>
 
 <style lang="scss">

From efaa92f91985b7c19aef069c1470b61a394f3a84 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Thu, 23 Mar 2023 20:17:07 +0800
Subject: [PATCH 05/12] =?UTF-8?q?style:=E6=89=B9=E9=87=8F=E9=9D=A2?=
 =?UTF-8?q?=E6=8E=88=E6=8A=A5=E5=90=8D=E6=A8=A1=E7=89=88=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=8F=8A=E6=A0=B7=E5=BC=8F=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                              |  4 +++-
 .env.boe                                          |  4 +++-
 .env.prod                                         |  4 +++-
 .env.release                                      |  4 +++-
 .../drawers/project/ImpoterGroupLeader.vue        | 15 ++++++++++++---
 src/views/learningpath/LevelAdd.vue               |  2 +-
 src/views/projectcenter/TaskPage.vue              |  1 +
 7 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/.env b/.env
index f02adc52..5abc8902 100644
--- a/.env
+++ b/.env
@@ -38,4 +38,6 @@ VUE_APP_H5=//u-pre.boe.com/student-h5
 #用户头像
 VUE_APP_AVATAR_PATH=/upload/
 # 旧版管理员界面
-VUE_APP_OLD_MANAGE=//u-pre.boe.com/resource/index.html
\ No newline at end of file
+VUE_APP_OLD_MANAGE=//u-pre.boe.com/resource/index.html
+# 批量面授报名模板
+VUE_APP_FACE_STUDENT_TEMPLATE=批量面授报名模版-1673963663229.xlsx
\ No newline at end of file
diff --git a/.env.boe b/.env.boe
index dff531eb..e3def201 100644
--- a/.env.boe
+++ b/.env.boe
@@ -13,4 +13,6 @@ VUE_APP_UP_LOAD_STUDENT_SCORE_TEMPLATE=coursefile/外部考试学员成绩导入
 #在线
 VUE_APP_ONLINE_CLASS_URL=//u-pre.boe.com/mobile/pages/study/courseStudy?id=
 VITE_BOE_CASS_DETAIL_URL=//u-pre.boe.com/pc/case/detail?id=
-VUE_APP_EXAM_DETAIL_URL=//u-pre.boe.com/mobile/pages/exam/exam?id=
\ No newline at end of file
+VUE_APP_EXAM_DETAIL_URL=//u-pre.boe.com/mobile/pages/exam/exam?id=
+# 批量面授报名模板
+VUE_APP_FACE_STUDENT_TEMPLATE=批量面授报名模版-1673963663229.xlsx
\ No newline at end of file
diff --git a/.env.prod b/.env.prod
index 54f6aaed..065ab4f0 100644
--- a/.env.prod
+++ b/.env.prod
@@ -29,4 +29,6 @@ VUE_APP_FILE_PATH=/upload/boe/file/
 #用户头像
 VUE_APP_AVATAR_PATH=/upload/
 # 旧版管理员界面
-VUE_APP_OLD_MANAGE=//u.boe.com/resource/index.html
\ No newline at end of file
+VUE_APP_OLD_MANAGE=//u.boe.com/resource/index.html
+# 批量面授报名模板
+VUE_APP_FACE_STUDENT_TEMPLATE=批量面授报名模版-1673963663229.xlsx
\ No newline at end of file
diff --git a/.env.release b/.env.release
index 95765bc6..a38aecf3 100644
--- a/.env.release
+++ b/.env.release
@@ -25,4 +25,6 @@ VUE_APP_H5=//u.boe.com/student-h5-release
 #用户头像
 VUE_APP_AVATAR_PATH=/upload/
 # 旧版管理员界面
-VUE_APP_OLD_MANAGE=//u-pre.boe.com/resource/index.html
\ No newline at end of file
+VUE_APP_OLD_MANAGE=//u-pre.boe.com/resource/index.html
+# 批量面授报名模板
+VUE_APP_FACE_STUDENT_TEMPLATE=批量面授报名模版-1673963663229.xlsx
\ No newline at end of file
diff --git a/src/components/drawers/project/ImpoterGroupLeader.vue b/src/components/drawers/project/ImpoterGroupLeader.vue
index 73e3a37f..0810f9b4 100644
--- a/src/components/drawers/project/ImpoterGroupLeader.vue
+++ b/src/components/drawers/project/ImpoterGroupLeader.vue
@@ -18,13 +18,18 @@
         />
       </div>
       <div class="main">
-        <div class="minatitl">
+        <div v-if="downloadType!==1"  class="minatitl">
           <div class="up1" style="font-weight: bolder">导入小组长</div>
           <!--<div class="up2" @click="downTemplate" style="cursor: pointer">-->
             <!--模板-->
           <!--</div>-->
         </div>
-        <div class="up1">请先导出小组填写小组长，按要求填写数据并导入</div>
+        <div v-if="downloadType!==1" class="up1">请先导出小组填写小组长，按要求填写数据并导入</div>
+        <div v-else class="up1">
+          请下载
+          <a :href="stuFeceStuTemplateUrl" target="_blank">模版</a>
+          ，按要求填写并导入
+        </div>
         <div class="upload">
           <div class="text">上传：</div>
           <div class="right">
@@ -65,7 +70,7 @@
                         <div class="curloading">
                           <div style="color: #387df7; margin-left: 20px; cursor: pointer"
                                v-if="file.uploadState?.status === 'FAILED'" @click="downloadErrorData(file.uploadState?.url)">
-                            下载失败数据1
+                            下载失败数据
                           </div>
                         </div>
                       </div>
@@ -105,6 +110,7 @@ const props = defineProps({
   fileType: Object,
   data: Object,
   templateUrl: String,
+  downloadType: Number
 })
 const emit = defineEmits({})
 
@@ -126,6 +132,9 @@ const closeDrawer = () => {
   fileList.value = [];
 };
 
+// 批量面授报名模版
+const stuFeceStuTemplateUrl = ref(process.env.VUE_APP_FILE_PATH + process.env.VUE_APP_FACE_STUDENT_TEMPLATE);
+
 function openDrawer() {
   visible.value = true
 }
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index bd87252e..3a888455 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -325,7 +325,7 @@
           <div style="flex: 1">
             <div class="onerow">
               <div class="taskmain">任务大纲</div>
-              <ImpoterGroupLeader title="批量面授报名" :data="{targetId:routerId,type:2}" :url="`/admin/offcourse/importCourse`" :template-url="`/admin/router/exportTaskCoursePlan/${routerId}?type=1&taskType=2&thirdType=3`">
+              <ImpoterGroupLeader :downloadType="1" title="批量面授报名" :data="{targetId:routerId,type:2}" :url="`/admin/offcourse/importCourse`" :template-url="`/admin/router/exportTaskCoursePlan/${routerId}?type=1&taskType=2&thirdType=3`">
                 <button class="btn">批量面授报名</button>
               </ImpoterGroupLeader>
               <router-link
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 50e659a3..b26005ad 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -461,6 +461,7 @@
               <div class="taskmain">任务大纲</div>
               <ImpoterGroupLeader
                 title="批量面授报名"
+                :downloadType="1"
                 :data="{ targetId: projectId, type: 1 }"
                 :url="`/admin/offcourse/importCourse`"
                 :template-url="`/admin/project/exportTaskCoursePlan/${projectId}?type=1&taskType=2&thirdType=3`"

From f2bd1df8794a730c5c99b0e4ccd251214dc14cd9 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Thu, 23 Mar 2023 20:34:13 +0800
Subject: [PATCH 06/12] =?UTF-8?q?fix:=E7=AD=BE=E5=88=B0=E5=8F=8A=E5=BC=80?=
 =?UTF-8?q?=E8=AF=BE=E4=BA=8C=E7=BB=B4=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../drawers/router/RouterFaceStu.vue          | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/components/drawers/router/RouterFaceStu.vue b/src/components/drawers/router/RouterFaceStu.vue
index a6e35ff7..498ff640 100644
--- a/src/components/drawers/router/RouterFaceStu.vue
+++ b/src/components/drawers/router/RouterFaceStu.vue
@@ -85,10 +85,17 @@
           <div
             class="btn btn1"
             style="margin-right: 20px"
-            @click="qrcodeVisible()"
+            @click="qrcodeVisibleSign()"
           >
             <div class="wz">签到二维码</div>
           </div>
+          <div
+            class="btn btn1"
+            style="margin-right: 20px"
+            @click="qrcodeVisible()"
+          >
+            <div class="wz">开课二维码</div>
+          </div>
           <CommonStudent
             :type="3"
             :isGroup="true"
@@ -370,12 +377,21 @@ function resetStudentPage() {
 //二维码
 const qrcodeVisible = () => {
   qrCode({
-    title: "【签到】二维码",
+    title: "【开课】二维码",
     name: props.datasource?.name,
     // url: `${location.protocol}//${location.host}${process.env.VUE_APP_BASE_API}/admin/student/studentSign?taskId=${props.datasource.id}&taskType=${props.datasource.type}&type=${props.type}`,
     url: `${location.protocol}//${location.host}${process.env.VUE_APP_BASE_API}/stu/project/redirectDetail?courseId=${data.value[coursePlanIndex.value]?.id}`,
   });
 };
+// 签到二维码
+const qrcodeVisibleSign = () => {
+  qrCode({
+    title: "【签到】二维码",
+    name: props.datasource?.name,
+    // url: `${location.protocol}//${location.host}${process.env.VUE_APP_BASE_API}/admin/student/studentSign?taskId=${props.datasource.id}&taskType=${props.datasource.type}&type=${props.type}`,
+    url: `${location.protocol}//${location.host}${process.env.VUE_APP_BASE_API}/admin/student/studentSign?taskId=${data.value[coursePlanIndex.value]?.id}&taskType=${2}&type=${3}`,
+  });
+};
 
 const change = (e) => {
   console.log(e)

From 94693dcaae79825c5fc0d6a6344f5e0d917c28f3 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 23 Mar 2023 22:06:29 +0800
Subject: [PATCH 07/12] --fix bug

---
 src/views/courselibrary/CoursewareManage.vue | 24 +++++++-------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index b82bd848..59e18d22 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -1053,17 +1053,9 @@
               <span style="margin-right: 3px">签到设置</span>
             </div>
             <div class="b_input">
-              <a-radio-group v-model:value="xjkkradioV1">
-                <a-radio :value="0" @click="clear_xjkkradioV1">
-                  <span style="color: #6d7584; margin-right: 30px">
-                    是否允许未报名的学员签到
-                  </span>
-                </a-radio>
-                <!--
-                <a-radio :value="1" @click="clear_xjkkradioV1">
-                  <span style="color: #6d7584">签到是否需要口令</span>
-                </a-radio>-->
-              </a-radio-group>
+              <a-checkbox v-model:checked="xjkkradioV1">
+                <span style="color: #6d7584">是否允许未报名的学员签到</span>
+              </a-checkbox>
             </div>
           </div>
 
@@ -2570,7 +2562,7 @@ export default defineComponent({
       kkinputV1: "",
       kkinputV2: "",
       //新建开课
-      xjkkradioV1: "",
+      xjkkradioV1: false,
       completeType: "",
       xjkkinputV1: "",
       onceName: "",
@@ -3620,7 +3612,7 @@ export default defineComponent({
       state.attach = "";
 
       state.kk_eidt = false;
-      state.xjkkradioV1 = "";
+      state.xjkkradioV1 = false;
       state.completeType = "";
       state.xjkkinputV1 = "";
       state.onceName = "";
@@ -3679,7 +3671,7 @@ export default defineComponent({
         testId: state.examInfo.examinationName ? state.EditTestId : 0,
         homeWorkId: state.EditWorkId,
         name: state.xjkkinputV1,
-        signFlag: state.xjkkradioV1 === 0 ? 1 : 0, //是否允许未报名的签到:1是0否
+        signFlag: state.xjkkradioV1 ? 1 : 0, //是否允许未报名的签到:1是0否
         // signWordFlag: state.xjkkradioV1 === 1 ? 1 : 0, //签到是否需要口令:1是0否
         teacherId: state.member.value,
         teacher: state.member.name,
@@ -3762,7 +3754,7 @@ export default defineComponent({
       state.afterStartValue = item.afterStart; //考勤 开始后
       if (item.signFlag === 1) {
         //是否允许未报名的签到:1是0否
-        state.xjkkradioV1 = 0;
+        state.xjkkradioV1 = true;
       }
       state.member = { value: item.teacherId, name: item.teacher };
       state.cstm_hs = true;
@@ -3999,7 +3991,7 @@ export default defineComponent({
     };
     const clear_xjkkradioV1 = (value) => {
       if (value != "") {
-        state.xjkkradioV1 = "";
+        state.xjkkradioV1 = false;
       }
     };
     const clear_xjkkradioV2 = (value) => {

From 615445aea34f8bbf3a3edd2948a19dfba66daffe Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Thu, 23 Mar 2023 22:16:26 +0800
Subject: [PATCH 08/12] fix

---
 src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index cd90f36b..43bd6a64 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -33,7 +33,7 @@ import {USER_PERMISSION} from "@/api/ThirdApi";
 
 const store = useStore();
 const isLogin = ref(false);
-console.log("版本2.2.5------------");
+console.log("版本2.2.6------------");
 
 // 监听关闭浏览器
 let time1 = ref(0);

From 3fb0073b112b7fd2655a9a7454122306d9a7f13c Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 24 Mar 2023 02:43:53 +0800
Subject: [PATCH 09/12] --fix bug

---
 .env.boe                                      |  2 +-
 .env.prod                                     |  2 +-
 .../drawers/project/ImpoterGroupLeader.vue    | 19 ++-----------------
 src/views/learningpath/LevelAdd.vue           |  3 ++-
 src/views/projectcenter/TaskPage.vue          |  6 +++---
 5 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/.env.boe b/.env.boe
index e3def201..a6bbf443 100644
--- a/.env.boe
+++ b/.env.boe
@@ -15,4 +15,4 @@ VUE_APP_ONLINE_CLASS_URL=//u-pre.boe.com/mobile/pages/study/courseStudy?id=
 VITE_BOE_CASS_DETAIL_URL=//u-pre.boe.com/pc/case/detail?id=
 VUE_APP_EXAM_DETAIL_URL=//u-pre.boe.com/mobile/pages/exam/exam?id=
 # 批量面授报名模板
-VUE_APP_FACE_STUDENT_TEMPLATE=批量面授报名模版-1673963663229.xlsx
\ No newline at end of file
+VUE_APP_FACE_STUDENT_TEMPLATE=coursefile/批量面授报名模版-1679595849719.xlsx
\ No newline at end of file
diff --git a/.env.prod b/.env.prod
index 065ab4f0..fcf6b999 100644
--- a/.env.prod
+++ b/.env.prod
@@ -31,4 +31,4 @@ VUE_APP_AVATAR_PATH=/upload/
 # 旧版管理员界面
 VUE_APP_OLD_MANAGE=//u.boe.com/resource/index.html
 # 批量面授报名模板
-VUE_APP_FACE_STUDENT_TEMPLATE=批量面授报名模版-1673963663229.xlsx
\ No newline at end of file
+VUE_APP_FACE_STUDENT_TEMPLATE=/file/批量面授报名模版-1679595925822.xlsx
\ No newline at end of file
diff --git a/src/components/drawers/project/ImpoterGroupLeader.vue b/src/components/drawers/project/ImpoterGroupLeader.vue
index 0810f9b4..a12a607f 100644
--- a/src/components/drawers/project/ImpoterGroupLeader.vue
+++ b/src/components/drawers/project/ImpoterGroupLeader.vue
@@ -18,16 +18,9 @@
         />
       </div>
       <div class="main">
-        <div v-if="downloadType!==1"  class="minatitl">
-          <div class="up1" style="font-weight: bolder">导入小组长</div>
-          <!--<div class="up2" @click="downTemplate" style="cursor: pointer">-->
-            <!--模板-->
-          <!--</div>-->
-        </div>
-        <div v-if="downloadType!==1" class="up1">请先导出小组填写小组长，按要求填写数据并导入</div>
-        <div v-else class="up1">
+        <div class="up1" v-if="templateUrl">
           请下载
-          <a :href="stuFeceStuTemplateUrl" target="_blank">模版</a>
+          <a :href="templateUrl" target="_blank">模版</a>
           ，按要求填写并导入
         </div>
         <div class="upload">
@@ -110,7 +103,6 @@ const props = defineProps({
   fileType: Object,
   data: Object,
   templateUrl: String,
-  downloadType: Number
 })
 const emit = defineEmits({})
 
@@ -132,16 +124,9 @@ const closeDrawer = () => {
   fileList.value = [];
 };
 
-// 批量面授报名模版
-const stuFeceStuTemplateUrl = ref(process.env.VUE_APP_FILE_PATH + process.env.VUE_APP_FACE_STUDENT_TEMPLATE);
-
 function openDrawer() {
   visible.value = true
 }
-//
-// function downTemplate() {
-//   window.open(process.env.VUE_APP_BASE_API + props.templateUrl);
-// }
 
 function downloadErrorData(url) {
   window.open(process.env.VUE_APP_FILE_PATH + url)
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index 3a888455..f07ff679 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -325,7 +325,7 @@
           <div style="flex: 1">
             <div class="onerow">
               <div class="taskmain">任务大纲</div>
-              <ImpoterGroupLeader :downloadType="1" title="批量面授报名" :data="{targetId:routerId,type:2}" :url="`/admin/offcourse/importCourse`" :template-url="`/admin/router/exportTaskCoursePlan/${routerId}?type=1&taskType=2&thirdType=3`">
+              <ImpoterGroupLeader title="批量面授报名" :data="{targetId:routerId,type:2}" :url="`/admin/offcourse/importCourse`" :template-url="templateUrl">
                 <button class="btn">批量面授报名</button>
               </ImpoterGroupLeader>
               <router-link
@@ -1691,6 +1691,7 @@ export default {
       isreload: true,
       TaskFaceImpStuvisible: false,
       uploadAction: process.env.VUE_APP_BASE_API + "/file/uploadunlimit",
+      templateUrl:process.env.VUE_APP_FILE_PATH+process.env.VUE_APP_FACE_STUDENT_TEMPLATE
     });
 
     const levelList = reactive({
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index b26005ad..87070d9d 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -461,10 +461,9 @@
               <div class="taskmain">任务大纲</div>
               <ImpoterGroupLeader
                 title="批量面授报名"
-                :downloadType="1"
                 :data="{ targetId: projectId, type: 1 }"
                 :url="`/admin/offcourse/importCourse`"
-                :template-url="`/admin/project/exportTaskCoursePlan/${projectId}?type=1&taskType=2&thirdType=3`"
+                :template-url="templateUrl"
               >
                 <button class="btn">批量面授报名</button>
               </ImpoterGroupLeader>
@@ -817,9 +816,9 @@
                     <span class="btn1text">导出小组</span>
                   </div>
                   <ImpoterGroupLeader
+                    title="导入小组长"
                     :data="{ targetId: projectId, type: 1 }"
                     :url="`/admin/studentGroup/importGroup`"
-                    :template-url="`/admin/studentGroup/exportGroup/${projectId}`"
                   >
                     <div class="btn1">
                       <span class="btn1text">导入小组长</span>
@@ -2843,6 +2842,7 @@ export default {
       certificatelist: [],
       fileUrl: process.env.VUE_APP_FILE_PATH,
       uploadAction: process.env.VUE_APP_BASE_API + "/file/uploadunlimit",
+      templateUrl:process.env.VUE_APP_FILE_PATH+process.env.VUE_APP_FACE_STUDENT_TEMPLATE
     });
     // 排行榜 - start
     // 积分排行榜 Top10

From e3edca5191528da23293eb5902e0a9ab8cc12c9b Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 24 Mar 2023 02:49:09 +0800
Subject: [PATCH 10/12] --fix bug

---
 src/components/drawers/StuScoreDetail.vue | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/components/drawers/StuScoreDetail.vue b/src/components/drawers/StuScoreDetail.vue
index d1b8914c..55ea8cd7 100644
--- a/src/components/drawers/StuScoreDetail.vue
+++ b/src/components/drawers/StuScoreDetail.vue
@@ -22,17 +22,14 @@
               style="border: 1px solid #f2f6fe"
               :columns="tablecolumns"
               :data-source="tabledata"
-              :loading="tableDataTotal === -1 ? true : false"
-              @expand="expandTable"
               :pagination="false"
             />
 
             <div class="pa">
               <a-pagination
-                v-if="tableDataTotal > 10"
                 :showSizeChanger="false"
-                showQuickJumper="true"
-                hideOnSinglePage="true"
+                :showQuickJumper="true"
+                :hideOnSinglePage="true"
                 :pageSize="pageSize"
                 :current="currentPage"
                 :total="tableDataTotal"
@@ -138,7 +135,7 @@ export default {
       studentScoreList(obj).then((res) => {
         console.log("dede", res.data.data);
         let result = res.data.data;
-        state.tableDataTotal = result.pageSize;
+        state.tableDataTotal = result.total;
         if (result.pageSize > 0) {
           setTable(result.rows);
         }

From 0651540b69048d6a8b80b0f27680b86a13dd79d4 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 24 Mar 2023 03:38:56 +0800
Subject: [PATCH 11/12] --fix bug

---
 src/views/courselibrary/CoursewareManage.vue | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 59e18d22..2a873b5c 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -1789,6 +1789,15 @@ const columns2 = [
     customRender: ({ record: { courseName, routerName } }) =>
       courseName || routerName || "开课",
   },
+  {
+    title: "是否开课学员",
+    dataIndex: "infoType",
+    key: "infoType",
+    ellipsis: true,
+    width: "10%",
+    align: "center",
+    customRender: ({ record: { infoType } }) => infoType ===1 ? '是':'否'
+  },
   {
     title: "学习时间",
     dataIndex: "lastStudyTime",

From 6337b811cd5f2426a3fdc9abcdc3e5f10435cc3e Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 24 Mar 2023 03:50:10 +0800
Subject: [PATCH 12/12] =?UTF-8?q?--fix=20bug=20=E7=B3=BB=E7=BB=9F=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/config.js  |  5 ++---
 src/api/request.js | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/api/config.js b/src/api/config.js
index 0130bcf3..dc624903 100644
--- a/src/api/config.js
+++ b/src/api/config.js
@@ -51,9 +51,8 @@ http.interceptors.response.use(
     (response) => {
         // console.log('response', response)
         const {
-            data: {code, msg, show},
+            data: {code, msg ,show},
         } = response;
-        console.log('code', code)
         if (code === 0 || code === 200) {
             return response;
         }
@@ -65,7 +64,7 @@ http.interceptors.response.use(
             localStorage.removeItem('refreshPage')
             return Promise.reject(response);
         }
-        show && message.error(msg);
+        show ? message.error(msg):message.error('系统接口数据异常，请联系管理员');
         console.log("api %o", msg);
         return Promise.reject(response);
     },
diff --git a/src/api/request.js b/src/api/request.js
index cbdc783b..4efc7830 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -1,6 +1,8 @@
 import {isRef, reactive, ref, toRefs, unref, watch, watchEffect} from "vue";
 import {getCookieForName, throttle} from "@/api/method";
 import JSONBigInt from "json-bigint";
+import router from "@/router";
+import {message} from "ant-design-vue";
 
 const JSONBigIntStr = JSONBigInt({ storeAsString: true });
 
@@ -346,5 +348,18 @@ export async function request(_url, params) {
     return res.text();
   }).then(res => {
     return JSONBigIntStr.parse(res);
+  }).then(res => {
+    if (res.code === 0 || res.code === 200) {
+      return res;
+    }
+    if (res.code === 1000) {
+      (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'alpine') ?
+        router.push({path: 'login', query: { returnUrl: router.currentRoute.value.fullPath }}) :
+        (window.location.href = process.env.VUE_APP_LOGIN_URL + encodeURIComponent(window.location.protocol + process.env.VUE_APP_BOE_API_URL + process.env.VUE_APP_BASE + router.currentRoute.value.fullPath))
+      localStorage.removeItem('refreshPage')
+      return Promise.reject(res);
+    }
+    res.show ? message.error(res.msg):message.error('系统接口数据异常，请联系管理员');
+    return Promise.reject(res);
   });
 }
\ No newline at end of file