From 8510bc124c563702bcc8b6016ecec45160093b7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=82=A5=E7=BE=8A?= <1048382248@qq.com> Date: Wed, 13 Aug 2025 15:23:06 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=20=E4=BF=AE=E5=A4=8D=20hTable=20Edit=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=B6=E5=80=99id=E4=B8=8D=E4=B8=BA0?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/hTable/hTable.ts | 2 +- src/components/hTable/hTableEdit.vue | 10 +-- src/components/hTable/index.vue | 4 +- src/views/admin/role.vue | 109 +++++++++++++++++++++++++++ 4 files changed, 117 insertions(+), 8 deletions(-) create mode 100644 src/views/admin/role.vue diff --git a/src/components/hTable/hTable.ts b/src/components/hTable/hTable.ts index 45fb491..95bf2a1 100644 --- a/src/components/hTable/hTable.ts +++ b/src/components/hTable/hTable.ts @@ -107,7 +107,7 @@ export interface TableColumn { /* 列宽度 */ width?: string; /* 字段类型 */ - type?: string; + type?: "string" | "dropdown" | "switch" | "img" | "datetime" | "textarea"; /** 是否多选 */ multiple?: boolean; /** 编辑时显示列 */ diff --git a/src/components/hTable/hTableEdit.vue b/src/components/hTable/hTableEdit.vue index 8da9a3a..b0cc80a 100644 --- a/src/components/hTable/hTableEdit.vue +++ b/src/components/hTable/hTableEdit.vue @@ -75,10 +75,10 @@ function handleSubmitForm() { } editData.value.loading = true; - let form = {}; + let form: any = {}; if (editData.value.isedit) { form = props.row; - } + } else form.id = 0; for (const key in column.value) { const element = column.value[key]; if (element.valueE !== null && element.valueE !== "") { @@ -154,9 +154,9 @@ function fetchFormData() {
diff --git a/src/views/admin/role.vue b/src/views/admin/role.vue new file mode 100644 index 0000000..fc16386 --- /dev/null +++ b/src/views/admin/role.vue @@ -0,0 +1,109 @@ + + + From 3f354eae5833b2aa676996e86db4f90da67ac10c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=82=A5=E7=BE=8A?= <1048382248@qq.com> Date: Wed, 13 Aug 2025 17:20:06 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E9=83=A8=E5=88=86ht?= =?UTF-8?q?able=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/menu.ts | 7 ++ src/components/hTable/hTable.ts | 5 +- src/components/hTable/hTableEdit.vue | 4 +- src/components/hTable/index.vue | 11 ++- src/utils/auth.ts | 5 +- src/utils/roles.ts | 20 +++++ src/views/admin/index.vue | 15 +++- src/views/admin/role.vue | 13 ++- src/views/class/index.vue | 109 ++++++++++++++++++++++++++ src/views/menu/index.vue | 78 +++++++++++++----- src/views/permission/button/index.vue | 99 ----------------------- src/views/permission/button/perms.vue | 109 -------------------------- src/views/permission/page/index.vue | 66 ---------------- 13 files changed, 236 insertions(+), 305 deletions(-) create mode 100644 src/utils/roles.ts create mode 100644 src/views/class/index.vue delete mode 100644 src/views/permission/button/index.vue delete mode 100644 src/views/permission/button/perms.vue delete mode 100644 src/views/permission/page/index.vue diff --git a/src/api/menu.ts b/src/api/menu.ts index e6db80f..17ba631 100644 --- a/src/api/menu.ts +++ b/src/api/menu.ts @@ -30,3 +30,10 @@ export function MenuAll() { export function Edit(info: MenuItem) { return http.request>("post", `Menu/Edit`, { data: info }); } +/** + * @description 获取所有的菜单 + * @return {object} + */ +export function Del(ids: number[]) { + return http.request>("post", `Menu/Del`, { data: ids }); +} diff --git a/src/components/hTable/hTable.ts b/src/components/hTable/hTable.ts index 95bf2a1..26dcada 100644 --- a/src/components/hTable/hTable.ts +++ b/src/components/hTable/hTable.ts @@ -50,6 +50,8 @@ export interface ButtonCustomConfig { export interface OperationButton { /* 是否为头部按钮 */ topBtn: boolean; + /** 按钮权限码 */ + perms?: string; /* 是否显示 */ show?: boolean; /* 按钮文本 */ @@ -57,7 +59,7 @@ export interface OperationButton { /* 按钮类型 */ btnType: "add" | "edit" | "del" | "custom"; /* 按钮样式 */ - btnStyle?: "success" | "danger"; + btnStyle?: "success" | "info" | "primary" | "danger" | "warning"; /* 自定义按钮配置 */ custom?: ButtonCustomConfig; } @@ -112,6 +114,7 @@ export interface TableColumn { multiple?: boolean; /** 编辑时显示列 */ editShow?: boolean; + /**校验规则 */ rules?: any | Array; /** 显示列 */ show?: boolean; diff --git a/src/components/hTable/hTableEdit.vue b/src/components/hTable/hTableEdit.vue index b0cc80a..3a9bb75 100644 --- a/src/components/hTable/hTableEdit.vue +++ b/src/components/hTable/hTableEdit.vue @@ -116,8 +116,8 @@ function handleResetForm() { function fetchInitData() {} function fetchFormData() { editData.value.loading = false; - handleResetForm(); if (editData.value.isedit) { + handleResetForm(); Api.Info({ id: props.id }).then(res => { if (res.code === 200) { editData.value.frorm = res.data; @@ -192,7 +192,7 @@ function fetchFormData() {
) { permissions }); } - - if (data.userName && data.roles) { + if (data.userName && data.permissions) { const { userName, roles } = data; setUserKey({ avatar: data?.avatar ?? "", @@ -129,7 +128,7 @@ export const formatToken = (token: string): string => { /** 是否有按钮级别的权限（根据登录接口返回的`permissions`字段进行判断）*/ export const hasPerms = (value: string | Array): boolean => { - if (!value) return false; + if (!value) return true; const allPerms = "*:*:*"; const { permissions } = useUserStoreHook(); if (!permissions) return false; diff --git a/src/utils/roles.ts b/src/utils/roles.ts new file mode 100644 index 0000000..6f7566d --- /dev/null +++ b/src/utils/roles.ts @@ -0,0 +1,20 @@ +export const ruleRequired = [ + { required: true, message: "不能为空", trigger: "blur" } +]; +export const rulePassword = [ + { required: true, message: "不能为空", trigger: "blur" }, + { min: 6, message: "长度必须大于5", trigger: "blur" } +]; +export const ruleAccount = [ + { required: true, message: "不能为空", trigger: "blur" }, + { min: 13, message: "长度必须大于12", trigger: "blur" } +]; + +export const rulePhone = [ + { required: true, message: "手机号不能为空", trigger: "blur" }, + { + pattern: /^1[3-9]\d{9}$/, + message: "请输入正确的手机号", + trigger: "blur" + } +]; diff --git a/src/views/admin/index.vue b/src/views/admin/index.vue index db4fa4f..0f1c91e 100644 --- a/src/views/admin/index.vue +++ b/src/views/admin/index.vue @@ -4,6 +4,12 @@ import { TableConfig } from "@/components/hTable/hTable"; import { onMounted, ref } from "vue"; import { fa } from "element-plus/es/locales.mjs"; import { hTableAPI } from "@/api/hTable"; +import { + ruleAccount, + rulePassword, + rulePhone, + ruleRequired +} from "@/utils/roles"; const ControllerName = "Admin"; defineOptions({ @@ -71,6 +77,7 @@ const tableData: TableConfig = { name: { label: "名称", width: "180px", + rules: ruleRequired, search: true, searchType: "Like", add: true, // 字段允许添加 @@ -78,6 +85,7 @@ const tableData: TableConfig = { }, Phone: { label: "手机号", + rules: rulePhone, width: "200px", search: true, add: true, // 字段允许添加 @@ -85,6 +93,7 @@ const tableData: TableConfig = { }, account: { label: "账号", + rules: ruleAccount, search: true, add: true, // 字段允许添加 edit: false // 字段允许修改 @@ -92,6 +101,8 @@ const tableData: TableConfig = { password: { label: "密码", show: false, + /**长度必须大于6 */ + rules: rulePassword, search: false, add: true, // 字段允许添加 edit: false // 字段允许修改 @@ -100,13 +111,15 @@ const tableData: TableConfig = { label: "启用", type: "switch", search: false, - add: false, // 字段允许添加 + + add: true, // 字段允许添加 edit: true, // 字段允许修改 valueE: true // 编辑时的默认值 }, roleId: { label: "角色", type: "dropdown", + rules: ruleRequired, search: true, add: true, // 字段允许添加 edit: false, // 字段允许修改 diff --git a/src/views/admin/role.vue b/src/views/admin/role.vue index fc16386..11e281e 100644 --- a/src/views/admin/role.vue +++ b/src/views/admin/role.vue @@ -11,7 +11,6 @@ defineOptions({ }); function searchCallback(data) {} -const RoleApi = new hTableAPI("AdminRole"); const table = ref<{ initTable: (config: TableConfig) => void }>(null); const tableData: TableConfig = { apiUrl: ControllerName, @@ -29,6 +28,14 @@ const tableData: TableConfig = { }, operationColumn: true, // 显示操作按钮 operationColumnData: [ + { + topBtn: false, // 头部按钮 + show: true, + label: "角色授权", + perms: "角色授权", //按钮显示需要的权限码 + btnType: "custom", // 按钮类型 add edit del 不设置则 自定义按钮 + btnStyle: "success" // topBtn: true才生效 success danger + }, { // 操作按钮 topBtn: false, // 是头部按钮 @@ -71,7 +78,7 @@ const tableData: TableConfig = { label: "启用", type: "switch", search: false, - add: false, // 字段允许添加 + add: true, // 字段允许添加 edit: true, // 字段允许修改 valueE: true // 编辑时的默认值 }, @@ -84,6 +91,8 @@ const tableData: TableConfig = { }, remark: { label: "备注", + type: "textarea", + editRows: 3, search: false, add: true, // 字段允许添加 edit: true // 字段允许修改 diff --git a/src/views/class/index.vue b/src/views/class/index.vue new file mode 100644 index 0000000..2aab196 --- /dev/null +++ b/src/views/class/index.vue @@ -0,0 +1,109 @@ + + + diff --git a/src/views/menu/index.vue b/src/views/menu/index.vue index 91a83c7..6f09a21 100644 --- a/src/views/menu/index.vue +++ b/src/views/menu/index.vue @@ -17,26 +17,47 @@ class="menu-tree" > @@ -57,7 +78,7 @@ - - diff --git a/src/views/permission/button/perms.vue b/src/views/permission/button/perms.vue deleted file mode 100644 index 8fce6da..0000000 --- a/src/views/permission/button/perms.vue +++ /dev/null @@ -1,109 +0,0 @@ - - - diff --git a/src/views/permission/page/index.vue b/src/views/permission/page/index.vue deleted file mode 100644 index d65d03f..0000000 --- a/src/views/permission/page/index.vue +++ /dev/null @@ -1,66 +0,0 @@ - - - From dc8eec1b87396232066a50657f504842b600219c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=82=A5=E7=BE=8A?= <1048382248@qq.com> Date: Wed, 13 Aug 2025 17:28:15 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20comboModel=E7=9A=84?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=86=99=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/hTable/hTable.ts | 4 ++-- src/views/school/index.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/hTable/hTable.ts b/src/components/hTable/hTable.ts index 26dcada..8bd020b 100644 --- a/src/components/hTable/hTable.ts +++ b/src/components/hTable/hTable.ts @@ -85,8 +85,8 @@ export interface FieldSetting { ///* 表格列配置 */ //export interface TableEditColumn {} export interface ComboModel { - Value: any; - Text: string; + value: any; + text: string; } /* 表格列配置 */ export interface TableColumn { diff --git a/src/views/school/index.vue b/src/views/school/index.vue index c1d3d24..5c99a23 100644 --- a/src/views/school/index.vue +++ b/src/views/school/index.vue @@ -95,8 +95,8 @@ const tableData: TableConfig = { edit: true, // 字段允许修改 setting: { datasource: [ - { Value: "true", Text: "√" }, - { Value: "false", Text: "X" } + { value: "true", text: "√" }, + { value: "false", text: "X" } ] } } From 14c4e011756082b48e25ff64fcaefe5673496259 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=82=A5=E7=BE=8A?= <1048382248@qq.com> Date: Wed, 13 Aug 2025 17:28:40 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E7=BB=A7=E7=BB=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/hTable/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/hTable/index.vue b/src/components/hTable/index.vue index 91d5532..7057044 100644 --- a/src/components/hTable/index.vue +++ b/src/components/hTable/index.vue @@ -400,7 +400,7 @@ function fetchPagedData() { > Date: Wed, 13 Aug 2025 18:38:11 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=96=B9=E5=BC=8F=20=E6=96=B0=E5=A2=9E=20?= =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/enum.ts | 4 +-- src/components/hTable/hTableEdit.vue | 20 +++++++++--- src/components/hTable/index.vue | 11 +++---- src/views/class/index.vue | 49 ++++++++++++++++++++++++---- 4 files changed, 65 insertions(+), 19 deletions(-) diff --git a/src/api/enum.ts b/src/api/enum.ts index 21e3c72..055735b 100644 --- a/src/api/enum.ts +++ b/src/api/enum.ts @@ -7,7 +7,7 @@ import type { Res } from "@/utils/http/types"; * @return {object} */ export function getenum(type) { - return http.request>("get", `public/enum/${type}`); + return http.request>("get", `Public/enum/${type}`); } /** * @description 获取枚举对象 @@ -15,5 +15,5 @@ export function getenum(type) { * @return {object} */ export function getenumDic(type) { - return http.request>("get", `public/enum/${type}/Dic`); + return http.request>("get", `Public/enum/${type}/Dic`); } diff --git a/src/components/hTable/hTableEdit.vue b/src/components/hTable/hTableEdit.vue index 3a9bb75..cd24367 100644 --- a/src/components/hTable/hTableEdit.vue +++ b/src/components/hTable/hTableEdit.vue @@ -158,7 +158,7 @@ function fetchFormData() { format="YYYY-MM-DD" value-format="YYYY-MM-DD" :placeholder="o.label" - style="width: 100%" + class="elWidth" @change="o.change" />
@@ -169,12 +169,12 @@ function fetchFormData() { clearable filterable :placeholder="o.label" - style="width: 100%" + class="elWidth" @change="o.change" >
@@ -195,11 +196,16 @@ function fetchFormData() { v-model="o.valueE as boolean" active-text="启用" inactive-text="禁用" + class="elWidth" @change="o.change" />
- +
@@ -215,3 +221,9 @@ function fetchFormData() { + diff --git a/src/components/hTable/index.vue b/src/components/hTable/index.vue index 7057044..57b9236 100644 --- a/src/components/hTable/index.vue +++ b/src/components/hTable/index.vue @@ -281,7 +281,7 @@ function handleReloadPaged(reload = true) { data.ConditionalType = "Like"; } data.FieldName = name.charAt(0).toUpperCase() + name.slice(1); - data.FieldValue = table.value.column[name].value; + data.FieldValue = table.value.column[name].value.toString(); if (table.value.column[name].searchType != undefined) { data.ConditionalType = table.value.column[name].searchType || 0; @@ -303,11 +303,10 @@ async function fetchInitData() { const element = table.value.column[key]; if (element.type === "dropdown") { if (!element.setting.datasource) { - // 存在值就不处理 - - let rdata = await eval(element.setting.datasourceStr); - element.setting.datasource = rdata.data; - console.log(key + " " + element.setting.datasourceStr, rdata); + // 不安全取消 存在值就不处理 + // let rdata = await eval(element.setting.datasourceStr); + // element.setting.datasource = rdata.data; + // console.log(key + " " + element.setting.datasourceStr, rdata); } } if ( diff --git a/src/views/class/index.vue b/src/views/class/index.vue index 2aab196..78a25b4 100644 --- a/src/views/class/index.vue +++ b/src/views/class/index.vue @@ -4,12 +4,14 @@ import { TableConfig } from "@/components/hTable/hTable"; import { onMounted, ref } from "vue"; import { fa } from "element-plus/es/locales.mjs"; import { hTableAPI } from "@/api/hTable"; +import { getenum } from "@/api/enum"; const ControllerName = "Class"; defineOptions({ name: ControllerName }); +const SchoolApi = new hTableAPI("School"); function searchCallback(data) {} const table = ref<{ initTable: (config: TableConfig) => void }>(); @@ -59,24 +61,46 @@ const tableData: TableConfig = { edit: false, // 字段允许修改 width: "150px" }, + schoolId: { + label: "学校", + width: "180px", + search: true, + type: "dropdown", + add: true, // 字段允许添加 + edit: true, // 字段允许修改 + setting: {} + }, name: { - label: "角色名称", + label: "名称", width: "180px", search: true, searchType: "Like", add: true, // 字段允许添加 edit: true // 字段允许修改 }, - enable: { - label: "启用", - type: "switch", - search: false, - add: false, // 字段允许添加 + Grade: { + label: "年级", + width: "180px", + type: "dropdown", + custom: row => `${row.grade ?? ""}`, + // `${row.grade ?? ""} ${row.gradeLevel + row.graduationYear}`, + search: true, + setting: {}, + add: true, // 字段允许添加 + edit: false // 字段允许修改 + }, + type: { + label: "类型", + width: "150px", + type: "dropdown", + search: true, + add: true, // 字段允许添加 edit: true, // 字段允许修改 - valueE: true // 编辑时的默认值 + setting: {} }, createTime: { label: "创建时间", + width: "180px", type: "datetime", search: true, add: false, // 字段允许添加 @@ -84,6 +108,8 @@ const tableData: TableConfig = { }, remark: { label: "备注", + type: "textarea", + editRows: 3, search: false, add: true, // 字段允许添加 edit: true // 字段允许修改 @@ -100,6 +126,15 @@ const showTable = ref(false); onMounted(async () => { //初始化数据原 + tableData.column.Grade.setting.datasource = (await getenum("GradeEnum")).data; + + tableData.column.type.setting.datasource = ( + await getenum("ClassTypeEnum") + ).data; + tableData.column.schoolId.setting.datasource = ( + await SchoolApi.querycombo({ TextName: "Name", ValueName: "Id" }) + ).data; + showTable.value = true; }); From f13a4261a1f2df7a57dcda3f6fc9696104eabf01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=82=A5=E7=BE=8A?= <1048382248@qq.com> Date: Thu, 14 Aug 2025 18:20:28 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=8E=88=E6=9D=83=E9=97=AE=E9=A2=98=20=E4=BC=98=E5=8C=96=20?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E8=B0=83=E7=94=A8=E6=95=B0=E6=8D=AE=E4=B8=AD?= =?UTF-8?q?=E5=BF=83API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +- src/api/class.ts | 12 + src/api/hTable.ts | 8 +- src/api/school.ts | 2 +- src/components/hTable/hTableEdit.vue | 2 +- src/utils/http/index.ts | 63 +++++ src/utils/{roles.ts => rules.ts} | 0 src/views/admin/index.vue | 2 +- src/views/class/edit.vue | 347 +++++++++++++++++++++++++++ src/views/class/index.vue | 99 ++++++-- src/views/grade/index.vue | 136 +++++++++++ src/views/menu/index.vue | 2 +- src/views/school/SchoolEdit.vue | 2 - src/views/school/index.vue | 28 +-- 14 files changed, 647 insertions(+), 60 deletions(-) create mode 100644 src/api/class.ts rename src/utils/{roles.ts => rules.ts} (100%) create mode 100644 src/views/class/edit.vue create mode 100644 src/views/grade/index.vue diff --git a/.env.development b/.env.development index 17faa14..d70fc73 100644 --- a/.env.development +++ b/.env.development @@ -6,5 +6,7 @@ VITE_PUBLIC_PATH = / # 开发环境路由历史模式（Hash模式传"hash"、HTML5模式传"h5"、Hash模式带base参数传"hash,base参数"、HTML5模式带base参数传"h5,base参数"） VITE_ROUTER_HISTORY = "hash" - +# 接口地址 VITE_API_BASEURL = "http://localhost:5199/api" +#数据中心后台地址 +VITE_API_USERCENTER_URL = "https://dca.w.23544.com:8843/api/back" diff --git a/src/api/class.ts b/src/api/class.ts new file mode 100644 index 0000000..5589bda --- /dev/null +++ b/src/api/class.ts @@ -0,0 +1,12 @@ +import { http } from "@/utils/http"; +import type { Res } from "@/utils/http/types"; + +/** + * @description 获取所有的菜单 + * @return {object} + */ +export function addClasses(info: any) { + return http.request>("post", `classes/addclass`, { + data: info + }); +} diff --git a/src/api/hTable.ts b/src/api/hTable.ts index 038394e..e097d07 100644 --- a/src/api/hTable.ts +++ b/src/api/hTable.ts @@ -11,13 +11,9 @@ export class hTableAPI { PageList(data = {}) { return http.request>("post", `${this.url}/PageList`, { data }); } - Info(tag = {}) { - const pUrl = `${this.url}/Info`; + Info(tag) { + const pUrl = `${this.url}/${tag}`; let getUrl = pUrl; - for (const key in tag) { - const el = tag[key]; - getUrl += (getUrl === pUrl ? "?" : "&") + key + "=" + el; - } return http.request>("get", getUrl); } edit(data) { diff --git a/src/api/school.ts b/src/api/school.ts index 4891252..1a78add 100644 --- a/src/api/school.ts +++ b/src/api/school.ts @@ -33,5 +33,5 @@ export function getregion(r) { * @return {void} */ export function EditSchool(data: any) { - return http.request>("post", `School/Edit`, { data }); + return http.request>("post", `schools/add`, { data }); } diff --git a/src/components/hTable/hTableEdit.vue b/src/components/hTable/hTableEdit.vue index cd24367..19dce09 100644 --- a/src/components/hTable/hTableEdit.vue +++ b/src/components/hTable/hTableEdit.vue @@ -118,7 +118,7 @@ function fetchFormData() { editData.value.loading = false; if (editData.value.isedit) { handleResetForm(); - Api.Info({ id: props.id }).then(res => { + Api.Info(props.id).then(res => { if (res.code === 200) { editData.value.frorm = res.data; for (const key in column.value) { diff --git a/src/utils/http/index.ts b/src/utils/http/index.ts index bfd306b..49f6eb3 100644 --- a/src/utils/http/index.ts +++ b/src/utils/http/index.ts @@ -13,6 +13,59 @@ import { stringify } from "qs"; import NProgress from "../progress"; import { getToken, formatToken } from "@/utils/auth"; import { useUserStoreHook } from "@/store/modules/user"; +import { string } from "vue-types"; +import router from "@/router"; + +/**请求后端的地址 未配置则访问BaseURL */ +const apiServiceConfig = { + classes: import.meta.env.VITE_API_USERCENTER_URL, + schools: import.meta.env.VITE_API_USERCENTER_URL +}; + +function getAPIUrl(url: string): string { + let token = url.startsWith("/") ? url.split("/")[1] : url.split("/")[0]; + if (apiServiceConfig[token] != null) return apiServiceConfig[token]; + else return import.meta.env.VITE_API_BASEURL; +} + +const snakeToCamel = (str: string): string => { + // 处理蛇形命名（user_id → userId） + let result = str.replace(/_([a-zA-Z0-9])/g, (_, letter) => + letter.toUpperCase() + ); + + // 处理大驼峰命名（UserName → userName） + if (result.length > 0) { + result = result.charAt(0).toLowerCase() + result.slice(1); + } + + // 特殊场景：处理连续下划线（__type → Type） + result = result.replace(/^_+/, ""); + + return result; +}; + +/** + * 递归转换对象/数组的键名为小驼峰格式 + */ +const convertKeysToCamelCase = (data: any): T => { + if (Array.isArray(data)) { + return data.map(item => convertKeysToCamelCase(item)) as unknown as T; + } + + if (data !== null && typeof data === "object") { + return Object.keys(data).reduce((result, key) => { + const camelKey = snakeToCamel(key); + const value = data[key]; + return { + ...result, + [camelKey]: convertKeysToCamelCase(value) + }; + }, {}) as T; + } + + return data as T; +}; // 相关配置请参考：www.axios-js.com/zh-cn/docs/#axios-request-config-1 const defaultConfig: AxiosRequestConfig = { @@ -64,6 +117,9 @@ class PureHttp { async (config: PureHttpRequestConfig): Promise => { // 开启进度条动画 NProgress.start(); + if (config.url.indexOf("http") === -1) { + config.baseURL = getAPIUrl(config.url); + } // 优先判断post/get等方法是否传入回调，否则执行初始化设置等回调 if (typeof config.beforeRequestCallback === "function") { config.beforeRequestCallback(config); @@ -124,6 +180,7 @@ class PureHttp { const $config = response.config; // 关闭进度条动画 NProgress.done(); + response.data = convertKeysToCamelCase(response.data); // 优先判断post/get等方法是否传入回调，否则执行初始化设置等回调 if (typeof $config.beforeResponseCallback === "function") { $config.beforeResponseCallback(response); @@ -140,6 +197,12 @@ class PureHttp { $error.isCancelRequest = Axios.isCancel($error); // 关闭进度条动画 NProgress.done(); + if (error.response?.status === 403) { + // 跳转到403页面 + router.push({ + path: "/error/403" + }); + } // 所有的响应异常 区分来源为取消请求/非取消请求 return Promise.reject($error); } diff --git a/src/utils/roles.ts b/src/utils/rules.ts similarity index 100% rename from src/utils/roles.ts rename to src/utils/rules.ts diff --git a/src/views/admin/index.vue b/src/views/admin/index.vue index 0f1c91e..6a2a671 100644 --- a/src/views/admin/index.vue +++ b/src/views/admin/index.vue @@ -9,7 +9,7 @@ import { rulePassword, rulePhone, ruleRequired -} from "@/utils/roles"; +} from "@/utils/rules"; const ControllerName = "Admin"; defineOptions({ diff --git a/src/views/class/edit.vue b/src/views/class/edit.vue new file mode 100644 index 0000000..a3fea06 --- /dev/null +++ b/src/views/class/edit.vue @@ -0,0 +1,347 @@ + + + + + diff --git a/src/views/class/index.vue b/src/views/class/index.vue index 78a25b4..8314e3c 100644 --- a/src/views/class/index.vue +++ b/src/views/class/index.vue @@ -5,13 +5,14 @@ import { onMounted, ref } from "vue"; import { fa } from "element-plus/es/locales.mjs"; import { hTableAPI } from "@/api/hTable"; import { getenum } from "@/api/enum"; -const ControllerName = "Class"; +import { ruleRequired } from "@/utils/rules"; +const ControllerName = "classes"; defineOptions({ name: ControllerName }); -const SchoolApi = new hTableAPI("School"); +const SchoolApi = new hTableAPI("schools"); function searchCallback(data) {} const table = ref<{ initTable: (config: TableConfig) => void }>(); @@ -38,11 +39,17 @@ const tableData: TableConfig = { btnType: "edit" // 按钮类型 add edit del custom }, { - // 操作按钮 - topBtn: true, // 是头部按钮 - label: "添加", - btnStyle: "success", - btnType: "add" // 按钮类型 add edit del custom + topBtn: true, // 头部按钮 + label: "新增", + btnType: "custom", // 按钮类型 add edit del custom + btnStyle: "success", // topBtn: true才生效 success danger + custom: { + // 按钮类型 custom 专用 + title: "新增班级", // 弹出框title + src: "class/edit", // 组件路径 + width: "550px", // 弹框宽度 + height: "520px" // 弹框高度 + } }, { topBtn: false, // 头部按钮 @@ -63,6 +70,7 @@ const tableData: TableConfig = { }, schoolId: { label: "学校", + rules: ruleRequired, width: "180px", search: true, type: "dropdown", @@ -72,6 +80,7 @@ const tableData: TableConfig = { }, name: { label: "名称", + rules: ruleRequired, width: "180px", search: true, searchType: "Like", @@ -80,6 +89,7 @@ const tableData: TableConfig = { }, Grade: { label: "年级", + rules: ruleRequired, width: "180px", type: "dropdown", custom: row => `${row.grade ?? ""}`, @@ -89,31 +99,56 @@ const tableData: TableConfig = { add: true, // 字段允许添加 edit: false // 字段允许修改 }, + GradeLevel: { + label: "年级", + search: false, + type: "dropdown", + searchType: "Like", // Equal等于/NoEqual不等于/Like包含/GreaterThan大于/LessThan小于/NoLike不包括 + add: true, // 字段允许添加 + edit: true, // 字段允许修改 + width: "70px", + setting: { + datasource: [ + { text: "初", value: "初" }, + { text: "高", value: "高" }, + { text: "小", value: "小" } + ] + } + }, + GraduationYear: { + label: "届", + search: false, + searchType: "Like", // Equal等于/NoEqual不等于/Like包含/GreaterThan大于/LessThan小于/NoLike不包括 + add: true, // 字段允许添加 + edit: true, // 字段允许修改 + width: "80px" + }, type: { label: "类型", - width: "150px", + rules: ruleRequired, + // width: "150px", type: "dropdown", search: true, add: true, // 字段允许添加 edit: true, // 字段允许修改 setting: {} - }, - createTime: { - label: "创建时间", - width: "180px", - type: "datetime", - search: true, - add: false, // 字段允许添加 - edit: false // 字段允许修改 - }, - remark: { - label: "备注", - type: "textarea", - editRows: 3, - search: false, - add: true, // 字段允许添加 - edit: true // 字段允许修改 } + // createTime: { + // label: "创建时间", + // width: "180px", + // type: "datetime", + // search: true, + // add: false, // 字段允许添加 + // edit: false // 字段允许修改 + // }, + // remark: { + // label: "备注", + // type: "textarea", + // editRows: 3, + // search: false, + // add: true, // 字段允许添加 + // edit: true // 字段允许修改 + // } }, data: [], pageData: { @@ -126,8 +161,20 @@ const showTable = ref(false); onMounted(async () => { //初始化数据原 - tableData.column.Grade.setting.datasource = (await getenum("GradeEnum")).data; - + tableData.column.Grade.setting.datasource = [ + { text: "初一", value: "初一" }, + { text: "初二", value: "初二" }, + { text: "初三", value: "初三" }, + { text: "高一", value: "高一" }, + { text: "高二", value: "高二" }, + { text: "高三", value: "高三" }, + { text: "一年级", value: "一年级" }, + { text: "二年级", value: "二年级" }, + { text: "三年级", value: "三年级" }, + { text: "四年级", value: "四年级" }, + { text: "五年级", value: "五年级" }, + { text: "六年级", value: "六年级" } + ]; tableData.column.type.setting.datasource = ( await getenum("ClassTypeEnum") ).data; diff --git a/src/views/grade/index.vue b/src/views/grade/index.vue new file mode 100644 index 0000000..7478824 --- /dev/null +++ b/src/views/grade/index.vue @@ -0,0 +1,136 @@ + + + diff --git a/src/views/menu/index.vue b/src/views/menu/index.vue index 6f09a21..265f1c6 100644 --- a/src/views/menu/index.vue +++ b/src/views/menu/index.vue @@ -42,7 +42,7 @@ -
+
菜单按钮权限: diff --git a/src/views/school/SchoolEdit.vue b/src/views/school/SchoolEdit.vue index a37f44d..3b4911e 100644 --- a/src/views/school/SchoolEdit.vue +++ b/src/views/school/SchoolEdit.vue @@ -90,8 +90,6 @@
- 创建学校会生成一个默认管理员账号 -

diff --git a/src/views/school/index.vue b/src/views/school/index.vue index 5c99a23..d627fe3 100644 --- a/src/views/school/index.vue +++ b/src/views/school/index.vue @@ -8,19 +8,10 @@ defineOptions({ }); onMounted(() => {}); -function searchCallback(data) { - let c = data.Conditions.find(s => s.FieldName === "Enable"); - if (c) { - if (c.FieldValue == "true") { - c.FieldValue = 1; - } else { - c.FieldValue = 0; - } - } -} +function searchCallback(data) {} const table = ref<{ initTable: (config: TableConfig) => void }>(null); const tableData: TableConfig = { - apiUrl: "School", + apiUrl: "schools", selectColumn: false, // 列表选择 border: false, // 是否显示表格边框 searchCallback: searchCallback, @@ -84,21 +75,16 @@ const tableData: TableConfig = { width: "300px", search: true, custom: row => `${row.pname}-${row.cname}-${row.rname}`, - add: true, // 字段允许添加 - edit: true // 字段允许修改 + add: false, // 字段允许添加 + edit: false // 字段允许修改 }, enable: { label: "启用", - type: "dropdown", + type: "switch", search: true, + custom: row => (row.enable ? "启用" : "禁用"), add: true, // 字段允许添加 - edit: true, // 字段允许修改 - setting: { - datasource: [ - { value: "true", text: "√" }, - { value: "false", text: "X" } - ] - } + edit: true // 字段允许修改 } }, data: [], From e99c37aa0c2f409a3ea11c7327ec9ef50e213b67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=82=A5=E7=BE=8A?= <1048382248@qq.com> Date: Fri, 15 Aug 2025 19:47:01 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E6=95=99=E5=B8=88?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- .env.production | 8 +- src/api/class.ts | 12 - src/api/school.ts | 7 - src/api/userCenter.ts | 182 ++++++ src/components/hTable/index.vue | 9 +- src/router/index.ts | 6 +- src/router/modules/home.ts | 9 - src/utils/http/index.ts | 15 +- src/utils/http/types.d.ts | 8 + src/views/class/edit.vue | 4 +- src/views/class/index.vue | 4 +- src/views/grade/index.vue | 2 +- src/views/school/SchoolEdit.vue | 3 +- src/views/school/index.vue | 2 +- src/views/teacher/edit.vue | 555 +++++++++++++++++++ src/views/teacher/editUser.vue | 555 +++++++++++++++++++ src/views/teacher/index.vue | 859 +++++++++++++++++++++++++++++ src/views/teacher/positionForm.vue | 522 ++++++++++++++++++ 19 files changed, 2719 insertions(+), 45 deletions(-) delete mode 100644 src/api/class.ts create mode 100644 src/api/userCenter.ts create mode 100644 src/views/teacher/edit.vue create mode 100644 src/views/teacher/editUser.vue create mode 100644 src/views/teacher/index.vue create mode 100644 src/views/teacher/positionForm.vue diff --git a/.env.development b/.env.development index d70fc73..93c993a 100644 --- a/.env.development +++ b/.env.development @@ -9,4 +9,4 @@ VITE_ROUTER_HISTORY = "hash" # 接口地址 VITE_API_BASEURL = "http://localhost:5199/api" #数据中心后台地址 -VITE_API_USERCENTER_URL = "https://dca.w.23544.com:8843/api/back" +VITE_API_USERCENTER_URL = "https://dca.w.23544.com:8843/api/" diff --git a/.env.production b/.env.production index 84e6086..ca7f985 100644 --- a/.env.production +++ b/.env.production @@ -10,4 +10,10 @@ VITE_CDN = false # 是否启用gzip压缩或brotli压缩（分两种情况，删除原始文件和不删除原始文件） # 压缩时不删除原始文件的配置：gzip、brotli、both（同时开启 gzip 与 brotli 压缩）、none（不开启压缩，默认） # 压缩时删除原始文件的配置：gzip-clear、brotli-clear、both-clear（同时开启 gzip 与 brotli 压缩）、none（不开启压缩，默认） -VITE_COMPRESSION = "none" \ No newline at end of file +VITE_COMPRESSION = "none" + + +# 接口地址 +VITE_API_BASEURL = "http://localhost:5199/api" +#数据中心后台地址 +VITE_API_USERCENTER_URL = "https://dcb.23544.com/api" \ No newline at end of file diff --git a/src/api/class.ts b/src/api/class.ts deleted file mode 100644 index 5589bda..0000000 --- a/src/api/class.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { http } from "@/utils/http"; -import type { Res } from "@/utils/http/types"; - -/** - * @description 获取所有的菜单 - * @return {object} - */ -export function addClasses(info: any) { - return http.request>("post", `classes/addclass`, { - data: info - }); -} diff --git a/src/api/school.ts b/src/api/school.ts index 1a78add..8f8e2b6 100644 --- a/src/api/school.ts +++ b/src/api/school.ts @@ -28,10 +28,3 @@ export function getregion(r) { return http.request>("get", `address/${r}/region`); } -/** - * @description 编辑学校 - * @return {void} - */ -export function EditSchool(data: any) { - return http.request>("post", `schools/add`, { data }); -} diff --git a/src/api/userCenter.ts b/src/api/userCenter.ts new file mode 100644 index 0000000..3a454ef --- /dev/null +++ b/src/api/userCenter.ts @@ -0,0 +1,182 @@ +import { http } from "@/utils/http"; +import type { Res, ResPage } from "@/utils/http/types"; +/** + * @description 获取枚举下拉 + * @param {string} type 枚举类型 type=StatusEnum + * @return {object} + */ +export function getPageUserList(data: any) { + return http.request>( + "post", + `userCenter/back/users/getpageuserlist`, + { + data + } + ); +} +/** + * @description 编辑学校 + * @return {void} + */ +export function EditSchool(data: any) { + return http.request>("post", `userCenter/back/schools/add`, { + data + }); +} +/** + * @description 获取学校 + * @return {void} + */ +export function getSchoolData() { + return http.request>("get", `userCenter/public/getschooldata`); +} +/** + * @description 获取职位列表 + * @return {void} + */ +export function getPositionList(data: any) { + return http.request>( + "post", + `userCenter/back/positions/getpositionlist`, + { data } + ); +} +/** + * @description 云校下拉框数据 + * @return {object} + */ +export function cloudSchoolCombo() { + let data = { + ValueName: "Id", + TextName: "Name" + }; + return http.request>( + "post", + `userCenter/back/cloudschool/querycombo`, + { + data + } + ); +} +/** + * @description 获取用户信息 + * @return {object} + */ +export function getUserInfo(id) { + return http.request>( + "get", + `userCenter/back/users/getuserinfo?id=${id}` + ); +} + +/** + * @description 添加班级 + * @return {object} + */ +export function addClasses(info: any) { + return http.request>("post", `userCenter/back/classes/addclass`, { + data: info + }); +} + +/** + * @description 添加班级 + * @return {object} + */ +export function editUser(data: any) { + return http.request>("post", `userCenter/back/users/edituser`, { + data + }); +} + +/** + * @description 添加班级 + * @return {object} + */ +export function getClassCombo(info: any) { + return http.request>("post", `userCenter/public/getclasscombo`, { + data: info + }); +} + +/** + * @description 获取科目 + * @return {object} + */ +export function getSubjectData() { + return http.request>("get", `userCenter/public/getsubjectdata`); +} +/** + * @description 获取职位列表 + * @return {object} + */ +export function getPositions(data) { + return http.request>("post", `userCenter/back/positions/positions`, { + data + }); +} + +//--------------------------interface---------------------------- + +/** + * 职位信息 + */ +export interface Position { + userId: number; + id: number; + name: string; + schoolId: number; + enable: boolean; + endTime: string | null; + schoolName: string; + graduationYear: number; + grade: string; + classId: number; + className: string; + subjectId: number; + subjectName: string; + positionType: number; + positionLevel: number; + status: boolean; +} + +/** + * 用户详细信息 + */ +export interface UserDetail { + id: number; + templateId: number; + phone: string; + edited: boolean; + userType: number; + cloudSchoolId: number; + account: string; + studentId: string; + realName: string; + sex: number; + subjectLevel: any; + birthDate: string; + residence: string; + national: string; + headImage: string; + idCard: string | null; + pid: number; + pname: string; + cid: number; + cname: string; + rid: number; + rname: string; + wx: string; + isPerfectInfo: number; + level: number; + state: number; + meetingAccount: string | null; + gkSubject: string | null; + glSubject: string | null; + gSubject1: string | null; + gSubject2: string | null; + thirdPartyId: string | null; + pointPenSN: string | null; + subjectLevels: null; + positions: Position[]; +} diff --git a/src/components/hTable/index.vue b/src/components/hTable/index.vue index 57b9236..c8a69ba 100644 --- a/src/components/hTable/index.vue +++ b/src/components/hTable/index.vue @@ -559,7 +559,14 @@ function fetchPagedData() { -
+
{ getTopMenu(true); // query、params模式路由传参数的标签页不在此处处理 if (route && route.meta?.title) { - if (isAllEmpty(route.parentId) && route.meta?.backstage) { + if ( + isAllEmpty(route.parentId) && + route.meta?.backstage && + route.children + ) { // 此处为动态顶级路由（目录） const { path, name, meta } = route.children[0]; useMultiTagsStoreHook().handleTags("push", { diff --git a/src/router/modules/home.ts b/src/router/modules/home.ts index ff03d20..1cc1a4f 100644 --- a/src/router/modules/home.ts +++ b/src/router/modules/home.ts @@ -20,15 +20,6 @@ export default { title: "首页", showLink: VITE_HIDE_HOME === "true" ? false : true } - }, - { - path: "/school", - name: "school", - component: () => import("@/views/school/index.vue"), - meta: { - title: "学校", - showLink: true - } } ] } satisfies RouteConfigsTable; diff --git a/src/utils/http/index.ts b/src/utils/http/index.ts index 49f6eb3..80282e0 100644 --- a/src/utils/http/index.ts +++ b/src/utils/http/index.ts @@ -18,14 +18,17 @@ import router from "@/router"; /**请求后端的地址 未配置则访问BaseURL */ const apiServiceConfig = { - classes: import.meta.env.VITE_API_USERCENTER_URL, - schools: import.meta.env.VITE_API_USERCENTER_URL + userCenter: import.meta.env.VITE_API_USERCENTER_URL, + usercenter: import.meta.env.VITE_API_USERCENTER_URL }; -function getAPIUrl(url: string): string { +function setAPIUrl(c: PureHttpRequestConfig): void { + let url = c.url; let token = url.startsWith("/") ? url.split("/")[1] : url.split("/")[0]; - if (apiServiceConfig[token] != null) return apiServiceConfig[token]; - else return import.meta.env.VITE_API_BASEURL; + if (apiServiceConfig[token] != null) { + c.url = url.replaceAll(token, ""); + c.baseURL = apiServiceConfig[token]; + } else c.baseURL = import.meta.env.VITE_API_BASEURL; } const snakeToCamel = (str: string): string => { @@ -118,7 +121,7 @@ class PureHttp { // 开启进度条动画 NProgress.start(); if (config.url.indexOf("http") === -1) { - config.baseURL = getAPIUrl(config.url); + setAPIUrl(config); } // 优先判断post/get等方法是否传入回调，否则执行初始化设置等回调 if (typeof config.beforeRequestCallback === "function") { diff --git a/src/utils/http/types.d.ts b/src/utils/http/types.d.ts index f7870e8..7eb9427 100644 --- a/src/utils/http/types.d.ts +++ b/src/utils/http/types.d.ts @@ -18,6 +18,14 @@ export interface PureHttpError extends AxiosError { isCancelRequest?: boolean; } +export type ResPage = { + code: number; + data: { + data: T; + total: number; + }; + message: string; +}; export type Res = { code: number; data: T; diff --git a/src/views/class/edit.vue b/src/views/class/edit.vue index a3fea06..8da2f5f 100644 --- a/src/views/class/edit.vue +++ b/src/views/class/edit.vue @@ -180,7 +180,7 @@ import type { FormInstance } from "element-plus"; import { getenum } from "@/api/enum"; import { hTableAPI } from "@/api/hTable"; import { ruleRequired } from "@/utils/rules"; -import { addClasses } from "@/api/class"; +import { addClasses } from "@/api/userCenter"; import { ComboModel } from "@/components/hTable/hTable"; interface Formdata { @@ -295,7 +295,7 @@ const handleResetForm = () => { classesAddForm.value?.resetFields(); }; -const SchoolApi = new hTableAPI("schools"); +const SchoolApi = new hTableAPI("usercenter/back/schools"); const fetchInitdata = async () => { // 初始化班级列表 ClassNameList.value = Array.from({ length: 500 }, (_, i) => `${i + 1}班`); diff --git a/src/views/class/index.vue b/src/views/class/index.vue index 8314e3c..80ca012 100644 --- a/src/views/class/index.vue +++ b/src/views/class/index.vue @@ -12,12 +12,12 @@ defineOptions({ name: ControllerName }); -const SchoolApi = new hTableAPI("schools"); +const SchoolApi = new hTableAPI("usercenter/back/schools"); function searchCallback(data) {} const table = ref<{ initTable: (config: TableConfig) => void }>(); const tableData: TableConfig = { - apiUrl: ControllerName, + apiUrl: "usercenter/back/classes", selectColumn: false, // 列表选择 border: false, // 是否显示表格边框 searchCallback: searchCallback, diff --git a/src/views/grade/index.vue b/src/views/grade/index.vue index 7478824..a78a477 100644 --- a/src/views/grade/index.vue +++ b/src/views/grade/index.vue @@ -12,7 +12,7 @@ defineOptions({ name: ControllerName }); -const SchoolApi = new hTableAPI("School"); +const SchoolApi = new hTableAPI("usercenter/back/schools"); function searchCallback(data) {} const table = ref<{ initTable: (config: TableConfig) => void }>(); diff --git a/src/views/school/SchoolEdit.vue b/src/views/school/SchoolEdit.vue index 3b4911e..5e48c40 100644 --- a/src/views/school/SchoolEdit.vue +++ b/src/views/school/SchoolEdit.vue @@ -105,7 +105,8 @@
+ + diff --git a/src/views/teacher/editUser.vue b/src/views/teacher/editUser.vue new file mode 100644 index 0000000..924716f --- /dev/null +++ b/src/views/teacher/editUser.vue @@ -0,0 +1,555 @@ + + + + diff --git a/src/views/teacher/index.vue b/src/views/teacher/index.vue new file mode 100644 index 0000000..5892bd7 --- /dev/null +++ b/src/views/teacher/index.vue @@ -0,0 +1,859 @@ + + + + + diff --git a/src/views/teacher/positionForm.vue b/src/views/teacher/positionForm.vue new file mode 100644 index 0000000..bf01612 --- /dev/null +++ b/src/views/teacher/positionForm.vue @@ -0,0 +1,522 @@ + + + + + From e05671447df23ab0331429237449913802632a5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=82=A5=E7=BE=8A?= <1048382248@qq.com> Date: Sun, 17 Aug 2025 16:23:49 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E8=80=83=E8=AF=95?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/hTable.ts | 1 + src/components/hTable/hTable.ts | 43 +- src/components/hTable/index.vue | 12 +- src/utils/rules.ts | 8 + src/views/admin/index.vue | 4 +- src/views/admin/role.vue | 4 +- src/views/class/index.vue | 7 +- src/views/exam/classDetails.vue | 137 +++ src/views/exam/index.vue | 177 ++++ src/views/exam/userDetails.vue | 132 +++ src/views/grade/index.vue | 4 +- src/views/school/index.vue | 4 +- .../editUser.vue => student/edit.vue} | 2 +- src/views/student/index.vue | 855 ++++++++++++++++++ 14 files changed, 1364 insertions(+), 26 deletions(-) create mode 100644 src/views/exam/classDetails.vue create mode 100644 src/views/exam/index.vue create mode 100644 src/views/exam/userDetails.vue rename src/views/{teacher/editUser.vue => student/edit.vue} (99%) create mode 100644 src/views/student/index.vue diff --git a/src/api/hTable.ts b/src/api/hTable.ts index e097d07..e29d581 100644 --- a/src/api/hTable.ts +++ b/src/api/hTable.ts @@ -28,3 +28,4 @@ export class hTableAPI { }); } } + diff --git a/src/components/hTable/hTable.ts b/src/components/hTable/hTable.ts index 8bd020b..b97653f 100644 --- a/src/components/hTable/hTable.ts +++ b/src/components/hTable/hTable.ts @@ -64,6 +64,27 @@ export interface OperationButton { custom?: ButtonCustomConfig; } +/** 类型判断枚举 */ +export enum ConditionalType { + Equal, + Like, + GreaterThan, + GreaterThanOrEqual, + LessThan, + LessThanOrEqual, + In, + NotIn, + LikeLeft, + LikeRight, + NoEqual, + IsNullOrEmpty, + IsNot, + NoLike, + EqualNull, + InLike, + Range +} + /* 字段设置项 */ export interface FieldSetting { /**map 时Value的取值的属性 */ @@ -95,13 +116,7 @@ export interface TableColumn { /* 是否可搜索 */ search: boolean; /* 搜索类型 */ - searchType?: - | "Equal" - | "NoEqual" - | "Like" - | "GreaterThan" - | "LessThan" - | "NoLike"; + searchType?: ConditionalType; /* 是否允许添加 */ add: boolean; /* 是否允许修改 */ @@ -138,6 +153,18 @@ export interface PageData { total: number; } +/* 分页数据 */ +export interface ConditionalModel { + /** 字段名称 */ + FieldName: string; + /** 字段查询值 */ + FieldValue: string; + /** 查询方式 */ + ConditionalType?: ConditionalType; + /** C#类型名称 */ + CSharpTypeName?: string; +} + /* 搜索条件 */ export interface SearchConditions { /* 是否显示搜索 */ @@ -149,7 +176,7 @@ export interface SearchConditions { /* 排序字段 */ OrderBy: string; /* 默认查询条件 */ - defaultConditions: any[]; + defaultConditions: ConditionalModel[]; /* 查询条件 */ Conditions: any[]; } diff --git a/src/components/hTable/index.vue b/src/components/hTable/index.vue index c8a69ba..29e27c2 100644 --- a/src/components/hTable/index.vue +++ b/src/components/hTable/index.vue @@ -16,7 +16,7 @@ import { import { Search } from "@element-plus/icons-vue"; import { ElMessage, ElMessageBox } from "element-plus"; import { defineAsyncComponent, AsyncComponentLoader } from "vue"; -import { Dialog, TableColumn, TableConfig } from "./hTable"; +import { ConditionalType, Dialog, TableColumn, TableConfig } from "./hTable"; import hTableEdit from "./hTableEdit.vue"; import { hTableAPI } from "@/api/hTable"; import { getenum } from "@/api/enum"; @@ -274,17 +274,19 @@ function handleReloadPaged(reload = true) { let data: any = { ConditionalType: 0 }; if (table.value.column[name].type === "datetime") { // data.CSharpTypeName = 'DateTime' - data.ConditionalType = 8; // '2023-10-07%' + data.ConditionalType = ConditionalType.LikeLeft; // '2023-10-07%' } else if (table.value.column[name].type === "switch") { data.CSharpTypeName = "Boolean"; } else if (table.value.column[name].type === "string") { - data.ConditionalType = "Like"; - } + data.ConditionalType = ConditionalType.Like; + } else data.ConditionalType = ConditionalType.Equal; + data.FieldName = name.charAt(0).toUpperCase() + name.slice(1); data.FieldValue = table.value.column[name].value.toString(); if (table.value.column[name].searchType != undefined) { - data.ConditionalType = table.value.column[name].searchType || 0; + let v: number = table.value.column[name].searchType || 0; + data.ConditionalType = v; } table.value.search.Conditions.push(data); } diff --git a/src/utils/rules.ts b/src/utils/rules.ts index 6f7566d..3f6f515 100644 --- a/src/utils/rules.ts +++ b/src/utils/rules.ts @@ -1,6 +1,14 @@ export const ruleRequired = [ { required: true, message: "不能为空", trigger: "blur" } ]; +export const ruleRequiredNumber = [ + { required: true, message: "不能为空", trigger: "blur" }, + { + pattern: /^\d*\.?\d+$/, + message: "请输入正确数字", + trigger: "blur" + } +]; export const rulePassword = [ { required: true, message: "不能为空", trigger: "blur" }, { min: 6, message: "长度必须大于5", trigger: "blur" } diff --git a/src/views/admin/index.vue b/src/views/admin/index.vue index 6a2a671..f33bdf6 100644 --- a/src/views/admin/index.vue +++ b/src/views/admin/index.vue @@ -1,6 +1,6 @@ + + diff --git a/src/views/exam/index.vue b/src/views/exam/index.vue new file mode 100644 index 0000000..3089926 --- /dev/null +++ b/src/views/exam/index.vue @@ -0,0 +1,177 @@ + + + diff --git a/src/views/exam/userDetails.vue b/src/views/exam/userDetails.vue new file mode 100644 index 0000000..5030e01 --- /dev/null +++ b/src/views/exam/userDetails.vue @@ -0,0 +1,132 @@ + + + diff --git a/src/views/grade/index.vue b/src/views/grade/index.vue index a78a477..d6a6ec0 100644 --- a/src/views/grade/index.vue +++ b/src/views/grade/index.vue @@ -1,6 +1,6 @@ + + From 44e387310f750293bf54d65eac32bc49ba7297b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=82=A5=E7=BE=8A?= <1048382248@qq.com> Date: Mon, 18 Aug 2025 18:00:45 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E5=AE=8C=E5=96=84=20=E8=80=83=E8=AF=95?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- src/api/exam.ts | 24 ++++++ src/api/userCenter.ts | 6 +- src/components/hTable/hTable.ts | 135 +++++++++++++++++--------------- src/components/hTable/index.vue | 3 +- src/views/exam/classDetails.vue | 10 ++- src/views/exam/index.vue | 40 +++++++++- src/views/exam/userDetails.vue | 127 +++++++++++++++++------------- src/views/teacher/index.vue | 8 +- 9 files changed, 223 insertions(+), 132 deletions(-) create mode 100644 src/api/exam.ts diff --git a/.env.development b/.env.development index 93c993a..f8f8e9a 100644 --- a/.env.development +++ b/.env.development @@ -9,4 +9,4 @@ VITE_ROUTER_HISTORY = "hash" # 接口地址 VITE_API_BASEURL = "http://localhost:5199/api" #数据中心后台地址 -VITE_API_USERCENTER_URL = "https://dca.w.23544.com:8843/api/" +VITE_API_USERCENTER_URL = "https://dca.w.23544.com:8843/api" diff --git a/src/api/exam.ts b/src/api/exam.ts new file mode 100644 index 0000000..5668245 --- /dev/null +++ b/src/api/exam.ts @@ -0,0 +1,24 @@ +import { http } from "@/utils/http"; +import type { Res } from "@/utils/http/types"; + +/** + * @description 导入表单 + * @return {object} + */ +export function ImportExamInfo(id: number, file: File) { + let formData = new FormData(); + formData.append("eId", id.toString()); + formData.append("file", file); + return http.request( + "post", + `ExamClassInfo/Import`, + { + data: formData + }, + { + headers: { + "Content-Type": "application/x-www-form-urlencoded" + } + } + ); +} diff --git a/src/api/userCenter.ts b/src/api/userCenter.ts index 3a454ef..5ddc5b0 100644 --- a/src/api/userCenter.ts +++ b/src/api/userCenter.ts @@ -1,3 +1,4 @@ +import { ComboModel } from "@/components/hTable/hTable"; import { http } from "@/utils/http"; import type { Res, ResPage } from "@/utils/http/types"; /** @@ -28,7 +29,10 @@ export function EditSchool(data: any) { * @return {void} */ export function getSchoolData() { - return http.request>("get", `userCenter/public/getschooldata`); + return http.request>( + "get", + `userCenter/public/getschooldata` + ); } /** * @description 获取职位列表 diff --git a/src/components/hTable/hTable.ts b/src/components/hTable/hTable.ts index b97653f..f000c78 100644 --- a/src/components/hTable/hTable.ts +++ b/src/components/hTable/hTable.ts @@ -1,66 +1,73 @@ export interface Dialog { - /* 对话框是否可见 */ + /** 对话框是否可见 */ visible: boolean; - /* 是否显示关闭按钮 */ + /** 是否显示关闭按钮 */ close: boolean; - /* 对话框标题 */ + /** 对话框标题 */ title: string; - /* 对话框宽度 */ + /** 对话框宽度 */ width: string; /**自定义弹窗数据 */ custom: { - /* 自定义对话框高度 */ + /** 自定义对话框高度 */ height: string; - /* 自定义对话框数据 */ + /** 自定义对话框数据 */ data: any[]; - /* 自定义组件路径 */ + /** 自定义组件路径 */ src?: string; - /* 自定义配置项 */ + /** 自定义配置项 */ custom: Record; - /* 自定义对话框是否可见 */ + /** 自定义对话框是否可见 */ visible: boolean; - /* 异步加载组件 */ + /** 异步加载组件 */ component: any; }; edit: { - /* 编辑项ID */ + /** 编辑项ID */ id: number; - /* 编辑对话框标题 */ + /** 编辑对话框标题 */ title: string; - /* 编辑对话框是否可见 */ + /** 编辑对话框是否可见 */ visible: boolean; row?: any; tagData?: any; }; } -/* 按钮自定义配置 */ +/** 按钮自定义配置 */ export interface ButtonCustomConfig { - /* 弹出框标题 */ + /** 弹出框标题 */ title: string; - /* 组件路径 */ + /** 组件路径 */ src: string; - /* 弹框宽度 */ + /** 弹框宽度 */ width: string; - /* 弹框高度 */ + /** 弹框高度 */ height: string; } -/* 操作按钮配置 */ +/** 操作按钮配置 */ export interface OperationButton { - /* 是否为头部按钮 */ + /** 是否为头部按钮 */ topBtn: boolean; /** 按钮权限码 */ perms?: string; - /* 是否显示 */ + /** 是否显示 */ show?: boolean; - /* 按钮文本 */ + /** 按钮文本 */ label: string; - /* 按钮类型 */ - btnType: "add" | "edit" | "del" | "custom"; - /* 按钮样式 */ + /** 按钮点击事件 + * @tips btnType 为空时触发 + * @param obj 当前按钮配置对象 + * @param row 当前行数据 + * @param handleReloadPaged 父表单刷新函数 + */ + click?: (obj, row, handleReloadPaged: (reload: boolean) => void) => void; + /** 按钮类型 */ + btnType?: "add" | "edit" | "del" | "custom"; + /** 按钮样式 */ btnStyle?: "success" | "info" | "primary" | "danger" | "warning"; - /* 自定义按钮配置 */ + /** 自定义按钮配置 */ custom?: ButtonCustomConfig; } @@ -85,7 +92,7 @@ export enum ConditionalType { Range } -/* 字段设置项 */ +/** 字段设置项 */ export interface FieldSetting { /**map 时Value的取值的属性 */ mapValue?: string; @@ -100,30 +107,30 @@ export interface FieldSetting { * @returns 预期返回有效图片地址url */ imgUrl?: (value: any, row: any) => string; - /* 数据源 */ + /** 数据源 */ datasource?: ComboModel[]; } -///* 表格列配置 */ +///** 表格列配置 */ //export interface TableEditColumn {} export interface ComboModel { value: any; text: string; } -/* 表格列配置 */ +/** 表格列配置 */ export interface TableColumn { - /* 显示标签 */ + /** 显示标签 */ label: string; - /* 是否可搜索 */ + /** 是否可搜索 */ search: boolean; - /* 搜索类型 */ + /** 搜索类型 */ searchType?: ConditionalType; - /* 是否允许添加 */ - add: boolean; - /* 是否允许修改 */ + /** 是否允许添加 [false]*/ + add?: boolean; + /** 是否允许修改 [false]*/ edit?: boolean; - /* 列宽度 */ + /** 列宽度 [auto]*/ width?: string; - /* 字段类型 */ + /** 字段类型 */ type?: "string" | "dropdown" | "switch" | "img" | "datetime" | "textarea"; /** 是否多选 */ multiple?: boolean; @@ -133,11 +140,11 @@ export interface TableColumn { rules?: any | Array; /** 显示列 */ show?: boolean; - /* 字段设置 */ + /** 字段设置 */ setting?: FieldSetting; - /* 修改时的编辑值 */ + /** 修改时的编辑值 */ valueE?: Array | string | number | boolean | Date; - /* 查询值 */ + /** 查询值 */ value?: Array | string | number | boolean | Date; /** textarea编辑时的行数 */ editRows?: number; @@ -147,13 +154,13 @@ export interface TableColumn { custom?: (row: any) => string; } -/* 分页数据 */ +/** 分页数据 */ export interface PageData { - /* 总条数 */ + /** 总条数 */ total: number; } -/* 分页数据 */ +/** 分页数据 */ export interface ConditionalModel { /** 字段名称 */ FieldName: string; @@ -165,49 +172,49 @@ export interface ConditionalModel { CSharpTypeName?: string; } -/* 搜索条件 */ +/** 搜索条件 */ export interface SearchConditions { - /* 是否显示搜索 */ + /** 是否显示搜索 */ show: boolean; - /* 当前页码 */ + /** 当前页码 */ PageIndex: number; - /* 每页大小 */ + /** 每页大小 */ PageSize: number; - /* 排序字段 */ + /** 排序字段 */ OrderBy: string; - /* 默认查询条件 */ + /** 默认查询条件 */ defaultConditions: ConditionalModel[]; - /* 查询条件 */ + /** 查询条件 */ Conditions: any[]; } -/* 表格配置 */ +/** 表格配置 */ export interface TableConfig { - /* 搜索回调函数 */ + /** 搜索回调函数 */ searchCallback?: (s: SearchConditions) => void; - /* 新增/修改回调函数 */ + /** 新增/修改回调函数 */ editCallback?: (from: any) => void; - /* API地址 */ + /** API地址 */ apiUrl: string; - /* 是否显示选择列 */ + /** 是否显示选择列 */ selectColumn: boolean; - /* 搜索配置 */ + /** 搜索配置 */ search: SearchConditions; - /* 是否显示操作列 */ + /** 是否显示操作列 */ operationColumn: boolean; - /* 操作按钮配置 */ + /** 操作按钮配置 */ operationColumnData: OperationButton[]; - /* 列配置 */ + /** 列配置 */ column: Record; - /* 表格数据 */ + /** 表格数据 */ data: any[]; /**显示头部操作按钮 */ operationTop?: boolean; - /* 分页数据 */ + /** 分页数据 */ pageData: PageData; - /* 选中行 */ + /** 选中行 */ selectRows: any[]; - /* 是否显示边框 */ + /** 是否显示边框 */ border: boolean; /**是否显示 */ show?: boolean; diff --git a/src/components/hTable/index.vue b/src/components/hTable/index.vue index 29e27c2..3ebbba5 100644 --- a/src/components/hTable/index.vue +++ b/src/components/hTable/index.vue @@ -108,7 +108,8 @@ function intdata() { // 处理 column 的属性 for (const key in table.value.column) { const element = table.value.column[key]; - + if (element.add === undefined) element.add = false; + if (element.edit === undefined) element.edit = false; // Vue 3 中直接赋值即可，不需要 $set if (element.valueE === undefined) element.valueE = element.multiple ? [] : ""; diff --git a/src/views/exam/classDetails.vue b/src/views/exam/classDetails.vue index d91c0a4..1304807 100644 --- a/src/views/exam/classDetails.vue +++ b/src/views/exam/classDetails.vue @@ -66,7 +66,13 @@ const tableData: TableConfig = { show: true, label: "学生成绩详情", btnType: "custom", - btnStyle: "primary" // topBtn: true才生效 success danger + btnStyle: "primary", + custom: { + title: "考试班级详情", // 弹出框title + src: "exam/userDetails", // 组件路径 + width: "1600px", // 弹框宽度 + height: "800px" // 弹框高度 + } } ], column: { @@ -102,7 +108,7 @@ const tableData: TableConfig = { add: false, // 字段允许添加 edit: false // 字段允许修改 }, - etryPerson: { + entryPerson: { label: "录入人", width: "200px", search: true, diff --git a/src/views/exam/index.vue b/src/views/exam/index.vue index 3089926..5cd7edd 100644 --- a/src/views/exam/index.vue +++ b/src/views/exam/index.vue @@ -6,6 +6,8 @@ import { fa } from "element-plus/es/locales.mjs"; import { hTableAPI } from "@/api/hTable"; import { getenum } from "@/api/enum"; import { ruleRequired, ruleRequiredNumber } from "@/utils/rules"; +import { ImportExamInfo } from "@/api/exam"; +import { ElMessage } from "element-plus"; const ControllerName = "Exam"; defineOptions({ @@ -60,15 +62,15 @@ const tableData: TableConfig = { custom: { title: "考试班级详情", // 弹出框title src: "exam/classDetails", // 组件路径 - width: "1600px", // 弹框宽度 - height: "520px" // 弹框高度 + width: "1300px", // 弹框宽度 + height: "800px" // 弹框高度 } }, { topBtn: false, // 头部按钮 show: true, label: "录入成绩", - btnType: "custom", // 按钮类型 add edit del 不设置则 自定义按钮 + click: entryExam, btnStyle: "primary" // topBtn: true才生效 success danger } ], @@ -154,7 +156,39 @@ const tableData: TableConfig = { }, selectRows: [] }; +function entryExam(obj, row, callBack) { + let fileE = document.createElement("input"); + fileE.type = "file"; + var formData = new window.FormData(); + fileE.onchange = async function () { + formData.append("File", fileE.files[0]); + let res = await ImportExamInfo(row[0].id, fileE.files[0]); + if (res.code != undefined) { + if (res.code !== 200) return ElMessage.error(res.message); + else return ElMessage.success("所有数据录入成功"); + } else if (res.type === "application/json") { + let json = await res.text(); + if (json !== undefined && json.Code !== 200) { + return ElMessage.error(json.Message); + } else { + return ElMessage.success("操所有数据录入成功作成功"); + } + } else if (res === undefined || res.size === 0) + return ElMessage.success("所有数据录入成功"); + const url = res && window.URL.createObjectURL(res); + const link = document.createElement("a"); + link.href = url; + link.setAttribute("download", "未成功导入的考试信息数据" + ".xlsx"); + document.body.appendChild(link); + link.click(); + document.body.removeChild(link); + ElMessage.success("操作成功,已导出重复数据"); + }; + try { + fileE.click(); + } catch (error) {} +} const showTable = ref(false); onMounted(async () => { //初始化数据原 diff --git a/src/views/exam/userDetails.vue b/src/views/exam/userDetails.vue index 5030e01..2e0fd78 100644 --- a/src/views/exam/userDetails.vue +++ b/src/views/exam/userDetails.vue @@ -38,78 +38,93 @@ const tableData: TableConfig = { { // 操作按钮 topBtn: true, // 是头部按钮 - label: "添加", - btnStyle: "success", - btnType: "custom" + label: "成绩升序", + btnStyle: "primary" + }, + { + // 操作按钮 + topBtn: true, // 是头部按钮 + label: "成绩降序", + btnStyle: "primary" }, { topBtn: false, // 头部按钮 - show: true, - label: "删除", - btnType: "del", // 按钮类型 add edit del 不设置则 自定义按钮 - btnStyle: "danger" // topBtn: true才生效 success danger - }, - { - topBtn: false, // 头部按钮 - show: true, - label: "重新录入", - btnType: "custom", // 按钮类型 add edit del 不设置则 自定义按钮 - btnStyle: "primary" // topBtn: true才生效 success danger - }, - { - topBtn: false, // 头部按钮 - show: true, - label: "学生成绩详情", + label: "个人详情", btnType: "custom", btnStyle: "primary" // topBtn: true才生效 success danger } ], column: { // 行数据 - schoolName: { - label: "学校", + userName: { + label: "姓名", search: true, searchType: ConditionalType.Like, // 搜索类型 - add: false, // 字段允许添加 - edit: false, // 字段允许修改 width: "180px" }, - grade: { - label: "年级", - width: "100px", - custom: s => `${s.gradeYear}${s.gradeLevel}`, - search: true, - add: false, // 字段允许添加 - edit: false // 字段允许修改 - }, - className: { - label: "班级", - width: "150px", - search: true, - searchType: ConditionalType.Like, // 搜索类型 - add: false, // 字段允许添加 - edit: false // 字段允许修改 - }, - peopleCount: { - label: "参考人数", - width: "100px", + 语文: { + label: "语文", search: false, - add: false, // 字段允许添加 - edit: false // 字段允许修改 + width: "100px", + custom: row => row.subjectDic.语文 }, - etryPerson: { - label: "录入人", - width: "200px", - search: true, - add: false, // 字段允许添加 - edit: false // 字段允许修改 + 数学: { + label: "数学", + search: false, + width: "100px", + custom: row => row.subjectDic.数学 }, - createTime: { - label: "录入时间", - width: "200px", - search: true, - add: false, // 字段允许添加 - edit: false // 字段允许修改 + 英语: { + label: "英语", + search: false, + width: "100px", + custom: row => row.subjectDic.英语 + }, + 物理: { + label: "物理", + search: false, + width: "100px", + custom: row => row.subjectDic.物理 + }, + 化学: { + label: "化学", + search: false, + width: "100px", + custom: row => row.subjectDic.化学 + }, + 生物: { + label: "生物", + search: false, + width: "100px", + custom: row => row.subjectDic.生物 + }, + 政治: { + label: "政治", + search: false, + width: "100px", + custom: row => row.subjectDic.政治 + }, + 历史: { + label: "历史", + search: false, + width: "100px", + custom: row => row.subjectDic.历史 + }, + 地理: { + label: "地理", + search: false, + width: "100px", + custom: row => row.subjectDic.地理 ?? "--" + }, + assignScore: { + label: "赋分总分", + search: false, + width: "180px" + }, + assignRanking: { + label: "赋分后的排名", + search: false, + width: "200px" } }, data: [], diff --git a/src/views/teacher/index.vue b/src/views/teacher/index.vue index 5892bd7..9f81387 100644 --- a/src/views/teacher/index.vue +++ b/src/views/teacher/index.vue @@ -364,10 +364,10 @@ const props = defineProps({ } }); -const baseUrl = import.meta.env.VITE_APP_BASE_API; -const excelImportUsersUrl = `${baseUrl}api/back/users/downloadimportusersexceltemplate`; -const excelImportMeetingUrl = `${baseUrl}api/back/users/downloadimportmeetingexceltemplate`; -const excelImportOrdersUrl = `${baseUrl}api/back/users/downloadimportordersexceltemplate`; +const baseUrl = import.meta.env.VITE_API_USERCENTER_URL; +const excelImportUsersUrl = `${baseUrl}/back/users/downloadimportusersexceltemplate`; +const excelImportMeetingUrl = `${baseUrl}/back/users/downloadimportmeetingexceltemplate`; +const excelImportOrdersUrl = `${baseUrl}/back/users/downloadimportordersexceltemplate`; const editId = ref(0); const showAllPosition = ref([]); From 077450e4045c05fc4e83129658fe661dbd03a389 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=82=A5=E7=BE=8A?= <1048382248@qq.com> Date: Mon, 18 Aug 2025 18:02:30 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=AD=A6=E6=A0=A1API=E7=B1=BB=E5=9E=8B=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/userCenter.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/userCenter.ts b/src/api/userCenter.ts index 5ddc5b0..d9abc2e 100644 --- a/src/api/userCenter.ts +++ b/src/api/userCenter.ts @@ -29,7 +29,7 @@ export function EditSchool(data: any) { * @return {void} */ export function getSchoolData() { - return http.request>( + return http.request>( "get", `userCenter/public/getschooldata` );