diff --git a/src/api/system/tanchuang.js b/src/api/system/tanchuang.js index a002c1d..39ba563 100644 --- a/src/api/system/tanchuang.js +++ b/src/api/system/tanchuang.js @@ -45,3 +45,47 @@ data, }); } + +// 排水 站点最新一条数据记录 +export function realtimeDataLatest(stCode) { + return request({ + url: '/business/rtuSiteMonitor/realtimeData/' + stCode, + method: 'get', + }); +} + +// 数据统计-动态表头 +export function dataAnalysisHead(query) { + return request({ + url: '/business/siteHistoryMonitor/dataAnalysis/heads', + method: 'get', + params: query, + }); +} +// 数据统计-表格数据 +export function dataAnalysisBody(query) { + return request({ + url: '/business/siteHistoryMonitor/dataAnalysis', + method: 'get', + params: query, + }); +} + +// 燃气 /dockingThorughfare/list +export function dockingList(query) { + return request({ + url: '/business/dockingThorughfare/list', + method: 'get', + params: query, + }); +} + +// 燃气 /dockingThorughfareHistory/page +export function dockingHistory(query){ + return request({ + url: '/business/dockingThorughfareHistory/page', + method: 'get', + params: query, + });business +} + diff --git a/src/api/system/tanchuang.js b/src/api/system/tanchuang.js index a002c1d..39ba563 100644 --- a/src/api/system/tanchuang.js +++ b/src/api/system/tanchuang.js @@ -45,3 +45,47 @@ data, }); } + +// 排水 站点最新一条数据记录 +export function realtimeDataLatest(stCode) { + return request({ + url: '/business/rtuSiteMonitor/realtimeData/' + stCode, + method: 'get', + }); +} + +// 数据统计-动态表头 +export function dataAnalysisHead(query) { + return request({ + url: '/business/siteHistoryMonitor/dataAnalysis/heads', + method: 'get', + params: query, + }); +} +// 数据统计-表格数据 +export function dataAnalysisBody(query) { + return request({ + url: '/business/siteHistoryMonitor/dataAnalysis', + method: 'get', + params: query, + }); +} + +// 燃气 /dockingThorughfare/list +export function dockingList(query) { + return request({ + url: '/business/dockingThorughfare/list', + method: 'get', + params: query, + }); +} + +// 燃气 /dockingThorughfareHistory/page +export function dockingHistory(query){ + return request({ + url: '/business/dockingThorughfareHistory/page', + method: 'get', + params: query, + });business +} + diff --git a/src/assets/ranQi_supervise.json b/src/assets/ranQi_supervise.json index f382396..af943b0 100644 --- a/src/assets/ranQi_supervise.json +++ b/src/assets/ranQi_supervise.json @@ -6,15 +6,13 @@ "id": 0, "geometry": { "type": "Point", - "coordinates": [ - 109.4774986436632, - 36.60497748480903 - ] + "coordinates": [109.47244692182598,36.60446952409992] }, "properties": { "FID": 0, "id": 0, - "name": "延安中学" + "device_id": "ac9913a19ca14fdb90c2293457e4733a", + "name": "延中主管井" } }, { @@ -22,16 +20,14 @@ "id": 1, "geometry": { "type": "Point", - "coordinates": [ - 109.48304674487184, - 36.59982338278728 - ] + "coordinates": [109.47839936288358,36.599235476431346] }, "properties": { "FID": 1, "id": 1, - "name": "延安大学附属医院" + "device_id": "daf5f8e9ce7c4af29fd695cad551248e", + "name": "延大附院支井" } } ] -} \ No newline at end of file +} diff --git a/src/api/system/tanchuang.js b/src/api/system/tanchuang.js index a002c1d..39ba563 100644 --- a/src/api/system/tanchuang.js +++ b/src/api/system/tanchuang.js @@ -45,3 +45,47 @@ data, }); } + +// 排水 站点最新一条数据记录 +export function realtimeDataLatest(stCode) { + return request({ + url: '/business/rtuSiteMonitor/realtimeData/' + stCode, + method: 'get', + }); +} + +// 数据统计-动态表头 +export function dataAnalysisHead(query) { + return request({ + url: '/business/siteHistoryMonitor/dataAnalysis/heads', + method: 'get', + params: query, + }); +} +// 数据统计-表格数据 +export function dataAnalysisBody(query) { + return request({ + url: '/business/siteHistoryMonitor/dataAnalysis', + method: 'get', + params: query, + }); +} + +// 燃气 /dockingThorughfare/list +export function dockingList(query) { + return request({ + url: '/business/dockingThorughfare/list', + method: 'get', + params: query, + }); +} + +// 燃气 /dockingThorughfareHistory/page +export function dockingHistory(query){ + return request({ + url: '/business/dockingThorughfareHistory/page', + method: 'get', + params: query, + });business +} + diff --git a/src/assets/ranQi_supervise.json b/src/assets/ranQi_supervise.json index f382396..af943b0 100644 --- a/src/assets/ranQi_supervise.json +++ b/src/assets/ranQi_supervise.json @@ -6,15 +6,13 @@ "id": 0, "geometry": { "type": "Point", - "coordinates": [ - 109.4774986436632, - 36.60497748480903 - ] + "coordinates": [109.47244692182598,36.60446952409992] }, "properties": { "FID": 0, "id": 0, - "name": "延安中学" + "device_id": "ac9913a19ca14fdb90c2293457e4733a", + "name": "延中主管井" } }, { @@ -22,16 +20,14 @@ "id": 1, "geometry": { "type": "Point", - "coordinates": [ - 109.48304674487184, - 36.59982338278728 - ] + "coordinates": [109.47839936288358,36.599235476431346] }, "properties": { "FID": 1, "id": 1, - "name": "延安大学附属医院" + "device_id": "daf5f8e9ce7c4af29fd695cad551248e", + "name": "延大附院支井" } } ] -} \ No newline at end of file +} diff --git a/src/store/modules/dialogTabs.js b/src/store/modules/dialogTabs.js index 2453eb6..d44000d 100644 --- a/src/store/modules/dialogTabs.js +++ b/src/store/modules/dialogTabs.js @@ -6,7 +6,10 @@ // 全景点位 pointLocation: [], // 类型模块 - moduleType:"" + moduleType: '', + // 地图排水或燃气类型 + mapType: '', + mapTypeTitle:'' }; }, actions: { @@ -29,9 +32,15 @@ setModuleType(type) { this.moduleType = type; }, + setMapType(type,title) { + this.mapType = type; + this.mapTypeTitle = title; + }, clear() { this.pointLocation = []; this.RQvalue = {}; + this.mapType = ''; + this.mapTypeTitle = ''; }, }, }); diff --git a/src/api/system/tanchuang.js b/src/api/system/tanchuang.js index a002c1d..39ba563 100644 --- a/src/api/system/tanchuang.js +++ b/src/api/system/tanchuang.js @@ -45,3 +45,47 @@ data, }); } + +// 排水 站点最新一条数据记录 +export function realtimeDataLatest(stCode) { + return request({ + url: '/business/rtuSiteMonitor/realtimeData/' + stCode, + method: 'get', + }); +} + +// 数据统计-动态表头 +export function dataAnalysisHead(query) { + return request({ + url: '/business/siteHistoryMonitor/dataAnalysis/heads', + method: 'get', + params: query, + }); +} +// 数据统计-表格数据 +export function dataAnalysisBody(query) { + return request({ + url: '/business/siteHistoryMonitor/dataAnalysis', + method: 'get', + params: query, + }); +} + +// 燃气 /dockingThorughfare/list +export function dockingList(query) { + return request({ + url: '/business/dockingThorughfare/list', + method: 'get', + params: query, + }); +} + +// 燃气 /dockingThorughfareHistory/page +export function dockingHistory(query){ + return request({ + url: '/business/dockingThorughfareHistory/page', + method: 'get', + params: query, + });business +} + diff --git a/src/assets/ranQi_supervise.json b/src/assets/ranQi_supervise.json index f382396..af943b0 100644 --- a/src/assets/ranQi_supervise.json +++ b/src/assets/ranQi_supervise.json @@ -6,15 +6,13 @@ "id": 0, "geometry": { "type": "Point", - "coordinates": [ - 109.4774986436632, - 36.60497748480903 - ] + "coordinates": [109.47244692182598,36.60446952409992] }, "properties": { "FID": 0, "id": 0, - "name": "延安中学" + "device_id": "ac9913a19ca14fdb90c2293457e4733a", + "name": "延中主管井" } }, { @@ -22,16 +20,14 @@ "id": 1, "geometry": { "type": "Point", - "coordinates": [ - 109.48304674487184, - 36.59982338278728 - ] + "coordinates": [109.47839936288358,36.599235476431346] }, "properties": { "FID": 1, "id": 1, - "name": "延安大学附属医院" + "device_id": "daf5f8e9ce7c4af29fd695cad551248e", + "name": "延大附院支井" } } ] -} \ No newline at end of file +} diff --git a/src/store/modules/dialogTabs.js b/src/store/modules/dialogTabs.js index 2453eb6..d44000d 100644 --- a/src/store/modules/dialogTabs.js +++ b/src/store/modules/dialogTabs.js @@ -6,7 +6,10 @@ // 全景点位 pointLocation: [], // 类型模块 - moduleType:"" + moduleType: '', + // 地图排水或燃气类型 + mapType: '', + mapTypeTitle:'' }; }, actions: { @@ -29,9 +32,15 @@ setModuleType(type) { this.moduleType = type; }, + setMapType(type,title) { + this.mapType = type; + this.mapTypeTitle = title; + }, clear() { this.pointLocation = []; this.RQvalue = {}; + this.mapType = ''; + this.mapTypeTitle = ''; }, }, }); diff --git a/src/views/DialogTabs/component/JC_dialog.vue b/src/views/DialogTabs/component/JC_dialog.vue index 86c3b52..c51127e 100644 --- a/src/views/DialogTabs/component/JC_dialog.vue +++ b/src/views/DialogTabs/component/JC_dialog.vue @@ -2,8 +2,66 @@
- -
+ +
+ + + + {{ ListData.stCode }} + + + + + {{ ListData.stName }} + + + + + + + {{ ListData.siteType == 'water_level' ? '水位计' : '燃气井下探测器' }} + + + + + {{ ListData.address || '' }} + + + + + + + {{ ListData.monitorValueList[i].monitorValue }} + + + + + + + + {{ ListData.faultStatus == 'normal' ? '正常' : '异常' }} + + + + + {{ ListData.tt }} + + + + + {{ ListData.ut }} + + + +
+ +
@@ -15,104 +73,48 @@ {{ ListData.siteName }} - - - {{ ListData.shebei }} + {{ '燃气井下探测器' }} - {{ ListData.weizhi }} + {{ ListData.siteAddress }} + + + + + {{ gas_type.find(item => item.value == ListData.gasType)?.label || ListData.gasType }} + + + + + {{ ListData.gasValue + '%VOL' }} + + + + + {{ ListData.temperature + '℃' }} + + + + + {{ ListData.waterLevelState == 0 ? '正常' : '超限' }} + + + + + {{ ListData.eventType == 1 ? '在线' : '离线' }} + + + + + {{ ListData.timestamp }} - - - - {{ ListData.z + '米' }} - - - - - {{ ListData.h + '米' }} - - - - - - - {{ ListData.q }} - - - - - {{ ListData.dl + '米' }} - - - - - - - {{ ListData.dy + '伏特' }} - - - - - {{ ListData.state }} - - - - - - - {{ ListData.jcTime }} - - - - - {{ ListData.cunchuTime }} - - - -
- -
@@ -121,21 +123,13 @@ diff --git a/src/api/system/tanchuang.js b/src/api/system/tanchuang.js index a002c1d..39ba563 100644 --- a/src/api/system/tanchuang.js +++ b/src/api/system/tanchuang.js @@ -45,3 +45,47 @@ data, }); } + +// 排水 站点最新一条数据记录 +export function realtimeDataLatest(stCode) { + return request({ + url: '/business/rtuSiteMonitor/realtimeData/' + stCode, + method: 'get', + }); +} + +// 数据统计-动态表头 +export function dataAnalysisHead(query) { + return request({ + url: '/business/siteHistoryMonitor/dataAnalysis/heads', + method: 'get', + params: query, + }); +} +// 数据统计-表格数据 +export function dataAnalysisBody(query) { + return request({ + url: '/business/siteHistoryMonitor/dataAnalysis', + method: 'get', + params: query, + }); +} + +// 燃气 /dockingThorughfare/list +export function dockingList(query) { + return request({ + url: '/business/dockingThorughfare/list', + method: 'get', + params: query, + }); +} + +// 燃气 /dockingThorughfareHistory/page +export function dockingHistory(query){ + return request({ + url: '/business/dockingThorughfareHistory/page', + method: 'get', + params: query, + });business +} + diff --git a/src/assets/ranQi_supervise.json b/src/assets/ranQi_supervise.json index f382396..af943b0 100644 --- a/src/assets/ranQi_supervise.json +++ b/src/assets/ranQi_supervise.json @@ -6,15 +6,13 @@ "id": 0, "geometry": { "type": "Point", - "coordinates": [ - 109.4774986436632, - 36.60497748480903 - ] + "coordinates": [109.47244692182598,36.60446952409992] }, "properties": { "FID": 0, "id": 0, - "name": "延安中学" + "device_id": "ac9913a19ca14fdb90c2293457e4733a", + "name": "延中主管井" } }, { @@ -22,16 +20,14 @@ "id": 1, "geometry": { "type": "Point", - "coordinates": [ - 109.48304674487184, - 36.59982338278728 - ] + "coordinates": [109.47839936288358,36.599235476431346] }, "properties": { "FID": 1, "id": 1, - "name": "延安大学附属医院" + "device_id": "daf5f8e9ce7c4af29fd695cad551248e", + "name": "延大附院支井" } } ] -} \ No newline at end of file +} diff --git a/src/store/modules/dialogTabs.js b/src/store/modules/dialogTabs.js index 2453eb6..d44000d 100644 --- a/src/store/modules/dialogTabs.js +++ b/src/store/modules/dialogTabs.js @@ -6,7 +6,10 @@ // 全景点位 pointLocation: [], // 类型模块 - moduleType:"" + moduleType: '', + // 地图排水或燃气类型 + mapType: '', + mapTypeTitle:'' }; }, actions: { @@ -29,9 +32,15 @@ setModuleType(type) { this.moduleType = type; }, + setMapType(type,title) { + this.mapType = type; + this.mapTypeTitle = title; + }, clear() { this.pointLocation = []; this.RQvalue = {}; + this.mapType = ''; + this.mapTypeTitle = ''; }, }, }); diff --git a/src/views/DialogTabs/component/JC_dialog.vue b/src/views/DialogTabs/component/JC_dialog.vue index 86c3b52..c51127e 100644 --- a/src/views/DialogTabs/component/JC_dialog.vue +++ b/src/views/DialogTabs/component/JC_dialog.vue @@ -2,8 +2,66 @@
- -
+ +
+ + + + {{ ListData.stCode }} + + + + + {{ ListData.stName }} + + + + + + + {{ ListData.siteType == 'water_level' ? '水位计' : '燃气井下探测器' }} + + + + + {{ ListData.address || '' }} + + + + + + + {{ ListData.monitorValueList[i].monitorValue }} + + + + + + + + {{ ListData.faultStatus == 'normal' ? '正常' : '异常' }} + + + + + {{ ListData.tt }} + + + + + {{ ListData.ut }} + + + +
+ +
@@ -15,104 +73,48 @@ {{ ListData.siteName }} - - - {{ ListData.shebei }} + {{ '燃气井下探测器' }} - {{ ListData.weizhi }} + {{ ListData.siteAddress }} + + + + + {{ gas_type.find(item => item.value == ListData.gasType)?.label || ListData.gasType }} + + + + + {{ ListData.gasValue + '%VOL' }} + + + + + {{ ListData.temperature + '℃' }} + + + + + {{ ListData.waterLevelState == 0 ? '正常' : '超限' }} + + + + + {{ ListData.eventType == 1 ? '在线' : '离线' }} + + + + + {{ ListData.timestamp }} - - - - {{ ListData.z + '米' }} - - - - - {{ ListData.h + '米' }} - - - - - - - {{ ListData.q }} - - - - - {{ ListData.dl + '米' }} - - - - - - - {{ ListData.dy + '伏特' }} - - - - - {{ ListData.state }} - - - - - - - {{ ListData.jcTime }} - - - - - {{ ListData.cunchuTime }} - - - -
- -
@@ -121,21 +123,13 @@ diff --git a/src/views/DialogTabs/component/JC_oldList.vue b/src/views/DialogTabs/component/JC_oldList.vue index 04ebd1e..4063005 100644 --- a/src/views/DialogTabs/component/JC_oldList.vue +++ b/src/views/DialogTabs/component/JC_oldList.vue @@ -12,19 +12,68 @@ placeholder="请选择年月日" />
- 搜索 - 导出 + 搜索 + 导出
-
- +
+ + --> + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -41,135 +90,121 @@ @@ -268,6 +303,8 @@ } // 内容 .el-table__body-wrapper { + // --el-bg-color:linear-gradient(0deg, #008599 0%, #08596d 100%); + --el-bg-color: transparent; .el-table__row { background-color: transparent; border: none; @@ -283,7 +320,7 @@ } .el-table__row--striped { td.el-table__cell { - background: linear-gradient(0deg, #008599 0%, #08596d 100%); + background: linear-gradient(0deg, #008599 0%, #08596d 100%) !important; border: none; } } diff --git a/src/api/system/tanchuang.js b/src/api/system/tanchuang.js index a002c1d..39ba563 100644 --- a/src/api/system/tanchuang.js +++ b/src/api/system/tanchuang.js @@ -45,3 +45,47 @@ data, }); } + +// 排水 站点最新一条数据记录 +export function realtimeDataLatest(stCode) { + return request({ + url: '/business/rtuSiteMonitor/realtimeData/' + stCode, + method: 'get', + }); +} + +// 数据统计-动态表头 +export function dataAnalysisHead(query) { + return request({ + url: '/business/siteHistoryMonitor/dataAnalysis/heads', + method: 'get', + params: query, + }); +} +// 数据统计-表格数据 +export function dataAnalysisBody(query) { + return request({ + url: '/business/siteHistoryMonitor/dataAnalysis', + method: 'get', + params: query, + }); +} + +// 燃气 /dockingThorughfare/list +export function dockingList(query) { + return request({ + url: '/business/dockingThorughfare/list', + method: 'get', + params: query, + }); +} + +// 燃气 /dockingThorughfareHistory/page +export function dockingHistory(query){ + return request({ + url: '/business/dockingThorughfareHistory/page', + method: 'get', + params: query, + });business +} + diff --git a/src/assets/ranQi_supervise.json b/src/assets/ranQi_supervise.json index f382396..af943b0 100644 --- a/src/assets/ranQi_supervise.json +++ b/src/assets/ranQi_supervise.json @@ -6,15 +6,13 @@ "id": 0, "geometry": { "type": "Point", - "coordinates": [ - 109.4774986436632, - 36.60497748480903 - ] + "coordinates": [109.47244692182598,36.60446952409992] }, "properties": { "FID": 0, "id": 0, - "name": "延安中学" + "device_id": "ac9913a19ca14fdb90c2293457e4733a", + "name": "延中主管井" } }, { @@ -22,16 +20,14 @@ "id": 1, "geometry": { "type": "Point", - "coordinates": [ - 109.48304674487184, - 36.59982338278728 - ] + "coordinates": [109.47839936288358,36.599235476431346] }, "properties": { "FID": 1, "id": 1, - "name": "延安大学附属医院" + "device_id": "daf5f8e9ce7c4af29fd695cad551248e", + "name": "延大附院支井" } } ] -} \ No newline at end of file +} diff --git a/src/store/modules/dialogTabs.js b/src/store/modules/dialogTabs.js index 2453eb6..d44000d 100644 --- a/src/store/modules/dialogTabs.js +++ b/src/store/modules/dialogTabs.js @@ -6,7 +6,10 @@ // 全景点位 pointLocation: [], // 类型模块 - moduleType:"" + moduleType: '', + // 地图排水或燃气类型 + mapType: '', + mapTypeTitle:'' }; }, actions: { @@ -29,9 +32,15 @@ setModuleType(type) { this.moduleType = type; }, + setMapType(type,title) { + this.mapType = type; + this.mapTypeTitle = title; + }, clear() { this.pointLocation = []; this.RQvalue = {}; + this.mapType = ''; + this.mapTypeTitle = ''; }, }, }); diff --git a/src/views/DialogTabs/component/JC_dialog.vue b/src/views/DialogTabs/component/JC_dialog.vue index 86c3b52..c51127e 100644 --- a/src/views/DialogTabs/component/JC_dialog.vue +++ b/src/views/DialogTabs/component/JC_dialog.vue @@ -2,8 +2,66 @@
- -
+ +
+ + + + {{ ListData.stCode }} + + + + + {{ ListData.stName }} + + + + + + + {{ ListData.siteType == 'water_level' ? '水位计' : '燃气井下探测器' }} + + + + + {{ ListData.address || '' }} + + + + + + + {{ ListData.monitorValueList[i].monitorValue }} + + + + + + + + {{ ListData.faultStatus == 'normal' ? '正常' : '异常' }} + + + + + {{ ListData.tt }} + + + + + {{ ListData.ut }} + + + +
+ +
@@ -15,104 +73,48 @@ {{ ListData.siteName }} - - - {{ ListData.shebei }} + {{ '燃气井下探测器' }} - {{ ListData.weizhi }} + {{ ListData.siteAddress }} + + + + + {{ gas_type.find(item => item.value == ListData.gasType)?.label || ListData.gasType }} + + + + + {{ ListData.gasValue + '%VOL' }} + + + + + {{ ListData.temperature + '℃' }} + + + + + {{ ListData.waterLevelState == 0 ? '正常' : '超限' }} + + + + + {{ ListData.eventType == 1 ? '在线' : '离线' }} + + + + + {{ ListData.timestamp }} - - - - {{ ListData.z + '米' }} - - - - - {{ ListData.h + '米' }} - - - - - - - {{ ListData.q }} - - - - - {{ ListData.dl + '米' }} - - - - - - - {{ ListData.dy + '伏特' }} - - - - - {{ ListData.state }} - - - - - - - {{ ListData.jcTime }} - - - - - {{ ListData.cunchuTime }} - - - -
- -
@@ -121,21 +123,13 @@ diff --git a/src/views/DialogTabs/component/JC_oldList.vue b/src/views/DialogTabs/component/JC_oldList.vue index 04ebd1e..4063005 100644 --- a/src/views/DialogTabs/component/JC_oldList.vue +++ b/src/views/DialogTabs/component/JC_oldList.vue @@ -12,19 +12,68 @@ placeholder="请选择年月日" />
- 搜索 - 导出 + 搜索 + 导出 -
- +
+ + --> + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -41,135 +90,121 @@ @@ -268,6 +303,8 @@ } // 内容 .el-table__body-wrapper { + // --el-bg-color:linear-gradient(0deg, #008599 0%, #08596d 100%); + --el-bg-color: transparent; .el-table__row { background-color: transparent; border: none; @@ -283,7 +320,7 @@ } .el-table__row--striped { td.el-table__cell { - background: linear-gradient(0deg, #008599 0%, #08596d 100%); + background: linear-gradient(0deg, #008599 0%, #08596d 100%) !important; border: none; } } diff --git a/src/views/oneMap/components/mapboxPopup.vue b/src/views/oneMap/components/mapboxPopup.vue index 9eb693e..f37e3bf 100644 --- a/src/views/oneMap/components/mapboxPopup.vue +++ b/src/views/oneMap/components/mapboxPopup.vue @@ -522,20 +522,6 @@ bus.on("popupcontent", (params) => { console.log("popup接收地图标注点值---111", params); - // 排水弹窗 - if (params.popupInfo.type == "paishuiSupervise") { - allData.popupShow = false; - let data = { - title:'水位计：'+ params.popupInfo.name, - comIDs: ["JC_dialog",'JC_oldList'], - SiteNo: params.popupInfo.siteNo, - }; - bus.emit("publicDialog", data); - // setTimeout(() => { - // bus.emit("xxinformationList", params); - // }, 100); - return - } allData.streetPosition = params.point; allData.dataList = params.popupInfo; let pipePopupDiv = document.getElementById("cesiumPopupID"); @@ -590,6 +576,24 @@ bus.emit("xxinformationList", params); }, 100); } + + // 排水弹窗 + if (params.popupInfo.type == "paishuiSupervise" || params.popupInfo.type == "ranQi_supervise") { + allData.popupShow = false; + let title = params.popupInfo.type == "paishuiSupervise" ?'水位计：'+ params.popupInfo.name :'燃气井下探测器：'+ params.popupInfo.name + useDialogTabs.setMapType(params.popupInfo.type,title); + let data = { + // 燃气井下探测器 device_id + title, + comIDs: ["JC_dialog",'JC_oldList'], + SiteNo: params.popupInfo.type == "paishuiSupervise" ?params.popupInfo.siteNo: params.popupInfo.device_id, + }; + bus.emit("publicDialog", data); + // setTimeout(() => { + // bus.emit("xxinformationList", params); + // }, 100); + return + } if (allData.dataList.siteType == "rain") changeDate(); //雨量站曲线图 if (allData.dataList.type == "waterCourse") changeDateSW(); //河道水位计 if (allData.dataList.type == "waterLoging") changeDateJSD(); //内涝积水点 diff --git a/src/api/system/tanchuang.js b/src/api/system/tanchuang.js index a002c1d..39ba563 100644 --- a/src/api/system/tanchuang.js +++ b/src/api/system/tanchuang.js @@ -45,3 +45,47 @@ data, }); } + +// 排水 站点最新一条数据记录 +export function realtimeDataLatest(stCode) { + return request({ + url: '/business/rtuSiteMonitor/realtimeData/' + stCode, + method: 'get', + }); +} + +// 数据统计-动态表头 +export function dataAnalysisHead(query) { + return request({ + url: '/business/siteHistoryMonitor/dataAnalysis/heads', + method: 'get', + params: query, + }); +} +// 数据统计-表格数据 +export function dataAnalysisBody(query) { + return request({ + url: '/business/siteHistoryMonitor/dataAnalysis', + method: 'get', + params: query, + }); +} + +// 燃气 /dockingThorughfare/list +export function dockingList(query) { + return request({ + url: '/business/dockingThorughfare/list', + method: 'get', + params: query, + }); +} + +// 燃气 /dockingThorughfareHistory/page +export function dockingHistory(query){ + return request({ + url: '/business/dockingThorughfareHistory/page', + method: 'get', + params: query, + });business +} + diff --git a/src/assets/ranQi_supervise.json b/src/assets/ranQi_supervise.json index f382396..af943b0 100644 --- a/src/assets/ranQi_supervise.json +++ b/src/assets/ranQi_supervise.json @@ -6,15 +6,13 @@ "id": 0, "geometry": { "type": "Point", - "coordinates": [ - 109.4774986436632, - 36.60497748480903 - ] + "coordinates": [109.47244692182598,36.60446952409992] }, "properties": { "FID": 0, "id": 0, - "name": "延安中学" + "device_id": "ac9913a19ca14fdb90c2293457e4733a", + "name": "延中主管井" } }, { @@ -22,16 +20,14 @@ "id": 1, "geometry": { "type": "Point", - "coordinates": [ - 109.48304674487184, - 36.59982338278728 - ] + "coordinates": [109.47839936288358,36.599235476431346] }, "properties": { "FID": 1, "id": 1, - "name": "延安大学附属医院" + "device_id": "daf5f8e9ce7c4af29fd695cad551248e", + "name": "延大附院支井" } } ] -} \ No newline at end of file +} diff --git a/src/store/modules/dialogTabs.js b/src/store/modules/dialogTabs.js index 2453eb6..d44000d 100644 --- a/src/store/modules/dialogTabs.js +++ b/src/store/modules/dialogTabs.js @@ -6,7 +6,10 @@ // 全景点位 pointLocation: [], // 类型模块 - moduleType:"" + moduleType: '', + // 地图排水或燃气类型 + mapType: '', + mapTypeTitle:'' }; }, actions: { @@ -29,9 +32,15 @@ setModuleType(type) { this.moduleType = type; }, + setMapType(type,title) { + this.mapType = type; + this.mapTypeTitle = title; + }, clear() { this.pointLocation = []; this.RQvalue = {}; + this.mapType = ''; + this.mapTypeTitle = ''; }, }, }); diff --git a/src/views/DialogTabs/component/JC_dialog.vue b/src/views/DialogTabs/component/JC_dialog.vue index 86c3b52..c51127e 100644 --- a/src/views/DialogTabs/component/JC_dialog.vue +++ b/src/views/DialogTabs/component/JC_dialog.vue @@ -2,8 +2,66 @@
- -
+ +
+ + + + {{ ListData.stCode }} + + + + + {{ ListData.stName }} + + + + + + + {{ ListData.siteType == 'water_level' ? '水位计' : '燃气井下探测器' }} + + + + + {{ ListData.address || '' }} + + + + + + + {{ ListData.monitorValueList[i].monitorValue }} + + + + + + + + {{ ListData.faultStatus == 'normal' ? '正常' : '异常' }} + + + + + {{ ListData.tt }} + + + + + {{ ListData.ut }} + + + +
+ +
@@ -15,104 +73,48 @@ {{ ListData.siteName }} - - - {{ ListData.shebei }} + {{ '燃气井下探测器' }} - {{ ListData.weizhi }} + {{ ListData.siteAddress }} + + + + + {{ gas_type.find(item => item.value == ListData.gasType)?.label || ListData.gasType }} + + + + + {{ ListData.gasValue + '%VOL' }} + + + + + {{ ListData.temperature + '℃' }} + + + + + {{ ListData.waterLevelState == 0 ? '正常' : '超限' }} + + + + + {{ ListData.eventType == 1 ? '在线' : '离线' }} + + + + + {{ ListData.timestamp }} - - - - {{ ListData.z + '米' }} - - - - - {{ ListData.h + '米' }} - - - - - - - {{ ListData.q }} - - - - - {{ ListData.dl + '米' }} - - - - - - - {{ ListData.dy + '伏特' }} - - - - - {{ ListData.state }} - - - - - - - {{ ListData.jcTime }} - - - - - {{ ListData.cunchuTime }} - - - -
- -
@@ -121,21 +123,13 @@ diff --git a/src/views/DialogTabs/component/JC_oldList.vue b/src/views/DialogTabs/component/JC_oldList.vue index 04ebd1e..4063005 100644 --- a/src/views/DialogTabs/component/JC_oldList.vue +++ b/src/views/DialogTabs/component/JC_oldList.vue @@ -12,19 +12,68 @@ placeholder="请选择年月日" />
- 搜索 - 导出 + 搜索 + 导出 -
- +
+ + --> + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -41,135 +90,121 @@ @@ -268,6 +303,8 @@ } // 内容 .el-table__body-wrapper { + // --el-bg-color:linear-gradient(0deg, #008599 0%, #08596d 100%); + --el-bg-color: transparent; .el-table__row { background-color: transparent; border: none; @@ -283,7 +320,7 @@ } .el-table__row--striped { td.el-table__cell { - background: linear-gradient(0deg, #008599 0%, #08596d 100%); + background: linear-gradient(0deg, #008599 0%, #08596d 100%) !important; border: none; } } diff --git a/src/views/oneMap/components/mapboxPopup.vue b/src/views/oneMap/components/mapboxPopup.vue index 9eb693e..f37e3bf 100644 --- a/src/views/oneMap/components/mapboxPopup.vue +++ b/src/views/oneMap/components/mapboxPopup.vue @@ -522,20 +522,6 @@ bus.on("popupcontent", (params) => { console.log("popup接收地图标注点值---111", params); - // 排水弹窗 - if (params.popupInfo.type == "paishuiSupervise") { - allData.popupShow = false; - let data = { - title:'水位计：'+ params.popupInfo.name, - comIDs: ["JC_dialog",'JC_oldList'], - SiteNo: params.popupInfo.siteNo, - }; - bus.emit("publicDialog", data); - // setTimeout(() => { - // bus.emit("xxinformationList", params); - // }, 100); - return - } allData.streetPosition = params.point; allData.dataList = params.popupInfo; let pipePopupDiv = document.getElementById("cesiumPopupID"); @@ -590,6 +576,24 @@ bus.emit("xxinformationList", params); }, 100); } + + // 排水弹窗 + if (params.popupInfo.type == "paishuiSupervise" || params.popupInfo.type == "ranQi_supervise") { + allData.popupShow = false; + let title = params.popupInfo.type == "paishuiSupervise" ?'水位计：'+ params.popupInfo.name :'燃气井下探测器：'+ params.popupInfo.name + useDialogTabs.setMapType(params.popupInfo.type,title); + let data = { + // 燃气井下探测器 device_id + title, + comIDs: ["JC_dialog",'JC_oldList'], + SiteNo: params.popupInfo.type == "paishuiSupervise" ?params.popupInfo.siteNo: params.popupInfo.device_id, + }; + bus.emit("publicDialog", data); + // setTimeout(() => { + // bus.emit("xxinformationList", params); + // }, 100); + return + } if (allData.dataList.siteType == "rain") changeDate(); //雨量站曲线图 if (allData.dataList.type == "waterCourse") changeDateSW(); //河道水位计 if (allData.dataList.type == "waterLoging") changeDateJSD(); //内涝积水点 diff --git a/vite.config.js b/vite.config.js index a500b18..91cf1df 100644 --- a/vite.config.js +++ b/vite.config.js @@ -8,7 +8,7 @@ // const targetUrl = 'http://192.168.48.145:13000'; //张鸿志 const zhz = 'http://192.168.20.5:13002'; //张鸿志 -// const targetUrl = 'http://192.168.16.105:13000'; //张亚辉 +const zyh = 'http://192.168.16.105:13002'; //张亚辉 const targetUrl = 'https://server2.wh-nf.cn:8088/prod-api'; //线上 // https://vitejs.dev/config/ @@ -80,6 +80,12 @@ logLevel: 'debug', rewrite: p => p.replace(/^\/zhz/, ''), }, + '/zyh': { + target: zyh, //测试服务 + changeOrigin: true, + logLevel: 'debug', + rewrite: p => p.replace(/^\/zyh/, ''), + }, // 洪山服务 '/hsApi': { target: 'http://42.193.13.68:8104', //测试服务