优化页面样式

package-lock.json

@@ -1894,12 +1894,39 @@
           "integrity": "sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo=",
           "dev": true
         },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995547052&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz",
+          "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
         "camelcase": {
           "version": "5.3.1",
           "resolved": "https://registry.npm.taobao.org/camelcase/download/camelcase-5.3.1.tgz?cache=0&sync_timestamp=1603921882890&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcamelcase%2Fdownload%2Fcamelcase-5.3.1.tgz",
           "integrity": "sha1-48mzFWnhBoEd8kL3FXJaH0xJQyA=",
           "dev": true
         },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz",
+          "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz",
+          "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
+          "dev": true,
+          "optional": true
+        },
         "css-loader": {
           "version": "3.6.0",
           "resolved": "https://registry.nlark.com/css-loader/download/css-loader-3.6.0.tgz?cache=0&sync_timestamp=1626725891008&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcss-loader%2Fdownload%2Fcss-loader-3.6.0.tgz",
@@ -1941,6 +1968,13 @@
             "universalify": "^0.1.0"
           }
         },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz",
+          "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
+          "dev": true,
+          "optional": true
+        },
         "json5": {
           "version": "1.0.1",
           "resolved": "https://registry.nlark.com/json5/download/json5-1.0.1.tgz",
@@ -1982,6 +2016,63 @@
             "minipass": "^3.1.1"
           }
         },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.nlark.com/supports-color/download/supports-color-7.2.0.tgz?cache=0&sync_timestamp=1626703455199&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz",
+          "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "vue-loader-v16": {
+          "version": "npm:vue-loader@16.5.0",
+          "resolved": "https://registry.nlark.com/vue-loader/download/vue-loader-16.5.0.tgz?cache=0&sync_timestamp=1628666767864&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fvue-loader%2Fdownload%2Fvue-loader-16.5.0.tgz",
+          "integrity": "sha1-CcTgcSRmiZ40uZpoZSTxkWX7KJI=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chalk": "^4.1.0",
+            "hash-sum": "^2.0.0",
+            "loader-utils": "^2.0.0"
+          },
+          "dependencies": {
+            "chalk": {
+              "version": "4.1.2",
+              "resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.2.tgz?cache=0&sync_timestamp=1627646655305&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-4.1.2.tgz",
+              "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+              }
+            },
+            "json5": {
+              "version": "2.2.0",
+              "resolved": "https://registry.nlark.com/json5/download/json5-2.2.0.tgz",
+              "integrity": "sha1-Lf7+cgxrpSXZ69kJlQ8FFTFsiaM=",
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "minimist": "^1.2.5"
+              }
+            },
+            "loader-utils": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz",
+              "integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "big.js": "^5.2.2",
+                "emojis-list": "^3.0.0",
+                "json5": "^2.1.2"
+              }
+            }
+          }
+        },
         "webpack-bundle-analyzer": {
           "version": "3.9.0",
           "resolved": "https://registry.nlark.com/webpack-bundle-analyzer/download/webpack-bundle-analyzer-3.9.0.tgz",
@@ -12441,75 +12532,6 @@
         }
       }
     },
-    "vue-loader-v16": {
-      "version": "npm:vue-loader@16.5.0",
-      "resolved": "https://registry.nlark.com/vue-loader/download/vue-loader-16.5.0.tgz?cache=0&sync_timestamp=1628666767864&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fvue-loader%2Fdownload%2Fvue-loader-16.5.0.tgz",
-      "integrity": "sha1-CcTgcSRmiZ40uZpoZSTxkWX7KJI=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "hash-sum": "^2.0.0",
-        "loader-utils": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995547052&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz",
-          "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.2.tgz?cache=0&sync_timestamp=1627646655305&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-4.1.2.tgz",
-          "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz",
-          "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz",
-          "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-          "dev": true,
-          "optional": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz",
-          "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-          "dev": true,
-          "optional": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.nlark.com/supports-color/download/supports-color-7.2.0.tgz?cache=0&sync_timestamp=1626703455199&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz",
-          "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
     "vue-ref": {
       "version": "2.0.0",
       "resolved": "https://registry.npm.taobao.org/vue-ref/download/vue-ref-2.0.0.tgz",

src/components/layout/components/Sider.vue

@@ -191,6 +191,12 @@ export default {
   .ant-menu-ul {
     height: calc(100vh - @navTopHight);
     overflow-y: auto;
+    -ms-overflow-style: none; // IE+10
+    overflow: -moz-scrollbars-none; // 火狐
+    &::-webkit-scrollbar {
+      width: 0 !important;
+      display: none;
+    }
   }
 }
 </style>

src/styles/index.js

@@ -31,7 +31,7 @@ import 'ant-design-vue/dist/antd.css';
 // 定义网络链接的图标库组件
 // import { Icon } from 'ant-design-vue';
 const IconFont = Icon.createFromIconfontCN({
-  scriptUrl: '//at.alicdn.com/t/font_2605334_1qo67s1vjpz.js',
+  scriptUrl: '//at.alicdn.com/t/font_2605334_5nupkuiacgo.js',
 });
 
 Vue.use(message);

src/views/examQuestionManagement/examQuestionBatchImport.vue

@@ -2,11 +2,16 @@
   <div class="app-container question-batch-import">
     <a-spin :spinning="loading">
       <div class="common-card basic-information-box">
-        <div class="basic-information-title">上传试题CSV文件</div>
+        <div class="basic-information-title">
+          <div>上传试题CSV文件</div>
+          <div class="basic-information-title-other">
+            支持.xls,.xlsx和.csv格式
+          </div>
+        </div>
         <div class="basic-information-form">
           <a-upload
             name="file"
-            accept=".csv"
+            accept=".csv,.xls,.xlsx"
             :headers="headers"
             :show-upload-list="false"
             multiple
@@ -14,7 +19,12 @@
             @change="uploadFileFun"
           >
             <div class="uploadButton">
-              <a-icon :type="loading ? 'loading' : 'upload'" />
+              <a-icon v-show="loading" type="loading" />
+              <icon-font
+                v-show="!loading"
+                class="iconFont"
+                type="ali-icon-shangchuan"
+              />
               <div class="uploadText">
                 点击上传
               </div>
@@ -56,16 +66,21 @@ export default {
     initDataFun() {},
     // 上传前
     beforeUpload(file) {
-      let isJpgOrPng = file.type === 'application/vnd.ms-excel';
-      if (!isJpgOrPng) {
-        this.$message.error('上传文件只能是 .csv 格式！');
+      console.log(file.type);
+      let isUploadFile = [
+        'application/vnd.ms-excel',
+        'application/vnd.ms-excel',
+        'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+      ].includes(file.type);
+      if (!isUploadFile) {
+        this.$message.error('上传文件支持 .xls, .xlsx 和 .csv 格式！');
       }
       let isLtHalf1M = file.size / 1024 / 1024 < 0.5;
       if (!isLtHalf1M) {
         this.$message.error(`${file.name} 文件必须小于 0.5M ！`);
       }
       let bySelf = false;
-      return isJpgOrPng && isLtHalf1M && bySelf;
+      return isUploadFile && isLtHalf1M && bySelf;
     },
     // 上传文件
     uploadFileFun(data) {
@@ -102,6 +117,16 @@ export default {
 <style lang="less" scoped>
 @import '~@/styles/common/variable.less';
 .question-batch-import {
+  .basic-information-title {
+    display: flex;
+    align-items: flex-end;
+    .basic-information-title-other {
+      margin-left: @paddingMarginVal;
+      color: #fd3d31;
+      font-size: 15px;
+      font-weight: normal;
+    }
+  }
   .uploadButton {
     margin: @navTopHight 0;
     padding: @paddingMarginVal;
@@ -111,22 +136,19 @@ export default {
     flex-direction: column;
     justify-content: center;
     align-items: center;
-    border: 1px dashed @mainColorBorder;
     cursor: pointer;
     border-radius: 4px;
     i {
       color: @mainColorBlack65;
-      font-size: 30px;
+      font-size: 80px;
       margin-bottom: 8px;
     }
     .uploadText {
-      color: @mainColorBlack85;
+      color: @mainColorBlueNormal;
       font-size: 16px;
     }
     &:hover {
-      border: 1px dashed @mainColorBlueNormal;
-      i,
-      .uploadText {
+      i {
         color: @mainColorBlueNormal;
       }
     }