update 仿真汇总看板接口替换

src/components/common/echartCard/commonFilterChart.vue

@@ -87,7 +87,7 @@
               @change="filterChange"
             />
           </el-form-item>
-          <slot name="extraFilters" :extraFilters="props.extraFilters" />
+          <slot name="extraFilters" :extraFilters="extraFilters" />
         </el-form>
       </template>
     </EchartCard>
@@ -248,7 +248,13 @@ watch(
   async () => {
     filterChange();
     hasFilterField.value = Object.values({ ...formData.value, ...props.extraFilters }).some(
-      (item) => item
+      (item) => {
+        // 排除空数组、空字符串、null、undefined和0
+        if (Array.isArray(item)) {
+          return item.length > 0;
+        }
+        return Boolean(item);
+      }
     );
   },
   { deep: true }

src/views/task/dashboard/components/summaryNewBoard.vue

@@ -59,8 +59,11 @@
 import commonFilterChart from '@/components/common/echartCard/commonFilterChart.vue';
 import { ref } from 'vue';
 import { getThemeColor } from '@/utils/theme';
-import { getTaskCompleteStatisticsByDisciplineApi } from '@/api/project/node';
-import { getTaskAchieveStatisticsApi } from '@/api/project/task';
+import {
+  getTaskCompleteStatisticsByDisciplineApi,
+  getTaskAchieveStatisticsByDisciplineApi,
+} from '@/api/project/node';
+// import { getTaskAchieveStatisticsApi } from '@/api/project/task';
 import { useDict } from '@/utils/useDict';
 import { getTaskStatusColorList } from '@/utils/enum/task';
 import { TASK_CALCULATE_STATUS_OPTIONS } from '@/utils/enum/task';
@@ -168,11 +171,11 @@ const taskCalculateStatusLegendData = TASK_CALCULATE_STATUS_OPTIONS.map((item) =
   name: item.label,
 }));
 const achieveBarChartUpdate = async (data: any) => {
-  const res: any = await getTaskAchieveStatisticsApi({
-    resultTagType: 'tag6',
+  const res: any = await getTaskAchieveStatisticsByDisciplineApi({
+    // resultTagType: 'tag6',
     tag1: data.tag1,
     tag5: data.workspace,
-    tag6: data.discipline,
+    discipline: data.discipline,
   });
   if (res && res.code === 200) {
     const xData = res.data.result.map((item: any) => {
@@ -203,14 +206,14 @@ const achievePieChartNodata = ref(false);
 const achievePieOption = ref<any>();
 const achievePieChartUpdate = async (data: any) => {
   const seriesData: { name: any; value: any }[] = [];
-  const res: any = await getTaskAchieveStatisticsApi({
-    resultTagType: 'tag6',
+  const res: any = await getTaskAchieveStatisticsByDisciplineApi({
+    // resultTagType: 'tag6',
     tag1: data.tag1,
     tag5: data.workspace,
-    tag6: data.discipline,
+    discipline: data.discipline,
   });
   if (res.code === 200) {
-    achievePieChartNodata.value = res.data.allAchieveStatus.length === 0;
+    achievePieChartNodata.value = res.data.allExeStatus.length === 0;
     const achieveStatusObj: any = {};
     Object.keys(RESULT_ACHIEVE_STATUS.value.O).forEach((item: any) => {
       achieveStatusObj[item] = 0;