diff --git a/frontend/src/api/mapModal/index.ts b/frontend/src/api/mapModal/index.ts index e7b12bc6..748784b1 100644 --- a/frontend/src/api/mapModal/index.ts +++ b/frontend/src/api/mapModal/index.ts @@ -54,7 +54,7 @@ export function getFishTab(stcd: string) { // 检查水质站是否启用 AI 预测功能 export function checkAnalysisShow(data: any) { return request({ - url: '/api/dec-lygk-base-server/base/vmsstbprpt/GetKendoList', + url: '/overview/vmsstbprpt/GetKendoList', method: 'post', data }); diff --git a/frontend/src/api/sw/index.ts b/frontend/src/api/sw/index.ts index 4abd7e4e..b8fe2449 100644 --- a/frontend/src/api/sw/index.ts +++ b/frontend/src/api/sw/index.ts @@ -128,7 +128,7 @@ export function dwInfoGetKendoListCust(data: any) { data }); } -//月均水温对比,图表,表格 /api/wmp-env-server/sw/monthDetail/Det/GetKendoListCust +//月均水温对比,图表,表格 export function DetGetKendoListCust(data: any) { return request({ url: '/wt/monthDetail/Det/GetKendoListCust', diff --git a/frontend/src/api/system/disposeManage/index.ts b/frontend/src/api/system/disposeManage/index.ts index 6972338e..3b3d9a01 100644 --- a/frontend/src/api/system/disposeManage/index.ts +++ b/frontend/src/api/system/disposeManage/index.ts @@ -1,23 +1,23 @@ import request from '@/utils/request'; -// 获取所有沿程配置数据 +// 飞行路径 export function threedroambGetKendoListCust(data: any) { return request({ - url: '/api/wmp-sys-server/sys/threedroamb/GetKendoListCust', + url: '/threedroamb/GetKendoListCust', method: 'post', data: data }); } export function threedroambsave(data: any) { return request({ - url: '/api/wmp-sys-server/sys/threedroamb/save', + url: '/threedroamb/save', method: 'post', data: data }); } export function threedroambdelete(data: any) { return request({ - url: '/api/wmp-sys-server/sys/threedroamb/delete', + url: '/threedroamb/delete', method: 'get', params: data }); @@ -25,7 +25,7 @@ export function threedroambdelete(data: any) { //根据id查询弹窗 export function threedroambGetKendoById(data: any) { return request({ - url: '/api/wmp-sys-server/sys/threedroamb/getThreedRoamDetails', + url: '/threedroamb/getThreedRoamDetails', method: 'get', params: data }); @@ -33,7 +33,7 @@ export function threedroambGetKendoById(data: any) { // 导入接口 export function threedroambimport(data: FormData) { return request({ - url: '/api/wmp-sys-server/sys/threedroamb/import', + url: '/threedroamb/import', method: 'post', data: data, headers: { 'Content-Type': 'multipart/form-data' } @@ -42,7 +42,7 @@ export function threedroambimport(data: FormData) { // 导出模板 export function threedroambexport(data: any) { return request({ - url: '/api/wmp-sys-server/sys/threedroamb/export', + url: '/threedroamb/export', method: 'post', data: data, responseType: 'blob' diff --git a/frontend/src/api/system/map/ConfigManagement/index.ts b/frontend/src/api/system/map/ConfigManagement/index.ts index b572288b..d8ebc4ff 100644 --- a/frontend/src/api/system/map/ConfigManagement/index.ts +++ b/frontend/src/api/system/map/ConfigManagement/index.ts @@ -49,3 +49,11 @@ export function saveBaseWbsbChildDetail(data: any) { data: data }); } +//站点类型下拉框 +export function sttpGetKendoList(data: any) { + return request({ + url: '/base/msalongb/sttp/GetKendoList', + method: 'post', + data: data + }); +} diff --git a/frontend/src/components/MapModal/components/videoInfo.vue b/frontend/src/components/MapModal/components/videoInfo.vue index 556698df..4fceb41e 100644 --- a/frontend/src/components/MapModal/components/videoInfo.vue +++ b/frontend/src/components/MapModal/components/videoInfo.vue @@ -231,12 +231,77 @@ const loadRecordList = async () => { }; const res: any = await getVideoPlayDetail(params); - if (res?.data?.data) { + if (res?.data?.data.length >0) { recordList.value = res.data.data; recordTotal.value = res.data.total || 0; } else { - recordList.value = []; - recordTotal.value = 0; + // 处理空数据情况 + const params1 = { + filter: { + logic: 'and', + filters: [ + { + field: 'stcd', + operator: 'in', + value: [selectedStcd.value] + } + ] + }, + sort: [ + { + field: 'tm', + dir: 'desc' + } + ] + }; + let res1 = await getVideoDetail(params1); + if (res1.data.data.length > 0) { + // 取第一条记录的tm作为结束时间,一周前作为开始时间 + const tm = res1.data.data[0].tm; + const endTime = dayjs(tm); + const startTime = endTime.subtract(7, 'day'); + dateRange.value = [startTime, endTime]; + + // 用新时间范围重新请求getVideoPlayDetail + const newParams = { + filter: { + logic: 'and', + filters: [ + { + field: 'stcd', + operator: 'in', + value: [selectedStcd.value] + }, + { + field: 'tm', + operator: 'gte', + dataType: 'date', + value: startTime.format('YYYY-MM-DD 00:00:00') + }, + { + field: 'tm', + operator: 'lte', + dataType: 'date', + value: endTime.format('YYYY-MM-DD 23:59:59') + } + ] + }, + sort: [{ field: 'tm', dir: 'desc' }], + skip: 0, + take: pageSize + }; + const res2 = await getVideoPlayDetail(newParams); + if (res2?.data?.data?.length > 0) { + recordList.value = res2.data.data; + recordTotal.value = res2.data.total || 0; + } else { + recordList.value = []; + recordTotal.value = 0; + } + } else { + recordList.value = []; + recordTotal.value = 0; + } } } catch (error) { recordList.value = []; diff --git a/frontend/src/views/system/ConfigManagement/ConfigManagementForm.vue b/frontend/src/views/system/ConfigManagement/ConfigManagementForm.vue index becf29cf..345340c1 100644 --- a/frontend/src/views/system/ConfigManagement/ConfigManagementForm.vue +++ b/frontend/src/views/system/ConfigManagement/ConfigManagementForm.vue @@ -103,7 +103,7 @@ :default-expand-all="false" :selectable="false" block-node - style="width: 400px" + >