diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js
index 25081b6..109d251 100644
--- a/src/api/MonitorAssetsOnMap.js
+++ b/src/api/MonitorAssetsOnMap.js
@@ -299,3 +299,18 @@
     params: query,
   });
 }
+export function getByPipeLineCode(query) {
+  return request({
+    url: `/business/pipelineInfo/getByPipeLineCode`,
+    method: 'get',
+    params: query,
+  });
+}
+
+export function selectByPointNumber(query) {
+  return request({
+    url: `/business/pipelinePoint/selectByPointNumber`,
+    method: 'get',
+    params: query,
+  });
+}
\ No newline at end of file

diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js
index 25081b6..109d251 100644
--- a/src/api/MonitorAssetsOnMap.js
+++ b/src/api/MonitorAssetsOnMap.js
@@ -299,3 +299,18 @@
     params: query,
   });
 }
+export function getByPipeLineCode(query) {
+  return request({
+    url: `/business/pipelineInfo/getByPipeLineCode`,
+    method: 'get',
+    params: query,
+  });
+}
+
+export function selectByPointNumber(query) {
+  return request({
+    url: `/business/pipelinePoint/selectByPointNumber`,
+    method: 'get',
+    params: query,
+  });
+}
\ No newline at end of file
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/PointAndLine.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/PointAndLine.vue
index 0ca20f8..c5bb777 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/PointAndLine.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/PointAndLine.vue
@@ -1,7 +1,13 @@
 <template>
   <div id="PointAndLine">
     <div class="items-content">
-      <div class="contentitem" v-for="p in GXOBJ" :key="p" v-show="p.name != 'geometry'" :class="[p.type]">
+      <div
+        class="contentitem"
+        v-for="p in GXOBJ"
+        :key="p"
+        v-show="p.name != 'geometry'"
+        :class="[p.type]"
+      >
         <el-tooltip class="item" effect="light" placement="top" :content="p.name">
           <div class="name gxname">{{ p.name }}</div>
         </el-tooltip>
@@ -29,7 +35,9 @@
           placement="top"
           :content="typeof p.value == 'number' ? p.value.toFixed(3) : p.value || '-'"
         >
-          <div class="value gxvalue">：{{ typeof p.value == 'number' ? p.value.toFixed(3) : p.value || '-' }}</div>
+          <div class="value gxvalue">
+            ：{{ typeof p.value == "number" ? p.value.toFixed(3) : p.value || "-" }}
+          </div>
         </el-tooltip>
       </div>
 
@@ -45,8 +53,14 @@
 </template>
 
 <script setup name="PointAndLine">
-import bus from '@/bus';
-import { downStreamAnalyse, upStreamAnalyse, connectAnalyse } from '@/api/MonitorAssetsOnMap';
+import bus from "@/bus";
+import {
+  downStreamAnalyse,
+  upStreamAnalyse,
+  connectAnalyse,
+  selectByPointNumber,
+  getByPipeLineCode,
+} from "@/api/MonitorAssetsOnMap";
 const { proxy } = getCurrentInstance();
 
 const props = defineProps({
@@ -72,7 +86,7 @@
   },
 });
 
-const typearr = ['pipeline_point', 'pipeline_info', 'pipeline_info_text'];
+const typearr = ["pipeline_point", "pipeline_info", "pipeline_info_text"];
 
 const setnamobj = ref([]);
 const GXOBJ = ref();
@@ -98,133 +112,141 @@
  * @param {Object} properties - 包含其他属性的对象
  */
 function Distinguishnames() {
-  console.log('props', props);
+  console.log("props", props);
   let properties = cleanKeyNames(props.Getproperties);
-  console.log('properties', properties);
+  console.log("properties", properties);
   // 假设GXOBJ.value 与本函数无关，如果它也需要被清空或重置，可以取消下面这行的注释
   GXOBJ.value = [];
   // 清除现有的 setnamobj.value（如果需要的话）
   setnamobj.value = [];
   switch (props.dataCode) {
-    case 'pipeline_info_text':
-      setnamobj.value = [
-        '管段编码',
-        '起始井号',
-        '终止井号',
-        '管线材质',
-        '管径',
-        '起点埋深',
-        '终点埋深',
-        '起点高程',
-        '终点高程',
-        '管段类型',
-        '道路名称',
-        '管网归属',
-        '测区',
-        '维护管理单位',
-        '管段长度',
-      ];
-      break;
-    case 'pipeline_info':
-      setnamobj.value = [
-        '管段编码',
-        '起始井号',
-        '终止井号',
-        '管线材质',
-        '管径',
-        '起点埋深',
-        '终点埋深',
-        '起点高程',
-        '终点高程',
-        '管段类型',
-        '道路名称',
-        '管网归属',
-        '测区',
-        '维护管理单位',
-        '管段长度',
-      ];
-      break;
-    case 'pipeline_point':
-      let nameobj = [
-        '设施编号',
-        '地面高程',
-        '井盖尺寸',
-        '井盖材质',
-        '井深',
-        '井径',
-        '特征',
-        '类型',
-        '附属物',
-        '管网归属',
-        '维护管理单位',
-        '道路名称',
-      ];
+    case "pipeline_info_text":
+      // setnamobj.value = [
+      //   '管段编码',
+      //   '起始井号',
+      //   '终止井号',
+      //   '管线材质',
+      //   '管径',
+      //   '起点埋深',
+      //   '终点埋深',
+      //   '起点高程',
+      //   '终点高程',
+      //   '管段类型',
+      //   '道路名称',
+      //   '管网归属',
+      //   '测区',
+      //   '维护管理单位',
+      //   '管段长度',
+      // ];
+      pointOrline("line");
 
-      let dmgc = '';
-      let js = '';
-      // 井底高程：地面高程-井深
+      return;
+    case "pipeline_info":
+      pointOrline("line");
 
-      for (var k in properties) {
-        if (nameobj.includes(k)) {
-          GXOBJ.value.push({ name: k, value: properties[k] });
-        } //
-        if (k == '地面高程') {
-          dmgc = properties[k];
-        }
-        if (k == '井深') {
-          js = properties[k];
-        }
-      }
-      GXOBJ.value.push({ name: '井底高程', value: dmgc - js || 0 });
+      // setnamobj.value = [
+      //   '管段编码',
+      //   '起始井号',
+      //   '终止井号',
+      //   '管线材质',
+      //   '管径',
+      //   '起点埋深',
+      //   '终点埋深',
+      //   '起点高程',
+      //   '终点高程',
+      //   '管段类型',
+      //   '道路名称',
+      //   '管网归属',
+      //   '测区',
+      //   '维护管理单位',
+      //   '管段长度',
+      // ];
+      return;
+    case "pipeline_point":
+      pointOrline("point");
+      // let nameobj = [
+      //   '设施编号',
+      //   '地面高程',
+      //   '井盖尺寸',
+      //   '井盖材质',
+      //   '井深',
+      //   '井径',
+      //   '特征',
+      //   '类型',
+      //   '附属物',
+      //   '管网归属',
+      //   '维护管理单位',
+      //   '道路名称',
+      // ];
 
-      break;
-    case '已建管网测点':
-      setnamobj.value = ['站点名称', '站点编号'];
+      // GXOBJ.value.push({ name: k, value: properties[k] });
+
+      // let dmgc = '';
+      // let js = '';
+      // // 井底高程：地面高程-井深
+
+      // for (var k in properties) {
+      //   if (nameobj.includes(k)) {
+      //     GXOBJ.value.push({ name: k, value: properties[k] });
+      //   } //
+      //   if (k == '地面高程') {
+      //     dmgc = properties[k];
+      //   }
+      //   if (k == '井深') {
+      //     js = properties[k];
+      //   }
+      // }
+      // GXOBJ.value.push({ name: '井底高程', value: dmgc - js || 0 });
+
+      return;
+    // break;
+    case "已建管网测点":
+      setnamobj.value = ["站点名称", "站点编号"];
 
       GXOBJ.value = [
-        { name: '站点名称', value: properties.st_name },
-        { name: '站点编号', value: properties.st_code },
+        { name: "站点名称", value: properties.st_name },
+        { name: "站点编号", value: properties.st_code },
       ];
 
       break;
-    case 'point':
+    case "point":
       setnamobj.value = [
-        '管段编码',
-        '起始井号',
-        '终止井号',
-        '管线材质',
-        '管径',
-        '起点埋深',
-        '终点埋深',
-        '起点高程',
-        '终点高程',
-        '管段类型',
-        '道路名称',
-        '管网归属',
-        '测区',
-        '维护管理单位',
-        '管段长度',
-        '大管套小管',
-        '断头管',
-        '雨污混接',
-        '管网逆坡',
+        "管段编码",
+        "起始井号",
+        "终止井号",
+        "管线材质",
+        "管径",
+        "起点埋深",
+        "终点埋深",
+        "起点高程",
+        "终点高程",
+        "管段类型",
+        "道路名称",
+        "管网归属",
+        "测区",
+        "维护管理单位",
+        "管段长度",
+        "大管套小管",
+        "断头管",
+        "雨污混接",
+        "管网逆坡",
       ];
 
       GXOBJ.value = [
-        { name: '所在排水系统', value: properties.drainageSystem },
-        { name: '起始井号', value: properties.startPointNumber },
-        { name: '终止井号', value: properties.endPointNumber },
-        { name: '管线材质', value: properties.pipelineTexture },
-        { name: '管径', value: properties.pipelineDiameter },
-        { name: '起点埋深', value: properties.startGroundDepth },
-        { name: '终点埋深', value: properties.endGroundDepth },
-        { name: '起点高程', value: properties.startCopNoseElevation },
-        { name: '终点高程', value: properties.endCopNoseElevation },
-        { name: '管段类型', value: properties.sectionType },
-        { name: '道路名称', value: properties.roadName },
-        { name: '管网归属', value: properties.ownershipUnits },
-        { name: '管段长度', value: properties.pipelineLength },
-        { name: '建设年代', value: properties.constructionDate },
+        { name: "所在排水系统", value: properties.drainageSystem },
+        { name: "起始井号", value: properties.startPointNumber },
+        { name: "终止井号", value: properties.endPointNumber },
+        { name: "管线材质", value: properties.pipelineTexture },
+        { name: "管径", value: properties.pipelineDiameter },
+        { name: "起点埋深", value: properties.startGroundDepth },
+        { name: "终点埋深", value: properties.endGroundDepth },
+        { name: "起点高程", value: properties.startCopNoseElevation },
+        { name: "终点高程", value: properties.endCopNoseElevation },
+        { name: "管段类型", value: properties.sectionType },
+        { name: "道路名称", value: properties.roadName },
+        { name: "管网归属", value: properties.ownershipUnits },
+        { name: "管段长度", value: properties.pipelineLength },
+        { name: "建设年代", value: properties.constructionDate },
         // { name: "大管套小管", value: properties.bigCoverSmallReason  },
         // { name: "断头管", value: properties.cutOffReason},
         // { name: "雨污混接",  value: properties.mixReason  },
@@ -232,34 +254,117 @@
         // { name: "流向错误", value: properties.flowDirectionWrongReason  },
       ];
       if (properties.bigCoverSmallReason) {
-        GXOBJ.value = [...GXOBJ.value, { name: '大管套小管', value: properties.bigCoverSmallReason }];
+        GXOBJ.value = [
+          ...GXOBJ.value,
+          { name: "大管套小管", value: properties.bigCoverSmallReason },
+        ];
       }
       if (properties.cutOffReason) {
-        GXOBJ.value = [...GXOBJ.value, { name: '断头管', value: properties.cutOffReason }];
+        GXOBJ.value = [
+          ...GXOBJ.value,
+          { name: "断头管", value: properties.cutOffReason },
+        ];
       }
       if (properties.mixReason) {
-        GXOBJ.value = [...GXOBJ.value, { name: '雨污混接', value: properties.mixReason }];
+        GXOBJ.value = [...GXOBJ.value, { name: "雨污混接", value: properties.mixReason }];
       }
       if (properties.reverseSlopeReason) {
-        GXOBJ.value = [...GXOBJ.value, { name: '管网逆坡', value: properties.reverseSlopeReason }];
+        GXOBJ.value = [
+          ...GXOBJ.value,
+          { name: "管网逆坡", value: properties.reverseSlopeReason },
+        ];
       }
       // if (properties.flowDirectionWrongReason) {
       //   GXOBJ.value = [...GXOBJ.value, { name: '流向错误', value: properties.flowDirectionWrongReason }];
       // }
       // 流向错误
       break;
+    case "缺陷管点":
+      setnamobj.value = [
+        "填报单位",
+        "所属流域",
+        "投入使用年限",
+        "管网是否已移交",
+        "管道材质",
+        "管道类型",
+        "管道缺陷类型",
+        "维护管理单位",
+        "联系方式",
+        "负责人",
+        "道路名称",
+        "需改造长度m",
+        "需要改造内容",
+      ];
+
+      break;
     default:
       // 如果没有匹配到任何id，可以设置默认值或空数组
       setnamobj.value = [];
-      console.log('未知的id:', id);
+      console.log("未知的id:", props.dataCode);
       return;
   }
 
   setobj(properties);
 }
 
+function pointOrline(type) {
+  if (type == "point") {
+    // 井底高程：地面高程-井深
+    let prams = {
+      pointNumber: props.Getproperties["外业点号"],
+    };
+    selectByPointNumber(prams).then((res) => {
+      console.log(res.data);
+      let obj = res.data;
+      GXOBJ.value = [
+        { name: "设施编号", value: obj.pointNumber || "-" },
+        { name: "地面高程", value: obj.groundElevation || "-" },
+        { name: "井盖尺寸", value: obj.manholeCoverSize || "-" },
+        { name: "井盖材质", value: obj.pointTexture || "-" },
+        { name: "井深", value: obj.bottomBuriedDepth || "-" },
+        { name: "井径", value: obj.wellDiameter || "-" },
+        { name: "特征", value: obj.features || "-" },
+        { name: "坡度", value: obj.slope || "-" },
+        { name: "类型", value: obj.pointType || "-" },
+        { name: "附属物", value: obj.appendage || "-" },
+        { name: "管网归属", value: obj.ownershipUnits || "-" },
+        { name: "维护管理单位", value: obj.operationalUnits || "-" },
+        { name: "道路名称", value: obj.roadName || "-" },
+        { name: "井底高程", value: obj.groundElevation - obj.bottomBuriedDepth || "-" },
+      ];
+    });
+  }
+  if (type == "line") {
+    let prams = {
+      pipeLineCode: props.Getproperties["管段编码"],
+    };
+    getByPipeLineCode(prams).then((res) => {
+      console.log(res.data);
+
+      let obj2 = res.data;
+      GXOBJ.value = [
+        { name: "排水系统", value: obj2.drainageSystem || "-" },
+        { name: "管道类别", value: obj2.pipelineType || "-" },
+        { name: "起点编号", value: obj2.startPointNumber || "-" },
+        { name: "终点编号", value: obj2.endPointNumber || "-" },
+        { name: "管线材质", value: obj2.pipelineTexture || "-" },
+        { name: "管径", value: obj2.pipelineDiameter || "-" },
+        { name: "起点埋深", value: obj2.startGroundDepth || "-" },
+        { name: "终点埋深", value: obj2.endGroundDepth || "-" },
+        { name: "起点高程", value: obj2.startCopNoseElevation || "-" },
+        { name: "终点高程", value: obj2.endCopNoseElevation || "-" },
+        { name: "道路名称", value: obj2.roadName || "-" },
+        { name: "权属单位", value: obj2.ownershipUnits || "-" },
+        { name: "管段长度", value: obj2.pipelineLength || "-" },
+        { name: "断面类型", value: obj2.sectionType || "-" },
+        { name: "管径1", value: obj2.sectionDataTwo || "-" },
+      ];
+    });
+  }
+}
+
 function setobj(properties) {
-  console.log('aaaa', properties, setnamobj.value);
+  console.log("aaaa", properties, setnamobj.value);
   if (properties) {
     for (var k in properties) {
       if (setnamobj.value.includes(k)) {
@@ -286,7 +391,7 @@
   // 遍历输入对象的所有属性
   for (let key in obj) {
     // 假设“清理”过程就是去除键名中的换行符（尽管在标准情况下这是不必要的）
-    let cleanKey = key.replace(/\n/g, ''); // 去除换行符
+    let cleanKey = key.replace(/\n/g, ""); // 去除换行符
 
     // 将清理后的键名和原始属性值复制到新对象中
     newObj[cleanKey] = obj[key];
@@ -295,64 +400,65 @@
   return newObj;
 }
 
-const key = '问题管线';
+const key = "问题管线";
 const isConnectivity = ref(false); //记录是否选择连通性分析
 const oldConnectivityData = ref({}); //上一个择连通性分析数据
-const guanxianAnalysis = async type => {
+const guanxianAnalysis = async (type) => {
   let properties = props.Getproperties;
 
   // properties['起始外业点号'] = 'I2206PYS1010172';
   // properties['终止外业点号'] = 'I2206PYS1010221';
-  console.log('properties123', properties);
-  console.log('type123', type);
+  console.log("properties123", properties);
+  console.log("type123", type);
   let results = {};
-  bus.emit('removeMapDatas', [key]);
+  bus.emit("removeMapDatas", [key]);
   const methods = {
     up: upStreamAnalyse,
     down: downStreamAnalyse,
     connectivity: connectAnalyse,
     question: upStreamAnalyse,
   }[type];
-  if (!isConnectivity.value && type == 'connectivity') {
+  if (!isConnectivity.value && type == "connectivity") {
     oldConnectivityData.value = properties;
     isConnectivity.value = true;
-    proxy.$modal.msgWarning('请再次选择需要连通性分析的另一条管线或管点进行分析');
-    bus.emit('closedia', [key]);
+    proxy.$modal.msgWarning("请再次选择需要连通性分析的另一条管线或管点进行分析");
+    bus.emit("closedia", [key]);
 
     return;
   } else if (isConnectivity.value) {
     //流通性分析 第二条管网
-    proxy.$modal.msgSuccess('正在进行流通性分析······');
+    proxy.$modal.msgSuccess("正在进行流通性分析······");
 
     isConnectivity.value = false;
     results = await methods({
-      startPointNumber: oldConnectivityData.value['起始外业点号'] || properties['外业点号'],
-      endPointNumber: properties['终止外业点号'] || properties['外业点号'],
+      startPointNumber:
+        oldConnectivityData.value["起始外业点号"] || properties["外业点号"],
+      endPointNumber: properties["终止外业点号"] || properties["外业点号"],
     });
     oldConnectivityData.value = {};
 
     gx_DataFun(results, properties, type);
-    bus.emit('closedia', [key]);
-  } else if (type == 'updown') {
+    bus.emit("closedia", [key]);
+  } else if (type == "updown") {
     let params = {
-      startPointNumber: properties['起始外业点号'] || properties['外业点号'],
-      endPointNumber: properties['终止外业点号'] || properties['外业点号'],
+      startPointNumber: properties["起始外业点号"] || properties["外业点号"],
+      endPointNumber: properties["终止外业点号"] || properties["外业点号"],
     };
-    await upStreamAnalyse(params).then(res => {
-      console.log('上下游1', res);
+    await upStreamAnalyse(params).then((res) => {
+      console.log("上下游1", res);
       gx_DataFun(res, properties, type);
     });
-    await downStreamAnalyse(params).then(res => {
-      console.log('上下游2', res);
+    await downStreamAnalyse(params).then((res) => {
+      console.log("上下游2", res);
       gx_DataFun(res, properties, type);
     });
   } else {
     oldConnectivityData.value = {};
     isConnectivity.value = false;
-    proxy.$modal.msgSuccess('正在分析中······');
+    proxy.$modal.msgSuccess("正在分析中······");
     results = await methods({
-      startPointNumber: properties['起始外业点号'] || properties['外业点号'],
-      endPointNumber: properties['终止外业点号'] || properties['外业点号'],
+      startPointNumber: properties["起始外业点号"] || properties["外业点号"],
+      endPointNumber: properties["终止外业点号"] || properties["外业点号"],
     });
     gx_DataFun(results, properties, type);
   }
@@ -360,37 +466,36 @@
 
 // 管线分析处理方法
 const gx_DataFun = (results, properties, type) => {
-  proxy.$modal.msgSuccess('分析完成！');
+  proxy.$modal.msgSuccess("分析完成！");
 
-  // debugger;
   const properKs = [
-    { key: 'bigCoverSmallFlag', value: '大管套小管' },
-    { key: 'cutOffFlag', value: '断头管' },
-    { key: 'mixFlag', value: '雨污混接' },
-    { key: 'reverseSlopeFlag', value: '管网逆坡' },
+    { key: "bigCoverSmallFlag", value: "大管套小管" },
+    { key: "cutOffFlag", value: "断头管" },
+    { key: "mixFlag", value: "雨污混接" },
+    { key: "reverseSlopeFlag", value: "管网逆坡" },
     // { key: 'flowDirectionWrongFlag', value: '流向错误' },
   ];
   //问题管线
   // errorText(i.properties)
   const questionLinePoints = results.data.pipelineInfoList
-    .filter(i => properKs.map(k => eval(i[k.key])).filter(Boolean)[0])
-    .map(i => ({
+    .filter((i) => properKs.map((k) => eval(i[k.key])).filter(Boolean)[0])
+    .map((i) => ({
       ...turf.center(turf.feature(Terraformer.WKT.parse(i.geometrys))),
       properties: i,
     }))
-    .map(i => ({
+    .map((i) => ({
       ...i,
       properties: {
         ...i.properties,
         name: `${key}:\n${properKs
           .map((k, o) => eval(i.properties[k.key]) && k.value)
           .filter(Boolean)
-          .map((k, o) => o + 1 + '、' + k)
-          .join('\n')}`,
+          .map((k, o) => o + 1 + "、" + k)
+          .join("\n")}`,
         geometrys: Terraformer.WKT.convert(i.geometry),
       },
     }));
-  const siteKey = 'rainwater_pipeline_water_level';
+  /*  const siteKey = 'rainwater_pipeline_water_level';
   results.data.siteList = [
     {
       id: '2',
@@ -512,38 +617,45 @@
         facilityAttrTypeName: '',
       },
     },
-  ];
+  ];*/
   const siteList = (results.data.siteList || [])
-    .filter(i => i.geometry)
-    .map(i =>
+    .filter((i) => i.geometry)
+    .map((i) =>
       turf.feature(Terraformer.WKT.parse(i.geometry), {
         ...i,
-        type: i.pointType + '_' + i.pipeWarn.warnTypeCode,
-        name: [i.pipeWarn.warnTypeName, '持续时间:' + (i.pipeWarn.duration || 0)].join('\n'),
+        type: i.pointType + "_" + i.pipeWarn.warnTypeCode,
+        name: [i.pipeWarn.warnTypeName, "持续时间:" + (i.pipeWarn.duration || 0)].join(
+          "\n"
+        ),
       })
     );
   // const siteList = (results.data.siteList || []).filter(i => i.geometry).map(i => turf.feature(Terraformer.WKT.parse(i.geometry),({...i,type:siteKey,name:[i.name,i.pipeWarn.warnTypeName].concat(i.siteData.monitorPropertyList.map((o,o_idx) => `${o.monitorName}${o.unit}：\t${i.siteData.monitorValueList[o_idx].monitorValue}`)).join('\n')})))
   //上下游管线
   let pipelines = results.data.pipelineInfoList
-    .map(i =>
+    .map((i) =>
       turf.feature(Terraformer.WKT.parse(i.geometrys), {
         ...i,
-        area: i.pipelineType == 'Rain' ? '雨水' : '污水',
+        area: i.pipelineType == "YS" ? "雨水" : "污水",
       })
     )
-    .map(i => (i.properties.flowDirection == 0 ? turf.lineString(turf.getCoords(i).reverse(), i.properties) : i));
+    .map((i) =>
+      i.properties.flowDirection == 1
+        ? turf.lineString(turf.getCoords(i).flat().reverse(), i.properties)
+        : i
+    );
   newfiberMap
     .getLayers()
-    .filter(i => i.newfiberId == '水系流向')[0]
+    .filter((i) => i.newfiberId == "水系流向")[0]
     .getSource()
     .setData(turf.featureCollection(pipelines));
 
-  bus.emit('setGeoJSON', { json: turf.featureCollection(questionLinePoints), key });
-  siteList.length && bus.emit('setGeoJSON', { json: turf.featureCollection(siteList), key: siteKey });
+  bus.emit("setGeoJSON", { json: turf.featureCollection(questionLinePoints), key });
+  siteList.length &&
+    bus.emit("setGeoJSON", { json: turf.featureCollection(siteList), key: siteKey });
 };
 
 onMounted(() => {
-  console.log('props', props);
+  console.log("props", props);
   Distinguishnames();
 });
 </script>
@@ -554,6 +666,7 @@
   height: 100%;
   color: #ccefff;
 }
+
 .items-content {
   width: 100%;
   height: 100%;
@@ -589,9 +702,12 @@
 
     .gxvalue {
       width: calc(90% - 100px);
-      white-space: nowrap; /* 确保文本在一行内显示 */
-      overflow: hidden; /* 隐藏超出容器宽度的文本 */
-      text-overflow: ellipsis; /* 使用省略号表示被截断的文本 */
+      white-space: nowrap;
+      /* 确保文本在一行内显示 */
+      overflow: hidden;
+      /* 隐藏超出容器宽度的文本 */
+      text-overflow: ellipsis;
+      /* 使用省略号表示被截断的文本 */
     }
   }
 }

diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js
index 25081b6..109d251 100644
--- a/src/api/MonitorAssetsOnMap.js
+++ b/src/api/MonitorAssetsOnMap.js
@@ -299,3 +299,18 @@
     params: query,
   });
 }
+export function getByPipeLineCode(query) {
+  return request({
+    url: `/business/pipelineInfo/getByPipeLineCode`,
+    method: 'get',
+    params: query,
+  });
+}
+
+export function selectByPointNumber(query) {
+  return request({
+    url: `/business/pipelinePoint/selectByPointNumber`,
+    method: 'get',
+    params: query,
+  });
+}
\ No newline at end of file
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/PointAndLine.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/PointAndLine.vue
index 0ca20f8..c5bb777 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/PointAndLine.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/PointAndLine.vue
@@ -1,7 +1,13 @@
 <template>
   <div id="PointAndLine">
     <div class="items-content">
-      <div class="contentitem" v-for="p in GXOBJ" :key="p" v-show="p.name != 'geometry'" :class="[p.type]">
+      <div
+        class="contentitem"
+        v-for="p in GXOBJ"
+        :key="p"
+        v-show="p.name != 'geometry'"
+        :class="[p.type]"
+      >
         <el-tooltip class="item" effect="light" placement="top" :content="p.name">
           <div class="name gxname">{{ p.name }}</div>
         </el-tooltip>
@@ -29,7 +35,9 @@
           placement="top"
           :content="typeof p.value == 'number' ? p.value.toFixed(3) : p.value || '-'"
         >
-          <div class="value gxvalue">：{{ typeof p.value == 'number' ? p.value.toFixed(3) : p.value || '-' }}</div>
+          <div class="value gxvalue">
+            ：{{ typeof p.value == "number" ? p.value.toFixed(3) : p.value || "-" }}
+          </div>
         </el-tooltip>
       </div>
 
@@ -45,8 +53,14 @@
 </template>
 
 <script setup name="PointAndLine">
-import bus from '@/bus';
-import { downStreamAnalyse, upStreamAnalyse, connectAnalyse } from '@/api/MonitorAssetsOnMap';
+import bus from "@/bus";
+import {
+  downStreamAnalyse,
+  upStreamAnalyse,
+  connectAnalyse,
+  selectByPointNumber,
+  getByPipeLineCode,
+} from "@/api/MonitorAssetsOnMap";
 const { proxy } = getCurrentInstance();
 
 const props = defineProps({
@@ -72,7 +86,7 @@
   },
 });
 
-const typearr = ['pipeline_point', 'pipeline_info', 'pipeline_info_text'];
+const typearr = ["pipeline_point", "pipeline_info", "pipeline_info_text"];
 
 const setnamobj = ref([]);
 const GXOBJ = ref();
@@ -98,133 +112,141 @@
  * @param {Object} properties - 包含其他属性的对象
  */
 function Distinguishnames() {
-  console.log('props', props);
+  console.log("props", props);
   let properties = cleanKeyNames(props.Getproperties);
-  console.log('properties', properties);
+  console.log("properties", properties);
   // 假设GXOBJ.value 与本函数无关，如果它也需要被清空或重置，可以取消下面这行的注释
   GXOBJ.value = [];
   // 清除现有的 setnamobj.value（如果需要的话）
   setnamobj.value = [];
   switch (props.dataCode) {
-    case 'pipeline_info_text':
-      setnamobj.value = [
-        '管段编码',
-        '起始井号',
-        '终止井号',
-        '管线材质',
-        '管径',
-        '起点埋深',
-        '终点埋深',
-        '起点高程',
-        '终点高程',
-        '管段类型',
-        '道路名称',
-        '管网归属',
-        '测区',
-        '维护管理单位',
-        '管段长度',
-      ];
-      break;
-    case 'pipeline_info':
-      setnamobj.value = [
-        '管段编码',
-        '起始井号',
-        '终止井号',
-        '管线材质',
-        '管径',
-        '起点埋深',
-        '终点埋深',
-        '起点高程',
-        '终点高程',
-        '管段类型',
-        '道路名称',
-        '管网归属',
-        '测区',
-        '维护管理单位',
-        '管段长度',
-      ];
-      break;
-    case 'pipeline_point':
-      let nameobj = [
-        '设施编号',
-        '地面高程',
-        '井盖尺寸',
-        '井盖材质',
-        '井深',
-        '井径',
-        '特征',
-        '类型',
-        '附属物',
-        '管网归属',
-        '维护管理单位',
-        '道路名称',
-      ];
+    case "pipeline_info_text":
+      // setnamobj.value = [
+      //   '管段编码',
+      //   '起始井号',
+      //   '终止井号',
+      //   '管线材质',
+      //   '管径',
+      //   '起点埋深',
+      //   '终点埋深',
+      //   '起点高程',
+      //   '终点高程',
+      //   '管段类型',
+      //   '道路名称',
+      //   '管网归属',
+      //   '测区',
+      //   '维护管理单位',
+      //   '管段长度',
+      // ];
+      pointOrline("line");
 
-      let dmgc = '';
-      let js = '';
-      // 井底高程：地面高程-井深
+      return;
+    case "pipeline_info":
+      pointOrline("line");
 
-      for (var k in properties) {
-        if (nameobj.includes(k)) {
-          GXOBJ.value.push({ name: k, value: properties[k] });
-        } //
-        if (k == '地面高程') {
-          dmgc = properties[k];
-        }
-        if (k == '井深') {
-          js = properties[k];
-        }
-      }
-      GXOBJ.value.push({ name: '井底高程', value: dmgc - js || 0 });
+      // setnamobj.value = [
+      //   '管段编码',
+      //   '起始井号',
+      //   '终止井号',
+      //   '管线材质',
+      //   '管径',
+      //   '起点埋深',
+      //   '终点埋深',
+      //   '起点高程',
+      //   '终点高程',
+      //   '管段类型',
+      //   '道路名称',
+      //   '管网归属',
+      //   '测区',
+      //   '维护管理单位',
+      //   '管段长度',
+      // ];
+      return;
+    case "pipeline_point":
+      pointOrline("point");
+      // let nameobj = [
+      //   '设施编号',
+      //   '地面高程',
+      //   '井盖尺寸',
+      //   '井盖材质',
+      //   '井深',
+      //   '井径',
+      //   '特征',
+      //   '类型',
+      //   '附属物',
+      //   '管网归属',
+      //   '维护管理单位',
+      //   '道路名称',
+      // ];
 
-      break;
-    case '已建管网测点':
-      setnamobj.value = ['站点名称', '站点编号'];
+      // GXOBJ.value.push({ name: k, value: properties[k] });
+
+      // let dmgc = '';
+      // let js = '';
+      // // 井底高程：地面高程-井深
+
+      // for (var k in properties) {
+      //   if (nameobj.includes(k)) {
+      //     GXOBJ.value.push({ name: k, value: properties[k] });
+      //   } //
+      //   if (k == '地面高程') {
+      //     dmgc = properties[k];
+      //   }
+      //   if (k == '井深') {
+      //     js = properties[k];
+      //   }
+      // }
+      // GXOBJ.value.push({ name: '井底高程', value: dmgc - js || 0 });
+
+      return;
+    // break;
+    case "已建管网测点":
+      setnamobj.value = ["站点名称", "站点编号"];
 
       GXOBJ.value = [
-        { name: '站点名称', value: properties.st_name },
-        { name: '站点编号', value: properties.st_code },
+        { name: "站点名称", value: properties.st_name },
+        { name: "站点编号", value: properties.st_code },
       ];
 
       break;
-    case 'point':
+    case "point":
       setnamobj.value = [
-        '管段编码',
-        '起始井号',
-        '终止井号',
-        '管线材质',
-        '管径',
-        '起点埋深',
-        '终点埋深',
-        '起点高程',
-        '终点高程',
-        '管段类型',
-        '道路名称',
-        '管网归属',
-        '测区',
-        '维护管理单位',
-        '管段长度',
-        '大管套小管',
-        '断头管',
-        '雨污混接',
-        '管网逆坡',
+        "管段编码",
+        "起始井号",
+        "终止井号",
+        "管线材质",
+        "管径",
+        "起点埋深",
+        "终点埋深",
+        "起点高程",
+        "终点高程",
+        "管段类型",
+        "道路名称",
+        "管网归属",
+        "测区",
+        "维护管理单位",
+        "管段长度",
+        "大管套小管",
+        "断头管",
+        "雨污混接",
+        "管网逆坡",
       ];
 
       GXOBJ.value = [
-        { name: '所在排水系统', value: properties.drainageSystem },
-        { name: '起始井号', value: properties.startPointNumber },
-        { name: '终止井号', value: properties.endPointNumber },
-        { name: '管线材质', value: properties.pipelineTexture },
-        { name: '管径', value: properties.pipelineDiameter },
-        { name: '起点埋深', value: properties.startGroundDepth },
-        { name: '终点埋深', value: properties.endGroundDepth },
-        { name: '起点高程', value: properties.startCopNoseElevation },
-        { name: '终点高程', value: properties.endCopNoseElevation },
-        { name: '管段类型', value: properties.sectionType },
-        { name: '道路名称', value: properties.roadName },
-        { name: '管网归属', value: properties.ownershipUnits },
-        { name: '管段长度', value: properties.pipelineLength },
-        { name: '建设年代', value: properties.constructionDate },
+        { name: "所在排水系统", value: properties.drainageSystem },
+        { name: "起始井号", value: properties.startPointNumber },
+        { name: "终止井号", value: properties.endPointNumber },
+        { name: "管线材质", value: properties.pipelineTexture },
+        { name: "管径", value: properties.pipelineDiameter },
+        { name: "起点埋深", value: properties.startGroundDepth },
+        { name: "终点埋深", value: properties.endGroundDepth },
+        { name: "起点高程", value: properties.startCopNoseElevation },
+        { name: "终点高程", value: properties.endCopNoseElevation },
+        { name: "管段类型", value: properties.sectionType },
+        { name: "道路名称", value: properties.roadName },
+        { name: "管网归属", value: properties.ownershipUnits },
+        { name: "管段长度", value: properties.pipelineLength },
+        { name: "建设年代", value: properties.constructionDate },
         // { name: "大管套小管", value: properties.bigCoverSmallReason  },
         // { name: "断头管", value: properties.cutOffReason},
         // { name: "雨污混接",  value: properties.mixReason  },
@@ -232,34 +254,117 @@
         // { name: "流向错误", value: properties.flowDirectionWrongReason  },
       ];
       if (properties.bigCoverSmallReason) {
-        GXOBJ.value = [...GXOBJ.value, { name: '大管套小管', value: properties.bigCoverSmallReason }];
+        GXOBJ.value = [
+          ...GXOBJ.value,
+          { name: "大管套小管", value: properties.bigCoverSmallReason },
+        ];
       }
       if (properties.cutOffReason) {
-        GXOBJ.value = [...GXOBJ.value, { name: '断头管', value: properties.cutOffReason }];
+        GXOBJ.value = [
+          ...GXOBJ.value,
+          { name: "断头管", value: properties.cutOffReason },
+        ];
       }
       if (properties.mixReason) {
-        GXOBJ.value = [...GXOBJ.value, { name: '雨污混接', value: properties.mixReason }];
+        GXOBJ.value = [...GXOBJ.value, { name: "雨污混接", value: properties.mixReason }];
       }
       if (properties.reverseSlopeReason) {
-        GXOBJ.value = [...GXOBJ.value, { name: '管网逆坡', value: properties.reverseSlopeReason }];
+        GXOBJ.value = [
+          ...GXOBJ.value,
+          { name: "管网逆坡", value: properties.reverseSlopeReason },
+        ];
       }
       // if (properties.flowDirectionWrongReason) {
       //   GXOBJ.value = [...GXOBJ.value, { name: '流向错误', value: properties.flowDirectionWrongReason }];
       // }
       // 流向错误
       break;
+    case "缺陷管点":
+      setnamobj.value = [
+        "填报单位",
+        "所属流域",
+        "投入使用年限",
+        "管网是否已移交",
+        "管道材质",
+        "管道类型",
+        "管道缺陷类型",
+        "维护管理单位",
+        "联系方式",
+        "负责人",
+        "道路名称",
+        "需改造长度m",
+        "需要改造内容",
+      ];
+
+      break;
     default:
       // 如果没有匹配到任何id，可以设置默认值或空数组
       setnamobj.value = [];
-      console.log('未知的id:', id);
+      console.log("未知的id:", props.dataCode);
       return;
   }
 
   setobj(properties);
 }
 
+function pointOrline(type) {
+  if (type == "point") {
+    // 井底高程：地面高程-井深
+    let prams = {
+      pointNumber: props.Getproperties["外业点号"],
+    };
+    selectByPointNumber(prams).then((res) => {
+      console.log(res.data);
+      let obj = res.data;
+      GXOBJ.value = [
+        { name: "设施编号", value: obj.pointNumber || "-" },
+        { name: "地面高程", value: obj.groundElevation || "-" },
+        { name: "井盖尺寸", value: obj.manholeCoverSize || "-" },
+        { name: "井盖材质", value: obj.pointTexture || "-" },
+        { name: "井深", value: obj.bottomBuriedDepth || "-" },
+        { name: "井径", value: obj.wellDiameter || "-" },
+        { name: "特征", value: obj.features || "-" },
+        { name: "坡度", value: obj.slope || "-" },
+        { name: "类型", value: obj.pointType || "-" },
+        { name: "附属物", value: obj.appendage || "-" },
+        { name: "管网归属", value: obj.ownershipUnits || "-" },
+        { name: "维护管理单位", value: obj.operationalUnits || "-" },
+        { name: "道路名称", value: obj.roadName || "-" },
+        { name: "井底高程", value: obj.groundElevation - obj.bottomBuriedDepth || "-" },
+      ];
+    });
+  }
+  if (type == "line") {
+    let prams = {
+      pipeLineCode: props.Getproperties["管段编码"],
+    };
+    getByPipeLineCode(prams).then((res) => {
+      console.log(res.data);
+
+      let obj2 = res.data;
+      GXOBJ.value = [
+        { name: "排水系统", value: obj2.drainageSystem || "-" },
+        { name: "管道类别", value: obj2.pipelineType || "-" },
+        { name: "起点编号", value: obj2.startPointNumber || "-" },
+        { name: "终点编号", value: obj2.endPointNumber || "-" },
+        { name: "管线材质", value: obj2.pipelineTexture || "-" },
+        { name: "管径", value: obj2.pipelineDiameter || "-" },
+        { name: "起点埋深", value: obj2.startGroundDepth || "-" },
+        { name: "终点埋深", value: obj2.endGroundDepth || "-" },
+        { name: "起点高程", value: obj2.startCopNoseElevation || "-" },
+        { name: "终点高程", value: obj2.endCopNoseElevation || "-" },
+        { name: "道路名称", value: obj2.roadName || "-" },
+        { name: "权属单位", value: obj2.ownershipUnits || "-" },
+        { name: "管段长度", value: obj2.pipelineLength || "-" },
+        { name: "断面类型", value: obj2.sectionType || "-" },
+        { name: "管径1", value: obj2.sectionDataTwo || "-" },
+      ];
+    });
+  }
+}
+
 function setobj(properties) {
-  console.log('aaaa', properties, setnamobj.value);
+  console.log("aaaa", properties, setnamobj.value);
   if (properties) {
     for (var k in properties) {
       if (setnamobj.value.includes(k)) {
@@ -286,7 +391,7 @@
   // 遍历输入对象的所有属性
   for (let key in obj) {
     // 假设“清理”过程就是去除键名中的换行符（尽管在标准情况下这是不必要的）
-    let cleanKey = key.replace(/\n/g, ''); // 去除换行符
+    let cleanKey = key.replace(/\n/g, ""); // 去除换行符
 
     // 将清理后的键名和原始属性值复制到新对象中
     newObj[cleanKey] = obj[key];
@@ -295,64 +400,65 @@
   return newObj;
 }
 
-const key = '问题管线';
+const key = "问题管线";
 const isConnectivity = ref(false); //记录是否选择连通性分析
 const oldConnectivityData = ref({}); //上一个择连通性分析数据
-const guanxianAnalysis = async type => {
+const guanxianAnalysis = async (type) => {
   let properties = props.Getproperties;
 
   // properties['起始外业点号'] = 'I2206PYS1010172';
   // properties['终止外业点号'] = 'I2206PYS1010221';
-  console.log('properties123', properties);
-  console.log('type123', type);
+  console.log("properties123", properties);
+  console.log("type123", type);
   let results = {};
-  bus.emit('removeMapDatas', [key]);
+  bus.emit("removeMapDatas", [key]);
   const methods = {
     up: upStreamAnalyse,
     down: downStreamAnalyse,
     connectivity: connectAnalyse,
     question: upStreamAnalyse,
   }[type];
-  if (!isConnectivity.value && type == 'connectivity') {
+  if (!isConnectivity.value && type == "connectivity") {
     oldConnectivityData.value = properties;
     isConnectivity.value = true;
-    proxy.$modal.msgWarning('请再次选择需要连通性分析的另一条管线或管点进行分析');
-    bus.emit('closedia', [key]);
+    proxy.$modal.msgWarning("请再次选择需要连通性分析的另一条管线或管点进行分析");
+    bus.emit("closedia", [key]);
 
     return;
   } else if (isConnectivity.value) {
     //流通性分析 第二条管网
-    proxy.$modal.msgSuccess('正在进行流通性分析······');
+    proxy.$modal.msgSuccess("正在进行流通性分析······");
 
     isConnectivity.value = false;
     results = await methods({
-      startPointNumber: oldConnectivityData.value['起始外业点号'] || properties['外业点号'],
-      endPointNumber: properties['终止外业点号'] || properties['外业点号'],
+      startPointNumber:
+        oldConnectivityData.value["起始外业点号"] || properties["外业点号"],
+      endPointNumber: properties["终止外业点号"] || properties["外业点号"],
     });
     oldConnectivityData.value = {};
 
     gx_DataFun(results, properties, type);
-    bus.emit('closedia', [key]);
-  } else if (type == 'updown') {
+    bus.emit("closedia", [key]);
+  } else if (type == "updown") {
     let params = {
-      startPointNumber: properties['起始外业点号'] || properties['外业点号'],
-      endPointNumber: properties['终止外业点号'] || properties['外业点号'],
+      startPointNumber: properties["起始外业点号"] || properties["外业点号"],
+      endPointNumber: properties["终止外业点号"] || properties["外业点号"],
     };
-    await upStreamAnalyse(params).then(res => {
-      console.log('上下游1', res);
+    await upStreamAnalyse(params).then((res) => {
+      console.log("上下游1", res);
       gx_DataFun(res, properties, type);
     });
-    await downStreamAnalyse(params).then(res => {
-      console.log('上下游2', res);
+    await downStreamAnalyse(params).then((res) => {
+      console.log("上下游2", res);
       gx_DataFun(res, properties, type);
     });
   } else {
     oldConnectivityData.value = {};
     isConnectivity.value = false;
-    proxy.$modal.msgSuccess('正在分析中······');
+    proxy.$modal.msgSuccess("正在分析中······");
     results = await methods({
-      startPointNumber: properties['起始外业点号'] || properties['外业点号'],
-      endPointNumber: properties['终止外业点号'] || properties['外业点号'],
+      startPointNumber: properties["起始外业点号"] || properties["外业点号"],
+      endPointNumber: properties["终止外业点号"] || properties["外业点号"],
     });
     gx_DataFun(results, properties, type);
   }
@@ -360,37 +466,36 @@
 
 // 管线分析处理方法
 const gx_DataFun = (results, properties, type) => {
-  proxy.$modal.msgSuccess('分析完成！');
+  proxy.$modal.msgSuccess("分析完成！");
 
-  // debugger;
   const properKs = [
-    { key: 'bigCoverSmallFlag', value: '大管套小管' },
-    { key: 'cutOffFlag', value: '断头管' },
-    { key: 'mixFlag', value: '雨污混接' },
-    { key: 'reverseSlopeFlag', value: '管网逆坡' },
+    { key: "bigCoverSmallFlag", value: "大管套小管" },
+    { key: "cutOffFlag", value: "断头管" },
+    { key: "mixFlag", value: "雨污混接" },
+    { key: "reverseSlopeFlag", value: "管网逆坡" },
     // { key: 'flowDirectionWrongFlag', value: '流向错误' },
   ];
   //问题管线
   // errorText(i.properties)
   const questionLinePoints = results.data.pipelineInfoList
-    .filter(i => properKs.map(k => eval(i[k.key])).filter(Boolean)[0])
-    .map(i => ({
+    .filter((i) => properKs.map((k) => eval(i[k.key])).filter(Boolean)[0])
+    .map((i) => ({
       ...turf.center(turf.feature(Terraformer.WKT.parse(i.geometrys))),
       properties: i,
     }))
-    .map(i => ({
+    .map((i) => ({
       ...i,
       properties: {
         ...i.properties,
         name: `${key}:\n${properKs
           .map((k, o) => eval(i.properties[k.key]) && k.value)
           .filter(Boolean)
-          .map((k, o) => o + 1 + '、' + k)
-          .join('\n')}`,
+          .map((k, o) => o + 1 + "、" + k)
+          .join("\n")}`,
         geometrys: Terraformer.WKT.convert(i.geometry),
       },
     }));
-  const siteKey = 'rainwater_pipeline_water_level';
+  /*  const siteKey = 'rainwater_pipeline_water_level';
   results.data.siteList = [
     {
       id: '2',
@@ -512,38 +617,45 @@
         facilityAttrTypeName: '',
       },
     },
-  ];
+  ];*/
   const siteList = (results.data.siteList || [])
-    .filter(i => i.geometry)
-    .map(i =>
+    .filter((i) => i.geometry)
+    .map((i) =>
       turf.feature(Terraformer.WKT.parse(i.geometry), {
         ...i,
-        type: i.pointType + '_' + i.pipeWarn.warnTypeCode,
-        name: [i.pipeWarn.warnTypeName, '持续时间:' + (i.pipeWarn.duration || 0)].join('\n'),
+        type: i.pointType + "_" + i.pipeWarn.warnTypeCode,
+        name: [i.pipeWarn.warnTypeName, "持续时间:" + (i.pipeWarn.duration || 0)].join(
+          "\n"
+        ),
       })
     );
   // const siteList = (results.data.siteList || []).filter(i => i.geometry).map(i => turf.feature(Terraformer.WKT.parse(i.geometry),({...i,type:siteKey,name:[i.name,i.pipeWarn.warnTypeName].concat(i.siteData.monitorPropertyList.map((o,o_idx) => `${o.monitorName}${o.unit}：\t${i.siteData.monitorValueList[o_idx].monitorValue}`)).join('\n')})))
   //上下游管线
   let pipelines = results.data.pipelineInfoList
-    .map(i =>
+    .map((i) =>
       turf.feature(Terraformer.WKT.parse(i.geometrys), {
         ...i,
-        area: i.pipelineType == 'Rain' ? '雨水' : '污水',
+        area: i.pipelineType == "YS" ? "雨水" : "污水",
       })
     )
-    .map(i => (i.properties.flowDirection == 0 ? turf.lineString(turf.getCoords(i).reverse(), i.properties) : i));
+    .map((i) =>
+      i.properties.flowDirection == 1
+        ? turf.lineString(turf.getCoords(i).flat().reverse(), i.properties)
+        : i
+    );
   newfiberMap
     .getLayers()
-    .filter(i => i.newfiberId == '水系流向')[0]
+    .filter((i) => i.newfiberId == "水系流向")[0]
     .getSource()
     .setData(turf.featureCollection(pipelines));
 
-  bus.emit('setGeoJSON', { json: turf.featureCollection(questionLinePoints), key });
-  siteList.length && bus.emit('setGeoJSON', { json: turf.featureCollection(siteList), key: siteKey });
+  bus.emit("setGeoJSON", { json: turf.featureCollection(questionLinePoints), key });
+  siteList.length &&
+    bus.emit("setGeoJSON", { json: turf.featureCollection(siteList), key: siteKey });
 };
 
 onMounted(() => {
-  console.log('props', props);
+  console.log("props", props);
   Distinguishnames();
 });
 </script>
@@ -554,6 +666,7 @@
   height: 100%;
   color: #ccefff;
 }
+
 .items-content {
   width: 100%;
   height: 100%;
@@ -589,9 +702,12 @@
 
     .gxvalue {
       width: calc(90% - 100px);
-      white-space: nowrap; /* 确保文本在一行内显示 */
-      overflow: hidden; /* 隐藏超出容器宽度的文本 */
-      text-overflow: ellipsis; /* 使用省略号表示被截断的文本 */
+      white-space: nowrap;
+      /* 确保文本在一行内显示 */
+      overflow: hidden;
+      /* 隐藏超出容器宽度的文本 */
+      text-overflow: ellipsis;
+      /* 使用省略号表示被截断的文本 */
     }
   }
 }
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/guanwangpoumian.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/guanwangpoumian.vue
index b82b179..56819d2 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/guanwangpoumian.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/guanwangpoumian.vue
@@ -30,13 +30,10 @@
         time:moment(props.Getproperties.daterange[0]).format("YYYY-MM-DD")
       }
       getSectionByWellCodeDetail(params).then(res => {
-        loading.value=false
         if (res && res.code == 200) {
           console.log('res.data', res.data);
           GetpoumianList.value = res.data;
         }
-      },(error)=>{
-        loading.value=false
       });
     }else{
       getSectionByWellCode(wellcode).then(res => {