diff --git a/jeecgboot-vue3-master/src/api/common/api.ts b/jeecgboot-vue3-master/src/api/common/api.ts index 3499047f..6ec6b129 100644 --- a/jeecgboot-vue3-master/src/api/common/api.ts +++ b/jeecgboot-vue3-master/src/api/common/api.ts @@ -170,41 +170,43 @@ export const uploadMyFile = (url, data) => { return defHttp.uploadMyFile(url, data); }; // 组委会首页 -export const getOrganizingCommittee = (params={recreateFlag:false}) => { +export const getOrganizingCommittee = (params = { recreateFlag: false }) => { return defHttp.get({ - url:'/annualcompetitionprojectregistration/annualCompetitionProjectRegistration/zwhsybsjs', + url: '/annualcompetitionprojectregistration/annualCompetitionProjectRegistration/zwhsybsjs', params }) } // 学生首页 -export const getStudent = (params={recreateFlag:false}) => { +export const getStudent = (params = { recreateFlag: false }) => { return defHttp.get({ - url:'/annualcompetitionprojectregistration/annualCompetitionProjectRegistration/xssybsjs', + url: '/annualcompetitionprojectregistration/annualCompetitionProjectRegistration/xssybsjs', params }) } // 组委会报告 // /annualcompetitionprojectregistration/annualCompetitionProjectRegistration/zwhfxbg -export const getOrganizingCommitteeReport = (params={recreateFlag:false}) => { +export const getOrganizingCommitteeReport = (params = {}) => { + const par = { recreateFlag: false, annualid: '' }; + Object.assign(par, params); return defHttp.get({ - url:'/annualcompetitionprojectregistration/annualCompetitionProjectRegistration/zwhfxbg', - params + url: '/annualcompetitionprojectregistration/annualCompetitionProjectRegistration/zwhfxbg', + params: par }) } // /user/login/homepage/report4School // 学校综合报告 -export const getComprehensiveReport = (params={}) => { +export const getComprehensiveReport = (params = {}) => { return defHttp.get({ - url:'/user/login/homepage/report4School', + url: '/user/login/homepage/report4School', params }) } // 部门 // http://localhost:18083/jeecg-boot/user/login/homepage/report4Depart -export const getdepartmentReport = (params:any={}) => { +export const getdepartmentReport = (params: any = {}) => { return defHttp.get({ - url:'/user/login/homepage/report4School', + url: '/user/login/homepage/report4School', params }) } \ No newline at end of file diff --git a/jeecgboot-vue3-master/src/api/demo/depart.ts b/jeecgboot-vue3-master/src/api/demo/depart.ts index 9188a0fb..ccda18c8 100644 --- a/jeecgboot-vue3-master/src/api/demo/depart.ts +++ b/jeecgboot-vue3-master/src/api/demo/depart.ts @@ -10,6 +10,14 @@ enum Api { // Get personal center-basic settings export const pageSchoolApi = () => defHttp.get({ url: Api.PAGE_SCHOOL }); export const pageDepartmentApi = (orgCode: string) => defHttp.get({ url: Api.PAGE_DEPARTMENT, params: { orgCode } }); -export const getZjsybsjs = (params = { recreateFlag: false }) => defHttp.get({ url: Api.PAGE_ZJSYBSJS, params }); -export const getXsfxbg = (params = { recreateFlag: false }) => defHttp.get({ url: Api.PAGE_XSFXBG, params }); +export const getZjsybsjs = (params = {}) => { + const par = { recreateFlag: false }; + Object.assign(par, params); + return defHttp.get({ url: Api.PAGE_ZJSYBSJS, params: par }); +}; +export const getXsfxbg = (params = {}) => { + const par = { recreateFlag: false, annualid: '' }; + Object.assign(par, params); + return defHttp.get({ url: Api.PAGE_XSFXBG, params: par }); +}; diff --git a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/individual.vue b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/individual.vue index d0636fdf..c346e38c 100644 --- a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/individual.vue +++ b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/individual.vue @@ -1,6 +1,8 @@ diff --git a/jeecgboot-vue3-master/src/views/depart/workbench/components/chExpert/index.vue b/jeecgboot-vue3-master/src/views/depart/workbench/components/chExpert/index.vue index 499ce43c..ee2a5d9c 100644 --- a/jeecgboot-vue3-master/src/views/depart/workbench/components/chExpert/index.vue +++ b/jeecgboot-vue3-master/src/views/depart/workbench/components/chExpert/index.vue @@ -56,15 +56,19 @@
序号
+
年度
年度比赛名称
年度比赛项目
+
项目层次
{{ o.xh }}
+
{{ o.nd }}
{{ o.ndbs }}
{{ o.ndbsxm }}
+
{{ o.cc }}
@@ -85,15 +89,19 @@
序号
+
年度
年度比赛名称
年度比赛项目
+
项目层次
{{ o.xh }}
+
{{ o.nd }}
{{ o.ndbs }}
{{ o.ndbsxm }}
+
{{ o.cc }}
@@ -112,7 +120,9 @@ import { ref } from 'vue' type o = { xh: string, ndbs: string, - ndbsxm: string + ndbsxm: string, + nd: string, + cc: string, } type ob = { jxzndbsxmNumber: number; @@ -270,13 +280,21 @@ function reset() { } .name { - width: calc((542 / 756) * 100%); + width: calc((208 / 756) * 100%); } .newp { width: calc((134 / 756) * 100%); } + .nd { + width: calc((174 / 756) * 100%); + } + + .cc { + width: calc((160 / 756) * 100%); + } + //.total { // width: calc((74 / 756) * 100%); //}