格点雨量、发起会商

src/views/emergencyCommandMap/RightSection/InitConsultation.vue

@@ -80,7 +80,7 @@
     <div class="footer">
       <div></div>
       <div class="btn-box">
-        <div class="common-btn-primary2" style="margin-right: 20px">电话呼叫</div>
+        <div class="common-btn-primary2" style="margin-right: 20px" @click="handlePhoneCall">电话呼叫</div>
         <div class="common-btn-primary2" @click="handleStartMeeting">发起会议</div>
       </div>
     </div>
@@ -91,7 +91,10 @@
 import { Search } from '@element-plus/icons-vue';
 import { ConvergedCommunication } from '@/utils/convergedCommunication';
 
-const emits = defineEmits(['close']);
+const props = defineProps({
+  modelValue: Boolean
+});
+const emits = defineEmits(['update:modelValue', 'close']);
 let activeIndex = ref(0);
 const options = ref([{ name: '全部', value: '全部' }]);
 const queryParams = ref({
@@ -242,14 +245,18 @@ const deleteItem = (item) => {
 
 // 弹窗关闭后
 const handleClose = () => {
-  emits('close');
+  emits('update:modelValue', false);
 };
 
 // 融合通信参数
+const handlePhoneCall = () => {
+  emits('update:modelValue', false);
+}
 // 发起会议
 const handleStartMeeting = () => {
   const convergedCommunication = new ConvergedCommunication();
   convergedCommunication.start();
+  emits('update:modelValue', false);
 };
 </script>
 

src/views/emergencyCommandMap/RightSection/index.vue

@@ -41,7 +41,7 @@
     <RightTop :event-id="eventId" />
     <PublicOpinionSupervision />
     <JointDuty />
-    <InitConsultation v-if="showInitConsultation" />
+    <InitConsultation v-if="showInitConsultation" v-model="showInitConsultation" />
     <StartPlan v-if="startPlanState.show" v-model:show="startPlanState.show" :title="startPlanState.title" :event-id="startPlanState.eventId" />
     <SelectPlan v-model="selectPlanState.show" :title="selectPlanState.title" :temp-event-id="eventId" @update-plan="updatePlan" />
     <RenWuDengJi v-if="renWuDengJiState.show" v-model:show="renWuDengJiState.show" :event-id="eventId" />

src/views/globalMap/RightMenu/GridPointRainfall.vue

@@ -58,7 +58,6 @@ onMounted(() => {
       chartOption.value.series[1].data = data3;
     });
   });
-
 });
 onMounted(() => {