'修改部门报告接口'

jeecgboot-vue3-master/src/api/common/api.ts

@@ -206,7 +206,8 @@ export const getComprehensiveReport = (params = {}) => {
 // http://localhost:18083/jeecg-boot/user/login/homepage/report4Depart
 export const getdepartmentReport = (params: any = {}) => {
   return defHttp.get({
-    url: '/user/login/homepage/report4School',
+    url: '/user/login/homepage/report4Depart',
     params
   })
 }
+// 11111111

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

@@ -296,13 +296,22 @@
       }
     });
   };
+  const selectYeay = async () => {
+    isLoading.value = false;
+
+    const res = await getComprehensiveReport({ annualid: annualid.value });
+    console.log(res);
+    data.value = res;
+    data12.value = JSON.stringify(res.学生能力平均值);
+    isLoading.value = true;
+  };
   const annualid = ref('');
   watch(
     () => annualid.value,
     () => {
       console.log(annualid);
       
-      Rebuild();
+      selectYeay();
     }
   );
 </script>

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

@@ -118,7 +118,6 @@
         <div class="left border-000">
           <!-- <div class="border-title">年度维度分析</div> -->
           <ringChart :data="data.比赛获奖占比" />
-
         </div>
       </div>
       <div class="footer-edit border-000">
@@ -133,7 +132,6 @@
       <div class="right border-000">
         <cardList7 :data="data.部门参赛情况列表" />
       </div>
-     
     </div>
     <!-- <div class="footer border-000">
       <cardList6 :data="data.部门获奖情况列表"/>
@@ -141,7 +139,6 @@
   </div>
   <div class="loading" v-else>
     <a-spin />
-    
   </div>
 </template>
 
@@ -161,32 +158,39 @@
   import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
 
   import { ref, watch } from 'vue';
-  import {useUserStore} from '/@/store/modules/user'
+  import { useUserStore } from '/@/store/modules/user';
-  const userStore = useUserStore()
+  const userStore = useUserStore();
   const activeKey = ref('1');
-  const data = ref<any>({})
+  const data = ref<any>({});
-    const isLoading =   ref<any>(false)
+  const isLoading = ref<any>(false);
-  const data12 = ref<any>([])
+  const data12 = ref<any>([]);
 
   const getdepartmentReportEvent = async () => {
-    const res = await getdepartmentReport({orgCode:userStore.userInfo.id
+    const res = await getdepartmentReport({ orgCode: userStore.userInfo.orgCode });
-    })
     console.log(res);
-    data.value = res
+    data.value = res;
-    data12.value = JSON.stringify(res.学生能力平均值)
+    data12.value = JSON.stringify(res.学生能力平均值);
-    isLoading.value = true
+    isLoading.value = true;
-  }
+  };
-  getdepartmentReportEvent()
+  getdepartmentReportEvent();
   const Rebuild = async () => {
-    isLoading.value = false
+    isLoading.value = false;
 
-    const res = await getdepartmentReport({recreateFlag:true,orgCode:userStore.userInfo.id,annualid: annualid.value
+    const res = await getdepartmentReport({ recreateFlag: true, orgCode: userStore.userInfo.orgCode, annualid: annualid.value });
-    })
     console.log(res);
-    data.value = res
+    data.value = res;
-    data12.value = JSON.stringify(res.学生能力平均值)
+    data12.value = JSON.stringify(res.学生能力平均值);
-    isLoading.value = true
+    isLoading.value = true;
-  }
+  };
+  const selectYeay = async () => {
+    isLoading.value = false;
+
+    const res = await getdepartmentReport({ orgCode: userStore.userInfo.orgCode, annualid: annualid.value });
+    console.log(res);
+    data.value = res;
+    data12.value = JSON.stringify(res.学生能力平均值);
+    isLoading.value = true;
+  };
   var indicator = [
     {
       text: '前言探索',
@@ -243,7 +247,7 @@
     () => {
       console.log(annualid);
 
-      Rebuild();
+      selectYeay();
     }
   );
 </script>