From 753a43a23bd3ca244a3d4b671538f16786f7e01a Mon Sep 17 00:00:00 2001
From: JayChou <2064936853@qq.com>
Date: Mon, 29 Jul 2024 10:51:52 +0800
Subject: [PATCH] =?UTF-8?q?'=E4=BF=AE=E6=94=B9card=E6=A0=87=E9=A2=98'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jeecgboot-vue3-master/.eslintrc.js            |   5 +
 jeecgboot-vue3-master/src/api/common/api.ts   |   8 +
 .../comprehensiveReport.vue                   |   4 +-
 .../comprehensiveEvaluation/department.vue    |   2 +-
 .../comprehensiveEvaluation/individual.vue    |   2 +-
 .../organizingCommittee.vue                   | 282 +++++++++---------
 .../components/components/cardList.vue        |   2 +-
 .../components/components/cardListThree.vue   |   2 +-
 8 files changed, 162 insertions(+), 145 deletions(-)

diff --git a/jeecgboot-vue3-master/.eslintrc.js b/jeecgboot-vue3-master/.eslintrc.js
index 5fcac9eb..0276b3f7 100644
--- a/jeecgboot-vue3-master/.eslintrc.js
+++ b/jeecgboot-vue3-master/.eslintrc.js
@@ -7,6 +7,11 @@ module.exports = defineConfig({
     node: true,
     es6: true,
   },
+  globals: {  
+    // 在这里声明html2canvas为全局变量  
+    html2canvas: 'readonly',  
+ 
+  },  
   parser: 'vue-eslint-parser',
   parserOptions: {
     parser: '@typescript-eslint/parser',
diff --git a/jeecgboot-vue3-master/src/api/common/api.ts b/jeecgboot-vue3-master/src/api/common/api.ts
index 4be01130..237e17fc 100644
--- a/jeecgboot-vue3-master/src/api/common/api.ts
+++ b/jeecgboot-vue3-master/src/api/common/api.ts
@@ -181,3 +181,11 @@ export const getStudent = () => {
     url:'/annualcompetitionprojectregistration/annualCompetitionProjectRegistration/xssybsjs'
   })
 }
+
+// 组委会报告
+// /annualcompetitionprojectregistration/annualCompetitionProjectRegistration/zwhfxbg
+export const getOrganizingCommitteeReport = () => {
+  return defHttp.get({
+    url:'/annualcompetitionprojectregistration/annualCompetitionProjectRegistration/zwhfxbg'
+  })
+}
\ No newline at end of file
diff --git a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/comprehensiveReport.vue b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/comprehensiveReport.vue
index 50140904..cf706eea 100644
--- a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/comprehensiveReport.vue
+++ b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/comprehensiveReport.vue
@@ -185,8 +185,8 @@
       await clickDom();
       // return
       var canvas = document.createElement('canvas');
-      var w = parseInt(document.querySelector('.container').clientWidth);
-      var h = parseInt(document.querySelector('.container').clientHeight);
+      var w = parseInt((document.querySelector('.container') as  Element).clientWidth);
+      var h = parseInt((document.querySelector('.container') as  Element).clientHeight);
       console.log(w, h);
 
       canvas.width = w;
diff --git a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/department.vue b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/department.vue
index 3a522f53..6c04fa1a 100644
--- a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/department.vue
+++ b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/department.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="container">
-    <div class="title">河南机电学院比赛综合报告</div>
+    <div class="title">河南机电学院比赛部门报告</div>
     <p class="description"
       >我是比赛综述:全面落实立德树人根本任务，依据CDI0工程教育理念，培养德、智、体、美、劳全面发展，掌握软件工程专业所需的数学与自然科学基础知识、专业基础理论知识;在企业级软件开发和工业智能软件开发方向，能承担软件分析、设计、开发、项目管理等任务，具备解决复杂工程问题的能力;具有终身学习和创新创业意识、国际交流能力、团队合作精神等良好案养，能适应产业与社会变革的国际化应用型人才。<br />本专业毕业生经过五年左右的实际工作，能够达到以下目标:</p
     >
diff --git a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/individual.vue b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/individual.vue
index 8eed315c..713e55b3 100644
--- a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/individual.vue
+++ b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/individual.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="personage">
 
-        <h1 class="title">机电学院比赛综合报告</h1>
+        <h1 class="title">机电学院比赛个人报告</h1>
         <p class="paragraph">
             我是比赛综述：全面落实立德树人根本任务，依据CDIO工程教育理念，培养德、智、体、美、劳全面发展，掌握软件工程专业所需的数学与自然科学基础知识、专业基础理论知识；在企业级软件开发和工业智能软件开发方向，能承担软件分析、设计、开发、项目管理等任务，具备解决复杂工程问题的能力；具有终身学习和创新创业意识、国际交流能力、团队合作精神等良好素养，能适应产业与社会变革的国际化应用型人。
         </p>
diff --git a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/organizingCommittee.vue b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/organizingCommittee.vue
index 6acaac2b..6746211c 100644
--- a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/organizingCommittee.vue
+++ b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/organizingCommittee.vue
@@ -1,158 +1,162 @@
 <template>
-    <div class="container">
-      <div class="title">河南机电学院比赛综组委会报告</div>
-      <p class="description"
-        >我是比赛综述:全面落实立德树人根本任务，依据CDI0工程教育理念，培养德、智、体、美、劳全面发展，掌握软件工程专业所需的数学与自然科学基础知识、专业基础理论知识;在企业级软件开发和工业智能软件开发方向，能承担软件分析、设计、开发、项目管理等任务，具备解决复杂工程问题的能力;具有终身学习和创新创业意识、国际交流能力、团队合作精神等良好案养，能适应产业与社会变革的国际化应用型人才。<br />本专业毕业生经过五年左右的实际工作，能够达到以下目标:</p
-      >
-      <div class="card-content">
-        <div class="item" v-for="(item,index) in 4" :key="item">
-          <div class="top-title">{{ formatTitle(index) }}</div>
-          <div class="sum">{{ index === 0 ? '第八届': '88' }}</div>
-        </div>
+  <div class="container">
+    <div class="title">河南机电学院比赛综组委会报告</div>
+    <p class="description"
+      >我是比赛综述:全面落实立德树人根本任务，依据CDI0工程教育理念，培养德、智、体、美、劳全面发展，掌握软件工程专业所需的数学与自然科学基础知识、专业基础理论知识;在企业级软件开发和工业智能软件开发方向，能承担软件分析、设计、开发、项目管理等任务，具备解决复杂工程问题的能力;具有终身学习和创新创业意识、国际交流能力、团队合作精神等良好案养，能适应产业与社会变革的国际化应用型人才。<br />本专业毕业生经过五年左右的实际工作，能够达到以下目标:</p
+    >
+    <div class="card-content">
+      <div class="item" v-for="(item, index) in 4" :key="item">
+        <div class="top-title">{{ formatTitle(index) }}</div>
+        <div class="sum">{{ index === 0 ? '第八届' : '88' }}</div>
       </div>
-      <cardTitle title="参赛学生综合能力评价分析" />
-      <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 />
-        </div>
+    </div>
+    <cardTitle title="参赛学生综合能力评价分析" />
+    <p class="description"
+      >我是比赛综述:全面落实立德树人根本任务，依据CDI0工程教育理念，培养德、智、体、美、劳全面发展，掌握软件工程专业所需的数学与自然科学基础知识、专业基础理论知识;在企业级软件开发和工业智能软件开发方向，能承担软件分析、设计、开发、项目管理等任务，具备解决复杂工程问题的能力;具有终身学习和创新创业意识、国际交流能力、团队合作精神等良好案养，能适应产业与社会变革的国际化应用型人才。<br />本专业毕业生经过五年左右的实际工作，能够达到以下目标:</p
+    >
+    <div class="year-content">
+      <div class="left border-000">
+        <div class="border-title">年度维度分析</div>
+        <randerChart />
       </div>
-      <cardTitle title="比赛学生获奖情况分析" />
-      <p class="description"
-        >我是比赛综述:全面落实立德树人根本任务，依据CDI0工程教育理念，培养德、智、体、美、劳全面发展，掌握软件工程专业所需的数学与自然科学基础知识、专业基础理论知识;在企业级软件开发和工业智能软件开发方向，能承担软件分析、设计、开发、项目管理等任务，具备解决复杂工程问题的能力;具有终身学习和创新创业意识、国际交流能力、团队合作精神等良好案养，能适应产业与社会变革的国际化应用型人才。<br />本专业毕业生经过五年左右的实际工作，能够达到以下目标:</p
-      >
-      <div class="participation-status-content">
-        <div class="right border-000">
-            <cardList7 />
-
-        </div>
-       
+      <div class="right border-000">
+        <cardList />
       </div>
-      <cardTitle title="部门参赛情况分析" />
-      <p class="description"
-        >我是比赛综述:全面落实立德树人根本任务，依据CDI0工程教育理念，培养德、智、体、美、劳全面发展，掌握软件工程专业所需的数学与自然科学基础知识、专业基础理论知识;在企业级软件开发和工业智能软件开发方向，能承担软件分析、设计、开发、项目管理等任务，具备解决复杂工程问题的能力;具有终身学习和创新创业意识、国际交流能力、团队合作精神等良好案养，能适应产业与社会变革的国际化应用型人才。<br />本专业毕业生经过五年左右的实际工作，能够达到以下目标:</p
-      >
-      <div class="participation-status-content">
-        <div class="right border-000">
-          <cardList8 />
-        </div>
-       
+    </div>
+    <cardTitle title="比赛学生获奖情况分析" />
+    <p class="description"
+      >我是比赛综述:全面落实立德树人根本任务，依据CDI0工程教育理念，培养德、智、体、美、劳全面发展，掌握软件工程专业所需的数学与自然科学基础知识、专业基础理论知识;在企业级软件开发和工业智能软件开发方向，能承担软件分析、设计、开发、项目管理等任务，具备解决复杂工程问题的能力;具有终身学习和创新创业意识、国际交流能力、团队合作精神等良好案养，能适应产业与社会变革的国际化应用型人才。<br />本专业毕业生经过五年左右的实际工作，能够达到以下目标:</p
+    >
+    <div class="participation-status-content">
+      <div class="right border-000">
+        <cardList7 />
+      </div>
+    </div>
+    <cardTitle title="部门参赛情况分析" />
+    <p class="description"
+      >我是比赛综述:全面落实立德树人根本任务，依据CDI0工程教育理念，培养德、智、体、美、劳全面发展，掌握软件工程专业所需的数学与自然科学基础知识、专业基础理论知识;在企业级软件开发和工业智能软件开发方向，能承担软件分析、设计、开发、项目管理等任务，具备解决复杂工程问题的能力;具有终身学习和创新创业意识、国际交流能力、团队合作精神等良好案养，能适应产业与社会变革的国际化应用型人才。<br />本专业毕业生经过五年左右的实际工作，能够达到以下目标:</p
+    >
+    <div class="participation-status-content">
+      <div class="right border-000">
+        <cardList8 />
       </div>
     </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 { onMounted, reactive, ref, toRefs, watch } from 'vue'
-    const formatTitle = (index:number) => {
-        const arr:any = ['当前届数','参赛人数','参赛队伍数','比赛项目数']
-        return arr[index]
+  </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 { onMounted, reactive, ref, toRefs, watch } from 'vue'
+
+  const getOrganizingCommitteeReportEvent = async () => {
+    const res = await getOrganizingCommitteeReport()
+    console.log(res);
+    
+  }
+  getOrganizingCommitteeReportEvent()
+  const formatTitle = (index: number) => {
+    const arr: any = ['当前届数', '参赛人数', '参赛队伍数', '比赛项目数'];
+    return arr[index];
+  };
+</script>
+
+<style lang="less" scoped>
+  .container {
+    width: 1200px;
+    margin: 0 auto;
+    // height: 100vh;
+    padding-bottom: 30px;
+    .title {
+      width: 100%;
+      font-size: 36px;
+      text-align: center;
+      font-weight: 700;
     }
-  </script>
-  
-  <style lang="less" scoped>
-    .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 {
+    .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;
     }
-  </style>
+  }
+  .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;
+  }
+</style>
diff --git a/jeecgboot-vue3-master/src/views/depart/workbench/components/components/cardList.vue b/jeecgboot-vue3-master/src/views/depart/workbench/components/components/cardList.vue
index 56ee45b3..57b84ccf 100644
--- a/jeecgboot-vue3-master/src/views/depart/workbench/components/components/cardList.vue
+++ b/jeecgboot-vue3-master/src/views/depart/workbench/components/components/cardList.vue
@@ -6,7 +6,7 @@
       <div class="t_item t_head">
         <div class="ranking">排名</div>
         <div class="name">参赛院系</div>
-        <div class="total">报名人数</div>
+        <div class="total">报名数</div>
         <div class="operate">操作</div>
       </div>
       <div class="t_item t_con" v-for="(i,index) in props.data" :key="index">
diff --git a/jeecgboot-vue3-master/src/views/depart/workbench/components/components/cardListThree.vue b/jeecgboot-vue3-master/src/views/depart/workbench/components/components/cardListThree.vue
index de223734..4d53a595 100644
--- a/jeecgboot-vue3-master/src/views/depart/workbench/components/components/cardListThree.vue
+++ b/jeecgboot-vue3-master/src/views/depart/workbench/components/components/cardListThree.vue
@@ -6,7 +6,7 @@
       <div class="t_item t_head">
         <!-- <div class="ranking">排名</div> -->
         <div class="name">项目名称</div>
-        <div class="total">报名人数</div>
+        <div class="total">报名数</div>
         <div class="total">队伍数</div>
         <div class="operate">所在院系</div>
       </div>