zhc077
/
hnjd_comp
forked from wangjiadong/comp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增参数annualid

Browse Source
main
significative 3 months ago
parent 8819bd3c33
commit e3cc8e5ac2
5 changed files with 299 additions and 217 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      jeecgboot-vue3-master/src/api/common/api.ts
  2. 12
      jeecgboot-vue3-master/src/api/demo/depart.ts
  3. 27
      jeecgboot-vue3-master/src/views/comprehensiveEvaluation/individual.vue
  4. 431
      jeecgboot-vue3-master/src/views/comprehensiveEvaluation/organizingCommittee.vue
  5. 22
      jeecgboot-vue3-master/src/views/depart/workbench/components/chExpert/index.vue

24
jeecgboot-vue3-master/src/api/common/api.ts
Unescape View File

@ -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
})
}

12
jeecgboot-vue3-master/src/api/demo/depart.ts
Unescape View File

@ -10,6 +10,14 @@ enum Api {
// Get personal center-basic settings
export const pageSchoolApi = () => defHttp.get<GetAccountInfoModel>({ url: Api.PAGE_SCHOOL });
export const pageDepartmentApi = (orgCode: string) => defHttp.get<GetAccountInfoModel>({ 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 });
};

27
jeecgboot-vue3-master/src/views/comprehensiveEvaluation/individual.vue
Unescape View File

@ -1,6 +1,8 @@
<template>
<div style="padding: 30px 18.6vw 0; width: 100%;margin: auto;">
年度：<j-dict-select-tag placeholder="请选择年度" v-model:value="annualid" dictCode="annual,annual_name,id" />
</div>
<div class="personage" v-if="isLoading">
<h1 class="title">机电学院比赛个人报告</h1>
<div class="rebuild">
<div @click="Rebuild">重新生成报告</div>
@ -130,13 +132,17 @@
</div>
</div>
<div class="loading" v-else>
<a-spin />
</div>
</template>
<script lang='ts' setup>
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
import cardList from './components/cardList.vue';
import randerChart from './components/randerChart.vue';
import { getXsfxbg } from '/@/api/demo/depart';
import { ref } from 'vue';
import { ref, watch } from 'vue';
type allApList = {
jxname: string
@ -161,20 +167,33 @@ const data = ref({
allApList: [] as allApList
})
const isLoading = ref<any>(false)
const isLoading = ref<any>(false)
getXsfxbg().then(res => {
data.value = res
isLoading.value = true
})
const Rebuild = async () => {
isLoading.value = false
const res = await getXsfxbg({ recreateFlag: true })
const res = await getXsfxbg({ recreateFlag: true, annualid: annualid.value })
data.value = res
isLoading.value = true
}
const annualid = ref('')
watch(() => annualid.value, () => {
Rebuild()
})
</script>
<style lang='less' scoped>
.loading {
width: 100%;
height: 100vh;
display: flex;
align-items: center;
justify-content: center;
}
.rebuild {
display: flex;
justify-content: center;

431
jeecgboot-vue3-master/src/views/comprehensiveEvaluation/organizingCommittee.vue
Unescape View File

@ -1,14 +1,19 @@
<template>
<div style="padding: 30px 18.6vw 0; width: 100%;margin: auto;">
年度：<j-dict-select-tag placeholder="请选择年度" v-model:value="annualid" dictCode="annual,annual_name,id" />
</div>
<div class="container" v-if="loading">
<div class="title">河南机电学院比赛 {{data.annualCompName}} 组委会报告</div>
<div class="rebuild" ><div @click="Rebuild">重新生成报告</div></div>
<p class="description"
>我是比赛综述:全面落实立德树人根本任务，依据CDI0工程教育理念，培养德、智、体、美、劳全面发展，掌握软件工程专业所需的数学与自然科学基础知识、专业基础理论知识;在企业级软件开发和工业智能软件开发方向，能承担软件分析、设计、开发、项目管理等任务，具备解决复杂工程问题的能力;具有终身学习和创新创业意识、国际交流能力、团队合作精神等良好案养，能适应产业与社会变革的国际化应用型人才。<br />本专业毕业生经过五年左右的实际工作，能够达到以下目标:</p
>
<div class="title">河南机电学院比赛 {{ data.annualCompName }} 组委会报告</div>
<div class="rebuild">
<div @click="Rebuild">重新生成报告</div>
</div>
<p class="description">
我是比赛综述:全面落实立德树人根本任务，依据CDI0工程教育理念，培养德、智、体、美、劳全面发展，掌握软件工程专业所需的数学与自然科学基础知识、专业基础理论知识;在企业级软件开发和工业智能软件开发方向，能承担软件分析、设计、开发、项目管理等任务，具备解决复杂工程问题的能力;具有终身学习和创新创业意识、国际交流能力、团队合作精神等良好案养，能适应产业与社会变革的国际化应用型人才。<br />本专业毕业生经过五年左右的实际工作，能够达到以下目标:
</p>
<div class="card-content">
<div class="item">
<div class="top-title">当前届数</div>
<div class="sum">第{{data.sum}}届</div>
<div class="sum">第{{ data.sum }}届</div>
</div>
<div class="item">
<div class="top-title">参赛报名数</div>
@ -24,244 +29,274 @@
</div>
</div>
<cardTitle title="参赛学生综合能力评价分析" />
<p class="description"
>我是比赛综述:全面落实立德树人根本任务，依据CDI0工程教育理念，培养德、智、体、美、劳全面发展，掌握软件工程专业所需的数学与自然科学基础知识、专业基础理论知识;在企业级软件开发和工业智能软件开发方向，能承担软件分析、设计、开发、项目管理等任务，具备解决复杂工程问题的能力;具有终身学习和创新创业意识、国际交流能力、团队合作精神等良好案养，能适应产业与社会变革的国际化应用型人才。<br />本专业毕业生经过五年左右的实际工作，能够达到以下目标:</p
>
<p class="description">
我是比赛综述:全面落实立德树人根本任务，依据CDI0工程教育理念，培养德、智、体、美、劳全面发展，掌握软件工程专业所需的数学与自然科学基础知识、专业基础理论知识;在企业级软件开发和工业智能软件开发方向，能承担软件分析、设计、开发、项目管理等任务，具备解决复杂工程问题的能力;具有终身学习和创新创业意识、国际交流能力、团队合作精神等良好案养，能适应产业与社会变革的国际化应用型人才。<br />本专业毕业生经过五年左右的实际工作，能够达到以下目标:
</p>
<div class="year-content">
<div class="left border-000">
<div class="border-title">年度维度分析</div>
<randerChart />
</div>
<div class="right border-000">
<cardList :DATA="data12"/>
<cardList :DATA="data12" />
</div>
</div>
<cardTitle title="比赛学生获奖情况分析" />
<p class="description"
>我是比赛综述:全面落实立德树人根本任务，依据CDI0工程教育理念，培养德、智、体、美、劳全面发展，掌握软件工程专业所需的数学与自然科学基础知识、专业基础理论知识;在企业级软件开发和工业智能软件开发方向，能承担软件分析、设计、开发、项目管理等任务，具备解决复杂工程问题的能力;具有终身学习和创新创业意识、国际交流能力、团队合作精神等良好案养，能适应产业与社会变革的国际化应用型人才。<br />本专业毕业生经过五年左右的实际工作，能够达到以下目标:</p
>
<p class="description">
我是比赛综述:全面落实立德树人根本任务，依据CDI0工程教育理念，培养德、智、体、美、劳全面发展，掌握软件工程专业所需的数学与自然科学基础知识、专业基础理论知识;在企业级软件开发和工业智能软件开发方向，能承担软件分析、设计、开发、项目管理等任务，具备解决复杂工程问题的能力;具有终身学习和创新创业意识、国际交流能力、团队合作精神等良好案养，能适应产业与社会变革的国际化应用型人才。<br />本专业毕业生经过五年左右的实际工作，能够达到以下目标:
</p>
<div class="participation-status-content">
<div class="right border-000">
<cardList7 :data="data.allApList"/>
<cardList7 :data="data.allApList" />
</div>
</div>
<cardTitle title="部门参赛情况分析" />
<p class="description"
>我是比赛综述:全面落实立德树人根本任务，依据CDI0工程教育理念，培养德、智、体、美、劳全面发展，掌握软件工程专业所需的数学与自然科学基础知识、专业基础理论知识;在企业级软件开发和工业智能软件开发方向，能承担软件分析、设计、开发、项目管理等任务，具备解决复杂工程问题的能力;具有终身学习和创新创业意识、国际交流能力、团队合作精神等良好案养，能适应产业与社会变革的国际化应用型人才。<br />本专业毕业生经过五年左右的实际工作，能够达到以下目标:</p
>
<p class="description">
我是比赛综述:全面落实立德树人根本任务，依据CDI0工程教育理念，培养德、智、体、美、劳全面发展，掌握软件工程专业所需的数学与自然科学基础知识、专业基础理论知识;在企业级软件开发和工业智能软件开发方向，能承担软件分析、设计、开发、项目管理等任务，具备解决复杂工程问题的能力;具有终身学习和创新创业意识、国际交流能力、团队合作精神等良好案养，能适应产业与社会变革的国际化应用型人才。<br />本专业毕业生经过五年左右的实际工作，能够达到以下目标:
</p>
<div class="participation-status-content">
<div class="right border-000">
<cardList8 :data="data.csyxbmpm"/>
<cardList8 :data="data.csyxbmpm" />
</div>
</div>
</div>
<div class="loading" v-else>
<a-spin />
</div>
</template>
<script lang="ts" setup>
import cardTitle from './components/cardTitle.vue';
import cardList from './components/cardList.vue';
import cardList7 from './components/cardList7.vue';
import cardList8 from './components/cardList8.vue';
import randerChart from './components/randerChart.vue';
import { getOrganizingCommitteeReport } from '/@/api/common/api';
import {ref} from 'vue'
const data = ref<any>({})
const loading = ref<any>(false)
const getOrganizingCommitteeReportEvent = async () => {
const res = await getOrganizingCommitteeReport()
data.value = res
console.log(res);
loading.value = true
}
getOrganizingCommitteeReportEvent()
const Rebuild = async() => {
loading.value = false
const res = await getOrganizingCommitteeReport({recreateFlag:true
})
console.log(res);
data.value = res
loading.value = true
import cardTitle from './components/cardTitle.vue';
import cardList from './components/cardList.vue';
import cardList7 from './components/cardList7.vue';
import cardList8 from './components/cardList8.vue';
import randerChart from './components/randerChart.vue';
import { getOrganizingCommitteeReport } from '/@/api/common/api';
import { ref, watch } from 'vue'
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
const data = ref<any>({})
const loading = ref<any>(false)
const getOrganizingCommitteeReportEvent = async () => {
const res = await getOrganizingCommitteeReport()
data.value = res
console.log(res);
loading.value = true
}
getOrganizingCommitteeReportEvent()
const Rebuild = async () => {
loading.value = false
const res = await getOrganizingCommitteeReport({
recreateFlag: true,
annualid: annualid.value
})
console.log(res);
data.value = res
loading.value = true
}
// ===============
const annualid = ref('')
watch(() => annualid.value, () => {
Rebuild()
})
// ===============
const formatTitle = (index: number) => {
const arr: any = ['当前届数', '参赛人数', '参赛队伍数', '比赛项目数'];
return arr[index];
};
const data12 = JSON.stringify([
{
"capacityName": "职业规范",
"value": 1.87
},
{
"capacityName": "沟通",
"value": 0.94
},
{
"capacityName": "设计/开发解决方案",
"value": 1.87
},
{
"capacityName": "研究",
"value": 1.87
},
{
"capacityName": "环境和可持续发展",
"value": 1.87
},
{
"capacityName": "使用现代工具",
"value": 1.87
},
{
"capacityName": "终身学习",
"value": 0.94
},
{
"capacityName": "工程知识",
"value": 1.87
},
{
"capacityName": "项目管理",
"value": 0.94
},
{
"capacityName": "工程与社会",
"value": 1.87
},
{
"capacityName": "个人和团队",
"value": 0.94
},
{
"capacityName": "问题分析",
"value": 1.87
}
const formatTitle = (index: number) => {
const arr: any = ['当前届数', '参赛人数', '参赛队伍数', '比赛项目数'];
return arr[index];
};
const data12 = JSON.stringify([
{
"capacityName": "职业规范",
"value": 1.87
},
{
"capacityName": "沟通",
"value": 0.94
},
{
"capacityName": "设计/开发解决方案",
"value": 1.87
},
{
"capacityName": "研究",
"value": 1.87
},
{
"capacityName": "环境和可持续发展",
"value": 1.87
},
{
"capacityName": "使用现代工具",
"value": 1.87
},
{
"capacityName": "终身学习",
"value": 0.94
},
{
"capacityName": "工程知识",
"value": 1.87
},
{
"capacityName": "项目管理",
"value": 0.94
},
{
"capacityName": "工程与社会",
"value": 1.87
},
{
"capacityName": "个人和团队",
"value": 0.94
},
{
"capacityName": "问题分析",
"value": 1.87
}
])
</script>
<style lang="less" scoped>
.loading{
.loading {
width: 100%;
height: 100vh;
display: flex;
align-items: center;
justify-content: center;
}
.container {
width: 1200px;
margin: 0 auto;
// height: 100vh;
padding-bottom: 30px;
.title {
width: 100%;
font-size: 36px;
text-align: center;
font-weight: 700;
}
.description {
text-indent: 2em;
margin: 30px 0;
}
.card-content {
.container {
width: 1200px;
margin: 0 auto;
// height: 100vh;
padding-bottom: 30px;
.title {
width: 100%;
font-size: 36px;
text-align: center;
font-weight: 700;
}
.description {
text-indent: 2em;
margin: 30px 0;
}
.card-content {
display: flex;
.item {
width: 25%;
height: 100px;
border: 1px solid #000;
margin-right: 10px;
display: flex;
.item {
width: 25%;
height: 100px;
border: 1px solid #000;
margin-right: 10px;
flex-direction: column;
justify-content: space-between;
padding: 10px 15px;
.top-title {
font-size: 12px;
color: #aaa;
}
.sum {
font-size: 36px;
font-weight: 700;
}
.content {
display: flex;
flex-direction: column;
width: 100%;
justify-content: space-between;
padding: 10px 15px;
.top-title {
font-size: 12px;
color: #aaa;
}
.sum {
font-size: 36px;
font-weight: 700;
}
.content {
display: flex;
width: 100%;
justify-content: space-between;
align-items: center;
font-size: 12px;
color: #999;
}
}
.item:nth-child(4) {
margin: 0;
align-items: center;
font-size: 12px;
color: #999;
}
}
.year-content {
width: 100%;
height: auto;
display: flex;
justify-content: space-between;
.left {
width: 500px;
height: 500px;
}
.right {
flex: 1;
height: auto;
margin-left: 50px;
}
.item:nth-child(4) {
margin: 0;
}
.participation-status-content {
width: 100%;
height: auto;
display: flex;
justify-content: space-between;
.left {
width: 500px;
height: 500px;
margin-left: 50px;
}
.right {
flex: 1;
height: auto;
}
}
.year-content {
width: 100%;
height: auto;
display: flex;
justify-content: space-between;
.left {
width: 500px;
height: 500px;
}
.footer {
width: 100%;
margin: 30px 0;
.right {
flex: 1;
height: auto;
margin-left: 50px;
}
}
.border-000 {
border: 1px solid #000;
.participation-status-content {
width: 100%;
height: auto;
display: flex;
justify-content: space-between;
.left {
width: 500px;
height: 500px;
margin-left: 50px;
}
.right {
flex: 1;
height: auto;
}
}
.border-title {
.footer {
width: 100%;
border-bottom: 1px solid #000;
height: 50px;
line-height: 50px;
font-size: 14px;
padding: 0 20px;
margin: 30px 0;
}
.rebuild{
display: flex;
justify-content: center;
div{
cursor: pointer;
}
}
}
.border-000 {
border: 1px solid #000;
}
.border-title {
width: 100%;
border-bottom: 1px solid #000;
height: 50px;
line-height: 50px;
font-size: 14px;
padding: 0 20px;
}
.rebuild {
display: flex;
justify-content: center;
div {
cursor: pointer;
}
}
</style>

22
jeecgboot-vue3-master/src/views/depart/workbench/components/chExpert/index.vue
Unescape View File

@ -56,15 +56,19 @@
<div class="table">
<div class="t_item t_head">
<div class="ranking">序号</div>
<div class="nd">年度</div>
<div class="name">年度比赛名称</div>
<div class="newp">年度比赛项目</div>
<div class="cc">项目层次</div>
</div>
<div class="t_item t_con" v-for="o, i in data.jxzndbsxmList" :key="i">
<div class="ranking">
<div class="ol">{{ o.xh }}</div>
</div>
<div class="nd">{{ o.nd }}</div>
<div class="name">{{ o.ndbs }}</div>
<div class="newp">{{ o.ndbsxm }}</div>
<div class="cc">{{ o.cc }}</div>
</div>
<a-empty v-if="!data.jxzndbsxmList.length" style="margin-top: 50px;" />
@ -85,15 +89,19 @@
<div class="table">
<div class="t_item t_head">
<div class="ranking">序号</div>
<div class="nd">年度</div>
<div class="name">年度比赛名称</div>
<div class="newp">年度比赛项目</div>
<div class="cc">项目层次</div>
</div>
<div class="t_item t_con" v-for="o, i in data.lsndbsxmList" :key="i">
<div class="ranking">
<div class="ol">{{ o.xh }}</div>
</div>
<div class="nd">{{ o.nd }}</div>
<div class="name">{{ o.ndbs }}</div>
<div class="newp">{{ o.ndbsxm }}</div>
<div class="cc">{{ o.cc }}</div>
</div>
<a-empty v-if="!data.lsndbsxmList.length" style="margin-top: 50px;" />
</div>
@ -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%);
//}

Write Preview
Loading…
Cancel
Save