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

增加学校 学校管理员选择年度报告

Browse Source
main
JayChou 3 months ago
parent 06fdd0c6e0
commit d0f9445c49
2 changed files with 75 additions and 49 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 107
      jeecgboot-vue3-master/src/views/comprehensiveEvaluation/comprehensiveReport.vue
  2. 17
      jeecgboot-vue3-master/src/views/comprehensiveEvaluation/department.vue

107
jeecgboot-vue3-master/src/views/comprehensiveEvaluation/comprehensiveReport.vue
Unescape View File

@ -1,7 +1,13 @@
<template> <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="isLoading"> <div class="container" v-if="isLoading">
<div class="title">河南机电学院比赛综合报告<div style="margin-left: 10px;cursor: pointer;"><SvgIcon name="log" @click="log"/></div></div> <div class="title"
<div class="rebuild" ><div @click="Rebuild">重新生成报告</div></div> >河南机电学院比赛综合报告<div style="margin-left: 10px; cursor: pointer"><SvgIcon name="log" @click="log" /></div
></div>
<div class="rebuild"><div @click="Rebuild">重新生成报告</div></div>
<p class="description" <p class="description"
>我是比赛综述:全面落实立德树人根本任务，依据CDI0工程教育理念，培养德、智、体、美、劳全面发展，掌握软件工程专业所需的数学与自然科学基础知识、专业基础理论知识;在企业级软件开发和工业智能软件开发方向，能承担软件分析、设计、开发、项目管理等任务，具备解决复杂工程问题的能力;具有终身学习和创新创业意识、国际交流能力、团队合作精神等良好案养，能适应产业与社会变革的国际化应用型人才。<br />本专业毕业生经过五年左右的实际工作，能够达到以下目标:</p >我是比赛综述:全面落实立德树人根本任务，依据CDI0工程教育理念，培养德、智、体、美、劳全面发展，掌握软件工程专业所需的数学与自然科学基础知识、专业基础理论知识;在企业级软件开发和工业智能软件开发方向，能承担软件分析、设计、开发、项目管理等任务，具备解决复杂工程问题的能力;具有终身学习和创新创业意识、国际交流能力、团队合作精神等良好案养，能适应产业与社会变革的国际化应用型人才。<br />本专业毕业生经过五年左右的实际工作，能够达到以下目标:</p
> >
@ -10,7 +16,7 @@
<div class="top-title">本年度已开展比赛数</div> <div class="top-title">本年度已开展比赛数</div>
<div class="sum">{{ data.本年度已开展比赛项目数 }}</div> <div class="sum">{{ data.本年度已开展比赛项目数 }}</div>
<div class="content"> <div class="content">
<div>国赛：{{data.国赛}}</div> <div>国赛：{{ data.国赛 }}</div>
<div>省赛：{{ data.省赛 }}</div> <div>省赛：{{ data.省赛 }}</div>
<div>校赛：{{ data.校赛 }}</div> <div>校赛：{{ data.校赛 }}</div>
</div> </div>
@ -19,16 +25,16 @@
<div class="top-title">本年度已开展比赛数</div> <div class="top-title">本年度已开展比赛数</div>
<div class="sum">{{ data.本年度已开展比赛数 }}</div> <div class="sum">{{ data.本年度已开展比赛数 }}</div>
<div class="content"> <div class="content">
<div>国赛：{{data.国赛}}</div> <div>国赛：{{ data.国赛 }}</div>
<div>省赛：{{ data.省赛 }}</div> <div>省赛：{{ data.省赛 }}</div>
<div>校赛：{{ data.校赛 }}</div> <div>校赛：{{ data.校赛 }}</div>
</div> </div>
</div> </div>
<div class="item"> <div class="item">
<div class="top-title">本年度参加比赛队伍数</div> <div class="top-title">本年度参加比赛队伍数</div>
<div class="sum">{{ data.本年度参加比赛队伍数}}</div> <div class="sum">{{ data.本年度参加比赛队伍数 }}</div>
<div class="content"> <div class="content">
<div>国赛：{{data.国赛}}</div> <div>国赛：{{ data.国赛 }}</div>
<div>省赛：{{ data.省赛 }}</div> <div>省赛：{{ data.省赛 }}</div>
<div>校赛：{{ data.校赛 }}</div> <div>校赛：{{ data.校赛 }}</div>
</div> </div>
@ -37,7 +43,7 @@
<div class="top-title">已完成的比赛</div> <div class="top-title">已完成的比赛</div>
<div class="sum">{{ data.已完成的比赛 }}</div> <div class="sum">{{ data.已完成的比赛 }}</div>
<div class="content"> <div class="content">
<div>国赛：{{data.国赛}}</div> <div>国赛：{{ data.国赛 }}</div>
<div>省赛：{{ data.省赛 }}</div> <div>省赛：{{ data.省赛 }}</div>
<div>校赛：{{ data.校赛 }}</div> <div>校赛：{{ data.校赛 }}</div>
</div> </div>
@ -51,10 +57,10 @@
<div class="year-content-top"> <div class="year-content-top">
<div class="left border-000"> <div class="left border-000">
<div class="border-title">年度维度分析</div> <div class="border-title">年度维度分析</div>
<randerChart :data="data.学生能力平均值"/> <randerChart :data="data.学生能力平均值" />
</div> </div>
<div class="right border-000"> <div class="right border-000">
<cardList :DATA="data12"/> <cardList :DATA="data12" />
</div> </div>
</div> </div>
@ -97,11 +103,11 @@
<div class="left border-000"> <div class="left border-000">
<!-- <div class="border-title">年度维度分析</div> --> <!-- <div class="border-title">年度维度分析</div> -->
<cakeChart :data="data.比赛类型占比"/> <cakeChart :data="data.比赛类型占比" />
</div> </div>
</div> </div>
<div class="footer-edit border-000"> <div class="footer-edit border-000">
<cardList2 :data="data.学生参赛情况"/> <cardList2 :data="data.学生参赛情况" />
</div> </div>
</div> </div>
<cardTitle title="比赛学生获奖情况分析" /> <cardTitle title="比赛学生获奖情况分析" />
@ -115,11 +121,11 @@
</div> </div>
<div class="left border-000"> <div class="left border-000">
<!-- <div class="border-title">年度维度分析</div> --> <!-- <div class="border-title">年度维度分析</div> -->
<ringChart :data="data.比赛获奖占比"/> <ringChart :data="data.比赛获奖占比" />
</div> </div>
</div> </div>
<div class="footer-edit border-000"> <div class="footer-edit border-000">
<cardList3 :data="data.比赛获奖情况列表"/> <cardList3 :data="data.比赛获奖情况列表" />
</div> </div>
</div> </div>
<cardTitle title="部门参赛情况分析" /> <cardTitle title="部门参赛情况分析" />
@ -128,11 +134,11 @@
> >
<div class="participation-status-content"> <div class="participation-status-content">
<div class="right border-000"> <div class="right border-000">
<cardList4 :data="data.部门参赛情况列表"/> <cardList4 :data="data.部门参赛情况列表" />
</div> </div>
<div class="left border-000" style="height: auto"> <div class="left border-000" style="height: auto">
<!-- <div class="border-title">年度维度分析</div> --> <!-- <div class="border-title">年度维度分析</div> -->
<cardList5 :data="data.比赛学生积分况分析"/> <cardList5 :data="data.比赛学生积分况分析" />
</div> </div>
</div> </div>
<!-- <div class="footer border-000"> <!-- <div class="footer border-000">
@ -141,7 +147,6 @@
</div> </div>
<div class="loading" v-else> <div class="loading" v-else>
<a-spin /> <a-spin />
</div> </div>
</template> </template>
@ -154,34 +159,34 @@
import cardList5 from './components/cardList5.vue'; import cardList5 from './components/cardList5.vue';
// import cardList6 from './components/cardList6.vue'; // import cardList6 from './components/cardList6.vue';
import { SvgIcon } from '/@/components/Icon'; import { SvgIcon } from '/@/components/Icon';
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
import randerChart from './components/randerChart.vue'; import randerChart from './components/randerChart.vue';
import cakeChart from './components/cakeChart.vue'; import cakeChart from './components/cakeChart.vue';
import ringChart from './components/ringChart.vue'; import ringChart from './components/ringChart.vue';
import pillarChart from './components/pillarChart.vue'; import pillarChart from './components/pillarChart.vue';
import { ref, onMounted, nextTick } from 'vue'; import { ref, onMounted, nextTick,watch } from 'vue';
import { jsPDF } from 'jspdf'; import { jsPDF } from 'jspdf';
import {getComprehensiveReport} from '/@/api/common/api'; import { getComprehensiveReport } from '/@/api/common/api';
const data = ref<any>({}) const data = ref<any>({});
const isLoading = ref<any>(false) const isLoading = ref<any>(false);
const data12 = ref<any>([]) const data12 = ref<any>([]);
const getComprehensiveReportEvent = async () => { const getComprehensiveReportEvent = async () => {
const res = await getComprehensiveReport() const res = await getComprehensiveReport();
data.value = res data.value = res;
console.log(res); console.log(res);
data12.value = JSON.stringify(res.学生能力平均值) data12.value = JSON.stringify(res.学生能力平均值);
isLoading.value = true isLoading.value = true;
};
} getComprehensiveReportEvent();
getComprehensiveReportEvent()
const Rebuild = async () => { const Rebuild = async () => {
isLoading.value = false isLoading.value = false;
const res = await getComprehensiveReport({recreateFlag:true}) const res = await getComprehensiveReport({ recreateFlag: true ,annualid:annualid.value});
data.value = res data.value = res;
console.log(res); console.log(res);
data12.value = JSON.stringify(res.学生能力平均值) data12.value = JSON.stringify(res.学生能力平均值);
isLoading.value = true isLoading.value = true;
} };
const activeKey = ref('1'); const activeKey = ref('1');
var indicator = [ var indicator = [
{ {
@ -238,8 +243,8 @@
await clickDom(); await clickDom();
// return // return
var canvas = document.createElement('canvas'); var canvas = document.createElement('canvas');
var w = parseInt((document.querySelector('.container') as Element).clientWidth); var w = parseInt((document.querySelector('.container') as Element).clientWidth);
var h = parseInt((document.querySelector('.container') as Element).clientHeight); var h = parseInt((document.querySelector('.container') as Element).clientHeight);
console.log(w, h); console.log(w, h);
canvas.width = w; canvas.width = w;
@ -291,16 +296,25 @@
} }
}); });
}; };
const annualid = ref('');
watch(
() => annualid.value,
() => {
console.log(annualid);
Rebuild();
}
);
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.loading{ .loading {
width: 100%; width: 100%;
height: 100vh; height: 100vh;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.container { .container {
width: 1240px; width: 1240px;
margin: 0 auto; margin: 0 auto;
@ -314,12 +328,12 @@
font-weight: 700; font-weight: 700;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.rebuild{ .rebuild {
display: flex; display: flex;
justify-content: center; justify-content: center;
div{ div {
cursor: pointer; cursor: pointer;
} }
} }
@ -485,6 +499,5 @@
line-height: 50px; line-height: 50px;
font-size: 14px; font-size: 14px;
padding: 0 20px; padding: 0 20px;
} }
</style> </style>

17
jeecgboot-vue3-master/src/views/comprehensiveEvaluation/department.vue
Unescape View File

@ -1,4 +1,7 @@
<template> <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="isLoading"> <div class="container" v-if="isLoading">
<div class="title">河南机电学院比赛部门报告</div> <div class="title">河南机电学院比赛部门报告</div>
<div class="rebuild" ><div @click="Rebuild">重新生成报告</div></div> <div class="rebuild" ><div @click="Rebuild">重新生成报告</div></div>
@ -155,8 +158,9 @@
import ringChart from './components/ringChart.vue'; import ringChart from './components/ringChart.vue';
import pillarChart from './components/pillarChart.vue'; import pillarChart from './components/pillarChart.vue';
import {getdepartmentReport} from '/@/api/common/api'; import {getdepartmentReport} from '/@/api/common/api';
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
import { ref } from 'vue'; import { ref,watch } from 'vue';
import {useUserStore} from '/@/store/modules/user' import {useUserStore} from '/@/store/modules/user'
const userStore = useUserStore() const userStore = useUserStore()
const activeKey = ref('1'); const activeKey = ref('1');
@ -176,7 +180,7 @@
const Rebuild = async() => { const Rebuild = async() => {
isLoading.value = false isLoading.value = false
const res = await getdepartmentReport({recreateFlag:true,orgCode:userStore.userInfo.id const res = await getdepartmentReport({recreateFlag:true,orgCode:userStore.userInfo.id,annualid: annualid.value
}) })
console.log(res); console.log(res);
data.value = res data.value = res
@ -233,6 +237,15 @@
max: 5000, max: 5000,
}, },
]; ];
const annualid = ref('');
watch(
() => annualid.value,
() => {
console.log(annualid);
Rebuild();
}
);
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>

Write Preview
Loading…
Cancel
Save