zhengsl/WholeProcessPlatform
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://121.37.111.42:3000/zhengsl/WholeProcessPlatform into main_hzz

Browse Source
This commit is contained in:
扈兆增 2026-06-15 09:18:26 +08:00
commit c1dfff5fac
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/src/components/MapModal/index.vue
View File

@ -594,9 +594,9 @@ const setQGCTabList = async (_tabs: any, stcd: string) => {
);
if (!jianCei) {
// newTabs = newTabs.filter(
// item => item.type !== 'VerticalWaterTemperature'
// );
newTabs = newTabs.filter(
item => item.type !== 'VerticalWaterTemperature'
);
} else {
modelStore.verticalWaterStcd = jianCei.stcd;
}
@ -658,6 +658,7 @@ const setQGCTabList = async (_tabs: any, stcd: string) => {
};
const res2 = await getVideoList(params);
console.log('', modelStore.params.sttp);
// debugger
if (
res2?.data?.data?.length > 0 ||
res2?.data?.records?.length > 0 ||

35
frontend/src/components/MapModal/setting.config.ts
View File

@ -608,23 +608,23 @@ const DWTabs: Array<any> = [
type: 'basic',
default: true, // 默认显示
url: '/api/dec-lygk-base-server/base/msstbprpt/getStcdInfo'
},
{
name: '实时视频',
key: 'videoInfo',
type: 'video',
url: '/video/dataStcdFrame/getVideoMonitorList'
},
{
name: '监测数据',
key: 'VerticalWaterTemperature',
type: 'VerticalWaterTemperature'
},
{
name: '叠梁门运行AI识别',
key: 'AIYXSB',
type: 'AIYXSB'
}
// {
// name: '实时视频',
// key: 'videoInfo',
// type: 'video',
// url: '/video/dataStcdFrame/getVideoMonitorList'
// },
// {
// name: '监测数据',
// key: 'VerticalWaterTemperature',
// type: 'VerticalWaterTemperature',
// },
// {
// name: '叠梁门运行AI识别',
// key: 'AIYXSB',
// type: 'AIYXSB',
// }
];
// //低温水减缓设施这是旧的
// const DWTabs2: Array<any> = [
@ -1057,7 +1057,7 @@ const handleTabs = (modaldata: any) => {
if (modaldata?.bldstt == 2 || modaldata?.bldstt == 1) {
console.log('modaldata', modaldata);
arr =[ arr[0]]; //国家站 人工站把视频tab去除
arr = [arr[0]]; //国家站 人工站把视频tab去除
}
return arr;
case 'FH_ZQ_POINT':
@ -1111,6 +1111,7 @@ const handleTabs = (modaldata: any) => {
case 'DW_3':
case 'DW_4':
case 'DW_5':
case 'DW_6':
return DWTabs;
case 'FP': //todo，后续再删除多余代码
case 'FP_1': //todo，后续再删除多余代码