From ceae62ff4aa3199016525b6c6e6b6d0187ecd473 Mon Sep 17 00:00:00 2001
From: significative <163999932+significative@users.noreply.github.com>
Date: Sun, 28 Jul 2024 18:25:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E8=83=BD=E5=8A=9B=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../comprehensiveEvaluation/individual.vue    | 168 +++++++++++++++---
 .../workbench/components/student/student.vue  |  13 +-
 2 files changed, 150 insertions(+), 31 deletions(-)

diff --git a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/individual.vue b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/individual.vue
index 8eed315c..32321a57 100644
--- a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/individual.vue
+++ b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/individual.vue
@@ -6,21 +6,72 @@
             我是比赛综述：全面落实立德树人根本任务，依据CDIO工程教育理念，培养德、智、体、美、劳全面发展，掌握软件工程专业所需的数学与自然科学基础知识、专业基础理论知识；在企业级软件开发和工业智能软件开发方向，能承担软件分析、设计、开发、项目管理等任务，具备解决复杂工程问题的能力；具有终身学习和创新创业意识、国际交流能力、团队合作精神等良好素养，能适应产业与社会变革的国际化应用型人。
         </p>
         <a-row class="card-box" :gutter="[16, 16]" type="flex">
-            <a-col :xs="24" :md="12" :xl="6" v-for="i in 4" :key="i">
-                <div class="card">
+            <a-col :xs="24" :md="12" :xl="12">
+                <!-- <div class="card">
                     <div class="inner">
                         <div class="container">
                             <div class="fl-box">
-                                <div class="tit">参加的比赛数</div>
-                                <div class="center">88</div>
+                                <div class="tit">参加的比赛数</div> 
+                                <div class="center">{{ data.cjbsxmsl }}</div>
                                 <div class="info">
-                                    <div class="li">国赛：12</div>
-                                    <div class="li">省赛：32</div>
-                                    <div class="li">校赛：44</div>
+                                    <div class="li">国家级：{{ data.gjj }}</div>
+                                    <div class="li">省级：{{ data.shengj }}</div>
+                                    <div class="li">市级：{{ data.shij }}</div>
+                                    <div class="li">校级：{{ data.xj }}</div>
                                 </div>
                             </div>
                         </div>
                     </div>
+                </div> -->
+                <div class="card1">
+                    <div class="title">
+                        <div class="left">参加比赛项目数量</div>
+                        <div class="right">
+                            <SvgIcon size="20" name="content" />
+                        </div>
+                    </div>
+                    <div class="name">{{ data.cjbsxmsl }}</div>
+                    <div class="total" style="margin-top: 10px">
+                        <div class="two">国家级：{{ data.gjj }}</div>
+                        <div class="three">省级：{{ data.shengj }}</div>
+                        <div class="three">市级：{{ data.shij }}</div>
+                        <div class="three">校级：{{ data.xj }}</div>
+                    </div>
+                </div>
+            </a-col>
+            <a-col :xs="24" :md="12" :xl="12">
+                <!-- <div class="card">
+                    <div class="inner">
+                        <div class="container">
+                            <div class="fl-box">
+                                <div class="tit">获奖数</div>
+                                <div class="center">{{ data.hjNumber }}</div>
+                                <div class="info">
+                                    <div class="li">一等：{{ data.ydjNumber }}</div>
+                                    <div class="li">二等：{{ data.edjNumber }}</div>
+                                    <div class="li">三等：{{ data.sdjNumber }}</div>
+                                    <div class="li">四等：{{ data.sidjNumber }}</div>
+                                    <div class="li">五等：{{ data.wdjNumber }}</div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div> -->
+                <div class="card1">
+                    <div class="title">
+                        <div class="left">获奖数</div>
+                        <div class="right">
+                            <SvgIcon size="20" name="content" />
+                        </div>
+                    </div>
+                    <div class="name">{{ data.hjNumber }}</div>
+                    <div class="total" style="grid-template-columns: repeat(5, 1fr)">
+                        <div class="one">一等：{{ data.ydjNumber }}</div>
+                        <div class="two">二等：{{ data.edjNumber }}</div>
+                        <div class="three">三等：{{ data.sdjNumber }}</div>
+                        <div class="two">四等：{{ data.sidjNumber }}</div>
+                        <div class="three">五等：{{ data.wdjNumber }}</div>
+                    </div>
                 </div>
             </a-col>
         </a-row>
@@ -49,34 +100,27 @@
         <p class="paragraph">
             我是比赛参赛情况综述：全面落实立德树人根本任务，依据CDIO工程教育理念，培养德、智、体、美、劳全面发展，掌握软件工程专业所需的数学与自然科学基础知识、专业基础理论知识；在企业级软件开发和工业智能软件开发方向，能承担软件分析、设计、开发、项目管理等任务，具备解决复杂工程问题的能力；具有终身学习和创新创业意识、国际交流能力、团队合作精神等良好素养，能适应产业与社会变革的国际化应用型人。
         </p>
-        <div class="table-box">
+        <div class="table-box" style="min-height: 500px;">
             <table>
                 <caption>
                     个人比赛获奖情况
                 </caption>
                 <thead>
                     <tr>
-                        <th scope="col">获奖等级</th>
-                        <th scope="col">比赛名称</th>
-                        <th scope="col">项目名称</th>
-                        <th scope="col">所在小队</th>
+                        <th scope="col">奖项名称</th>
+                        <th scope="col">年度比赛</th>
+                        <th scope="col">年度比赛项目</th>
+                        <th scope="col">所在队伍名称</th>
                         <th scope="col">积分</th>
                     </tr>
                 </thead>
                 <tbody>
-                    <tr>
-                        <th scope="row">一等奖</th>
-                        <td>全国计算机大赛</td>
-                        <td>项目一</td>
-                        <td>我是一个小队</td>
-                        <td>135</td>
-                    </tr>
-                    <tr>
-                        <th scope="row">一等奖</th>
-                        <td>全国计算机大赛</td>
-                        <td>项目一</td>
-                        <td>我是一个小队</td>
-                        <td>135</td>
+                    <tr v-for="item, i in data.allApList" :key="i">
+                        <th scope="row">{{ item.jxname }}</th>
+                        <td>{{ item.ndbs }}</td>
+                        <td>{{ item.ndbsxm }}</td>
+                        <td>{{ item.dwname }}</td>
+                        <td>{{ item.jf }}</td>
                     </tr>
                 </tbody>
             </table>
@@ -88,6 +132,33 @@
 <script lang='ts' setup>
 import cardList from './components/cardList.vue';
 import randerChart from './components/randerChart.vue';
+import { getXsfxbg } from '/@/api/demo/depart';
+import { reactive } from 'vue';
+
+type allApList = {
+    jxname: string
+    ndbs: string
+    ndbsxm: string
+    dwname: string
+    jf: string
+}[] | []
+const data = reactive({
+    cjbsxmsl: 0,
+    gjj: 0,
+    shengj: 0,
+    shij: 0,
+    xj: 0,
+    hjNumber: 0,
+    ydjNumber: 0,
+    edjNumber: 0,
+    sdjNumber: 0,
+    sidjNumber: 0,
+    wdjNumber: 0,
+    allApList: [] as allApList
+})
+getXsfxbg().then(res => {
+    Object.assign(data, res)
+})
 </script>
 
 <style lang='less' scoped>
@@ -218,5 +289,52 @@ import randerChart from './components/randerChart.vue';
         }
     }
 
+
+    /** */
+    .card1 {
+        width: 100%;
+        height: 182px;
+        // background-color: #ffffff00;
+        border: 1px solid #ccc;
+        padding: 20px;
+
+        .title {
+            display: flex;
+            width: 100%;
+
+            justify-content: space-between;
+
+            .left {
+                font-size: 14px;
+                color: #fff;
+                color: rgba(0, 0, 0, 0.45);
+            }
+        }
+
+        .name {
+            font-size: 42px;
+            font-weight: 500;
+            color: #000;
+            margin-top: 10px;
+        }
+
+        .total {
+            margin-top: 20px;
+            font-size: 12px;
+            color: #000;
+            // display: flex;
+            width: 100%;
+            display: grid;
+            grid-template-columns: repeat(4, 1fr);
+            /* 创建两列，每列宽度相等 */
+            grid-template-rows: repeat(2, 10px);
+            /* 创建四行，每行高度固定为100px */
+            gap: 10px;
+
+            div {
+                // width: 25%;
+            }
+        }
+    }
 }
 </style>
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 1bac1d46..98b9a874 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
@@ -11,10 +11,10 @@
               </div>
               <div class="name">{{ data.cjbsxmsl }}</div>
               <div class="total" style="margin-top: 10px">
-                <div class="two">国家级：：{{ data.gjj }}</div>
-                <div class="three">省级：：{{ data.shengj }}</div>
-                <div class="three">市级：：{{ data.shij }}</div>
-                <div class="three">校级：：{{ data.xj }}</div>
+                <div class="two">国家级：{{ data.gjj }}</div>
+                <div class="three">省级：{{ data.shengj }}</div>
+                <div class="three">市级：{{ data.shij }}</div>
+                <div class="three">校级：{{ data.xj }}</div>
               </div>
             </div>
           </a-col>
@@ -24,7 +24,7 @@
                 <div class="left">获奖数</div>
                 <div class="right"><SvgIcon size="20" name="content" /></div>
               </div>
-              <div class="name">1314</div>
+              <div class="name">{{ data.hjNumber }}</div>
               <div class="total" style="grid-template-columns: repeat(5, 1fr)">
                 <div class="one">一等：{{data.ydjNumber}}</div>
                 <div class="two">二等：{{data.edjNumber}}</div>
@@ -114,7 +114,8 @@ const router = useRouter()
     wdjNumber:0,
     allApList:[],
     ndbsxm:[],
-    bmbsxm:[]
+    bmbsxm:[],
+    hjNumber:0
   });
   const getStudentEvent = async () => {
     const res = await getStudent();