基础信息调整

frontend/src/api/stll/index.ts

@@ -0,0 +1,49 @@
+import request from '@/utils/request';
+//生态流量达标情况
+export function qgcetQgcStaticData(data: any) {
+  return request({
+    url: '/api/wmp-eng-server/eng/eq/interval/qgc/getQgcStaticData',
+    method: 'post',
+    data
+  });
+}
+//tabs 日
+export function dayGetKendoListCust(data: any) {
+  return request({
+    url: '/api/wmp-eng-server/eng/eq/interval/qgc/day/GetKendoListCust',
+    method: 'post',
+    data
+  });
+}
+//tabs 小时
+export function hourGetKendoListCust(queryParams: any) {
+  return request({
+    url: '/api/wmp-eng-server/eng/eq/interval/qgc/hour/GetKendoListCust',
+    method: 'post',
+    data: queryParams
+  });
+}
+//接入过生态流量数据的电站
+export function evnmAutoMonitorGetKendoListCust(queryParams: any) {
+  return request({
+    url: '/api/dec-lygk-base-server/base/evnmAutoMonitor/GetKendoListCust',
+    method: 'post',
+    data: queryParams
+  });
+}
+//获取电站 
+export function vmsstbprptGetKendoList(queryParams: any) {
+  return request({
+    url: '/api/dec-lygk-base-server/base/vmsstbprpt/GetKendoList',
+    method: 'post',
+    data: queryParams
+  });
+}
+//生态流量达标情况 /api/wmp-eng-server/eng/eq/qecRateCount
+export function eqqecRateCount(queryParams: any) {
+  return request({
+    url: '/api/wmp-eng-server/eng/eq/qecRateCount',
+    method: 'post',
+    data: queryParams
+  });
+}

frontend/src/components/BasicTable/index.vue

@@ -306,9 +306,62 @@ const processData = (records: any[]) => {
   });
 };
 
-// --- 列配置增强（超出隐藏 + Tooltip + 插槽兼容）---
+// --- 处理自定义单元格（用于行合并）---
+const createMergeCellHandler = (dataIndex: string) => {
+  return (record: any, index: number) => {
+    const currentValue = record[dataIndex];
+    
+    // 检查当前行是否是该值的起始行
+    let isStartRow = true;
+    if (index > 0) {
+      const previousValue = tableData.value[index - 1]?.[dataIndex];
+      if (previousValue === currentValue) {
+        isStartRow = false;
+      }
+    }
+    
+    if (!isStartRow) {
+      // 不是起始行，设置 rowSpan 为 0（隐藏该单元格）
+      return { rowSpan: 0 };
+    } else {
+      // 是起始行，计算需要跨越的行数
+      let rowSpan = 1;
+      for (let i = index + 1; i < tableData.value.length; i++) {
+        if (tableData.value[i][dataIndex] === currentValue) {
+          rowSpan++;
+        } else {
+          break;
+        }
+      }
+      
+      return rowSpan > 1 ? { rowSpan } : {};
+    }
+  };
+};
+
+// --- 列配置增强（超出隐藏 + Tooltip + 插槽兼容 + 行合并）---
 const enhancedColumns = computed(() => {
   return props.columns.map(col => {
+    // 处理 merge 配置
+    if (col.merge && col.dataIndex) {
+      const baseCol = {
+        ...col,
+        customCell: createMergeCellHandler(col.dataIndex)
+      };
+      
+      // 如果有 slots.customRender，移除 slots
+      if (baseCol.slots?.customRender) {
+        const { slots, ...restCol } = baseCol;
+        return {
+          ...restCol,
+          _slotName: slots.customRender,
+          ...(props.enableEllipsis ? { ellipsis: true } : {})
+        };
+      }
+      
+      return baseCol;
+    }
+    
     // 如果有 slots.customRender，移除 slots（由 bodyCell 处理），保留 dataIndex 用于匹配
     if (col.slots?.customRender) {
       const { slots, ...restCol } = col;
@@ -384,4 +437,13 @@ watch(
 );
 </script>
 
-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+// 优化合并单元格的边框样式
+::v-deep(.ant-table-cell) {
+  vertical-align: middle;
+}
+
+::v-deep(.ant-table-tbody > tr > td) {
+  border-bottom: 1px solid #f0f0f0;
+}
+</style>

frontend/src/components/MapModal/column.config.ts

@@ -1471,6 +1471,760 @@ const FPPointColumns: Array<any> = [
     url: ''
   }
 ];
+const FPPointColumns1: Array<any> = [
+  {
+    name: '基本属性',
+    visible: false,
+    ruleTips: '',
+    type: '',
+    url: ''
+  },
+  {
+    name: '设施名称',
+    filed: 'stnm',
+    visible: true,
+    type: 'input',
+    url: ''
+  },
+  {
+    name: '设施类型',
+    filed: 'sttpName',
+    visible: true,
+    type: 'select',
+    url: ''
+  },
+  {
+    name: '地址',
+    filed: 'addvcdName',
+    visible: true,
+    type: 'input',
+    url: ''
+  },
+  {
+    name: '所属流域',
+    filed: 'hbrvcdName',
+    visible: true,
+    type: 'select',
+    url: ''
+  },
+  {
+    name: '经度(°)',
+    filed: 'lgtd',
+    visible: true,
+    type: 'number',
+    toFixed: 6,
+    url: ''
+  },
+  {
+    name: '纬度(°)',
+    filed: 'lttd',
+    visible: true,
+    type: 'number',
+    toFixed: 6,
+    url: ''
+  },
+
+  {
+    name: '开工日期',
+    filed: 'ststdt',
+    visible: true,
+    type: 'date',
+    format: 'YYYY-MM-DD',
+    url: ''
+  },
+  {
+    name: '建成日期',
+    filed: 'jcdt',
+    visible: true,
+    type: 'date',
+    format: 'YYYY-MM-DD',
+    url: ''
+  },
+  {
+    name: '鱼道',
+    visible: false,
+    ruleTips: '',
+    type: '',
+    url: ''
+  },
+  {
+    name: '鱼道型式',
+    filed: 'ydxs',
+    visible: true,
+    type: 'input',
+    url: ''
+  },
+  {
+    name: '位置',
+    filed: 'stlc',
+    visible: true,
+    type: 'select',
+    url: ''
+  },
+  {
+    name: '总长度(m)',
+    filed: 'ydzcd',
+    visible: true,
+    type: 'number',
+    url: '',
+    toFixed: 1
+  },
+  {
+    name: '进口运行设计水位(m)',
+    filed: 'ydjkz',
+    visible: true,
+    type: 'number',
+    url: '',
+    toFixed: 2
+  },
+  {
+    name: '进口数量(个)',
+    filed: 'ydjkcnt',
+    visible: true,
+    type: 'number',
+    url: '',
+    toFixed: 0
+  },
+  {
+    name: '进口底板高程(m)',
+    filed: 'ydjkhg',
+    visible: true,
+    type: 'number',
+    url: '',
+    toFixed: 2
+  },
+  {
+    name: '进口诱鱼型式',
+    filed: 'ydyyxs',
+    visible: true,
+    type: 'select',
+    url: ''
+  },
+  {
+    name: '出口运行设计水位(m)',
+    filed: 'outdsgnz',
+    visible: true,
+    type: 'number',
+    toFixed: 0,
+    url: ''
+  },
+  {
+    name: '出口数量(个)',
+    filed: 'outcnt',
+    visible: true,
+    type: 'number',
+    toFixed: 0,
+    url: ''
+  },
+  {
+    name: '出口底板高程(m)',
+    filed: 'wschgc',
+    visible: true,
+    type: 'number',
+    toFixed: 1,
+    url: ''
+  },
+  {
+    name: '池室设计流速(m/s)',
+    filed: 'ydcsv',
+    visible: true,
+    type: 'number',
+    toFixed: 1,
+    url: ''
+  },
+  {
+    name: '每级池室长(m)',
+    filed: 'ydcscd',
+    visible: true,
+    type: 'number',
+    toFixed: 0,
+    url: ''
+  },
+  {
+    name: '每级池室宽(m)',
+    filed: 'ydcskd',
+    visible: true,
+    type: 'select',
+    url: ''
+  },
+  {
+    name: '池室坡度',
+    filed: 'ydcspd',
+    visible: true,
+    type: 'number',
+    toFixed: 0,
+    url: ''
+  },
+  {
+    name: '池室数量(个)',
+    filed: 'ydcscnt',
+    visible: true,
+    type: 'number',
+    toFixed: 0,
+    url: ''
+  },
+  {
+    name: '过鱼对象',
+    filed: 'psfishtyp',
+    visible: true,
+    type: 'select',
+    url: ''
+  },
+  {
+    name: '过鱼规模(尾)',
+    filed: 'psfishcnt',
+    visible: true,
+    type: 'select',
+    url: ''
+  },
+  {
+    name: '过鱼时间',
+    filed: 'psfishtm',
+    visible: true,
+    type: 'select',
+    url: ''
+  },
+  {
+    name: '建成时间',
+    filed: 'jcdt',
+    visible: true,
+    type: 'date',
+    format: 'YYYY-MM-DD',
+    url: ''
+  },
+  {
+    name: '投资(亿元)',
+    filed: 'inv',
+    visible: true,
+    type: 'number',
+    url: ''
+  },
+  {
+    name: '休息池个数',
+    filed: 'restplcnt',
+    visible: true,
+    type: 'number',
+    toFixed: 0,
+    url: ''
+  },
+  {
+    name: '诱鱼口流速(m/s)',
+    filed: 'ydcsv',
+    visible: true,
+    type: 'number',
+    toFixed: 1,
+    url: ''
+  },
+  {
+    name: '主要过鱼月份（多个月份用,隔开）',
+    filed: 'fpssmnmon',
+    visible: true,
+    type: 'select',
+    url: ''
+  },
+  {
+    name: '数据监测频次',
+    filed: 'dtfrqcy',
+    visible: true,
+    type: 'select',
+    url: ''
+  }
+];
+const FPPointColumns2: Array<any> = [
+  {
+    name: '基本属性',
+    visible: false,
+    ruleTips: '',
+    type: '',
+    url: ''
+  },
+  {
+    name: '设施名称',
+    filed: 'stnm',
+    visible: true,
+    type: 'input',
+    url: ''
+  },
+  {
+    name: '设施类型',
+    filed: 'sttpName',
+    visible: true,
+    type: 'select',
+    url: ''
+  },
+  {
+    name: '地址',
+    filed: 'addvcdName',
+    visible: true,
+    type: 'input',
+    url: ''
+  },
+  {
+    name: '所属流域',
+    filed: 'hbrvcdName',
+    visible: true,
+    type: 'select',
+    url: ''
+  },
+  {
+    name: '经度(°)',
+    filed: 'lgtd',
+    visible: true,
+    type: 'number',
+    toFixed: 6,
+    url: ''
+  },
+  {
+    name: '纬度(°)',
+    filed: 'lttd',
+    visible: true,
+    type: 'number',
+    toFixed: 6,
+    url: ''
+  },
+
+  {
+    name: '开工日期',
+    filed: 'ststdt',
+    visible: true,
+    type: 'date',
+    format: 'YYYY-MM-DD',
+    url: ''
+  },
+  {
+    name: '建成日期',
+    filed: 'jcdt',
+    visible: true,
+    type: 'date',
+    format: 'YYYY-MM-DD',
+    url: ''
+  },
+  {
+    name: '仿自然通道',
+    visible: false,
+    ruleTips: '',
+    type: '',
+    url: ''
+  },
+  {
+    name: '位置',
+    filed: 'stlc',
+    visible: true,
+    type: 'input',
+    url: ''
+  },
+  {
+    name: '通道断面形状',
+    filed: 'fzrdmxz',
+    visible: true,
+    type: 'select',
+    url: ''
+  },
+  {
+    name: '通道长度*宽度(m)',
+    filed: 'fzrtdsz',
+    visible: true,
+    type: 'number',
+    url: ''
+  },
+  {
+    name: '运行水深(m)',
+    filed: 'fzryxwdp',
+    visible: true,
+    type: 'number',
+    url: ''
+  },
+  {
+    name: '坡降',
+    filed: 'fzrpj',
+    visible: true,
+    type: 'number',
+    url: ''
+  },
+  {
+    name: '流速(m/s)',
+    filed: 'fzrv',
+    visible: true,
+    type: 'number',
+    url: ''
+  },
+  {
+    name: '进口高程(m)',
+    filed: 'fzrjkhg',
+    visible: true,
+    type: 'number',
+    url: ''
+  },
+  {
+    name: '出口高程(m)',
+    filed: 'outelev',
+    visible: true,
+    type: 'number',
+    url: ''
+  },
+  {
+    name: '过鱼对象',
+    filed: 'psfishtyp',
+    visible: true,
+    type: 'input',
+    url: ''
+  },
+  {
+    name: '过鱼规模(尾)',
+    filed: 'psfishcnt',
+    visible: true,
+    type: 'number',
+    url: ''
+  },
+  {
+    name: '过鱼对象',
+    filed: 'psfishtyp',
+    visible: true,
+    type: 'input',
+    url: ''
+  },
+  {
+    name: '过鱼规模(尾)',
+    filed: 'psfishcnt',
+    visible: true,
+    type: 'input',
+    url: ''
+  },
+  {
+    name: '过鱼时间',
+    filed: 'psfishtm',
+    visible: true,
+    type: 'select',
+    url: ''
+  },
+  {
+    name: '建成时间',
+    filed: 'jcdt',
+    visible: true,
+    type: 'date',
+    format: 'YYYY-MM-DD',
+    url: ''
+  },
+  {
+    name: '投资(亿元)',
+    filed: 'inv',
+    visible: true,
+    type: 'number',
+    url: ''
+  },
+  {
+    name: '运行时间',
+    filed: 'runtm',
+    visible: true,
+    type: 'date',
+    format: 'YYYY-MM-DD',
+    url: ''
+  },
+  {
+    name: '主要过鱼月份（多个月份用,隔开）',
+    filed: 'fpssmnmon',
+    visible: true,
+    type: 'select',
+    url: ''
+  },
+  {
+    name: '数据监测频次',
+    filed: 'dtfrqcy',
+    visible: true,
+    type: 'select',
+    url: ''
+  }
+];
+const FPPointColumns4: Array<any> = [
+  {
+    name: '基本属性',
+    visible: false,
+    ruleTips: '',
+    type: '',
+    url: ''
+  },
+  {
+    name: '设施名称',
+    filed: 'stnm',
+    visible: true,
+    type: 'input',
+    url: ''
+  },
+  {
+    name: '设施类型',
+    filed: 'sttpName',
+    visible: true,
+    type: 'select',
+    url: ''
+  },
+  {
+    name: '地址',
+    filed: 'addvcdName',
+    visible: true,
+    type: 'input',
+    url: ''
+  },
+  {
+    name: '所属流域',
+    filed: 'hbrvcdName',
+    visible: true,
+    type: 'select',
+    url: ''
+  },
+  {
+    name: '经度(°)',
+    filed: 'lgtd',
+    visible: true,
+    type: 'number',
+    toFixed: 6,
+    url: ''
+  },
+  {
+    name: '纬度(°)',
+    filed: 'lttd',
+    visible: true,
+    type: 'number',
+    toFixed: 6,
+    url: ''
+  },
+
+  {
+    name: '开工日期',
+    filed: 'ststdt',
+    visible: true,
+    type: 'date',
+    format: 'YYYY-MM-DD',
+    url: ''
+  },
+  {
+    name: '建成日期',
+    filed: 'jcdt',
+    visible: true,
+    type: 'date',
+    format: 'YYYY-MM-DD',
+    url: ''
+  },
+  {
+    name: '升鱼机',
+    visible: false,
+    ruleTips: '',
+    type: '',
+    url: ''
+  },
+ {
+    name: '上游码头位置',
+    filed: 'updcklc',
+    visible: true,
+    type: 'input',
+    url: ''
+  },
+  {
+    name: '上游码头型式',
+    filed: 'updcktp',
+    visible: true,
+    type: 'select',
+    url: ''
+  },
+  {
+    name: '下游码头位置',
+    filed: 'downdcklc',
+    visible: true,
+    type: 'input',
+    url: ''
+  },
+  {
+    name: '下游码头型式',
+    filed: 'downdcktp',
+    visible: true,
+    type: 'select',
+    url: ''
+  },
+  {
+    name: '集鱼槽数量(个)',
+    filed: 'syjcnt',
+    visible: true,
+    type: 'number',
+    url: ''
+  },
+  {
+    name: '集鱼槽进口高程(m)',
+    filed: 'syjhg',
+    visible: true,
+    type: 'number',
+    url: ''
+  },
+  {
+    name: '集鱼槽流量(m³/s)',
+    filed: 'syjq',
+    visible: true,
+    type: 'number',
+    url: ''
+  },
+  {
+    name: '断面尺寸（长*宽*高）(m)',
+    filed: 'syjsz',
+    visible: true,
+    type: 'number',
+    url: ''
+  },
+  {
+    name: '集鱼槽水深(m)',
+    filed: 'syjwdp',
+    visible: true,
+    type: 'number',
+    url: ''
+  },
+  {
+    name: '运鱼设施方式',
+    filed: 'jyyyyfs',
+    visible: true,
+    type: 'select',
+    url: ''
+  },
+  {
+    name: '过鱼对象',
+    filed: 'psfishtyp',
+    visible: true,
+    type: 'input',
+    url: ''
+  },
+  {
+    name: '过鱼规模(尾)',
+    filed: 'psfishcnt',
+    visible: true,
+    type: 'input',
+    url: ''
+  },
+    {
+    name: '过鱼时间',
+    filed: 'psfishtm',
+    visible: true,
+    type: 'select',
+    url: ''
+  },
+ {
+    name: '建成时间',
+    filed: 'jcdt',
+    visible: true,
+    type: 'date',
+    format: 'YYYY-MM-DD',
+    url: ''
+  },
+  {
+    name: '投资(亿元)',
+    filed: 'inv',
+    visible: true,
+    type: 'number',
+    url: ''
+  },
+  {
+    name: '运行时间',
+    filed: 'runtm',
+    visible: true,
+    type: 'date',
+    format: 'YYYY-MM-DD',
+    url: ''
+  },
+  {
+    name: '集诱鱼方式',
+    filed: 'syjjyyfs',
+    visible: true,
+    type: 'input',
+    url: ''
+  },
+  {
+    name: '主要过鱼月份（多个月份用,隔开）',
+    filed: 'fpssmnmon',
+    visible: true,
+    type: 'select',
+    url: ''
+  },
+  {
+    name: '数据监测频次',
+    filed: 'dtfrqcy',
+    visible: true,
+    type: 'select',
+    url: ''
+  },
+  {
+    name: '',
+    filed: '',
+    visible: true,
+    type: '',
+    url: ''
+  }
+];
+const FPPointColumns5: Array<any> = [
+  {
+    name: '基本属性',
+    visible: false,
+    ruleTips: '',
+    type: '',
+    url: ''
+  },
+  {
+    name: '设施名称',
+    filed: 'stnm',
+    visible: true,
+    type: 'input',
+    url: ''
+  },
+  {
+    name: '设施类型',
+    filed: 'sttpName',
+    visible: true,
+    type: 'select',
+    url: ''
+  },
+  {
+    name: '地址',
+    filed: 'addvcdName',
+    visible: true,
+    type: 'input',
+    url: ''
+  },
+  {
+    name: '所属流域',
+    filed: 'hbrvcdName',
+    visible: true,
+    type: 'select',
+    url: ''
+  },
+  {
+    name: '经度(°)',
+    filed: 'lgtd',
+    visible: true,
+    type: 'number',
+    toFixed: 6,
+    url: ''
+  },
+  {
+    name: '纬度(°)',
+    filed: 'lttd',
+    visible: true,
+    type: 'number',
+    toFixed: 6,
+    url: ''
+  },
+
+  {
+    name: '开工日期',
+    filed: 'ststdt',
+    visible: true,
+    type: 'date',
+    format: 'YYYY-MM-DD',
+    url: ''
+  },
+  {
+    name: '建成日期',
+    filed: 'jcdt',
+    visible: true,
+    type: 'date',
+    format: 'YYYY-MM-DD',
+    url: ''
+  },
+  
+];
 //鱼类增殖站 基础信息
 const FBPointColumns: Array<any> = [
   {
@@ -3416,6 +4170,10 @@ export {
   FhPointColumns,
   FhZQPointColumns,
   FPPointColumns,
+  FPPointColumns1,
+  FPPointColumns2,
+  FPPointColumns4,
+  FPPointColumns5,
   FBPointColumns,
   VaPointColumns,
   VPPointColumns,

frontend/src/components/MapModal/components/BasicInfo.vue

@@ -121,6 +121,10 @@ import {
   FhPointColumns,
   FhZQPointColumns,
   FPPointColumns,
+  FPPointColumns1,
+  FPPointColumns2,
+  FPPointColumns4,
+  FPPointColumns5,
   FBPointColumns,
   VaPointColumns,
   VPPointColumns,
@@ -158,6 +162,10 @@ const columnsConfig = ref([
   {
     type: 'ENG',
     columns: BasicColumns
+  },
+    {
+    type: 'ENG_ALARM',
+    columns: BasicColumns
   },
   {
     type: 'WT',
@@ -193,11 +201,11 @@ const columnsConfig = ref([
   },
   {
     type: 'FP_1',
-    columns: FPPointColumns
+    columns: FPPointColumns1
   },
   {
     type: 'FP_2',
-    columns: FPPointColumns
+    columns: FPPointColumns2
   },
   {
     type: 'FP_3',
@@ -205,34 +213,34 @@ const columnsConfig = ref([
   },
   {
     type: 'FP_4',
-    columns: FPPointColumns
+    columns: FPPointColumns4
   },
   {
     type: 'FP_5',
-    columns: FPPointColumns
+    columns: FPPointColumns5
   },
   {
-    type: 'fb_point',
+    type: 'FB',
     columns: FBPointColumns
   },
   {
-    type: 'va_point',
+    type: 'VA',
     columns: VaPointColumns
   },
   {
-    type: 'vp_point',
+    type: 'VP',
     columns: VPPointColumns
   },
   {
-    type: 'we_point',
+    type: 'WE',
     columns: wePointColumns
   },
   {
-    type: 'wa_point',
+    type: 'WVA',
     columns: waPointColumns
   },
   {
-    type: 'stinfo_ai_video_point',
+    type: 'VD_FBFM',
     columns: StinfoAiVidoPointColumns
   },
   {
@@ -240,7 +248,7 @@ const columnsConfig = ref([
     columns: BasicColumns
   },
   {
-    type: 'fprd_point',
+    type: 'FPRD',
     columns: StinfoAiVidoPointColumns
   },
   {

frontend/src/components/MapModal/index.vue

@@ -382,6 +382,9 @@ watch(
     let params = newVal;
     if (['VD', 'WTRV', 'ZQ', 'WQ'].includes(params?.sttpCode)) {
       params.sttp = params.sttpCode;
+    }else
+    if (['ENG_ALARM'].includes(params?.sttpMap)) {
+      params.sttp = params.sttpMap;
     }
     tabsConfig.value = handleTabs({ ...params });
     let value = tabsConfig.value.find((item: any) => item.default);

frontend/src/components/MapModal/setting.config.ts

@@ -323,24 +323,25 @@ const FPTabs: Array<any> =
       name: '在线监测数据',
       key: 'FishFacilityMonitorData', //Normal
       type: 'FishFacilityMonitorData', //Normal
-      code: 'gyss.tabs.jcsj'
+      code: 'gyss.tabs.jcsj',
-      // tabs: [
+      // 默认显示
-      //     {
+      tabs: [
-      //         name: '',
+        {
-      //         type: 'table',
+          name: '',
-      //         tableUrl: getUrl('/wmp-env-server/env/fp/fpssTable/GetKendoListCust'),
+          type: 'table',
-      //         hiddenChart: true,
+          tableUrl: '/wmp-env-server/env/fp/fpssTable/GetKendoListCust',
-      //         hiddenTabs: true,
+          hiddenChart: true,
+          hiddenTabs: true
           // filter: NormalDatePickerFilter
-      //     }
+        }
-      // ]
+      ]
     },
     {
       name: '运行情况',
       key: 'FishFacilityRunState', //Normal1
       type: 'FishFacilityRunState', //Normal
       code: 'gyss.tabs.yxqk',
-      default: true // 默认显示
+      default: true
       // tabs: [
       //     {
       //         name: '',
@@ -452,14 +453,14 @@ const FBTabs: Array<any> = [
         }
       }
     ]
-  },
-  {
-    name: '实时视频',
-    key: 'videoInfo',
-    type: 'video',
-    url: '/video/dataStcdFrame/getVideoMonitorList'
   }
   // {
+  //   name: '实时视频',
+  //   key: 'videoInfo',
+  //   type: 'video',
+  //   url: '/video/dataStcdFrame/getVideoMonitorList'
+  // }
+  // {
   //     name: "全景影像",
   //     key: "panoramaInfo",
   //     type: "panorama"
@@ -794,7 +795,7 @@ const DZGJ: Array<any> = [
     name: '基础信息',
     key: 'basicInfo',
     type: 'basic',
-    url: '/bbi/siteBipc/getSiteBasicInfo',
+    url: '/api/dec-lygk-base-server/base/msstbprpt/getStcdInfo',
     default: true // 默认显示
   },
   {
@@ -1112,21 +1113,21 @@ const handleTabs = (modaldata: any) => {
       return FLOWTabs;
     case 'FP_POINT':
       return FPTabs;
-    case 'FB_POINT':
+    case 'FB':
       return FBTabs;
-    case 'VA_POINT':
+    case 'VA':
       return VATabs;
-    case 'VP_POINT':
+    case 'VP':
       return VPTabs;
-    case 'WE_POINT':
+    case 'WE':
       return WETabs;
-    case 'WA_POINT':
+    case 'WVA':
       return WATabs;
-    case 'STINFO_AI_VIDEO_POINT':
+    case 'VD_FBFM':
       return videoTabs;
     case 'ENG_ALARM_POINT':
       return DZGJ;
-    case 'FPRD_POINT':
+    case 'FPRD':
       return DEVICETABS;
       // case 'DW_POINT':
       //   return DWTabs;
@@ -1148,8 +1149,8 @@ const handleTabs = (modaldata: any) => {
     //  else {
     //     return Session.getAppCode() === 'hbb' ? ENGTabs.filter((e) => e.name !== '阶段属性') : ENGTabs
     // }
-    //     case 'ENG_ALARM':
+    case 'ENG_ALARM':
-    //         return DZGJ
+      return DZGJ;
     //     case 'EQ':
     //         return EQTabs
     case 'DW':
@@ -1159,8 +1160,10 @@ const handleTabs = (modaldata: any) => {
     case 'DW_4':
     case 'DW_5':
       return DWTabs;
-    case 'FP': //todo，后续再删除多余代码
     case 'FP_1': //todo，后续再删除多余代码
+      return FPTabs.filter(item => item.name !== '在线监测数据');
+    case 'FP': //todo，后续再删除多余代码
+
     // case "FP_2":   //todo，后续再删除多余代码
     case 'FP_3': //todo，后续再删除多余代码
     case 'FP_4': //todo，后续再删除多余代码
@@ -1171,7 +1174,8 @@ const handleTabs = (modaldata: any) => {
         modaldata.bldsttCcode == '1' ||
         modaldata.bldsttCcode == '0' ||
         modaldata.bldstt == '1' ||
-        modaldata.bldstt == '0'
+        modaldata.bldstt == '0' ||
+        modaldata.bldstt == '2'
       ) {
         return [
           ...FPTabs1 //建设情况

frontend/src/components/SidePanelItem/index.vue

@@ -20,6 +20,15 @@
                         <span :class="iconmap.icon"></span>
                     </a-tooltip>
                 </span>
+                <!-- 新增的 clickAction 插槽区域 -->
+                <span v-if="clickAction.show" class="title_icon">
+                    <a-tooltip placement="top" trigger="click" :get-popup-container="getPopupContainer">
+                        <template #title>
+                            <slot name="click-action-content"></slot>
+                        </template>
+                        <InfoCircleOutlined />
+                    </a-tooltip>
+                </span>
             </div>
             <div class="title_right">
                 <div v-if="select.show">
@@ -133,6 +142,12 @@ const props = defineProps({
             icon: 'iconfont icon-time',
         })
     },
+    clickAction: { // 新增：用于控制带交互的提示插槽
+        type: Object as () => { show: boolean },
+        default: () => ({
+            show: false
+        })
+    },
     select: { // 选择框
         type: Object as () => SelectConfig,
         default: () => ({

frontend/src/modules/guoyujiance/components/FPVDDetailMD.vue

@@ -63,7 +63,7 @@ const customTransform = (res: any) => {
 // 查看详情
 const handleViewDetail = (record: any) => {
     modelStore.modalVisible = true;
-    modelStore.params.sttp = "stinfo_ai_video_point";
+    modelStore.params.sttp = "VD_FBFM";
     modelStore.title = record.stnm + "详情信息";
     modelStore.params.stcd = record.stcd;
 }

frontend/src/modules/qixidibaohugongzuokaizhanQK/qixidiheduanjianceqingkuangEJ/index.vue

@@ -368,7 +368,7 @@ const handleViewDetail = (record: any, type: any) => {
       modelStore.params.stcd = record.stcd;
     } else if (tabIndex.value == 'VD') {
       modelStore.modalVisible = true;
-      modelStore.params.sttp = 'stinfo_ai_video_point';
+      modelStore.params.sttp = 'VD_FBFM';
       modelStore.title = '视频监控站详情信息';
       modelStore.isBasicEdit = true;
       modelStore.params.stcd = record.stcd;

frontend/src/store/modules/model.ts

@@ -16,13 +16,16 @@ export const useModelStore = defineStore('model', () => {
     date: any;
     show: any;
     enfc:any;
+    eqtp:any;
   }>({
     sttp: 'eng',
     stcd: '',
     date: '',
     show: true,
     enfc:'0',
+    eqtp:''
   });
+  const filterStll= ref('')
   return {
     params,
     modalVisible,
@@ -31,6 +34,7 @@ export const useModelStore = defineStore('model', () => {
     title,
     isBasicEdit,
     showStcdSelector,  // 新增
-    stcdOptions        // 新增
+    stcdOptions,        // 新增
+    filterStll,
   };
 });

frontend/src/utils/request.ts

@@ -33,7 +33,7 @@ service.interceptors.request.use(
       config.headers._sysid = '10EC2E0B-AEA9-4757-83A2-201BA1BC54E9';
 
       config.headers.authorization =
-        'bearer f6ce5036-cefe-487b-b731-b6d7b8922e0f';
+        'bearer aa5be16b-d1a3-4b93-9886-b2490025c7d6';
       config.baseURL = '/';
     } else {
       const user = useUserStoreHook();

frontend/src/views/home/shuiDianKaiFaZhuangKuang.vue

@@ -63,38 +63,38 @@ const showMapModal5 = () => {
 };
 const showMapModal6 = () => {
   modelStore.modalVisible = true;
-  modelStore.params.sttp = "fb_point";
+  modelStore.params.sttp = "FB";
   modelStore.title = "鱼类增殖站 详情信息";
   modelStore.isBasicEdit = true;
 };
 //
 const showMapModal7 = () => {
   modelStore.modalVisible = true;
-  modelStore.params.sttp = "va_point";
+  modelStore.params.sttp = "VA";
   modelStore.title = "动物救助站 详情信息";
   modelStore.isBasicEdit = true;
 };
 const showMapModal8 = () => {
   modelStore.modalVisible = true;
-  modelStore.params.sttp = "vp_point";
+  modelStore.params.sttp = "VP";
   modelStore.title = "珍稀植物园 详情信息";
   modelStore.isBasicEdit = true;
 };
 const showMapModal9 = () => {
   modelStore.modalVisible = true;
-  modelStore.params.sttp = "we_point";
+  modelStore.params.sttp = "WE";
   modelStore.title = "水生生态调查断面 详情信息";
   modelStore.isBasicEdit = true;
 };
 const showMapModal10 = () => {
   modelStore.modalVisible = true;
-  modelStore.params.sttp = "wa_point";
+  modelStore.params.sttp = "WVA";
   modelStore.title = "野生动物监测 详情信息";
   modelStore.isBasicEdit = true;
 };
 const showMapModal11 = () => {
   modelStore.modalVisible = true;
-  modelStore.params.sttp = "stinfo_ai_video_point";
+  modelStore.params.sttp = "VD_FBFM";
   modelStore.title = "AI视频监控站 详情信息";
   modelStore.isBasicEdit = true;
 };
@@ -106,7 +106,7 @@ const showMapModal12 = () => {
 };
 const showMapModal13 = () => {
   modelStore.modalVisible = true;
-  modelStore.params.sttp = "fprd_point";
+  modelStore.params.sttp = "FPRD";
   modelStore.title = "鱼类调查装置 详情信息";
   modelStore.isBasicEdit = true;
 };