update bug修复

src/components/common/echartCard/commonChart.vue

@@ -104,6 +104,20 @@ const formData = ref({
   discipline: '',
 });
 
+const formatEmitData = () => {
+  // 只把需要的条件保留
+  const obj = {
+    ...(props.filterItems.includes('userGroup') && { userGroupId: formData.value.userGroupId }),
+    ...(props.filterItems.includes('user') && { userId: formData.value.userId }),
+    ...((props.filterItems.includes('projectName') ||
+      props.filterItems.includes('projectCode')) && {
+      tag1: formData.value.tag1,
+    }),
+    ...(props.filterItems.includes('discipline') && { discipline: formData.value.discipline }),
+  };
+  return obj;
+};
+
 const getGroupList = async () => {
   const res: any = await userQueryGroupApi({
     current: 1,
@@ -116,7 +130,7 @@ const getGroupList = async () => {
     }));
     if (userGroupOptions.value?.length && props.filterItems.includes('userGroup')) {
       formData.value.userGroupId = userGroupOptions.value[0].value;
-      emit('update', formData.value);
+      emit('update', formatEmitData());
     }
   }
 };
@@ -124,11 +138,11 @@ const getGroupList = async () => {
 // 用户组改变
 const handleUserGroupChange = () => {
   formData.value.userId = '';
-  emit('update', formData.value);
+  emit('update', formatEmitData());
 };
 // 筛选条件改变
 const filterChange = () => {
-  emit('update', formData.value);
+  emit('update', formatEmitData());
 };
 
 // 初始化图表
@@ -150,7 +164,7 @@ onMounted(async () => {
   if (props.filterItems.includes('userGroup')) {
     await getGroupList();
   } else {
-    emit('update', formData.value);
+    emit('update', formatEmitData());
   }
 });
 </script>

src/views/task/dashboard/components/simulation/summaryCharts.vue

@@ -42,6 +42,12 @@
                   :label="item.nodeName"
                   :value="item.uuid"
                 />
+                <!-- <el-option
+                  v-for="item in DISCIPLINE_TYPE.A"
+                  :label="item.label"
+                  :value="item.label"
+                  :key="item.value"
+                ></el-option> -->
               </el-select>
             </el-form-item>
           </el-form>
@@ -80,6 +86,8 @@ import {
   TASK_CALCULATE_STATUS_OBJ,
 } from '@/utils/enum/task';
 import emitter from '@/utils/eventBus';
+// import { useDict } from '@/utils/useDict';
+// const { DISCIPLINE_TYPE } = useDict('DISCIPLINE_TYPE');
 
 // 进度状态颜色列表
 const statusColorList = [
@@ -170,6 +178,7 @@ const getCommonOptionFun = async () => {
       legendData,
     };
   } else {
+    // dzhtodo  感觉这里的学科入参有问题
     const res: any = await getTaskCompleteStatisticsByDisciplineApi({
       tag1: currentProjectId.value,
       tag5: projectTaskFormData.value.workspace,