diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js index 86078ff..4826300 100644 --- a/src/api/FloodControlAndDrainage.js +++ b/src/api/FloodControlAndDrainage.js @@ -1,10 +1,10 @@ -import request from '@/utils/request' +import request from '@/utils/request'; // 检测水位 export function queryRiverWaterLevel(data) { return request({ url: `/business/drainageMap/hhsxLakeInfo/queryRiverWaterLevel`, - method: "post", + method: 'post', data, }); } @@ -12,240 +12,240 @@ export function rainMapDataListBack(params) { return request({ url: `/business/drainageMap/drainageDispatch/rainMapDataListBack`, - method: "get", - params + method: 'get', + params, }); } export function rainCalendar(params) { return request({ url: `/business/drainageMap/rainData/rainCalendar`, - method: "get", - params + method: 'get', + params, }); } export function rainCalendarLately(params) { return request({ url: `/business/drainageMap/rainData/rainCalendarLately`, - method: "get", - params + method: 'get', + params, }); } export function rainMapDataBack(params) { return request({ url: `/business/drainageMap/drainageDispatch/rainMapDataBack`, - method: "get", - params + method: 'get', + params, }); } // 人员调度 export function personnelSchedulingInfoList(params) { return request({ url: `/business/drainageMap/personnelSchedulingInfo/list`, - method: "get", - params + method: 'get', + params, }); } // 物资调度 export function schedulingInfoList(params) { return request({ url: `/business/drainageMap/schedulingInfo/list`, - method: "get", - params + method: 'get', + params, }); } export function managementWarehouseGood(params) { return request({ url: `/business/drainageMap/managementWarehouseGood/list`, - method: "get", - params + method: 'get', + params, }); } -// +// export function siteMonitorwaterLevelBack(params) { return request({ url: `/business/drainageMap/siteMonitor/waterLevelBack`, - method: "get", - params + method: 'get', + params, }); } -// +// export function selectPumpMonitorListHistory(params) { return request({ url: `/business/drainageMap/facilityPump/selectPumpMonitorListHistory`, - method: "get", - params + method: 'get', + params, }); } -// +// export function getFxLogList(params) { return request({ url: `/business/drainageMap/drainageDispatch/getFxLogList`, - method: "get", - params + method: 'get', + params, }); } -// +// export function getBZFxLogList(params) { return request({ url: `/business/drainageMap/drainageDispatch/getBZFxLogList`, - method: "get", - params + method: 'get', + params, }); } -// +// export function warnData(params) { return request({ url: `/business/drainageMap/drainageDispatch/warnData`, - method: "get", - params + method: 'get', + params, }); } -// +// export function drainageFacilityDfxgxd(data) { return request({ url: `/business/drainageMap/drainageFacilityDfxgxd/list`, - method: "post", - data + method: 'post', + data, }); } // 预警建议 -export function getResponseRecommend(params){ +export function getResponseRecommend(params) { return request({ - url:'/business/drainageDispatch/getResponseRecommend', + url: '/business/drainageDispatch/getResponseRecommend', method: 'get', - params - }) + params, + }); } // 预警列表 -export function psWarningReleasePage(params){ +export function psWarningReleasePage(params) { return request({ - url:'/business/emergencyWarningRelease/page', + url: '/business/emergencyWarningRelease/page', method: 'get', - params - }) + params, + }); } // 预警新增 -export function psWarningReleaseSave(data){ +export function psWarningReleaseSave(data) { return request({ - url:'/business/emergencyWarningRelease/save', + url: '/business/emergencyWarningRelease/save', method: 'post', - data - }) + data, + }); } // 预警发布 -export function emergencyWarningReleasePublish(data){ +export function emergencyWarningReleasePublish(data) { return request({ - url:'/business/emergencyWarningRelease/publish', + url: '/business/emergencyWarningRelease/publish', method: 'post', - data - }) + data, + }); } // 预警解除 -export function emergencyWarningReleaseRelease(data){ +export function emergencyWarningReleaseRelease(data) { return request({ - url:'/business/emergencyWarningRelease/release', + url: '/business/emergencyWarningRelease/release', method: 'post', - data - }) + data, + }); } // 预警说明 -export function psWarningIllustrate(params){ +export function psWarningIllustrate(params) { return request({ - url:'/business/informationPlan/plan-list', + url: '/business/informationPlan/plan-list', method: 'get', - params - }) + params, + }); } // 监测预警 `````````````````````````` // 监测预警 顶部数量 -export function drainageDispatchmonitorCount(params){ +export function drainageDispatchmonitorCount(params) { return request({ - url:'/business/drainageDispatch/monitorCount', + url: '/business/drainageDispatch/monitorCount', method: 'get', - params - }) + params, + }); } // 监测数据 -export function drainageDispatchMonitorData(params){ +export function drainageDispatchMonitorData(params) { return request({ - url:'/business/drainageDispatch/monitorData', + url: '/business/drainageDispatch/monitorData', method: 'get', - params - }) + params, + }); } // 监测告警 -export function drainageDispatchWarnData(params){ +export function drainageDispatchWarnData(params) { return request({ - url:'/business/drainageDispatch/warnData', + url: '/business/drainageDispatch/warnData', method: 'get', - params - }) + params, + }); } // 排涝风险区域 -export function drainageDispatchDrainageRiskAreaCount(params){ +export function drainageDispatchDrainageRiskAreaCount(params) { return request({ - url:'/business/drainageDispatch/drainageRiskAreaCount', + url: '/business/drainageDispatch/drainageRiskAreaCount', method: 'get', - params - }) + params, + }); } // 预案分析 -export function drainageDispatchGetPlanAnalysis(params){ +export function drainageDispatchGetPlanAnalysis(params) { return request({ - url:'/business/drainageDispatch/getPlanAnalysis', + url: '/business/drainageDispatch/getPlanAnalysis', method: 'get', - params - }) + params, + }); } // 防汛检查 -export function drainageDispatchGetCheckCount(params){ +export function drainageDispatchGetCheckCount(params) { return request({ - url:'/business/drainageDispatch/getCheckCount', + url: '/business/drainageDispatch/getCheckCount', method: 'get', - params - }) + params, + }); } // 值班统计 -export function drainageDispatchGetDutyCount(params){ +export function drainageDispatchGetDutyCount(params) { return request({ - url:'/business/drainageDispatch/getDutyCount', + url: '/business/drainageDispatch/getDutyCount', method: 'get', - params - }) + params, + }); } // 今日值班人员 -export function drainageDispatchGetFbTodayDutyUserShift(params){ +export function drainageDispatchGetFbTodayDutyUserShift(params) { return request({ - url:'/business/drainageDispatch/getFbTodayDutyUserShift', + url: '/business/drainageDispatch/getFbTodayDutyUserShift', method: 'get', - params - }) + params, + }); } // 排涝值守统计 -export function drainageDispatchGetWatchCount(params){ +export function drainageDispatchGetWatchCount(params) { return request({ - url:'/business/drainageDispatch/getWatchCount', + url: '/business/drainageDispatch/getWatchCount', method: 'get', - params - }) + params, + }); } // 降雨预报 -export function dataSiteRelationRainTrend(params){ +export function dataSiteRelationRainTrend(params) { return request({ - url:'/business/dataSiteRelation/rainTrend', + url: '/business/dataSiteRelation/rainTrend', method: 'get', - params - }) + params, + }); } // 当前预警信息 -export function getRecommendLevel(data){ +export function getRecommendLevel(data) { return request({ - url:'/business/emergencyWarningRelease/getRecommendLevel', + url: '/business/emergencyWarningRelease/getRecommendLevel', method: 'get', - data - }) + data, + }); } // 查询基础数据-水系汇水分区列表 export function listwaterRegionInfo(query) { @@ -264,74 +264,74 @@ }); } // 防汛检查 -export function streetFloodList(data){ +export function streetFloodList(data) { return request({ - url:'/business/drainageMap/streetFlood/list', + url: '/business/drainageMap/streetFlood/list', method: 'get', - data - }) + data, + }); } // 值守检查 -export function watchAreaList(data){ +export function watchAreaList(data) { return request({ - url:'/business/drainageMap/watchArea/list', + url: '/business/drainageMap/watchArea/list', method: 'get', - data - }) + data, + }); } // 排渍检查 -export function watchAreaSortingScheduling(params){ +export function watchAreaSortingScheduling(params) { return request({ - url:'/business/drainageMap/watchArea/SortingScheduling', + url: '/business/drainageMap/watchArea/SortingScheduling', method: 'get', - params - }) + params, + }); } // 排渍明细 -export function watchAreaCheckPicture(params){ +export function watchAreaCheckPicture(params) { return request({ - url:'/business/drainageMap/watchArea/checkPicture', + url: '/business/drainageMap/watchArea/checkPicture', method: 'get', - params - }) + params, + }); } // 值守明细 -export function watchAreaDutyPersonnel(params){ +export function watchAreaDutyPersonnel(params) { return request({ - url:'/business/drainageMap/watchArea/dutyPersonnel', + url: '/business/drainageMap/watchArea/dutyPersonnel', method: 'get', - params - }) + params, + }); } // 泵站调度 -export function watchAreaDutyPumpScheduling(params){ +export function watchAreaDutyPumpScheduling(params) { return request({ - url:'/business/drainageMap/watchArea/pumpScheduling', + url: '/business/drainageMap/watchArea/pumpScheduling', method: 'get', - params - }) + params, + }); } // 下发泵站调度 -export function dispatchOutbound(data){ +export function dispatchOutbound(data) { return request({ - url:'/business/drainageMap/dispatch/outbound', + url: '/business/drainageMap/dispatch/outbound', method: 'post', - data - }) + data, + }); } -export function pumpDispatchCommandPublish(data){ +export function pumpDispatchCommandPublish(data) { return request({ - url:'/business/pumpDispatchCommand/publish', + url: '/business/pumpDispatchCommand/publish', method: 'post', - data - }) + data, + }); } -export function pumpDispatchHistoryList(params){ +export function pumpDispatchHistoryList(params) { return request({ - url:'/business/pumpDispatchHistory/list', + url: '/business/pumpDispatchHistory/list', method: 'get', - params - }) + params, + }); } // 降雨分布 export function monitorUnitRainfallDistributionGetRainMap(params) { @@ -350,25 +350,25 @@ }); } // 渍水点详情 -export function waterloggingPointInfo(id){ +export function waterloggingPointInfo(id) { return request({ url: `/business/waterloggingPointInfo/${id}`, method: 'get', - }) + }); } // 泵站工情雨水详情 -export function rainWaterPumpStationInfo(id){ +export function rainWaterPumpStationInfo(id) { return request({ url: `/business/rainWaterPumpStationInfo/${id}`, method: 'get', - }) + }); } //泵站工情污水详情 -export function sewagePumpStationInfo(id){ +export function sewagePumpStationInfo(id) { return request({ url: `/business/sewagePumpStationInfo/${id}`, method: 'get', - }) + }); } // 河湖详情 export function lakeInfoList(query) { @@ -426,12 +426,12 @@ }); } // 渍水调度任务 -export function distributeTask(data){ +export function distributeTask(data) { return request({ - url:'/business/watchResponseTask/distributeTask', + url: '/business/watchResponseTask/distributeTask', method: 'post', - data - }) + data, + }); } export function watchDispatchList(query) { return request({ @@ -460,14 +460,23 @@ return request({ url: '/business/emergencyWarningRelease/list', method: 'get', - params + params, }); } export function pumpStationStatistics(params) { return request({ url: '/business/drainageMap/pumpStationStatistics', method: 'get', - params + params, }); } -// ``````````EDN````````````````````` \ No newline at end of file + +export function drainageDispatchCall(params) { + return request({ + url: '/business/drainageDispatch/call', + method: 'get', + params, + }); +} + +// ``````````EDN````````````````````` diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js index 86078ff..4826300 100644 --- a/src/api/FloodControlAndDrainage.js +++ b/src/api/FloodControlAndDrainage.js @@ -1,10 +1,10 @@ -import request from '@/utils/request' +import request from '@/utils/request'; // 检测水位 export function queryRiverWaterLevel(data) { return request({ url: `/business/drainageMap/hhsxLakeInfo/queryRiverWaterLevel`, - method: "post", + method: 'post', data, }); } @@ -12,240 +12,240 @@ export function rainMapDataListBack(params) { return request({ url: `/business/drainageMap/drainageDispatch/rainMapDataListBack`, - method: "get", - params + method: 'get', + params, }); } export function rainCalendar(params) { return request({ url: `/business/drainageMap/rainData/rainCalendar`, - method: "get", - params + method: 'get', + params, }); } export function rainCalendarLately(params) { return request({ url: `/business/drainageMap/rainData/rainCalendarLately`, - method: "get", - params + method: 'get', + params, }); } export function rainMapDataBack(params) { return request({ url: `/business/drainageMap/drainageDispatch/rainMapDataBack`, - method: "get", - params + method: 'get', + params, }); } // 人员调度 export function personnelSchedulingInfoList(params) { return request({ url: `/business/drainageMap/personnelSchedulingInfo/list`, - method: "get", - params + method: 'get', + params, }); } // 物资调度 export function schedulingInfoList(params) { return request({ url: `/business/drainageMap/schedulingInfo/list`, - method: "get", - params + method: 'get', + params, }); } export function managementWarehouseGood(params) { return request({ url: `/business/drainageMap/managementWarehouseGood/list`, - method: "get", - params + method: 'get', + params, }); } -// +// export function siteMonitorwaterLevelBack(params) { return request({ url: `/business/drainageMap/siteMonitor/waterLevelBack`, - method: "get", - params + method: 'get', + params, }); } -// +// export function selectPumpMonitorListHistory(params) { return request({ url: `/business/drainageMap/facilityPump/selectPumpMonitorListHistory`, - method: "get", - params + method: 'get', + params, }); } -// +// export function getFxLogList(params) { return request({ url: `/business/drainageMap/drainageDispatch/getFxLogList`, - method: "get", - params + method: 'get', + params, }); } -// +// export function getBZFxLogList(params) { return request({ url: `/business/drainageMap/drainageDispatch/getBZFxLogList`, - method: "get", - params + method: 'get', + params, }); } -// +// export function warnData(params) { return request({ url: `/business/drainageMap/drainageDispatch/warnData`, - method: "get", - params + method: 'get', + params, }); } -// +// export function drainageFacilityDfxgxd(data) { return request({ url: `/business/drainageMap/drainageFacilityDfxgxd/list`, - method: "post", - data + method: 'post', + data, }); } // 预警建议 -export function getResponseRecommend(params){ +export function getResponseRecommend(params) { return request({ - url:'/business/drainageDispatch/getResponseRecommend', + url: '/business/drainageDispatch/getResponseRecommend', method: 'get', - params - }) + params, + }); } // 预警列表 -export function psWarningReleasePage(params){ +export function psWarningReleasePage(params) { return request({ - url:'/business/emergencyWarningRelease/page', + url: '/business/emergencyWarningRelease/page', method: 'get', - params - }) + params, + }); } // 预警新增 -export function psWarningReleaseSave(data){ +export function psWarningReleaseSave(data) { return request({ - url:'/business/emergencyWarningRelease/save', + url: '/business/emergencyWarningRelease/save', method: 'post', - data - }) + data, + }); } // 预警发布 -export function emergencyWarningReleasePublish(data){ +export function emergencyWarningReleasePublish(data) { return request({ - url:'/business/emergencyWarningRelease/publish', + url: '/business/emergencyWarningRelease/publish', method: 'post', - data - }) + data, + }); } // 预警解除 -export function emergencyWarningReleaseRelease(data){ +export function emergencyWarningReleaseRelease(data) { return request({ - url:'/business/emergencyWarningRelease/release', + url: '/business/emergencyWarningRelease/release', method: 'post', - data - }) + data, + }); } // 预警说明 -export function psWarningIllustrate(params){ +export function psWarningIllustrate(params) { return request({ - url:'/business/informationPlan/plan-list', + url: '/business/informationPlan/plan-list', method: 'get', - params - }) + params, + }); } // 监测预警 `````````````````````````` // 监测预警 顶部数量 -export function drainageDispatchmonitorCount(params){ +export function drainageDispatchmonitorCount(params) { return request({ - url:'/business/drainageDispatch/monitorCount', + url: '/business/drainageDispatch/monitorCount', method: 'get', - params - }) + params, + }); } // 监测数据 -export function drainageDispatchMonitorData(params){ +export function drainageDispatchMonitorData(params) { return request({ - url:'/business/drainageDispatch/monitorData', + url: '/business/drainageDispatch/monitorData', method: 'get', - params - }) + params, + }); } // 监测告警 -export function drainageDispatchWarnData(params){ +export function drainageDispatchWarnData(params) { return request({ - url:'/business/drainageDispatch/warnData', + url: '/business/drainageDispatch/warnData', method: 'get', - params - }) + params, + }); } // 排涝风险区域 -export function drainageDispatchDrainageRiskAreaCount(params){ +export function drainageDispatchDrainageRiskAreaCount(params) { return request({ - url:'/business/drainageDispatch/drainageRiskAreaCount', + url: '/business/drainageDispatch/drainageRiskAreaCount', method: 'get', - params - }) + params, + }); } // 预案分析 -export function drainageDispatchGetPlanAnalysis(params){ +export function drainageDispatchGetPlanAnalysis(params) { return request({ - url:'/business/drainageDispatch/getPlanAnalysis', + url: '/business/drainageDispatch/getPlanAnalysis', method: 'get', - params - }) + params, + }); } // 防汛检查 -export function drainageDispatchGetCheckCount(params){ +export function drainageDispatchGetCheckCount(params) { return request({ - url:'/business/drainageDispatch/getCheckCount', + url: '/business/drainageDispatch/getCheckCount', method: 'get', - params - }) + params, + }); } // 值班统计 -export function drainageDispatchGetDutyCount(params){ +export function drainageDispatchGetDutyCount(params) { return request({ - url:'/business/drainageDispatch/getDutyCount', + url: '/business/drainageDispatch/getDutyCount', method: 'get', - params - }) + params, + }); } // 今日值班人员 -export function drainageDispatchGetFbTodayDutyUserShift(params){ +export function drainageDispatchGetFbTodayDutyUserShift(params) { return request({ - url:'/business/drainageDispatch/getFbTodayDutyUserShift', + url: '/business/drainageDispatch/getFbTodayDutyUserShift', method: 'get', - params - }) + params, + }); } // 排涝值守统计 -export function drainageDispatchGetWatchCount(params){ +export function drainageDispatchGetWatchCount(params) { return request({ - url:'/business/drainageDispatch/getWatchCount', + url: '/business/drainageDispatch/getWatchCount', method: 'get', - params - }) + params, + }); } // 降雨预报 -export function dataSiteRelationRainTrend(params){ +export function dataSiteRelationRainTrend(params) { return request({ - url:'/business/dataSiteRelation/rainTrend', + url: '/business/dataSiteRelation/rainTrend', method: 'get', - params - }) + params, + }); } // 当前预警信息 -export function getRecommendLevel(data){ +export function getRecommendLevel(data) { return request({ - url:'/business/emergencyWarningRelease/getRecommendLevel', + url: '/business/emergencyWarningRelease/getRecommendLevel', method: 'get', - data - }) + data, + }); } // 查询基础数据-水系汇水分区列表 export function listwaterRegionInfo(query) { @@ -264,74 +264,74 @@ }); } // 防汛检查 -export function streetFloodList(data){ +export function streetFloodList(data) { return request({ - url:'/business/drainageMap/streetFlood/list', + url: '/business/drainageMap/streetFlood/list', method: 'get', - data - }) + data, + }); } // 值守检查 -export function watchAreaList(data){ +export function watchAreaList(data) { return request({ - url:'/business/drainageMap/watchArea/list', + url: '/business/drainageMap/watchArea/list', method: 'get', - data - }) + data, + }); } // 排渍检查 -export function watchAreaSortingScheduling(params){ +export function watchAreaSortingScheduling(params) { return request({ - url:'/business/drainageMap/watchArea/SortingScheduling', + url: '/business/drainageMap/watchArea/SortingScheduling', method: 'get', - params - }) + params, + }); } // 排渍明细 -export function watchAreaCheckPicture(params){ +export function watchAreaCheckPicture(params) { return request({ - url:'/business/drainageMap/watchArea/checkPicture', + url: '/business/drainageMap/watchArea/checkPicture', method: 'get', - params - }) + params, + }); } // 值守明细 -export function watchAreaDutyPersonnel(params){ +export function watchAreaDutyPersonnel(params) { return request({ - url:'/business/drainageMap/watchArea/dutyPersonnel', + url: '/business/drainageMap/watchArea/dutyPersonnel', method: 'get', - params - }) + params, + }); } // 泵站调度 -export function watchAreaDutyPumpScheduling(params){ +export function watchAreaDutyPumpScheduling(params) { return request({ - url:'/business/drainageMap/watchArea/pumpScheduling', + url: '/business/drainageMap/watchArea/pumpScheduling', method: 'get', - params - }) + params, + }); } // 下发泵站调度 -export function dispatchOutbound(data){ +export function dispatchOutbound(data) { return request({ - url:'/business/drainageMap/dispatch/outbound', + url: '/business/drainageMap/dispatch/outbound', method: 'post', - data - }) + data, + }); } -export function pumpDispatchCommandPublish(data){ +export function pumpDispatchCommandPublish(data) { return request({ - url:'/business/pumpDispatchCommand/publish', + url: '/business/pumpDispatchCommand/publish', method: 'post', - data - }) + data, + }); } -export function pumpDispatchHistoryList(params){ +export function pumpDispatchHistoryList(params) { return request({ - url:'/business/pumpDispatchHistory/list', + url: '/business/pumpDispatchHistory/list', method: 'get', - params - }) + params, + }); } // 降雨分布 export function monitorUnitRainfallDistributionGetRainMap(params) { @@ -350,25 +350,25 @@ }); } // 渍水点详情 -export function waterloggingPointInfo(id){ +export function waterloggingPointInfo(id) { return request({ url: `/business/waterloggingPointInfo/${id}`, method: 'get', - }) + }); } // 泵站工情雨水详情 -export function rainWaterPumpStationInfo(id){ +export function rainWaterPumpStationInfo(id) { return request({ url: `/business/rainWaterPumpStationInfo/${id}`, method: 'get', - }) + }); } //泵站工情污水详情 -export function sewagePumpStationInfo(id){ +export function sewagePumpStationInfo(id) { return request({ url: `/business/sewagePumpStationInfo/${id}`, method: 'get', - }) + }); } // 河湖详情 export function lakeInfoList(query) { @@ -426,12 +426,12 @@ }); } // 渍水调度任务 -export function distributeTask(data){ +export function distributeTask(data) { return request({ - url:'/business/watchResponseTask/distributeTask', + url: '/business/watchResponseTask/distributeTask', method: 'post', - data - }) + data, + }); } export function watchDispatchList(query) { return request({ @@ -460,14 +460,23 @@ return request({ url: '/business/emergencyWarningRelease/list', method: 'get', - params + params, }); } export function pumpStationStatistics(params) { return request({ url: '/business/drainageMap/pumpStationStatistics', method: 'get', - params + params, }); } -// ``````````EDN````````````````````` \ No newline at end of file + +export function drainageDispatchCall(params) { + return request({ + url: '/business/drainageDispatch/call', + method: 'get', + params, + }); +} + +// ``````````EDN````````````````````` diff --git a/src/assets/images/pictureOnMap/eachBgc22.png b/src/assets/images/pictureOnMap/eachBgc22.png new file mode 100644 index 0000000..da1640f --- /dev/null +++ b/src/assets/images/pictureOnMap/eachBgc22.png Binary files differ diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js index 86078ff..4826300 100644 --- a/src/api/FloodControlAndDrainage.js +++ b/src/api/FloodControlAndDrainage.js @@ -1,10 +1,10 @@ -import request from '@/utils/request' +import request from '@/utils/request'; // 检测水位 export function queryRiverWaterLevel(data) { return request({ url: `/business/drainageMap/hhsxLakeInfo/queryRiverWaterLevel`, - method: "post", + method: 'post', data, }); } @@ -12,240 +12,240 @@ export function rainMapDataListBack(params) { return request({ url: `/business/drainageMap/drainageDispatch/rainMapDataListBack`, - method: "get", - params + method: 'get', + params, }); } export function rainCalendar(params) { return request({ url: `/business/drainageMap/rainData/rainCalendar`, - method: "get", - params + method: 'get', + params, }); } export function rainCalendarLately(params) { return request({ url: `/business/drainageMap/rainData/rainCalendarLately`, - method: "get", - params + method: 'get', + params, }); } export function rainMapDataBack(params) { return request({ url: `/business/drainageMap/drainageDispatch/rainMapDataBack`, - method: "get", - params + method: 'get', + params, }); } // 人员调度 export function personnelSchedulingInfoList(params) { return request({ url: `/business/drainageMap/personnelSchedulingInfo/list`, - method: "get", - params + method: 'get', + params, }); } // 物资调度 export function schedulingInfoList(params) { return request({ url: `/business/drainageMap/schedulingInfo/list`, - method: "get", - params + method: 'get', + params, }); } export function managementWarehouseGood(params) { return request({ url: `/business/drainageMap/managementWarehouseGood/list`, - method: "get", - params + method: 'get', + params, }); } -// +// export function siteMonitorwaterLevelBack(params) { return request({ url: `/business/drainageMap/siteMonitor/waterLevelBack`, - method: "get", - params + method: 'get', + params, }); } -// +// export function selectPumpMonitorListHistory(params) { return request({ url: `/business/drainageMap/facilityPump/selectPumpMonitorListHistory`, - method: "get", - params + method: 'get', + params, }); } -// +// export function getFxLogList(params) { return request({ url: `/business/drainageMap/drainageDispatch/getFxLogList`, - method: "get", - params + method: 'get', + params, }); } -// +// export function getBZFxLogList(params) { return request({ url: `/business/drainageMap/drainageDispatch/getBZFxLogList`, - method: "get", - params + method: 'get', + params, }); } -// +// export function warnData(params) { return request({ url: `/business/drainageMap/drainageDispatch/warnData`, - method: "get", - params + method: 'get', + params, }); } -// +// export function drainageFacilityDfxgxd(data) { return request({ url: `/business/drainageMap/drainageFacilityDfxgxd/list`, - method: "post", - data + method: 'post', + data, }); } // 预警建议 -export function getResponseRecommend(params){ +export function getResponseRecommend(params) { return request({ - url:'/business/drainageDispatch/getResponseRecommend', + url: '/business/drainageDispatch/getResponseRecommend', method: 'get', - params - }) + params, + }); } // 预警列表 -export function psWarningReleasePage(params){ +export function psWarningReleasePage(params) { return request({ - url:'/business/emergencyWarningRelease/page', + url: '/business/emergencyWarningRelease/page', method: 'get', - params - }) + params, + }); } // 预警新增 -export function psWarningReleaseSave(data){ +export function psWarningReleaseSave(data) { return request({ - url:'/business/emergencyWarningRelease/save', + url: '/business/emergencyWarningRelease/save', method: 'post', - data - }) + data, + }); } // 预警发布 -export function emergencyWarningReleasePublish(data){ +export function emergencyWarningReleasePublish(data) { return request({ - url:'/business/emergencyWarningRelease/publish', + url: '/business/emergencyWarningRelease/publish', method: 'post', - data - }) + data, + }); } // 预警解除 -export function emergencyWarningReleaseRelease(data){ +export function emergencyWarningReleaseRelease(data) { return request({ - url:'/business/emergencyWarningRelease/release', + url: '/business/emergencyWarningRelease/release', method: 'post', - data - }) + data, + }); } // 预警说明 -export function psWarningIllustrate(params){ +export function psWarningIllustrate(params) { return request({ - url:'/business/informationPlan/plan-list', + url: '/business/informationPlan/plan-list', method: 'get', - params - }) + params, + }); } // 监测预警 `````````````````````````` // 监测预警 顶部数量 -export function drainageDispatchmonitorCount(params){ +export function drainageDispatchmonitorCount(params) { return request({ - url:'/business/drainageDispatch/monitorCount', + url: '/business/drainageDispatch/monitorCount', method: 'get', - params - }) + params, + }); } // 监测数据 -export function drainageDispatchMonitorData(params){ +export function drainageDispatchMonitorData(params) { return request({ - url:'/business/drainageDispatch/monitorData', + url: '/business/drainageDispatch/monitorData', method: 'get', - params - }) + params, + }); } // 监测告警 -export function drainageDispatchWarnData(params){ +export function drainageDispatchWarnData(params) { return request({ - url:'/business/drainageDispatch/warnData', + url: '/business/drainageDispatch/warnData', method: 'get', - params - }) + params, + }); } // 排涝风险区域 -export function drainageDispatchDrainageRiskAreaCount(params){ +export function drainageDispatchDrainageRiskAreaCount(params) { return request({ - url:'/business/drainageDispatch/drainageRiskAreaCount', + url: '/business/drainageDispatch/drainageRiskAreaCount', method: 'get', - params - }) + params, + }); } // 预案分析 -export function drainageDispatchGetPlanAnalysis(params){ +export function drainageDispatchGetPlanAnalysis(params) { return request({ - url:'/business/drainageDispatch/getPlanAnalysis', + url: '/business/drainageDispatch/getPlanAnalysis', method: 'get', - params - }) + params, + }); } // 防汛检查 -export function drainageDispatchGetCheckCount(params){ +export function drainageDispatchGetCheckCount(params) { return request({ - url:'/business/drainageDispatch/getCheckCount', + url: '/business/drainageDispatch/getCheckCount', method: 'get', - params - }) + params, + }); } // 值班统计 -export function drainageDispatchGetDutyCount(params){ +export function drainageDispatchGetDutyCount(params) { return request({ - url:'/business/drainageDispatch/getDutyCount', + url: '/business/drainageDispatch/getDutyCount', method: 'get', - params - }) + params, + }); } // 今日值班人员 -export function drainageDispatchGetFbTodayDutyUserShift(params){ +export function drainageDispatchGetFbTodayDutyUserShift(params) { return request({ - url:'/business/drainageDispatch/getFbTodayDutyUserShift', + url: '/business/drainageDispatch/getFbTodayDutyUserShift', method: 'get', - params - }) + params, + }); } // 排涝值守统计 -export function drainageDispatchGetWatchCount(params){ +export function drainageDispatchGetWatchCount(params) { return request({ - url:'/business/drainageDispatch/getWatchCount', + url: '/business/drainageDispatch/getWatchCount', method: 'get', - params - }) + params, + }); } // 降雨预报 -export function dataSiteRelationRainTrend(params){ +export function dataSiteRelationRainTrend(params) { return request({ - url:'/business/dataSiteRelation/rainTrend', + url: '/business/dataSiteRelation/rainTrend', method: 'get', - params - }) + params, + }); } // 当前预警信息 -export function getRecommendLevel(data){ +export function getRecommendLevel(data) { return request({ - url:'/business/emergencyWarningRelease/getRecommendLevel', + url: '/business/emergencyWarningRelease/getRecommendLevel', method: 'get', - data - }) + data, + }); } // 查询基础数据-水系汇水分区列表 export function listwaterRegionInfo(query) { @@ -264,74 +264,74 @@ }); } // 防汛检查 -export function streetFloodList(data){ +export function streetFloodList(data) { return request({ - url:'/business/drainageMap/streetFlood/list', + url: '/business/drainageMap/streetFlood/list', method: 'get', - data - }) + data, + }); } // 值守检查 -export function watchAreaList(data){ +export function watchAreaList(data) { return request({ - url:'/business/drainageMap/watchArea/list', + url: '/business/drainageMap/watchArea/list', method: 'get', - data - }) + data, + }); } // 排渍检查 -export function watchAreaSortingScheduling(params){ +export function watchAreaSortingScheduling(params) { return request({ - url:'/business/drainageMap/watchArea/SortingScheduling', + url: '/business/drainageMap/watchArea/SortingScheduling', method: 'get', - params - }) + params, + }); } // 排渍明细 -export function watchAreaCheckPicture(params){ +export function watchAreaCheckPicture(params) { return request({ - url:'/business/drainageMap/watchArea/checkPicture', + url: '/business/drainageMap/watchArea/checkPicture', method: 'get', - params - }) + params, + }); } // 值守明细 -export function watchAreaDutyPersonnel(params){ +export function watchAreaDutyPersonnel(params) { return request({ - url:'/business/drainageMap/watchArea/dutyPersonnel', + url: '/business/drainageMap/watchArea/dutyPersonnel', method: 'get', - params - }) + params, + }); } // 泵站调度 -export function watchAreaDutyPumpScheduling(params){ +export function watchAreaDutyPumpScheduling(params) { return request({ - url:'/business/drainageMap/watchArea/pumpScheduling', + url: '/business/drainageMap/watchArea/pumpScheduling', method: 'get', - params - }) + params, + }); } // 下发泵站调度 -export function dispatchOutbound(data){ +export function dispatchOutbound(data) { return request({ - url:'/business/drainageMap/dispatch/outbound', + url: '/business/drainageMap/dispatch/outbound', method: 'post', - data - }) + data, + }); } -export function pumpDispatchCommandPublish(data){ +export function pumpDispatchCommandPublish(data) { return request({ - url:'/business/pumpDispatchCommand/publish', + url: '/business/pumpDispatchCommand/publish', method: 'post', - data - }) + data, + }); } -export function pumpDispatchHistoryList(params){ +export function pumpDispatchHistoryList(params) { return request({ - url:'/business/pumpDispatchHistory/list', + url: '/business/pumpDispatchHistory/list', method: 'get', - params - }) + params, + }); } // 降雨分布 export function monitorUnitRainfallDistributionGetRainMap(params) { @@ -350,25 +350,25 @@ }); } // 渍水点详情 -export function waterloggingPointInfo(id){ +export function waterloggingPointInfo(id) { return request({ url: `/business/waterloggingPointInfo/${id}`, method: 'get', - }) + }); } // 泵站工情雨水详情 -export function rainWaterPumpStationInfo(id){ +export function rainWaterPumpStationInfo(id) { return request({ url: `/business/rainWaterPumpStationInfo/${id}`, method: 'get', - }) + }); } //泵站工情污水详情 -export function sewagePumpStationInfo(id){ +export function sewagePumpStationInfo(id) { return request({ url: `/business/sewagePumpStationInfo/${id}`, method: 'get', - }) + }); } // 河湖详情 export function lakeInfoList(query) { @@ -426,12 +426,12 @@ }); } // 渍水调度任务 -export function distributeTask(data){ +export function distributeTask(data) { return request({ - url:'/business/watchResponseTask/distributeTask', + url: '/business/watchResponseTask/distributeTask', method: 'post', - data - }) + data, + }); } export function watchDispatchList(query) { return request({ @@ -460,14 +460,23 @@ return request({ url: '/business/emergencyWarningRelease/list', method: 'get', - params + params, }); } export function pumpStationStatistics(params) { return request({ url: '/business/drainageMap/pumpStationStatistics', method: 'get', - params + params, }); } -// ``````````EDN````````````````````` \ No newline at end of file + +export function drainageDispatchCall(params) { + return request({ + url: '/business/drainageDispatch/call', + method: 'get', + params, + }); +} + +// ``````````EDN````````````````````` diff --git a/src/assets/images/pictureOnMap/eachBgc22.png b/src/assets/images/pictureOnMap/eachBgc22.png new file mode 100644 index 0000000..da1640f --- /dev/null +++ b/src/assets/images/pictureOnMap/eachBgc22.png Binary files differ diff --git a/src/assets/styles/pictureOnMap.scss b/src/assets/styles/pictureOnMap.scss index c3ae4f7..5dece19 100644 --- a/src/assets/styles/pictureOnMap.scss +++ b/src/assets/styles/pictureOnMap.scss @@ -40,7 +40,7 @@ .typeList { padding-bottom: 2px; - border-bottom: 1px solid #0D356F; + border-bottom: 1px solid #0d356f; overflow: hidden; margin-top: 8px; margin-bottom: 14px; @@ -50,13 +50,13 @@ line-height: 28px; background: linear-gradient(0deg, rgba(0, 98, 183, 0.3) 0%, rgba(0, 98, 183, 0.1) 100%); font-weight: 400; - font-size: 16px; - color: #8FBFFE; + font-size: 15px; + color: #8fbffe; text-align: center; cursor: pointer; &.active { - color: #E0E5FA; + color: #e0e5fa; background: linear-gradient(0deg, rgba(9, 216, 241, 0.9) 0%, rgba(0, 98, 183, 0.3) 100%); } } @@ -69,7 +69,7 @@ padding-left: 32px; font-weight: 500; font-size: 16px; - color: #FFFFFF; + color: #ffffff; div { margin-left: 40px; @@ -105,11 +105,11 @@ } .blue { - color: #2CB7FF; + color: #2cb7ff; } .blueD { - color: #00FCFF; + color: #00fcff; } .leve2Title { @@ -118,7 +118,7 @@ background-size: 103% auto; font-weight: bold; font-size: 18px; - color: #E0E5FA; + color: #e0e5fa; padding-left: 45px; line-height: 60px; } @@ -130,7 +130,6 @@ // 弹框 .pmpSitNewDialog { - .el-dialog__header { display: none; } @@ -155,7 +154,7 @@ font-family: PangMenZhengDao; font-weight: 400; font-size: 24px; - color: #FFFFFF; + color: #ffffff; } .closeIcon { @@ -169,16 +168,15 @@ .contentBox { background: #071645; - border: 1px solid #163F80; + border: 1px solid #163f80; } - } // 表格样式 .dispatchTable { &.el-table { background: none; - color: #D2E2FF; + color: #d2e2ff; } .el-table__inner-wrapper::before { @@ -186,16 +184,16 @@ } tr { - background: linear-gradient(0deg, #00134F 0%, #003065 100%); + background: linear-gradient(0deg, #00134f 0%, #003065 100%); } td.el-table__cell, th.el-table__cell.is-leaf { - border-color: #163F80; + border-color: #163f80; } &.el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell { - background: linear-gradient(0deg, #001F75 0%, #284F93 100%); + background: linear-gradient(0deg, #001f75 0%, #284f93 100%); } .el-table__header-wrapper th { @@ -204,54 +202,58 @@ } .el-table__header-wrapper { - border: 1px solid #0B9BFF; + border: 1px solid #0b9bff; } th { - color: #FFFFFF !important; + color: #ffffff !important; font-size: 16px; } - &.el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell { + &.el-table--enable-row-hover .el-table__body tr:hover > td.el-table__cell { background: rgba(13, 57, 139, 0.7); } } // 弹框表格 .popUpTable { - .el-table{ + .el-table { font-weight: 400; -font-size: 14px; -color: #CCDFFF; -&.el-table--striped .el-table__body tr.el-table__row { - background: #0D2359; -} - &.el-table--enable-row-transition .el-table__body td.el-table__cell{ - background: #0D2359; + font-size: 14px; + color: #ccdfff; + &.el-table--striped .el-table__body tr.el-table__row { + background: #0d2359; } - &.el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell { + &.el-table--enable-row-transition .el-table__body td.el-table__cell { + background: #0d2359; + } + &.el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell { background: rgba(7, 22, 69, 1); } - td.el-table__cell, th.el-table__cell.is-leaf { + td.el-table__cell, + th.el-table__cell.is-leaf { border: 0; } - .el-table__header-wrapper th, .el-table__fixed-header-wrapper th { - background: #153990!important; + .el-table__header-wrapper th, + .el-table__fixed-header-wrapper th { + background: #153990 !important; font-weight: bold; - font-size: 14px; - color: #FFFFFF; + font-size: 14px; + color: #ffffff; } - .el-table--border .el-table__inner-wrapper::after, .el-table--border::after, .el-table--border::before, .el-table__inner-wrapper::before{ + .el-table--border .el-table__inner-wrapper::after, + .el-table--border::after, + .el-table--border::before, + .el-table__inner-wrapper::before { background: 0; } .el-table__empty-block { background: rgba(7, 22, 69, 1); } - &.el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell { + &.el-table--enable-row-hover .el-table__body tr:hover > td.el-table__cell { background: rgba(13, 57, 139, 0.7); } } - } // 降雨日历 .dayListPop { @@ -261,9 +263,7 @@ background: linear-gradient(90deg, rgba(10, 36, 121, 0.8) 0%, rgba(1, 28, 71, 0.6) 100%) !important; border-radius: 6px !important; border: 1px solid !important; - border-image: linear-gradient(0deg, #47AFFF, #47AFFF) 10 10 !important; - - + border-image: linear-gradient(0deg, #47afff, #47afff) 10 10 !important; border-radius: 10px !important; @@ -290,7 +290,7 @@ .num { line-height: 1; - white-space:nowrap; + white-space: nowrap; } &.current { @@ -353,15 +353,12 @@ background: none; color: #9d9d9d; } - .el-pager li.is-active{ + .el-pager li.is-active { color: #409eff; - } .el-input__wrapper { - background: linear-gradient(90deg, - rgba(32, 127, 244, 0.3) 0%, - rgba(32, 127, 244, 0.1) 100%); + background: linear-gradient(90deg, rgba(32, 127, 244, 0.3) 0%, rgba(32, 127, 244, 0.1) 100%); border: 1px solid #0497e9; color: #fff; box-shadow: none; @@ -369,7 +366,6 @@ .el-input__wrapper:hover { box-shadow: none; - } .el-input__inner { @@ -428,44 +424,44 @@ opacity: 0; } -.mapTotalDialog{ - .el-dialog{ +.mapTotalDialog { + .el-dialog { background: #071645; - .el-dialog__title{ + .el-dialog__title { font-family: 'PangMenZhengDao'; font-weight: 400; font-size: 24px; - color: #FFFFFF; + color: #ffffff; line-height: 44px; } } - .el-dialog__header{ + .el-dialog__header { height: 44px; background: url('@/assets/images/pictureOnMap/titlePop.png') no-repeat; - background-size:100% 100%; + background-size: 100% 100%; margin: 0; padding: 0 20px 0 50px; } - .el-dialog__headerbtn{ + .el-dialog__headerbtn { width: 44px; height: 44px; font-size: 30px; font-weight: bold; top: 0; right: 10px; - .el-dialog__close{ - color: #3FA4F6; - background: linear-gradient(0deg, #3FA4F6 0%, #F7FDFF 100%); + .el-dialog__close { + color: #3fa4f6; + background: linear-gradient(0deg, #3fa4f6 0%, #f7fdff 100%); -webkit-background-clip: text; -webkit-text-fill-color: transparent; } } - .el-dialog__body{ + .el-dialog__body { padding: 10px !important; - border: 1px solid #163F80; + border: 1px solid #163f80; } } -.curCick{ +.curCick { cursor: pointer; -} \ No newline at end of file +} diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js index 86078ff..4826300 100644 --- a/src/api/FloodControlAndDrainage.js +++ b/src/api/FloodControlAndDrainage.js @@ -1,10 +1,10 @@ -import request from '@/utils/request' +import request from '@/utils/request'; // 检测水位 export function queryRiverWaterLevel(data) { return request({ url: `/business/drainageMap/hhsxLakeInfo/queryRiverWaterLevel`, - method: "post", + method: 'post', data, }); } @@ -12,240 +12,240 @@ export function rainMapDataListBack(params) { return request({ url: `/business/drainageMap/drainageDispatch/rainMapDataListBack`, - method: "get", - params + method: 'get', + params, }); } export function rainCalendar(params) { return request({ url: `/business/drainageMap/rainData/rainCalendar`, - method: "get", - params + method: 'get', + params, }); } export function rainCalendarLately(params) { return request({ url: `/business/drainageMap/rainData/rainCalendarLately`, - method: "get", - params + method: 'get', + params, }); } export function rainMapDataBack(params) { return request({ url: `/business/drainageMap/drainageDispatch/rainMapDataBack`, - method: "get", - params + method: 'get', + params, }); } // 人员调度 export function personnelSchedulingInfoList(params) { return request({ url: `/business/drainageMap/personnelSchedulingInfo/list`, - method: "get", - params + method: 'get', + params, }); } // 物资调度 export function schedulingInfoList(params) { return request({ url: `/business/drainageMap/schedulingInfo/list`, - method: "get", - params + method: 'get', + params, }); } export function managementWarehouseGood(params) { return request({ url: `/business/drainageMap/managementWarehouseGood/list`, - method: "get", - params + method: 'get', + params, }); } -// +// export function siteMonitorwaterLevelBack(params) { return request({ url: `/business/drainageMap/siteMonitor/waterLevelBack`, - method: "get", - params + method: 'get', + params, }); } -// +// export function selectPumpMonitorListHistory(params) { return request({ url: `/business/drainageMap/facilityPump/selectPumpMonitorListHistory`, - method: "get", - params + method: 'get', + params, }); } -// +// export function getFxLogList(params) { return request({ url: `/business/drainageMap/drainageDispatch/getFxLogList`, - method: "get", - params + method: 'get', + params, }); } -// +// export function getBZFxLogList(params) { return request({ url: `/business/drainageMap/drainageDispatch/getBZFxLogList`, - method: "get", - params + method: 'get', + params, }); } -// +// export function warnData(params) { return request({ url: `/business/drainageMap/drainageDispatch/warnData`, - method: "get", - params + method: 'get', + params, }); } -// +// export function drainageFacilityDfxgxd(data) { return request({ url: `/business/drainageMap/drainageFacilityDfxgxd/list`, - method: "post", - data + method: 'post', + data, }); } // 预警建议 -export function getResponseRecommend(params){ +export function getResponseRecommend(params) { return request({ - url:'/business/drainageDispatch/getResponseRecommend', + url: '/business/drainageDispatch/getResponseRecommend', method: 'get', - params - }) + params, + }); } // 预警列表 -export function psWarningReleasePage(params){ +export function psWarningReleasePage(params) { return request({ - url:'/business/emergencyWarningRelease/page', + url: '/business/emergencyWarningRelease/page', method: 'get', - params - }) + params, + }); } // 预警新增 -export function psWarningReleaseSave(data){ +export function psWarningReleaseSave(data) { return request({ - url:'/business/emergencyWarningRelease/save', + url: '/business/emergencyWarningRelease/save', method: 'post', - data - }) + data, + }); } // 预警发布 -export function emergencyWarningReleasePublish(data){ +export function emergencyWarningReleasePublish(data) { return request({ - url:'/business/emergencyWarningRelease/publish', + url: '/business/emergencyWarningRelease/publish', method: 'post', - data - }) + data, + }); } // 预警解除 -export function emergencyWarningReleaseRelease(data){ +export function emergencyWarningReleaseRelease(data) { return request({ - url:'/business/emergencyWarningRelease/release', + url: '/business/emergencyWarningRelease/release', method: 'post', - data - }) + data, + }); } // 预警说明 -export function psWarningIllustrate(params){ +export function psWarningIllustrate(params) { return request({ - url:'/business/informationPlan/plan-list', + url: '/business/informationPlan/plan-list', method: 'get', - params - }) + params, + }); } // 监测预警 `````````````````````````` // 监测预警 顶部数量 -export function drainageDispatchmonitorCount(params){ +export function drainageDispatchmonitorCount(params) { return request({ - url:'/business/drainageDispatch/monitorCount', + url: '/business/drainageDispatch/monitorCount', method: 'get', - params - }) + params, + }); } // 监测数据 -export function drainageDispatchMonitorData(params){ +export function drainageDispatchMonitorData(params) { return request({ - url:'/business/drainageDispatch/monitorData', + url: '/business/drainageDispatch/monitorData', method: 'get', - params - }) + params, + }); } // 监测告警 -export function drainageDispatchWarnData(params){ +export function drainageDispatchWarnData(params) { return request({ - url:'/business/drainageDispatch/warnData', + url: '/business/drainageDispatch/warnData', method: 'get', - params - }) + params, + }); } // 排涝风险区域 -export function drainageDispatchDrainageRiskAreaCount(params){ +export function drainageDispatchDrainageRiskAreaCount(params) { return request({ - url:'/business/drainageDispatch/drainageRiskAreaCount', + url: '/business/drainageDispatch/drainageRiskAreaCount', method: 'get', - params - }) + params, + }); } // 预案分析 -export function drainageDispatchGetPlanAnalysis(params){ +export function drainageDispatchGetPlanAnalysis(params) { return request({ - url:'/business/drainageDispatch/getPlanAnalysis', + url: '/business/drainageDispatch/getPlanAnalysis', method: 'get', - params - }) + params, + }); } // 防汛检查 -export function drainageDispatchGetCheckCount(params){ +export function drainageDispatchGetCheckCount(params) { return request({ - url:'/business/drainageDispatch/getCheckCount', + url: '/business/drainageDispatch/getCheckCount', method: 'get', - params - }) + params, + }); } // 值班统计 -export function drainageDispatchGetDutyCount(params){ +export function drainageDispatchGetDutyCount(params) { return request({ - url:'/business/drainageDispatch/getDutyCount', + url: '/business/drainageDispatch/getDutyCount', method: 'get', - params - }) + params, + }); } // 今日值班人员 -export function drainageDispatchGetFbTodayDutyUserShift(params){ +export function drainageDispatchGetFbTodayDutyUserShift(params) { return request({ - url:'/business/drainageDispatch/getFbTodayDutyUserShift', + url: '/business/drainageDispatch/getFbTodayDutyUserShift', method: 'get', - params - }) + params, + }); } // 排涝值守统计 -export function drainageDispatchGetWatchCount(params){ +export function drainageDispatchGetWatchCount(params) { return request({ - url:'/business/drainageDispatch/getWatchCount', + url: '/business/drainageDispatch/getWatchCount', method: 'get', - params - }) + params, + }); } // 降雨预报 -export function dataSiteRelationRainTrend(params){ +export function dataSiteRelationRainTrend(params) { return request({ - url:'/business/dataSiteRelation/rainTrend', + url: '/business/dataSiteRelation/rainTrend', method: 'get', - params - }) + params, + }); } // 当前预警信息 -export function getRecommendLevel(data){ +export function getRecommendLevel(data) { return request({ - url:'/business/emergencyWarningRelease/getRecommendLevel', + url: '/business/emergencyWarningRelease/getRecommendLevel', method: 'get', - data - }) + data, + }); } // 查询基础数据-水系汇水分区列表 export function listwaterRegionInfo(query) { @@ -264,74 +264,74 @@ }); } // 防汛检查 -export function streetFloodList(data){ +export function streetFloodList(data) { return request({ - url:'/business/drainageMap/streetFlood/list', + url: '/business/drainageMap/streetFlood/list', method: 'get', - data - }) + data, + }); } // 值守检查 -export function watchAreaList(data){ +export function watchAreaList(data) { return request({ - url:'/business/drainageMap/watchArea/list', + url: '/business/drainageMap/watchArea/list', method: 'get', - data - }) + data, + }); } // 排渍检查 -export function watchAreaSortingScheduling(params){ +export function watchAreaSortingScheduling(params) { return request({ - url:'/business/drainageMap/watchArea/SortingScheduling', + url: '/business/drainageMap/watchArea/SortingScheduling', method: 'get', - params - }) + params, + }); } // 排渍明细 -export function watchAreaCheckPicture(params){ +export function watchAreaCheckPicture(params) { return request({ - url:'/business/drainageMap/watchArea/checkPicture', + url: '/business/drainageMap/watchArea/checkPicture', method: 'get', - params - }) + params, + }); } // 值守明细 -export function watchAreaDutyPersonnel(params){ +export function watchAreaDutyPersonnel(params) { return request({ - url:'/business/drainageMap/watchArea/dutyPersonnel', + url: '/business/drainageMap/watchArea/dutyPersonnel', method: 'get', - params - }) + params, + }); } // 泵站调度 -export function watchAreaDutyPumpScheduling(params){ +export function watchAreaDutyPumpScheduling(params) { return request({ - url:'/business/drainageMap/watchArea/pumpScheduling', + url: '/business/drainageMap/watchArea/pumpScheduling', method: 'get', - params - }) + params, + }); } // 下发泵站调度 -export function dispatchOutbound(data){ +export function dispatchOutbound(data) { return request({ - url:'/business/drainageMap/dispatch/outbound', + url: '/business/drainageMap/dispatch/outbound', method: 'post', - data - }) + data, + }); } -export function pumpDispatchCommandPublish(data){ +export function pumpDispatchCommandPublish(data) { return request({ - url:'/business/pumpDispatchCommand/publish', + url: '/business/pumpDispatchCommand/publish', method: 'post', - data - }) + data, + }); } -export function pumpDispatchHistoryList(params){ +export function pumpDispatchHistoryList(params) { return request({ - url:'/business/pumpDispatchHistory/list', + url: '/business/pumpDispatchHistory/list', method: 'get', - params - }) + params, + }); } // 降雨分布 export function monitorUnitRainfallDistributionGetRainMap(params) { @@ -350,25 +350,25 @@ }); } // 渍水点详情 -export function waterloggingPointInfo(id){ +export function waterloggingPointInfo(id) { return request({ url: `/business/waterloggingPointInfo/${id}`, method: 'get', - }) + }); } // 泵站工情雨水详情 -export function rainWaterPumpStationInfo(id){ +export function rainWaterPumpStationInfo(id) { return request({ url: `/business/rainWaterPumpStationInfo/${id}`, method: 'get', - }) + }); } //泵站工情污水详情 -export function sewagePumpStationInfo(id){ +export function sewagePumpStationInfo(id) { return request({ url: `/business/sewagePumpStationInfo/${id}`, method: 'get', - }) + }); } // 河湖详情 export function lakeInfoList(query) { @@ -426,12 +426,12 @@ }); } // 渍水调度任务 -export function distributeTask(data){ +export function distributeTask(data) { return request({ - url:'/business/watchResponseTask/distributeTask', + url: '/business/watchResponseTask/distributeTask', method: 'post', - data - }) + data, + }); } export function watchDispatchList(query) { return request({ @@ -460,14 +460,23 @@ return request({ url: '/business/emergencyWarningRelease/list', method: 'get', - params + params, }); } export function pumpStationStatistics(params) { return request({ url: '/business/drainageMap/pumpStationStatistics', method: 'get', - params + params, }); } -// ``````````EDN````````````````````` \ No newline at end of file + +export function drainageDispatchCall(params) { + return request({ + url: '/business/drainageDispatch/call', + method: 'get', + params, + }); +} + +// ``````````EDN````````````````````` diff --git a/src/assets/images/pictureOnMap/eachBgc22.png b/src/assets/images/pictureOnMap/eachBgc22.png new file mode 100644 index 0000000..da1640f --- /dev/null +++ b/src/assets/images/pictureOnMap/eachBgc22.png Binary files differ diff --git a/src/assets/styles/pictureOnMap.scss b/src/assets/styles/pictureOnMap.scss index c3ae4f7..5dece19 100644 --- a/src/assets/styles/pictureOnMap.scss +++ b/src/assets/styles/pictureOnMap.scss @@ -40,7 +40,7 @@ .typeList { padding-bottom: 2px; - border-bottom: 1px solid #0D356F; + border-bottom: 1px solid #0d356f; overflow: hidden; margin-top: 8px; margin-bottom: 14px; @@ -50,13 +50,13 @@ line-height: 28px; background: linear-gradient(0deg, rgba(0, 98, 183, 0.3) 0%, rgba(0, 98, 183, 0.1) 100%); font-weight: 400; - font-size: 16px; - color: #8FBFFE; + font-size: 15px; + color: #8fbffe; text-align: center; cursor: pointer; &.active { - color: #E0E5FA; + color: #e0e5fa; background: linear-gradient(0deg, rgba(9, 216, 241, 0.9) 0%, rgba(0, 98, 183, 0.3) 100%); } } @@ -69,7 +69,7 @@ padding-left: 32px; font-weight: 500; font-size: 16px; - color: #FFFFFF; + color: #ffffff; div { margin-left: 40px; @@ -105,11 +105,11 @@ } .blue { - color: #2CB7FF; + color: #2cb7ff; } .blueD { - color: #00FCFF; + color: #00fcff; } .leve2Title { @@ -118,7 +118,7 @@ background-size: 103% auto; font-weight: bold; font-size: 18px; - color: #E0E5FA; + color: #e0e5fa; padding-left: 45px; line-height: 60px; } @@ -130,7 +130,6 @@ // 弹框 .pmpSitNewDialog { - .el-dialog__header { display: none; } @@ -155,7 +154,7 @@ font-family: PangMenZhengDao; font-weight: 400; font-size: 24px; - color: #FFFFFF; + color: #ffffff; } .closeIcon { @@ -169,16 +168,15 @@ .contentBox { background: #071645; - border: 1px solid #163F80; + border: 1px solid #163f80; } - } // 表格样式 .dispatchTable { &.el-table { background: none; - color: #D2E2FF; + color: #d2e2ff; } .el-table__inner-wrapper::before { @@ -186,16 +184,16 @@ } tr { - background: linear-gradient(0deg, #00134F 0%, #003065 100%); + background: linear-gradient(0deg, #00134f 0%, #003065 100%); } td.el-table__cell, th.el-table__cell.is-leaf { - border-color: #163F80; + border-color: #163f80; } &.el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell { - background: linear-gradient(0deg, #001F75 0%, #284F93 100%); + background: linear-gradient(0deg, #001f75 0%, #284f93 100%); } .el-table__header-wrapper th { @@ -204,54 +202,58 @@ } .el-table__header-wrapper { - border: 1px solid #0B9BFF; + border: 1px solid #0b9bff; } th { - color: #FFFFFF !important; + color: #ffffff !important; font-size: 16px; } - &.el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell { + &.el-table--enable-row-hover .el-table__body tr:hover > td.el-table__cell { background: rgba(13, 57, 139, 0.7); } } // 弹框表格 .popUpTable { - .el-table{ + .el-table { font-weight: 400; -font-size: 14px; -color: #CCDFFF; -&.el-table--striped .el-table__body tr.el-table__row { - background: #0D2359; -} - &.el-table--enable-row-transition .el-table__body td.el-table__cell{ - background: #0D2359; + font-size: 14px; + color: #ccdfff; + &.el-table--striped .el-table__body tr.el-table__row { + background: #0d2359; } - &.el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell { + &.el-table--enable-row-transition .el-table__body td.el-table__cell { + background: #0d2359; + } + &.el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell { background: rgba(7, 22, 69, 1); } - td.el-table__cell, th.el-table__cell.is-leaf { + td.el-table__cell, + th.el-table__cell.is-leaf { border: 0; } - .el-table__header-wrapper th, .el-table__fixed-header-wrapper th { - background: #153990!important; + .el-table__header-wrapper th, + .el-table__fixed-header-wrapper th { + background: #153990 !important; font-weight: bold; - font-size: 14px; - color: #FFFFFF; + font-size: 14px; + color: #ffffff; } - .el-table--border .el-table__inner-wrapper::after, .el-table--border::after, .el-table--border::before, .el-table__inner-wrapper::before{ + .el-table--border .el-table__inner-wrapper::after, + .el-table--border::after, + .el-table--border::before, + .el-table__inner-wrapper::before { background: 0; } .el-table__empty-block { background: rgba(7, 22, 69, 1); } - &.el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell { + &.el-table--enable-row-hover .el-table__body tr:hover > td.el-table__cell { background: rgba(13, 57, 139, 0.7); } } - } // 降雨日历 .dayListPop { @@ -261,9 +263,7 @@ background: linear-gradient(90deg, rgba(10, 36, 121, 0.8) 0%, rgba(1, 28, 71, 0.6) 100%) !important; border-radius: 6px !important; border: 1px solid !important; - border-image: linear-gradient(0deg, #47AFFF, #47AFFF) 10 10 !important; - - + border-image: linear-gradient(0deg, #47afff, #47afff) 10 10 !important; border-radius: 10px !important; @@ -290,7 +290,7 @@ .num { line-height: 1; - white-space:nowrap; + white-space: nowrap; } &.current { @@ -353,15 +353,12 @@ background: none; color: #9d9d9d; } - .el-pager li.is-active{ + .el-pager li.is-active { color: #409eff; - } .el-input__wrapper { - background: linear-gradient(90deg, - rgba(32, 127, 244, 0.3) 0%, - rgba(32, 127, 244, 0.1) 100%); + background: linear-gradient(90deg, rgba(32, 127, 244, 0.3) 0%, rgba(32, 127, 244, 0.1) 100%); border: 1px solid #0497e9; color: #fff; box-shadow: none; @@ -369,7 +366,6 @@ .el-input__wrapper:hover { box-shadow: none; - } .el-input__inner { @@ -428,44 +424,44 @@ opacity: 0; } -.mapTotalDialog{ - .el-dialog{ +.mapTotalDialog { + .el-dialog { background: #071645; - .el-dialog__title{ + .el-dialog__title { font-family: 'PangMenZhengDao'; font-weight: 400; font-size: 24px; - color: #FFFFFF; + color: #ffffff; line-height: 44px; } } - .el-dialog__header{ + .el-dialog__header { height: 44px; background: url('@/assets/images/pictureOnMap/titlePop.png') no-repeat; - background-size:100% 100%; + background-size: 100% 100%; margin: 0; padding: 0 20px 0 50px; } - .el-dialog__headerbtn{ + .el-dialog__headerbtn { width: 44px; height: 44px; font-size: 30px; font-weight: bold; top: 0; right: 10px; - .el-dialog__close{ - color: #3FA4F6; - background: linear-gradient(0deg, #3FA4F6 0%, #F7FDFF 100%); + .el-dialog__close { + color: #3fa4f6; + background: linear-gradient(0deg, #3fa4f6 0%, #f7fdff 100%); -webkit-background-clip: text; -webkit-text-fill-color: transparent; } } - .el-dialog__body{ + .el-dialog__body { padding: 10px !important; - border: 1px solid #163F80; + border: 1px solid #163f80; } } -.curCick{ +.curCick { cursor: pointer; -} \ No newline at end of file +} diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index 741e66c..0240ccf 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -103,9 +103,7 @@ 'outlet_water_level_city', //排口流量 'plcSewagePumpStation', //plc污水泵站 'plcRainPumpStation', //plc雨水泵站 - "plcGateStation",//plc水闸 - - + 'plcGateStation', //plc水闸 ]); // 基本数据 const arrid = ref([ @@ -126,8 +124,8 @@ 'water_region_info', // 水系汇水分区 'storehouse', //物资仓库 'dikeGood', //堤防备料 - "waterlog_community", - "waterlogging_scheduling",//渍水风险点 + 'waterlog_community', + 'waterlogging_scheduling', //渍水风险点 ]); // 视频点 const videoList = ref([ @@ -265,7 +263,6 @@ // name: "dp_ysgwfx", //大屏雨水管网风险分析弹框 // value: "rainwater_pipeline_quality", //雨水管网水质 // }, - ]; return arr.find(item => item.value == type)?.name || null; }; @@ -333,7 +330,8 @@ if (type == 'sewage_pipeline_quality_city') { type = 'sewage_pipeline_quality'; } - if (type == 'waterlog_community') {//渍水风险点 + if (type == 'waterlog_community') { + //渍水风险点 type = 'waterlogging_point_info'; } @@ -455,20 +453,20 @@ // 处理标注 Getproperties.value = properties; - let type = properties ? properties.type : '' || 1; + let type = properties ? properties.type : '' || 1; // 针对调度辅助决策易渍水点做的判断 - let fzjcArr=['waterlog_community_text','waterloggingPointRelation'] - if(fzjcArr.includes(properties.type)){ - // 调度辅助决策易渍水点上图统一类型 - type=properties._image - if(!Object.keys(properties).includes('stCode')){ - properties.stCode=properties.dataCode - } - if(!Object.keys(properties).includes('id')){ - properties.id=properties.dataId - } + let fzjcArr = ['waterlog_community_text', 'waterloggingPointRelation']; + if (fzjcArr.includes(properties.type)) { + // 调度辅助决策易渍水点上图统一类型 + type = properties._image; + if (!Object.keys(properties).includes('stCode')) { + properties.stCode = properties.dataCode; } - + if (!Object.keys(properties).includes('id')) { + properties.id = properties.dataId; + } + } + let Name = properties ? properties.pointTypeName : '' || ''; // Annotation(properties); console.log('1111', type, layerId); @@ -578,10 +576,10 @@ if (arrid.value.includes(item.stType)) { properties.id = item.pid || item.id; } - if(item.stType=="waterlogging"||item.stType=="rainwater_pipeline_quality"){ - Getproperties.value.peopleUser=item.watchId - Getproperties.value.useTitle=item.stName - }else { + if (item.stType == 'waterlogging' || item.stType == 'rainwater_pipeline_quality') { + Getproperties.value.peopleUser = item.watchId; + Getproperties.value.useTitle = item.stName; + } else { Getproperties.value.peopleUser = null; Getproperties.value.useTitle = null; } @@ -615,7 +613,7 @@ Getproperties.value.geometry = item.geometry || item.geometrys; dialogConfig.visible = true; } - debugger + // debugger }); bus.on('closedia', e => { closediaMeth(); diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js index 86078ff..4826300 100644 --- a/src/api/FloodControlAndDrainage.js +++ b/src/api/FloodControlAndDrainage.js @@ -1,10 +1,10 @@ -import request from '@/utils/request' +import request from '@/utils/request'; // 检测水位 export function queryRiverWaterLevel(data) { return request({ url: `/business/drainageMap/hhsxLakeInfo/queryRiverWaterLevel`, - method: "post", + method: 'post', data, }); } @@ -12,240 +12,240 @@ export function rainMapDataListBack(params) { return request({ url: `/business/drainageMap/drainageDispatch/rainMapDataListBack`, - method: "get", - params + method: 'get', + params, }); } export function rainCalendar(params) { return request({ url: `/business/drainageMap/rainData/rainCalendar`, - method: "get", - params + method: 'get', + params, }); } export function rainCalendarLately(params) { return request({ url: `/business/drainageMap/rainData/rainCalendarLately`, - method: "get", - params + method: 'get', + params, }); } export function rainMapDataBack(params) { return request({ url: `/business/drainageMap/drainageDispatch/rainMapDataBack`, - method: "get", - params + method: 'get', + params, }); } // 人员调度 export function personnelSchedulingInfoList(params) { return request({ url: `/business/drainageMap/personnelSchedulingInfo/list`, - method: "get", - params + method: 'get', + params, }); } // 物资调度 export function schedulingInfoList(params) { return request({ url: `/business/drainageMap/schedulingInfo/list`, - method: "get", - params + method: 'get', + params, }); } export function managementWarehouseGood(params) { return request({ url: `/business/drainageMap/managementWarehouseGood/list`, - method: "get", - params + method: 'get', + params, }); } -// +// export function siteMonitorwaterLevelBack(params) { return request({ url: `/business/drainageMap/siteMonitor/waterLevelBack`, - method: "get", - params + method: 'get', + params, }); } -// +// export function selectPumpMonitorListHistory(params) { return request({ url: `/business/drainageMap/facilityPump/selectPumpMonitorListHistory`, - method: "get", - params + method: 'get', + params, }); } -// +// export function getFxLogList(params) { return request({ url: `/business/drainageMap/drainageDispatch/getFxLogList`, - method: "get", - params + method: 'get', + params, }); } -// +// export function getBZFxLogList(params) { return request({ url: `/business/drainageMap/drainageDispatch/getBZFxLogList`, - method: "get", - params + method: 'get', + params, }); } -// +// export function warnData(params) { return request({ url: `/business/drainageMap/drainageDispatch/warnData`, - method: "get", - params + method: 'get', + params, }); } -// +// export function drainageFacilityDfxgxd(data) { return request({ url: `/business/drainageMap/drainageFacilityDfxgxd/list`, - method: "post", - data + method: 'post', + data, }); } // 预警建议 -export function getResponseRecommend(params){ +export function getResponseRecommend(params) { return request({ - url:'/business/drainageDispatch/getResponseRecommend', + url: '/business/drainageDispatch/getResponseRecommend', method: 'get', - params - }) + params, + }); } // 预警列表 -export function psWarningReleasePage(params){ +export function psWarningReleasePage(params) { return request({ - url:'/business/emergencyWarningRelease/page', + url: '/business/emergencyWarningRelease/page', method: 'get', - params - }) + params, + }); } // 预警新增 -export function psWarningReleaseSave(data){ +export function psWarningReleaseSave(data) { return request({ - url:'/business/emergencyWarningRelease/save', + url: '/business/emergencyWarningRelease/save', method: 'post', - data - }) + data, + }); } // 预警发布 -export function emergencyWarningReleasePublish(data){ +export function emergencyWarningReleasePublish(data) { return request({ - url:'/business/emergencyWarningRelease/publish', + url: '/business/emergencyWarningRelease/publish', method: 'post', - data - }) + data, + }); } // 预警解除 -export function emergencyWarningReleaseRelease(data){ +export function emergencyWarningReleaseRelease(data) { return request({ - url:'/business/emergencyWarningRelease/release', + url: '/business/emergencyWarningRelease/release', method: 'post', - data - }) + data, + }); } // 预警说明 -export function psWarningIllustrate(params){ +export function psWarningIllustrate(params) { return request({ - url:'/business/informationPlan/plan-list', + url: '/business/informationPlan/plan-list', method: 'get', - params - }) + params, + }); } // 监测预警 `````````````````````````` // 监测预警 顶部数量 -export function drainageDispatchmonitorCount(params){ +export function drainageDispatchmonitorCount(params) { return request({ - url:'/business/drainageDispatch/monitorCount', + url: '/business/drainageDispatch/monitorCount', method: 'get', - params - }) + params, + }); } // 监测数据 -export function drainageDispatchMonitorData(params){ +export function drainageDispatchMonitorData(params) { return request({ - url:'/business/drainageDispatch/monitorData', + url: '/business/drainageDispatch/monitorData', method: 'get', - params - }) + params, + }); } // 监测告警 -export function drainageDispatchWarnData(params){ +export function drainageDispatchWarnData(params) { return request({ - url:'/business/drainageDispatch/warnData', + url: '/business/drainageDispatch/warnData', method: 'get', - params - }) + params, + }); } // 排涝风险区域 -export function drainageDispatchDrainageRiskAreaCount(params){ +export function drainageDispatchDrainageRiskAreaCount(params) { return request({ - url:'/business/drainageDispatch/drainageRiskAreaCount', + url: '/business/drainageDispatch/drainageRiskAreaCount', method: 'get', - params - }) + params, + }); } // 预案分析 -export function drainageDispatchGetPlanAnalysis(params){ +export function drainageDispatchGetPlanAnalysis(params) { return request({ - url:'/business/drainageDispatch/getPlanAnalysis', + url: '/business/drainageDispatch/getPlanAnalysis', method: 'get', - params - }) + params, + }); } // 防汛检查 -export function drainageDispatchGetCheckCount(params){ +export function drainageDispatchGetCheckCount(params) { return request({ - url:'/business/drainageDispatch/getCheckCount', + url: '/business/drainageDispatch/getCheckCount', method: 'get', - params - }) + params, + }); } // 值班统计 -export function drainageDispatchGetDutyCount(params){ +export function drainageDispatchGetDutyCount(params) { return request({ - url:'/business/drainageDispatch/getDutyCount', + url: '/business/drainageDispatch/getDutyCount', method: 'get', - params - }) + params, + }); } // 今日值班人员 -export function drainageDispatchGetFbTodayDutyUserShift(params){ +export function drainageDispatchGetFbTodayDutyUserShift(params) { return request({ - url:'/business/drainageDispatch/getFbTodayDutyUserShift', + url: '/business/drainageDispatch/getFbTodayDutyUserShift', method: 'get', - params - }) + params, + }); } // 排涝值守统计 -export function drainageDispatchGetWatchCount(params){ +export function drainageDispatchGetWatchCount(params) { return request({ - url:'/business/drainageDispatch/getWatchCount', + url: '/business/drainageDispatch/getWatchCount', method: 'get', - params - }) + params, + }); } // 降雨预报 -export function dataSiteRelationRainTrend(params){ +export function dataSiteRelationRainTrend(params) { return request({ - url:'/business/dataSiteRelation/rainTrend', + url: '/business/dataSiteRelation/rainTrend', method: 'get', - params - }) + params, + }); } // 当前预警信息 -export function getRecommendLevel(data){ +export function getRecommendLevel(data) { return request({ - url:'/business/emergencyWarningRelease/getRecommendLevel', + url: '/business/emergencyWarningRelease/getRecommendLevel', method: 'get', - data - }) + data, + }); } // 查询基础数据-水系汇水分区列表 export function listwaterRegionInfo(query) { @@ -264,74 +264,74 @@ }); } // 防汛检查 -export function streetFloodList(data){ +export function streetFloodList(data) { return request({ - url:'/business/drainageMap/streetFlood/list', + url: '/business/drainageMap/streetFlood/list', method: 'get', - data - }) + data, + }); } // 值守检查 -export function watchAreaList(data){ +export function watchAreaList(data) { return request({ - url:'/business/drainageMap/watchArea/list', + url: '/business/drainageMap/watchArea/list', method: 'get', - data - }) + data, + }); } // 排渍检查 -export function watchAreaSortingScheduling(params){ +export function watchAreaSortingScheduling(params) { return request({ - url:'/business/drainageMap/watchArea/SortingScheduling', + url: '/business/drainageMap/watchArea/SortingScheduling', method: 'get', - params - }) + params, + }); } // 排渍明细 -export function watchAreaCheckPicture(params){ +export function watchAreaCheckPicture(params) { return request({ - url:'/business/drainageMap/watchArea/checkPicture', + url: '/business/drainageMap/watchArea/checkPicture', method: 'get', - params - }) + params, + }); } // 值守明细 -export function watchAreaDutyPersonnel(params){ +export function watchAreaDutyPersonnel(params) { return request({ - url:'/business/drainageMap/watchArea/dutyPersonnel', + url: '/business/drainageMap/watchArea/dutyPersonnel', method: 'get', - params - }) + params, + }); } // 泵站调度 -export function watchAreaDutyPumpScheduling(params){ +export function watchAreaDutyPumpScheduling(params) { return request({ - url:'/business/drainageMap/watchArea/pumpScheduling', + url: '/business/drainageMap/watchArea/pumpScheduling', method: 'get', - params - }) + params, + }); } // 下发泵站调度 -export function dispatchOutbound(data){ +export function dispatchOutbound(data) { return request({ - url:'/business/drainageMap/dispatch/outbound', + url: '/business/drainageMap/dispatch/outbound', method: 'post', - data - }) + data, + }); } -export function pumpDispatchCommandPublish(data){ +export function pumpDispatchCommandPublish(data) { return request({ - url:'/business/pumpDispatchCommand/publish', + url: '/business/pumpDispatchCommand/publish', method: 'post', - data - }) + data, + }); } -export function pumpDispatchHistoryList(params){ +export function pumpDispatchHistoryList(params) { return request({ - url:'/business/pumpDispatchHistory/list', + url: '/business/pumpDispatchHistory/list', method: 'get', - params - }) + params, + }); } // 降雨分布 export function monitorUnitRainfallDistributionGetRainMap(params) { @@ -350,25 +350,25 @@ }); } // 渍水点详情 -export function waterloggingPointInfo(id){ +export function waterloggingPointInfo(id) { return request({ url: `/business/waterloggingPointInfo/${id}`, method: 'get', - }) + }); } // 泵站工情雨水详情 -export function rainWaterPumpStationInfo(id){ +export function rainWaterPumpStationInfo(id) { return request({ url: `/business/rainWaterPumpStationInfo/${id}`, method: 'get', - }) + }); } //泵站工情污水详情 -export function sewagePumpStationInfo(id){ +export function sewagePumpStationInfo(id) { return request({ url: `/business/sewagePumpStationInfo/${id}`, method: 'get', - }) + }); } // 河湖详情 export function lakeInfoList(query) { @@ -426,12 +426,12 @@ }); } // 渍水调度任务 -export function distributeTask(data){ +export function distributeTask(data) { return request({ - url:'/business/watchResponseTask/distributeTask', + url: '/business/watchResponseTask/distributeTask', method: 'post', - data - }) + data, + }); } export function watchDispatchList(query) { return request({ @@ -460,14 +460,23 @@ return request({ url: '/business/emergencyWarningRelease/list', method: 'get', - params + params, }); } export function pumpStationStatistics(params) { return request({ url: '/business/drainageMap/pumpStationStatistics', method: 'get', - params + params, }); } -// ``````````EDN````````````````````` \ No newline at end of file + +export function drainageDispatchCall(params) { + return request({ + url: '/business/drainageDispatch/call', + method: 'get', + params, + }); +} + +// ``````````EDN````````````````````` diff --git a/src/assets/images/pictureOnMap/eachBgc22.png b/src/assets/images/pictureOnMap/eachBgc22.png new file mode 100644 index 0000000..da1640f --- /dev/null +++ b/src/assets/images/pictureOnMap/eachBgc22.png Binary files differ diff --git a/src/assets/styles/pictureOnMap.scss b/src/assets/styles/pictureOnMap.scss index c3ae4f7..5dece19 100644 --- a/src/assets/styles/pictureOnMap.scss +++ b/src/assets/styles/pictureOnMap.scss @@ -40,7 +40,7 @@ .typeList { padding-bottom: 2px; - border-bottom: 1px solid #0D356F; + border-bottom: 1px solid #0d356f; overflow: hidden; margin-top: 8px; margin-bottom: 14px; @@ -50,13 +50,13 @@ line-height: 28px; background: linear-gradient(0deg, rgba(0, 98, 183, 0.3) 0%, rgba(0, 98, 183, 0.1) 100%); font-weight: 400; - font-size: 16px; - color: #8FBFFE; + font-size: 15px; + color: #8fbffe; text-align: center; cursor: pointer; &.active { - color: #E0E5FA; + color: #e0e5fa; background: linear-gradient(0deg, rgba(9, 216, 241, 0.9) 0%, rgba(0, 98, 183, 0.3) 100%); } } @@ -69,7 +69,7 @@ padding-left: 32px; font-weight: 500; font-size: 16px; - color: #FFFFFF; + color: #ffffff; div { margin-left: 40px; @@ -105,11 +105,11 @@ } .blue { - color: #2CB7FF; + color: #2cb7ff; } .blueD { - color: #00FCFF; + color: #00fcff; } .leve2Title { @@ -118,7 +118,7 @@ background-size: 103% auto; font-weight: bold; font-size: 18px; - color: #E0E5FA; + color: #e0e5fa; padding-left: 45px; line-height: 60px; } @@ -130,7 +130,6 @@ // 弹框 .pmpSitNewDialog { - .el-dialog__header { display: none; } @@ -155,7 +154,7 @@ font-family: PangMenZhengDao; font-weight: 400; font-size: 24px; - color: #FFFFFF; + color: #ffffff; } .closeIcon { @@ -169,16 +168,15 @@ .contentBox { background: #071645; - border: 1px solid #163F80; + border: 1px solid #163f80; } - } // 表格样式 .dispatchTable { &.el-table { background: none; - color: #D2E2FF; + color: #d2e2ff; } .el-table__inner-wrapper::before { @@ -186,16 +184,16 @@ } tr { - background: linear-gradient(0deg, #00134F 0%, #003065 100%); + background: linear-gradient(0deg, #00134f 0%, #003065 100%); } td.el-table__cell, th.el-table__cell.is-leaf { - border-color: #163F80; + border-color: #163f80; } &.el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell { - background: linear-gradient(0deg, #001F75 0%, #284F93 100%); + background: linear-gradient(0deg, #001f75 0%, #284f93 100%); } .el-table__header-wrapper th { @@ -204,54 +202,58 @@ } .el-table__header-wrapper { - border: 1px solid #0B9BFF; + border: 1px solid #0b9bff; } th { - color: #FFFFFF !important; + color: #ffffff !important; font-size: 16px; } - &.el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell { + &.el-table--enable-row-hover .el-table__body tr:hover > td.el-table__cell { background: rgba(13, 57, 139, 0.7); } } // 弹框表格 .popUpTable { - .el-table{ + .el-table { font-weight: 400; -font-size: 14px; -color: #CCDFFF; -&.el-table--striped .el-table__body tr.el-table__row { - background: #0D2359; -} - &.el-table--enable-row-transition .el-table__body td.el-table__cell{ - background: #0D2359; + font-size: 14px; + color: #ccdfff; + &.el-table--striped .el-table__body tr.el-table__row { + background: #0d2359; } - &.el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell { + &.el-table--enable-row-transition .el-table__body td.el-table__cell { + background: #0d2359; + } + &.el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell { background: rgba(7, 22, 69, 1); } - td.el-table__cell, th.el-table__cell.is-leaf { + td.el-table__cell, + th.el-table__cell.is-leaf { border: 0; } - .el-table__header-wrapper th, .el-table__fixed-header-wrapper th { - background: #153990!important; + .el-table__header-wrapper th, + .el-table__fixed-header-wrapper th { + background: #153990 !important; font-weight: bold; - font-size: 14px; - color: #FFFFFF; + font-size: 14px; + color: #ffffff; } - .el-table--border .el-table__inner-wrapper::after, .el-table--border::after, .el-table--border::before, .el-table__inner-wrapper::before{ + .el-table--border .el-table__inner-wrapper::after, + .el-table--border::after, + .el-table--border::before, + .el-table__inner-wrapper::before { background: 0; } .el-table__empty-block { background: rgba(7, 22, 69, 1); } - &.el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell { + &.el-table--enable-row-hover .el-table__body tr:hover > td.el-table__cell { background: rgba(13, 57, 139, 0.7); } } - } // 降雨日历 .dayListPop { @@ -261,9 +263,7 @@ background: linear-gradient(90deg, rgba(10, 36, 121, 0.8) 0%, rgba(1, 28, 71, 0.6) 100%) !important; border-radius: 6px !important; border: 1px solid !important; - border-image: linear-gradient(0deg, #47AFFF, #47AFFF) 10 10 !important; - - + border-image: linear-gradient(0deg, #47afff, #47afff) 10 10 !important; border-radius: 10px !important; @@ -290,7 +290,7 @@ .num { line-height: 1; - white-space:nowrap; + white-space: nowrap; } &.current { @@ -353,15 +353,12 @@ background: none; color: #9d9d9d; } - .el-pager li.is-active{ + .el-pager li.is-active { color: #409eff; - } .el-input__wrapper { - background: linear-gradient(90deg, - rgba(32, 127, 244, 0.3) 0%, - rgba(32, 127, 244, 0.1) 100%); + background: linear-gradient(90deg, rgba(32, 127, 244, 0.3) 0%, rgba(32, 127, 244, 0.1) 100%); border: 1px solid #0497e9; color: #fff; box-shadow: none; @@ -369,7 +366,6 @@ .el-input__wrapper:hover { box-shadow: none; - } .el-input__inner { @@ -428,44 +424,44 @@ opacity: 0; } -.mapTotalDialog{ - .el-dialog{ +.mapTotalDialog { + .el-dialog { background: #071645; - .el-dialog__title{ + .el-dialog__title { font-family: 'PangMenZhengDao'; font-weight: 400; font-size: 24px; - color: #FFFFFF; + color: #ffffff; line-height: 44px; } } - .el-dialog__header{ + .el-dialog__header { height: 44px; background: url('@/assets/images/pictureOnMap/titlePop.png') no-repeat; - background-size:100% 100%; + background-size: 100% 100%; margin: 0; padding: 0 20px 0 50px; } - .el-dialog__headerbtn{ + .el-dialog__headerbtn { width: 44px; height: 44px; font-size: 30px; font-weight: bold; top: 0; right: 10px; - .el-dialog__close{ - color: #3FA4F6; - background: linear-gradient(0deg, #3FA4F6 0%, #F7FDFF 100%); + .el-dialog__close { + color: #3fa4f6; + background: linear-gradient(0deg, #3fa4f6 0%, #f7fdff 100%); -webkit-background-clip: text; -webkit-text-fill-color: transparent; } } - .el-dialog__body{ + .el-dialog__body { padding: 10px !important; - border: 1px solid #163F80; + border: 1px solid #163f80; } } -.curCick{ +.curCick { cursor: pointer; -} \ No newline at end of file +} diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index 741e66c..0240ccf 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -103,9 +103,7 @@ 'outlet_water_level_city', //排口流量 'plcSewagePumpStation', //plc污水泵站 'plcRainPumpStation', //plc雨水泵站 - "plcGateStation",//plc水闸 - - + 'plcGateStation', //plc水闸 ]); // 基本数据 const arrid = ref([ @@ -126,8 +124,8 @@ 'water_region_info', // 水系汇水分区 'storehouse', //物资仓库 'dikeGood', //堤防备料 - "waterlog_community", - "waterlogging_scheduling",//渍水风险点 + 'waterlog_community', + 'waterlogging_scheduling', //渍水风险点 ]); // 视频点 const videoList = ref([ @@ -265,7 +263,6 @@ // name: "dp_ysgwfx", //大屏雨水管网风险分析弹框 // value: "rainwater_pipeline_quality", //雨水管网水质 // }, - ]; return arr.find(item => item.value == type)?.name || null; }; @@ -333,7 +330,8 @@ if (type == 'sewage_pipeline_quality_city') { type = 'sewage_pipeline_quality'; } - if (type == 'waterlog_community') {//渍水风险点 + if (type == 'waterlog_community') { + //渍水风险点 type = 'waterlogging_point_info'; } @@ -455,20 +453,20 @@ // 处理标注 Getproperties.value = properties; - let type = properties ? properties.type : '' || 1; + let type = properties ? properties.type : '' || 1; // 针对调度辅助决策易渍水点做的判断 - let fzjcArr=['waterlog_community_text','waterloggingPointRelation'] - if(fzjcArr.includes(properties.type)){ - // 调度辅助决策易渍水点上图统一类型 - type=properties._image - if(!Object.keys(properties).includes('stCode')){ - properties.stCode=properties.dataCode - } - if(!Object.keys(properties).includes('id')){ - properties.id=properties.dataId - } + let fzjcArr = ['waterlog_community_text', 'waterloggingPointRelation']; + if (fzjcArr.includes(properties.type)) { + // 调度辅助决策易渍水点上图统一类型 + type = properties._image; + if (!Object.keys(properties).includes('stCode')) { + properties.stCode = properties.dataCode; } - + if (!Object.keys(properties).includes('id')) { + properties.id = properties.dataId; + } + } + let Name = properties ? properties.pointTypeName : '' || ''; // Annotation(properties); console.log('1111', type, layerId); @@ -578,10 +576,10 @@ if (arrid.value.includes(item.stType)) { properties.id = item.pid || item.id; } - if(item.stType=="waterlogging"||item.stType=="rainwater_pipeline_quality"){ - Getproperties.value.peopleUser=item.watchId - Getproperties.value.useTitle=item.stName - }else { + if (item.stType == 'waterlogging' || item.stType == 'rainwater_pipeline_quality') { + Getproperties.value.peopleUser = item.watchId; + Getproperties.value.useTitle = item.stName; + } else { Getproperties.value.peopleUser = null; Getproperties.value.useTitle = null; } @@ -615,7 +613,7 @@ Getproperties.value.geometry = item.geometry || item.geometrys; dialogConfig.visible = true; } - debugger + // debugger }); bus.on('closedia', e => { closediaMeth(); diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Hhsq.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Hhsq.vue index 4d40a28..22f6d05 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Hhsq.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Hhsq.vue @@ -33,7 +33,8 @@ 名称 当前水位 常水位 - 状态 + 状态 + 调度
{{ item.z == 0 ? '--' : item.z }} - - - + + +
{{ item.mormalWaterLevel }}
- 超控制 - 超常水位 - + + 超控制{{ item.warnData ? '(' + item.warnData + ')' : '' }} + + + 超常水位{{ item.warnData ? '(' + item.warnData + ')' : '' }} + 正常
+
调度
@@ -81,18 +86,56 @@ /> + +
+
+ {{ ruleForm.name }} +
+
+ +
+
+
调度设施
+
{{ ruleForm.facilities }}
+
+
+
指令人名称
+
{{ ruleForm.userName }}
+
+
+
指令人手机
+
{{ ruleForm.phone }}
+
+
+
指令内容
+
+ + + + + +
+ 下发指令 +
+ + +
+
+ diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js index 86078ff..4826300 100644 --- a/src/api/FloodControlAndDrainage.js +++ b/src/api/FloodControlAndDrainage.js @@ -1,10 +1,10 @@ -import request from '@/utils/request' +import request from '@/utils/request'; // 检测水位 export function queryRiverWaterLevel(data) { return request({ url: `/business/drainageMap/hhsxLakeInfo/queryRiverWaterLevel`, - method: "post", + method: 'post', data, }); } @@ -12,240 +12,240 @@ export function rainMapDataListBack(params) { return request({ url: `/business/drainageMap/drainageDispatch/rainMapDataListBack`, - method: "get", - params + method: 'get', + params, }); } export function rainCalendar(params) { return request({ url: `/business/drainageMap/rainData/rainCalendar`, - method: "get", - params + method: 'get', + params, }); } export function rainCalendarLately(params) { return request({ url: `/business/drainageMap/rainData/rainCalendarLately`, - method: "get", - params + method: 'get', + params, }); } export function rainMapDataBack(params) { return request({ url: `/business/drainageMap/drainageDispatch/rainMapDataBack`, - method: "get", - params + method: 'get', + params, }); } // 人员调度 export function personnelSchedulingInfoList(params) { return request({ url: `/business/drainageMap/personnelSchedulingInfo/list`, - method: "get", - params + method: 'get', + params, }); } // 物资调度 export function schedulingInfoList(params) { return request({ url: `/business/drainageMap/schedulingInfo/list`, - method: "get", - params + method: 'get', + params, }); } export function managementWarehouseGood(params) { return request({ url: `/business/drainageMap/managementWarehouseGood/list`, - method: "get", - params + method: 'get', + params, }); } -// +// export function siteMonitorwaterLevelBack(params) { return request({ url: `/business/drainageMap/siteMonitor/waterLevelBack`, - method: "get", - params + method: 'get', + params, }); } -// +// export function selectPumpMonitorListHistory(params) { return request({ url: `/business/drainageMap/facilityPump/selectPumpMonitorListHistory`, - method: "get", - params + method: 'get', + params, }); } -// +// export function getFxLogList(params) { return request({ url: `/business/drainageMap/drainageDispatch/getFxLogList`, - method: "get", - params + method: 'get', + params, }); } -// +// export function getBZFxLogList(params) { return request({ url: `/business/drainageMap/drainageDispatch/getBZFxLogList`, - method: "get", - params + method: 'get', + params, }); } -// +// export function warnData(params) { return request({ url: `/business/drainageMap/drainageDispatch/warnData`, - method: "get", - params + method: 'get', + params, }); } -// +// export function drainageFacilityDfxgxd(data) { return request({ url: `/business/drainageMap/drainageFacilityDfxgxd/list`, - method: "post", - data + method: 'post', + data, }); } // 预警建议 -export function getResponseRecommend(params){ +export function getResponseRecommend(params) { return request({ - url:'/business/drainageDispatch/getResponseRecommend', + url: '/business/drainageDispatch/getResponseRecommend', method: 'get', - params - }) + params, + }); } // 预警列表 -export function psWarningReleasePage(params){ +export function psWarningReleasePage(params) { return request({ - url:'/business/emergencyWarningRelease/page', + url: '/business/emergencyWarningRelease/page', method: 'get', - params - }) + params, + }); } // 预警新增 -export function psWarningReleaseSave(data){ +export function psWarningReleaseSave(data) { return request({ - url:'/business/emergencyWarningRelease/save', + url: '/business/emergencyWarningRelease/save', method: 'post', - data - }) + data, + }); } // 预警发布 -export function emergencyWarningReleasePublish(data){ +export function emergencyWarningReleasePublish(data) { return request({ - url:'/business/emergencyWarningRelease/publish', + url: '/business/emergencyWarningRelease/publish', method: 'post', - data - }) + data, + }); } // 预警解除 -export function emergencyWarningReleaseRelease(data){ +export function emergencyWarningReleaseRelease(data) { return request({ - url:'/business/emergencyWarningRelease/release', + url: '/business/emergencyWarningRelease/release', method: 'post', - data - }) + data, + }); } // 预警说明 -export function psWarningIllustrate(params){ +export function psWarningIllustrate(params) { return request({ - url:'/business/informationPlan/plan-list', + url: '/business/informationPlan/plan-list', method: 'get', - params - }) + params, + }); } // 监测预警 `````````````````````````` // 监测预警 顶部数量 -export function drainageDispatchmonitorCount(params){ +export function drainageDispatchmonitorCount(params) { return request({ - url:'/business/drainageDispatch/monitorCount', + url: '/business/drainageDispatch/monitorCount', method: 'get', - params - }) + params, + }); } // 监测数据 -export function drainageDispatchMonitorData(params){ +export function drainageDispatchMonitorData(params) { return request({ - url:'/business/drainageDispatch/monitorData', + url: '/business/drainageDispatch/monitorData', method: 'get', - params - }) + params, + }); } // 监测告警 -export function drainageDispatchWarnData(params){ +export function drainageDispatchWarnData(params) { return request({ - url:'/business/drainageDispatch/warnData', + url: '/business/drainageDispatch/warnData', method: 'get', - params - }) + params, + }); } // 排涝风险区域 -export function drainageDispatchDrainageRiskAreaCount(params){ +export function drainageDispatchDrainageRiskAreaCount(params) { return request({ - url:'/business/drainageDispatch/drainageRiskAreaCount', + url: '/business/drainageDispatch/drainageRiskAreaCount', method: 'get', - params - }) + params, + }); } // 预案分析 -export function drainageDispatchGetPlanAnalysis(params){ +export function drainageDispatchGetPlanAnalysis(params) { return request({ - url:'/business/drainageDispatch/getPlanAnalysis', + url: '/business/drainageDispatch/getPlanAnalysis', method: 'get', - params - }) + params, + }); } // 防汛检查 -export function drainageDispatchGetCheckCount(params){ +export function drainageDispatchGetCheckCount(params) { return request({ - url:'/business/drainageDispatch/getCheckCount', + url: '/business/drainageDispatch/getCheckCount', method: 'get', - params - }) + params, + }); } // 值班统计 -export function drainageDispatchGetDutyCount(params){ +export function drainageDispatchGetDutyCount(params) { return request({ - url:'/business/drainageDispatch/getDutyCount', + url: '/business/drainageDispatch/getDutyCount', method: 'get', - params - }) + params, + }); } // 今日值班人员 -export function drainageDispatchGetFbTodayDutyUserShift(params){ +export function drainageDispatchGetFbTodayDutyUserShift(params) { return request({ - url:'/business/drainageDispatch/getFbTodayDutyUserShift', + url: '/business/drainageDispatch/getFbTodayDutyUserShift', method: 'get', - params - }) + params, + }); } // 排涝值守统计 -export function drainageDispatchGetWatchCount(params){ +export function drainageDispatchGetWatchCount(params) { return request({ - url:'/business/drainageDispatch/getWatchCount', + url: '/business/drainageDispatch/getWatchCount', method: 'get', - params - }) + params, + }); } // 降雨预报 -export function dataSiteRelationRainTrend(params){ +export function dataSiteRelationRainTrend(params) { return request({ - url:'/business/dataSiteRelation/rainTrend', + url: '/business/dataSiteRelation/rainTrend', method: 'get', - params - }) + params, + }); } // 当前预警信息 -export function getRecommendLevel(data){ +export function getRecommendLevel(data) { return request({ - url:'/business/emergencyWarningRelease/getRecommendLevel', + url: '/business/emergencyWarningRelease/getRecommendLevel', method: 'get', - data - }) + data, + }); } // 查询基础数据-水系汇水分区列表 export function listwaterRegionInfo(query) { @@ -264,74 +264,74 @@ }); } // 防汛检查 -export function streetFloodList(data){ +export function streetFloodList(data) { return request({ - url:'/business/drainageMap/streetFlood/list', + url: '/business/drainageMap/streetFlood/list', method: 'get', - data - }) + data, + }); } // 值守检查 -export function watchAreaList(data){ +export function watchAreaList(data) { return request({ - url:'/business/drainageMap/watchArea/list', + url: '/business/drainageMap/watchArea/list', method: 'get', - data - }) + data, + }); } // 排渍检查 -export function watchAreaSortingScheduling(params){ +export function watchAreaSortingScheduling(params) { return request({ - url:'/business/drainageMap/watchArea/SortingScheduling', + url: '/business/drainageMap/watchArea/SortingScheduling', method: 'get', - params - }) + params, + }); } // 排渍明细 -export function watchAreaCheckPicture(params){ +export function watchAreaCheckPicture(params) { return request({ - url:'/business/drainageMap/watchArea/checkPicture', + url: '/business/drainageMap/watchArea/checkPicture', method: 'get', - params - }) + params, + }); } // 值守明细 -export function watchAreaDutyPersonnel(params){ +export function watchAreaDutyPersonnel(params) { return request({ - url:'/business/drainageMap/watchArea/dutyPersonnel', + url: '/business/drainageMap/watchArea/dutyPersonnel', method: 'get', - params - }) + params, + }); } // 泵站调度 -export function watchAreaDutyPumpScheduling(params){ +export function watchAreaDutyPumpScheduling(params) { return request({ - url:'/business/drainageMap/watchArea/pumpScheduling', + url: '/business/drainageMap/watchArea/pumpScheduling', method: 'get', - params - }) + params, + }); } // 下发泵站调度 -export function dispatchOutbound(data){ +export function dispatchOutbound(data) { return request({ - url:'/business/drainageMap/dispatch/outbound', + url: '/business/drainageMap/dispatch/outbound', method: 'post', - data - }) + data, + }); } -export function pumpDispatchCommandPublish(data){ +export function pumpDispatchCommandPublish(data) { return request({ - url:'/business/pumpDispatchCommand/publish', + url: '/business/pumpDispatchCommand/publish', method: 'post', - data - }) + data, + }); } -export function pumpDispatchHistoryList(params){ +export function pumpDispatchHistoryList(params) { return request({ - url:'/business/pumpDispatchHistory/list', + url: '/business/pumpDispatchHistory/list', method: 'get', - params - }) + params, + }); } // 降雨分布 export function monitorUnitRainfallDistributionGetRainMap(params) { @@ -350,25 +350,25 @@ }); } // 渍水点详情 -export function waterloggingPointInfo(id){ +export function waterloggingPointInfo(id) { return request({ url: `/business/waterloggingPointInfo/${id}`, method: 'get', - }) + }); } // 泵站工情雨水详情 -export function rainWaterPumpStationInfo(id){ +export function rainWaterPumpStationInfo(id) { return request({ url: `/business/rainWaterPumpStationInfo/${id}`, method: 'get', - }) + }); } //泵站工情污水详情 -export function sewagePumpStationInfo(id){ +export function sewagePumpStationInfo(id) { return request({ url: `/business/sewagePumpStationInfo/${id}`, method: 'get', - }) + }); } // 河湖详情 export function lakeInfoList(query) { @@ -426,12 +426,12 @@ }); } // 渍水调度任务 -export function distributeTask(data){ +export function distributeTask(data) { return request({ - url:'/business/watchResponseTask/distributeTask', + url: '/business/watchResponseTask/distributeTask', method: 'post', - data - }) + data, + }); } export function watchDispatchList(query) { return request({ @@ -460,14 +460,23 @@ return request({ url: '/business/emergencyWarningRelease/list', method: 'get', - params + params, }); } export function pumpStationStatistics(params) { return request({ url: '/business/drainageMap/pumpStationStatistics', method: 'get', - params + params, }); } -// ``````````EDN````````````````````` \ No newline at end of file + +export function drainageDispatchCall(params) { + return request({ + url: '/business/drainageDispatch/call', + method: 'get', + params, + }); +} + +// ``````````EDN````````````````````` diff --git a/src/assets/images/pictureOnMap/eachBgc22.png b/src/assets/images/pictureOnMap/eachBgc22.png new file mode 100644 index 0000000..da1640f --- /dev/null +++ b/src/assets/images/pictureOnMap/eachBgc22.png Binary files differ diff --git a/src/assets/styles/pictureOnMap.scss b/src/assets/styles/pictureOnMap.scss index c3ae4f7..5dece19 100644 --- a/src/assets/styles/pictureOnMap.scss +++ b/src/assets/styles/pictureOnMap.scss @@ -40,7 +40,7 @@ .typeList { padding-bottom: 2px; - border-bottom: 1px solid #0D356F; + border-bottom: 1px solid #0d356f; overflow: hidden; margin-top: 8px; margin-bottom: 14px; @@ -50,13 +50,13 @@ line-height: 28px; background: linear-gradient(0deg, rgba(0, 98, 183, 0.3) 0%, rgba(0, 98, 183, 0.1) 100%); font-weight: 400; - font-size: 16px; - color: #8FBFFE; + font-size: 15px; + color: #8fbffe; text-align: center; cursor: pointer; &.active { - color: #E0E5FA; + color: #e0e5fa; background: linear-gradient(0deg, rgba(9, 216, 241, 0.9) 0%, rgba(0, 98, 183, 0.3) 100%); } } @@ -69,7 +69,7 @@ padding-left: 32px; font-weight: 500; font-size: 16px; - color: #FFFFFF; + color: #ffffff; div { margin-left: 40px; @@ -105,11 +105,11 @@ } .blue { - color: #2CB7FF; + color: #2cb7ff; } .blueD { - color: #00FCFF; + color: #00fcff; } .leve2Title { @@ -118,7 +118,7 @@ background-size: 103% auto; font-weight: bold; font-size: 18px; - color: #E0E5FA; + color: #e0e5fa; padding-left: 45px; line-height: 60px; } @@ -130,7 +130,6 @@ // 弹框 .pmpSitNewDialog { - .el-dialog__header { display: none; } @@ -155,7 +154,7 @@ font-family: PangMenZhengDao; font-weight: 400; font-size: 24px; - color: #FFFFFF; + color: #ffffff; } .closeIcon { @@ -169,16 +168,15 @@ .contentBox { background: #071645; - border: 1px solid #163F80; + border: 1px solid #163f80; } - } // 表格样式 .dispatchTable { &.el-table { background: none; - color: #D2E2FF; + color: #d2e2ff; } .el-table__inner-wrapper::before { @@ -186,16 +184,16 @@ } tr { - background: linear-gradient(0deg, #00134F 0%, #003065 100%); + background: linear-gradient(0deg, #00134f 0%, #003065 100%); } td.el-table__cell, th.el-table__cell.is-leaf { - border-color: #163F80; + border-color: #163f80; } &.el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell { - background: linear-gradient(0deg, #001F75 0%, #284F93 100%); + background: linear-gradient(0deg, #001f75 0%, #284f93 100%); } .el-table__header-wrapper th { @@ -204,54 +202,58 @@ } .el-table__header-wrapper { - border: 1px solid #0B9BFF; + border: 1px solid #0b9bff; } th { - color: #FFFFFF !important; + color: #ffffff !important; font-size: 16px; } - &.el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell { + &.el-table--enable-row-hover .el-table__body tr:hover > td.el-table__cell { background: rgba(13, 57, 139, 0.7); } } // 弹框表格 .popUpTable { - .el-table{ + .el-table { font-weight: 400; -font-size: 14px; -color: #CCDFFF; -&.el-table--striped .el-table__body tr.el-table__row { - background: #0D2359; -} - &.el-table--enable-row-transition .el-table__body td.el-table__cell{ - background: #0D2359; + font-size: 14px; + color: #ccdfff; + &.el-table--striped .el-table__body tr.el-table__row { + background: #0d2359; } - &.el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell { + &.el-table--enable-row-transition .el-table__body td.el-table__cell { + background: #0d2359; + } + &.el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell { background: rgba(7, 22, 69, 1); } - td.el-table__cell, th.el-table__cell.is-leaf { + td.el-table__cell, + th.el-table__cell.is-leaf { border: 0; } - .el-table__header-wrapper th, .el-table__fixed-header-wrapper th { - background: #153990!important; + .el-table__header-wrapper th, + .el-table__fixed-header-wrapper th { + background: #153990 !important; font-weight: bold; - font-size: 14px; - color: #FFFFFF; + font-size: 14px; + color: #ffffff; } - .el-table--border .el-table__inner-wrapper::after, .el-table--border::after, .el-table--border::before, .el-table__inner-wrapper::before{ + .el-table--border .el-table__inner-wrapper::after, + .el-table--border::after, + .el-table--border::before, + .el-table__inner-wrapper::before { background: 0; } .el-table__empty-block { background: rgba(7, 22, 69, 1); } - &.el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell { + &.el-table--enable-row-hover .el-table__body tr:hover > td.el-table__cell { background: rgba(13, 57, 139, 0.7); } } - } // 降雨日历 .dayListPop { @@ -261,9 +263,7 @@ background: linear-gradient(90deg, rgba(10, 36, 121, 0.8) 0%, rgba(1, 28, 71, 0.6) 100%) !important; border-radius: 6px !important; border: 1px solid !important; - border-image: linear-gradient(0deg, #47AFFF, #47AFFF) 10 10 !important; - - + border-image: linear-gradient(0deg, #47afff, #47afff) 10 10 !important; border-radius: 10px !important; @@ -290,7 +290,7 @@ .num { line-height: 1; - white-space:nowrap; + white-space: nowrap; } &.current { @@ -353,15 +353,12 @@ background: none; color: #9d9d9d; } - .el-pager li.is-active{ + .el-pager li.is-active { color: #409eff; - } .el-input__wrapper { - background: linear-gradient(90deg, - rgba(32, 127, 244, 0.3) 0%, - rgba(32, 127, 244, 0.1) 100%); + background: linear-gradient(90deg, rgba(32, 127, 244, 0.3) 0%, rgba(32, 127, 244, 0.1) 100%); border: 1px solid #0497e9; color: #fff; box-shadow: none; @@ -369,7 +366,6 @@ .el-input__wrapper:hover { box-shadow: none; - } .el-input__inner { @@ -428,44 +424,44 @@ opacity: 0; } -.mapTotalDialog{ - .el-dialog{ +.mapTotalDialog { + .el-dialog { background: #071645; - .el-dialog__title{ + .el-dialog__title { font-family: 'PangMenZhengDao'; font-weight: 400; font-size: 24px; - color: #FFFFFF; + color: #ffffff; line-height: 44px; } } - .el-dialog__header{ + .el-dialog__header { height: 44px; background: url('@/assets/images/pictureOnMap/titlePop.png') no-repeat; - background-size:100% 100%; + background-size: 100% 100%; margin: 0; padding: 0 20px 0 50px; } - .el-dialog__headerbtn{ + .el-dialog__headerbtn { width: 44px; height: 44px; font-size: 30px; font-weight: bold; top: 0; right: 10px; - .el-dialog__close{ - color: #3FA4F6; - background: linear-gradient(0deg, #3FA4F6 0%, #F7FDFF 100%); + .el-dialog__close { + color: #3fa4f6; + background: linear-gradient(0deg, #3fa4f6 0%, #f7fdff 100%); -webkit-background-clip: text; -webkit-text-fill-color: transparent; } } - .el-dialog__body{ + .el-dialog__body { padding: 10px !important; - border: 1px solid #163F80; + border: 1px solid #163f80; } } -.curCick{ +.curCick { cursor: pointer; -} \ No newline at end of file +} diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index 741e66c..0240ccf 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -103,9 +103,7 @@ 'outlet_water_level_city', //排口流量 'plcSewagePumpStation', //plc污水泵站 'plcRainPumpStation', //plc雨水泵站 - "plcGateStation",//plc水闸 - - + 'plcGateStation', //plc水闸 ]); // 基本数据 const arrid = ref([ @@ -126,8 +124,8 @@ 'water_region_info', // 水系汇水分区 'storehouse', //物资仓库 'dikeGood', //堤防备料 - "waterlog_community", - "waterlogging_scheduling",//渍水风险点 + 'waterlog_community', + 'waterlogging_scheduling', //渍水风险点 ]); // 视频点 const videoList = ref([ @@ -265,7 +263,6 @@ // name: "dp_ysgwfx", //大屏雨水管网风险分析弹框 // value: "rainwater_pipeline_quality", //雨水管网水质 // }, - ]; return arr.find(item => item.value == type)?.name || null; }; @@ -333,7 +330,8 @@ if (type == 'sewage_pipeline_quality_city') { type = 'sewage_pipeline_quality'; } - if (type == 'waterlog_community') {//渍水风险点 + if (type == 'waterlog_community') { + //渍水风险点 type = 'waterlogging_point_info'; } @@ -455,20 +453,20 @@ // 处理标注 Getproperties.value = properties; - let type = properties ? properties.type : '' || 1; + let type = properties ? properties.type : '' || 1; // 针对调度辅助决策易渍水点做的判断 - let fzjcArr=['waterlog_community_text','waterloggingPointRelation'] - if(fzjcArr.includes(properties.type)){ - // 调度辅助决策易渍水点上图统一类型 - type=properties._image - if(!Object.keys(properties).includes('stCode')){ - properties.stCode=properties.dataCode - } - if(!Object.keys(properties).includes('id')){ - properties.id=properties.dataId - } + let fzjcArr = ['waterlog_community_text', 'waterloggingPointRelation']; + if (fzjcArr.includes(properties.type)) { + // 调度辅助决策易渍水点上图统一类型 + type = properties._image; + if (!Object.keys(properties).includes('stCode')) { + properties.stCode = properties.dataCode; } - + if (!Object.keys(properties).includes('id')) { + properties.id = properties.dataId; + } + } + let Name = properties ? properties.pointTypeName : '' || ''; // Annotation(properties); console.log('1111', type, layerId); @@ -578,10 +576,10 @@ if (arrid.value.includes(item.stType)) { properties.id = item.pid || item.id; } - if(item.stType=="waterlogging"||item.stType=="rainwater_pipeline_quality"){ - Getproperties.value.peopleUser=item.watchId - Getproperties.value.useTitle=item.stName - }else { + if (item.stType == 'waterlogging' || item.stType == 'rainwater_pipeline_quality') { + Getproperties.value.peopleUser = item.watchId; + Getproperties.value.useTitle = item.stName; + } else { Getproperties.value.peopleUser = null; Getproperties.value.useTitle = null; } @@ -615,7 +613,7 @@ Getproperties.value.geometry = item.geometry || item.geometrys; dialogConfig.visible = true; } - debugger + // debugger }); bus.on('closedia', e => { closediaMeth(); diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Hhsq.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Hhsq.vue index 4d40a28..22f6d05 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Hhsq.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Hhsq.vue @@ -33,7 +33,8 @@ 名称 当前水位 常水位 - 状态 + 状态 + 调度
{{ item.z == 0 ? '--' : item.z }} - - - + + +
{{ item.mormalWaterLevel }}
- 超控制 - 超常水位 - + + 超控制{{ item.warnData ? '(' + item.warnData + ')' : '' }} + + + 超常水位{{ item.warnData ? '(' + item.warnData + ')' : '' }} + 正常
+
调度
@@ -81,18 +86,56 @@ /> + +
+
+ {{ ruleForm.name }} +
+
+ +
+
+
调度设施
+
{{ ruleForm.facilities }}
+
+
+
指令人名称
+
{{ ruleForm.userName }}
+
+
+
指令人手机
+
{{ ruleForm.phone }}
+
+
+
指令内容
+
+ + + + + +
+ 下发指令 +
+ + +
+
+ diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/index.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/index.vue index 740719f..2bd2fa2 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/index.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/index.vue @@ -1,7 +1,7 @@