diff --git a/src/views/DialogTabs/component/RQ_FengXianJianCe.vue b/src/views/DialogTabs/component/RQ_FengXianJianCe.vue index c0ecb7d..75e6f7c 100644 --- a/src/views/DialogTabs/component/RQ_FengXianJianCe.vue +++ b/src/views/DialogTabs/component/RQ_FengXianJianCe.vue @@ -7,7 +7,7 @@ clearable format="YYYY-MM-DD" value-format="YYYY-MM-DD" - v-model="AllData.dateTime" + v-model="AllData.endTime" type="date" placeholder="请选择年月日" @change="handleQuery" @@ -107,9 +107,10 @@ onMounted(() => { bus.on('getDataListFxjc', val => { - // console.log(val, '接受111111111111'); + console.log(val, '接受111111111111'); getList(val.zb); AllData.value2 = val.value; + AllData.endTime = val.endTime; }); }); diff --git a/src/views/DialogTabs/component/RQ_FengXianJianCe.vue b/src/views/DialogTabs/component/RQ_FengXianJianCe.vue index c0ecb7d..75e6f7c 100644 --- a/src/views/DialogTabs/component/RQ_FengXianJianCe.vue +++ b/src/views/DialogTabs/component/RQ_FengXianJianCe.vue @@ -7,7 +7,7 @@ clearable format="YYYY-MM-DD" value-format="YYYY-MM-DD" - v-model="AllData.dateTime" + v-model="AllData.endTime" type="date" placeholder="请选择年月日" @change="handleQuery" @@ -107,9 +107,10 @@ onMounted(() => { bus.on('getDataListFxjc', val => { - // console.log(val, '接受111111111111'); + console.log(val, '接受111111111111'); getList(val.zb); AllData.value2 = val.value; + AllData.endTime = val.endTime; }); }); diff --git a/src/views/oneMap/components/ZHRQ.vue b/src/views/oneMap/components/ZHRQ.vue index 4e8ddc4..9127f89 100644 --- a/src/views/oneMap/components/ZHRQ.vue +++ b/src/views/oneMap/components/ZHRQ.vue @@ -511,6 +511,14 @@ comIDs: ['RQ_FengXianJianCe'], }; bus.emit('publicDialog', data); + + let a = { + value: '全部', + endTime: '2024-10-05', + }; + setTimeout(() => { + bus.emit('getDataListFxjc', a); + }, 500); }); animateChart(); diff --git a/src/views/DialogTabs/component/RQ_FengXianJianCe.vue b/src/views/DialogTabs/component/RQ_FengXianJianCe.vue index c0ecb7d..75e6f7c 100644 --- a/src/views/DialogTabs/component/RQ_FengXianJianCe.vue +++ b/src/views/DialogTabs/component/RQ_FengXianJianCe.vue @@ -7,7 +7,7 @@ clearable format="YYYY-MM-DD" value-format="YYYY-MM-DD" - v-model="AllData.dateTime" + v-model="AllData.endTime" type="date" placeholder="请选择年月日" @change="handleQuery" @@ -107,9 +107,10 @@ onMounted(() => { bus.on('getDataListFxjc', val => { - // console.log(val, '接受111111111111'); + console.log(val, '接受111111111111'); getList(val.zb); AllData.value2 = val.value; + AllData.endTime = val.endTime; }); }); diff --git a/src/views/oneMap/components/ZHRQ.vue b/src/views/oneMap/components/ZHRQ.vue index 4e8ddc4..9127f89 100644 --- a/src/views/oneMap/components/ZHRQ.vue +++ b/src/views/oneMap/components/ZHRQ.vue @@ -511,6 +511,14 @@ comIDs: ['RQ_FengXianJianCe'], }; bus.emit('publicDialog', data); + + let a = { + value: '全部', + endTime: '2024-10-05', + }; + setTimeout(() => { + bus.emit('getDataListFxjc', a); + }, 500); }); animateChart(); diff --git a/src/views/oneMap/components/mapboxPopup.vue b/src/views/oneMap/components/mapboxPopup.vue index f8a0a7f..5ee9578 100644 --- a/src/views/oneMap/components/mapboxPopup.vue +++ b/src/views/oneMap/components/mapboxPopup.vue @@ -210,7 +210,7 @@