From 7c20c2200e0c3266f5c5cd6f15b220065f43b70d Mon Sep 17 00:00:00 2001
From: JayChou <2064936853@qq.com>
Date: Mon, 29 Jul 2024 11:53:28 +0800
Subject: [PATCH] =?UTF-8?q?'=E5=AF=B9=E6=8E=A5=E7=BB=84=E5=A7=94=E4=BC=9A?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/cardList7.vue                  | 17 ++++---
 .../components/cardList8.vue                  | 48 +++++++------------
 .../organizingCommittee.vue                   | 29 +++++++----
 3 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList7.vue b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList7.vue
index bcad6eda..c5921448 100644
--- a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList7.vue
+++ b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList7.vue
@@ -5,16 +5,18 @@
 
     <div class="table">
       <div class="t_item t_head">
-        <div class="name">获奖等级</div>
-        <div class="total">项目名称</div>
+        <div class="name">获奖名称</div>
+        <div class="total">年度比赛名称</div>
+        <div class="total">年度比赛项目名称</div>
         <div class="total">所在小队</div>
         <div class="operate">积分</div>
       </div>
-      <div class="t_item t_con" v-for="(i) in 20" :key="i">
-        <div class="name">一等奖</div>
-        <div class="total">项目一</div>
-        <div class="total">一路向北</div>
-        <div class="operate">121</div>
+      <div class="t_item t_con" v-for="(item,index) in props.data" :key="index">
+        <div class="name">{{ item.jxname }}</div>
+        <div class="total">{{item.ndbs}}</div>
+        <div class="total">{{ item.ndbsxm }}</div>
+        <div class="total">{{ item.dwname }}</div>
+        <div class="operate">{{ item.jf }}</div>
       </div>
     </div>
   </div>
@@ -26,6 +28,7 @@
   const props = defineProps({
     data: {
       type: Array,
+      default:[]
 
     },
   });
diff --git a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList8.vue b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList8.vue
index e750f808..de71698e 100644
--- a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList8.vue
+++ b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList8.vue
@@ -1,48 +1,39 @@
 <template>
-  <div class="foo_card8">
-    <div class="title"> 比赛获奖情况<div class="log-btn" @click="unfold"><SvgIcon class="icon" name="zhedie" /></div
-    ></div>
+  <div class="foo_card">
+    <!-- <div class="title"> 部门学生积分排名 </div> -->
 
     <div class="table">
       <div class="t_item t_head">
-        <div class="name">部门名称</div>
-        <div class="total">参赛人数</div>
-        <div class="operate">队伍量</div>
+        <div class="ranking">排名</div>
+        <div class="name">参赛院系</div>
+        <!-- <div class="total">报名数</div> -->
+        <div class="operate">报名数</div>
       </div>
-      <div class="t_item t_con" v-for="(i) in 20" :key="i">
-        <div class="name">机电学院</div>
-        <div class="total">2121</div>
-        <div class="operate">121</div>
+      <div class="t_item t_con" v-for="(i,index) in props.data" :key="index">
+        <div class="ranking">
+          <div class="ol" :class="{ ac: index <= 3 }">{{ i.pm}}</div>
+        </div>
+        <div class="name">{{ i.csyxname }}</div>
+        <div class="operate">{{ i.bms }}</div>
       </div>
     </div>
   </div>
 </template>
 
 <script lang="ts" setup>
-  import { SvgIcon } from '/@/components/Icon';
-
   const props = defineProps({
     data: {
       type: Array,
-
+      default: [],
     },
   });
-  let falg = false;
-  const unfold = () => {
-    const dom: any = document.querySelector('.foo_card8') as Element;
-    falg = !falg;
-    if (falg) {
-      dom.style.height = 'auto';
-    } else {
-      dom.style.height = '500px';
-    }
-  };
+
 </script>
 
 <style lang="less" scoped>
-  .foo_card8 {
+  .foo_card {
     width: 100%;
-    height: 500px;
+    height: calc(502px - 58px);
     overflow: auto;
     background: #ffffff;
     // box-shadow: 0px 1px 2px 0px rgba(0, 0, 0, 0.1);
@@ -50,19 +41,12 @@
 
     .title {
       width: 100%;
-      text-align: center;
       padding-left: 23px;
       height: 57px;
       line-height: 57px;
       font-size: 16px;
       color: rgba(0, 0, 0, 0.85);
       position: relative;
-      .icon {
-        position: absolute;
-        right: 20px;
-        top: 20px;
-        cursor: pointer;
-      }
 
       &::before {
         content: '';
diff --git a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/organizingCommittee.vue b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/organizingCommittee.vue
index 6746211c..f0216b62 100644
--- a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/organizingCommittee.vue
+++ b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/organizingCommittee.vue
@@ -1,13 +1,25 @@
 <template>
   <div class="container">
-    <div class="title">河南机电学院比赛综组委会报告</div>
+    <div class="title">河南机电学院比赛 {{data.annualCompName}} 组委会报告</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 class="item">
+        <div class="top-title">当前届数</div>
+        <div class="sum">第{{data.sum}}届</div>
+      </div>
+      <div class="item">
+        <div class="top-title">参赛报名数</div>
+        <div class="sum">{{ data.bmNumber }}</div>
+      </div>
+      <div class="item">
+        <div class="top-title">参赛人数</div>
+        <div class="sum">{{ data.csNumber }}</div>
+      </div>
+      <div class="item">
+        <div class="top-title">比赛项目数</div>
+        <div class="sum">{{ data.bsxmSum }}</div>
       </div>
     </div>
     <cardTitle title="参赛学生综合能力评价分析" />
@@ -29,7 +41,7 @@
     >
     <div class="participation-status-content">
       <div class="right border-000">
-        <cardList7 />
+        <cardList7/>
       </div>
     </div>
     <cardTitle title="部门参赛情况分析" />
@@ -38,7 +50,7 @@
     >
     <div class="participation-status-content">
       <div class="right border-000">
-        <cardList8 />
+        <cardList8  :data="data.csyxbmpm"/>
       </div>
     </div>
   </div>
@@ -51,10 +63,11 @@
   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'
-
+  import {ref} from 'vue'
+  const data = ref<any>({})
   const getOrganizingCommitteeReportEvent = async () => {
     const res = await getOrganizingCommitteeReport()
+    data.value = res
     console.log(res);
     
   }