diff --git a/src/views/oneMap/SmartDrainage/PsRightBox.vue b/src/views/oneMap/SmartDrainage/PsRightBox.vue index 350fff1..c5a397e 100644 --- a/src/views/oneMap/SmartDrainage/PsRightBox.vue +++ b/src/views/oneMap/SmartDrainage/PsRightBox.vue @@ -223,6 +223,8 @@ selectSiteMonitorBySiteType, waterloggingArchiveList, } from "@/api/system/tanchuang"; +import dialogTabsStore from "@/store/modules/dialogTabs"; +const useDialogTabs = dialogTabsStore(); const FXJCData = ref([ { @@ -232,6 +234,7 @@ kzsw: 2000, zt: "超控制常水位", siteNo: "2024101614", + position:[109.497341,36.603151], }, { xh: "2", @@ -240,6 +243,7 @@ kzsw: 300, zt: "正常", siteNo: "2024101615", + position:[109.417646,36.571427], }, { xh: "3", @@ -248,6 +252,7 @@ kzsw: 700, zt: "正常", siteNo: "2024101616", + position:[109.383491,36.634602], }, { xh: "4", @@ -256,6 +261,7 @@ kzsw: 700, zt: "正常", siteNo: "2024101617", + position:[109.476953,36.536511], }, ]); const listData = ref([ @@ -264,14 +270,16 @@ onlineStatus: "online", riskAnalysis: "无风险", siteNo: "2024101612", + position:'109.504561,36.60637', }, { siteName: "大桥街与延河西路交叉口", onlineStatus: "online", riskAnalysis: "无风险", siteNo: "2024101613", + position:'109.497323,36.60318', }, - // { siteName: '文化沟路与延河西路交叉口', siteStatus: '在线', warnInfo: '无风险' }, + { siteName: '文化沟路与延河西路交叉口', siteStatus: '在线', riskAnalysis: '无风险',siteNo: '2024101634',position:'109.480944,36.613436', }, ]); const jsjcData = ref([ // { siteName: '东关大街与长青路交叉口', siteStatus: '在线', warnInfo: '无风险', siteNo: '2024101612' }, @@ -348,7 +356,7 @@ riskAnalysis: "无风险", siteNo: "2024101613", }, - // { siteName: '文化沟路与延河西路交叉口', siteStatus: '在线', warnInfo: '无风险' }, + { siteName: '文化沟路与延河西路交叉口', siteStatus: 'online', warnInfo: '无风险',siteNo: '2024101634' }, ]; } else if (monitorname.value == "积水监测(0/16)") { listData.value = jsjcData.value; @@ -365,6 +373,7 @@ function showMapDalog(val) { console.log("val.siteName", val); + useDialogTabs.addPosition(val.position.split(',').map(item => parseFloat(item))) let data = { title: val.siteName, // comIDs: ['gwpm', 'jcsj', 'danganInfo'], //满溢监测 @@ -386,6 +395,8 @@ // comIDs: ['spjk', 'jcsj', 'danganInfo'], //积水监测 // }; // bus.emit('publicDialog', data); + // useDialogTabs.addPosition(val.position); // 添加全景位置 + useDialogTabs.addPosition(val.position.split(',').map(item => parseFloat(item))) let data = { title: val.siteName, // comIDs: ['gwpm', 'jcsj', 'danganInfo'], //满溢监测 @@ -439,7 +450,7 @@ const tabsList = res.data.boxList.map((item) => item.boxId); return tabsList; } catch (error) { - console.log("🚀 ~ getTabsList ~ error:", error); + console.log(" ~ getTabsList ~ error:", error); } }; diff --git a/src/views/oneMap/SmartDrainage/PsRightBox.vue b/src/views/oneMap/SmartDrainage/PsRightBox.vue index 350fff1..c5a397e 100644 --- a/src/views/oneMap/SmartDrainage/PsRightBox.vue +++ b/src/views/oneMap/SmartDrainage/PsRightBox.vue @@ -223,6 +223,8 @@ selectSiteMonitorBySiteType, waterloggingArchiveList, } from "@/api/system/tanchuang"; +import dialogTabsStore from "@/store/modules/dialogTabs"; +const useDialogTabs = dialogTabsStore(); const FXJCData = ref([ { @@ -232,6 +234,7 @@ kzsw: 2000, zt: "超控制常水位", siteNo: "2024101614", + position:[109.497341,36.603151], }, { xh: "2", @@ -240,6 +243,7 @@ kzsw: 300, zt: "正常", siteNo: "2024101615", + position:[109.417646,36.571427], }, { xh: "3", @@ -248,6 +252,7 @@ kzsw: 700, zt: "正常", siteNo: "2024101616", + position:[109.383491,36.634602], }, { xh: "4", @@ -256,6 +261,7 @@ kzsw: 700, zt: "正常", siteNo: "2024101617", + position:[109.476953,36.536511], }, ]); const listData = ref([ @@ -264,14 +270,16 @@ onlineStatus: "online", riskAnalysis: "无风险", siteNo: "2024101612", + position:'109.504561,36.60637', }, { siteName: "大桥街与延河西路交叉口", onlineStatus: "online", riskAnalysis: "无风险", siteNo: "2024101613", + position:'109.497323,36.60318', }, - // { siteName: '文化沟路与延河西路交叉口', siteStatus: '在线', warnInfo: '无风险' }, + { siteName: '文化沟路与延河西路交叉口', siteStatus: '在线', riskAnalysis: '无风险',siteNo: '2024101634',position:'109.480944,36.613436', }, ]); const jsjcData = ref([ // { siteName: '东关大街与长青路交叉口', siteStatus: '在线', warnInfo: '无风险', siteNo: '2024101612' }, @@ -348,7 +356,7 @@ riskAnalysis: "无风险", siteNo: "2024101613", }, - // { siteName: '文化沟路与延河西路交叉口', siteStatus: '在线', warnInfo: '无风险' }, + { siteName: '文化沟路与延河西路交叉口', siteStatus: 'online', warnInfo: '无风险',siteNo: '2024101634' }, ]; } else if (monitorname.value == "积水监测(0/16)") { listData.value = jsjcData.value; @@ -365,6 +373,7 @@ function showMapDalog(val) { console.log("val.siteName", val); + useDialogTabs.addPosition(val.position.split(',').map(item => parseFloat(item))) let data = { title: val.siteName, // comIDs: ['gwpm', 'jcsj', 'danganInfo'], //满溢监测 @@ -386,6 +395,8 @@ // comIDs: ['spjk', 'jcsj', 'danganInfo'], //积水监测 // }; // bus.emit('publicDialog', data); + // useDialogTabs.addPosition(val.position); // 添加全景位置 + useDialogTabs.addPosition(val.position.split(',').map(item => parseFloat(item))) let data = { title: val.siteName, // comIDs: ['gwpm', 'jcsj', 'danganInfo'], //满溢监测 @@ -439,7 +450,7 @@ const tabsList = res.data.boxList.map((item) => item.boxId); return tabsList; } catch (error) { - console.log("🚀 ~ getTabsList ~ error:", error); + console.log(" ~ getTabsList ~ error:", error); } }; diff --git a/src/views/oneMap/floodPrevention/FholRightBox.vue b/src/views/oneMap/floodPrevention/FholRightBox.vue index 22d34e7..21b215a 100644 --- a/src/views/oneMap/floodPrevention/FholRightBox.vue +++ b/src/views/oneMap/floodPrevention/FholRightBox.vue @@ -20,8 +20,8 @@ {{ i.siteStatus }}{{ i.onlineStatus == "online" ? "在线" : "离线" }}
@@ -34,9 +34,9 @@
风险分析:
- {{ i.warnInfo }} + {{ i.riskAnalysis }}
@@ -162,19 +162,34 @@ bzname.value = val.name; } const listData = ref([ + // { + // siteName: "东关大街与长青路交叉口", + // siteStatus: "在线", + // warnInfo: "无风险", + // siteNo: "2024101618", + // }, + // { + // siteName: "大桥街与延河西路交叉口", + // siteStatus: "离线", + // warnInfo: "无风险", + // siteNo: "2024101619", + // }, + // { siteName: "文化沟路与延河西路交叉口", siteStatus: "在线", warnInfo: "无风险" }, { siteName: "东关大街与长青路交叉口", - siteStatus: "在线", - warnInfo: "无风险", - siteNo: "2024101618", + onlineStatus: "online", + riskAnalysis: "无风险", + siteNo: "2024101612", + position:'109.504561,36.60637', }, { siteName: "大桥街与延河西路交叉口", - siteStatus: "离线", - warnInfo: "无风险", - siteNo: "2024101619", + onlineStatus: "online", + riskAnalysis: "无风险", + siteNo: "2024101613", + position:'109.497323,36.60318', }, - // { siteName: "文化沟路与延河西路交叉口", siteStatus: "在线", warnInfo: "无风险" }, + { siteName: '文化沟路与延河西路交叉口', siteStatus: '在线', riskAnalysis: '无风险',siteNo: '2024101634',position:'109.480944,36.613436', }, ]); const search = ref({ stCode: 1, @@ -236,6 +251,7 @@ function showMapDalog(val) { console.log(val.siteName, "val.siteName"); + useDialogTabs.addPosition(val.position.split(',').map(item => parseFloat(item))) let data = { title: val.siteName, // comIDs: ['gwpm', 'jcsj'], diff --git a/src/views/oneMap/SmartDrainage/PsRightBox.vue b/src/views/oneMap/SmartDrainage/PsRightBox.vue index 350fff1..c5a397e 100644 --- a/src/views/oneMap/SmartDrainage/PsRightBox.vue +++ b/src/views/oneMap/SmartDrainage/PsRightBox.vue @@ -223,6 +223,8 @@ selectSiteMonitorBySiteType, waterloggingArchiveList, } from "@/api/system/tanchuang"; +import dialogTabsStore from "@/store/modules/dialogTabs"; +const useDialogTabs = dialogTabsStore(); const FXJCData = ref([ { @@ -232,6 +234,7 @@ kzsw: 2000, zt: "超控制常水位", siteNo: "2024101614", + position:[109.497341,36.603151], }, { xh: "2", @@ -240,6 +243,7 @@ kzsw: 300, zt: "正常", siteNo: "2024101615", + position:[109.417646,36.571427], }, { xh: "3", @@ -248,6 +252,7 @@ kzsw: 700, zt: "正常", siteNo: "2024101616", + position:[109.383491,36.634602], }, { xh: "4", @@ -256,6 +261,7 @@ kzsw: 700, zt: "正常", siteNo: "2024101617", + position:[109.476953,36.536511], }, ]); const listData = ref([ @@ -264,14 +270,16 @@ onlineStatus: "online", riskAnalysis: "无风险", siteNo: "2024101612", + position:'109.504561,36.60637', }, { siteName: "大桥街与延河西路交叉口", onlineStatus: "online", riskAnalysis: "无风险", siteNo: "2024101613", + position:'109.497323,36.60318', }, - // { siteName: '文化沟路与延河西路交叉口', siteStatus: '在线', warnInfo: '无风险' }, + { siteName: '文化沟路与延河西路交叉口', siteStatus: '在线', riskAnalysis: '无风险',siteNo: '2024101634',position:'109.480944,36.613436', }, ]); const jsjcData = ref([ // { siteName: '东关大街与长青路交叉口', siteStatus: '在线', warnInfo: '无风险', siteNo: '2024101612' }, @@ -348,7 +356,7 @@ riskAnalysis: "无风险", siteNo: "2024101613", }, - // { siteName: '文化沟路与延河西路交叉口', siteStatus: '在线', warnInfo: '无风险' }, + { siteName: '文化沟路与延河西路交叉口', siteStatus: 'online', warnInfo: '无风险',siteNo: '2024101634' }, ]; } else if (monitorname.value == "积水监测(0/16)") { listData.value = jsjcData.value; @@ -365,6 +373,7 @@ function showMapDalog(val) { console.log("val.siteName", val); + useDialogTabs.addPosition(val.position.split(',').map(item => parseFloat(item))) let data = { title: val.siteName, // comIDs: ['gwpm', 'jcsj', 'danganInfo'], //满溢监测 @@ -386,6 +395,8 @@ // comIDs: ['spjk', 'jcsj', 'danganInfo'], //积水监测 // }; // bus.emit('publicDialog', data); + // useDialogTabs.addPosition(val.position); // 添加全景位置 + useDialogTabs.addPosition(val.position.split(',').map(item => parseFloat(item))) let data = { title: val.siteName, // comIDs: ['gwpm', 'jcsj', 'danganInfo'], //满溢监测 @@ -439,7 +450,7 @@ const tabsList = res.data.boxList.map((item) => item.boxId); return tabsList; } catch (error) { - console.log("🚀 ~ getTabsList ~ error:", error); + console.log(" ~ getTabsList ~ error:", error); } }; diff --git a/src/views/oneMap/floodPrevention/FholRightBox.vue b/src/views/oneMap/floodPrevention/FholRightBox.vue index 22d34e7..21b215a 100644 --- a/src/views/oneMap/floodPrevention/FholRightBox.vue +++ b/src/views/oneMap/floodPrevention/FholRightBox.vue @@ -20,8 +20,8 @@ {{ i.siteStatus }}{{ i.onlineStatus == "online" ? "在线" : "离线" }}
@@ -34,9 +34,9 @@
风险分析:
- {{ i.warnInfo }} + {{ i.riskAnalysis }}
@@ -162,19 +162,34 @@ bzname.value = val.name; } const listData = ref([ + // { + // siteName: "东关大街与长青路交叉口", + // siteStatus: "在线", + // warnInfo: "无风险", + // siteNo: "2024101618", + // }, + // { + // siteName: "大桥街与延河西路交叉口", + // siteStatus: "离线", + // warnInfo: "无风险", + // siteNo: "2024101619", + // }, + // { siteName: "文化沟路与延河西路交叉口", siteStatus: "在线", warnInfo: "无风险" }, { siteName: "东关大街与长青路交叉口", - siteStatus: "在线", - warnInfo: "无风险", - siteNo: "2024101618", + onlineStatus: "online", + riskAnalysis: "无风险", + siteNo: "2024101612", + position:'109.504561,36.60637', }, { siteName: "大桥街与延河西路交叉口", - siteStatus: "离线", - warnInfo: "无风险", - siteNo: "2024101619", + onlineStatus: "online", + riskAnalysis: "无风险", + siteNo: "2024101613", + position:'109.497323,36.60318', }, - // { siteName: "文化沟路与延河西路交叉口", siteStatus: "在线", warnInfo: "无风险" }, + { siteName: '文化沟路与延河西路交叉口', siteStatus: '在线', riskAnalysis: '无风险',siteNo: '2024101634',position:'109.480944,36.613436', }, ]); const search = ref({ stCode: 1, @@ -236,6 +251,7 @@ function showMapDalog(val) { console.log(val.siteName, "val.siteName"); + useDialogTabs.addPosition(val.position.split(',').map(item => parseFloat(item))) let data = { title: val.siteName, // comIDs: ['gwpm', 'jcsj'], diff --git a/src/views/oneMap/floodPrevention/FhplLeftBox.vue b/src/views/oneMap/floodPrevention/FhplLeftBox.vue index 3624fc8..864c5a4 100644 --- a/src/views/oneMap/floodPrevention/FhplLeftBox.vue +++ b/src/views/oneMap/floodPrevention/FhplLeftBox.vue @@ -48,14 +48,17 @@ 积水深度(cm) - -
- {{ item.zb }} - {{ item.sz }} + +
+ {{ item.siteName }} + {{ item.riskLevel }} - {{ item.zt }} - + {{ item.z }} + +
@@ -168,13 +171,14 @@ @@ -500,6 +553,7 @@ line-height: 34px; width: 100%; display: flex; + cursor: pointer; /* 选择偶数行 */ &:nth-child(even) { background: linear-gradient(0deg, #008599 0%, #08596d 100%);