Merge branch 'bugfix-zd' into 'master'

Bugfix zd

See merge request tian-group/skyeye-admin-fe!27

src/views/system/user/component/AddUser.vue

@@ -14,7 +14,7 @@
           :multiple="false"
           :limit="1"
           drag
-          action="http://localhost:8092/api/user/import"
+          action="/skyeye-admin-api/user/import"
           :headers="headers"
           :with-credentials="true"
           :auto-upload="false"
@@ -153,7 +153,7 @@
         headers,
         responseType: 'blob',
       };
-      const response = await axios.get('/api/user/downloadExcel', config);
+      const response = await axios.get('/skyeye-admin-api/user/downloadExcel', config);
       const blob = new Blob([response.data], {
         type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
       });
@@ -176,7 +176,7 @@
   };
 
   const beforeUpload = (file) => {
-    const isExcel = /\.(xlsx|xls)$/.test(file.name.toLowerCase());
+    const isExcel = /\.(xlsx|xls|xlsm)$/.test(file.name.toLowerCase());
     if (!isExcel) {
       // 提示用户选择正确的文件类型
       ElMessage({