Merge remote-tracking branch 'origin/new-exam' into new-exam

ruoyi-admin/src/main/java/com/ruoyi/web/controller/exam/QuController.java

@@ -187,6 +187,7 @@ public class QuController extends BaseController {
 
 
     @ApiOperation("导入Excel")
+    @RequiresPermissions("system:qu:import")
     @ResponseBody
     @PostMapping( "/import")
     public AjaxResult importFile(@RequestParam("file") MultipartFile file) {

ruoyi-admin/src/main/resources/templates/system/elExam/qu/qu.html

@@ -39,7 +39,7 @@
 		        <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:qu:remove">
 		            <i class="fa fa-remove"></i> 删除
 		        </a>
-				<a class="btn btn-info" @click="toImport()">
+				<a class="btn btn-info" @click="toImport()" shiro:hasPermission="system:qu:import">
 					<i class="fa fa-upload"></i> 导入
 				</a>
 	        </div>
@@ -110,6 +110,7 @@
 		// function  toImport(){
 		// 	$.modal.open("试题导入", prefix + "/toImport",'500','300');
 		// }
+		console.log(document.getElementsByClassName('fixed-sidebar'))
 		// 请求实例
 		const instance = axios.create({
 			baseURL: ctx,
@@ -151,7 +152,12 @@
 							formData.append(key, data[key])
 						})
 					}
-
+					const loading = this.$loading({
+						lock: true,
+						text: 'Loading',
+						spinner: 'el-icon-loading',
+						background: 'rgba(0, 0, 0, 0.7)'
+					});
 					return new Promise((resolve, reject) => {
 						instance.request({
 							url: url,
@@ -159,6 +165,7 @@
 							data: formData,
 							timeout: 1200000
 						}).then(response => {
+							loading.close();
 							console.log(response)
 							resolve(response)
 						}).catch(err => {