diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 86ae337..9c8fbf9 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -2,11 +2,7 @@
   <div class="pictureOnMap">
     <TopTab />
     <div class="mainContentBox">
-      <MapBox
-        :initJson="`/static/libs/mapbox/style/wh_dhgx.json`"
-        :loadCallback="loadCallback"
-        @mapClick1="mapClick1"
-      ></MapBox>
+      <MapBox :initJson="`/static/libs/mapbox/style/wh_dhgx.json`" :loadCallback="loadCallback" @mapClick1="mapClick1"></MapBox>
       <router-view></router-view>
       <recordPage></recordPage>
       <LayerControl></LayerControl>
@@ -39,20 +35,20 @@
   </div>
 </template>
 <script setup>
-import line from "../../../public/static/libs/mapbox/json/line.json";
-import point from "../../../public/static/libs/mapbox/json/point.json";
-import { ref, reactive, onMounted, nextTick } from "vue";
-import TopTab from "./TopTab/index.vue";
-import MapBox from "../../components/Map/MapBox";
-import bus from "@/bus";
-import useUserStore from "@/store/modules/user";
-import DialogTabs from "@/views/pictureOnMap/page/components/DialogTabs/dialogTabs.vue";
-import { drainageDispatchGetMenu } from "@/api/MonitorAssetsOnMap";
-import recordPage from "@/views/voice/recordPage/index";
-import usepartitionStore from "@/store/modules/partition";
+import line from '../../../public/static/libs/mapbox/json/line.json';
+import point from '../../../public/static/libs/mapbox/json/point.json';
+import { ref, reactive, onMounted, nextTick } from 'vue';
+import TopTab from './TopTab/index.vue';
+import MapBox from '../../components/Map/MapBox';
+import bus from '@/bus';
+import useUserStore from '@/store/modules/user';
+import DialogTabs from '@/views/pictureOnMap/page/components/DialogTabs/dialogTabs.vue';
+import { drainageDispatchGetMenu } from '@/api/MonitorAssetsOnMap';
+import recordPage from '@/views/voice/recordPage/index';
+import usepartitionStore from '@/store/modules/partition';
 
-import LayerControl from "@/views/pictureOnMap/LayerControl.vue";
-import { FALSE } from "ol/functions";
+import LayerControl from '@/views/pictureOnMap/LayerControl.vue';
+import { FALSE } from 'ol/functions';
 
 const useStore = usepartitionStore();
 
@@ -64,14 +60,14 @@
 const GetcomIDs = ref([]);
 const dialogConfig = reactive({
   visible: false,
-  dataID: "",
-  dataCode: "",
+  dataID: '',
+  dataCode: '',
   data: {},
   comIDs: [],
   customData: [],
-  RefName: "",
-  title: "详情",
-  typeName: "",
+  RefName: '',
+  title: '详情',
+  typeName: '',
 });
 const closediaMeth = () => {
   dialogConfig.visible = false;
@@ -79,72 +75,69 @@
 // 站点数组
 const arrstcode = ref([
   // 站点类型名称: 编码
-  "outlet_water_level", // 排口流量
-  "outlet_quality", // 排口水质
-  "channel_quality", // 港渠水质
-  "channel_water_level", // 港渠水位
-  "lake_water_level", // 湖泊水位
-  "waterlogging", // 渍水监测点（注意：这里编码没有后缀，可能是特例或故意为之）
-  "rain", // 雨量站
-  "rainwater_pipeline_quality", // 雨水管网水质
-  "sewage_pipeline_quality", // 污水管网水质
-  "rainwater_pipeline_water_level", // 雨水管网液位
-  "reservoir_water_level", //水库水位
-  "rainPumpStation", //雨水泵站
-  "dirtyPumpStation", //污水泵站
-  "sewageStation", //污水厂
-  "gateStation", //闸门
+  'outlet_water_level', // 排口流量
+  'outlet_quality', // 排口水质
+  'channel_quality', // 港渠水质
+  'channel_water_level', // 港渠水位
+  'lake_water_level', // 湖泊水位
+  'waterlogging', // 渍水监测点（注意：这里编码没有后缀，可能是特例或故意为之）
+  'rain', // 雨量站
+  'rainwater_pipeline_quality', // 雨水管网水质
+  'sewage_pipeline_quality', // 污水管网水质
+  'rainwater_pipeline_quality_area', // 接驳口
+  'rainwater_pipeline_water_level', // 雨水管网液位
+  'reservoir_water_level', //水库水位
+  'rainPumpStation', //雨水泵站
+  'dirtyPumpStation', //污水泵站
+  'sewageStation', //污水厂
+  'gateStation', //闸门
 ]);
 // 基本数据
 const arrid = ref([
-  "diversion_well_info", // 分流井
-  "drainage_info", // 排水户
-  "lake_info", // 湖泊
-  "outlet_info", // 排口
-  "port_channel_info", // 港渠
-  "rain_water_pump_station_info", // 雨水泵站
-  "region_info", // 分区信息
-  "reservoir_info", // 水库
-  "sewage_factory_info", // 污水处理厂
-  "sewage_factory_station_info", //污水处理站
-  "sewage_pump_station_info", // 污水泵站
-  "storage_tank_info", // 调蓄池
-  "water_gate_info", // 水闸
-  "waterlogging_point_info", // 渍水点
-  "water_region_info", // 水系汇水分区
-  "storehouse", //物资仓库
-  "dikeGood", //堤防备料
+  'diversion_well_info', // 分流井
+  'drainage_info', // 排水户
+  'lake_info', // 湖泊
+  'outlet_info', // 排口
+  'port_channel_info', // 港渠
+  'rain_water_pump_station_info', // 雨水泵站
+  'region_info', // 分区信息
+  'reservoir_info', // 水库
+  'sewage_factory_info', // 污水处理厂
+  'sewage_factory_station_info', //污水处理站
+  'sewage_pump_station_info', // 污水泵站
+  'storage_tank_info', // 调蓄池
+  'water_gate_info', // 水闸
+  'waterlogging_point_info', // 渍水点
+  'water_region_info', // 水系汇水分区
+  'storehouse', //物资仓库
+  'dikeGood', //堤防备料
 ]);
 // 基础数据
 const switchStcode = (Name, type) => {
-  if (type == "outlet_info") {
+  if (type == 'outlet_info') {
     pkClick(Getproperties.value);
   }
-  console.log("GetcomIDs.value", GetcomIDs.value);
+  console.log('GetcomIDs.value', GetcomIDs.value);
 
   if (arrid.value.includes(type)) {
     dialogConfig.visible = true;
     dialogConfig.dataCode = type;
     dialogConfig.comIDs = GetcomIDs.value;
-    dialogConfig.title = Getproperties.value.name.split("\n")[0];
-    dialogConfig.dataID = Getproperties.value.pid
-      ? Getproperties.value.pid
-      : Getproperties.value.id;
-    dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs[0] : "";
+    dialogConfig.title = Getproperties.value.name.split('\n')[0];
+    dialogConfig.dataID = Getproperties.value.pid ? Getproperties.value.pid : Getproperties.value.id;
+    dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs[0] : '';
   } else {
     return;
   }
 };
 // 类型弹框判断
-const typecodeswitch = (type) => {
+const typecodeswitch = type => {
   if (diabox[type]) {
     // console.log('diabox[type]', diabox[type]);
-    window[type + "_map"] = diabox[type]
-      .filter((i) => i.geometry)
+    window[type + '_map'] = diabox[type]
+      .filter(i => i.geometry)
       .map((item, index) => {
-        let coordinates = turf.getCoords(
-          turf.center(Terraformer.WKT.parse(item.geometry))
-        );
+        let coordinates = turf.getCoords(turf.center(Terraformer.WKT.parse(item.geometry)));
         const popup = new mapboxgl1.Popup({
           closeButton: false,
           closeOnClick: false,
@@ -158,7 +151,7 @@
       });
 
     nextTick(() => {
-      window[type + "_map"].forEach((i) => i._setOpacity(0));
+      window[type + '_map'].forEach(i => i._setOpacity(0));
     });
   }
 };
@@ -166,7 +159,7 @@
   let typearr = [];
   for (var k in diabox) {
     typearr.push(k);
-    appStore.MapData.map((item) => {
+    appStore.MapData.map(item => {
       if (item.pointType == k) {
         diabox[k] = item.data;
       }
@@ -187,56 +180,60 @@
     dialogConfig.dataID = Getproperties.value.stCode;
 
     dialogConfig.comIDs = GetcomIDs.value;
-    dialogConfig.title = Getproperties.value.name.split("\n")[0];
-    dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs.value[0].menuName : "";
+    dialogConfig.title = Getproperties.value.name.split('\n')[0];
+    dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs.value[0].menuName : '';
   } else {
     return;
   }
 };
 // 智慧水务大脑一张图 特定大屏动态菜单
-const specificFun = (type) => {
+const specificFun = type => {
   // 监测预警模块弹框
   // value值 统一菜单类型
   //name值 特指智慧水务大脑获取的动态菜单类型
   let arr = [
     {
-      name: "dp_zsfx", //渍水点
-      value: "waterlogging",
+      name: 'dp_zsfx', //渍水点
+      value: 'waterlogging',
     },
     {
-      name: "dp_hhsq", //河湖水情
-      value: "lake_water_level",
+      name: 'dp_hhsq', //河湖水情
+      value: 'lake_water_level',
     },
     {
-      name: "dp_bzgq", //泵站工情
-      value: "rainPumpStation", //雨水泵站
+      name: 'dp_bzgq', //泵站工情
+      value: 'rainPumpStation', //雨水泵站
     },
     {
-      name: "dp_gwfx", //管网风险
-      value: "rainwater_pipeline_water_level", //雨水管网液位
+      name: 'dp_gwfx', //管网风险
+      value: 'rainwater_pipeline_water_level', //雨水管网液位
     },
     {
-      name: "dp_gwfx", //管网风险
-      value: "rainwater_pipeline_quality", //雨水管网水质
+      name: 'dp_gwfx', //管网风险
+      value: 'rainwater_pipeline_quality', //雨水管网水质
     },
     {
-      name: "dp_wsgwfx", //大屏污水管网风险分析弹框
-      value: "sewage_pipeline_quality", //雨水管网水质
+      name: 'dp_gwfx', //接驳口
+      value: 'rainwater_pipeline_quality_area', //接驳口
+    },
+    {
+      name: 'dp_wsgwfx', //大屏污水管网风险分析弹框
+      value: 'sewage_pipeline_quality', //雨水管网水质
     },
     // {
     //   name: "dp_ysgwfx", //大屏雨水管网风险分析弹框
     //   value: "rainwater_pipeline_quality", //雨水管网水质
     // },
   ];
-  return arr.find((item) => item.value == type)?.name || null;
+  return arr.find(item => item.value == type)?.name || null;
 };
 
 // 获取动态弹框菜单
 const GetBoxmenu = (Name, type) => {
-  console.log("name", Name);
-  console.log("type", type);
+  console.log('name', Name);
+  console.log('type', type);
   GetcomIDs.value = [];
-  let dataId = "";
+  let dataId = '';
   if (arrstcode.value.includes(type)) {
     dataId = Getproperties.value.stCode;
   }
@@ -244,7 +241,7 @@
   if (arrid.value.includes(type)) {
     dataId = Getproperties.value.pid ? Getproperties.value.pid : Getproperties.value.id;
   }
-  console.log("dataId", dataId);
+  console.log('dataId', dataId);
   if (!dataId) {
     // proxy.$modal.msgSuccess('');
     return;
@@ -252,14 +249,14 @@
   // debugger;
   let params = {
     dataCode: specificFun(type) || type,
-    scene: "basis_monitor",
+    scene: 'basis_monitor',
     dataId: dataId,
   };
-  drainageDispatchGetMenu(params).then((res) => {
-    console.log("获得的菜单", res.data);
+  drainageDispatchGetMenu(params).then(res => {
+    console.log('获得的菜单', res.data);
     Getmenuarr.value = res.data;
     if (res.data && res.data.length) {
-      res.data.map((item) => {
+      res.data.map(item => {
         GetcomIDs.value.push(item.moduleName);
       });
     }
@@ -274,112 +271,104 @@
 const pointandlineOpen = (type, properties) => {
   dialogConfig.visible = true;
   switch (type) {
-    case "pipeline_info_text":
-      dialogConfig.title = "管线信息";
+    case 'pipeline_info_text':
+      dialogConfig.title = '管线信息';
       break;
-    case "pipeline_info":
-      dialogConfig.title = "管线信息";
+    case 'pipeline_info':
+      dialogConfig.title = '管线信息';
       break;
-    case "pipeline_point":
-      dialogConfig.title = "管点信息";
+    case 'pipeline_point':
+      dialogConfig.title = '管点信息';
       break;
-    case "point":
-      dialogConfig.title = "问题管线";
+    case 'point':
+      dialogConfig.title = '问题管线';
       break;
   }
 
   Getmenuarr.value = [
     {
-      menuName: "管网信息",
+      menuName: '管网信息',
       show: true,
-      moduleName: "PointAndLine",
+      moduleName: 'PointAndLine',
     },
   ];
 
   // dialogConfig.dataID = '0371000003';
-  dialogConfig.comIDs = ["PointAndLine"];
-  dialogConfig.RefName = "PointAndLine";
+  dialogConfig.comIDs = ['PointAndLine'];
+  dialogConfig.RefName = 'PointAndLine';
 };
 const loadCallback = () => {};
 // 排口溯源
-const pkClick = async (properties) => {
+const pkClick = async properties => {
   // debugger;
   if (!properties.wellCode) return;
   let results = await upStreamAnalyse({ endPointNumber: properties.wellCode });
   let pipelines = results.data.pipelineInfoList
-    .map((i) =>
+    .map(i =>
       turf.feature(Terraformer.WKT.parse(i.geometrys), {
         ...i,
-        area: i.pipelineType == "Rain" ? "雨水" : "污水",
+        area: i.pipelineType == 'Rain' ? '雨水' : '污水',
       })
     )
-    .map((i) =>
-      i.properties.flowDirection == 0
-        ? turf.lineString(turf.getCoords(i).reverse(), i.properties)
-        : i
-    );
+    .map(i => (i.properties.flowDirection == 0 ? turf.lineString(turf.getCoords(i).reverse(), i.properties) : i));
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == "水系流向")[0]
+    .filter(i => i.newfiberId == '水系流向')[0]
     .getSource()
     .setData(turf.featureCollection(pipelines));
 };
 
-const a = (properties) => {
-  const keys_ = ["雨水", "污水"];
-  const keys = ["1_泵站", "1_污水处理厂", "分区流向", "分区流向1"];
-  bus.emit("removeMapDatas", keys);
+const a = properties => {
+  const keys_ = ['雨水', '污水'];
+  const keys = ['1_泵站', '1_污水处理厂', '分区流向', '分区流向1'];
+  bus.emit('removeMapDatas', keys);
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == keys[3])[0]
+    .filter(i => i.newfiberId == keys[3])[0]
     .getSource()
     .setData(turf.featureCollection([]));
   const key = properties.c_layer.includes(keys_[0]) ? keys_[0] : keys_[1];
   const nameKey = properties.name.substring(0, 2);
-  let features = line.features.filter(
-    (i) => i.properties.area.includes(key) && i.properties.name.includes(nameKey)
-  );
-  let features1 = point.features.filter(
-    (i) => i.properties.area.includes(key) && i.properties.system.includes(nameKey)
-  );
-  let points = _.groupBy(features1, (a) => a.properties.type);
-  features.forEach((i) => {
+  let features = line.features.filter(i => i.properties.area.includes(key) && i.properties.name.includes(nameKey));
+  let features1 = point.features.filter(i => i.properties.area.includes(key) && i.properties.system.includes(nameKey));
+  let points = _.groupBy(features1, a => a.properties.type);
+  features.forEach(i => {
     i.properties.type = keys[2];
-    i.properties.color = key == keys_[0] ? "rgba(21,127,176,1)" : "rgba(255,0,0,1)";
+    i.properties.color = key == keys_[0] ? 'rgba(21,127,176,1)' : 'rgba(255,0,0,1)';
   });
-  Object.keys(points).map((key) =>
-    bus.emit("setGeoJSON", {
+  Object.keys(points).map(key =>
+    bus.emit('setGeoJSON', {
       json: turf.featureCollection(
-        points[key].map((i) => ({
+        points[key].map(i => ({
           type: i.type,
           geometry: i.geometry,
-          properties: { ...i.properties, type: "1_" + key },
+          properties: { ...i.properties, type: '1_' + key },
         }))
       ),
-      key: "1_" + key,
+      key: '1_' + key,
     })
   );
-  bus.emit("setGeoJSON", { json: turf.featureCollection(features), key: keys[2] });
+  bus.emit('setGeoJSON', { json: turf.featureCollection(features), key: keys[2] });
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == keys[3])[0]
+    .filter(i => i.newfiberId == keys[3])[0]
     .getSource()
     .setData(turf.featureCollection(features));
 };
 
 const mapClick1 = (lngLat, properties = {}, layerId) => {
-  console.log("经纬度", lngLat);
-  console.log("数据", properties);
-  console.log("layerid", layerId);
+  console.log('经纬度', lngLat);
+  console.log('数据', properties);
+  console.log('layerid', layerId);
 
   // 处理标注
   Getproperties.value = properties;
-  let type = properties ? properties.type : "" || 1;
-  let Name = properties ? properties.pointTypeName : "" || "";
+  let type = properties ? properties.type : '' || 1;
+  let Name = properties ? properties.pointTypeName : '' || '';
   // Annotation(properties);
-  console.log("1111", type, layerId);
+  console.log('1111', type, layerId);
 
-  if (properties.layer == "排水分区") {
+  if (properties.layer == '排水分区') {
     // a(properties);
 
     // if (Getproperties.value.c_layer.includes('雨水分区_1')) {
@@ -395,24 +384,17 @@
     return;
   }
 
-  let layerIdarr = [
-    "湖泊",
-    "湖泊_text",
-    "港渠",
-    "港渠_text",
-    "水库管理范围",
-    "水库管理范围_text",
-  ];
+  let layerIdarr = ['湖泊', '湖泊_text', '港渠', '港渠_text', '水库管理范围', '水库管理范围_text'];
   let newsetarr = [
-    { name: "湖泊", value: "lake_info" },
-    { name: "湖泊_text", value: "lake_info" },
-    { name: "港渠", value: "port_channel_info" },
-    { name: "港渠_text", value: "port_channel_info" },
-    { name: "水库管理范围", value: "reservoir_info" },
-    { name: "水库管理范围_text", value: "reservoir_info" },
+    { name: '湖泊', value: 'lake_info' },
+    { name: '湖泊_text', value: 'lake_info' },
+    { name: '港渠', value: 'port_channel_info' },
+    { name: '港渠_text', value: 'port_channel_info' },
+    { name: '水库管理范围', value: 'reservoir_info' },
+    { name: '水库管理范围_text', value: 'reservoir_info' },
   ];
   if (layerIdarr.includes(layerId)) {
-    type = newsetarr.find((item) => {
+    type = newsetarr.find(item => {
       return layerId == item.name;
     }).value;
 
@@ -421,15 +403,15 @@
     return;
   }
 
-  let arr = ["pipeline_point", "pipeline_info", "pipeline_info_text"];
+  let arr = ['pipeline_point', 'pipeline_info', 'pipeline_info_text'];
 
   if (arr.includes(layerId)) {
-    console.log("进了方法");
+    console.log('进了方法');
     pointandlineOpen(layerId);
     dialogConfig.dataCode = layerId;
-  } else if (properties.type && properties.type == "问题管线") {
-    pointandlineOpen("point");
-    dialogConfig.dataCode = "point";
+  } else if (properties.type && properties.type == '问题管线') {
+    pointandlineOpen('point');
+    dialogConfig.dataCode = 'point';
   } else {
     if (type) {
       GetBoxmenu(Name, type);
@@ -439,30 +421,27 @@
 
 // 根据类型处理接口返回的标注内容
 const AnnotationArr = ref([]);
-const StringName = ref("");
-const Annotation = (properties) => {
+const StringName = ref('');
+const Annotation = properties => {
   if (properties.siteData && properties.siteData.length) {
     let arr = JSON.parse(properties.siteData);
     AnnotationArr.value = arr;
-    console.log("数据", arr);
-    let string = "";
+    console.log('数据', arr);
+    let string = '';
 
     switch (properties.type) {
-      case "rain":
-        AnnotationArr.value = [
-          { valueName: "监测时间", value: properties.recordTime },
-          ...arr,
-        ];
+      case 'rain':
+        AnnotationArr.value = [{ valueName: '监测时间', value: properties.recordTime }, ...arr];
         break;
     }
     string = Methtion(string);
-    console.log("数据", string);
+    console.log('数据', string);
   }
 };
 
-const Methtion = (StringName) => {
+const Methtion = StringName => {
   if (AnnotationArr.value.length) {
-    AnnotationArr.value.map((item) => {
+    AnnotationArr.value.map(item => {
       StringName += `${item.valueName}:${item.value}+'/n' `;
     });
     return StringName;
@@ -479,7 +458,7 @@
     domElement.webkitRequestFullScreen();
   }
 };
-const closeFun = (is) => {
+const closeFun = is => {
   dialogConfig.visible = is;
 };
 function anotherMeht(item) {
@@ -487,22 +466,22 @@
   Getproperties.value.stCode = item.stCode || item.siteCode || item.lakeCode;
   Getproperties.value.dataCode = item.dataCode;
   Getproperties.value.wellcode = item.wellCode || item.dataName || item.pipeLine;
-  Getproperties.value.id =item.id;
-  Getproperties.value.gwMonitorId =item.gwMonitorId||item.id; //管网坡面
-  Getproperties.value.dataId = item.dataId || "";
+  Getproperties.value.id = item.id;
+  Getproperties.value.gwMonitorId = item.gwMonitorId || item.id; //管网坡面
+  Getproperties.value.dataId = item.dataId || '';
   Getproperties.value.stType = item.stType;
 
-  Getproperties.value.geometry = item.geometry || item.geometrys||'';
-    // Terraformer.WKT.convert(turf.point(item.lonLat.split(",").map(Number)).geometry);
+  Getproperties.value.geometry = item.geometry || item.geometrys || '';
+  // Terraformer.WKT.convert(turf.point(item.lonLat.split(",").map(Number)).geometry);
 
-  Getproperties.value.waterRegionCode =item.lakeCode ||item.waterRegionCode ; //河湖水情  查询水系分区详情
+  Getproperties.value.waterRegionCode = item.lakeCode || item.waterRegionCode; //河湖水情  查询水系分区详情
   Getproperties.value.GWDADataNow = item.GWDADataNow ? item.GWDADataNow : false;
   if (item.daterange) {
     Getproperties.value.daterange = item.daterange;
   } else {
     Getproperties.value.daterange = null;
   }
-  console.log("Getproperties", Getproperties.value);
+  console.log('Getproperties', Getproperties.value);
   if (arrstcode.value.includes(item.stType)) {
     properties.stCode = item.stCode;
   }
@@ -510,15 +489,15 @@
   if (arrid.value.includes(item.stType)) {
     properties.id = item.pid || item.id;
   }
-  GetBoxmenu("", item.stType);
+  GetBoxmenu('', item.stType);
 }
 
 onMounted(() => {
   allScreen();
   useStore.getsewageData();
-  bus.on("DynamicBus", (item) => {
-    console.log("item", item);
-    dialogConfig.RefName = item.RefName || "";
+  bus.on('DynamicBus', item => {
+    console.log('item', item);
+    dialogConfig.RefName = item.RefName || '';
     dialogConfig.title = item.stName || item.name;
     // debugger;
     if (!!!item.NoPromise) {
@@ -531,22 +510,19 @@
       dialogConfig.dataID = item.pid ? item.pid : item.id;
       Getproperties.value.stCode = item.stCode;
       Getproperties.value.dataCode = item.dataCode;
-      Getproperties.value.wellcode =
-        item.wellCode || item.dataName || item.startPointNumber;
-      Getproperties.value.id =item.relationId  || item.id; //item.relationId监测告警的普通id
-      Getproperties.value.dataId = item.dataId || "";
+      Getproperties.value.wellcode = item.wellCode || item.dataName || item.startPointNumber;
+      Getproperties.value.id = item.relationId || item.id; //item.relationId监测告警的普通id
+      Getproperties.value.dataId = item.dataId || '';
       Getproperties.value.stType = item.stType;
       Getproperties.value.geometry =
-        item.geometry ||
-        item.geometrys ||
-        Terraformer.WKT.convert(turf.point(item.lonLat.split(",").map(Number)).geometry);
+        item.geometry || item.geometrys || Terraformer.WKT.convert(turf.point(item.lonLat.split(',').map(Number)).geometry);
       dialogConfig.visible = true;
     }
   });
-  bus.on("closedia", (e) => {
+  bus.on('closedia', e => {
     closediaMeth();
   });
-  bus.on("changeData", (e) => {
+  bus.on('changeData', e => {
     // switchArr();
   });
   // 部分公共弹窗需要使用一个查询时间,目前不确定后期有没有人使用同类型的弹窗,在此初始化,增加公共弹窗的兼容性
@@ -554,17 +530,17 @@
 });
 
 onBeforeUnmount(() => {
-  bus.off("DynamicBus");
-  bus.off("closedia");
-  bus.off("changeData");
+  bus.off('DynamicBus');
+  bus.off('closedia');
+  bus.off('changeData');
 });
 </script>
 <style lang="scss">
-@import "@/assets/styles/pictureOnMap.scss";
+@import '@/assets/styles/pictureOnMap.scss';
 .pictureOnMap {
   width: 100%;
   height: 100%;
-  background: url("@/assets/images/pictureOnMap/maxBgc.png") no-repeat center;
+  background: url('@/assets/images/pictureOnMap/maxBgc.png') no-repeat center;
   background-size: 100% 100%;
   color: #fff;
   overflow: hidden;

diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 86ae337..9c8fbf9 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -2,11 +2,7 @@
   <div class="pictureOnMap">
     <TopTab />
     <div class="mainContentBox">
-      <MapBox
-        :initJson="`/static/libs/mapbox/style/wh_dhgx.json`"
-        :loadCallback="loadCallback"
-        @mapClick1="mapClick1"
-      ></MapBox>
+      <MapBox :initJson="`/static/libs/mapbox/style/wh_dhgx.json`" :loadCallback="loadCallback" @mapClick1="mapClick1"></MapBox>
       <router-view></router-view>
       <recordPage></recordPage>
       <LayerControl></LayerControl>
@@ -39,20 +35,20 @@
   </div>
 </template>
 <script setup>
-import line from "../../../public/static/libs/mapbox/json/line.json";
-import point from "../../../public/static/libs/mapbox/json/point.json";
-import { ref, reactive, onMounted, nextTick } from "vue";
-import TopTab from "./TopTab/index.vue";
-import MapBox from "../../components/Map/MapBox";
-import bus from "@/bus";
-import useUserStore from "@/store/modules/user";
-import DialogTabs from "@/views/pictureOnMap/page/components/DialogTabs/dialogTabs.vue";
-import { drainageDispatchGetMenu } from "@/api/MonitorAssetsOnMap";
-import recordPage from "@/views/voice/recordPage/index";
-import usepartitionStore from "@/store/modules/partition";
+import line from '../../../public/static/libs/mapbox/json/line.json';
+import point from '../../../public/static/libs/mapbox/json/point.json';
+import { ref, reactive, onMounted, nextTick } from 'vue';
+import TopTab from './TopTab/index.vue';
+import MapBox from '../../components/Map/MapBox';
+import bus from '@/bus';
+import useUserStore from '@/store/modules/user';
+import DialogTabs from '@/views/pictureOnMap/page/components/DialogTabs/dialogTabs.vue';
+import { drainageDispatchGetMenu } from '@/api/MonitorAssetsOnMap';
+import recordPage from '@/views/voice/recordPage/index';
+import usepartitionStore from '@/store/modules/partition';
 
-import LayerControl from "@/views/pictureOnMap/LayerControl.vue";
-import { FALSE } from "ol/functions";
+import LayerControl from '@/views/pictureOnMap/LayerControl.vue';
+import { FALSE } from 'ol/functions';
 
 const useStore = usepartitionStore();
 
@@ -64,14 +60,14 @@
 const GetcomIDs = ref([]);
 const dialogConfig = reactive({
   visible: false,
-  dataID: "",
-  dataCode: "",
+  dataID: '',
+  dataCode: '',
   data: {},
   comIDs: [],
   customData: [],
-  RefName: "",
-  title: "详情",
-  typeName: "",
+  RefName: '',
+  title: '详情',
+  typeName: '',
 });
 const closediaMeth = () => {
   dialogConfig.visible = false;
@@ -79,72 +75,69 @@
 // 站点数组
 const arrstcode = ref([
   // 站点类型名称: 编码
-  "outlet_water_level", // 排口流量
-  "outlet_quality", // 排口水质
-  "channel_quality", // 港渠水质
-  "channel_water_level", // 港渠水位
-  "lake_water_level", // 湖泊水位
-  "waterlogging", // 渍水监测点（注意：这里编码没有后缀，可能是特例或故意为之）
-  "rain", // 雨量站
-  "rainwater_pipeline_quality", // 雨水管网水质
-  "sewage_pipeline_quality", // 污水管网水质
-  "rainwater_pipeline_water_level", // 雨水管网液位
-  "reservoir_water_level", //水库水位
-  "rainPumpStation", //雨水泵站
-  "dirtyPumpStation", //污水泵站
-  "sewageStation", //污水厂
-  "gateStation", //闸门
+  'outlet_water_level', // 排口流量
+  'outlet_quality', // 排口水质
+  'channel_quality', // 港渠水质
+  'channel_water_level', // 港渠水位
+  'lake_water_level', // 湖泊水位
+  'waterlogging', // 渍水监测点（注意：这里编码没有后缀，可能是特例或故意为之）
+  'rain', // 雨量站
+  'rainwater_pipeline_quality', // 雨水管网水质
+  'sewage_pipeline_quality', // 污水管网水质
+  'rainwater_pipeline_quality_area', // 接驳口
+  'rainwater_pipeline_water_level', // 雨水管网液位
+  'reservoir_water_level', //水库水位
+  'rainPumpStation', //雨水泵站
+  'dirtyPumpStation', //污水泵站
+  'sewageStation', //污水厂
+  'gateStation', //闸门
 ]);
 // 基本数据
 const arrid = ref([
-  "diversion_well_info", // 分流井
-  "drainage_info", // 排水户
-  "lake_info", // 湖泊
-  "outlet_info", // 排口
-  "port_channel_info", // 港渠
-  "rain_water_pump_station_info", // 雨水泵站
-  "region_info", // 分区信息
-  "reservoir_info", // 水库
-  "sewage_factory_info", // 污水处理厂
-  "sewage_factory_station_info", //污水处理站
-  "sewage_pump_station_info", // 污水泵站
-  "storage_tank_info", // 调蓄池
-  "water_gate_info", // 水闸
-  "waterlogging_point_info", // 渍水点
-  "water_region_info", // 水系汇水分区
-  "storehouse", //物资仓库
-  "dikeGood", //堤防备料
+  'diversion_well_info', // 分流井
+  'drainage_info', // 排水户
+  'lake_info', // 湖泊
+  'outlet_info', // 排口
+  'port_channel_info', // 港渠
+  'rain_water_pump_station_info', // 雨水泵站
+  'region_info', // 分区信息
+  'reservoir_info', // 水库
+  'sewage_factory_info', // 污水处理厂
+  'sewage_factory_station_info', //污水处理站
+  'sewage_pump_station_info', // 污水泵站
+  'storage_tank_info', // 调蓄池
+  'water_gate_info', // 水闸
+  'waterlogging_point_info', // 渍水点
+  'water_region_info', // 水系汇水分区
+  'storehouse', //物资仓库
+  'dikeGood', //堤防备料
 ]);
 // 基础数据
 const switchStcode = (Name, type) => {
-  if (type == "outlet_info") {
+  if (type == 'outlet_info') {
     pkClick(Getproperties.value);
   }
-  console.log("GetcomIDs.value", GetcomIDs.value);
+  console.log('GetcomIDs.value', GetcomIDs.value);
 
   if (arrid.value.includes(type)) {
     dialogConfig.visible = true;
     dialogConfig.dataCode = type;
     dialogConfig.comIDs = GetcomIDs.value;
-    dialogConfig.title = Getproperties.value.name.split("\n")[0];
-    dialogConfig.dataID = Getproperties.value.pid
-      ? Getproperties.value.pid
-      : Getproperties.value.id;
-    dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs[0] : "";
+    dialogConfig.title = Getproperties.value.name.split('\n')[0];
+    dialogConfig.dataID = Getproperties.value.pid ? Getproperties.value.pid : Getproperties.value.id;
+    dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs[0] : '';
   } else {
     return;
   }
 };
 // 类型弹框判断
-const typecodeswitch = (type) => {
+const typecodeswitch = type => {
   if (diabox[type]) {
     // console.log('diabox[type]', diabox[type]);
-    window[type + "_map"] = diabox[type]
-      .filter((i) => i.geometry)
+    window[type + '_map'] = diabox[type]
+      .filter(i => i.geometry)
       .map((item, index) => {
-        let coordinates = turf.getCoords(
-          turf.center(Terraformer.WKT.parse(item.geometry))
-        );
+        let coordinates = turf.getCoords(turf.center(Terraformer.WKT.parse(item.geometry)));
         const popup = new mapboxgl1.Popup({
           closeButton: false,
           closeOnClick: false,
@@ -158,7 +151,7 @@
       });
 
     nextTick(() => {
-      window[type + "_map"].forEach((i) => i._setOpacity(0));
+      window[type + '_map'].forEach(i => i._setOpacity(0));
     });
   }
 };
@@ -166,7 +159,7 @@
   let typearr = [];
   for (var k in diabox) {
     typearr.push(k);
-    appStore.MapData.map((item) => {
+    appStore.MapData.map(item => {
       if (item.pointType == k) {
         diabox[k] = item.data;
       }
@@ -187,56 +180,60 @@
     dialogConfig.dataID = Getproperties.value.stCode;
 
     dialogConfig.comIDs = GetcomIDs.value;
-    dialogConfig.title = Getproperties.value.name.split("\n")[0];
-    dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs.value[0].menuName : "";
+    dialogConfig.title = Getproperties.value.name.split('\n')[0];
+    dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs.value[0].menuName : '';
   } else {
     return;
   }
 };
 // 智慧水务大脑一张图 特定大屏动态菜单
-const specificFun = (type) => {
+const specificFun = type => {
   // 监测预警模块弹框
   // value值 统一菜单类型
   //name值 特指智慧水务大脑获取的动态菜单类型
   let arr = [
     {
-      name: "dp_zsfx", //渍水点
-      value: "waterlogging",
+      name: 'dp_zsfx', //渍水点
+      value: 'waterlogging',
     },
     {
-      name: "dp_hhsq", //河湖水情
-      value: "lake_water_level",
+      name: 'dp_hhsq', //河湖水情
+      value: 'lake_water_level',
     },
     {
-      name: "dp_bzgq", //泵站工情
-      value: "rainPumpStation", //雨水泵站
+      name: 'dp_bzgq', //泵站工情
+      value: 'rainPumpStation', //雨水泵站
     },
     {
-      name: "dp_gwfx", //管网风险
-      value: "rainwater_pipeline_water_level", //雨水管网液位
+      name: 'dp_gwfx', //管网风险
+      value: 'rainwater_pipeline_water_level', //雨水管网液位
     },
     {
-      name: "dp_gwfx", //管网风险
-      value: "rainwater_pipeline_quality", //雨水管网水质
+      name: 'dp_gwfx', //管网风险
+      value: 'rainwater_pipeline_quality', //雨水管网水质
     },
     {
-      name: "dp_wsgwfx", //大屏污水管网风险分析弹框
-      value: "sewage_pipeline_quality", //雨水管网水质
+      name: 'dp_gwfx', //接驳口
+      value: 'rainwater_pipeline_quality_area', //接驳口
+    },
+    {
+      name: 'dp_wsgwfx', //大屏污水管网风险分析弹框
+      value: 'sewage_pipeline_quality', //雨水管网水质
     },
     // {
     //   name: "dp_ysgwfx", //大屏雨水管网风险分析弹框
     //   value: "rainwater_pipeline_quality", //雨水管网水质
     // },
   ];
-  return arr.find((item) => item.value == type)?.name || null;
+  return arr.find(item => item.value == type)?.name || null;
 };
 
 // 获取动态弹框菜单
 const GetBoxmenu = (Name, type) => {
-  console.log("name", Name);
-  console.log("type", type);
+  console.log('name', Name);
+  console.log('type', type);
   GetcomIDs.value = [];
-  let dataId = "";
+  let dataId = '';
   if (arrstcode.value.includes(type)) {
     dataId = Getproperties.value.stCode;
   }
@@ -244,7 +241,7 @@
   if (arrid.value.includes(type)) {
     dataId = Getproperties.value.pid ? Getproperties.value.pid : Getproperties.value.id;
   }
-  console.log("dataId", dataId);
+  console.log('dataId', dataId);
   if (!dataId) {
     // proxy.$modal.msgSuccess('');
     return;
@@ -252,14 +249,14 @@
   // debugger;
   let params = {
     dataCode: specificFun(type) || type,
-    scene: "basis_monitor",
+    scene: 'basis_monitor',
     dataId: dataId,
   };
-  drainageDispatchGetMenu(params).then((res) => {
-    console.log("获得的菜单", res.data);
+  drainageDispatchGetMenu(params).then(res => {
+    console.log('获得的菜单', res.data);
     Getmenuarr.value = res.data;
     if (res.data && res.data.length) {
-      res.data.map((item) => {
+      res.data.map(item => {
         GetcomIDs.value.push(item.moduleName);
       });
     }
@@ -274,112 +271,104 @@
 const pointandlineOpen = (type, properties) => {
   dialogConfig.visible = true;
   switch (type) {
-    case "pipeline_info_text":
-      dialogConfig.title = "管线信息";
+    case 'pipeline_info_text':
+      dialogConfig.title = '管线信息';
       break;
-    case "pipeline_info":
-      dialogConfig.title = "管线信息";
+    case 'pipeline_info':
+      dialogConfig.title = '管线信息';
       break;
-    case "pipeline_point":
-      dialogConfig.title = "管点信息";
+    case 'pipeline_point':
+      dialogConfig.title = '管点信息';
       break;
-    case "point":
-      dialogConfig.title = "问题管线";
+    case 'point':
+      dialogConfig.title = '问题管线';
       break;
   }
 
   Getmenuarr.value = [
     {
-      menuName: "管网信息",
+      menuName: '管网信息',
       show: true,
-      moduleName: "PointAndLine",
+      moduleName: 'PointAndLine',
     },
   ];
 
   // dialogConfig.dataID = '0371000003';
-  dialogConfig.comIDs = ["PointAndLine"];
-  dialogConfig.RefName = "PointAndLine";
+  dialogConfig.comIDs = ['PointAndLine'];
+  dialogConfig.RefName = 'PointAndLine';
 };
 const loadCallback = () => {};
 // 排口溯源
-const pkClick = async (properties) => {
+const pkClick = async properties => {
   // debugger;
   if (!properties.wellCode) return;
   let results = await upStreamAnalyse({ endPointNumber: properties.wellCode });
   let pipelines = results.data.pipelineInfoList
-    .map((i) =>
+    .map(i =>
       turf.feature(Terraformer.WKT.parse(i.geometrys), {
         ...i,
-        area: i.pipelineType == "Rain" ? "雨水" : "污水",
+        area: i.pipelineType == 'Rain' ? '雨水' : '污水',
       })
     )
-    .map((i) =>
-      i.properties.flowDirection == 0
-        ? turf.lineString(turf.getCoords(i).reverse(), i.properties)
-        : i
-    );
+    .map(i => (i.properties.flowDirection == 0 ? turf.lineString(turf.getCoords(i).reverse(), i.properties) : i));
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == "水系流向")[0]
+    .filter(i => i.newfiberId == '水系流向')[0]
     .getSource()
     .setData(turf.featureCollection(pipelines));
 };
 
-const a = (properties) => {
-  const keys_ = ["雨水", "污水"];
-  const keys = ["1_泵站", "1_污水处理厂", "分区流向", "分区流向1"];
-  bus.emit("removeMapDatas", keys);
+const a = properties => {
+  const keys_ = ['雨水', '污水'];
+  const keys = ['1_泵站', '1_污水处理厂', '分区流向', '分区流向1'];
+  bus.emit('removeMapDatas', keys);
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == keys[3])[0]
+    .filter(i => i.newfiberId == keys[3])[0]
     .getSource()
     .setData(turf.featureCollection([]));
   const key = properties.c_layer.includes(keys_[0]) ? keys_[0] : keys_[1];
   const nameKey = properties.name.substring(0, 2);
-  let features = line.features.filter(
-    (i) => i.properties.area.includes(key) && i.properties.name.includes(nameKey)
-  );
-  let features1 = point.features.filter(
-    (i) => i.properties.area.includes(key) && i.properties.system.includes(nameKey)
-  );
-  let points = _.groupBy(features1, (a) => a.properties.type);
-  features.forEach((i) => {
+  let features = line.features.filter(i => i.properties.area.includes(key) && i.properties.name.includes(nameKey));
+  let features1 = point.features.filter(i => i.properties.area.includes(key) && i.properties.system.includes(nameKey));
+  let points = _.groupBy(features1, a => a.properties.type);
+  features.forEach(i => {
     i.properties.type = keys[2];
-    i.properties.color = key == keys_[0] ? "rgba(21,127,176,1)" : "rgba(255,0,0,1)";
+    i.properties.color = key == keys_[0] ? 'rgba(21,127,176,1)' : 'rgba(255,0,0,1)';
   });
-  Object.keys(points).map((key) =>
-    bus.emit("setGeoJSON", {
+  Object.keys(points).map(key =>
+    bus.emit('setGeoJSON', {
       json: turf.featureCollection(
-        points[key].map((i) => ({
+        points[key].map(i => ({
           type: i.type,
           geometry: i.geometry,
-          properties: { ...i.properties, type: "1_" + key },
+          properties: { ...i.properties, type: '1_' + key },
         }))
       ),
-      key: "1_" + key,
+      key: '1_' + key,
     })
   );
-  bus.emit("setGeoJSON", { json: turf.featureCollection(features), key: keys[2] });
+  bus.emit('setGeoJSON', { json: turf.featureCollection(features), key: keys[2] });
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == keys[3])[0]
+    .filter(i => i.newfiberId == keys[3])[0]
     .getSource()
     .setData(turf.featureCollection(features));
 };
 
 const mapClick1 = (lngLat, properties = {}, layerId) => {
-  console.log("经纬度", lngLat);
-  console.log("数据", properties);
-  console.log("layerid", layerId);
+  console.log('经纬度', lngLat);
+  console.log('数据', properties);
+  console.log('layerid', layerId);
 
   // 处理标注
   Getproperties.value = properties;
-  let type = properties ? properties.type : "" || 1;
-  let Name = properties ? properties.pointTypeName : "" || "";
+  let type = properties ? properties.type : '' || 1;
+  let Name = properties ? properties.pointTypeName : '' || '';
   // Annotation(properties);
-  console.log("1111", type, layerId);
+  console.log('1111', type, layerId);
 
-  if (properties.layer == "排水分区") {
+  if (properties.layer == '排水分区') {
     // a(properties);
 
     // if (Getproperties.value.c_layer.includes('雨水分区_1')) {
@@ -395,24 +384,17 @@
     return;
   }
 
-  let layerIdarr = [
-    "湖泊",
-    "湖泊_text",
-    "港渠",
-    "港渠_text",
-    "水库管理范围",
-    "水库管理范围_text",
-  ];
+  let layerIdarr = ['湖泊', '湖泊_text', '港渠', '港渠_text', '水库管理范围', '水库管理范围_text'];
   let newsetarr = [
-    { name: "湖泊", value: "lake_info" },
-    { name: "湖泊_text", value: "lake_info" },
-    { name: "港渠", value: "port_channel_info" },
-    { name: "港渠_text", value: "port_channel_info" },
-    { name: "水库管理范围", value: "reservoir_info" },
-    { name: "水库管理范围_text", value: "reservoir_info" },
+    { name: '湖泊', value: 'lake_info' },
+    { name: '湖泊_text', value: 'lake_info' },
+    { name: '港渠', value: 'port_channel_info' },
+    { name: '港渠_text', value: 'port_channel_info' },
+    { name: '水库管理范围', value: 'reservoir_info' },
+    { name: '水库管理范围_text', value: 'reservoir_info' },
   ];
   if (layerIdarr.includes(layerId)) {
-    type = newsetarr.find((item) => {
+    type = newsetarr.find(item => {
       return layerId == item.name;
     }).value;
 
@@ -421,15 +403,15 @@
     return;
   }
 
-  let arr = ["pipeline_point", "pipeline_info", "pipeline_info_text"];
+  let arr = ['pipeline_point', 'pipeline_info', 'pipeline_info_text'];
 
   if (arr.includes(layerId)) {
-    console.log("进了方法");
+    console.log('进了方法');
     pointandlineOpen(layerId);
     dialogConfig.dataCode = layerId;
-  } else if (properties.type && properties.type == "问题管线") {
-    pointandlineOpen("point");
-    dialogConfig.dataCode = "point";
+  } else if (properties.type && properties.type == '问题管线') {
+    pointandlineOpen('point');
+    dialogConfig.dataCode = 'point';
   } else {
     if (type) {
       GetBoxmenu(Name, type);
@@ -439,30 +421,27 @@
 
 // 根据类型处理接口返回的标注内容
 const AnnotationArr = ref([]);
-const StringName = ref("");
-const Annotation = (properties) => {
+const StringName = ref('');
+const Annotation = properties => {
   if (properties.siteData && properties.siteData.length) {
     let arr = JSON.parse(properties.siteData);
     AnnotationArr.value = arr;
-    console.log("数据", arr);
-    let string = "";
+    console.log('数据', arr);
+    let string = '';
 
     switch (properties.type) {
-      case "rain":
-        AnnotationArr.value = [
-          { valueName: "监测时间", value: properties.recordTime },
-          ...arr,
-        ];
+      case 'rain':
+        AnnotationArr.value = [{ valueName: '监测时间', value: properties.recordTime }, ...arr];
         break;
     }
     string = Methtion(string);
-    console.log("数据", string);
+    console.log('数据', string);
   }
 };
 
-const Methtion = (StringName) => {
+const Methtion = StringName => {
   if (AnnotationArr.value.length) {
-    AnnotationArr.value.map((item) => {
+    AnnotationArr.value.map(item => {
       StringName += `${item.valueName}:${item.value}+'/n' `;
     });
     return StringName;
@@ -479,7 +458,7 @@
     domElement.webkitRequestFullScreen();
   }
 };
-const closeFun = (is) => {
+const closeFun = is => {
   dialogConfig.visible = is;
 };
 function anotherMeht(item) {
@@ -487,22 +466,22 @@
   Getproperties.value.stCode = item.stCode || item.siteCode || item.lakeCode;
   Getproperties.value.dataCode = item.dataCode;
   Getproperties.value.wellcode = item.wellCode || item.dataName || item.pipeLine;
-  Getproperties.value.id =item.id;
-  Getproperties.value.gwMonitorId =item.gwMonitorId||item.id; //管网坡面
-  Getproperties.value.dataId = item.dataId || "";
+  Getproperties.value.id = item.id;
+  Getproperties.value.gwMonitorId = item.gwMonitorId || item.id; //管网坡面
+  Getproperties.value.dataId = item.dataId || '';
   Getproperties.value.stType = item.stType;
 
-  Getproperties.value.geometry = item.geometry || item.geometrys||'';
-    // Terraformer.WKT.convert(turf.point(item.lonLat.split(",").map(Number)).geometry);
+  Getproperties.value.geometry = item.geometry || item.geometrys || '';
+  // Terraformer.WKT.convert(turf.point(item.lonLat.split(",").map(Number)).geometry);
 
-  Getproperties.value.waterRegionCode =item.lakeCode ||item.waterRegionCode ; //河湖水情  查询水系分区详情
+  Getproperties.value.waterRegionCode = item.lakeCode || item.waterRegionCode; //河湖水情  查询水系分区详情
   Getproperties.value.GWDADataNow = item.GWDADataNow ? item.GWDADataNow : false;
   if (item.daterange) {
     Getproperties.value.daterange = item.daterange;
   } else {
     Getproperties.value.daterange = null;
   }
-  console.log("Getproperties", Getproperties.value);
+  console.log('Getproperties', Getproperties.value);
   if (arrstcode.value.includes(item.stType)) {
     properties.stCode = item.stCode;
   }
@@ -510,15 +489,15 @@
   if (arrid.value.includes(item.stType)) {
     properties.id = item.pid || item.id;
   }
-  GetBoxmenu("", item.stType);
+  GetBoxmenu('', item.stType);
 }
 
 onMounted(() => {
   allScreen();
   useStore.getsewageData();
-  bus.on("DynamicBus", (item) => {
-    console.log("item", item);
-    dialogConfig.RefName = item.RefName || "";
+  bus.on('DynamicBus', item => {
+    console.log('item', item);
+    dialogConfig.RefName = item.RefName || '';
     dialogConfig.title = item.stName || item.name;
     // debugger;
     if (!!!item.NoPromise) {
@@ -531,22 +510,19 @@
       dialogConfig.dataID = item.pid ? item.pid : item.id;
       Getproperties.value.stCode = item.stCode;
       Getproperties.value.dataCode = item.dataCode;
-      Getproperties.value.wellcode =
-        item.wellCode || item.dataName || item.startPointNumber;
-      Getproperties.value.id =item.relationId  || item.id; //item.relationId监测告警的普通id
-      Getproperties.value.dataId = item.dataId || "";
+      Getproperties.value.wellcode = item.wellCode || item.dataName || item.startPointNumber;
+      Getproperties.value.id = item.relationId || item.id; //item.relationId监测告警的普通id
+      Getproperties.value.dataId = item.dataId || '';
       Getproperties.value.stType = item.stType;
       Getproperties.value.geometry =
-        item.geometry ||
-        item.geometrys ||
-        Terraformer.WKT.convert(turf.point(item.lonLat.split(",").map(Number)).geometry);
+        item.geometry || item.geometrys || Terraformer.WKT.convert(turf.point(item.lonLat.split(',').map(Number)).geometry);
       dialogConfig.visible = true;
     }
   });
-  bus.on("closedia", (e) => {
+  bus.on('closedia', e => {
     closediaMeth();
   });
-  bus.on("changeData", (e) => {
+  bus.on('changeData', e => {
     // switchArr();
   });
   // 部分公共弹窗需要使用一个查询时间,目前不确定后期有没有人使用同类型的弹窗,在此初始化,增加公共弹窗的兼容性
@@ -554,17 +530,17 @@
 });
 
 onBeforeUnmount(() => {
-  bus.off("DynamicBus");
-  bus.off("closedia");
-  bus.off("changeData");
+  bus.off('DynamicBus');
+  bus.off('closedia');
+  bus.off('changeData');
 });
 </script>
 <style lang="scss">
-@import "@/assets/styles/pictureOnMap.scss";
+@import '@/assets/styles/pictureOnMap.scss';
 .pictureOnMap {
   width: 100%;
   height: 100%;
-  background: url("@/assets/images/pictureOnMap/maxBgc.png") no-repeat center;
+  background: url('@/assets/images/pictureOnMap/maxBgc.png') no-repeat center;
   background-size: 100% 100%;
   color: #fff;
   overflow: hidden;
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/guanwangpoumian.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/guanwangpoumian.vue
index 18afcf5..366f1c6 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/guanwangpoumian.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/guanwangpoumian.vue
@@ -7,13 +7,10 @@
 </template>
 
 <script setup name="guanwangpoumian">
-import moment from "moment";
-import commonUnderGround from "@/views/pictureOnMap/page/components/DialogTabs/component/commonUnderGround.vue";
+import moment from 'moment';
+import commonUnderGround from '@/views/pictureOnMap/page/components/DialogTabs/component/commonUnderGround.vue';
 const { proxy } = getCurrentInstance();
-import {
-  getSectionByWellCode,
-  getSectionByWellCodeDetail,
-} from "@/api/MonitorAssetsOnMap";
+import { getSectionByWellCode, getSectionByWellCodeDetail } from '@/api/MonitorAssetsOnMap';
 
 const props = defineProps({
   Getproperties: {
@@ -23,7 +20,7 @@
 const GetpoumianList = ref({});
 
 function GWpoumian() {
-  let wellcode = props.Getproperties.wellcode ? props.Getproperties.wellcode : "";
+  let wellcode = props.Getproperties.wellCode ? props.Getproperties.wellCode : '';
   if (wellcode) {
     if (props.Getproperties.daterange && !props.Getproperties.GWDADataNow) {
       let params = {
@@ -31,20 +28,20 @@
         // time:moment(props.Getproperties.daterange[0]).format("YYYY-MM-DD")
         id: props.Getproperties.gwMonitorId,
       };
-      getSectionByWellCodeDetail(params).then((res) => {
+      getSectionByWellCodeDetail(params).then(res => {
         if (res && res.code == 200) {
-          console.log("res.data", res.data);
+          console.log('res.data', res.data);
           GetpoumianList.value = res.data;
         }
       });
     } else {
-      getSectionByWellCode(wellcode).then((res) => {
-        console.log("res.data", res.data);
+      getSectionByWellCode(wellcode).then(res => {
+        console.log('res.data', res.data);
         GetpoumianList.value = res.data;
       });
     }
   } else {
-    console.log("没有wellcode", props.Getproperties);
+    console.log('没有wellcode', props.Getproperties);
     // proxy.$modal.msgSuccess("");
   }
 }

diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 86ae337..9c8fbf9 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -2,11 +2,7 @@
   <div class="pictureOnMap">
     <TopTab />
     <div class="mainContentBox">
-      <MapBox
-        :initJson="`/static/libs/mapbox/style/wh_dhgx.json`"
-        :loadCallback="loadCallback"
-        @mapClick1="mapClick1"
-      ></MapBox>
+      <MapBox :initJson="`/static/libs/mapbox/style/wh_dhgx.json`" :loadCallback="loadCallback" @mapClick1="mapClick1"></MapBox>
       <router-view></router-view>
       <recordPage></recordPage>
       <LayerControl></LayerControl>
@@ -39,20 +35,20 @@
   </div>
 </template>
 <script setup>
-import line from "../../../public/static/libs/mapbox/json/line.json";
-import point from "../../../public/static/libs/mapbox/json/point.json";
-import { ref, reactive, onMounted, nextTick } from "vue";
-import TopTab from "./TopTab/index.vue";
-import MapBox from "../../components/Map/MapBox";
-import bus from "@/bus";
-import useUserStore from "@/store/modules/user";
-import DialogTabs from "@/views/pictureOnMap/page/components/DialogTabs/dialogTabs.vue";
-import { drainageDispatchGetMenu } from "@/api/MonitorAssetsOnMap";
-import recordPage from "@/views/voice/recordPage/index";
-import usepartitionStore from "@/store/modules/partition";
+import line from '../../../public/static/libs/mapbox/json/line.json';
+import point from '../../../public/static/libs/mapbox/json/point.json';
+import { ref, reactive, onMounted, nextTick } from 'vue';
+import TopTab from './TopTab/index.vue';
+import MapBox from '../../components/Map/MapBox';
+import bus from '@/bus';
+import useUserStore from '@/store/modules/user';
+import DialogTabs from '@/views/pictureOnMap/page/components/DialogTabs/dialogTabs.vue';
+import { drainageDispatchGetMenu } from '@/api/MonitorAssetsOnMap';
+import recordPage from '@/views/voice/recordPage/index';
+import usepartitionStore from '@/store/modules/partition';
 
-import LayerControl from "@/views/pictureOnMap/LayerControl.vue";
-import { FALSE } from "ol/functions";
+import LayerControl from '@/views/pictureOnMap/LayerControl.vue';
+import { FALSE } from 'ol/functions';
 
 const useStore = usepartitionStore();
 
@@ -64,14 +60,14 @@
 const GetcomIDs = ref([]);
 const dialogConfig = reactive({
   visible: false,
-  dataID: "",
-  dataCode: "",
+  dataID: '',
+  dataCode: '',
   data: {},
   comIDs: [],
   customData: [],
-  RefName: "",
-  title: "详情",
-  typeName: "",
+  RefName: '',
+  title: '详情',
+  typeName: '',
 });
 const closediaMeth = () => {
   dialogConfig.visible = false;
@@ -79,72 +75,69 @@
 // 站点数组
 const arrstcode = ref([
   // 站点类型名称: 编码
-  "outlet_water_level", // 排口流量
-  "outlet_quality", // 排口水质
-  "channel_quality", // 港渠水质
-  "channel_water_level", // 港渠水位
-  "lake_water_level", // 湖泊水位
-  "waterlogging", // 渍水监测点（注意：这里编码没有后缀，可能是特例或故意为之）
-  "rain", // 雨量站
-  "rainwater_pipeline_quality", // 雨水管网水质
-  "sewage_pipeline_quality", // 污水管网水质
-  "rainwater_pipeline_water_level", // 雨水管网液位
-  "reservoir_water_level", //水库水位
-  "rainPumpStation", //雨水泵站
-  "dirtyPumpStation", //污水泵站
-  "sewageStation", //污水厂
-  "gateStation", //闸门
+  'outlet_water_level', // 排口流量
+  'outlet_quality', // 排口水质
+  'channel_quality', // 港渠水质
+  'channel_water_level', // 港渠水位
+  'lake_water_level', // 湖泊水位
+  'waterlogging', // 渍水监测点（注意：这里编码没有后缀，可能是特例或故意为之）
+  'rain', // 雨量站
+  'rainwater_pipeline_quality', // 雨水管网水质
+  'sewage_pipeline_quality', // 污水管网水质
+  'rainwater_pipeline_quality_area', // 接驳口
+  'rainwater_pipeline_water_level', // 雨水管网液位
+  'reservoir_water_level', //水库水位
+  'rainPumpStation', //雨水泵站
+  'dirtyPumpStation', //污水泵站
+  'sewageStation', //污水厂
+  'gateStation', //闸门
 ]);
 // 基本数据
 const arrid = ref([
-  "diversion_well_info", // 分流井
-  "drainage_info", // 排水户
-  "lake_info", // 湖泊
-  "outlet_info", // 排口
-  "port_channel_info", // 港渠
-  "rain_water_pump_station_info", // 雨水泵站
-  "region_info", // 分区信息
-  "reservoir_info", // 水库
-  "sewage_factory_info", // 污水处理厂
-  "sewage_factory_station_info", //污水处理站
-  "sewage_pump_station_info", // 污水泵站
-  "storage_tank_info", // 调蓄池
-  "water_gate_info", // 水闸
-  "waterlogging_point_info", // 渍水点
-  "water_region_info", // 水系汇水分区
-  "storehouse", //物资仓库
-  "dikeGood", //堤防备料
+  'diversion_well_info', // 分流井
+  'drainage_info', // 排水户
+  'lake_info', // 湖泊
+  'outlet_info', // 排口
+  'port_channel_info', // 港渠
+  'rain_water_pump_station_info', // 雨水泵站
+  'region_info', // 分区信息
+  'reservoir_info', // 水库
+  'sewage_factory_info', // 污水处理厂
+  'sewage_factory_station_info', //污水处理站
+  'sewage_pump_station_info', // 污水泵站
+  'storage_tank_info', // 调蓄池
+  'water_gate_info', // 水闸
+  'waterlogging_point_info', // 渍水点
+  'water_region_info', // 水系汇水分区
+  'storehouse', //物资仓库
+  'dikeGood', //堤防备料
 ]);
 // 基础数据
 const switchStcode = (Name, type) => {
-  if (type == "outlet_info") {
+  if (type == 'outlet_info') {
     pkClick(Getproperties.value);
   }
-  console.log("GetcomIDs.value", GetcomIDs.value);
+  console.log('GetcomIDs.value', GetcomIDs.value);
 
   if (arrid.value.includes(type)) {
     dialogConfig.visible = true;
     dialogConfig.dataCode = type;
     dialogConfig.comIDs = GetcomIDs.value;
-    dialogConfig.title = Getproperties.value.name.split("\n")[0];
-    dialogConfig.dataID = Getproperties.value.pid
-      ? Getproperties.value.pid
-      : Getproperties.value.id;
-    dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs[0] : "";
+    dialogConfig.title = Getproperties.value.name.split('\n')[0];
+    dialogConfig.dataID = Getproperties.value.pid ? Getproperties.value.pid : Getproperties.value.id;
+    dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs[0] : '';
   } else {
     return;
   }
 };
 // 类型弹框判断
-const typecodeswitch = (type) => {
+const typecodeswitch = type => {
   if (diabox[type]) {
     // console.log('diabox[type]', diabox[type]);
-    window[type + "_map"] = diabox[type]
-      .filter((i) => i.geometry)
+    window[type + '_map'] = diabox[type]
+      .filter(i => i.geometry)
       .map((item, index) => {
-        let coordinates = turf.getCoords(
-          turf.center(Terraformer.WKT.parse(item.geometry))
-        );
+        let coordinates = turf.getCoords(turf.center(Terraformer.WKT.parse(item.geometry)));
         const popup = new mapboxgl1.Popup({
           closeButton: false,
           closeOnClick: false,
@@ -158,7 +151,7 @@
       });
 
     nextTick(() => {
-      window[type + "_map"].forEach((i) => i._setOpacity(0));
+      window[type + '_map'].forEach(i => i._setOpacity(0));
     });
   }
 };
@@ -166,7 +159,7 @@
   let typearr = [];
   for (var k in diabox) {
     typearr.push(k);
-    appStore.MapData.map((item) => {
+    appStore.MapData.map(item => {
       if (item.pointType == k) {
         diabox[k] = item.data;
       }
@@ -187,56 +180,60 @@
     dialogConfig.dataID = Getproperties.value.stCode;
 
     dialogConfig.comIDs = GetcomIDs.value;
-    dialogConfig.title = Getproperties.value.name.split("\n")[0];
-    dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs.value[0].menuName : "";
+    dialogConfig.title = Getproperties.value.name.split('\n')[0];
+    dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs.value[0].menuName : '';
   } else {
     return;
   }
 };
 // 智慧水务大脑一张图 特定大屏动态菜单
-const specificFun = (type) => {
+const specificFun = type => {
   // 监测预警模块弹框
   // value值 统一菜单类型
   //name值 特指智慧水务大脑获取的动态菜单类型
   let arr = [
     {
-      name: "dp_zsfx", //渍水点
-      value: "waterlogging",
+      name: 'dp_zsfx', //渍水点
+      value: 'waterlogging',
     },
     {
-      name: "dp_hhsq", //河湖水情
-      value: "lake_water_level",
+      name: 'dp_hhsq', //河湖水情
+      value: 'lake_water_level',
     },
     {
-      name: "dp_bzgq", //泵站工情
-      value: "rainPumpStation", //雨水泵站
+      name: 'dp_bzgq', //泵站工情
+      value: 'rainPumpStation', //雨水泵站
     },
     {
-      name: "dp_gwfx", //管网风险
-      value: "rainwater_pipeline_water_level", //雨水管网液位
+      name: 'dp_gwfx', //管网风险
+      value: 'rainwater_pipeline_water_level', //雨水管网液位
     },
     {
-      name: "dp_gwfx", //管网风险
-      value: "rainwater_pipeline_quality", //雨水管网水质
+      name: 'dp_gwfx', //管网风险
+      value: 'rainwater_pipeline_quality', //雨水管网水质
     },
     {
-      name: "dp_wsgwfx", //大屏污水管网风险分析弹框
-      value: "sewage_pipeline_quality", //雨水管网水质
+      name: 'dp_gwfx', //接驳口
+      value: 'rainwater_pipeline_quality_area', //接驳口
+    },
+    {
+      name: 'dp_wsgwfx', //大屏污水管网风险分析弹框
+      value: 'sewage_pipeline_quality', //雨水管网水质
     },
     // {
     //   name: "dp_ysgwfx", //大屏雨水管网风险分析弹框
     //   value: "rainwater_pipeline_quality", //雨水管网水质
     // },
   ];
-  return arr.find((item) => item.value == type)?.name || null;
+  return arr.find(item => item.value == type)?.name || null;
 };
 
 // 获取动态弹框菜单
 const GetBoxmenu = (Name, type) => {
-  console.log("name", Name);
-  console.log("type", type);
+  console.log('name', Name);
+  console.log('type', type);
   GetcomIDs.value = [];
-  let dataId = "";
+  let dataId = '';
   if (arrstcode.value.includes(type)) {
     dataId = Getproperties.value.stCode;
   }
@@ -244,7 +241,7 @@
   if (arrid.value.includes(type)) {
     dataId = Getproperties.value.pid ? Getproperties.value.pid : Getproperties.value.id;
   }
-  console.log("dataId", dataId);
+  console.log('dataId', dataId);
   if (!dataId) {
     // proxy.$modal.msgSuccess('');
     return;
@@ -252,14 +249,14 @@
   // debugger;
   let params = {
     dataCode: specificFun(type) || type,
-    scene: "basis_monitor",
+    scene: 'basis_monitor',
     dataId: dataId,
   };
-  drainageDispatchGetMenu(params).then((res) => {
-    console.log("获得的菜单", res.data);
+  drainageDispatchGetMenu(params).then(res => {
+    console.log('获得的菜单', res.data);
     Getmenuarr.value = res.data;
     if (res.data && res.data.length) {
-      res.data.map((item) => {
+      res.data.map(item => {
         GetcomIDs.value.push(item.moduleName);
       });
     }
@@ -274,112 +271,104 @@
 const pointandlineOpen = (type, properties) => {
   dialogConfig.visible = true;
   switch (type) {
-    case "pipeline_info_text":
-      dialogConfig.title = "管线信息";
+    case 'pipeline_info_text':
+      dialogConfig.title = '管线信息';
       break;
-    case "pipeline_info":
-      dialogConfig.title = "管线信息";
+    case 'pipeline_info':
+      dialogConfig.title = '管线信息';
       break;
-    case "pipeline_point":
-      dialogConfig.title = "管点信息";
+    case 'pipeline_point':
+      dialogConfig.title = '管点信息';
       break;
-    case "point":
-      dialogConfig.title = "问题管线";
+    case 'point':
+      dialogConfig.title = '问题管线';
       break;
   }
 
   Getmenuarr.value = [
     {
-      menuName: "管网信息",
+      menuName: '管网信息',
       show: true,
-      moduleName: "PointAndLine",
+      moduleName: 'PointAndLine',
     },
   ];
 
   // dialogConfig.dataID = '0371000003';
-  dialogConfig.comIDs = ["PointAndLine"];
-  dialogConfig.RefName = "PointAndLine";
+  dialogConfig.comIDs = ['PointAndLine'];
+  dialogConfig.RefName = 'PointAndLine';
 };
 const loadCallback = () => {};
 // 排口溯源
-const pkClick = async (properties) => {
+const pkClick = async properties => {
   // debugger;
   if (!properties.wellCode) return;
   let results = await upStreamAnalyse({ endPointNumber: properties.wellCode });
   let pipelines = results.data.pipelineInfoList
-    .map((i) =>
+    .map(i =>
       turf.feature(Terraformer.WKT.parse(i.geometrys), {
         ...i,
-        area: i.pipelineType == "Rain" ? "雨水" : "污水",
+        area: i.pipelineType == 'Rain' ? '雨水' : '污水',
       })
     )
-    .map((i) =>
-      i.properties.flowDirection == 0
-        ? turf.lineString(turf.getCoords(i).reverse(), i.properties)
-        : i
-    );
+    .map(i => (i.properties.flowDirection == 0 ? turf.lineString(turf.getCoords(i).reverse(), i.properties) : i));
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == "水系流向")[0]
+    .filter(i => i.newfiberId == '水系流向')[0]
     .getSource()
     .setData(turf.featureCollection(pipelines));
 };
 
-const a = (properties) => {
-  const keys_ = ["雨水", "污水"];
-  const keys = ["1_泵站", "1_污水处理厂", "分区流向", "分区流向1"];
-  bus.emit("removeMapDatas", keys);
+const a = properties => {
+  const keys_ = ['雨水', '污水'];
+  const keys = ['1_泵站', '1_污水处理厂', '分区流向', '分区流向1'];
+  bus.emit('removeMapDatas', keys);
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == keys[3])[0]
+    .filter(i => i.newfiberId == keys[3])[0]
     .getSource()
     .setData(turf.featureCollection([]));
   const key = properties.c_layer.includes(keys_[0]) ? keys_[0] : keys_[1];
   const nameKey = properties.name.substring(0, 2);
-  let features = line.features.filter(
-    (i) => i.properties.area.includes(key) && i.properties.name.includes(nameKey)
-  );
-  let features1 = point.features.filter(
-    (i) => i.properties.area.includes(key) && i.properties.system.includes(nameKey)
-  );
-  let points = _.groupBy(features1, (a) => a.properties.type);
-  features.forEach((i) => {
+  let features = line.features.filter(i => i.properties.area.includes(key) && i.properties.name.includes(nameKey));
+  let features1 = point.features.filter(i => i.properties.area.includes(key) && i.properties.system.includes(nameKey));
+  let points = _.groupBy(features1, a => a.properties.type);
+  features.forEach(i => {
     i.properties.type = keys[2];
-    i.properties.color = key == keys_[0] ? "rgba(21,127,176,1)" : "rgba(255,0,0,1)";
+    i.properties.color = key == keys_[0] ? 'rgba(21,127,176,1)' : 'rgba(255,0,0,1)';
   });
-  Object.keys(points).map((key) =>
-    bus.emit("setGeoJSON", {
+  Object.keys(points).map(key =>
+    bus.emit('setGeoJSON', {
       json: turf.featureCollection(
-        points[key].map((i) => ({
+        points[key].map(i => ({
           type: i.type,
           geometry: i.geometry,
-          properties: { ...i.properties, type: "1_" + key },
+          properties: { ...i.properties, type: '1_' + key },
         }))
       ),
-      key: "1_" + key,
+      key: '1_' + key,
     })
   );
-  bus.emit("setGeoJSON", { json: turf.featureCollection(features), key: keys[2] });
+  bus.emit('setGeoJSON', { json: turf.featureCollection(features), key: keys[2] });
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == keys[3])[0]
+    .filter(i => i.newfiberId == keys[3])[0]
     .getSource()
     .setData(turf.featureCollection(features));
 };
 
 const mapClick1 = (lngLat, properties = {}, layerId) => {
-  console.log("经纬度", lngLat);
-  console.log("数据", properties);
-  console.log("layerid", layerId);
+  console.log('经纬度', lngLat);
+  console.log('数据', properties);
+  console.log('layerid', layerId);
 
   // 处理标注
   Getproperties.value = properties;
-  let type = properties ? properties.type : "" || 1;
-  let Name = properties ? properties.pointTypeName : "" || "";
+  let type = properties ? properties.type : '' || 1;
+  let Name = properties ? properties.pointTypeName : '' || '';
   // Annotation(properties);
-  console.log("1111", type, layerId);
+  console.log('1111', type, layerId);
 
-  if (properties.layer == "排水分区") {
+  if (properties.layer == '排水分区') {
     // a(properties);
 
     // if (Getproperties.value.c_layer.includes('雨水分区_1')) {
@@ -395,24 +384,17 @@
     return;
   }
 
-  let layerIdarr = [
-    "湖泊",
-    "湖泊_text",
-    "港渠",
-    "港渠_text",
-    "水库管理范围",
-    "水库管理范围_text",
-  ];
+  let layerIdarr = ['湖泊', '湖泊_text', '港渠', '港渠_text', '水库管理范围', '水库管理范围_text'];
   let newsetarr = [
-    { name: "湖泊", value: "lake_info" },
-    { name: "湖泊_text", value: "lake_info" },
-    { name: "港渠", value: "port_channel_info" },
-    { name: "港渠_text", value: "port_channel_info" },
-    { name: "水库管理范围", value: "reservoir_info" },
-    { name: "水库管理范围_text", value: "reservoir_info" },
+    { name: '湖泊', value: 'lake_info' },
+    { name: '湖泊_text', value: 'lake_info' },
+    { name: '港渠', value: 'port_channel_info' },
+    { name: '港渠_text', value: 'port_channel_info' },
+    { name: '水库管理范围', value: 'reservoir_info' },
+    { name: '水库管理范围_text', value: 'reservoir_info' },
   ];
   if (layerIdarr.includes(layerId)) {
-    type = newsetarr.find((item) => {
+    type = newsetarr.find(item => {
       return layerId == item.name;
     }).value;
 
@@ -421,15 +403,15 @@
     return;
   }
 
-  let arr = ["pipeline_point", "pipeline_info", "pipeline_info_text"];
+  let arr = ['pipeline_point', 'pipeline_info', 'pipeline_info_text'];
 
   if (arr.includes(layerId)) {
-    console.log("进了方法");
+    console.log('进了方法');
     pointandlineOpen(layerId);
     dialogConfig.dataCode = layerId;
-  } else if (properties.type && properties.type == "问题管线") {
-    pointandlineOpen("point");
-    dialogConfig.dataCode = "point";
+  } else if (properties.type && properties.type == '问题管线') {
+    pointandlineOpen('point');
+    dialogConfig.dataCode = 'point';
   } else {
     if (type) {
       GetBoxmenu(Name, type);
@@ -439,30 +421,27 @@
 
 // 根据类型处理接口返回的标注内容
 const AnnotationArr = ref([]);
-const StringName = ref("");
-const Annotation = (properties) => {
+const StringName = ref('');
+const Annotation = properties => {
   if (properties.siteData && properties.siteData.length) {
     let arr = JSON.parse(properties.siteData);
     AnnotationArr.value = arr;
-    console.log("数据", arr);
-    let string = "";
+    console.log('数据', arr);
+    let string = '';
 
     switch (properties.type) {
-      case "rain":
-        AnnotationArr.value = [
-          { valueName: "监测时间", value: properties.recordTime },
-          ...arr,
-        ];
+      case 'rain':
+        AnnotationArr.value = [{ valueName: '监测时间', value: properties.recordTime }, ...arr];
         break;
     }
     string = Methtion(string);
-    console.log("数据", string);
+    console.log('数据', string);
   }
 };
 
-const Methtion = (StringName) => {
+const Methtion = StringName => {
   if (AnnotationArr.value.length) {
-    AnnotationArr.value.map((item) => {
+    AnnotationArr.value.map(item => {
       StringName += `${item.valueName}:${item.value}+'/n' `;
     });
     return StringName;
@@ -479,7 +458,7 @@
     domElement.webkitRequestFullScreen();
   }
 };
-const closeFun = (is) => {
+const closeFun = is => {
   dialogConfig.visible = is;
 };
 function anotherMeht(item) {
@@ -487,22 +466,22 @@
   Getproperties.value.stCode = item.stCode || item.siteCode || item.lakeCode;
   Getproperties.value.dataCode = item.dataCode;
   Getproperties.value.wellcode = item.wellCode || item.dataName || item.pipeLine;
-  Getproperties.value.id =item.id;
-  Getproperties.value.gwMonitorId =item.gwMonitorId||item.id; //管网坡面
-  Getproperties.value.dataId = item.dataId || "";
+  Getproperties.value.id = item.id;
+  Getproperties.value.gwMonitorId = item.gwMonitorId || item.id; //管网坡面
+  Getproperties.value.dataId = item.dataId || '';
   Getproperties.value.stType = item.stType;
 
-  Getproperties.value.geometry = item.geometry || item.geometrys||'';
-    // Terraformer.WKT.convert(turf.point(item.lonLat.split(",").map(Number)).geometry);
+  Getproperties.value.geometry = item.geometry || item.geometrys || '';
+  // Terraformer.WKT.convert(turf.point(item.lonLat.split(",").map(Number)).geometry);
 
-  Getproperties.value.waterRegionCode =item.lakeCode ||item.waterRegionCode ; //河湖水情  查询水系分区详情
+  Getproperties.value.waterRegionCode = item.lakeCode || item.waterRegionCode; //河湖水情  查询水系分区详情
   Getproperties.value.GWDADataNow = item.GWDADataNow ? item.GWDADataNow : false;
   if (item.daterange) {
     Getproperties.value.daterange = item.daterange;
   } else {
     Getproperties.value.daterange = null;
   }
-  console.log("Getproperties", Getproperties.value);
+  console.log('Getproperties', Getproperties.value);
   if (arrstcode.value.includes(item.stType)) {
     properties.stCode = item.stCode;
   }
@@ -510,15 +489,15 @@
   if (arrid.value.includes(item.stType)) {
     properties.id = item.pid || item.id;
   }
-  GetBoxmenu("", item.stType);
+  GetBoxmenu('', item.stType);
 }
 
 onMounted(() => {
   allScreen();
   useStore.getsewageData();
-  bus.on("DynamicBus", (item) => {
-    console.log("item", item);
-    dialogConfig.RefName = item.RefName || "";
+  bus.on('DynamicBus', item => {
+    console.log('item', item);
+    dialogConfig.RefName = item.RefName || '';
     dialogConfig.title = item.stName || item.name;
     // debugger;
     if (!!!item.NoPromise) {
@@ -531,22 +510,19 @@
       dialogConfig.dataID = item.pid ? item.pid : item.id;
       Getproperties.value.stCode = item.stCode;
       Getproperties.value.dataCode = item.dataCode;
-      Getproperties.value.wellcode =
-        item.wellCode || item.dataName || item.startPointNumber;
-      Getproperties.value.id =item.relationId  || item.id; //item.relationId监测告警的普通id
-      Getproperties.value.dataId = item.dataId || "";
+      Getproperties.value.wellcode = item.wellCode || item.dataName || item.startPointNumber;
+      Getproperties.value.id = item.relationId || item.id; //item.relationId监测告警的普通id
+      Getproperties.value.dataId = item.dataId || '';
       Getproperties.value.stType = item.stType;
       Getproperties.value.geometry =
-        item.geometry ||
-        item.geometrys ||
-        Terraformer.WKT.convert(turf.point(item.lonLat.split(",").map(Number)).geometry);
+        item.geometry || item.geometrys || Terraformer.WKT.convert(turf.point(item.lonLat.split(',').map(Number)).geometry);
       dialogConfig.visible = true;
     }
   });
-  bus.on("closedia", (e) => {
+  bus.on('closedia', e => {
     closediaMeth();
   });
-  bus.on("changeData", (e) => {
+  bus.on('changeData', e => {
     // switchArr();
   });
   // 部分公共弹窗需要使用一个查询时间,目前不确定后期有没有人使用同类型的弹窗,在此初始化,增加公共弹窗的兼容性
@@ -554,17 +530,17 @@
 });
 
 onBeforeUnmount(() => {
-  bus.off("DynamicBus");
-  bus.off("closedia");
-  bus.off("changeData");
+  bus.off('DynamicBus');
+  bus.off('closedia');
+  bus.off('changeData');
 });
 </script>
 <style lang="scss">
-@import "@/assets/styles/pictureOnMap.scss";
+@import '@/assets/styles/pictureOnMap.scss';
 .pictureOnMap {
   width: 100%;
   height: 100%;
-  background: url("@/assets/images/pictureOnMap/maxBgc.png") no-repeat center;
+  background: url('@/assets/images/pictureOnMap/maxBgc.png') no-repeat center;
   background-size: 100% 100%;
   color: #fff;
   overflow: hidden;
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/guanwangpoumian.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/guanwangpoumian.vue
index 18afcf5..366f1c6 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/guanwangpoumian.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/guanwangpoumian.vue
@@ -7,13 +7,10 @@
 </template>
 
 <script setup name="guanwangpoumian">
-import moment from "moment";
-import commonUnderGround from "@/views/pictureOnMap/page/components/DialogTabs/component/commonUnderGround.vue";
+import moment from 'moment';
+import commonUnderGround from '@/views/pictureOnMap/page/components/DialogTabs/component/commonUnderGround.vue';
 const { proxy } = getCurrentInstance();
-import {
-  getSectionByWellCode,
-  getSectionByWellCodeDetail,
-} from "@/api/MonitorAssetsOnMap";
+import { getSectionByWellCode, getSectionByWellCodeDetail } from '@/api/MonitorAssetsOnMap';
 
 const props = defineProps({
   Getproperties: {
@@ -23,7 +20,7 @@
 const GetpoumianList = ref({});
 
 function GWpoumian() {
-  let wellcode = props.Getproperties.wellcode ? props.Getproperties.wellcode : "";
+  let wellcode = props.Getproperties.wellCode ? props.Getproperties.wellCode : '';
   if (wellcode) {
     if (props.Getproperties.daterange && !props.Getproperties.GWDADataNow) {
       let params = {
@@ -31,20 +28,20 @@
         // time:moment(props.Getproperties.daterange[0]).format("YYYY-MM-DD")
         id: props.Getproperties.gwMonitorId,
       };
-      getSectionByWellCodeDetail(params).then((res) => {
+      getSectionByWellCodeDetail(params).then(res => {
         if (res && res.code == 200) {
-          console.log("res.data", res.data);
+          console.log('res.data', res.data);
           GetpoumianList.value = res.data;
         }
       });
     } else {
-      getSectionByWellCode(wellcode).then((res) => {
-        console.log("res.data", res.data);
+      getSectionByWellCode(wellcode).then(res => {
+        console.log('res.data', res.data);
         GetpoumianList.value = res.data;
       });
     }
   } else {
-    console.log("没有wellcode", props.Getproperties);
+    console.log('没有wellcode', props.Getproperties);
     // proxy.$modal.msgSuccess("");
   }
 }
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/ylfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/ylfxJCFX.vue
index 228a398..84a21b2 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/ylfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/ylfxJCFX.vue
@@ -17,8 +17,7 @@
         <div class="name">历史经验:</div>
         <div class="text popUpTable">
           <el-table :data="listData.rainHistoryList" class="w100" stripe>
-            <el-table-column prop="time" label="降雨日期" width="140px">
-            </el-table-column>
+            <el-table-column prop="time" label="降雨日期" width="140px"> </el-table-column>
             <el-table-column prop="rain" label="日降雨量(mm)" />
             <el-table-column prop="jyjb" label="降雨级别">
               <template #default="scope">
@@ -44,10 +43,10 @@
 </template>
 
 <script setup name="ylfxJCFX">
-import { ref, reactive, toRefs, onMounted, nextTick } from "vue";
-import * as echarts from "echarts";
-import { drainageDispatchRainAnalysisByGwjcd, getEchart } from "@/api/MonitorAssetsOnMap";
-import moment from "moment";
+import { ref, reactive, toRefs, onMounted, nextTick } from 'vue';
+import * as echarts from 'echarts';
+import { drainageDispatchRainAnalysisByGwjcd, getEchart } from '@/api/MonitorAssetsOnMap';
+import moment from 'moment';
 
 const props = defineProps({
   // 数据id
@@ -71,35 +70,32 @@
 const AllData = reactive({
   chart: null,
   yAxis: [],
-  yAxis_Name: "降雨量",
+  yAxis_Name: '降雨量',
   yAxis3: [],
-  yAxis3_Name: "水深",
+  yAxis3_Name: '水深',
   xAxis: [],
   MGSW: 0,
   GSW: 0,
   MG: 0,
   YL: 0,
 });
-const Timers = ref([
-  moment().subtract(3, "day").format("YYYY-MM-DD HH:mm:ss"),
-  moment().format("YYYY-MM-DD HH:mm:ss"),
-]);
+const Timers = ref([moment().subtract(3, 'day').format('YYYY-MM-DD HH:mm:ss'), moment().format('YYYY-MM-DD HH:mm:ss')]);
 const init = () => {
   //先获取Dom上的实例
-  let chartDom = echarts.getInstanceByDom(document.getElementById("HeaderEcharts"));
+  let chartDom = echarts.getInstanceByDom(document.getElementById('HeaderEcharts'));
   //然后判断实例是否存在，如果不存在，就创建新实例
   if (chartDom == null) {
-    chartDom = echarts.init(document.getElementById("HeaderEcharts"));
+    chartDom = echarts.init(document.getElementById('HeaderEcharts'));
     var option = {
       tooltip: {
-        trigger: "axis",
-        backgroundColor: "#004284",
-        borderColor: "#0B9BFF",
+        trigger: 'axis',
+        backgroundColor: '#004284',
+        borderColor: '#0B9BFF',
         borderRadius: 6, // 设置圆角大小
         // 自定义提示框文本样
         textStyle: {
           // 字体颜色
-          color: "white",
+          color: 'white',
           // 字体大小
           fontSize: 14,
         },
@@ -107,25 +103,25 @@
       legend: {
         data: [AllData.yAxis_Name, AllData.yAxis3_Name],
         textStyle: {
-          color: "#FFFFFF",
+          color: '#FFFFFF',
           fontSize: 12,
         },
       },
       grid: {
-        left: 30,
+        left: 100,
         right: 100,
         bottom: 20,
         containLabel: true,
       },
 
       xAxis: {
-        type: "category",
+        type: 'category',
         boundaryGap: true,
         data: AllData.xAxis,
         axisLabel: {
-          color: "rgba(255,255,255,1)",
+          color: 'rgba(255,255,255,1)',
           fontSize: 12,
-          fontFamily: "AlibabaPuHuiTi",
+          fontFamily: 'AlibabaPuHuiTi',
         },
       },
 
@@ -137,20 +133,20 @@
           bottom: 10,
           start: 0,
           end: 100,
-          handleSize: "100%",
-          fillerColor: "#94FA41",
-          borderColor: "transparent",
-          backgroundColor: "rgba(148, 250, 65, 0.2)",
+          handleSize: '100%',
+          fillerColor: '#94FA41',
+          borderColor: 'transparent',
+          backgroundColor: 'rgba(148, 250, 65, 0.2)',
           handleStyle: {
-            color: "#94FA41",
+            color: '#94FA41',
           },
           moveHandleSize: 0,
           textStyle: {
-            color: "#fff",
+            color: '#fff',
           },
         },
         {
-          type: "inside",
+          type: 'inside',
           show: true,
           height: 15,
           start: 0,
@@ -160,10 +156,10 @@
       yAxis: [
         {
           name: AllData.yAxis_Name,
-          type: "value",
+          type: 'value',
           // minInterval: 1,
           axisLabel: {
-            color: "#AAC1CF",
+            color: '#AAC1CF',
             show: true,
             formatter: function (value) {
               return value.toFixed(2); // 保留两位小数
@@ -171,41 +167,41 @@
           },
           min: 0,
           nameTextStyle: {
-            color: "#19D5FF",
+            color: '#19D5FF',
           },
           splitLine: {
             lineStyle: {
-              type: "dashed",
-              color: "#2161a8",
+              type: 'dashed',
+              color: '#2161a8',
             },
           },
           alignTicks: true,
-          position: "left",
+          position: 'left',
           inverse: true,
-          nameLocation: "start",
+          nameLocation: 'start',
         },
         {
           name: AllData.yAxis3_Name,
-          type: "value",
+          type: 'value',
           // minInterval: 1,
           max: function (value) {
             return value.max > AllData.YL ? value.max : AllData.YL;
           },
           min: 0,
           axisLabel: {
-            color: "#AAC1CF",
+            color: '#AAC1CF',
             show: true,
             formatter: function (value) {
               return value.toFixed(2); // 保留两位小数
             },
           },
           nameTextStyle: {
-            color: "#99FF55",
+            color: '#99FF55',
           },
           splitLine: {
             lineStyle: {
-              type: "dashed",
-              color: "#2161a8",
+              type: 'dashed',
+              color: '#2161a8',
             },
           },
           alignTicks: true,
@@ -214,37 +210,37 @@
       series: [
         {
           name: AllData.yAxis_Name,
-          type: "bar",
+          type: 'bar',
           data: AllData.yAxis,
-          barWidth: "30%", // 可以是具体像素值 '20px' 或百分比 '50%'
+          barWidth: '30%', // 可以是具体像素值 '20px' 或百分比 '50%'
           // 修改数据点颜色
           itemStyle: {
             borderRadius: [0, 0, 50, 50],
             color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-              { offset: 0, color: "#08B1FF" },
-              { offset: 1, color: "#19D6FF" },
+              { offset: 0, color: '#08B1FF' },
+              { offset: 1, color: '#19D6FF' },
             ]), // 数据点颜色
           },
         },
         {
           name: AllData.yAxis3_Name,
-          type: "line",
+          type: 'line',
           data: AllData.yAxis3,
           yAxisIndex: 1,
           symbolSize: 7,
           // 修改折线颜色
           lineStyle: {
-            color: "#99FF55", // 折线颜色
+            color: '#99FF55', // 折线颜色
             width: 2, // 折线宽度
           },
           // 修改数据点颜色
           itemStyle: {
-            color: "#99FF55", // 数据点颜色
+            color: '#99FF55', // 数据点颜色
           },
           // yAxisIndex: 1,
           markLine: {
             data: [],
-            symbol: ["none", "none"], // 这里设置标记线两端的标记为'none'，即不显示箭头
+            symbol: ['none', 'none'], // 这里设置标记线两端的标记为'none'，即不显示箭头
           },
         },
       ],
@@ -253,16 +249,16 @@
       option.series[1].markLine.data.push({
         yAxis: AllData.MGSW, // 这是水平线的 Y 轴值
         lineStyle: {
-          type: "dashed",
-          color: "red", // 线的颜色
+          type: 'dashed',
+          color: 'red', // 线的颜色
         },
         label: {
           show: true,
           // formatter: "满管水位" + props.data.yAxis6_YJ,
-          formatter: "溢流风险:" + AllData.MGSW,
-          color: "red",
+          formatter: '溢流风险:' + AllData.MGSW,
+          color: 'red',
           fontSize: 12,
-          position: "middle",
+          position: 'middle',
         },
       });
     }
@@ -270,16 +266,16 @@
       option.series[1].markLine.data.push({
         yAxis: AllData.GSW, // 这是水平线的 Y 轴值
         lineStyle: {
-          type: "dashed",
-          color: "yellow", // 线的颜色
-          cap: "round",
+          type: 'dashed',
+          color: 'yellow', // 线的颜色
+          cap: 'round',
         },
         label: {
           show: true,
-          formatter: "高水位:" + AllData.GSW,
-          color: "yellow",
+          formatter: '高水位:' + AllData.GSW,
+          color: 'yellow',
           fontSize: 12,
-          position: "middle",
+          position: 'middle',
         },
       });
     }
@@ -287,16 +283,16 @@
       option.series[1].markLine.data.push({
         yAxis: AllData.MG, // 这是水平线的 Y 轴值
         lineStyle: {
-          type: "dashed",
-          color: "rgba(255, 191, 0, 1)", // 线的颜色
-          cap: "round",
+          type: 'dashed',
+          color: 'rgba(255, 191, 0, 1)', // 线的颜色
+          cap: 'round',
         },
         label: {
           show: true,
-          formatter: "满管:" + AllData.MG,
-          color: "rgba(255, 191, 0, 1)",
+          formatter: '满管:' + AllData.MG,
+          color: 'rgba(255, 191, 0, 1)',
           fontSize: 12,
-          position: "middle",
+          position: 'middle',
         },
       });
     }
@@ -304,16 +300,16 @@
       option.series[1].markLine.data.push({
         yAxis: AllData.YL, // 这是水平线的 Y 轴值
         lineStyle: {
-          type: "dashed",
-          color: "#610404", // 线的颜色
-          cap: "round",
+          type: 'dashed',
+          color: '#610404', // 线的颜色
+          cap: 'round',
         },
         label: {
           show: true,
-          formatter: "溢流:" + AllData.YL,
-          color: "#610404",
+          formatter: '溢流:' + AllData.YL,
+          color: '#610404',
           fontSize: 12,
-          position: "middle",
+          position: 'middle',
         },
       });
     }
@@ -333,30 +329,30 @@
     dataCode: props.Getproperties.dataCode,
     start: Timers.value[0],
     end: Timers.value[1],
-  }).then((res) => {
+  }).then(res => {
     if (res && res.code == 200) {
       AllData.xAxis = res.data.times;
-      res.data.datas.forEach((element) => {
+      res.data.datas.forEach(element => {
         switch (element.dataKey) {
-          case "z":
+          case 'z':
             AllData.yAxis3 = element.datas;
-            element.cordonLineList.forEach((element) => {
-              if (element.code == "ylfx") {
+            element.cordonLineList.forEach(element => {
+              if (element.code == 'ylfx') {
                 AllData.MGSW = Number(element.lineValue);
               }
-              if (element.code == "gsw") {
+              if (element.code == 'gsw') {
                 AllData.GSW = Number(element.lineValue);
               }
-              if (element.code == "mg") {
+              if (element.code == 'mg') {
                 AllData.MG = Number(element.lineValue);
               }
-              if (element.code == "yl") {
+              if (element.code == 'yl') {
                 AllData.YL = Number(element.lineValue);
               }
             });
             break;
 
-          case "pn05":
+          case 'pn05':
             AllData.yAxis = element.datas;
             break;
         }
@@ -372,40 +368,40 @@
     id: props.Getproperties.id,
   };
   drainageDispatchRainAnalysisByGwjcd(params).then(
-    (res) => {
-      console.log("监测分析渍水风险降雨历史", res);
+    res => {
+      console.log('监测分析渍水风险降雨历史', res);
       if (res && res.code == 200) {
         listData.value = res.data;
       }
     },
-    (error) => {}
+    error => {}
   );
 }
 function RainfallLevelFun(rain) {
   let sum = Number(rain);
-  let text = "";
+  let text = '';
   switch (true) {
     // 江河水位
     case sum > 200:
-      text = "特大暴雨";
+      text = '特大暴雨';
       break;
     case sum > 100:
-      text = "大暴雨";
+      text = '大暴雨';
       break;
     case sum > 50:
-      text = "暴雨";
+      text = '暴雨';
       break;
     case sum > 25:
-      text = "大雨";
+      text = '大雨';
       break;
     case sum > 10:
-      text = "中雨";
+      text = '中雨';
       break;
     case sum > 0:
-      text = "小雨";
+      text = '小雨';
       break;
     default:
-      text = "无雨";
+      text = '无雨';
   }
   return text;
 }
@@ -416,7 +412,7 @@
     }
     getChartsData();
     gitDataFun();
-    window.addEventListener("resize", resizeTheChart);
+    window.addEventListener('resize', resizeTheChart);
   });
 });
 </script>