From 406b364ec6dee60a1872a14d925f060d8f504fcd Mon Sep 17 00:00:00 2001
From: JayChou <2064936853@qq.com>
Date: Mon, 12 Aug 2024 17:39:30 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=BB=84=E5=A7=94=E4=BC=9A?=
 =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=A2=9E=E5=8A=A0=E9=87=8D=E6=96=B0=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=20=E7=BB=84=E5=A7=94=E4=BC=9A=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=87=8D=E6=96=B0=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jeecgboot-vue3-master/src/api/common/api.ts   | 15 +++++++-----
 .../organizingCommittee.vue                   | 24 +++++++++++++++++++
 .../organizingCommittee.vue                   | 17 +++++++++++--
 .../workbench/components/student/student.vue  | 17 ++++++++++++-
 4 files changed, 64 insertions(+), 9 deletions(-)

diff --git a/jeecgboot-vue3-master/src/api/common/api.ts b/jeecgboot-vue3-master/src/api/common/api.ts
index 4f1527b0..3499047f 100644
--- a/jeecgboot-vue3-master/src/api/common/api.ts
+++ b/jeecgboot-vue3-master/src/api/common/api.ts
@@ -170,23 +170,26 @@ export const uploadMyFile = (url, data) => {
   return defHttp.uploadMyFile(url, data);
 };
 //  组委会首页
-export const getOrganizingCommittee = () => {
+export const getOrganizingCommittee = (params={recreateFlag:false}) => {
   return defHttp.get({
-    url:'/annualcompetitionprojectregistration/annualCompetitionProjectRegistration/zwhsybsjs'
+    url:'/annualcompetitionprojectregistration/annualCompetitionProjectRegistration/zwhsybsjs',
+    params
   })
 }
 // 学生首页
-export const getStudent = () => {
+export const getStudent = (params={recreateFlag:false}) => {
   return defHttp.get({
-    url:'/annualcompetitionprojectregistration/annualCompetitionProjectRegistration/xssybsjs'
+    url:'/annualcompetitionprojectregistration/annualCompetitionProjectRegistration/xssybsjs',
+    params
   })
 }
 
 // 组委会报告
 // /annualcompetitionprojectregistration/annualCompetitionProjectRegistration/zwhfxbg
-export const getOrganizingCommitteeReport = () => {
+export const getOrganizingCommitteeReport = (params={recreateFlag:false}) => {
   return defHttp.get({
-    url:'/annualcompetitionprojectregistration/annualCompetitionProjectRegistration/zwhfxbg'
+    url:'/annualcompetitionprojectregistration/annualCompetitionProjectRegistration/zwhfxbg',
+    params
   })
 }
 //  /user/login/homepage/report4School
diff --git a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/organizingCommittee.vue b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/organizingCommittee.vue
index 3eed1415..fc3ea030 100644
--- a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/organizingCommittee.vue
+++ b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/organizingCommittee.vue
@@ -1,6 +1,7 @@
 <template>
   <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
     >
@@ -78,6 +79,15 @@
     
   }
   getOrganizingCommitteeReportEvent()
+  const Rebuild = async() => {
+    loading.value = false
+
+    const res = await getOrganizingCommitteeReport({recreateFlag:true
+    })
+    console.log(res);
+    data.value = res
+    loading.value = true
+  }
   const formatTitle = (index: number) => {
     const arr: any = ['当前届数', '参赛人数', '参赛队伍数', '比赛项目数'];
     return arr[index];
@@ -147,6 +157,13 @@
 </script>
 
 <style lang="less" scoped>
+.loading{
+  width: 100%;
+  height: 100vh;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
   .container {
     width: 1200px;
     margin: 0 auto;
@@ -240,4 +257,11 @@
     font-size: 14px;
     padding: 0 20px;
   }
+  .rebuild{
+      display: flex;
+      justify-content: center;
+      div{
+        cursor: pointer;
+      }
+    }
 </style>
diff --git a/jeecgboot-vue3-master/src/views/depart/workbench/components/organizingCommittee/organizingCommittee.vue b/jeecgboot-vue3-master/src/views/depart/workbench/components/organizingCommittee/organizingCommittee.vue
index 6915652c..8f3cdd84 100644
--- a/jeecgboot-vue3-master/src/views/depart/workbench/components/organizingCommittee/organizingCommittee.vue
+++ b/jeecgboot-vue3-master/src/views/depart/workbench/components/organizingCommittee/organizingCommittee.vue
@@ -1,11 +1,12 @@
 <template>
-  <div class="container-box">
+  <div class="container-box" v-show="loading">
   <a-row :gutter="[24, 32]" style="margin-top: 30px">
     <a-col :lg="12" :xxl="6">
       <div class="item">
         <div class="card1">
           <div class="title">
             <div class="left">比赛届数</div>
+            <div style="color: #fff;cursor: pointer;" @click="reset">重新生成报告</div>
             <div class="right"><SvgIcon size="20" name="shizhong" /></div>
           </div>
           <div class="name">{{ data.annualCompName }}</div>
@@ -103,7 +104,10 @@
     ></a-col>
   </a-row> 
   </div>
-
+  <div class="loading" v-if="!loading">
+    <a-spin />
+    
+  </div>
 </template>
 
 <script lang="ts" setup>
@@ -143,9 +147,11 @@
 
 
   })
+  const loading = ref(false)
   const getOrganizingCommitteeEvent = async () => {
     const res = await getOrganizingCommittee()
     data.value = res
+    loading.value = true
     console.log(res);
     
   }
@@ -153,6 +159,13 @@
   const getAll = () => {
     router.push('/annualcompetitionprojectregistration/administration/audited/AnnualCompetitionProjectRegistrationList')
   }
+  const reset = async() => {
+    loading.value = false
+    const res = await getOrganizingCommittee({recreateFlag:true})
+    data.value = res
+    console.log(res);
+    loading.value = true
+  }
   // const initContent = () => {
   //   const myChart = echarts.init(document.getElementById('chart-content'));
   //   const option = {
diff --git a/jeecgboot-vue3-master/src/views/depart/workbench/components/student/student.vue b/jeecgboot-vue3-master/src/views/depart/workbench/components/student/student.vue
index 98b9a874..3086b547 100644
--- a/jeecgboot-vue3-master/src/views/depart/workbench/components/student/student.vue
+++ b/jeecgboot-vue3-master/src/views/depart/workbench/components/student/student.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="container-box">
+  <div class="container-box" v-show="loading">
     <a-row :gutter="[24, 24]" style="margin-top: 30px">
       <a-col :xxl="12" :xl="12" :lg="24">
         <a-row :gutter="[24, 24]" style="margin-top: 0">
@@ -7,6 +7,7 @@
             <div class="card1">
               <div class="title">
                 <div class="left">参加比赛项目数量</div>
+                <div style="color: rgba(0, 0, 0, 0.45);cursor: pointer;" @click="reset">重新生成报告</div>
                 <div class="right"><SvgIcon size="20" name="content" /></div>
               </div>
               <div class="name">{{ data.cjbsxmsl }}</div>
@@ -89,6 +90,10 @@
       </a-col>
     </a-row>
   </div>
+  <div class="loading" v-if="!loading">
+    <a-spin />
+    
+  </div>
 </template>
 
 <script lang="ts" setup>
@@ -121,9 +126,19 @@ const router = useRouter()
     const res = await getStudent();
     data.value = res;
     console.log(res);
+    loading.value = true
+
     initHuojiangChart();
 
   };
+  const loading = ref(false)
+  const reset = async() => {
+    loading.value = false
+    const res = await getStudent({recreateFlag:true})
+    data.value = res
+    console.log(res);
+    loading.value = true
+  }
   getStudentEvent();
   const throttle = (fn: any) => {
     let timer: any;