diff --git a/src/views/basic/ask/analysis.vue b/src/views/basic/ask/analysis.vue
index a743ec9..dd2bc86 100644
--- a/src/views/basic/ask/analysis.vue
+++ b/src/views/basic/ask/analysis.vue
@@ -44,7 +44,7 @@
               <el-radio :label="2">导出</el-radio>
             </el-radio-group>
           </div>
-          <div class="down-item">
+          <div class="down-item" v-show="downType == 2">
             <p class="tit">选择要导出的学生</p>
             <el-radio-group v-model="exportType">
               <el-radio :label="1">导出全部</el-radio>
@@ -53,10 +53,18 @@
           </div>
         </div>
         <ul v-show="exportType == 2">
-          <li v-for="item in exportStudent"></li>
+          <p class="export-tit">选择学生</p>
+          <el-table :data="exportStudent" @selection-change="handleSelectionChange" :max-height="300">
+            <el-table-column type="selection"></el-table-column>
+            <el-table-column prop="studentName" label="姓名" align="center"></el-table-column>
+            <el-table-column prop="classRank" label="班名" align="center"></el-table-column>
+            <el-table-column prop="correctRate" label="总正确率" align="center"><template slot-scope="scoped">{{
+              scoped.row.correctRate }}%</template></el-table-column>
+          </el-table>
         </ul>
         <div class="dialog-footer" slot="footer">
-          <el-button size="small" type="primary" round @click="exportData">确 定</el-button>
+          <el-button v-show="downType == 2" size="small" type="primary" round @click="exportData(10)">导出前十</el-button>
+          <el-button size="small" type="primary" round @click="exportData(0)">确 定</el-button>
           <el-button size="small" type="danger" round @click="cancel">取 消</el-button>
         </div>
       </el-dialog>
@@ -91,7 +99,8 @@ export default {
       diaDown: false,
       downType: 1,
       exportType: 1,
-      exportStudent: []
+      exportStudent: [],
+      multipleSelection: [],
     };
   },
   created() {
@@ -116,6 +125,7 @@ export default {
     this.id = JSON.parse(this.$route.query.id)
     this.status = this.$route.query.status ? this.$route.query.status : 0;
     this._QueryData();
+    this._QueryDataQuestionRank();
     this.types != 3 ? this.periodDetail() : '';
   },
   methods: {
@@ -188,9 +198,7 @@ export default {
             ? this.$request.pPeriodQuestionReport
             : this.type == 2 ? this.$request.phaseAnswerReport : this.$request.phaseInteractiveReport;
         } else if (this.types == 3) {
-          this.type == 1
-            ? this.$request.pPeriodQuestionReport
-            : this.type == 2 ? this.$request.pPhaseAnswerReport : this.$request.pPhaseInteractiveReport;
+          queryData = this.type == 2 ? this.$request.pPhaseAnswerReport : this.$request.pPhaseInteractiveReport;
         }
       } else {
         if (this.types == 1) {
@@ -204,13 +212,9 @@ export default {
             ? this.$request.periodQuestionReport
             : this.type == 2 ? this.$request.phaseAnswerReport : this.$request.phaseInteractiveReport;
         } else if (this.types == 3) {
-          queryData = this.type == 1
-            ? this.$request.periodQuestionReport
-            : this.type == 2 ? this.$request.cTPhaseAnswerReport : this.$request.cTPhaseInteractiveReport;
+          queryData = this.type == 2 ? this.$request.cTPhaseAnswerReport : this.$request.cTPhaseInteractiveReport;
         }
       }
-
-
       if (this.types == 1) {
         query.type = this.type
       }
@@ -238,32 +242,24 @@ export default {
       let queryData;
       if (this.role == "ROLE_PERSONAL") {
         if (this.types == 1) {
-          queryData = this.type == 1
-            ? this.$request.pPeriodQuestionReport
-            : this.$request.pPeriodStudentReport
+          queryData = this.$request.pPeriodStudentReport
         }
         else if (this.types == 2) {
           queryData = this.type == 1
-            ? this.$request.pPeriodQuestionReport
+            ? this.$request.pPeriodStudentReport
             : this.type == 2 ? this.$request.phaseAnswerReport : this.$request.phaseInteractiveReport;
         } else if (this.types == 3) {
-          this.type == 1
-            ? this.$request.pPeriodQuestionReport
-            : this.type == 2 ? this.$request.pPhaseAnswerReport : this.$request.pPhaseInteractiveReport;
+          this.type == 2 ? this.$request.pPhaseAnswerReport : this.$request.pPhaseInteractiveReport;
         }
       } else {
         if (this.types == 1) {
-          queryData = this.type == 1
-            ? this.$request.periodQuestionReport
-            : this.$request.periodStudentReport
+          queryData = this.$request.periodStudentReport
         } else if (this.types == 2) {
           queryData = this.type == 1
-            ? this.$request.periodQuestionReport
+            ? this.$request.periodStudentReport
             : this.type == 2 ? this.$request.phaseAnswerReport : this.$request.phaseInteractiveReport;
         } else if (this.types == 3) {
-          queryData = this.type == 1
-            ? this.$request.periodQuestionReport
-            : this.type == 2 ? this.$request.cTPhaseAnswerReport : this.$request.cTPhaseInteractiveReport;
+          queryData = this.type == 2 ? this.$request.cTPhaseAnswerReport : this.$request.cTPhaseInteractiveReport;
         }
       }
 
@@ -301,15 +297,33 @@ export default {
     changeDownType() {
       this.exportType = 1
     },
-
-    //导出
-    async exportData() {
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    //导出  
+    async exportData(length) {
       if (this.exportLoading == true) return;
       this.exportLoading = true;
       let studentIds = []
+      if (length) {
+        studentIds = this.exportStudent.slice(0, 10).map(item => {
+          return item.studentId
+        })
+      } else {
+        studentIds = this.multipleSelection.map(item => {
+          return item.studentId
+        })
+      }
+      let query = {};
+      if (studentIds.length == this.exportStudent.length) {
+        query.studentIds = []
+      } else if (studentIds.length > 0) {
+        query.studentIds = studentIds
+      }
       const data = await this.$request.exportPeriodReport({
         // periodId: this.id,
         periodId: this.id[0],
+        ...query
       });
       this.exportLoading = false;
       if (data) {
@@ -377,7 +391,12 @@ div::-webkit-scrollbar-thumb {
   }
 }
 
+:deep(.el-dialog__body) {
+  padding-top: 0;
+}
+
 .el-dialog {
+
   .down-item {
     font-size: 15px;
     margin-bottom: 10px;
@@ -387,6 +406,12 @@ div::-webkit-scrollbar-thumb {
       padding: 10px 0;
     }
   }
+
+  .export-tit {
+    text-align: center;
+    font-size: 16px;
+    padding-bottom: 10px;
+  }
 }
 
 .dialog-footer {
diff --git a/src/views/basic/ask/components/answerQustion.vue b/src/views/basic/ask/components/answerQustion.vue
index 1bfd795..9e2792f 100644
--- a/src/views/basic/ask/components/answerQustion.vue
+++ b/src/views/basic/ask/components/answerQustion.vue
@@ -77,7 +77,7 @@ export default {
           let params = {};
 
           if (this.types == 1) {
-            const detail = JSON.parse(item.detail);
+            const detail = item.detail ? JSON.parse(item.detail) : [];
             if (detail.length > optionsList.length) {
               optionsList = [...detail];
             }
diff --git a/src/views/basic/ask/list.vue b/src/views/basic/ask/list.vue
index 7674135..9b706ff 100644
--- a/src/views/basic/ask/list.vue
+++ b/src/views/basic/ask/list.vue
@@ -16,7 +16,7 @@
         <p class="btn-box">
           <el-button type="primary" round @click="linkToDetail2">查看汇总报表</el-button>
         </p>
-        <div id="print-content">
+        <div>
           <el-table :data="tableData" border :show-header="total > 0" style="width: 100%"
             @selection-change="handleSelectionChange">
             <el-table-column type="selection" width="40"></el-table-column>
@@ -136,6 +136,7 @@ export default {
         query: {
           id: JSON.stringify([obj.id]),
           types: types,
+          params: this.$route.query.params
         },
       });
     },
@@ -151,7 +152,8 @@ export default {
         path: "/askAnalysis",
         query: {
           id: JSON.stringify(ids),
-          types: subjectArr.length == 1 ? 2 : 3,
+          types: this.multipleSelection.length == 1 ? 1 : subjectArr.length == 1 ? 2 : 3,
+          params: this.$route.query.params
         },
       });
     },
diff --git a/src/views/basic/dataSync/index.vue b/src/views/basic/dataSync/index.vue
index 18cb7b1..3dcf761 100644
--- a/src/views/basic/dataSync/index.vue
+++ b/src/views/basic/dataSync/index.vue
@@ -11,17 +11,8 @@
         <p class="txt">
           本功能帮助无法上网的授课端软件，将本地数据同步到云平台。
         </p>
-        <el-upload
-          class="upload-demo"
-          ref="upload"
-          :action="url"
-          :multiple="false"
-          :with-credentials="true"
-          :limit="1"
-          :on-change="change"
-          :on-success="upSuccess"
-          :on-error="upError"
-        >
+        <el-upload class="upload-demo" ref="upload" :action="url" :multiple="false" :with-credentials="true" :limit="1"
+          :on-change="change" :on-success="upSuccess" :on-error="upError">
           <div class="btn-box">
             <i class="fa fa-cloud-upload"></i>
             <el-button type="primary" round>选择文件</el-button>
@@ -31,26 +22,34 @@
 
       <div class="down-item">
         <p class="h-title">数据导出至U盘</p>
-        <p class="txt">本功能将云平台的数据导出到U盘。</p>
+        <p class="txt txt2">本功能将云平台的数据导出到U盘。</p>
         <div class="btn-box btn-box2" v-loading="downLoading">
-          <i class="fa fa-cloud-download" @click="downloadFile"></i>
-          <el-button type="primary" round @click="downloadFile"
-            >文件下载</el-button
-          >
+          <p class="p1">
+            <el-checkbox-group v-model="type">
+              <el-checkbox :label="0">班级信息</el-checkbox>
+              <el-checkbox :label="2">备题组卷数据</el-checkbox>
+              <el-checkbox :label="2">报表数据</el-checkbox>
+            </el-checkbox-group>
+          </p>
+          <p class="p1">
+            <el-radio-group v-model="dateType">
+              <el-radio :label="0">全部</el-radio>
+              <el-radio :label="1">最近一个月</el-radio>
+            </el-radio-group>
+          </p>
+          <el-button type="primary" round @click="downloadFile">文件下载</el-button>
         </div>
       </div>
     </div>
     <el-dialog :close-on-click-modal="false" title="" :visible.sync="dialogVisible" width="300" center>
       <el-result icon="success" title="上传成功"> </el-result>
       <el-descriptions title="" :column="1">
-        <el-descriptions-item label="导入答题卡数量">{{tipData.paperNum}}</el-descriptions-item>
-        <el-descriptions-item label="导入随堂问报表数量">{{tipData.periodNum}}</el-descriptions-item>
-        <el-descriptions-item label="导入即时测报表数量">{{tipData.examNum}}</el-descriptions-item>
+        <el-descriptions-item label="导入答题卡数量">{{ tipData.paperNum }}</el-descriptions-item>
+        <el-descriptions-item label="导入随堂问报表数量">{{ tipData.periodNum }}</el-descriptions-item>
+        <el-descriptions-item label="导入即时测报表数量">{{ tipData.examNum }}</el-descriptions-item>
       </el-descriptions>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="dialogVisible = false"
-          >确 定</el-button
-        >
+        <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -61,6 +60,7 @@ import { formatDate } from "@/utils";
 export default {
   data() {
     return {
+      role: "",
       downLoading: false,
       url: "/api_html/teaching/importData",
       file: {},
@@ -70,13 +70,36 @@ export default {
         periodNum: 0,
         examNum: 0,
       },
+      type: [0, 1, 2],
+      dateType: 0
     };
   },
+  created() {
+    this.role =
+      this.$store.getters.info.showRole ||
+      this.$store.getters.info.permissions[0].role;
+    if (this.role == "ROLE_PERSONAL") {
+      this.url = "/api_html/personal/importData"
+    }
+  },
   methods: {
     async downloadFile() {
       if (this.downLoading) return;
       this.downLoading = true;
-      const data = await this.$request.exportData();
+
+      let query = {}
+      if (this.type.length == 3 || this.type.length == 0) {
+        query.type = []
+      } else {
+        query.type = this.type
+      }
+      if (this.dateType == 1) {
+        let times = new Date().getTime() - 30 * 24 * 60 * 60 * 1000
+        query.exportData = formatDate(times, "yyyy-MM-dd");
+        query.exportData = query.exportData.replaceAll("-", "")
+      }
+      const exportData = this.role == "ROLE_PERSONAL" ? this.$request.pExportData : this.$request.exportData
+      const data = await exportData();
       this.downLoading = false;
       console.log(data);
       if (data) {
@@ -138,18 +161,21 @@ export default {
   padding: 50px;
   display: flex;
   justify-content: center;
+
   .down-item {
     width: 400px;
-    height:330px;
+    height: 330px;
     border-radius: 20px;
     margin: 20px;
     background: #f8f8f8;
     box-shadow: 2px 2px 5px #ccc;
+
     .h-title {
       font-size: 16px;
       color: #667ffd;
       padding: 16px 0 16px 12px;
     }
+
     .txt {
       height: 80px;
       padding: 0 20px;
@@ -158,22 +184,35 @@ export default {
       line-height: 24px;
       text-align: center;
     }
+
+    .txt2 {
+      height: 60px;
+    }
+
+    .p1 {
+      margin-bottom: 30px;
+    }
   }
+
   .upload-demo {
-    padding:0 20px 20px;
-    :deep(.el-upload--text){
+    padding: 0 20px 20px;
+
+    :deep(.el-upload--text) {
       display: block;
     }
   }
+
   :deep(.el-upload) {
     margin: 0 auto;
   }
+
   .btn-box {
     display: flex;
     flex-direction: column;
     justify-content: center;
     align-items: center;
     padding-bottom: 10px;
+
     .fa {
       font-size: 80px;
       color: #aeaeae;
@@ -181,6 +220,7 @@ export default {
       cursor: pointer;
     }
   }
+
   .btn-box {
     width: 100%;
   }