UI调整

src/components/ImportFile.vue

@@ -36,10 +36,10 @@
     </div>
 
     <template #footer>
+      <a-button @click="close">取消</a-button>
       <a-button type="primary" :disabled="loading" @click="confirm"
         >确认</a-button
       >
-      <a-button @click="close">取消</a-button>
     </template>
   </a-modal>
 </template>

src/constants/menu.ts

@@ -22,13 +22,7 @@ export const menuList = [
     name: "用户管理",
     icon: "user-manage",
     url: "UserManagement",
-    privileges: ["SUPER_ADMIN", "ORG_ADMIN", "ROOT_ORG_ADMIN"],
-  },
-  {
-    name: "科目管理",
-    icon: "course-manage",
-    url: "CourseManagement",
-    privileges: ["ORG_ADMIN", "ROOT_ORG_ADMIN", "COURSE_ADMIN"],
+    privileges: ["SUPER_ADMIN"],
   },
   {
     name: "项目列表",
@@ -36,6 +30,12 @@ export const menuList = [
     url: "ProjectManagement",
     privileges: ["ORG_ADMIN", "ROOT_ORG_ADMIN", "COURSE_ADMIN"],
   },
+  {
+    name: "科目管理",
+    icon: "course-manage",
+    url: "CourseManagement",
+    privileges: ["ORG_ADMIN", "ROOT_ORG_ADMIN", "COURSE_ADMIN"],
+  },
   // {
   //   name: "关联分析",
   //   icon: "project-compare-manage",

src/features/courseManagement/ModifyCourse.vue

@@ -31,10 +31,10 @@
     </a-form>
 
     <template #footer>
+      <a-button @click="close">取消</a-button>
       <a-button type="primary" :disabled="loading" @click="confirm"
         >确认</a-button
       >
-      <a-button @click="close">取消</a-button>
     </template>
   </a-modal>
 </template>

src/features/paperAnalysis/PaperAnalysis.vue

@@ -26,7 +26,7 @@
       </a-form>
     </a-card>
 
-    <div class="part-box">
+    <div class="part-box paper-tabs">
       <a-tabs v-model:activeKey="activeTab" type="card">
         <a-tab-pane key="1" tab="科目频数分布">
           <ScoreRate v-if="courseId" :courseId="courseId" />

src/features/paperAnalysis/QuestionDifficultyGroup.vue

@@ -6,7 +6,7 @@
     </div>
 
     <a-table
-      class="page-table mb-16"
+      class="page-table"
       :data-source="props.questions"
       :pagination="false"
       bordered
@@ -30,7 +30,7 @@
 
     <a-table
       v-if="props.rangeConfig"
-      class="page-table mb-16"
+      class="page-table"
       :data-source="props.questions"
       :pagination="false"
       bordered

src/features/paperAnalysis/QuestionTypeDifficulty.vue

@@ -24,6 +24,12 @@
       @ok="handleImport"
     >
       <a-form :labelCol="{ style: { width: '72px' } }">
+        <a-form-item label="下载模板">
+          <a-button :loading="downLoading" @click="downloadTpl">
+            <template #icon> <svg-icon name="download"></svg-icon> </template>
+            下载模板
+          </a-button>
+        </a-form-item>
         <a-form-item label="文件地址">
           <a-upload
             accept=".xls,.xlsx"
@@ -40,12 +46,6 @@
             </a-button>
           </a-upload>
         </a-form-item>
-        <a-form-item label="下载模板">
-          <a-button :loading="downLoading" @click="downloadTpl">
-            <template #icon> <svg-icon name="download"></svg-icon> </template>
-            下载模板
-          </a-button>
-        </a-form-item>
       </a-form>
     </a-modal>
   </div>

src/features/paperAnalysis/QuestionTypeDiscrimination.vue

@@ -24,6 +24,12 @@
       @ok="handleImport"
     >
       <a-form :labelCol="{ style: { width: '72px' } }">
+        <a-form-item label="下载模板">
+          <a-button :loading="downLoading" @click="downloadTpl">
+            <template #icon> <svg-icon name="download"></svg-icon> </template>
+            下载模板
+          </a-button>
+        </a-form-item>
         <a-form-item label="文件地址">
           <a-upload
             accept=".xls,.xlsx"
@@ -40,12 +46,6 @@
             </a-button>
           </a-upload>
         </a-form-item>
-        <a-form-item label="下载模板">
-          <a-button :loading="downLoading" @click="downloadTpl">
-            <template #icon> <svg-icon name="download"></svg-icon> </template>
-            下载模板
-          </a-button>
-        </a-form-item>
       </a-form>
     </a-modal>
   </div>

src/features/projectManagement/ModifyProject.vue

@@ -22,10 +22,10 @@
     </a-form>
 
     <template #footer>
+      <a-button @click="close">取消</a-button>
       <a-button type="primary" :disabled="loading" @click="confirm"
         >确认</a-button
       >
-      <a-button @click="close">取消</a-button>
     </template>
   </a-modal>
 </template>

src/features/projectParamsManagement/ImportScoreLine.vue

@@ -8,6 +8,12 @@
     @ok="handleImport"
   >
     <a-form :labelCol="{ style: { width: '72px' } }">
+      <a-form-item label="下载模板">
+        <a-button :loading="downLoading" @click="downloadTpl">
+          <template #icon> <svg-icon name="download"></svg-icon> </template>
+          下载模板
+        </a-button>
+      </a-form-item>
       <a-form-item label="批量导出">
         <a-button :loading="exportLoading" @click="toExport">
           <template #icon> <svg-icon name="download"></svg-icon> </template>
@@ -30,12 +36,6 @@
           </a-button>
         </a-upload>
       </a-form-item>
-      <a-form-item label="下载模板">
-        <a-button :loading="downLoading" @click="downloadTpl">
-          <template #icon> <svg-icon name="download"></svg-icon> </template>
-          下载模板
-        </a-button>
-      </a-form-item>
     </a-form>
   </a-modal>
 </template>

src/features/projectParamsManagement/ProjectCourseLineSet.vue

@@ -46,10 +46,10 @@
     </a-form>
 
     <template #footer>
+      <a-button @click="close">取消</a-button>
       <a-button type="primary" :disabled="loading" @click="confirm"
         >确认</a-button
       >
-      <a-button @click="close">取消</a-button>
     </template>
   </a-modal>
 </template>

src/features/report/ReportCompare.vue

@@ -287,7 +287,7 @@ function countChartOption() {
           show: false,
         },
         axisLabel: {
-          fontSize: 13,
+          fontSize: 10,
           fontWeight: 400,
           color: "#172C4D",
         },

src/features/userManagement/ModifyPwd.vue

@@ -19,10 +19,10 @@
     </a-form>
 
     <template #footer>
+      <a-button @click="close">取消</a-button>
       <a-button type="primary" :disabled="loading" @click="confirm"
         >确认</a-button
       >
-      <a-button @click="close">取消</a-button>
     </template>
   </a-modal>
 </template>

src/features/userManagement/ModifyUser.vue

@@ -40,10 +40,10 @@
     </a-form>
 
     <template #footer>
+      <a-button @click="close">取消</a-button>
       <a-button type="primary" :disabled="loading" @click="confirm"
         >确认</a-button
       >
-      <a-button @click="close">取消</a-button>
     </template>
   </a-modal>
 </template>

src/styles/base.less

@@ -101,6 +101,7 @@
   }
 }
 .part-action {
+  margin-bottom: 16px;
   .ant-btn-text {
     padding: 5px 8px;
   }
@@ -114,7 +115,6 @@
 .page-table {
   .ant-table-thead {
     .ant-table-cell {
-      background-color: #fff;
       color: var(--app-secondary-text-color);
       font-weight: 400;
 

src/styles/login.less

@@ -37,11 +37,12 @@
   overflow: hidden;
   border-radius: 30px;
   background-color: #fff;
+  box-shadow: 0px 0 6px 0px #d9d9d9;
 }
 .login-theme {
   width: 400px;
   height: 100%;
-  border-radius: 20px;
+  border-radius: 20px 0 0 20px;
   background-image: url(../assets/bg-login-theme.jpg);
   background-size: 100% 100%;
   float: left;

src/styles/nprogress.less

@@ -4,7 +4,7 @@
 }
 
 #nprogress .bar {
-  background: yellow;
+  background: #165dff;
 
   position: fixed;
   z-index: 1031;
@@ -36,7 +36,8 @@
   position: fixed;
   z-index: 1031;
   top: 15px;
-  right: 15px;
+  left: 50%;
+  transform: translateX(-50%);
 }
 
 #nprogress .spinner-icon {
@@ -45,8 +46,8 @@
   box-sizing: border-box;
 
   border: solid 2px transparent;
-  border-top-color: yellow;
-  border-left-color: yellow;
+  border-top-color: #165dff;
+  border-left-color: #165dff;
   border-radius: 50%;
 
   -webkit-animation: nprogress-spinner 400ms linear infinite;

src/styles/pages.less

@@ -13,6 +13,12 @@
     }
   }
 
+  .paper-tabs {
+    .ant-tabs-top > .ant-tabs-nav {
+      margin-bottom: 20px;
+    }
+  }
+
   .score-part {
     background-color: #f9f9f9;
     border-radius: var(--border-radius);