diff --git a/frontend/src/components/MapModal/components/BasicInfo.vue b/frontend/src/components/MapModal/components/BasicInfo.vue index 2f359d46..f0183e14 100644 --- a/frontend/src/components/MapModal/components/BasicInfo.vue +++ b/frontend/src/components/MapModal/components/BasicInfo.vue @@ -152,15 +152,23 @@ const columnsConfig = ref([ columns: BasicColumns }, { - type: 'wt_point', + type: 'WT', + columns: wtPointColumns + }, + { + type: 'WTRV', columns: wtPointColumns }, { - type: 'fh_wq_point', + type: 'WQFB', + columns: FhWpPointColumns + }, + { + type: 'WQ', columns: FhWpPointColumns }, { - type: 'fh_point', + type: 'FH', columns: FhPointColumns }, { @@ -204,7 +212,7 @@ const columnsConfig = ref([ columns: StinfoAiVidoPointColumns }, { - type: 'dw_point', + type: 'DW_2', columns: DwPointColumns }, { diff --git a/frontend/src/components/MapModal/components/WaterTemperatureRep.vue b/frontend/src/components/MapModal/components/WaterTemperatureRep.vue index e4d99557..63fca633 100644 --- a/frontend/src/components/MapModal/components/WaterTemperatureRep.vue +++ b/frontend/src/components/MapModal/components/WaterTemperatureRep.vue @@ -37,16 +37,16 @@ diff --git a/frontend/src/components/MapModal/setting.config.ts b/frontend/src/components/MapModal/setting.config.ts index 5ea8234c..5662b413 100644 --- a/frontend/src/components/MapModal/setting.config.ts +++ b/frontend/src/components/MapModal/setting.config.ts @@ -309,7 +309,7 @@ const FPTabs: Array = name: '基础信息', key: 'basicInfo', type: 'basic', - url: '/api/dec-lygk-base-server/base/msstbprpt/getStcdInfo', + url: '/api/dec-lygk-base-server/base/msstbprpt/getStcdInfo' // code: 'gyss.tabs.jcxx' }, // { @@ -683,15 +683,15 @@ const WQFBTabs: Array = [ url: '/video/dataStcdFrame/getVideoMonitorList' } ]; -// const WQTabs: Array = [ -// ...WQFBTabs, -// { -// name: '实时视频', -// key: 'videoInfo', -// type: 'video', -// url: '/video/dataStcdFrame/getVideoMonitorList' -// } -// ] +const WQTabs: Array = [ + ...WQFBTabs, + { + name: '实时视频', + key: 'videoInfo', + type: 'video', + url: '/video/dataStcdFrame/getVideoMonitorList' + } +]; // const WQDTATabs: Array = [ // { // name: '基础信息', @@ -758,20 +758,21 @@ const WTTabs: Array = [ code: 'swjc.tabs.ylfzsyxfx' } ]; -// //垂向水温 √ -// const WTTabs1: Array = [ -// { -// name: '基础信息', -// key: 'basicInfo', -// type: 'basic', -// url: '/bbi/siteBipc/getSiteBasicInfo' -// }, -// { -// name: '监测数据', -// key: 'VerticalWaterTemperature', -// type: 'VerticalWaterTemperature' -// } -// ] +//垂向水温 √ +const WTTabs1: Array = [ + { + name: '基础信息', + key: 'basicInfo', + type: 'basic', + url: '/api/dec-lygk-base-server/base/msstbprpt/getStcdInfo' + }, + { + name: '监测数据', + key: 'VerticalWaterTemperature', + type: 'VerticalWaterTemperature', + default: true // 默认显示 + } +]; // //低温水减缓设施 const DWTabs: Array = [ @@ -1026,7 +1027,7 @@ const videoTabs: Array = [ key: 'basicInfo', type: 'basic', url: '/api/dec-lygk-base-server/base/msstbprpt/getStcdInfo', - default: true, // 默认显示 + default: true // 默认显示 }, { name: '实时视频', @@ -1209,17 +1210,22 @@ const handleTabs = (modaldata: any) => { } else { return ENGTabs; } - case 'WT_POINT': - return WTTabs; - case 'FH_WQ_POINT': - return WQFBTabs; - case 'FH_POINT': - if (modaldata.show) { - return FHTabs; + case 'WT': + case 'WTRV': + if (modaldata.enfc == '1') { + return WTTabs1; } else { - let FHTabsTwo = FHTabs.slice(0, 1); - return FHTabsTwo; + return WTTabs; } + case 'WQFB': + return WQFBTabs; + case 'WQ': + const _tabs = [...WQTabs]; + if (modaldata?.dtinType == 2 || modaldata?.dtinType == 1) + _tabs.splice(2, 1); //国家站 人工站把视频tab去除 + return _tabs; + case 'FH': + return FHTabs; case 'FH_ZQ_POINT': return FLOWTabs; case 'FP_POINT': @@ -1240,14 +1246,14 @@ const handleTabs = (modaldata: any) => { return DZGJ; case 'FPRD_POINT': return DEVICETABS; - case 'DW_POINT': - return DWTabs; - case 'DW_5': - return DEVICETABS; - case 'DW_6': - return DEVICETABS; - case 'DW_1': - return DEVICETABS; + // case 'DW_POINT': + // return DWTabs; + // case 'DW_5': + // return DEVICETABS; + // case 'DW_6': + // return DEVICETABS; + // case 'DW_1': + // return DEVICETABS; // if (modaldata?.eqtp == 'QEC') { // const { page } = Utility.parseQueryString() @@ -1264,13 +1270,13 @@ const handleTabs = (modaldata: any) => { // return DZGJ // case 'EQ': // return EQTabs - // case 'DW': - // case 'DW_1': - // case 'DW_2': - // case 'DW_3': - // case 'DW_4': - // case 'DW_5': - // return DWTabs + case 'DW': + case 'DW_1': + case 'DW_2': + case 'DW_3': + case 'DW_4': + case 'DW_5': + return DWTabs; // case 'FP': //todo,后续再删除多余代码 // case 'FP_1': //todo,后续再删除多余代码 // // case "FP_2": //todo,后续再删除多余代码 @@ -1364,12 +1370,7 @@ const handleTabs = (modaldata: any) => { // return VPTabs // case 'VA': // return VATabs - // case 'WQFB': - // return WQFBTabs - // case 'WQ': - // const _tabs = [...WQTabs] - // if (modaldata?.dtinType == 2 || modaldata?.dtinType == 1) _tabs.splice(2, 1)//国家站 人工站把视频tab去除 - // return _tabs + // case 'WQDTA': // return WQDTATabs // case 'LL': diff --git a/frontend/src/modules/EnvironmentalQuality/TwoLayers/EnvironmentalQualityTwoLayers.vue b/frontend/src/modules/EnvironmentalQuality/TwoLayers/EnvironmentalQualityTwoLayers.vue index 9457f9d4..7174a72e 100644 --- a/frontend/src/modules/EnvironmentalQuality/TwoLayers/EnvironmentalQualityTwoLayers.vue +++ b/frontend/src/modules/EnvironmentalQuality/TwoLayers/EnvironmentalQualityTwoLayers.vue @@ -77,13 +77,11 @@
-