diff --git a/src/assets/paishuiSupervise.json b/src/assets/paishuiSupervise.json index eebe965..71763c5 100644 --- a/src/assets/paishuiSupervise.json +++ b/src/assets/paishuiSupervise.json @@ -14,6 +14,7 @@ "properties": { "FID": 0, "id": 0, + "siteNo": "2024101601", "name": "王家坪旧址门口" } }, @@ -30,6 +31,7 @@ "properties": { "FID": 1, "id": 1, + "siteNo": "2024101902", "name": "大砭沟与北大街交叉口" } } diff --git a/src/assets/paishuiSupervise.json b/src/assets/paishuiSupervise.json index eebe965..71763c5 100644 --- a/src/assets/paishuiSupervise.json +++ b/src/assets/paishuiSupervise.json @@ -14,6 +14,7 @@ "properties": { "FID": 0, "id": 0, + "siteNo": "2024101601", "name": "王家坪旧址门口" } }, @@ -30,6 +31,7 @@ "properties": { "FID": 1, "id": 1, + "siteNo": "2024101902", "name": "大砭沟与北大街交叉口" } } diff --git a/src/views/DialogTabs/DialogConfig.js b/src/views/DialogTabs/DialogConfig.js index 247208b..afb456a 100644 --- a/src/views/DialogTabs/DialogConfig.js +++ b/src/views/DialogTabs/DialogConfig.js @@ -75,6 +75,16 @@ content: markRaw(res_components['streetscape']), name: 'streetscape', }, + { + title: '实时数据', + content: markRaw(res_components['JC_dialog']), + name: 'JC_dialog', + }, + { + title: '历史数据', + content: markRaw(res_components['JC_oldList']), + name: 'JC_oldList', + }, ], }; diff --git a/src/assets/paishuiSupervise.json b/src/assets/paishuiSupervise.json index eebe965..71763c5 100644 --- a/src/assets/paishuiSupervise.json +++ b/src/assets/paishuiSupervise.json @@ -14,6 +14,7 @@ "properties": { "FID": 0, "id": 0, + "siteNo": "2024101601", "name": "王家坪旧址门口" } }, @@ -30,6 +31,7 @@ "properties": { "FID": 1, "id": 1, + "siteNo": "2024101902", "name": "大砭沟与北大街交叉口" } } diff --git a/src/views/DialogTabs/DialogConfig.js b/src/views/DialogTabs/DialogConfig.js index 247208b..afb456a 100644 --- a/src/views/DialogTabs/DialogConfig.js +++ b/src/views/DialogTabs/DialogConfig.js @@ -75,6 +75,16 @@ content: markRaw(res_components['streetscape']), name: 'streetscape', }, + { + title: '实时数据', + content: markRaw(res_components['JC_dialog']), + name: 'JC_dialog', + }, + { + title: '历史数据', + content: markRaw(res_components['JC_oldList']), + name: 'JC_oldList', + }, ], }; diff --git a/src/views/DialogTabs/component/JC_dialog.vue b/src/views/DialogTabs/component/JC_dialog.vue new file mode 100644 index 0000000..151baae --- /dev/null +++ b/src/views/DialogTabs/component/JC_dialog.vue @@ -0,0 +1,198 @@ + + + + + diff --git a/src/assets/paishuiSupervise.json b/src/assets/paishuiSupervise.json index eebe965..71763c5 100644 --- a/src/assets/paishuiSupervise.json +++ b/src/assets/paishuiSupervise.json @@ -14,6 +14,7 @@ "properties": { "FID": 0, "id": 0, + "siteNo": "2024101601", "name": "王家坪旧址门口" } }, @@ -30,6 +31,7 @@ "properties": { "FID": 1, "id": 1, + "siteNo": "2024101902", "name": "大砭沟与北大街交叉口" } } diff --git a/src/views/DialogTabs/DialogConfig.js b/src/views/DialogTabs/DialogConfig.js index 247208b..afb456a 100644 --- a/src/views/DialogTabs/DialogConfig.js +++ b/src/views/DialogTabs/DialogConfig.js @@ -75,6 +75,16 @@ content: markRaw(res_components['streetscape']), name: 'streetscape', }, + { + title: '实时数据', + content: markRaw(res_components['JC_dialog']), + name: 'JC_dialog', + }, + { + title: '历史数据', + content: markRaw(res_components['JC_oldList']), + name: 'JC_oldList', + }, ], }; diff --git a/src/views/DialogTabs/component/JC_dialog.vue b/src/views/DialogTabs/component/JC_dialog.vue new file mode 100644 index 0000000..151baae --- /dev/null +++ b/src/views/DialogTabs/component/JC_dialog.vue @@ -0,0 +1,198 @@ + + + + + diff --git a/src/views/DialogTabs/component/JC_oldList.vue b/src/views/DialogTabs/component/JC_oldList.vue new file mode 100644 index 0000000..bc87497 --- /dev/null +++ b/src/views/DialogTabs/component/JC_oldList.vue @@ -0,0 +1,306 @@ + + + + + diff --git a/src/assets/paishuiSupervise.json b/src/assets/paishuiSupervise.json index eebe965..71763c5 100644 --- a/src/assets/paishuiSupervise.json +++ b/src/assets/paishuiSupervise.json @@ -14,6 +14,7 @@ "properties": { "FID": 0, "id": 0, + "siteNo": "2024101601", "name": "王家坪旧址门口" } }, @@ -30,6 +31,7 @@ "properties": { "FID": 1, "id": 1, + "siteNo": "2024101902", "name": "大砭沟与北大街交叉口" } } diff --git a/src/views/DialogTabs/DialogConfig.js b/src/views/DialogTabs/DialogConfig.js index 247208b..afb456a 100644 --- a/src/views/DialogTabs/DialogConfig.js +++ b/src/views/DialogTabs/DialogConfig.js @@ -75,6 +75,16 @@ content: markRaw(res_components['streetscape']), name: 'streetscape', }, + { + title: '实时数据', + content: markRaw(res_components['JC_dialog']), + name: 'JC_dialog', + }, + { + title: '历史数据', + content: markRaw(res_components['JC_oldList']), + name: 'JC_oldList', + }, ], }; diff --git a/src/views/DialogTabs/component/JC_dialog.vue b/src/views/DialogTabs/component/JC_dialog.vue new file mode 100644 index 0000000..151baae --- /dev/null +++ b/src/views/DialogTabs/component/JC_dialog.vue @@ -0,0 +1,198 @@ + + + + + diff --git a/src/views/DialogTabs/component/JC_oldList.vue b/src/views/DialogTabs/component/JC_oldList.vue new file mode 100644 index 0000000..bc87497 --- /dev/null +++ b/src/views/DialogTabs/component/JC_oldList.vue @@ -0,0 +1,306 @@ + + + + + diff --git a/src/views/oneMap/components/mapboxPopup.vue b/src/views/oneMap/components/mapboxPopup.vue index c21ff0c..9eb693e 100644 --- a/src/views/oneMap/components/mapboxPopup.vue +++ b/src/views/oneMap/components/mapboxPopup.vue @@ -521,6 +521,21 @@ }); 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");