Merge remote-tracking branch 'origin/main' into main

jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList.vue

@@ -18,8 +18,8 @@
     <div class="table">
       <div class="t_item t_head">
         <div class="name">能力名称</div>
-        <div class="total">能力分数</div>
-        <div class="operate">达标情况</div>
+        <div class="operate">能力分数</div>
+        <!-- <div class="operate">达标情况</div> -->
       </div>
       <div class="t_item t_con" v-for="(item,index) in data.splice(-6)" :key="index">
         <div class="name">{{ item.capacityName }}</div>

jeecgboot-vue3-master/src/views/comprehensiveEvaluation/comprehensiveReport.vue

@@ -138,6 +138,10 @@
       <cardList6 />
     </div> -->
   </div>
+  <div class="loading" v-else>
+    <a-spin />
+    
+  </div>
 </template>
 
 <script lang="ts" setup>
@@ -281,6 +285,13 @@
 </script>
 
 <style lang="less" scoped>
+.loading{
+  width: 100%;
+  height: 100vh;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
   .container {
     width: 1240px;
     margin: 0 auto;

jeecgboot-vue3-master/src/views/comprehensiveEvaluation/department.vue

@@ -135,6 +135,10 @@
       <cardList6 :data="data.部门获奖情况列表"/>
     </div> -->
   </div>
+  <div class="loading" v-else>
+    <a-spin />
+    
+  </div>
 </template>
 
 <script lang="ts" setup>
@@ -221,6 +225,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;

jeecgboot-vue3-master/src/views/comprehensiveEvaluation/organizingCommittee.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="container">
+  <div class="container" v-if="loading">
     <div class="title">河南机电学院比赛 {{data.annualCompName}} 组委会报告</div>
     <p class="description"
       >我是比赛综述:全面落实立德树人根本任务，依据CDI0工程教育理念，培养德、智、体、美、劳全面发展，掌握软件工程专业所需的数学与自然科学基础知识、专业基础理论知识;在企业级软件开发和工业智能软件开发方向，能承担软件分析、设计、开发、项目管理等任务，具备解决复杂工程问题的能力;具有终身学习和创新创业意识、国际交流能力、团队合作精神等良好案养，能适应产业与社会变革的国际化应用型人才。<br />本专业毕业生经过五年左右的实际工作，能够达到以下目标:</p
@@ -32,7 +32,7 @@
         <randerChart />
       </div>
       <div class="right border-000">
-        <cardList />
+        <cardList :DATA="data12"/>
       </div>
     </div>
     <cardTitle title="比赛学生获奖情况分析" />
@@ -54,6 +54,10 @@
       </div>
     </div>
   </div>
+  <div class="loading" v-else>
+    <a-spin />
+    
+  </div>
 </template>
 
 <script lang="ts" setup>
@@ -65,10 +69,12 @@
   import { getOrganizingCommitteeReport } from '/@/api/common/api';
   import {ref} from 'vue'
   const data = ref<any>({})
+  const loading = ref<any>(false)
   const getOrganizingCommitteeReportEvent = async () => {
     const res = await getOrganizingCommitteeReport()
     data.value = res
     console.log(res);
+    loading.value = true
     
   }
   getOrganizingCommitteeReportEvent()
@@ -76,6 +82,68 @@
     const arr: any = ['当前届数', '参赛人数', '参赛队伍数', '比赛项目数'];
     return arr[index];
   };
+  const data12 = JSON.stringify([
+    {
+  
+        "capacityName": "职业规范",
+        "value": 1.87
+    },
+    {
+
+        "capacityName": "沟通",
+        "value": 0.94
+    },
+    {
+
+        "capacityName": "设计/开发解决方案",
+        "value": 1.87
+    },
+    {
+
+        "capacityName": "研究",
+        "value": 1.87
+    },
+    {
+
+        "capacityName": "环境和可持续发展",
+        "value": 1.87
+    },
+    {
+
+        "capacityName": "使用现代工具",
+        "value": 1.87
+    },
+    {
+
+        "capacityName": "终身学习",
+        "value": 0.94
+    },
+    {
+
+        "capacityName": "工程知识",
+        "value": 1.87
+    },
+    {
+
+        "capacityName": "项目管理",
+        "value": 0.94
+    },
+    {
+
+        "capacityName": "工程与社会",
+        "value": 1.87
+    },
+    {
+
+        "capacityName": "个人和团队",
+        "value": 0.94
+    },
+    {
+
+        "capacityName": "问题分析",
+        "value": 1.87
+    }
+])
 </script>
 
 <style lang="less" scoped>