소스 검색

修改河道监测、降雨量排行榜、24小时降雨图的弹窗

hmm 8 달 전
부모
커밋
095ff730ae

+ 2 - 4
src/views/globalMap/RightMenu/RainMonitor/RainChart.vue

@@ -1,7 +1,5 @@
 <template>
-  <div class="rain-chart-dialog">
-    <div class="close-btn" @click="handleClose"></div>
-    <div class="gradient-text title">24小时降水图</div>
+  <Dialog custom-show type="md" title="24小时降水图" hide-footer @close="handleClose">
     <div class="line">
       <div class="title-box">
         <div class="gradient-text">{{ rainData.address }}</div>
@@ -13,7 +11,7 @@
       </div>
     </div>
     <Chart :option="chartOption" style="flex: 1" />
-  </div>
+  </Dialog>
 </template>
 
 <script lang="ts" setup>

+ 3 - 4
src/views/globalMap/RightMenu/RainMonitor/RainRank.vue

@@ -1,8 +1,6 @@
 <template>
-  <div v-show="!showDialog" class="dialog-container">
-    <div class="close-btn" @click="handleClose"></div>
+  <Dialog custom-show type="md" title="降雨量排行榜" hide-footer @close="handleClose">
     <div class="title-box">
-      <div class="gradient-text title">降雨量排行榜</div>
       <el-select
         v-model="timeOption"
         class="custom-select"
@@ -74,7 +72,7 @@
         @current-change="handleChangePage"
       />
     </div>
-  </div>
+  </Dialog>
   <RainChart v-if="showDialog" v-model:show="showDialog" :rainData="rainData" />
 </template>
 
@@ -82,6 +80,7 @@
 import { getRainfallRange2 } from '@/api/globalMap/rainMonitor';
 import { getNextAreaInfo } from '@/api/common';
 import RainChart from '@/views/globalMap/RightMenu/RainMonitor/RainChart.vue';
+import CloseEventDialog from "@/views/routineCommandMap/eventing/CloseEventDialog.vue";
 
 interface Props {
   modelValue: boolean;

+ 7 - 2
src/views/globalMap/RightMenu/RiverMonitor.vue

@@ -34,7 +34,7 @@
       </div>
     </div>
   </div>
-  <Dialog v-model="showDialog" title="河道监测" width="2500px" height="1200px">
+  <Dialog v-model="showDialog" type="lg" title="河道监测" hide-footer>
     <div class="flex">
       <div class="detail-container">
         <div class="flex">
@@ -90,15 +90,20 @@
       </div>
     </div>
   </Dialog>
+
 </template>
 
 <script lang="ts" setup name="RiverMonitor">
-import Dialog from './Dialog.vue';
 import { option1, option2 } from './echartOptions';
 import { getRiverCourseLevel, getRiverList, getRiverWaterStatus } from '@/api/globalMap/riverMonitor';
 import { parseTime, validateNum } from '@/utils/ruoyi';
 import { getVideoInfo } from '@/api/globalMap';
 
+const handleClose = () => {
+  emits('update:show', false);
+};
+const emits = defineEmits(['update:show']);
+
 // 请求参数
 const queryParams = reactive({
   area: ''