diff --git a/src/api/sponeScreen/jxkh.js b/src/api/sponeScreen/jxkh.js new file mode 100644 index 0000000..9a7276b --- /dev/null +++ b/src/api/sponeScreen/jxkh.js @@ -0,0 +1,55 @@ +import request from '@/utils/request'; + +// 黑臭基础信息+工程治理介绍 +export function blackRiverList(params) { + return request({ + url: '/sponge/blackRiver/list', + method: 'get', + // params + }); +} +// 黑臭水体监测站数据 +export function sampleDetaillistTable(data) { + return request({ + url: `/business/sampleDetail/listTable`, + method: 'post', + data, + }); +} + +// 一张图-列表查询考核评估公共指标信息 +export function quotaCommomInfoList(params) { + return request({ + url: '/sponge/quotaCommomInfo/list', + method: 'get', + params, + }); +} + +// 一张图-列表查询考核指标数据信息 +export function hmyztQuotaDataList(params) { + return request({ + url: '/sponge/hmyztQuotaData/list', + method: 'get', + params, + }); +} + +// 一张图-查询考核指标数据文件信息: +export function querySysFileByType(params) { + return request({ + url: '/sponge/hmyztQuotaData/querySysFileByType', + method: 'get', + params, + }); +} + +// 降雨列表接口: + +export function dataAnalyseReport(params) { + return request({ + url: '/business/siteHistoryMonitor/dataAnalyseReport', + method: 'get', + params, + }); +} diff --git a/src/api/sponeScreen/jxkh.js b/src/api/sponeScreen/jxkh.js new file mode 100644 index 0000000..9a7276b --- /dev/null +++ b/src/api/sponeScreen/jxkh.js @@ -0,0 +1,55 @@ +import request from '@/utils/request'; + +// 黑臭基础信息+工程治理介绍 +export function blackRiverList(params) { + return request({ + url: '/sponge/blackRiver/list', + method: 'get', + // params + }); +} +// 黑臭水体监测站数据 +export function sampleDetaillistTable(data) { + return request({ + url: `/business/sampleDetail/listTable`, + method: 'post', + data, + }); +} + +// 一张图-列表查询考核评估公共指标信息 +export function quotaCommomInfoList(params) { + return request({ + url: '/sponge/quotaCommomInfo/list', + method: 'get', + params, + }); +} + +// 一张图-列表查询考核指标数据信息 +export function hmyztQuotaDataList(params) { + return request({ + url: '/sponge/hmyztQuotaData/list', + method: 'get', + params, + }); +} + +// 一张图-查询考核指标数据文件信息: +export function querySysFileByType(params) { + return request({ + url: '/sponge/hmyztQuotaData/querySysFileByType', + method: 'get', + params, + }); +} + +// 降雨列表接口: + +export function dataAnalyseReport(params) { + return request({ + url: '/business/siteHistoryMonitor/dataAnalyseReport', + method: 'get', + params, + }); +} diff --git a/src/assets/styles/publicXG.scss b/src/assets/styles/publicXG.scss index 1cd628d..f6a4e6b 100644 --- a/src/assets/styles/publicXG.scss +++ b/src/assets/styles/publicXG.scss @@ -271,7 +271,7 @@ background: #47e44e; } .primary { - background: #4fd4ff; + background: #bc65ff; } .yellow { background: #f4e443; diff --git a/src/api/sponeScreen/jxkh.js b/src/api/sponeScreen/jxkh.js new file mode 100644 index 0000000..9a7276b --- /dev/null +++ b/src/api/sponeScreen/jxkh.js @@ -0,0 +1,55 @@ +import request from '@/utils/request'; + +// 黑臭基础信息+工程治理介绍 +export function blackRiverList(params) { + return request({ + url: '/sponge/blackRiver/list', + method: 'get', + // params + }); +} +// 黑臭水体监测站数据 +export function sampleDetaillistTable(data) { + return request({ + url: `/business/sampleDetail/listTable`, + method: 'post', + data, + }); +} + +// 一张图-列表查询考核评估公共指标信息 +export function quotaCommomInfoList(params) { + return request({ + url: '/sponge/quotaCommomInfo/list', + method: 'get', + params, + }); +} + +// 一张图-列表查询考核指标数据信息 +export function hmyztQuotaDataList(params) { + return request({ + url: '/sponge/hmyztQuotaData/list', + method: 'get', + params, + }); +} + +// 一张图-查询考核指标数据文件信息: +export function querySysFileByType(params) { + return request({ + url: '/sponge/hmyztQuotaData/querySysFileByType', + method: 'get', + params, + }); +} + +// 降雨列表接口: + +export function dataAnalyseReport(params) { + return request({ + url: '/business/siteHistoryMonitor/dataAnalyseReport', + method: 'get', + params, + }); +} diff --git a/src/assets/styles/publicXG.scss b/src/assets/styles/publicXG.scss index 1cd628d..f6a4e6b 100644 --- a/src/assets/styles/publicXG.scss +++ b/src/assets/styles/publicXG.scss @@ -271,7 +271,7 @@ background: #47e44e; } .primary { - background: #4fd4ff; + background: #bc65ff; } .yellow { background: #f4e443; diff --git a/src/views/floodSys/assetManage/pipelinePoint.vue b/src/views/floodSys/assetManage/pipelinePoint.vue index 7d7b643..314b241 100644 --- a/src/views/floodSys/assetManage/pipelinePoint.vue +++ b/src/views/floodSys/assetManage/pipelinePoint.vue @@ -125,6 +125,12 @@ + + + + + + @@ -346,6 +352,8 @@ ownershipUnits: null, operationalUnits: null, pointTexture: null, + pipelineDiameter: 0, + bottomBuriedDepth: 0, groundElevation: null, // status: null, geometrys: null, @@ -355,9 +363,9 @@ pointNumber: [{ required: true, message: '管点编码不能为空', trigger: 'blur' }], originalX: [{ required: true, message: '坐标X不能为空', trigger: 'blur' }], originalY: [{ required: true, message: '坐标Y不能为空', trigger: 'blur' }], - roadName: [{ required: true, message: '所在道路/河道不能为空', trigger: 'blur' }], - ownershipUnits: [{ required: true, message: '权属单位不能为空', trigger: 'blur' }], - operationalUnits: [{ required: true, message: '运维单位不能为空', trigger: 'blur' }], + // roadName: [{ required: true, message: '所在道路/河道不能为空', trigger: 'blur' }], + // ownershipUnits: [{ required: true, message: '权属单位不能为空', trigger: 'blur' }], + // operationalUnits: [{ required: true, message: '运维单位不能为空', trigger: 'blur' }], pointTexture: [{ required: true, message: '管点材质不能为空', trigger: 'blur' }], groundElevation: [{ required: true, message: '地面高程不能为空', trigger: 'blur' }], }, @@ -396,6 +404,8 @@ ownershipUnits: null, operationalUnits: null, pointTexture: null, + pipelineDiameter: null, + bottomBuriedDepth: null, groundElevation: null, remark: null, // status: null, diff --git a/src/api/sponeScreen/jxkh.js b/src/api/sponeScreen/jxkh.js new file mode 100644 index 0000000..9a7276b --- /dev/null +++ b/src/api/sponeScreen/jxkh.js @@ -0,0 +1,55 @@ +import request from '@/utils/request'; + +// 黑臭基础信息+工程治理介绍 +export function blackRiverList(params) { + return request({ + url: '/sponge/blackRiver/list', + method: 'get', + // params + }); +} +// 黑臭水体监测站数据 +export function sampleDetaillistTable(data) { + return request({ + url: `/business/sampleDetail/listTable`, + method: 'post', + data, + }); +} + +// 一张图-列表查询考核评估公共指标信息 +export function quotaCommomInfoList(params) { + return request({ + url: '/sponge/quotaCommomInfo/list', + method: 'get', + params, + }); +} + +// 一张图-列表查询考核指标数据信息 +export function hmyztQuotaDataList(params) { + return request({ + url: '/sponge/hmyztQuotaData/list', + method: 'get', + params, + }); +} + +// 一张图-查询考核指标数据文件信息: +export function querySysFileByType(params) { + return request({ + url: '/sponge/hmyztQuotaData/querySysFileByType', + method: 'get', + params, + }); +} + +// 降雨列表接口: + +export function dataAnalyseReport(params) { + return request({ + url: '/business/siteHistoryMonitor/dataAnalyseReport', + method: 'get', + params, + }); +} diff --git a/src/assets/styles/publicXG.scss b/src/assets/styles/publicXG.scss index 1cd628d..f6a4e6b 100644 --- a/src/assets/styles/publicXG.scss +++ b/src/assets/styles/publicXG.scss @@ -271,7 +271,7 @@ background: #47e44e; } .primary { - background: #4fd4ff; + background: #bc65ff; } .yellow { background: #f4e443; diff --git a/src/views/floodSys/assetManage/pipelinePoint.vue b/src/views/floodSys/assetManage/pipelinePoint.vue index 7d7b643..314b241 100644 --- a/src/views/floodSys/assetManage/pipelinePoint.vue +++ b/src/views/floodSys/assetManage/pipelinePoint.vue @@ -125,6 +125,12 @@ + + + + + + @@ -346,6 +352,8 @@ ownershipUnits: null, operationalUnits: null, pointTexture: null, + pipelineDiameter: 0, + bottomBuriedDepth: 0, groundElevation: null, // status: null, geometrys: null, @@ -355,9 +363,9 @@ pointNumber: [{ required: true, message: '管点编码不能为空', trigger: 'blur' }], originalX: [{ required: true, message: '坐标X不能为空', trigger: 'blur' }], originalY: [{ required: true, message: '坐标Y不能为空', trigger: 'blur' }], - roadName: [{ required: true, message: '所在道路/河道不能为空', trigger: 'blur' }], - ownershipUnits: [{ required: true, message: '权属单位不能为空', trigger: 'blur' }], - operationalUnits: [{ required: true, message: '运维单位不能为空', trigger: 'blur' }], + // roadName: [{ required: true, message: '所在道路/河道不能为空', trigger: 'blur' }], + // ownershipUnits: [{ required: true, message: '权属单位不能为空', trigger: 'blur' }], + // operationalUnits: [{ required: true, message: '运维单位不能为空', trigger: 'blur' }], pointTexture: [{ required: true, message: '管点材质不能为空', trigger: 'blur' }], groundElevation: [{ required: true, message: '地面高程不能为空', trigger: 'blur' }], }, @@ -396,6 +404,8 @@ ownershipUnits: null, operationalUnits: null, pointTexture: null, + pipelineDiameter: null, + bottomBuriedDepth: null, groundElevation: null, remark: null, // status: null, diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue index 1707a00..e81aac9 100644 --- a/src/views/sponeScreen/HaiMianScreen/index.vue +++ b/src/views/sponeScreen/HaiMianScreen/index.vue @@ -178,7 +178,7 @@ { name: '排水防涝', id: 4 }, { name: '长效运维', id: 5 }, ]); -const menuIndex = ref(1); +const menuIndex = ref(3); const showPanel = ref(false); const showLegend = ref(false); const showPipe = ref(false); diff --git a/src/api/sponeScreen/jxkh.js b/src/api/sponeScreen/jxkh.js new file mode 100644 index 0000000..9a7276b --- /dev/null +++ b/src/api/sponeScreen/jxkh.js @@ -0,0 +1,55 @@ +import request from '@/utils/request'; + +// 黑臭基础信息+工程治理介绍 +export function blackRiverList(params) { + return request({ + url: '/sponge/blackRiver/list', + method: 'get', + // params + }); +} +// 黑臭水体监测站数据 +export function sampleDetaillistTable(data) { + return request({ + url: `/business/sampleDetail/listTable`, + method: 'post', + data, + }); +} + +// 一张图-列表查询考核评估公共指标信息 +export function quotaCommomInfoList(params) { + return request({ + url: '/sponge/quotaCommomInfo/list', + method: 'get', + params, + }); +} + +// 一张图-列表查询考核指标数据信息 +export function hmyztQuotaDataList(params) { + return request({ + url: '/sponge/hmyztQuotaData/list', + method: 'get', + params, + }); +} + +// 一张图-查询考核指标数据文件信息: +export function querySysFileByType(params) { + return request({ + url: '/sponge/hmyztQuotaData/querySysFileByType', + method: 'get', + params, + }); +} + +// 降雨列表接口: + +export function dataAnalyseReport(params) { + return request({ + url: '/business/siteHistoryMonitor/dataAnalyseReport', + method: 'get', + params, + }); +} diff --git a/src/assets/styles/publicXG.scss b/src/assets/styles/publicXG.scss index 1cd628d..f6a4e6b 100644 --- a/src/assets/styles/publicXG.scss +++ b/src/assets/styles/publicXG.scss @@ -271,7 +271,7 @@ background: #47e44e; } .primary { - background: #4fd4ff; + background: #bc65ff; } .yellow { background: #f4e443; diff --git a/src/views/floodSys/assetManage/pipelinePoint.vue b/src/views/floodSys/assetManage/pipelinePoint.vue index 7d7b643..314b241 100644 --- a/src/views/floodSys/assetManage/pipelinePoint.vue +++ b/src/views/floodSys/assetManage/pipelinePoint.vue @@ -125,6 +125,12 @@ + + + + + + @@ -346,6 +352,8 @@ ownershipUnits: null, operationalUnits: null, pointTexture: null, + pipelineDiameter: 0, + bottomBuriedDepth: 0, groundElevation: null, // status: null, geometrys: null, @@ -355,9 +363,9 @@ pointNumber: [{ required: true, message: '管点编码不能为空', trigger: 'blur' }], originalX: [{ required: true, message: '坐标X不能为空', trigger: 'blur' }], originalY: [{ required: true, message: '坐标Y不能为空', trigger: 'blur' }], - roadName: [{ required: true, message: '所在道路/河道不能为空', trigger: 'blur' }], - ownershipUnits: [{ required: true, message: '权属单位不能为空', trigger: 'blur' }], - operationalUnits: [{ required: true, message: '运维单位不能为空', trigger: 'blur' }], + // roadName: [{ required: true, message: '所在道路/河道不能为空', trigger: 'blur' }], + // ownershipUnits: [{ required: true, message: '权属单位不能为空', trigger: 'blur' }], + // operationalUnits: [{ required: true, message: '运维单位不能为空', trigger: 'blur' }], pointTexture: [{ required: true, message: '管点材质不能为空', trigger: 'blur' }], groundElevation: [{ required: true, message: '地面高程不能为空', trigger: 'blur' }], }, @@ -396,6 +404,8 @@ ownershipUnits: null, operationalUnits: null, pointTexture: null, + pipelineDiameter: null, + bottomBuriedDepth: null, groundElevation: null, remark: null, // status: null, diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue index 1707a00..e81aac9 100644 --- a/src/views/sponeScreen/HaiMianScreen/index.vue +++ b/src/views/sponeScreen/HaiMianScreen/index.vue @@ -178,7 +178,7 @@ { name: '排水防涝', id: 4 }, { name: '长效运维', id: 5 }, ]); -const menuIndex = ref(1); +const menuIndex = ref(3); const showPanel = ref(false); const showLegend = ref(false); const showPipe = ref(false); diff --git a/src/views/sponeScreen/waterFlood/floodWZ.vue b/src/views/sponeScreen/waterFlood/floodWZ.vue index b0cacdc..be6908d 100644 --- a/src/views/sponeScreen/waterFlood/floodWZ.vue +++ b/src/views/sponeScreen/waterFlood/floodWZ.vue @@ -141,7 +141,7 @@ .floodWZPage { width: 100%; .scrollMapHM { - height: 240px; + height: calc(100vh - 800px); p { width: 30%; } diff --git a/src/api/sponeScreen/jxkh.js b/src/api/sponeScreen/jxkh.js new file mode 100644 index 0000000..9a7276b --- /dev/null +++ b/src/api/sponeScreen/jxkh.js @@ -0,0 +1,55 @@ +import request from '@/utils/request'; + +// 黑臭基础信息+工程治理介绍 +export function blackRiverList(params) { + return request({ + url: '/sponge/blackRiver/list', + method: 'get', + // params + }); +} +// 黑臭水体监测站数据 +export function sampleDetaillistTable(data) { + return request({ + url: `/business/sampleDetail/listTable`, + method: 'post', + data, + }); +} + +// 一张图-列表查询考核评估公共指标信息 +export function quotaCommomInfoList(params) { + return request({ + url: '/sponge/quotaCommomInfo/list', + method: 'get', + params, + }); +} + +// 一张图-列表查询考核指标数据信息 +export function hmyztQuotaDataList(params) { + return request({ + url: '/sponge/hmyztQuotaData/list', + method: 'get', + params, + }); +} + +// 一张图-查询考核指标数据文件信息: +export function querySysFileByType(params) { + return request({ + url: '/sponge/hmyztQuotaData/querySysFileByType', + method: 'get', + params, + }); +} + +// 降雨列表接口: + +export function dataAnalyseReport(params) { + return request({ + url: '/business/siteHistoryMonitor/dataAnalyseReport', + method: 'get', + params, + }); +} diff --git a/src/assets/styles/publicXG.scss b/src/assets/styles/publicXG.scss index 1cd628d..f6a4e6b 100644 --- a/src/assets/styles/publicXG.scss +++ b/src/assets/styles/publicXG.scss @@ -271,7 +271,7 @@ background: #47e44e; } .primary { - background: #4fd4ff; + background: #bc65ff; } .yellow { background: #f4e443; diff --git a/src/views/floodSys/assetManage/pipelinePoint.vue b/src/views/floodSys/assetManage/pipelinePoint.vue index 7d7b643..314b241 100644 --- a/src/views/floodSys/assetManage/pipelinePoint.vue +++ b/src/views/floodSys/assetManage/pipelinePoint.vue @@ -125,6 +125,12 @@ + + + + + + @@ -346,6 +352,8 @@ ownershipUnits: null, operationalUnits: null, pointTexture: null, + pipelineDiameter: 0, + bottomBuriedDepth: 0, groundElevation: null, // status: null, geometrys: null, @@ -355,9 +363,9 @@ pointNumber: [{ required: true, message: '管点编码不能为空', trigger: 'blur' }], originalX: [{ required: true, message: '坐标X不能为空', trigger: 'blur' }], originalY: [{ required: true, message: '坐标Y不能为空', trigger: 'blur' }], - roadName: [{ required: true, message: '所在道路/河道不能为空', trigger: 'blur' }], - ownershipUnits: [{ required: true, message: '权属单位不能为空', trigger: 'blur' }], - operationalUnits: [{ required: true, message: '运维单位不能为空', trigger: 'blur' }], + // roadName: [{ required: true, message: '所在道路/河道不能为空', trigger: 'blur' }], + // ownershipUnits: [{ required: true, message: '权属单位不能为空', trigger: 'blur' }], + // operationalUnits: [{ required: true, message: '运维单位不能为空', trigger: 'blur' }], pointTexture: [{ required: true, message: '管点材质不能为空', trigger: 'blur' }], groundElevation: [{ required: true, message: '地面高程不能为空', trigger: 'blur' }], }, @@ -396,6 +404,8 @@ ownershipUnits: null, operationalUnits: null, pointTexture: null, + pipelineDiameter: null, + bottomBuriedDepth: null, groundElevation: null, remark: null, // status: null, diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue index 1707a00..e81aac9 100644 --- a/src/views/sponeScreen/HaiMianScreen/index.vue +++ b/src/views/sponeScreen/HaiMianScreen/index.vue @@ -178,7 +178,7 @@ { name: '排水防涝', id: 4 }, { name: '长效运维', id: 5 }, ]); -const menuIndex = ref(1); +const menuIndex = ref(3); const showPanel = ref(false); const showLegend = ref(false); const showPipe = ref(false); diff --git a/src/views/sponeScreen/waterFlood/floodWZ.vue b/src/views/sponeScreen/waterFlood/floodWZ.vue index b0cacdc..be6908d 100644 --- a/src/views/sponeScreen/waterFlood/floodWZ.vue +++ b/src/views/sponeScreen/waterFlood/floodWZ.vue @@ -141,7 +141,7 @@ .floodWZPage { width: 100%; .scrollMapHM { - height: 240px; + height: calc(100vh - 800px); p { width: 30%; } diff --git a/src/views/sponeScreen/waterFlood/index.vue b/src/views/sponeScreen/waterFlood/index.vue index 29120f3..3145b2b 100644 --- a/src/views/sponeScreen/waterFlood/index.vue +++ b/src/views/sponeScreen/waterFlood/index.vue @@ -178,7 +178,7 @@ show: false, }, ]); - }, 1000); + }, 1200); }); onBeforeUnmount(() => { bus.off('checkBZGYT'); diff --git a/src/api/sponeScreen/jxkh.js b/src/api/sponeScreen/jxkh.js new file mode 100644 index 0000000..9a7276b --- /dev/null +++ b/src/api/sponeScreen/jxkh.js @@ -0,0 +1,55 @@ +import request from '@/utils/request'; + +// 黑臭基础信息+工程治理介绍 +export function blackRiverList(params) { + return request({ + url: '/sponge/blackRiver/list', + method: 'get', + // params + }); +} +// 黑臭水体监测站数据 +export function sampleDetaillistTable(data) { + return request({ + url: `/business/sampleDetail/listTable`, + method: 'post', + data, + }); +} + +// 一张图-列表查询考核评估公共指标信息 +export function quotaCommomInfoList(params) { + return request({ + url: '/sponge/quotaCommomInfo/list', + method: 'get', + params, + }); +} + +// 一张图-列表查询考核指标数据信息 +export function hmyztQuotaDataList(params) { + return request({ + url: '/sponge/hmyztQuotaData/list', + method: 'get', + params, + }); +} + +// 一张图-查询考核指标数据文件信息: +export function querySysFileByType(params) { + return request({ + url: '/sponge/hmyztQuotaData/querySysFileByType', + method: 'get', + params, + }); +} + +// 降雨列表接口: + +export function dataAnalyseReport(params) { + return request({ + url: '/business/siteHistoryMonitor/dataAnalyseReport', + method: 'get', + params, + }); +} diff --git a/src/assets/styles/publicXG.scss b/src/assets/styles/publicXG.scss index 1cd628d..f6a4e6b 100644 --- a/src/assets/styles/publicXG.scss +++ b/src/assets/styles/publicXG.scss @@ -271,7 +271,7 @@ background: #47e44e; } .primary { - background: #4fd4ff; + background: #bc65ff; } .yellow { background: #f4e443; diff --git a/src/views/floodSys/assetManage/pipelinePoint.vue b/src/views/floodSys/assetManage/pipelinePoint.vue index 7d7b643..314b241 100644 --- a/src/views/floodSys/assetManage/pipelinePoint.vue +++ b/src/views/floodSys/assetManage/pipelinePoint.vue @@ -125,6 +125,12 @@ + + + + + + @@ -346,6 +352,8 @@ ownershipUnits: null, operationalUnits: null, pointTexture: null, + pipelineDiameter: 0, + bottomBuriedDepth: 0, groundElevation: null, // status: null, geometrys: null, @@ -355,9 +363,9 @@ pointNumber: [{ required: true, message: '管点编码不能为空', trigger: 'blur' }], originalX: [{ required: true, message: '坐标X不能为空', trigger: 'blur' }], originalY: [{ required: true, message: '坐标Y不能为空', trigger: 'blur' }], - roadName: [{ required: true, message: '所在道路/河道不能为空', trigger: 'blur' }], - ownershipUnits: [{ required: true, message: '权属单位不能为空', trigger: 'blur' }], - operationalUnits: [{ required: true, message: '运维单位不能为空', trigger: 'blur' }], + // roadName: [{ required: true, message: '所在道路/河道不能为空', trigger: 'blur' }], + // ownershipUnits: [{ required: true, message: '权属单位不能为空', trigger: 'blur' }], + // operationalUnits: [{ required: true, message: '运维单位不能为空', trigger: 'blur' }], pointTexture: [{ required: true, message: '管点材质不能为空', trigger: 'blur' }], groundElevation: [{ required: true, message: '地面高程不能为空', trigger: 'blur' }], }, @@ -396,6 +404,8 @@ ownershipUnits: null, operationalUnits: null, pointTexture: null, + pipelineDiameter: null, + bottomBuriedDepth: null, groundElevation: null, remark: null, // status: null, diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue index 1707a00..e81aac9 100644 --- a/src/views/sponeScreen/HaiMianScreen/index.vue +++ b/src/views/sponeScreen/HaiMianScreen/index.vue @@ -178,7 +178,7 @@ { name: '排水防涝', id: 4 }, { name: '长效运维', id: 5 }, ]); -const menuIndex = ref(1); +const menuIndex = ref(3); const showPanel = ref(false); const showLegend = ref(false); const showPipe = ref(false); diff --git a/src/views/sponeScreen/waterFlood/floodWZ.vue b/src/views/sponeScreen/waterFlood/floodWZ.vue index b0cacdc..be6908d 100644 --- a/src/views/sponeScreen/waterFlood/floodWZ.vue +++ b/src/views/sponeScreen/waterFlood/floodWZ.vue @@ -141,7 +141,7 @@ .floodWZPage { width: 100%; .scrollMapHM { - height: 240px; + height: calc(100vh - 800px); p { width: 30%; } diff --git a/src/views/sponeScreen/waterFlood/index.vue b/src/views/sponeScreen/waterFlood/index.vue index 29120f3..3145b2b 100644 --- a/src/views/sponeScreen/waterFlood/index.vue +++ b/src/views/sponeScreen/waterFlood/index.vue @@ -178,7 +178,7 @@ show: false, }, ]); - }, 1000); + }, 1200); }); onBeforeUnmount(() => { bus.off('checkBZGYT'); diff --git a/src/views/sponeScreen/waterFlood/pipeDetail.vue b/src/views/sponeScreen/waterFlood/pipeDetail.vue index bf4f01d..62aa2a5 100644 --- a/src/views/sponeScreen/waterFlood/pipeDetail.vue +++ b/src/views/sponeScreen/waterFlood/pipeDetail.vue @@ -17,7 +17,7 @@
水深:{{ realData.z }} 米
-
小时流量:{{ realData.sbl1 }} m³/h
+
流速:{{ realData.va }} m/s
@@ -41,11 +41,11 @@
800mm
-
井深:
-
5.80米
+
安装高度:
+
{{ pipeDetail.installHeight }} 米
-
实时数据
+
实时数据
水深:
{{ realData.z }} 米
@@ -66,6 +66,16 @@
更新时间:
{{ realData.tt }}
+ +
报警信息
+
+
负责人:
+
张小强 13328873032
+
+ +
+
有溢流风险,通知相关责任人进行处理
+
@@ -135,10 +145,10 @@ if (res && res.code == 200) { let datas = res.data; chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList; - chartOption.floodOneMapPipeSupervise.yAxis[0].name = '水位(m)'; + chartOption.floodOneMapPipeSupervise.yAxis[0].name = '水深(m)'; chartOption.floodOneMapPipeSupervise.yAxis[1].name = '雨量(mm)'; - chartOption.floodOneMapPipeSupervise.legend.data = ['水位', '雨量']; - chartOption.floodOneMapPipeSupervise.series[0].name = '水位'; + chartOption.floodOneMapPipeSupervise.legend.data = ['水深', '雨量']; + chartOption.floodOneMapPipeSupervise.series[0].name = '水深'; chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[0].ylist; } @@ -155,7 +165,7 @@ chartOption.floodOneMapPipeSupervise.series[1].name = '雨量'; chartOption.floodOneMapPipeSupervise.series[1].type = 'bar'; chartOption.floodOneMapPipeSupervise.series[1].barWidth = '10'; - chartOption.floodOneMapPipeSupervise.yAxis[1].inverse = true; //翻转 + chartOption.floodOneMapPipeSupervise.yAxis[1].inverse = false; //翻转 if (datas.propertyMonitorXList.length > 0) { chartOption.floodOneMapPipeSupervise.graphic.invisible = true; //暂无数据 } else {