From 4023e9ab37d41c33ddcd598b383f96f83ce82252 Mon Sep 17 00:00:00 2001 From: zwt13703 Date: Thu, 12 Mar 2026 12:59:01 +0800 Subject: [PATCH] updates --- .vscode/settings.json | 2 +- src/locales/langs/en-us.ts | 4 + src/locales/langs/zh-cn.ts | 5 + .../api/art/history-score-control-line.ts | 46 +- src/service/api/art/major.ts | 46 +- .../api/art/school-recruit-major-history.ts | 46 +- src/service/api/art/school-recruit-major.ts | 46 +- .../art.history-score-control-line.api.d.ts | 150 ++-- src/typings/api/art.major.api.d.ts | 150 ++-- src/typings/api/art.school-detail.api.d.ts | 100 ++- .../art.school-recruit-major-history.api.d.ts | 270 +++---- .../api/art.school-recruit-major.api.d.ts | 286 +++---- src/typings/api/art.school.api.d.ts | 49 +- src/typings/components.d.ts | 6 +- .../art/history-score-control-line/index.vue | 521 +++++++++---- ...tory-score-control-line-operate-drawer.vue | 82 +- .../history-score-control-line-search.vue | 31 +- src/views/art/major/index.vue | 508 +++++++++---- .../major/modules/major-operate-drawer.vue | 107 +-- src/views/art/major/modules/major-search.vue | 32 +- .../school-recruit-major-history/index.vue | 695 +++++++++++------ ...l-recruit-major-history-operate-drawer.vue | 157 +++- .../school-recruit-major-history-search.vue | 46 +- src/views/art/school-recruit-major/index.vue | 710 +++++++++++------- .../school-recruit-major-operate-drawer.vue | 169 +++-- .../modules/school-recruit-major-search.vue | 110 ++- src/views/art/school/index.vue | 38 +- .../school/modules/school-detail/index.vue | 123 ++- .../modules/school-detail-operate-drawer.vue | 394 ++++++++-- .../modules/school-detail-search.vue | 199 ++++- .../school/modules/school-operate-drawer.vue | 366 +++++++-- .../art/school/modules/school-search.vue | 29 +- .../school/modules/school-sub-table-modal.vue | 6 +- 33 files changed, 3782 insertions(+), 1747 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 6236cf2..71e2ede 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -34,7 +34,7 @@ "/docs": true, "**/dist/**": true, "**/node_modules": true, - "node_modules/**": true, + "node_modules/**": true }, "cSpell.words": ["Axios", "tinymce"] } diff --git a/src/locales/langs/en-us.ts b/src/locales/langs/en-us.ts index a200743..d2e614f 100644 --- a/src/locales/langs/en-us.ts +++ b/src/locales/langs/en-us.ts @@ -302,6 +302,8 @@ const local: App.I18n.Schema = { tool: 'System Tools', tool_gen: 'Code Generation', art: 'Art', + 'art_history-score-control-line': 'History Score Control Line', + art_major: 'Art Major Library', art_school: 'School', art_school_modules: 'School Modules', 'art_school_modules_school-campus': 'School Campus', @@ -314,6 +316,8 @@ const local: App.I18n.Schema = { 'art_school_modules_school-media': 'School Media', 'art_school_modules_school-name': 'School Name', 'art_school_modules_school-tag': 'School Tag', + 'art_school-recruit-major': 'School Recruit Major', + 'art_school-recruit-major-history': 'School Recruit Major History', about: 'About' }, menu: { diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts index 78ad3b8..189a7e4 100644 --- a/src/locales/langs/zh-cn.ts +++ b/src/locales/langs/zh-cn.ts @@ -298,6 +298,8 @@ const local: App.I18n.Schema = { tool: '系统工具', tool_gen: '代码生成', art: '艺术院校', + 'art_history-score-control-line': '历年省控线', + art_major: '艺术专业库', art_school: '院校管理', art_school_modules: '院校子模块', 'art_school_modules_school-campus': '校区管理', @@ -309,6 +311,9 @@ const local: App.I18n.Schema = { 'art_school_modules_school-major-tag': '专业标签', 'art_school_modules_school-media': '媒体管理', 'art_school_modules_school-name': '院校名称', + 'art_school_modules_school-tag': '学校标签', + 'art_school-recruit-major': '院校招录专业', + 'art_school-recruit-major-history': '院校招录专业历年录取', about: '关于' }, menu: { diff --git a/src/service/api/art/history-score-control-line.ts b/src/service/api/art/history-score-control-line.ts index 0776fbe..6f92089 100644 --- a/src/service/api/art/history-score-control-line.ts +++ b/src/service/api/art/history-score-control-line.ts @@ -1,35 +1,35 @@ import { request } from '@/service/request'; /** 获取历年省控线列表 */ -export function fetchGetHistoryScoreControlLineList (params?: Api.Art.HistoryScoreControlLineSearchParams) { - return request({ - url: '/art/historyScoreControlLine/list', - method: 'get', - params - }); +export function fetchGetHistoryScoreControlLineList(params?: Api.Art.HistoryScoreControlLineSearchParams) { + return request({ + url: '/art/historyScoreControlLine/list', + method: 'get', + params + }); } /** 新增历年省控线 */ -export function fetchCreateHistoryScoreControlLine (data: Api.Art.HistoryScoreControlLineOperateParams) { - return request({ - url: '/art/historyScoreControlLine', - method: 'post', - data - }); +export function fetchCreateHistoryScoreControlLine(data: Api.Art.HistoryScoreControlLineOperateParams) { + return request({ + url: '/art/historyScoreControlLine', + method: 'post', + data + }); } /** 修改历年省控线 */ -export function fetchUpdateHistoryScoreControlLine (data: Api.Art.HistoryScoreControlLineOperateParams) { - return request({ - url: '/art/historyScoreControlLine', - method: 'put', - data - }); +export function fetchUpdateHistoryScoreControlLine(data: Api.Art.HistoryScoreControlLineOperateParams) { + return request({ + url: '/art/historyScoreControlLine', + method: 'put', + data + }); } /** 批量删除历年省控线 */ -export function fetchBatchDeleteHistoryScoreControlLine (controlIds: CommonType.IdType[]) { - return request({ - url: `/art/historyScoreControlLine/${controlIds.join(',')}`, - method: 'delete' - }); +export function fetchBatchDeleteHistoryScoreControlLine(controlIds: CommonType.IdType[]) { + return request({ + url: `/art/historyScoreControlLine/${controlIds.join(',')}`, + method: 'delete' + }); } diff --git a/src/service/api/art/major.ts b/src/service/api/art/major.ts index ec4c4a3..a95782c 100644 --- a/src/service/api/art/major.ts +++ b/src/service/api/art/major.ts @@ -1,35 +1,35 @@ import { request } from '@/service/request'; /** 获取艺术专业库列表 */ -export function fetchGetMajorList (params?: Api.Art.MajorSearchParams) { - return request({ - url: '/art/major/list', - method: 'get', - params - }); +export function fetchGetMajorList(params?: Api.Art.MajorSearchParams) { + return request({ + url: '/art/major/list', + method: 'get', + params + }); } /** 新增艺术专业库 */ -export function fetchCreateMajor (data: Api.Art.MajorOperateParams) { - return request({ - url: '/art/major', - method: 'post', - data - }); +export function fetchCreateMajor(data: Api.Art.MajorOperateParams) { + return request({ + url: '/art/major', + method: 'post', + data + }); } /** 修改艺术专业库 */ -export function fetchUpdateMajor (data: Api.Art.MajorOperateParams) { - return request({ - url: '/art/major', - method: 'put', - data - }); +export function fetchUpdateMajor(data: Api.Art.MajorOperateParams) { + return request({ + url: '/art/major', + method: 'put', + data + }); } /** 批量删除艺术专业库 */ -export function fetchBatchDeleteMajor (majorIds: CommonType.IdType[]) { - return request({ - url: `/art/major/${majorIds.join(',')}`, - method: 'delete' - }); +export function fetchBatchDeleteMajor(majorIds: CommonType.IdType[]) { + return request({ + url: `/art/major/${majorIds.join(',')}`, + method: 'delete' + }); } diff --git a/src/service/api/art/school-recruit-major-history.ts b/src/service/api/art/school-recruit-major-history.ts index 21d1249..d96c0a2 100644 --- a/src/service/api/art/school-recruit-major-history.ts +++ b/src/service/api/art/school-recruit-major-history.ts @@ -1,35 +1,35 @@ import { request } from '@/service/request'; /** 获取院校招录专业历年录取数据列表 */ -export function fetchGetSchoolRecruitMajorHistoryList (params?: Api.Art.SchoolRecruitMajorHistorySearchParams) { - return request({ - url: '/art/schoolRecruitMajorHistory/list', - method: 'get', - params - }); +export function fetchGetSchoolRecruitMajorHistoryList(params?: Api.Art.SchoolRecruitMajorHistorySearchParams) { + return request({ + url: '/art/schoolRecruitMajorHistory/list', + method: 'get', + params + }); } /** 新增院校招录专业历年录取数据 */ -export function fetchCreateSchoolRecruitMajorHistory (data: Api.Art.SchoolRecruitMajorHistoryOperateParams) { - return request({ - url: '/art/schoolRecruitMajorHistory', - method: 'post', - data - }); +export function fetchCreateSchoolRecruitMajorHistory(data: Api.Art.SchoolRecruitMajorHistoryOperateParams) { + return request({ + url: '/art/schoolRecruitMajorHistory', + method: 'post', + data + }); } /** 修改院校招录专业历年录取数据 */ -export function fetchUpdateSchoolRecruitMajorHistory (data: Api.Art.SchoolRecruitMajorHistoryOperateParams) { - return request({ - url: '/art/schoolRecruitMajorHistory', - method: 'put', - data - }); +export function fetchUpdateSchoolRecruitMajorHistory(data: Api.Art.SchoolRecruitMajorHistoryOperateParams) { + return request({ + url: '/art/schoolRecruitMajorHistory', + method: 'put', + data + }); } /** 批量删除院校招录专业历年录取数据 */ -export function fetchBatchDeleteSchoolRecruitMajorHistory (historyIds: CommonType.IdType[]) { - return request({ - url: `/art/schoolRecruitMajorHistory/${historyIds.join(',')}`, - method: 'delete' - }); +export function fetchBatchDeleteSchoolRecruitMajorHistory(historyIds: CommonType.IdType[]) { + return request({ + url: `/art/schoolRecruitMajorHistory/${historyIds.join(',')}`, + method: 'delete' + }); } diff --git a/src/service/api/art/school-recruit-major.ts b/src/service/api/art/school-recruit-major.ts index cf9ca28..fccd692 100644 --- a/src/service/api/art/school-recruit-major.ts +++ b/src/service/api/art/school-recruit-major.ts @@ -1,35 +1,35 @@ import { request } from '@/service/request'; /** 获取院校招录专业列表 */ -export function fetchGetSchoolRecruitMajorList (params?: Api.Art.SchoolRecruitMajorSearchParams) { - return request({ - url: '/art/schoolRecruitMajor/list', - method: 'get', - params - }); +export function fetchGetSchoolRecruitMajorList(params?: Api.Art.SchoolRecruitMajorSearchParams) { + return request({ + url: '/art/schoolRecruitMajor/list', + method: 'get', + params + }); } /** 新增院校招录专业 */ -export function fetchCreateSchoolRecruitMajor (data: Api.Art.SchoolRecruitMajorOperateParams) { - return request({ - url: '/art/schoolRecruitMajor', - method: 'post', - data - }); +export function fetchCreateSchoolRecruitMajor(data: Api.Art.SchoolRecruitMajorOperateParams) { + return request({ + url: '/art/schoolRecruitMajor', + method: 'post', + data + }); } /** 修改院校招录专业 */ -export function fetchUpdateSchoolRecruitMajor (data: Api.Art.SchoolRecruitMajorOperateParams) { - return request({ - url: '/art/schoolRecruitMajor', - method: 'put', - data - }); +export function fetchUpdateSchoolRecruitMajor(data: Api.Art.SchoolRecruitMajorOperateParams) { + return request({ + url: '/art/schoolRecruitMajor', + method: 'put', + data + }); } /** 批量删除院校招录专业 */ -export function fetchBatchDeleteSchoolRecruitMajor (recruitMajorIds: CommonType.IdType[]) { - return request({ - url: `/art/schoolRecruitMajor/${recruitMajorIds.join(',')}`, - method: 'delete' - }); +export function fetchBatchDeleteSchoolRecruitMajor(recruitMajorIds: CommonType.IdType[]) { + return request({ + url: `/art/schoolRecruitMajor/${recruitMajorIds.join(',')}`, + method: 'delete' + }); } diff --git a/src/typings/api/art.history-score-control-line.api.d.ts b/src/typings/api/art.history-score-control-line.api.d.ts index 82a35d8..168da90 100644 --- a/src/typings/api/art.history-score-control-line.api.d.ts +++ b/src/typings/api/art.history-score-control-line.api.d.ts @@ -4,82 +4,82 @@ * All backend api type */ declare namespace Api { - /** - * namespace Art - * - * backend api module: "Art" - */ - namespace Art { - /** history score control line */ - type HistoryScoreControlLine = Common.CommonRecord<{ - /** 省控线主键 */ - controlId: CommonType.IdType; - /** 租户编号 */ - tenantId: CommonType.IdType; - /** 删除标志(0存在 1删除) */ - delFlag: string; - /** 省份行政区划代码 */ - provinceCode: string; - /** 省份名称 */ - provinceName: string; - /** 年份 */ - year: number; - /** 专业类别 */ - majorCategory: string; - /** 批次 */ - batchName: string; - /** 科类(文/理) */ - subjectType: string; - /** 文化成绩分数 */ - cultureScore: number; - /** 专业成绩分数 */ - majorScore: number; - /** 文化成绩校考分数 */ - cultureScoreExam: number; - /** 专业成绩校考分数 */ - majorScoreExam: number; - /** 备注 */ - remark: string; - }>; + /** + * namespace Art + * + * backend api module: "Art" + */ + namespace Art { + /** history score control line */ + type HistoryScoreControlLine = Common.CommonRecord<{ + /** 省控线主键 */ + controlId: CommonType.IdType; + /** 租户编号 */ + tenantId: CommonType.IdType; + /** 删除标志(0存在 1删除) */ + delFlag: string; + /** 省份行政区划代码 */ + provinceCode: string; + /** 省份名称 */ + provinceName: string; + /** 年份 */ + year: number; + /** 专业类别 */ + majorCategory: string; + /** 批次 */ + batchName: string; + /** 科类(文/理) */ + subjectType: string; + /** 文化成绩分数 */ + cultureScore: number; + /** 专业成绩分数 */ + majorScore: number; + /** 文化成绩校考分数 */ + cultureScoreExam: number; + /** 专业成绩校考分数 */ + majorScoreExam: number; + /** 备注 */ + remark: string; + }>; - /** history score control line search params */ - type HistoryScoreControlLineSearchParams = CommonType.RecordNullable< - Pick< - Api.Art.HistoryScoreControlLine, - | 'provinceCode' - | 'provinceName' - | 'year' - | 'majorCategory' - | 'batchName' - | 'subjectType' - | 'cultureScore' - | 'majorScore' - | 'cultureScoreExam' - | 'majorScoreExam' - > & - Api.Common.CommonSearchParams - >; + /** history score control line search params */ + type HistoryScoreControlLineSearchParams = CommonType.RecordNullable< + Pick< + Api.Art.HistoryScoreControlLine, + | 'provinceCode' + | 'provinceName' + | 'year' + | 'majorCategory' + | 'batchName' + | 'subjectType' + | 'cultureScore' + | 'majorScore' + | 'cultureScoreExam' + | 'majorScoreExam' + > & + Api.Common.CommonSearchParams + >; - /** history score control line operate params */ - type HistoryScoreControlLineOperateParams = CommonType.RecordNullable< - Pick< - Api.Art.HistoryScoreControlLine, - | 'controlId' - | 'provinceCode' - | 'provinceName' - | 'year' - | 'majorCategory' - | 'batchName' - | 'subjectType' - | 'cultureScore' - | 'majorScore' - | 'cultureScoreExam' - | 'majorScoreExam' - | 'remark' - > - >; + /** history score control line operate params */ + type HistoryScoreControlLineOperateParams = CommonType.RecordNullable< + Pick< + Api.Art.HistoryScoreControlLine, + | 'controlId' + | 'provinceCode' + | 'provinceName' + | 'year' + | 'majorCategory' + | 'batchName' + | 'subjectType' + | 'cultureScore' + | 'majorScore' + | 'cultureScoreExam' + | 'majorScoreExam' + | 'remark' + > + >; - /** history score control line list */ - type HistoryScoreControlLineList = Api.Common.PaginatingQueryRecord; - } + /** history score control line list */ + type HistoryScoreControlLineList = Api.Common.PaginatingQueryRecord; + } } diff --git a/src/typings/api/art.major.api.d.ts b/src/typings/api/art.major.api.d.ts index 1ac3c12..fc3b0f1 100644 --- a/src/typings/api/art.major.api.d.ts +++ b/src/typings/api/art.major.api.d.ts @@ -4,82 +4,82 @@ * All backend api type */ declare namespace Api { - /** - * namespace Art - * - * backend api module: "Art" - */ - namespace Art { - /** major */ - type Major = Common.CommonRecord<{ - /** 专业主键ID */ - majorId: CommonType.IdType; - /** 租户编号 */ - tenantId: CommonType.IdType; - /** 删除标志(0存在 1删除) */ - delFlag: string; - /** 专业名称 */ - majorName: string; - /** 学历层次 */ - educationLevel: string; - /** 专业图标 */ - majorIcon: string; - /** 学制(年) */ - schoolingYears: number; - /** 所属一级学科 */ - disciplinePrimary: string; - /** 所属二级学科 */ - disciplineSecondary: string; - /** 授予学士学位 */ - degreeAwarded: string; - /** 专业概括 */ - summary: string; - /** 培养方向 */ - trainingDirection: string; - /** 主要课程 */ - coreCourses: string; - /** 备注 */ - remark: string; - }>; + /** + * namespace Art + * + * backend api module: "Art" + */ + namespace Art { + /** major */ + type Major = Common.CommonRecord<{ + /** 专业主键ID */ + majorId: CommonType.IdType; + /** 租户编号 */ + tenantId: CommonType.IdType; + /** 删除标志(0存在 1删除) */ + delFlag: string; + /** 专业名称 */ + majorName: string; + /** 学历层次 */ + educationLevel: string; + /** 专业图标 */ + majorIcon: string; + /** 学制(年) */ + schoolingYears: number; + /** 所属一级学科 */ + disciplinePrimary: string; + /** 所属二级学科 */ + disciplineSecondary: string; + /** 授予学士学位 */ + degreeAwarded: string; + /** 专业概括 */ + summary: string; + /** 培养方向 */ + trainingDirection: string; + /** 主要课程 */ + coreCourses: string; + /** 备注 */ + remark: string; + }>; - /** major search params */ - type MajorSearchParams = CommonType.RecordNullable< - Pick< - Api.Art.Major, - | 'majorName' - | 'educationLevel' - | 'majorIcon' - | 'schoolingYears' - | 'disciplinePrimary' - | 'disciplineSecondary' - | 'degreeAwarded' - | 'summary' - | 'trainingDirection' - | 'coreCourses' - > & - Api.Common.CommonSearchParams - >; + /** major search params */ + type MajorSearchParams = CommonType.RecordNullable< + Pick< + Api.Art.Major, + | 'majorName' + | 'educationLevel' + | 'majorIcon' + | 'schoolingYears' + | 'disciplinePrimary' + | 'disciplineSecondary' + | 'degreeAwarded' + | 'summary' + | 'trainingDirection' + | 'coreCourses' + > & + Api.Common.CommonSearchParams + >; - /** major operate params */ - type MajorOperateParams = CommonType.RecordNullable< - Pick< - Api.Art.Major, - | 'majorId' - | 'majorName' - | 'educationLevel' - | 'majorIcon' - | 'schoolingYears' - | 'disciplinePrimary' - | 'disciplineSecondary' - | 'degreeAwarded' - | 'summary' - | 'trainingDirection' - | 'coreCourses' - | 'remark' - > - >; + /** major operate params */ + type MajorOperateParams = CommonType.RecordNullable< + Pick< + Api.Art.Major, + | 'majorId' + | 'majorName' + | 'educationLevel' + | 'majorIcon' + | 'schoolingYears' + | 'disciplinePrimary' + | 'disciplineSecondary' + | 'degreeAwarded' + | 'summary' + | 'trainingDirection' + | 'coreCourses' + | 'remark' + > + >; - /** major list */ - type MajorList = Api.Common.PaginatingQueryRecord; - } + /** major list */ + type MajorList = Api.Common.PaginatingQueryRecord; + } } diff --git a/src/typings/api/art.school-detail.api.d.ts b/src/typings/api/art.school-detail.api.d.ts index fd049fd..44e9607 100644 --- a/src/typings/api/art.school-detail.api.d.ts +++ b/src/typings/api/art.school-detail.api.d.ts @@ -20,6 +20,8 @@ declare namespace Api { schoolId: CommonType.IdType; /** 学校详细介绍(大文本) */ introduction: string; + /** 院校图标 */ + schoolIcon: string; /** 学校地址 */ address: string; /** 联系电话 */ @@ -28,6 +30,44 @@ declare namespace Api { email: string; /** 官网地址 */ website: string; + /** 邮编 */ + postcode: string; + /** 建校时间(年) */ + establishYear: number; + /** 占地面积(亩) */ + campusAreaMu: number; + /** 图书馆藏书量 */ + libraryCollection: number; + /** 男生比例(%) */ + maleRatio: number; + /** 女生比例(%) */ + femaleRatio: number; + /** 是否985(0/1) */ + is985: number; + /** 是否211(0/1) */ + is211: number; + /** 是否双一流(0/1) */ + isDoubleFirstClass: number; + /** 是否重点大学(0/1) */ + isKeyUniversity: number; + /** 标签 */ + tags: string[]; + /** 学生人数 */ + studentCount: number; + /** 教师人数 */ + teacherCount: number; + /** 硕士点数量 */ + masterPoint: number; + /** 博士点数量 */ + doctorPoint: number; + /** 重点专业数量 */ + keyMajorCount: number; + /** 就业率(%) */ + employmentRate: number; + /** 满意度(%) */ + satisfactionRate: number; + /** 外部学校ID */ + univId: number; /** 删除标志(0代表存在 1代表删除) */ delFlag: string; /** 备注 */ @@ -36,7 +76,36 @@ declare namespace Api { /** school detail search params */ type SchoolDetailSearchParams = CommonType.RecordNullable< - Pick & + Pick< + Api.Art.SchoolDetail, + | 'detailId' + | 'schoolId' + | 'introduction' + | 'schoolIcon' + | 'address' + | 'contact' + | 'email' + | 'website' + | 'postcode' + | 'establishYear' + | 'campusAreaMu' + | 'libraryCollection' + | 'maleRatio' + | 'femaleRatio' + | 'is985' + | 'is211' + | 'isDoubleFirstClass' + | 'isKeyUniversity' + | 'tags' + | 'studentCount' + | 'teacherCount' + | 'masterPoint' + | 'doctorPoint' + | 'keyMajorCount' + | 'employmentRate' + | 'satisfactionRate' + | 'univId' + > & Api.Common.CommonSearchParams >; @@ -44,7 +113,34 @@ declare namespace Api { type SchoolDetailOperateParams = CommonType.RecordNullable< Pick< Api.Art.SchoolDetail, - 'detailId' | 'schoolId' | 'introduction' | 'address' | 'contact' | 'email' | 'website' | 'remark' + | 'detailId' + | 'schoolId' + | 'introduction' + | 'schoolIcon' + | 'address' + | 'contact' + | 'email' + | 'website' + | 'postcode' + | 'establishYear' + | 'campusAreaMu' + | 'libraryCollection' + | 'maleRatio' + | 'femaleRatio' + | 'is985' + | 'is211' + | 'isDoubleFirstClass' + | 'isKeyUniversity' + | 'tags' + | 'studentCount' + | 'teacherCount' + | 'masterPoint' + | 'doctorPoint' + | 'keyMajorCount' + | 'employmentRate' + | 'satisfactionRate' + | 'univId' + | 'remark' > >; diff --git a/src/typings/api/art.school-recruit-major-history.api.d.ts b/src/typings/api/art.school-recruit-major-history.api.d.ts index 7ac72df..6c6014f 100644 --- a/src/typings/api/art.school-recruit-major-history.api.d.ts +++ b/src/typings/api/art.school-recruit-major-history.api.d.ts @@ -4,142 +4,142 @@ * All backend api type */ declare namespace Api { - /** - * namespace Art - * - * backend api module: "Art" - */ - namespace Art { - /** school recruit major history */ - type SchoolRecruitMajorHistory = Common.CommonRecord<{ - /** 历年录取数据ID */ - historyId: CommonType.IdType; - /** 租户编号 */ - tenantId: CommonType.IdType; - /** 删除标志(0存在 1删除) */ - delFlag: string; - /** 对应招录专业ID */ - recruitMajorId: CommonType.IdType; - /** 学校ID */ - schoolId: CommonType.IdType; - /** 学校代码 */ - schoolCode: string; - /** 院校代码 */ - collegeCode: string; - /** 学校名称 */ - schoolName: string; - /** 专业ID */ - majorId: CommonType.IdType; - /** 专业代码 */ - majorCode: string; - /** 专业名称 */ - majorName: string; - /** 招生代码 */ - enrollCode: string; - /** 专业类型 */ - majorType: string; - /** 专业类别子级 */ - majorTypeSub: string; - /** 主考科目 */ - mainExamSubject: string; - /** 年份 */ - year: number; - /** 科类(文/理) */ - subjectType: string; - /** 批次 */ - batchName: string; - /** 录取方式(文*x+专*y) */ - admissionFormula: string; - /** 录取概率规则运算符 */ - probabilityOperator: string; - /** 省控线 */ - controlScore: number; - /** 录取线 */ - admissionScore: number; - /** 招生人数 */ - planEnroll: number; - /** 实际投档人数 */ - filedAmount: number; - /** 录取数 */ - admitAmount: number; - /** 一志愿录取数 */ - firstChoiceAdmitAmount: number; - /** 最低分数差 */ - minScoreDiff: number; - /** 学费(元/年) */ - tuitionFee: number; - /** 备注 */ - remark: string; - }>; + /** + * namespace Art + * + * backend api module: "Art" + */ + namespace Art { + /** school recruit major history */ + type SchoolRecruitMajorHistory = Common.CommonRecord<{ + /** 历年录取数据ID */ + historyId: CommonType.IdType; + /** 租户编号 */ + tenantId: CommonType.IdType; + /** 删除标志(0存在 1删除) */ + delFlag: string; + /** 对应招录专业ID */ + recruitMajorId: CommonType.IdType; + /** 学校ID */ + schoolId: CommonType.IdType; + /** 学校代码 */ + schoolCode: string; + /** 院校代码 */ + collegeCode: string; + /** 学校名称 */ + schoolName: string; + /** 专业ID */ + majorId: CommonType.IdType; + /** 专业代码 */ + majorCode: string; + /** 专业名称 */ + majorName: string; + /** 招生代码 */ + enrollCode: string; + /** 专业类型 */ + majorType: string; + /** 专业类别子级 */ + majorTypeSub: string; + /** 主考科目 */ + mainExamSubject: string; + /** 年份 */ + year: number; + /** 科类(文/理) */ + subjectType: string; + /** 批次 */ + batchName: string; + /** 录取方式(文*x+专*y) */ + admissionFormula: string; + /** 录取概率规则运算符 */ + probabilityOperator: string; + /** 省控线 */ + controlScore: number; + /** 录取线 */ + admissionScore: number; + /** 招生人数 */ + planEnroll: number; + /** 实际投档人数 */ + filedAmount: number; + /** 录取数 */ + admitAmount: number; + /** 一志愿录取数 */ + firstChoiceAdmitAmount: number; + /** 最低分数差 */ + minScoreDiff: number; + /** 学费(元/年) */ + tuitionFee: number; + /** 备注 */ + remark: string; + }>; - /** school recruit major history search params */ - type SchoolRecruitMajorHistorySearchParams = CommonType.RecordNullable< - Pick< - Api.Art.SchoolRecruitMajorHistory, - | 'recruitMajorId' - | 'schoolId' - | 'schoolCode' - | 'collegeCode' - | 'schoolName' - | 'majorId' - | 'majorCode' - | 'majorName' - | 'enrollCode' - | 'majorType' - | 'majorTypeSub' - | 'mainExamSubject' - | 'year' - | 'subjectType' - | 'batchName' - | 'admissionFormula' - | 'probabilityOperator' - | 'controlScore' - | 'admissionScore' - | 'planEnroll' - | 'filedAmount' - | 'admitAmount' - | 'firstChoiceAdmitAmount' - | 'minScoreDiff' - | 'tuitionFee' - > & - Api.Common.CommonSearchParams - >; + /** school recruit major history search params */ + type SchoolRecruitMajorHistorySearchParams = CommonType.RecordNullable< + Pick< + Api.Art.SchoolRecruitMajorHistory, + | 'recruitMajorId' + | 'schoolId' + | 'schoolCode' + | 'collegeCode' + | 'schoolName' + | 'majorId' + | 'majorCode' + | 'majorName' + | 'enrollCode' + | 'majorType' + | 'majorTypeSub' + | 'mainExamSubject' + | 'year' + | 'subjectType' + | 'batchName' + | 'admissionFormula' + | 'probabilityOperator' + | 'controlScore' + | 'admissionScore' + | 'planEnroll' + | 'filedAmount' + | 'admitAmount' + | 'firstChoiceAdmitAmount' + | 'minScoreDiff' + | 'tuitionFee' + > & + Api.Common.CommonSearchParams + >; - /** school recruit major history operate params */ - type SchoolRecruitMajorHistoryOperateParams = CommonType.RecordNullable< - Pick< - Api.Art.SchoolRecruitMajorHistory, - | 'historyId' - | 'recruitMajorId' - | 'schoolId' - | 'schoolCode' - | 'collegeCode' - | 'schoolName' - | 'majorId' - | 'majorCode' - | 'majorName' - | 'enrollCode' - | 'majorType' - | 'majorTypeSub' - | 'mainExamSubject' - | 'year' - | 'subjectType' - | 'batchName' - | 'admissionFormula' - | 'probabilityOperator' - | 'controlScore' - | 'admissionScore' - | 'planEnroll' - | 'filedAmount' - | 'admitAmount' - | 'firstChoiceAdmitAmount' - | 'minScoreDiff' - | 'tuitionFee' - | 'remark' - > - >; + /** school recruit major history operate params */ + type SchoolRecruitMajorHistoryOperateParams = CommonType.RecordNullable< + Pick< + Api.Art.SchoolRecruitMajorHistory, + | 'historyId' + | 'recruitMajorId' + | 'schoolId' + | 'schoolCode' + | 'collegeCode' + | 'schoolName' + | 'majorId' + | 'majorCode' + | 'majorName' + | 'enrollCode' + | 'majorType' + | 'majorTypeSub' + | 'mainExamSubject' + | 'year' + | 'subjectType' + | 'batchName' + | 'admissionFormula' + | 'probabilityOperator' + | 'controlScore' + | 'admissionScore' + | 'planEnroll' + | 'filedAmount' + | 'admitAmount' + | 'firstChoiceAdmitAmount' + | 'minScoreDiff' + | 'tuitionFee' + | 'remark' + > + >; - /** school recruit major history list */ - type SchoolRecruitMajorHistoryList = Api.Common.PaginatingQueryRecord; - } + /** school recruit major history list */ + type SchoolRecruitMajorHistoryList = Api.Common.PaginatingQueryRecord; + } } diff --git a/src/typings/api/art.school-recruit-major.api.d.ts b/src/typings/api/art.school-recruit-major.api.d.ts index b1a3228..1670890 100644 --- a/src/typings/api/art.school-recruit-major.api.d.ts +++ b/src/typings/api/art.school-recruit-major.api.d.ts @@ -4,150 +4,150 @@ * All backend api type */ declare namespace Api { - /** - * namespace Art - * - * backend api module: "Art" - */ - namespace Art { - /** school recruit major */ - type SchoolRecruitMajor = Common.CommonRecord<{ - /** 院校招录专业ID */ - recruitMajorId: CommonType.IdType; - /** 租户编号 */ - tenantId: CommonType.IdType; - /** 删除标志(0存在 1删除) */ - delFlag: string; - /** 学校ID */ - schoolId: CommonType.IdType; - /** 学校代码 */ - schoolCode: string; - /** 学校名称(冗余) */ - schoolName: string; - /** 年份 */ - year: number; - /** 专业ID */ - majorId: CommonType.IdType; - /** 专业代码 */ - majorCode: string; - /** 专业名称 */ - majorName: string; - /** 招生代码(为空则存空串) */ - enrollCode: string; - /** 数据状态(停招/新招/新增) */ - dataStatus: string; - /** 批次 */ - batchName: string; - /** 专业类型 */ - majorType: string; - /** 二级专业类型 */ - majorTypeSub: string; - /** 科类(文/理) */ - subjectType: string; - /** 录取方式缩写 */ - admissionWayShort: string; - /** 对外录取方式 */ - admissionWayExternal: string; - /** 对外录取方式运算符 */ - admissionWayExternalOp: string; - /** 内部录取方式 */ - admissionWayInternal: string; - /** 内部录取方式运算符 */ - admissionWayInternalOp: string; - /** 计划招生人数 */ - planEnroll: number; - /** 主考科目 */ - mainExamSubject: string; - /** 学制(年) */ - schoolingYears: number; - /** 院校限制说明 */ - enrollLimitDesc: string; - /** 学费(元/年) */ - tuitionFee: number; - /** 文化分数限制 */ - cultureScoreLimit: number; - /** 专业分数限制 */ - majorScoreLimit: number; - /** 语文成绩限制 */ - chineseScoreLimit: number; - /** 英语成绩限制 */ - englishScoreLimit: number; - /** 备注 */ - remark: string; - }>; + /** + * namespace Art + * + * backend api module: "Art" + */ + namespace Art { + /** school recruit major */ + type SchoolRecruitMajor = Common.CommonRecord<{ + /** 院校招录专业ID */ + recruitMajorId: CommonType.IdType; + /** 租户编号 */ + tenantId: CommonType.IdType; + /** 删除标志(0存在 1删除) */ + delFlag: string; + /** 学校ID */ + schoolId: CommonType.IdType; + /** 学校代码 */ + schoolCode: string; + /** 学校名称(冗余) */ + schoolName: string; + /** 年份 */ + year: number; + /** 专业ID */ + majorId: CommonType.IdType; + /** 专业代码 */ + majorCode: string; + /** 专业名称 */ + majorName: string; + /** 招生代码(为空则存空串) */ + enrollCode: string; + /** 数据状态(停招/新招/新增) */ + dataStatus: string; + /** 批次 */ + batchName: string; + /** 专业类型 */ + majorType: string; + /** 二级专业类型 */ + majorTypeSub: string; + /** 科类(文/理) */ + subjectType: string; + /** 录取方式缩写 */ + admissionWayShort: string; + /** 对外录取方式 */ + admissionWayExternal: string; + /** 对外录取方式运算符 */ + admissionWayExternalOp: string; + /** 内部录取方式 */ + admissionWayInternal: string; + /** 内部录取方式运算符 */ + admissionWayInternalOp: string; + /** 计划招生人数 */ + planEnroll: number; + /** 主考科目 */ + mainExamSubject: string; + /** 学制(年) */ + schoolingYears: number; + /** 院校限制说明 */ + enrollLimitDesc: string; + /** 学费(元/年) */ + tuitionFee: number; + /** 文化分数限制 */ + cultureScoreLimit: number; + /** 专业分数限制 */ + majorScoreLimit: number; + /** 语文成绩限制 */ + chineseScoreLimit: number; + /** 英语成绩限制 */ + englishScoreLimit: number; + /** 备注 */ + remark: string; + }>; - /** school recruit major search params */ - type SchoolRecruitMajorSearchParams = CommonType.RecordNullable< - Pick< - Api.Art.SchoolRecruitMajor, - | 'schoolId' - | 'schoolCode' - | 'schoolName' - | 'year' - | 'majorId' - | 'majorCode' - | 'majorName' - | 'enrollCode' - | 'dataStatus' - | 'batchName' - | 'majorType' - | 'majorTypeSub' - | 'subjectType' - | 'admissionWayShort' - | 'admissionWayExternal' - | 'admissionWayExternalOp' - | 'admissionWayInternal' - | 'admissionWayInternalOp' - | 'planEnroll' - | 'mainExamSubject' - | 'schoolingYears' - | 'enrollLimitDesc' - | 'tuitionFee' - | 'cultureScoreLimit' - | 'majorScoreLimit' - | 'chineseScoreLimit' - | 'englishScoreLimit' - > & - Api.Common.CommonSearchParams - >; + /** school recruit major search params */ + type SchoolRecruitMajorSearchParams = CommonType.RecordNullable< + Pick< + Api.Art.SchoolRecruitMajor, + | 'schoolId' + | 'schoolCode' + | 'schoolName' + | 'year' + | 'majorId' + | 'majorCode' + | 'majorName' + | 'enrollCode' + | 'dataStatus' + | 'batchName' + | 'majorType' + | 'majorTypeSub' + | 'subjectType' + | 'admissionWayShort' + | 'admissionWayExternal' + | 'admissionWayExternalOp' + | 'admissionWayInternal' + | 'admissionWayInternalOp' + | 'planEnroll' + | 'mainExamSubject' + | 'schoolingYears' + | 'enrollLimitDesc' + | 'tuitionFee' + | 'cultureScoreLimit' + | 'majorScoreLimit' + | 'chineseScoreLimit' + | 'englishScoreLimit' + > & + Api.Common.CommonSearchParams + >; - /** school recruit major operate params */ - type SchoolRecruitMajorOperateParams = CommonType.RecordNullable< - Pick< - Api.Art.SchoolRecruitMajor, - | 'recruitMajorId' - | 'schoolId' - | 'schoolCode' - | 'schoolName' - | 'year' - | 'majorId' - | 'majorCode' - | 'majorName' - | 'enrollCode' - | 'dataStatus' - | 'batchName' - | 'majorType' - | 'majorTypeSub' - | 'subjectType' - | 'admissionWayShort' - | 'admissionWayExternal' - | 'admissionWayExternalOp' - | 'admissionWayInternal' - | 'admissionWayInternalOp' - | 'planEnroll' - | 'mainExamSubject' - | 'schoolingYears' - | 'enrollLimitDesc' - | 'tuitionFee' - | 'cultureScoreLimit' - | 'majorScoreLimit' - | 'chineseScoreLimit' - | 'englishScoreLimit' - | 'remark' - > - >; + /** school recruit major operate params */ + type SchoolRecruitMajorOperateParams = CommonType.RecordNullable< + Pick< + Api.Art.SchoolRecruitMajor, + | 'recruitMajorId' + | 'schoolId' + | 'schoolCode' + | 'schoolName' + | 'year' + | 'majorId' + | 'majorCode' + | 'majorName' + | 'enrollCode' + | 'dataStatus' + | 'batchName' + | 'majorType' + | 'majorTypeSub' + | 'subjectType' + | 'admissionWayShort' + | 'admissionWayExternal' + | 'admissionWayExternalOp' + | 'admissionWayInternal' + | 'admissionWayInternalOp' + | 'planEnroll' + | 'mainExamSubject' + | 'schoolingYears' + | 'enrollLimitDesc' + | 'tuitionFee' + | 'cultureScoreLimit' + | 'majorScoreLimit' + | 'chineseScoreLimit' + | 'englishScoreLimit' + | 'remark' + > + >; - /** school recruit major list */ - type SchoolRecruitMajorList = Api.Common.PaginatingQueryRecord; - } + /** school recruit major list */ + type SchoolRecruitMajorList = Api.Common.PaginatingQueryRecord; + } } diff --git a/src/typings/api/art.school.api.d.ts b/src/typings/api/art.school.api.d.ts index ae7f4f2..9d15cfd 100644 --- a/src/typings/api/art.school.api.d.ts +++ b/src/typings/api/art.school.api.d.ts @@ -26,8 +26,6 @@ declare namespace Api { enrollCodes: string[]; /** 学校标签列表 */ schoolTags: string[]; - /** 院校图标 */ - schoolIcon: string; /** 省份 */ province: string; /** 城市 */ @@ -42,14 +40,6 @@ declare namespace Api { schoolNature: string; /** 主管部门:教育部/工信部/民委... */ supervisorDept: string; - /** 建校时间(年) */ - establishYear: number; - /** 占地面积(亩) */ - campusAreaMu: number; - /** 男生比例(%) */ - maleRatio: number; - /** 女生比例(%) */ - femaleRatio: number; /** 删除标志(0代表存在 1代表删除) */ delFlag: string; /** 备注 */ @@ -64,7 +54,6 @@ declare namespace Api { | 'mainCode' | 'mainName' | 'shortName' - | 'schoolIcon' | 'province' | 'city' | 'district' @@ -72,10 +61,6 @@ declare namespace Api { | 'educationLevel' | 'schoolNature' | 'supervisorDept' - | 'establishYear' - | 'campusAreaMu' - | 'maleRatio' - | 'femaleRatio' > & Api.Common.CommonSearchParams >; @@ -88,7 +73,6 @@ declare namespace Api { | 'mainCode' | 'mainName' | 'shortName' - | 'schoolIcon' | 'province' | 'city' | 'district' @@ -96,10 +80,6 @@ declare namespace Api { | 'educationLevel' | 'schoolNature' | 'supervisorDept' - | 'establishYear' - | 'campusAreaMu' - | 'maleRatio' - | 'femaleRatio' | 'remark' > >; @@ -108,7 +88,34 @@ declare namespace Api { type SchoolDetailInSchoolOperateParams = CommonType.RecordNullable< Pick< Api.Art.SchoolDetail, - 'detailId' | 'schoolId' | 'introduction' | 'address' | 'contact' | 'email' | 'website' | 'remark' + | 'detailId' + | 'schoolId' + | 'introduction' + | 'schoolIcon' + | 'address' + | 'contact' + | 'email' + | 'website' + | 'postcode' + | 'establishYear' + | 'campusAreaMu' + | 'libraryCollection' + | 'maleRatio' + | 'femaleRatio' + | 'is985' + | 'is211' + | 'isDoubleFirstClass' + | 'isKeyUniversity' + | 'tags' + | 'studentCount' + | 'teacherCount' + | 'masterPoint' + | 'doctorPoint' + | 'keyMajorCount' + | 'employmentRate' + | 'satisfactionRate' + | 'univId' + | 'remark' > >; diff --git a/src/typings/components.d.ts b/src/typings/components.d.ts index 944c0b0..e530592 100644 --- a/src/typings/components.d.ts +++ b/src/typings/components.d.ts @@ -16,7 +16,6 @@ declare module 'vue' { BetterScroll: typeof import('./../components/custom/better-scroll.vue')['default'] BooleanTag: typeof import('./../components/custom/boolean-tag.vue')['default'] ButtonIcon: typeof import('./../components/custom/button-icon.vue')['default'] - copy: typeof import('./../components/custom/dict-radio copy.vue')['default'] CountTo: typeof import('./../components/custom/count-to.vue')['default'] DarkModeContainer: typeof import('./../components/common/dark-mode-container.vue')['default'] DataTable: typeof import('./../components/common/data-table.vue')['default'] @@ -37,6 +36,7 @@ declare module 'vue' { IconGridiconsFullscreen: typeof import('~icons/gridicons/fullscreen')['default'] IconGridiconsFullscreenExit: typeof import('~icons/gridicons/fullscreen-exit')['default'] IconHugeiconsConfiguration01: typeof import('~icons/hugeicons/configuration01')['default'] + IconIcRoundOpenInFull: typeof import('~icons/ic/round-open-in-full')['default'] IconIcRoundRefresh: typeof import('~icons/ic/round-refresh')['default'] IconIcRoundSearch: typeof import('~icons/ic/round-search')['default'] IconLocalBanner: typeof import('~icons/local/banner')['default'] @@ -62,6 +62,7 @@ declare module 'vue' { IconSimpleIconsGitee: typeof import('~icons/simple-icons/gitee')['default'] IconTooltip: typeof import('./../components/common/icon-tooltip.vue')['default'] IconUilSearch: typeof import('~icons/uil/search')['default'] + InlineExpandTextarea: typeof import('./../components/custom/inline-expand-textarea.vue')['default'] JsonPreview: typeof import('./../components/custom/json-preview.vue')['default'] LangSwitch: typeof import('./../components/common/lang-switch.vue')['default'] LookForward: typeof import('./../components/custom/look-forward.vue')['default'] @@ -168,7 +169,6 @@ declare global { const BetterScroll: typeof import('./../components/custom/better-scroll.vue')['default'] const BooleanTag: typeof import('./../components/custom/boolean-tag.vue')['default'] const ButtonIcon: typeof import('./../components/custom/button-icon.vue')['default'] - const copy: typeof import('./../components/custom/dict-radio copy.vue')['default'] const CountTo: typeof import('./../components/custom/count-to.vue')['default'] const DarkModeContainer: typeof import('./../components/common/dark-mode-container.vue')['default'] const DataTable: typeof import('./../components/common/data-table.vue')['default'] @@ -189,6 +189,7 @@ declare global { const IconGridiconsFullscreen: typeof import('~icons/gridicons/fullscreen')['default'] const IconGridiconsFullscreenExit: typeof import('~icons/gridicons/fullscreen-exit')['default'] const IconHugeiconsConfiguration01: typeof import('~icons/hugeicons/configuration01')['default'] + const IconIcRoundOpenInFull: typeof import('~icons/ic/round-open-in-full')['default'] const IconIcRoundRefresh: typeof import('~icons/ic/round-refresh')['default'] const IconIcRoundSearch: typeof import('~icons/ic/round-search')['default'] const IconLocalBanner: typeof import('~icons/local/banner')['default'] @@ -214,6 +215,7 @@ declare global { const IconSimpleIconsGitee: typeof import('~icons/simple-icons/gitee')['default'] const IconTooltip: typeof import('./../components/common/icon-tooltip.vue')['default'] const IconUilSearch: typeof import('~icons/uil/search')['default'] + const InlineExpandTextarea: typeof import('./../components/custom/inline-expand-textarea.vue')['default'] const JsonPreview: typeof import('./../components/custom/json-preview.vue')['default'] const LangSwitch: typeof import('./../components/common/lang-switch.vue')['default'] const LookForward: typeof import('./../components/custom/look-forward.vue')['default'] diff --git a/src/views/art/history-score-control-line/index.vue b/src/views/art/history-score-control-line/index.vue index 89ed46e..def7531 100644 --- a/src/views/art/history-score-control-line/index.vue +++ b/src/views/art/history-score-control-line/index.vue @@ -1,21 +1,26 @@ - + diff --git a/src/views/art/history-score-control-line/modules/history-score-control-line-operate-drawer.vue b/src/views/art/history-score-control-line/modules/history-score-control-line-operate-drawer.vue index ddcd1b7..bad2842 100644 --- a/src/views/art/history-score-control-line/modules/history-score-control-line-operate-drawer.vue +++ b/src/views/art/history-score-control-line/modules/history-score-control-line-operate-drawer.vue @@ -1,7 +1,10 @@ - + diff --git a/src/views/art/major/modules/major-operate-drawer.vue b/src/views/art/major/modules/major-operate-drawer.vue index 736162f..e09d0a0 100644 --- a/src/views/art/major/modules/major-operate-drawer.vue +++ b/src/views/art/major/modules/major-operate-drawer.vue @@ -45,36 +45,29 @@ const model = ref(createDefaultModel()); function createDefaultModel(): Model { return { - majorId: null, - majorName: '', - educationLevel: '', - majorIcon: '', - schoolingYears: null, - disciplinePrimary: '', - disciplineSecondary: '', - degreeAwarded: '', - summary: '', - trainingDirection: '', - coreCourses: '', - remark: '' + majorId: null, + majorName: '', + educationLevel: '', + majorIcon: '', + schoolingYears: null, + disciplinePrimary: '', + disciplineSecondary: '', + degreeAwarded: '', + summary: '', + trainingDirection: '', + coreCourses: '', + remark: '' }; } -type RuleKey = Extract< - keyof Model, - | 'majorId' - | 'tenantId' - | 'delFlag' - | 'majorName' - | 'educationLevel' ->; +type RuleKey = Extract; const rules: Record = { majorId: createRequiredRule('专业主键ID不能为空'), tenantId: createRequiredRule('租户编号不能为空'), delFlag: createRequiredRule('删除标志(0存在 1删除)不能为空'), majorName: createRequiredRule('专业名称不能为空'), - educationLevel: createRequiredRule('学历层次不能为空'), + educationLevel: createRequiredRule('学历层次不能为空') }; function handleUpdateModelWhenEdit() { @@ -92,16 +85,54 @@ function closeDrawer() { async function handleSubmit() { await validate(); - const { majorId, majorName, educationLevel, majorIcon, schoolingYears, disciplinePrimary, disciplineSecondary, degreeAwarded, summary, trainingDirection, coreCourses, remark } = model.value; + const { + majorId, + majorName, + educationLevel, + majorIcon, + schoolingYears, + disciplinePrimary, + disciplineSecondary, + degreeAwarded, + summary, + trainingDirection, + coreCourses, + remark + } = model.value; // request if (props.operateType === 'add') { - const { error } = await fetchCreateMajor({ majorName, educationLevel, majorIcon, schoolingYears, disciplinePrimary, disciplineSecondary, degreeAwarded, summary, trainingDirection, coreCourses, remark }); + const { error } = await fetchCreateMajor({ + majorName, + educationLevel, + majorIcon, + schoolingYears, + disciplinePrimary, + disciplineSecondary, + degreeAwarded, + summary, + trainingDirection, + coreCourses, + remark + }); if (error) return; } if (props.operateType === 'edit') { - const { error } = await fetchUpdateMajor({ majorId, majorName, educationLevel, majorIcon, schoolingYears, disciplinePrimary, disciplineSecondary, degreeAwarded, summary, trainingDirection, coreCourses, remark }); + const { error } = await fetchUpdateMajor({ + majorId, + majorName, + educationLevel, + majorIcon, + schoolingYears, + disciplinePrimary, + disciplineSecondary, + degreeAwarded, + summary, + trainingDirection, + coreCourses, + remark + }); if (error) return; } @@ -145,36 +176,16 @@ watch(visible, () => { - + - + - + - +