Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/components/question/question-upload.vue

@@ -3,16 +3,20 @@
 </style>
 <template>
   <q-dialog v-model="persistent" persistent content-class="bg-grey-1" transition-show="scale" transition-hide="scale">
-    <q-card style="width: 1400px;max-width:900px;min-height:100px;">
+    <q-card style="width: 1400px;min-height:100px;">
       <q-card-section>
         <div class="text-h6">{{importType==1?'模板导入(EXCEL)':'智能导入(WORD)'}}
-          <a style="color:blue;cursor:pointer;float:right;margin-right:5px;text-decoration:none;" :href="downLoadUrl"
+          <el-upload class="upload-demo" action="" style="display:inline-block;margin-left:80px;" :accept="accept" :show-file-list="false"
+            :http-request="UploadAttachment">
+            <el-button size="small" type="primary">点击上传</el-button>
+          </el-upload>
+          <a style="color:blue;font-size:14px;cursor:pointer;float:right;margin-right:5px;text-decoration:none;" :href="downLoadUrl"
             :download="downLoadName">下载模板文件</a>
         </div>
       </q-card-section>
       <q-card-section class="q-pt-none scroll" style="max-height: 70vh">
         <table>
-          <thead>
+          <!-- <thead>
             <tr>
               <td>
                 <el-upload class="upload-demo" action="" :accept="accept" :show-file-list="false"
@@ -21,7 +25,7 @@
                 </el-upload>
               </td>
             </tr>
-          </thead>
+          </thead> -->
           <tr>
             <td>
               <template v-for="(item,index) in questionData">