From d2dfca6c3c4a59e2d6c86fef879bb6f5cd14b1cb Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Mon, 9 Jan 2023 09:41:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=AD=A6=E5=91=98=E6=83=85=E5=86=B5=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E8=AF=84=E4=BC=B0=E8=AF=A6=E6=83=85=E9=A2=98=E7=9B=AE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/ViewAssess.vue | 20 ++++++++++----------
 src/views/research/ManagePage.vue     | 10 ++++++++--
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/components/drawers/ViewAssess.vue b/src/components/drawers/ViewAssess.vue
index 2e7de809..da45233e 100644
--- a/src/components/drawers/ViewAssess.vue
+++ b/src/components/drawers/ViewAssess.vue
@@ -41,14 +41,14 @@
               </div>
             </div>
             <div>
-              <div class="box1" style="margin-left: 55px; margin-top: 20px">
-                <div class="asstype">选择1：</div>
+              <div class="box1" v-for="(itteems, indexss) in values.assessmentSingleChoiceVoList" style="margin-left: 55px; margin-top: 20px" :key="indexss">
+                <div class="asstype">选择{{indexss+1}}：</div>
                 <div style="display:flex;justify-content:center;align-items:center;"> 
-                  <div v-if="values.select"  style="display:flex;justify-content:center;align-items:center;width:16px;height:16px;border-radius:8px;border:1px solid rgba(151, 151, 151, 0.29);margin-right: 8px;">
+                  <div v-if="itteems.select"  style="display:flex;justify-content:center;align-items:center;width:16px;height:16px;border-radius:8px;border:1px solid rgba(151, 151, 151, 0.29);margin-right: 8px;">
                     <div style="width:8px;height:8px;border-radius:4px;background-color:#409eff;"></div>
                   </div>
                   <div v-else style="width:16px;height:16px;border-radius:8px;border:1px solid rgba(151, 151, 151, 0.29);margin-right: 8px;"></div>
-                  {{values.singleOptionName}}
+                  {{itteems.singleOptionName}}
                 </div>
                 <!-- <a-radio :value="indexs" defaultValue>{{iitem.singleOptionName}}</a-radio> -->
               </div>
@@ -56,7 +56,7 @@
             <div style="margin-bottom:30px;"></div>
           </div>
           <!-- 多项选择 -->
-          <div v-if="values.questionType==2" class="assessbox" style="margin-top: 30px">
+          <div v-if="values.questionType==2" class="assessbox" style="margin-top: 30px"> 
             <div class="box1">
               <div class="asstype">评估类型：</div>
               <div class="typename">多选</div>
@@ -68,14 +68,14 @@
               </div>
             </div>
             <div>
-              <div class="box1" style="margin-left: 55px; margin-top: 20px">
-                <div class="asstype">选择1：</div>
+              <div class="box1" v-for="(itteems, indexss) in values.multipleChoiceVoList" style="margin-left: 55px; margin-top: 20px" :key="indexss">
+                <div class="asstype">选择{{indexss+1}}：</div>
                 <div style="display:flex;justify-content:center;align-items:center;"> 
-                  <div v-if="values.select"  style="display:flex;justify-content:center;align-items:center;width:16px;height:16px;border-radius:8px;border:1px solid rgba(151, 151, 151, 0.29);margin-right: 8px;">
+                  <div v-if="itteems.select"  style="display:flex;justify-content:center;align-items:center;width:16px;height:16px;border-radius:8px;border:1px solid rgba(151, 151, 151, 0.29);margin-right: 8px;">
                     <div style="width:8px;height:8px;border-radius:4px;background-color:#409eff;"></div>
                   </div>
                   <div v-else style="width:16px;height:16px;border-radius:8px;border:1px solid rgba(151, 151, 151, 0.29);margin-right: 8px;"></div>
-                  {{values.multipleOptionName}}
+                  {{itteems.multipleOptionName}}
                 </div>
                 <!-- <a-radio :value="indexs" defaultValue>{{iitem.singleOptionName}}</a-radio> -->
               </div>
@@ -200,7 +200,7 @@ export default {
         }).then(res=>{
           console.log(res)
           if(res.data.code==200){
-            let qarr = [res.data.data.assessmentEssayQuestionDtoList, res.data.data.assessmentMultipleChoiceDtoList,res.data.data.assessmentScoringQuestionDtoList,res.data.data.assessmentSingleChoiceDtoList]
+            let qarr = [res.data.data.essayQuestionVoList, res.data.data.multipleStemVoList,res.data.data.scoringQuestionVoList,res.data.data.singleStemVoList]
             let allArr = []
             for(let i=0;i<qarr.length;i++){
               for(let j=0;j<qarr[i].length;j++){
diff --git a/src/views/research/ManagePage.vue b/src/views/research/ManagePage.vue
index dea3ca38..e3b6a89b 100644
--- a/src/views/research/ManagePage.vue
+++ b/src/views/research/ManagePage.vue
@@ -52,7 +52,7 @@
     <div class="up down">
       <div class="header">
         <div class="text">学员情况</div>
-        <div class="btn btn2">
+        <div class="btn btn2" @click="exportStudentInfo">
           <div class="img2"></div>
           <div class="wz">导出信息</div>
         </div>
@@ -152,6 +152,11 @@ export default {
 
     getInfoDate();
 
+    // 导出学员信息
+    function exportStudentInfo() {
+      window.open(`${process.env.VUE_APP_PROXY_URL}admin/assessment/manage/exportAssessmentMessage?assessmentId=${state.basicInfo.assessmentId}`)
+    }
+
     //分页
     const changePaginationStu = (page) => {
       state.evalStuListLoading = true;
@@ -327,7 +332,8 @@ export default {
         },
       ],
       showassess,
-      changePaginationStu
+      changePaginationStu,
+      exportStudentInfo
     };
   },
 };