diff --git a/src/views/SagTraceResult_WX/components/eventStatistics/distributionNetwork.vue b/src/views/SagTraceResult_WX/components/eventStatistics/distributionNetwork.vue index a1ac9c7..d6d76ab 100644 --- a/src/views/SagTraceResult_WX/components/eventStatistics/distributionNetwork.vue +++ b/src/views/SagTraceResult_WX/components/eventStatistics/distributionNetwork.vue @@ -494,8 +494,8 @@ const generateFn = async () => { loading1.value = true; await getDynamicData({ lineId: dotList.value.id, - searchBeginTime: tabList.value[activeName.value].time[0], - searchEndTime: tabList.value[activeName.value].time[1], + searchBeginTime: time.value[0], + searchEndTime: time.value[1], time: tabList.value[activeName.value].key, type: form.type, userDataId: form.loadDataId, diff --git a/src/views/SagTraceResult_WX/components/eventStatistics/system.vue b/src/views/SagTraceResult_WX/components/eventStatistics/system.vue index 13a281d..e07cb7b 100644 --- a/src/views/SagTraceResult_WX/components/eventStatistics/system.vue +++ b/src/views/SagTraceResult_WX/components/eventStatistics/system.vue @@ -20,6 +20,7 @@ v-model="form.userList" :data="dataTree" multiple + filterable show-checkbox ref="treeRef" @@ -46,6 +47,7 @@ v-model="form.index" filterable multiple + :multiple-limit="5" collapse-tags collapse-tags-tooltip @@ -395,7 +397,7 @@ const submit = () => { showTabs.value = true; let list = JSON.parse(JSON.stringify(form.index)).sort((a, b) => a - b); tabList.value = []; - + list.forEach((item: any) => { tabList.value.push({ label: item + "次谐波", @@ -553,11 +555,13 @@ const generateFn = async () => { return ElMessage.warning("请选择用采用户"); } loading1.value = true; + console.log("🚀 ~ generateFn ~ dotList.value:", dotList.value.id, tabList.value); + await getDynamicData({ userDataId: "123", lineId: dotList.value.id, - searchBeginTime: tabList.value[activeName.value].time[0], - searchEndTime: tabList.value[activeName.value].time[1], + searchBeginTime: time.value[0], + searchEndTime: time.value[1], time: tabList.value[activeName.value].key, type: form.type, userList: form.userList,