From 18735986e609bf9ed8de5860a2c4cedd88a38dd7 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Wed, 27 May 2020 17:30:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=97=E8=BD=A6=E8=AF=86?=
 =?UTF-8?q?=E5=88=AB=E5=8F=B7=E7=A6=81=E7=94=A8=E4=BA=BA=E5=B7=A5=E8=BD=A6?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B&=E7=94=9F=E6=88=90=E8=AF=95=E5=8D=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue | 1 +
 src/views/competitionManage/generatePaper.vue           | 1 +
 src/views/competitionManage/setExamTime.vue             | 7 +++----
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue b/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue
index eebf40bcf..3e6bef581 100644
--- a/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue
+++ b/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue
@@ -56,6 +56,7 @@
           :id="domIdTrainNumber"
           v-model="formModel.category"
           filterable
+          :disabled="true"
         >
           <el-option
             v-for="item in categoryList"
diff --git a/src/views/competitionManage/generatePaper.vue b/src/views/competitionManage/generatePaper.vue
index dead2ef1c..98e93ef83 100644
--- a/src/views/competitionManage/generatePaper.vue
+++ b/src/views/competitionManage/generatePaper.vue
@@ -33,6 +33,7 @@
         <el-table-column
           prop="topic"
           label="题目"
+          show-overflow-tooltip
         >
           <template slot-scope="scope">
             <span v-html="scope.row.topic" />
diff --git a/src/views/competitionManage/setExamTime.vue b/src/views/competitionManage/setExamTime.vue
index 2dba4c70b..c546c8cc4 100644
--- a/src/views/competitionManage/setExamTime.vue
+++ b/src/views/competitionManage/setExamTime.vue
@@ -71,13 +71,12 @@ export default {
         handleExport() {
             getRaceById(this.$route.query.raceId).then(resp => {
                 const exportData = {
-                    operateQuestionList: this.operateQuestionList,
-                    theoryQuestionList: this.theoryQuestionList,
-                    raceId: this.$route.query.raceId,
+                    practicalQuestions: this.operateQuestionList,
+                    theoryQuestions: this.theoryQuestionList,
+                    competitionId: this.$route.query.raceId,
                     theoryExamTime: this.form.theoryExamTime,
                     operateExamTime: this.form.operateExamTime
                 };
-                console.log(exportData, '11111111');
                 const content = new Blob([JSON.stringify(exportData)]);
                 const urlObject = window.URL || window.webkitURL || window;
                 const url = urlObject.createObjectURL(content);