bug fix

src/api/rootOrgPage.ts

@@ -1,7 +1,7 @@
 import { httpApp } from "@/plugins/axiosApp";
 import { RootOrg, ServerPageResponse } from "@/types";
 
-/** 顶级机构分页查询 */
+/** 学校分页查询 */
 export function getRootOrgList(params: {
   code?: string;
   name?: string;
@@ -15,7 +15,7 @@ export function getRootOrgList(params: {
   );
 }
 
-/** 更新顶级机构 */
+/** 更新学校 */
 export function updateRootOrg(params: {
   // code: string;
   // name: string;
@@ -25,7 +25,7 @@ export function updateRootOrg(params: {
   return httpApp.post("/api/ess/root/org/update", params);
 }
 
-/** 查询顶级机构所有属性 */
+/** 查询学校所有属性 */
 export function getRootOrgSettings(orgId: number) {
   return httpApp.post(`/api/ess/root/org/property/all/${orgId}`);
 }
@@ -40,7 +40,7 @@ export function saveOrgSetting(orgId: number, properties: any) {
   return httpApp.post(`/api/ess/root/org/property/save`, { orgId, properties });
 }
 
-/** 同步顶级机构 */
+/** 同步学校 */
 export function syncRootOrg() {
   return httpApp.post(`/api/ess/root/org/sync`);
 }

src/features/allAnalysis/AllAnalysis2.vue

@@ -155,8 +155,8 @@ const columns = [
     dataIndex: "paperType",
   },
   {
-    title: "科目代码",
-    dataIndex: "courseCode",
+    title: "起始计算分",
+    dataIndex: "startScore",
   },
   {
     title: "样本数",
@@ -235,15 +235,17 @@ async function tableChange(
   filters: FilterType[],
   sorter: SorterType
 ) {
-  // console.log(sorter);
-  if (sorter.order) {
-    sortColName = sorter.field;
-    sortOrder = sorter.order.slice(0, -3).toUpperCase();
-  } else {
-    sortColName = "";
-    sortOrder = "";
+  if (sorter.field) {
+    if (sorter.order) {
+      sortColName = sorter.field;
+      sortOrder = sorter.order.slice(0, -3).toUpperCase();
+    } else {
+      sortColName = "";
+      sortOrder = "";
+    }
+    await search();
+    return;
   }
-  await search();
 }
 // async function goProjectPapers(id: number) {
 //   await router.push("/project/papers/" + id);

src/features/courseManagement/CourseManagement.vue

@@ -104,7 +104,7 @@
       @ok="handleOk"
     >
       <a-form :labelCol="{ span: 4 }">
-        <a-form-item v-show="store.isSuperAdmin" label="顶级机构">
+        <a-form-item v-show="store.isSuperAdmin" label="学校">
           <RootOrgSelect
             v-model:value="courseObj.rootOrgId"
             :disabled="!!courseObj.id"
@@ -139,7 +139,7 @@
       @ok="handleImport"
     >
       <a-form>
-        <a-form-item label="顶级机构">
+        <a-form-item label="学校">
           <RootOrgSelect
             v-show="store.isSuperAdmin"
             v-model:value="courseObj.rootOrgId"
@@ -216,7 +216,7 @@ async function fetchData() {
 
 const columns = [
   {
-    title: "顶级机构",
+    title: "学校",
     dataIndex: "rootOrgName",
     width: 200,
     slots: { customRender: "rootOrgName" },

src/features/roleManagement/RoleManagement.vue

@@ -36,7 +36,7 @@ let pageNo = $ref(1);
 
 async function search() {
   if (typeof rootOrgId !== "number") {
-    void message.warn("请先选择顶级机构。");
+    void message.warn("请先选择学校。");
     return;
   }
   await fetchData();

src/features/rootOrg/RootOrg.vue

@@ -4,7 +4,7 @@
       <a-input
         v-model:value="code"
         style="width: 178px"
-        placeholder="顶级机构代码"
+        placeholder="学校代码"
         allowClear
       ></a-input>
       <span class="tw-mr-4"></span>
@@ -12,7 +12,7 @@
         v-model:value="name"
         class="tw-mr-4"
         style="width: 178px"
-        placeholder="顶级机构名称"
+        placeholder="学校名称"
         allowClear
       ></a-input>
       <span class="tw-mr-4"></span>
@@ -54,16 +54,16 @@
     </div>
     <a-modal
       v-model:visible="visible"
-      title="顶级机构信息页"
+      title="学校信息页"
       okText="确定"
       cancelText="取消"
       @ok="handleOk"
     >
       <a-form :labelCol="{ span: 5 }">
-        <a-form-item label="顶级机构代码">
+        <a-form-item label="学校代码">
           <a-input v-model:value="rootOrgObj.code" disabled></a-input>
         </a-form-item>
-        <a-form-item label="顶级机构名称">
+        <a-form-item label="学校名称">
           <a-input v-model:value="rootOrgObj.name" disabled></a-input>
         </a-form-item>
         <a-form-item label="状态">
@@ -72,7 +72,7 @@
             <a-radio :value="false">禁用</a-radio>
           </a-radio-group>
         </a-form-item>
-        <a-form-item label="顶级机构域名">
+        <a-form-item label="学校域名">
           <a-input v-model:value="rootOrgObj.domainName"></a-input>
         </a-form-item>
       </a-form>
@@ -116,12 +116,12 @@ async function clickSearch() {
 
 const columns = [
   {
-    title: "顶级机构代码",
+    title: "学校代码",
     dataIndex: "code",
     width: 150,
   },
   {
-    title: "顶级机构名称",
+    title: "学校名称",
     dataIndex: "name",
     width: 150,
   },
@@ -131,7 +131,7 @@ const columns = [
     slots: { customRender: "enable" },
   },
   {
-    title: "顶级机构域名",
+    title: "学校域名",
     dataIndex: "domainName",
   },
   {

src/features/subOrg/SubOrg.vue

@@ -79,7 +79,7 @@
       @ok="handleOk"
     >
       <a-form :labelCol="{ span: 4 }">
-        <a-form-item v-show="store.isSuperAdmin" label="顶级机构">
+        <a-form-item v-show="store.isSuperAdmin" label="学校">
           <RootOrgSelect
             v-model:value="orgObj.rootOrgId"
             :disabled="!!orgObj.id"
@@ -111,7 +111,7 @@
       @ok="handleImport"
     >
       <a-form>
-        <a-form-item label="顶级机构">
+        <a-form-item label="学校">
           <RootOrgSelect
             v-show="store.isSuperAdmin"
             v-model:value="orgObj.rootOrgId"
@@ -183,7 +183,7 @@ async function fetchData() {
 
 const columns = [
   {
-    title: "顶级机构名称",
+    title: "学校名称",
     dataIndex: "rootOrgName",
     width: 150,
   },

src/features/userManagement/UserManagement.vue

@@ -115,7 +115,7 @@
       @ok="handleOk"
     >
       <a-form :labelCol="{ span: 4 }">
-        <a-form-item v-show="store.isSuperAdmin" label="顶级机构">
+        <a-form-item v-show="store.isSuperAdmin" label="学校">
           <RootOrgSelect
             v-model:value="userObj.rootOrgId"
             :disabled="!!userObj.id"
@@ -165,7 +165,7 @@
       @ok="handleImport"
     >
       <a-form>
-        <a-form-item v-show="store.isSuperAdmin" label="顶级机构">
+        <a-form-item v-show="store.isSuperAdmin" label="学校">
           <RootOrgSelect
             v-show="store.isSuperAdmin"
             v-model:value="userObj.rootOrgId"
@@ -245,7 +245,7 @@ async function fetchData() {
 
 const columns = [
   {
-    title: "顶级机构",
+    title: "学校",
     dataIndex: "rootOrgName",
     width: 200,
     slots: { customRender: "rootOrgName" },
@@ -328,7 +328,7 @@ const initUser = <User>(<unknown>{
   password: "",
   enable: true,
   role: "",
-  rootOrgId: store.userInfo.rootOrgId,
+  rootOrgId: store.isSuperAdmin ? null : store.userInfo.rootOrgId,
 });
 const userObj = reactive({ ...initUser });