样式

src/components/CommonRangeConfig.vue

@@ -41,7 +41,7 @@
         v-model:value="rangePoint.adjustScore"
       ></a-input-number>
       <br />
-      <a-button @click="newRangePoint">新增分割点</a-button>
+      <a-button type="primary" @click="newRangePoint">新增分割点</a-button>
     </div>
   </a-modal>
 </template>

src/features/allAnalysis/AllAnalysis2.vue

@@ -5,7 +5,7 @@
       <ProjectSelect :project-id="projectId" v-model:value="projectId" />
       <ProjectCourseSelect :project-id="projectId" v-model:value="courseId" />
       <span class="tw-mr-4"></span>
-      <a-button @click="search">查询</a-button>
+      <a-button @click="search" class="query-btn">查询</a-button>
 
       <div class="tw-mt-4">
         <a-button @click="goBack">返回</a-button>

src/features/courseManagement/CourseManagement.vue

@@ -21,21 +21,25 @@
 
       <span class="tw-mr-4"></span>
       <CourseTypeSelect v-model:value="type" />
+      <span class="tw-mr-4"></span>
       <StateSelect v-model:value="enable" />
       <span class="tw-mr-4"></span>
-      <a-button @click="search">查询</a-button>
+      <a-button @click="search" class="query-btn">查询</a-button>
+    </div>
 
-      <div v-if="store.isGreaterThanEqualRootOrgAdmin" class="tw-mt-4">
-        <a-button @click="newCourse">新增</a-button>
-        <a-button @click="importModalVisible = true">批量导入</a-button>
-        <a-button @click="handleExport">批量导出</a-button>
-        <a-button @click="handleToggleCourses(true, selectIds)">
-          批量启用
-        </a-button>
-        <a-button @click="handleToggleCourses(false, selectIds)">
-          批量禁用
-        </a-button>
-      </div>
+    <div
+      v-if="store.isGreaterThanEqualRootOrgAdmin"
+      class="tw-flex tw-gap-2 tw-my-4"
+    >
+      <a-button type="primary" @click="newCourse">新增</a-button>
+      <a-button @click="importModalVisible = true">批量导入</a-button>
+      <a-button @click="handleExport">批量导出</a-button>
+      <a-button @click="handleToggleCourses(true, selectIds)">
+        批量启用
+      </a-button>
+      <a-button @click="handleToggleCourses(false, selectIds)">
+        批量禁用
+      </a-button>
     </div>
 
     <div class="tw-bg-white tw-p-5 tw-rounded-xl">
@@ -128,7 +132,9 @@
           <input id="file-input" :multiple="false" type="file" />
         </a-form-item>
         <a-form-item label="下载模板">
-          <a-button @click="downloadTpl">下载模板</a-button>
+          <a-button class="download-tpl-btn" @click="downloadTpl"
+            >下载模板</a-button
+          >
         </a-form-item>
       </a-form>
     </a-modal>

src/features/paperAnalysis/PaperAnalysis.vue

@@ -9,7 +9,7 @@
       <span class="tw-mr-4"></span>
       试卷名称: <a-input disabled :value="paperName" style="width: 100px" />
       <span class="tw-mr-4"></span>
-      <a-button @click="search">查询</a-button>
+      <a-button @click="search" class="query-btn">查询</a-button>
 
       <div class="tw-mt-4">
         <a-button @click="goBack">返回</a-button>

src/features/paperAnalysis/QuestionTypeDifficulty.vue

@@ -22,7 +22,9 @@
           <input id="file-input" :multiple="false" type="file" />
         </a-form-item>
         <a-form-item label="下载模板">
-          <a-button @click="downloadTpl">下载模板</a-button>
+          <a-button class="download-tpl-btn" @click="downloadTpl"
+            >下载模板</a-button
+          >
         </a-form-item>
       </a-form>
     </a-modal>

src/features/projectDataManagement/ProjectDataManagement.vue

@@ -29,7 +29,9 @@
             <input id="file-input" :multiple="false" type="file" />
           </a-form-item>
           <a-form-item label="下载模板">
-            <a-button @click="downloadTpl">下载模板</a-button>
+            <a-button class="download-tpl-btn" @click="downloadTpl"
+              >下载模板</a-button
+            >
           </a-form-item>
           <a-button @click="handleImport">保存</a-button>
         </a-form>

src/features/projectManagement/ProjectManagement.vue

@@ -1,7 +1,6 @@
 <template>
   <div>
     <div class="tw-bg-white tw-p-5 tw-rounded-xl tw-mb-5">
-      <span class="tw-mr-4"></span>
       <a-input
         v-model:value="name"
         class="tw-mr-4"
@@ -13,10 +12,13 @@
       <span class="tw-mr-4"></span>
       <ProjectStatusSelect v-model:value="projectStatus" />
       <span class="tw-mr-4"></span>
-      <a-button @click="search">查询</a-button>
+      <a-button @click="search" class="query-btn">查询</a-button>
 
-      <div v-if="store.isGreaterThanEqualRootOrgAdmin" class="tw-mt-4">
-        <a-button @click="newProject">新增</a-button>
+      <div
+        v-if="store.isGreaterThanEqualRootOrgAdmin"
+        class="tw-flex tw-gap-2 tw-mt-4"
+      >
+        <a-button type="primary" @click="newProject">新增</a-button>
         <a-button @click="handleDeleteProjects(selectIds)"> 批量删除 </a-button>
       </div>
     </div>
@@ -104,7 +106,7 @@
       ok-text="确定"
       cancel-text="取消"
     >
-      <a-form>
+      <a-form :labelCol="{ span: 4 }">
         <a-form-item v-show="projectObj.id" label="项目id">
           <a-input
             :disabled="!!projectObj.id"
@@ -131,7 +133,7 @@ import {
 import router from "@/router";
 import { useMainStore } from "@/store";
 import { goBack } from "@/utils/utils";
-import { message } from "ant-design-vue";
+import { message, Modal } from "ant-design-vue";
 import { watch, onMounted, ref, reactive, toRaw } from "vue-demi";
 
 const store = useMainStore();
@@ -249,8 +251,17 @@ function checkEmpty(selectIds: number[]): boolean {
 }
 async function handleDeleteProjects(ids: number[]) {
   if (checkEmpty(ids)) return;
-  await deleteProjects(ids);
-  await search();
+  Modal.confirm({
+    title: "提示",
+    content: "确认删除？",
+    cancelText: "取消",
+    okText: "确定",
+    onOk: async () => {
+      await deleteProjects(ids);
+      await search();
+      message.success({ content: "操作成功" });
+    },
+  });
 }
 
 let selectIds = $ref<number[]>([]);
@@ -262,13 +273,31 @@ const rowSelection = {
 };
 
 async function handleCancelProject(id: number) {
-  await cancelProject(id);
-  message.success({ content: "操作成功" });
+  Modal.confirm({
+    title: "提示",
+    content: "确认取消计算？",
+    cancelText: "取消",
+    okText: "确定",
+    onOk: async () => {
+      await cancelProject(id);
+      await search();
+      message.success({ content: "操作成功" });
+    },
+  });
 }
 
 async function handleRestartProject(id: number) {
-  await restartProject(id);
-  message.success({ content: "操作成功" });
+  Modal.confirm({
+    title: "提示",
+    content: "确认重新计算？",
+    cancelText: "取消",
+    okText: "确定",
+    onOk: async () => {
+      await restartProject(id);
+      await search();
+      message.success({ content: "操作成功" });
+    },
+  });
 }
 
 async function handleLogsOfProject(id: number) {

src/features/projectPapersManagement/ProjectPapersManagement.vue

@@ -8,7 +8,7 @@
       <PaperTypeSelect v-model:value="paperType" />
       <span class="tw-mr-4"></span>
       <span class="tw-mr-4"></span>
-      <a-button @click="search">查询</a-button>
+      <a-button @click="search" class="query-btn">查询</a-button>
 
       <div class="tw-mt-4">
         <a-button @click="goAllAnalysis">整体分析</a-button>

src/features/projectParamsManagement/ProjectParamsManagement.vue

@@ -5,7 +5,7 @@
       <CourseSelect :root-org-id="rootOrgId" v-model:value="courseId" />
       <span class="tw-mr-4"></span>
       <span class="tw-mr-4"></span>
-      <a-button @click="search">查询</a-button>
+      <a-button @click="search" class="query-btn">查询</a-button>
 
       <div class="tw-mt-4">
         <a-button @click="importModalVisible = true">批量导入</a-button>
@@ -92,7 +92,9 @@
           <input id="file-input" :multiple="false" type="file" />
         </a-form-item>
         <a-form-item label="下载模板">
-          <a-button @click="downloadTpl">下载模板</a-button>
+          <a-button class="download-tpl-btn" @click="downloadTpl"
+            >下载模板</a-button
+          >
         </a-form-item>
       </a-form>
     </a-modal>

src/features/roleManagement/RoleManagement.vue

@@ -6,7 +6,7 @@
     >
       <RootOrgSelect v-model:value="rootOrgId" />
       <span class="tw-mr-4"></span>
-      <a-button @click="search">查询</a-button>
+      <a-button @click="search" class="query-btn">查询</a-button>
     </div>
 
     <div class="tw-bg-white tw-p-5 tw-rounded-xl">

src/features/rootOrg/RootOrg.vue

@@ -18,7 +18,7 @@
       <span class="tw-mr-4"></span>
       <StateSelect v-model:value="enable" />
       <span class="tw-mr-4"></span>
-      <a-button class="query-btn" @click="search">查询</a-button>
+      <a-button @click="search" class="query-btn">查询</a-button>
 
       <a-button @click="handleRootOrgSync" style="float: right">同步</a-button>
     </div>
@@ -59,7 +59,7 @@
       ok-text="确定"
       cancel-text="取消"
     >
-      <a-form>
+      <a-form :labelCol="{ span: 5 }">
         <a-form-item label="顶级机构代码">
           <a-input disabled v-model:value="rootOrgObj.code"></a-input>
         </a-form-item>

src/features/rootOrg/RootOrgEdit.vue

@@ -1,14 +1,22 @@
 <template>
   <div>
-    <div>
-      <div>报表默认说明</div>
-      <a-button @click="handleOrgPorps">确定</a-button>
-      <a-button @click="goBack">取消</a-button>
+    <div
+      class="
+        tw-flex tw-justify-between tw-bg-white tw-p-5 tw-rounded-xl tw-mb-5
+      "
+    >
+      <div style="color: #212534; font-size: 16px">报表默认说明</div>
+      <div>
+        <a-button @click="handleOrgPorps">确定</a-button>
+        <a-button @click="goBack">取消</a-button>
+      </div>
     </div>
 
-    <div>
+    <div class="tw-bg-white tw-p-5 tw-rounded-xl">
       <div v-for="(item, index) in Object.keys(orgPorps).sort()" :key="index">
-        <div>{{ codeToName(item) }}</div>
+        <div style="color: #3d404e; margin: 30px 0 10px 0">
+          {{ codeToName(item) }}
+        </div>
         <a-textarea
           :auto-size="{ minRows: 3, maxRows: 5 }"
           v-model:value="orgPorps[item]"

src/features/subOrg/SubOrg.vue

@@ -22,16 +22,16 @@
       <span class="tw-mr-4"></span>
       <StateSelect v-model:value="enable" />
       <span class="tw-mr-4"></span>
-      <a-button @click="search">查询</a-button>
+      <a-button @click="search" class="query-btn">查询</a-button>
+    </div>
 
-      <div class="tw-mt-4">
-        <a-button @click="newOrg">新增</a-button>
-        <a-button @click="importModalVisible = true">批量导入</a-button>
-        <a-button @click="handleExport">批量导出</a-button>
-        <a-button @click="handleToggleOrg(true, selectIds)">批量启用</a-button>
-        <a-button @click="handleToggleOrg(false, selectIds)">批量禁用</a-button>
-        <a-button @click="handleDelOrg(selectIds)">批量删除</a-button>
-      </div>
+    <div class="tw-flex tw-gap-2 tw-my-4">
+      <a-button type="primary" @click="newOrg">新增</a-button>
+      <a-button @click="importModalVisible = true">批量导入</a-button>
+      <a-button @click="handleExport">批量导出</a-button>
+      <a-button @click="handleToggleOrg(true, selectIds)">批量启用</a-button>
+      <a-button @click="handleToggleOrg(false, selectIds)">批量禁用</a-button>
+      <a-button @click="handleDelOrg(selectIds)">批量删除</a-button>
     </div>
 
     <div class="tw-bg-white tw-p-5 tw-rounded-xl">
@@ -73,7 +73,7 @@
       ok-text="确定"
       cancel-text="取消"
     >
-      <a-form>
+      <a-form :labelCol="{ span: 4 }">
         <a-form-item v-show="store.isSuperAdmin" label="顶级机构">
           <RootOrgSelect
             :disabled="!!orgObj.id"
@@ -117,7 +117,9 @@
           <input id="file-input" :multiple="false" type="file" />
         </a-form-item>
         <a-form-item label="下载模板">
-          <a-button @click="downloadTpl">下载模板</a-button>
+          <a-button class="download-tpl-btn" @click="downloadTpl"
+            >下载模板</a-button
+          >
         </a-form-item>
       </a-form>
     </a-modal>

src/features/userManagement/UserManagement.vue

@@ -21,22 +21,23 @@
       ></a-input>
       <span class="tw-mr-4"></span>
       <RoleSelect v-model:value="roleId" :root-org-id="rootOrgId" />
+      <span class="tw-mr-4"></span>
       <StateSelect v-model:value="enable" />
       <span class="tw-mr-4"></span>
-      <a-button @click="search">查询</a-button>
+      <a-button @click="search" class="query-btn">查询</a-button>
+    </div>
 
-      <div class="tw-mt-4">
-        <a-button @click="newUser">新增</a-button>
-        <a-button @click="importModalVisible = true">批量导入</a-button>
-        <a-button @click="handleExport">批量导出</a-button>
-        <a-button @click="handleToggleUsers(true, selectIds)">
-          批量启用
-        </a-button>
-        <a-button @click="handleToggleUsers(false, selectIds)">
-          批量禁用
-        </a-button>
-        <a-button @click="handleResetUsers(selectIds)">批量重置密码</a-button>
-      </div>
+    <div class="tw-flex tw-gap-2 tw-my-4">
+      <a-button type="primary" @click="newUser">新增</a-button>
+      <a-button @click="importModalVisible = true">批量导入</a-button>
+      <a-button @click="handleExport">批量导出</a-button>
+      <a-button @click="handleToggleUsers(true, selectIds)">
+        批量启用
+      </a-button>
+      <a-button @click="handleToggleUsers(false, selectIds)">
+        批量禁用
+      </a-button>
+      <a-button @click="handleResetUsers(selectIds)">批量重置密码</a-button>
     </div>
 
     <div class="tw-bg-white tw-p-5 tw-rounded-xl">
@@ -142,7 +143,9 @@
           <input id="file-input" :multiple="false" type="file" />
         </a-form-item>
         <a-form-item label="下载模板">
-          <a-button @click="downloadTpl">下载模板</a-button>
+          <a-button class="download-tpl-btn" @click="downloadTpl"
+            >下载模板</a-button
+          >
         </a-form-item>
       </a-form>
     </a-modal>

src/features/userManagement/UserPrivilegeCourse.vue

@@ -46,7 +46,7 @@
           </a-radio-group>
         </a-form-item> -->
 
-        <a-button @click="fetchData2">查询</a-button>
+        <a-button @click="fetchData2" class="query-btn">查询</a-button>
       </a-form>
       <div class="tw-bg-white tw-p-5 tw-rounded-xl">
         <a-table

src/features/userManagement/UserPrivilegeOrg.vue

@@ -46,7 +46,7 @@
           </a-radio-group>
         </a-form-item> -->
 
-        <a-button @click="fetchData2">查询</a-button>
+        <a-button @click="fetchData2" class="query-btn">查询</a-button>
       </a-form>
       <div class="tw-bg-white tw-p-5 tw-rounded-xl">
         <a-table

src/styles/global.css

@@ -66,3 +66,8 @@ button.ant-btn.query-btn {
   background-color: #fe8398;
   color: white;
 }
+
+button.ant-btn.download-tpl-btn {
+  background-color: #fe8398;
+  color: white;
+}