From e113af5378367265b7f2b9bbf4e57a15a01db72b 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, 11 Aug 2025 18:24:53 +0800 Subject: [PATCH 01/43] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=8A=A8=E6=80=81ed?= =?UTF-8?q?it=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 | 9 +- src/api/menu.ts | 10 +- src/api/school.ts | 37 +++ src/components/hTable/hTable.ts | 18 +- src/components/hTable/hTableEdit.vue | 7 +- src/components/hTable/index.vue | 120 ++++----- src/router/modules/home.ts | 9 - src/views/admin/index.vue | 138 ++++++++++ src/views/menu/edit.vue | 371 +++++++++++++++++++++++++++ src/views/menu/index.vue | 142 +++++----- src/views/school/SchoolEdit.vue | 255 ++++++++++++++++++ src/views/school/index.vue | 32 +-- 12 files changed, 969 insertions(+), 179 deletions(-) create mode 100644 src/api/school.ts create mode 100644 src/views/admin/index.vue create mode 100644 src/views/menu/edit.vue create mode 100644 src/views/school/SchoolEdit.vue diff --git a/src/api/hTable.ts b/src/api/hTable.ts index 8839c3b..038394e 100644 --- a/src/api/hTable.ts +++ b/src/api/hTable.ts @@ -1,5 +1,6 @@ import { http } from "@/utils/http"; import type { Res } from "@/utils/http/types"; +import type { ComboModel } from "@/components/hTable/hTable"; export class hTableAPI { url = ""; @@ -10,8 +11,8 @@ export class hTableAPI { PageList(data = {}) { return http.request>("post", `${this.url}/PageList`, { data }); } - Info(id, tag = {}) { - const pUrl = `${this.url}/${id}`; + Info(tag = {}) { + const pUrl = `${this.url}/Info`; let getUrl = pUrl; for (const key in tag) { const el = tag[key]; @@ -26,6 +27,8 @@ export class hTableAPI { return http.request>("post", `${this.url}/Del`, { data }); } querycombo(data) { - return http.request>("post", `${this.url}/QueryCombo`, { data }); + return http.request>("post", `${this.url}/QueryCombo`, { + data + }); } } diff --git a/src/api/menu.ts b/src/api/menu.ts index dffe752..e6db80f 100644 --- a/src/api/menu.ts +++ b/src/api/menu.ts @@ -3,7 +3,7 @@ import type { Res } from "@/utils/http/types"; // 定义菜单项接口 export interface MenuItem { - id: number; + id?: number; name: string; path?: string; isButton: boolean; @@ -22,3 +22,11 @@ export interface MenuItem { export function MenuAll() { return http.request>("get", `Menu/All`); } + +/** + * @description 获取所有的菜单 + * @return {object} + */ +export function Edit(info: MenuItem) { + return http.request>("post", `Menu/Edit`, { data: info }); +} diff --git a/src/api/school.ts b/src/api/school.ts new file mode 100644 index 0000000..4891252 --- /dev/null +++ b/src/api/school.ts @@ -0,0 +1,37 @@ +import { http } from "@/utils/http"; +import type { Res } from "@/utils/http/types"; + +/** + * @description 获取枚举下拉 + * @param {string} type 枚举类型 type=StatusEnum + * @return {object} + */ +export function getenum(type) { + return http.request>("get", `public/enum/${type}`); +} +/** + * @description 获取枚举对象 + * @param {string} type 枚举类型 type=StatusEnum + * @return {object} + */ +export function getenumDic(type) { + return http.request>("get", `public/enum/${type}/Dic`); +} + +export function getProvince() { + return http.request>("get", `address/province`); +} +export function getcity(c) { + return http.request>("get", `address/${c}/city`); +} +export function getregion(r) { + return http.request>("get", `address/${r}/region`); +} + +/** + * @description 编辑学校 + * @return {void} + */ +export function EditSchool(data: any) { + return http.request>("post", `School/Edit`, { data }); +} diff --git a/src/components/hTable/hTable.ts b/src/components/hTable/hTable.ts index eb1a905..45fb491 100644 --- a/src/components/hTable/hTable.ts +++ b/src/components/hTable/hTable.ts @@ -78,14 +78,14 @@ export interface FieldSetting { */ imgUrl?: (value: any, row: any) => string; /* 数据源 */ - datasource?: Array<{ - Value: any; - Text: string; - }>; + datasource?: ComboModel[]; } ///* 表格列配置 */ //export interface TableEditColumn {} - +export interface ComboModel { + Value: any; + Text: string; +} /* 表格列配置 */ export interface TableColumn { /* 显示标签 */ @@ -103,7 +103,7 @@ export interface TableColumn { /* 是否允许添加 */ add: boolean; /* 是否允许修改 */ - edit: boolean; + edit?: boolean; /* 列宽度 */ width?: string; /* 字段类型 */ @@ -118,9 +118,9 @@ export interface TableColumn { /* 字段设置 */ setting?: FieldSetting; /* 修改时的编辑值 */ - valueE?: Array | string; + valueE?: Array | string | number | boolean | Date; /* 查询值 */ - value?: Array | string; + value?: Array | string | number | boolean | Date; /** textarea编辑时的行数 */ editRows?: number; /**编辑时值发生变化 */ @@ -179,4 +179,6 @@ export interface TableConfig { selectRows: any[]; /* 是否显示边框 */ border: boolean; + /**是否显示 */ + show?: boolean; } diff --git a/src/components/hTable/hTableEdit.vue b/src/components/hTable/hTableEdit.vue index f35ec13..8da9a3a 100644 --- a/src/components/hTable/hTableEdit.vue +++ b/src/components/hTable/hTableEdit.vue @@ -25,7 +25,7 @@ const props = defineProps({ }); const emit = defineEmits(["handlePagedCallback"]); const editFormRef = ref(); -const column: Record = {}; +const column = ref>({}); const editData = ref({ frorm: {}, isedit: props.id !== -1, @@ -118,7 +118,7 @@ function fetchFormData() { editData.value.loading = false; handleResetForm(); if (editData.value.isedit) { - Api.Info(props.id).then(res => { + Api.Info({ id: props.id }).then(res => { if (res.code === 200) { editData.value.frorm = res.data; for (const key in column.value) { @@ -141,7 +141,6 @@ function fetchFormData() { ref="editFormRef" :model="editData.table.column" :label-width="editData.formLabelWidth" - size="small" clearable >
(props.tableConfig); +const tableShowColumn = ref>(); onBeforeMount(() => { /* 初始化系统配置 */ nextTick(async () => { intdata(); + //过滤无法显示的列 + tableShowColumn.value = Object.fromEntries( + Object.entries(table.value.column).filter(([_, s]) => s.show) + ); + Api = new hTableAPI(table.value.apiUrl); init.value = true; tableShow.value = true; @@ -55,7 +61,6 @@ onUnmounted(() => {}); // }); const tableShow = ref(false); let Api: hTableAPI = null; -const instance = getCurrentInstance(); const init = ref(false); const tableHeight = ref(0); @@ -109,9 +114,9 @@ function intdata() { if (element.show === undefined) element.show = true; if (element.editShow === undefined) element.editShow = true; if (!element.setting) - element.setting = { datasource: [], mapValue: "Value", maplabel: "Text" }; - if (!element.setting.mapValue) element.setting.mapValue = "Value"; - if (!element.setting.maplabel) element.setting.maplabel = "Text"; + element.setting = { datasource: [], mapValue: "value", maplabel: "text" }; + if (!element.setting.mapValue) element.setting.mapValue = "value"; + if (!element.setting.maplabel) element.setting.maplabel = "text"; if (!element.change) element.change = () => {}; } @@ -171,7 +176,7 @@ function handleAdd() { dialog.value.width = "500px"; } function handleEdit(obj, row) { - dialog.value.edit.id = row[0].Id; + dialog.value.edit.id = row[0].id; dialog.value.edit.row = row[0]; dialog.value.edit.tagData = obj.tagData; dialog.value.title = obj.label || "修改"; @@ -185,7 +190,7 @@ function handleCustom(obj, row, custom) { dialog.value.custom.custom = custom || []; // 异步加载组件 dialog.value.custom.component = defineAsyncComponent({ - loader: () => import(/* @vite-ignore */ `../${custom.src}.vue`) + loader: () => import(/* @vite-ignore */ `../../views/${custom.src}.vue`) }); dialog.value.width = custom.width; dialog.value.title = custom.title; @@ -206,7 +211,7 @@ function handleDelete(obj, row) { } const ids: any[] = []; row.forEach(it => { - ids.push(it.Id); + ids.push(it.id); }); ElMessageBox.confirm("此操作将永久删除勾选记录, 是否继续?").then(() => { Api.delete(ids).then(res => { @@ -309,12 +314,16 @@ async function fetchInitData() { element.type === "string" || element.type === undefined) ) { - element.custom = row => { - let sc = element.setting.datasource.find( - s => s[element.setting.mapValue] + "" == row[key] + "" - ); - return !sc ? row[key] : sc[element.setting.maplabel]; - }; + if (element.type === "string" || element.type === undefined) + element.custom = row => row[key]; + else { + element.custom = row => { + let sc = element.setting.datasource.find( + s => s[element.setting.mapValue] + "" == row[key] + "" + ); + return !sc ? row[key] : sc[element.setting.maplabel]; + }; + } } else if (element.custom == undefined) { element.custom = row => row[key]; } @@ -370,7 +379,7 @@ function fetchPagedData() { > + +
+ + + + +
@@ -427,7 +469,8 @@ function fetchPagedData() { :key="i" :type="e.btnStyle || 'info'" @click="getbtnClick(e, null)" - >{{ e.label }} + >{{ e.label }}
{{ item.custom(scope.row) }} - - @@ -529,41 +564,6 @@ function fetchPagedData() { @current-change="pageIndexChange" /> -
- - - /> - - -
diff --git a/src/router/modules/home.ts b/src/router/modules/home.ts index a9172f9..ff03d20 100644 --- a/src/router/modules/home.ts +++ b/src/router/modules/home.ts @@ -29,15 +29,6 @@ export default { title: "学校", showLink: true } - }, - { - path: "/menu", - name: "Menu", - component: () => import("@/views/menu/index.vue"), - meta: { - title: "菜单", - showLink: true - } } ] } satisfies RouteConfigsTable; diff --git a/src/views/admin/index.vue b/src/views/admin/index.vue new file mode 100644 index 0000000..db4fa4f --- /dev/null +++ b/src/views/admin/index.vue @@ -0,0 +1,138 @@ + + + diff --git a/src/views/menu/edit.vue b/src/views/menu/edit.vue new file mode 100644 index 0000000..fd383fb --- /dev/null +++ b/src/views/menu/edit.vue @@ -0,0 +1,371 @@ + + + + + diff --git a/src/views/menu/index.vue b/src/views/menu/index.vue index 07f3da1..91a83c7 100644 --- a/src/views/menu/index.vue +++ b/src/views/menu/index.vue @@ -1,6 +1,9 @@ + + + @@ -185,11 +172,16 @@ onMounted(async () => { margin-right: 10px; } +.menu-path-Rank { + font-size: 13px; + margin-right: 10px; + color: #909399; +} .menu-path { font-size: 12px; color: #909399; margin-right: 10px; - flex-grow: 1; + flex-grow: 0; } .menu-tree { padding: 20px; /* 增加内边距 */ diff --git a/src/views/school/SchoolEdit.vue b/src/views/school/SchoolEdit.vue new file mode 100644 index 0000000..a37f44d --- /dev/null +++ b/src/views/school/SchoolEdit.vue @@ -0,0 +1,255 @@ + + diff --git a/src/views/school/index.vue b/src/views/school/index.vue index 902ea25..c1d3d24 100644 --- a/src/views/school/index.vue +++ b/src/views/school/index.vue @@ -2,6 +2,7 @@ import ahTable from "@/components/hTable/index.vue"; import { TableConfig } from "@/components/hTable/hTable"; import { onMounted, ref } from "vue"; +import { fa } from "element-plus/es/locales.mjs"; defineOptions({ name: "School" }); @@ -42,24 +43,17 @@ const tableData: TableConfig = { }, { topBtn: true, // 头部按钮 - show: true, - label: "新增", - btnType: "add", // 按钮类型 add edit del custom - btnStyle: "success" // topBtn: true才生效 success danger + label: "新增学校", + btnType: "custom", // 按钮类型 add edit del custom + btnStyle: "success", // topBtn: true才生效 success danger + custom: { + // 按钮类型 custom 专用 + title: "新增学校", // 弹出框title + src: "school/SchoolEdit", // 组件路径 + width: "550px", // 弹框宽度 + height: "300px" // 弹框高度 + } }, - // { - // topBtn: true, // 头部按钮 - // label: "新增学校", - // btnType: "custom", // 按钮类型 add edit del custom - // btnStyle: "success", // topBtn: true才生效 success danger - // custom: { - // // 按钮类型 custom 专用 - // title: "新增学校", // 弹出框title - // src: "school/SchoolEdit", // 组件路径 - // width: "550px", // 弹框宽度 - // height: "300px" // 弹框高度 - // } - // }, { topBtn: false, // 头部按钮 show: true, @@ -73,8 +67,8 @@ const tableData: TableConfig = { id: { label: "编号", search: true, - add: true, // 字段允许添加 - edit: true, // 字段允许修改 + add: false, // 字段允许添加 + edit: false, // 字段允许修改 width: "150px" }, name: { 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 02/43] =?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 03/43] =?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 04/43] =?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 05/43] =?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 17:34:45 +0800 Subject: [PATCH 06/43] =?UTF-8?q?style:=20ui=E7=95=8C=E9=9D=A2=E6=90=9C?= =?UTF-8?q?=E7=B4=A2,=E8=A1=A8=E6=A0=BC=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- src/views/school/index.vue | 8 +- src/views/testxb/index.vue | 11 + src/views/toschoolinfomanage/index.vue | 288 +++++++++++++++++++++++++ 4 files changed, 305 insertions(+), 4 deletions(-) create mode 100644 src/views/testxb/index.vue create mode 100644 src/views/toschoolinfomanage/index.vue diff --git a/.env.development b/.env.development index 17faa14..ab8609f 100644 --- a/.env.development +++ b/.env.development @@ -7,4 +7,4 @@ 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_BASEURL = "http://192.168.2.33:5199/api" diff --git a/src/views/school/index.vue b/src/views/school/index.vue index c1d3d24..967f5de 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" } ] } } @@ -110,5 +110,7 @@ const tableData: TableConfig = { diff --git a/src/views/testxb/index.vue b/src/views/testxb/index.vue new file mode 100644 index 0000000..268449f --- /dev/null +++ b/src/views/testxb/index.vue @@ -0,0 +1,11 @@ + + + diff --git a/src/views/toschoolinfomanage/index.vue b/src/views/toschoolinfomanage/index.vue new file mode 100644 index 0000000..4aea880 --- /dev/null +++ b/src/views/toschoolinfomanage/index.vue @@ -0,0 +1,288 @@ + + + + + From e1fdca95b818d3efa58eb226401dadba11a524bf 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 18:38:11 +0800 Subject: [PATCH 07/43] =?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 08/43] =?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 fbac2ef72b490297dfb236a01d46fdfa63c46dfb Mon Sep 17 00:00:00 2001 From: xiangbo <975188351@qq.com> Date: Fri, 15 Aug 2025 14:06:52 +0800 Subject: [PATCH 09/43] =?UTF-8?q?feat:=20=E5=87=86=E5=A4=87=E5=90=88?= =?UTF-8?q?=E5=B9=B6main?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/toschoolinfomanage.ts | 23 +++++++++++ src/views/toschoolinfomanage/index.vue | 53 ++++++++++++++++++++------ 2 files changed, 65 insertions(+), 11 deletions(-) create mode 100644 src/api/toschoolinfomanage.ts diff --git a/src/api/toschoolinfomanage.ts b/src/api/toschoolinfomanage.ts new file mode 100644 index 0000000..8d48758 --- /dev/null +++ b/src/api/toschoolinfomanage.ts @@ -0,0 +1,23 @@ +import { http } from "@/utils/http"; +import type { Res } from "@/utils/http/types"; + +/** + * @description 获取学校枚举下拉 + * @param {string} type 枚举类型 type=StatusEnum + * @return {object} + */ +export function getenum(data) { + return http.request>("post", `/back/schools/QueryCombo`, { + data + }); +} +/** + * @description 获取学校枚举下拉 + * @param {string} type 枚举类型 type=StatusEnum + * @return {object} + */ +export function getPageList(data) { + return http.request>("post", `/SchoolBusiness/PageList`, { + data + }); +} diff --git a/src/views/toschoolinfomanage/index.vue b/src/views/toschoolinfomanage/index.vue index 4aea880..a44f29a 100644 --- a/src/views/toschoolinfomanage/index.vue +++ b/src/views/toschoolinfomanage/index.vue @@ -69,7 +69,12 @@ 重置 - + +
+ 新建 + 批量导入 + 导出 +
@@ -126,7 +131,8 @@ From 4b06c403a7fcf6bc80ac2e61ebd3df8b0d87a0ee Mon Sep 17 00:00:00 2001 From: xiangbo <975188351@qq.com> Date: Fri, 15 Aug 2025 15:18:25 +0800 Subject: [PATCH 10/43] feat: save code --- src/components/hTable/index.vue | 46 +++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/src/components/hTable/index.vue b/src/components/hTable/index.vue index 3f7d273..9ad6ee4 100644 --- a/src/components/hTable/index.vue +++ b/src/components/hTable/index.vue @@ -20,6 +20,9 @@ import { Dialog, TableColumn, TableConfig } from "./hTable"; import hTableEdit from "./hTableEdit.vue"; import { hTableAPI } from "@/api/hTable"; import { getenum } from "@/api/enum"; +//按钮权限 +import { hasPerms } from "@/utils/auth"; + const props = defineProps({ //** 传入的表单数据 */ Row: { @@ -278,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; @@ -300,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 ( @@ -380,9 +382,9 @@ function fetchPagedData() { @@ -397,7 +399,7 @@ function fetchPagedData() { >
Date: Fri, 15 Aug 2025 16:41:42 +0800 Subject: [PATCH 11/43] feat: save code1 --- src/api/toschoolinfomanage.ts | 2 +- src/views/toschoolinfomanage/addModal.vue | 354 ++++++++++++++++++++++ src/views/toschoolinfomanage/index.vue | 144 ++++----- 3 files changed, 428 insertions(+), 72 deletions(-) create mode 100644 src/views/toschoolinfomanage/addModal.vue diff --git a/src/api/toschoolinfomanage.ts b/src/api/toschoolinfomanage.ts index 8d48758..1806bf9 100644 --- a/src/api/toschoolinfomanage.ts +++ b/src/api/toschoolinfomanage.ts @@ -17,7 +17,7 @@ export function getenum(data) { * @return {object} */ export function getPageList(data) { - return http.request>("post", `/SchoolBusiness/PageList`, { + return http.request>("post", `/SchoolBusiness/QueryPageList`, { data }); } diff --git a/src/views/toschoolinfomanage/addModal.vue b/src/views/toschoolinfomanage/addModal.vue new file mode 100644 index 0000000..cd211da --- /dev/null +++ b/src/views/toschoolinfomanage/addModal.vue @@ -0,0 +1,354 @@ + + + + + + diff --git a/src/views/toschoolinfomanage/index.vue b/src/views/toschoolinfomanage/index.vue index a44f29a..f4ddc9c 100644 --- a/src/views/toschoolinfomanage/index.vue +++ b/src/views/toschoolinfomanage/index.vue @@ -1,5 +1,5 @@ + + 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 13/43] =?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 14/43] =?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 15/43] =?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` ); From 3aaebcb3cf4b6e1cc8dff10aa01e82b2b50f255f Mon Sep 17 00:00:00 2001 From: xiangbo <975188351@qq.com> Date: Mon, 18 Aug 2025 18:03:15 +0800 Subject: [PATCH 16/43] =?UTF-8?q?feat:=20=E6=96=B0=E5=BB=BA=E8=B5=B4?= =?UTF-8?q?=E6=A0=A1=E4=BF=A1=E6=81=AF=E5=BC=80=E5=8F=91=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/toschoolinfomanage.ts | 32 ++++++++- src/views/toschoolinfomanage/index.vue | 89 ++++++++++++++++++++++++-- 2 files changed, 111 insertions(+), 10 deletions(-) diff --git a/src/api/toschoolinfomanage.ts b/src/api/toschoolinfomanage.ts index 1806bf9..af81b17 100644 --- a/src/api/toschoolinfomanage.ts +++ b/src/api/toschoolinfomanage.ts @@ -6,8 +6,8 @@ import type { Res } from "@/utils/http/types"; * @param {string} type 枚举类型 type=StatusEnum * @return {object} */ -export function getenum(data) { - return http.request>("post", `/back/schools/QueryCombo`, { +export function getenumApi(data) { + return http.request>("post", `/SchoolBusiness/QueryCombo`, { data }); } @@ -16,8 +16,34 @@ export function getenum(data) { * @param {string} type 枚举类型 type=StatusEnum * @return {object} */ -export function getPageList(data) { +export function getPageListApi(data) { return http.request>("post", `/SchoolBusiness/QueryPageList`, { data }); } +/** + * @description 新增赴校信息或者编辑 id:0(新增)，其他（编辑） + * @return {object} + */ +export function addOrEditApi(data: any) { + return http.request>("post", `/SchoolBusiness/Edit`, { + data + }); +} +/** + * @description 获取赴校信息详情 + * @param {string} type 枚举类型 type=StatusEnum + * @return {object} + */ +export function getSchoolBusinessDetailApi(id: string | number) { + return http.request>("get", `/SchoolBusiness/${id}`); +} +/** + * @description 删除赴校信息 + * @return {object} + */ +export function deleteSchoolBusinessApi(data: Array) { + return http.request>("post", `/SchoolBusiness/Del`, { + data + }); +} diff --git a/src/views/toschoolinfomanage/index.vue b/src/views/toschoolinfomanage/index.vue index f4ddc9c..354d55f 100644 --- a/src/views/toschoolinfomanage/index.vue +++ b/src/views/toschoolinfomanage/index.vue @@ -98,7 +98,7 @@ - + + + diff --git a/src/views/toschoolinfomanage/index.vue b/src/views/toschoolinfomanage/index.vue index 354d55f..5b8873e 100644 --- a/src/views/toschoolinfomanage/index.vue +++ b/src/views/toschoolinfomanage/index.vue @@ -34,22 +34,31 @@ - + multiple + filterable + style="width: 300px" + > + + - - + + @@ -93,21 +102,38 @@ /> @@ -128,21 +154,26 @@ />
- + + + + + + From c54cebe31e27d345bdebf333967cbb49c3a0dfb4 Mon Sep 17 00:00:00 2001 From: xiangbo <975188351@qq.com> Date: Wed, 20 Aug 2025 16:32:32 +0800 Subject: [PATCH 20/43] =?UTF-8?q?feat:=20=E5=89=A9=E4=BD=99=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/toschoolinfomanage/addModal.vue | 2 +- src/views/toschoolinfomanage/editModal.vue | 532 +++++++++++++++++---- src/views/toschoolinfomanage/index.vue | 84 ++-- 3 files changed, 494 insertions(+), 124 deletions(-) diff --git a/src/views/toschoolinfomanage/addModal.vue b/src/views/toschoolinfomanage/addModal.vue index ef9f9c7..421c2a3 100644 --- a/src/views/toschoolinfomanage/addModal.vue +++ b/src/views/toschoolinfomanage/addModal.vue @@ -2,7 +2,7 @@ @@ -124,16 +245,91 @@ import { } from "@/api/toschoolinfomanage"; import { setFips } from "crypto"; -const activeName = ref(0); +const activeName = ref(0); const handleClick = (tab: TabsPaneContext, event: Event) => { - console.log(tab, event); + console.log(tab.props.name, event); + activeName.value = tab.props.name; }; -const props = defineProps<{ visible: boolean; detailData: any }>(); +const props = defineProps<{ + visible: boolean; + detailData: any; + editModalLoading: boolean; + isDetail: boolean; +}>(); const emit = defineEmits<{ (e: "update:visible", value: boolean): void; + (e: "handleReset"): void; }>(); +// 操作弹窗相关数据 +const operationDialogVisible = ref(false); +const operationType = ref(""); // 操作类型：markSolved, addRecord, addFinish +const operationForm = reactive({ + operationTime: "", + operationContent: "" +}); +const operationFormRef = ref(); + +// 执行记录和完结情况数据 +const executionRecords = ref>([]); +const finishRecord = ref<{ time: string; content: string } | null>(null); + +// 从父级 detailData.solutionRecord 回显本地显示数据 +watch( + () => props.detailData, + val => { + const sr = (val as any)?.solutionRecord || {}; + // 执行记录回显 + const recs = Array.isArray(sr?.record) ? sr.record : []; + executionRecords.value = recs.map((r: any) => ({ + time: r?.executionTime || "", + content: r?.executionRecords || "" + })); + // 完结情况回显 + if (sr?.endRecordTime || sr?.endRecord) { + finishRecord.value = { + time: sr?.endRecordTime || "", + content: sr?.endRecord || "" + }; + } else { + finishRecord.value = null; + } + }, + { immediate: true, deep: true } +); + +// 当前标记“已解决”的问题项 +const currentMarkedQuestion = ref(null); + +// 根据操作类型动态显示文案 +const operationContentLabel = computed(() => { + switch (operationType.value) { + case "markSolved": + return "解决情况"; + case "addRecord": + return "执行记录"; + case "addFinish": + return "完结情况"; + default: + return "操作内容"; + } +}); + +// 表单验证规则 +const operationRules: FormRules = { + operationTime: [ + { required: true, message: "请选择操作时间", trigger: "change" } + ], + operationContent: [ + { + required: true, + message: `请输入${operationContentLabel.value}`, + trigger: "blur" + } + ] +}; + const dialogVisible = computed({ get: () => props.visible, set: v => emit("update:visible", v) @@ -141,6 +337,7 @@ const dialogVisible = computed({ const closeModal = () => { emit("update:visible", false); + activeName.value = 0; }; const queType = { 1: "学校领导班子", @@ -154,10 +351,7 @@ const queType = { * @param data */ const handleUnHandleQust = (data: Array) => { - return (data || []).map(i => { - // 利用solution为空判断为未解决问题 - return !i.solution; - }).length; + return (data || []).filter(i => !i?.solution).length; }; const sortData = (data: Array) => { const categorizedData = [ @@ -186,14 +380,157 @@ const statusText = computed(() => const statusType = computed(() => safeDetail.value?.solutionEnd ? "success" : "warning" ); -const markTitle = () => { - console.log("标记已解决"); +const solutionText = computed({ + get: () => safeDetail.value?.solutionRecord?.solution || "", + set: (value: string) => { + if (!safeDetail.value.solutionRecord) { + safeDetail.value.solutionRecord = {}; + } + safeDetail.value.solutionRecord.solution = value; + } +}); + +// 未解决问题数量（依赖每个问题项的 solution 字段，确保标记已解决后自动更新） +const unresolvedCount = computed(() => { + const list = (safeDetail.value?.feedbackQuestions as any[]) || []; + return list.filter(item => !item?.solution).length; +}); +const markTitle = (data: any) => { + console.log("标记已解决", data); + operationType.value = "markSolved"; + currentMarkedQuestion.value = data; + // 预填已有值 + operationForm.operationTime = data?.endTime || ""; + operationForm.operationContent = data?.solution || ""; + operationFormRef.value?.clearValidate(); + operationDialogVisible.value = true; +}; +const addRecord = () => { + console.log("添加执行记录"); + operationType.value = "addRecord"; + operationDialogVisible.value = true; +}; +const addFinish = () => { + console.log("添加完结情况"); + operationType.value = "addFinish"; + const sr = (props.detailData as any)?.solutionRecord; + // 优先从父级已有完结情况预填，其次使用本地 finishRecord + if (sr && (sr.endRecordTime || sr.endRecord)) { + operationForm.operationTime = sr.endRecordTime || ""; + operationForm.operationContent = sr.endRecord || ""; + } else if (finishRecord.value) { + operationForm.operationTime = finishRecord.value.time; + operationForm.operationContent = finishRecord.value.content; + } else { + // 重置表单 + operationForm.operationTime = ""; + operationForm.operationContent = ""; + } + operationDialogVisible.value = true; +}; + +// 操作弹窗相关方法 +const closeOperationDialog = () => { + operationDialogVisible.value = false; + // 重置表单 + operationForm.operationTime = ""; + operationForm.operationContent = ""; + // 清除表单验证状态 + operationFormRef.value?.clearValidate(); + // 重置当前标记项 + currentMarkedQuestion.value = null; +}; + +const confirmOperation = async () => { + if (!operationFormRef.value) return; + + try { + await operationFormRef.value.validate(); + + const { operationTime, operationContent } = operationForm; + + // 根据操作类型处理数据 + switch (operationType.value) { + case "addRecord": + // 添加执行记录 + executionRecords.value.push({ + time: operationTime, + content: operationContent + }); + // 同步到父数据 solutionRecord.record + if (!props.detailData.solutionRecord) + props.detailData.solutionRecord = {} as any; + if (!Array.isArray(props.detailData.solutionRecord.record)) + props.detailData.solutionRecord.record = []; + props.detailData.solutionRecord.record.push({ + executionTime: operationTime, + executionRecords: operationContent + }); + break; + case "addFinish": + // 添加或修改完结情况 + finishRecord.value = { + time: operationTime, + content: operationContent + }; + // 同步到父数据 solutionRecord.endRecordTime / endRecord + if (!props.detailData.solutionRecord) + props.detailData.solutionRecord = {} as any; + props.detailData.solutionRecord.endRecordTime = operationTime; + props.detailData.solutionRecord.endRecord = operationContent; + break; + case "markSolved": + // 将提交的数据写回当前问题项 + if (currentMarkedQuestion.value) { + currentMarkedQuestion.value.endTime = operationTime; + currentMarkedQuestion.value.solution = operationContent; + } + break; + } + + console.log("确认操作", { + type: operationType.value, + time: operationTime, + content: operationContent + }); + closeOperationDialog(); + } catch (error) { + console.log("表单验证失败", error); + } }; function onClickCancel() { console.log("取消"); + emit("update:visible", false); + // 清空本地临时数据 + executionRecords.value = []; + finishRecord.value = null; + currentMarkedQuestion.value = null; + operationForm.operationTime = ""; + operationForm.operationContent = ""; + activeName.value = 0; + operationFormRef.value?.clearValidate(); } function onClickSave() { - console.log("保存"); + console.log("保存", props.detailData); + let copyParams = JSON.parse(JSON.stringify(props.detailData)); + delete copyParams.solutionEnd; + addOrEditApi(copyParams).then(res => { + if (res.code === 200) { + ElMessage.success("提交成功"); + // 关闭弹窗 + emit("update:visible", false); + // 清空本地临时数据 + executionRecords.value = []; + finishRecord.value = null; + currentMarkedQuestion.value = null; + operationForm.operationTime = ""; + operationForm.operationContent = ""; + activeName.value = 0; + operationFormRef.value?.clearValidate(); + // 通知父级刷新列表（复用父级的handleReset实现刷新） + emit("handleReset"); + } + }); } @@ -202,6 +539,9 @@ function onClickSave() { display: flex; align-items: center; justify-content: space-between; + padding-bottom: 10px; + border-bottom: 1px solid #ccc; + margin-bottom: 10px; } .status-box { display: flex; diff --git a/src/views/toschoolinfomanage/index.vue b/src/views/toschoolinfomanage/index.vue index 5b8873e..ec32409 100644 --- a/src/views/toschoolinfomanage/index.vue +++ b/src/views/toschoolinfomanage/index.vue @@ -38,7 +38,6 @@ v-model="query.people" placeholder="请选择赴校人员" clearable - multiple filterable style="width: 300px" > @@ -125,7 +124,11 @@ - 详情 跟进 @@ -157,7 +160,13 @@ - + From 26a1b003cd8bac0885d70b17a5811f64adecec1f 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, 22 Aug 2025 19:15:07 +0800 Subject: [PATCH 24/43] =?UTF-8?q?=E5=AE=8C=E5=96=84=20=E5=AD=A6=E7=94=9F?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/student.ts | 53 ++++++ src/views/student/edit.vue | 323 ++++++++++++++++-------------------- src/views/student/index.vue | 96 +++++------ 3 files changed, 234 insertions(+), 238 deletions(-) create mode 100644 src/api/student.ts diff --git a/src/api/student.ts b/src/api/student.ts new file mode 100644 index 0000000..42b36c3 --- /dev/null +++ b/src/api/student.ts @@ -0,0 +1,53 @@ +import { http } from "@/utils/http"; +import { Res } from "@/utils/http/types"; +// 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" + }, + responseType: "blob" + } + ); +} + +/** + * @description 修改学生拓展信息 + * @return {object} + */ +export function EditStudent(data) { + return http.request>("post", `Student/EditInfo`, { + data + }); +} + +/** + * @description 修改学生拓展信息 + * @return {object} + */ +export function PageList(data) { + return http.request>("post", `Student/PageList`, { + data + }); +} +/** + * @description 获取学生拓展信息 + * @return {object} + */ +export function StudentInfo(uid) { + return http.request>("get", `Student/Info?uid=${uid}`); +} diff --git a/src/views/student/edit.vue b/src/views/student/edit.vue index 44ea81b..bf52070 100644 --- a/src/views/student/edit.vue +++ b/src/views/student/edit.vue @@ -1,31 +1,6 @@ From c323620136607281f6d9d50d50fc79dc763fc511 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, 25 Aug 2025 10:39:33 +0800 Subject: [PATCH 27/43] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20Staging=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.staging | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.env.staging b/.env.staging index 65b57e3..bcf2c26 100644 --- a/.env.staging +++ b/.env.staging @@ -14,3 +14,9 @@ VITE_CDN = true # 压缩时不删除原始文件的配置：gzip、brotli、both（同时开启 gzip 与 brotli 压缩）、none（不开启压缩，默认） # 压缩时删除原始文件的配置：gzip-clear、brotli-clear、both-clear（同时开启 gzip 与 brotli 压缩）、none（不开启压缩，默认） VITE_COMPRESSION = "none" + + +# 接口地址 +VITE_API_BASEURL = "https://learn-archives-admin-dev.23544.com/api" +#数据中心后台地址 +VITE_API_USERCENTER_URL = "https://dca.w.23544.com:8843/api" \ No newline at end of file From a4795b7d90ba27fac2f6978f9ae257f5a7154a75 Mon Sep 17 00:00:00 2001 From: tiananlin Date: Mon, 25 Aug 2025 14:13:34 +0800 Subject: [PATCH 28/43] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20Dockerfiles/Dockerfi?= =?UTF-8?q?le-staging/Dockerfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfiles/Dockerfile-staging/Dockerfile | 41 +++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 Dockerfiles/Dockerfile-staging/Dockerfile diff --git a/Dockerfiles/Dockerfile-staging/Dockerfile b/Dockerfiles/Dockerfile-staging/Dockerfile new file mode 100644 index 0000000..e15a94f --- /dev/null +++ b/Dockerfiles/Dockerfile-staging/Dockerfile @@ -0,0 +1,41 @@ +# 构建阶段 +FROM m.daocloud.io/docker.io/library/node:22.14.0 AS builder + +# 设置工作目录 +WORKDIR /app + +# 设置 npm 镜像源 +RUN npm config set registry https://registry.npmmirror.com/ +RUN npm config set fetch-retries 3 +RUN npm config set fetch-retry-mintimeout 5000 +RUN npm config set fetch-retry-maxtimeout 60000 + +# 安装pnpm +RUN npm install -g pnpm + +# 复制源代码 +COPY . . + +# 设置 pnpm 下载源 +RUN pnpm config set registry https://registry.npmmirror.com/ + +# 安装依赖 +RUN pnpm i --fetch-timeout 300000 + +# 构建项目 +RUN pnpm build:staging + +# 部署阶段 +FROM m.daocloud.io/docker.io/library/nginx:alpine + +# 复制构建产物到 Nginx 目录 +COPY --from=builder --chown=nginx:nginx /app/dist /usr/share/nginx/html + +# 复制 Nginx 配置 +COPY Dockerfiles/Dockerfile-staging/default.conf /etc/nginx/conf.d/default.conf + +# 暴露端口 +EXPOSE 80 + +# 启动 Nginx +CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file From b871543d5e1428addd3f804ce5b34bf2d65ab4af Mon Sep 17 00:00:00 2001 From: tiananlin Date: Mon, 25 Aug 2025 14:14:03 +0800 Subject: [PATCH 29/43] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20Dockerfiles/Dockerfi?= =?UTF-8?q?le-staging/default.conf?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfiles/Dockerfile-staging/default.conf | 47 +++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 Dockerfiles/Dockerfile-staging/default.conf diff --git a/Dockerfiles/Dockerfile-staging/default.conf b/Dockerfiles/Dockerfile-staging/default.conf new file mode 100644 index 0000000..f761306 --- /dev/null +++ b/Dockerfiles/Dockerfile-staging/default.conf @@ -0,0 +1,47 @@ +server { + listen 80; + server_name localhost; + + # 基础设置 + root /usr/share/nginx/html; + index index.html index.htm; + try_files $uri $uri/ /index.html; + + client_max_body_size 100m; + + # 错误页面配置 + error_page 500 502 503 504 /50x.html; + location = /50x.html { + internal; # 仅用于内部错误请求 + } + + # Gzip 压缩设置 + gzip on; + gzip_min_length 1k; + gzip_comp_level 6; + gzip_types text/plain text/css text/javascript application/json + application/javascript application/x-javascript application/xml; + gzip_vary on; + gzip_disable "MSIE [1-6]\."; + + # 静态资源缓存优化 + location ~* \.(jpg|jpeg|gif|ico|css|js)$ { + expires 7d; + add_header Cache-Control "public, no-transform"; + } + + # API 代理配置 + location /api/ { + proxy_pass http://learn-archives-api-svc/api/; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; # 添加协议头 + + # 优化代理性能 + proxy_connect_timeout 30s; + proxy_send_timeout 60s; + proxy_read_timeout 60s; + proxy_buffering on; + } +} \ No newline at end of file From c00574ca599ef1c3307dbd2e06de2e9d6f94666b 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, 25 Aug 2025 11:19:34 +0800 Subject: [PATCH 30/43] =?UTF-8?q?=E7=A7=BB=E9=99=A4=20=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=97=B6=E5=80=99=E7=9A=84=E9=BB=98=E8=AE=A4=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/login/index.vue | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 25290d0..6e5a538 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -21,7 +21,7 @@ import Lock from "~icons/ri/lock-fill"; import User from "~icons/ri/user-3-fill"; defineOptions({ - name: "Login" + name: "Login", }); const router = useRouter(); @@ -37,21 +37,21 @@ dataThemeChange(overallStyle.value); const { title } = useNav(); const ruleForm = reactive({ - account: "admin", - password: "123456" + account: "", + password: "", }); const onLogin = async (formEl: FormInstance | undefined) => { if (!formEl) return; - await formEl.validate(valid => { + await formEl.validate((valid) => { if (valid) { loading.value = true; useUserStoreHook() .loginByUsername({ account: ruleForm.account, - password: ruleForm.password + password: ruleForm.password, }) - .then(res => { + .then((res) => { if ((res.code = 200)) { // 获取后端路由 return initRouter().then(() => { @@ -72,18 +72,10 @@ const onLogin = async (formEl: FormInstance | undefined) => { }); }; -const immediateDebounce: any = debounce( - formRef => onLogin(formRef), - 1000, - true -); +const immediateDebounce: any = debounce((formRef) => onLogin(formRef), 1000, true); useEventListener(document, "keydown", ({ code }) => { - if ( - ["Enter", "NumpadEnter"].includes(code) && - !disabled.value && - !loading.value - ) + if (["Enter", "NumpadEnter"].includes(code) && !disabled.value && !loading.value) immediateDebounce(ruleFormRef.value); }); @@ -126,8 +118,8 @@ useEventListener(document, "keydown", ({ code }) => { { required: true, message: '请输入账号', - trigger: 'blur' - } + trigger: 'blur', + }, ]" prop="account" > From c81ed3a84c05ae4e7dabebd289338bb88c9012b4 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, 25 Aug 2025 14:52:40 +0800 Subject: [PATCH 31/43] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20staging=E6=89=93?= =?UTF-8?q?=E5=8C=85=E6=97=A0=E6=B3=95=E8=BF=90=E8=A1=8C=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.staging | 2 +- src/router/utils.ts | 2 +- src/utils/http/index.ts | 12 ++++++++++-- src/utils/rules.ts | 22 +++++++++++++++++++++- src/views/admin/index.vue | 14 ++++++++++---- src/views/exam/index.vue | 13 +++++++++++++ src/views/login/index.vue | 8 ++++---- src/views/school/index.vue | 35 ++++++++++++++--------------------- 8 files changed, 74 insertions(+), 34 deletions(-) diff --git a/.env.staging b/.env.staging index bcf2c26..f613c0f 100644 --- a/.env.staging +++ b/.env.staging @@ -8,7 +8,7 @@ VITE_PUBLIC_PATH = / VITE_ROUTER_HISTORY = "hash" # 是否在打包时使用cdn替换本地库 替换 true 不替换 false -VITE_CDN = true +VITE_CDN = false # 是否启用gzip压缩或brotli压缩（分两种情况，删除原始文件和不删除原始文件） # 压缩时不删除原始文件的配置：gzip、brotli、both（同时开启 gzip 与 brotli 压缩）、none（不开启压缩，默认） diff --git a/src/router/utils.ts b/src/router/utils.ts index 0478475..2010a40 100644 --- a/src/router/utils.ts +++ b/src/router/utils.ts @@ -150,7 +150,7 @@ function addPathMatch() { /** 处理动态路由（后端返回的路由） */ function handleAsyncRoutes(routeList) { - if (routeList.length === 0) { + if (routeList == null ||routeList.length === 0) { usePermissionStoreHook().handleWholeMenus(routeList); } else { formatFlatteningRoutes(addAsyncRoutes(routeList)).map( diff --git a/src/utils/http/index.ts b/src/utils/http/index.ts index bb08ace..02ee09c 100644 --- a/src/utils/http/index.ts +++ b/src/utils/http/index.ts @@ -15,6 +15,8 @@ import { getToken, formatToken } from "@/utils/auth"; import { useUserStoreHook } from "@/store/modules/user"; // import { string } from "vue-types"; import router from "@/router"; +import { ElMessage } from "element-plus"; +import { message } from "../message"; /**请求后端的地址 未配置则访问BaseURL */ const apiServiceConfig = { @@ -231,10 +233,16 @@ class PureHttp { return new Promise((resolve, reject) => { PureHttp.axiosInstance .request(config) - .then((response: undefined) => { - resolve(response); + .then((response: any) => { + if (response.code != null && response.code !== 200) { + + message(response.message, { type: "error" }); + } resolve(response); }) .catch(error => { + if (error.status != 200) { + if (error.status == 200) ElMessage.warning("请求失败" + error.message); + } reject(error); }); }); diff --git a/src/utils/rules.ts b/src/utils/rules.ts index 3f6f515..89b8638 100644 --- a/src/utils/rules.ts +++ b/src/utils/rules.ts @@ -1,6 +1,26 @@ export const ruleRequired = [ { required: true, message: "不能为空", trigger: "blur" } ]; + +/** 验证长度不得超过多少 */ +type Rule = { + required?: boolean; + message: string; + trigger: string; + max?: number; + min?: number; + pattern?: RegExp; +}; + +export const ruleRequiredI = (max: number = 20, min: number = 0): Rule[] => { + let res: Rule[] = [ + { required: true, message: "不能为空", trigger: "blur" }, + { max: max, message: `长度不能超过${max}`, trigger: "blur" } + ]; + if (min > 0) + res.push({ min: min, message: `长度不能小于${min}`, trigger: "blur" }); + return res; +}; export const ruleRequiredNumber = [ { required: true, message: "不能为空", trigger: "blur" }, { @@ -15,7 +35,7 @@ export const rulePassword = [ ]; export const ruleAccount = [ { required: true, message: "不能为空", trigger: "blur" }, - { min: 13, message: "长度必须大于12", trigger: "blur" } + { min: 9, message: "长度必须大于8", trigger: "blur" } ]; export const rulePhone = [ diff --git a/src/views/admin/index.vue b/src/views/admin/index.vue index 66e4fc4..46d8fda 100644 --- a/src/views/admin/index.vue +++ b/src/views/admin/index.vue @@ -4,7 +4,13 @@ import { ConditionalType, TableConfig } from "@/components/hTable/hTable"; import { onMounted, ref, defineOptions } from "vue"; import { fa } from "element-plus/es/locales.mjs"; import { hTableAPI } from "@/api/hTable"; -import { ruleAccount, rulePassword, rulePhone, ruleRequired } from "@/utils/rules"; +import { + ruleAccount, + rulePassword, + rulePhone, + ruleRequired, + ruleRequiredI, +} from "@/utils/rules"; const ControllerName = "Admin"; defineOptions({ @@ -72,7 +78,7 @@ const tableData: TableConfig = { name: { label: "名称", width: "180px", - rules: ruleRequired, + rules: ruleRequiredI(12, 2), search: true, searchType: ConditionalType.Like, add: true, // 字段允许添加 @@ -88,7 +94,7 @@ const tableData: TableConfig = { }, account: { label: "账号", - rules: ruleAccount, + rules: ruleRequiredI(20, 8), search: true, add: true, // 字段允许添加 edit: false, // 字段允许修改 @@ -97,7 +103,7 @@ const tableData: TableConfig = { label: "密码", show: false, /**长度必须大于6 */ - rules: rulePassword, + rules: ruleRequiredI(32, 6), search: false, add: true, // 字段允许添加 edit: false, // 字段允许修改 diff --git a/src/views/exam/index.vue b/src/views/exam/index.vue index 014227f..7d968b2 100644 --- a/src/views/exam/index.vue +++ b/src/views/exam/index.vue @@ -74,6 +74,13 @@ const tableData: TableConfig = { click: entryExam, btnStyle: "primary", // topBtn: true才生效 success danger }, + { + topBtn: true, // 头部按钮 + show: true, + label: "录入成绩模板", + click: DwImportTemplate, + btnStyle: "info", // topBtn: true才生效 success danger + }, ], column: { // 行数据 @@ -166,6 +173,12 @@ const tableData: TableConfig = { }, selectRows: [], }; + +function DwImportTemplate(obj, row, callBack) { + const baseUrl = import.meta.env.VITE_API_BASEURL; + const excelImportUsersUrl = `${baseUrl}/ExamClassInfo/DwImportTemplate`; + window.open(excelImportUsersUrl, "_blank"); +} function entryExam(obj, row, callBack) { entryExamInfo(row[0].id); } diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 6e5a538..2752371 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -37,8 +37,8 @@ dataThemeChange(overallStyle.value); const { title } = useNav(); const ruleForm = reactive({ - account: "", - password: "", + account: "admin", + password: "123456", }); const onLogin = async (formEl: FormInstance | undefined) => { @@ -52,7 +52,7 @@ const onLogin = async (formEl: FormInstance | undefined) => { password: ruleForm.password, }) .then((res) => { - if ((res.code = 200)) { + if (res.code == 200) { // 获取后端路由 return initRouter().then(() => { disabled.value = true; @@ -64,7 +64,7 @@ const onLogin = async (formEl: FormInstance | undefined) => { .finally(() => (disabled.value = false)); }); } else { - message("登录失败", { type: "error" }); + // message("登录失败", { type: "error" }); } }) .finally(() => (loading.value = false)); diff --git a/src/views/school/index.vue b/src/views/school/index.vue index a7dc1f2..0cc2547 100644 --- a/src/views/school/index.vue +++ b/src/views/school/index.vue @@ -4,7 +4,7 @@ import { ConditionalType, TableConfig } from "@/components/hTable/hTable"; import { onMounted, ref } from "vue"; import { fa } from "element-plus/es/locales.mjs"; defineOptions({ - name: "School" + name: "School", }); onMounted(() => {}); @@ -22,7 +22,7 @@ const tableData: TableConfig = { PageSize: 20, OrderBy: "CreateTime", // 排序 defaultConditions: [], // 默认查询条件 - Conditions: [] + Conditions: [], }, operationColumn: true, // 显示操作按钮 operationColumnData: [ @@ -30,7 +30,7 @@ const tableData: TableConfig = { // 操作按钮 topBtn: false, // 是头部按钮 label: "修改", - btnType: "edit" // 按钮类型 add edit del custom + btnType: "edit", // 按钮类型 add edit del custom }, { topBtn: true, // 头部按钮 @@ -42,16 +42,9 @@ const tableData: TableConfig = { title: "新增学校", // 弹出框title src: "school/SchoolEdit", // 组件路径 width: "550px", // 弹框宽度 - height: "300px" // 弹框高度 - } + height: "300px", // 弹框高度 + }, }, - { - topBtn: false, // 头部按钮 - show: true, - label: "删除", - btnType: "del", // 按钮类型 add edit del 不设置则 自定义按钮 - btnStyle: "danger" // topBtn: true才生效 success danger - } ], column: { // 行数据 @@ -60,7 +53,7 @@ const tableData: TableConfig = { search: true, add: false, // 字段允许添加 edit: false, // 字段允许修改 - width: "150px" + width: "150px", }, name: { label: "学校名称", @@ -68,30 +61,30 @@ const tableData: TableConfig = { search: true, searchType: ConditionalType.Like, add: true, // 字段允许添加 - edit: true // 字段允许修改 + edit: true, // 字段允许修改 }, loc: { label: "地区", width: "300px", search: true, - custom: row => `${row.pname}-${row.cname}-${row.rname}`, + custom: (row) => `${row.pname}-${row.cname}-${row.rname}`, add: false, // 字段允许添加 - edit: false // 字段允许修改 + edit: false, // 字段允许修改 }, enable: { label: "启用", type: "switch", search: true, - custom: row => (row.enable ? "启用" : "禁用"), + custom: (row) => (row.enable ? "启用" : "禁用"), add: true, // 字段允许添加 - edit: true // 字段允许修改 - } + edit: true, // 字段允许修改 + }, }, data: [], pageData: { - total: 0 + total: 0, }, - selectRows: [] + selectRows: [], }; From 689d9a32bf801c139c41327b639865a96bc75b52 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, 25 Aug 2025 15:20:55 +0800 Subject: [PATCH 32/43] =?UTF-8?q?=E5=88=A0=E9=99=A4=20=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=97=B6=E7=9A=84=E9=BB=98=E8=AE=A4=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/login/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 2752371..8b91080 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -37,8 +37,8 @@ dataThemeChange(overallStyle.value); const { title } = useNav(); const ruleForm = reactive({ - account: "admin", - password: "123456", + account: "", + password: "", }); const onLogin = async (formEl: FormInstance | undefined) => { From 6b67a6131668cb7f88be077308234deab443dfcc Mon Sep 17 00:00:00 2001 From: tiananlin Date: Mon, 25 Aug 2025 15:31:05 +0800 Subject: [PATCH 33/43] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20Dockerfiles/Dockerfi?= =?UTF-8?q?le-staging/default.conf?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfiles/Dockerfile-staging/default.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfiles/Dockerfile-staging/default.conf b/Dockerfiles/Dockerfile-staging/default.conf index f761306..3de8a37 100644 --- a/Dockerfiles/Dockerfile-staging/default.conf +++ b/Dockerfiles/Dockerfile-staging/default.conf @@ -32,7 +32,7 @@ server { # API 代理配置 location /api/ { - proxy_pass http://learn-archives-api-svc/api/; + proxy_pass http://learn-archives-api-svc:8080/api/; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; From 1594810b5707fb682575080fcdc566317d49a173 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, 25 Aug 2025 16:49:54 +0800 Subject: [PATCH 34/43] =?UTF-8?q?=E5=AE=8C=E5=96=84=20=E6=96=B0=E7=9A=84?= =?UTF-8?q?=E5=AD=A6=E7=94=9F=E8=A1=A5=E5=8A=A9=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/enum.ts | 3 +- src/views/student/edit.vue | 67 +++++++++--- src/views/student/index.vue | 12 ++- src/views/teacher/index.vue | 3 +- src/views/toschoolinfomanage/addModal.vue | 122 ++++++++-------------- 5 files changed, 112 insertions(+), 95 deletions(-) diff --git a/src/api/enum.ts b/src/api/enum.ts index 055735b..1d8add7 100644 --- a/src/api/enum.ts +++ b/src/api/enum.ts @@ -1,3 +1,4 @@ +import { ComboModel } from "@/components/hTable/hTable"; import { http } from "@/utils/http"; import type { Res } from "@/utils/http/types"; @@ -7,7 +8,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 获取枚举对象 diff --git a/src/views/student/edit.vue b/src/views/student/edit.vue index 79f662a..df4ebbb 100644 --- a/src/views/student/edit.vue +++ b/src/views/student/edit.vue @@ -34,16 +34,6 @@ - - - - - + + + + + - + + +
+ + + + + + + + + +
+ + + +