diff --git a/src/views/DialogTabs/component/RQ_FengXianJianCe.vue b/src/views/DialogTabs/component/RQ_FengXianJianCe.vue
index 75e6f7c..9543a87 100644
--- a/src/views/DialogTabs/component/RQ_FengXianJianCe.vue
+++ b/src/views/DialogTabs/component/RQ_FengXianJianCe.vue
@@ -16,13 +16,18 @@
       <div class="SearchLabel">预警类型:</div>
       <div class="SearchSel">
         <el-select v-model="AllData.value2" placeholder="Select" style="width: 100%">
-          <el-option v-for="item in AllData.options2" :key="item.value" :label="item.label" :value="item.value" />
+          <el-option
+            v-for="item in AllData.options2"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
         </el-select>
       </div>
       <div class="SearchLabel">
         累计次数: <span class="SearchLabelValue">{{ AllData.CS }}</span>
       </div>
-      <div class="SearchRightBTN">切换图形</div>
+      <!-- <div class="SearchRightBTN">切换图形</div> -->
     </div>
     <div class="TableBox">
       <el-table stripe v-loading="AllData.loading" :data="AllData.DataList">
@@ -45,46 +50,46 @@
 </template>
 
 <script setup name="RQ_FengXianJianCe">
-import { ref, reactive, toRefs, onMounted, onBeforeUnmount } from 'vue';
-import { earlyWarningInfoPage } from '@/api/ranqi.js';
-import bus from '@/bus';
+import { ref, reactive, toRefs, onMounted, onBeforeUnmount } from "vue";
+import { earlyWarningInfoPage } from "@/api/ranqi.js";
+import bus from "@/bus";
 const AllData = reactive({
-  dateTime: '',
+  dateTime: "",
   options: [
     {
-      value: '2021',
-      label: '2021年',
+      value: "2021",
+      label: "2021年",
     },
     {
-      value: '2022',
-      label: '2022年',
+      value: "2022",
+      label: "2022年",
     },
     {
-      value: '2023',
-      label: '2023年',
+      value: "2023",
+      label: "2023年",
     },
     {
-      value: '2024',
-      label: '2024年',
+      value: "2024",
+      label: "2024年",
     },
   ],
-  value2: '0',
+  value2: "0",
   options2: [
     {
-      value: '0',
-      label: '全部',
+      value: "0",
+      label: "全部",
     },
     {
-      value: '1',
-      label: '甲烷浓度',
+      value: "1",
+      label: "甲烷浓度",
     },
     {
-      value: '2',
-      label: '压力',
+      value: "2",
+      label: "压力",
     },
     {
-      value: '3',
-      label: '温度',
+      value: "3",
+      label: "温度",
     },
   ],
   CS: 4,
@@ -96,9 +101,9 @@
     pageSize: 10,
   },
 });
-const getList = item => {
+const getList = (item) => {
   // 获取数据
-  earlyWarningInfoPage({ warningType: item }).then(res => {
+  earlyWarningInfoPage({ warningType: item }).then((res) => {
     AllData.DataList = res.data;
     AllData.total = res.total;
     // console.log(res, 'shuju');
@@ -106,8 +111,8 @@
 };
 
 onMounted(() => {
-  bus.on('getDataListFxjc', val => {
-    console.log(val, '接受111111111111');
+  bus.on("getDataListFxjc", (val) => {
+    console.log(val, "接受111111111111");
     getList(val.zb);
     AllData.value2 = val.value;
     AllData.endTime = val.endTime;
@@ -115,7 +120,7 @@
 });
 
 onBeforeUnmount(() => {
-  bus.off('getDataListFxjc');
+  bus.off("getDataListFxjc");
 });
 </script>
 

diff --git a/src/views/DialogTabs/component/RQ_FengXianJianCe.vue b/src/views/DialogTabs/component/RQ_FengXianJianCe.vue
index 75e6f7c..9543a87 100644
--- a/src/views/DialogTabs/component/RQ_FengXianJianCe.vue
+++ b/src/views/DialogTabs/component/RQ_FengXianJianCe.vue
@@ -16,13 +16,18 @@
       <div class="SearchLabel">预警类型:</div>
       <div class="SearchSel">
         <el-select v-model="AllData.value2" placeholder="Select" style="width: 100%">
-          <el-option v-for="item in AllData.options2" :key="item.value" :label="item.label" :value="item.value" />
+          <el-option
+            v-for="item in AllData.options2"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
         </el-select>
       </div>
       <div class="SearchLabel">
         累计次数: <span class="SearchLabelValue">{{ AllData.CS }}</span>
       </div>
-      <div class="SearchRightBTN">切换图形</div>
+      <!-- <div class="SearchRightBTN">切换图形</div> -->
     </div>
     <div class="TableBox">
       <el-table stripe v-loading="AllData.loading" :data="AllData.DataList">
@@ -45,46 +50,46 @@
 </template>
 
 <script setup name="RQ_FengXianJianCe">
-import { ref, reactive, toRefs, onMounted, onBeforeUnmount } from 'vue';
-import { earlyWarningInfoPage } from '@/api/ranqi.js';
-import bus from '@/bus';
+import { ref, reactive, toRefs, onMounted, onBeforeUnmount } from "vue";
+import { earlyWarningInfoPage } from "@/api/ranqi.js";
+import bus from "@/bus";
 const AllData = reactive({
-  dateTime: '',
+  dateTime: "",
   options: [
     {
-      value: '2021',
-      label: '2021年',
+      value: "2021",
+      label: "2021年",
     },
     {
-      value: '2022',
-      label: '2022年',
+      value: "2022",
+      label: "2022年",
     },
     {
-      value: '2023',
-      label: '2023年',
+      value: "2023",
+      label: "2023年",
     },
     {
-      value: '2024',
-      label: '2024年',
+      value: "2024",
+      label: "2024年",
     },
   ],
-  value2: '0',
+  value2: "0",
   options2: [
     {
-      value: '0',
-      label: '全部',
+      value: "0",
+      label: "全部",
     },
     {
-      value: '1',
-      label: '甲烷浓度',
+      value: "1",
+      label: "甲烷浓度",
     },
     {
-      value: '2',
-      label: '压力',
+      value: "2",
+      label: "压力",
     },
     {
-      value: '3',
-      label: '温度',
+      value: "3",
+      label: "温度",
     },
   ],
   CS: 4,
@@ -96,9 +101,9 @@
     pageSize: 10,
   },
 });
-const getList = item => {
+const getList = (item) => {
   // 获取数据
-  earlyWarningInfoPage({ warningType: item }).then(res => {
+  earlyWarningInfoPage({ warningType: item }).then((res) => {
     AllData.DataList = res.data;
     AllData.total = res.total;
     // console.log(res, 'shuju');
@@ -106,8 +111,8 @@
 };
 
 onMounted(() => {
-  bus.on('getDataListFxjc', val => {
-    console.log(val, '接受111111111111');
+  bus.on("getDataListFxjc", (val) => {
+    console.log(val, "接受111111111111");
     getList(val.zb);
     AllData.value2 = val.value;
     AllData.endTime = val.endTime;
@@ -115,7 +120,7 @@
 });
 
 onBeforeUnmount(() => {
-  bus.off('getDataListFxjc');
+  bus.off("getDataListFxjc");
 });
 </script>
 
diff --git a/src/views/oneMap/components/ZHRQ.vue b/src/views/oneMap/components/ZHRQ.vue
index 9db981e..bb36061 100644
--- a/src/views/oneMap/components/ZHRQ.vue
+++ b/src/views/oneMap/components/ZHRQ.vue
@@ -1064,7 +1064,15 @@
       warningPoint.on("click", (e) => {
         let popupData = e.feature.properties;
 
+        debugger;
         console.log("popupData---", "告警---------", popupData);
+        FengXianClick({
+          zb: "甲烷浓度",
+          sz: "3%",
+          szzt: true,
+          zt: 0, //0预警 1 正常
+          value: "JWND",
+        });
       });
     }
     bus.emit("setLayerVisible", { layername: "rq_SZLH", isCheck: true }); //所有管网rq_all、市政rq_SZLH、庭院rq_TYLH、立管rq_LGLH、其他rq_other