From d4923e3fd59fa1aee56207ae7d774361fed726b4 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Thu, 23 Mar 2023 15:15:08 +0800
Subject: [PATCH 1/8] fix

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

diff --git a/src/App.vue b/src/App.vue
index 58f5a507..cd90f36b 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.4------------");
+console.log("版本2.2.5------------");
 
 // 监听关闭浏览器
 let time1 = ref(0);

From bb80b35087c2878264145d7cfffba5abbf45c447 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Thu, 23 Mar 2023 15:39:35 +0800
Subject: [PATCH 2/8] style

---
 src/components/common/CommonImport.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/common/CommonImport.vue b/src/components/common/CommonImport.vue
index 44966b06..ef55088b 100644
--- a/src/components/common/CommonImport.vue
+++ b/src/components/common/CommonImport.vue
@@ -148,6 +148,10 @@ function handleChange({ file }) {
 </script>
 
 <style scoped lang="scss">
+.impotergroupleader > .ant-drawer-content-wrapper  {
+  min-width: 800px !important;
+  width: 800px !important;
+}
 .impotergroupleader {
   .drawerMain {
     min-width: 600px;

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 3/8] 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 4/8] 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 5/8] =?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 6/8] =?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 7/8] =?UTF-8?q?style:=E6=89=B9=E9=87=8F=E9=9D=A2=E6=8E=88?=
 =?UTF-8?q?=E6=8A=A5=E5=90=8D=E6=A8=A1=E7=89=88=E9=85=8D=E7=BD=AE=E5=8F=8A?=
 =?UTF-8?q?=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 8/8] =?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)