From 7074de9ad7c167a9adc6649fbe30b43074c699c5 Mon Sep 17 00:00:00 2001 From: X_Rian <904416525@qq.com> Date: Mon, 1 Jul 2024 17:36:16 +0800 Subject: [PATCH] =?UTF-8?q?flx=EF=BC=9A=E5=AF=B9=E6=8E=A5=E5=AE=8C?= =?UTF-8?q?=E5=96=84=E9=9B=A8=E9=87=8F=E7=9B=91=E6=B5=8B=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/modules/headNoise.ts | 15 ++- .../commandScreen/commandCenter/rightAll.vue | 4 +- .../sevenLargeScreen/headNoise/centerTop.vue | 35 +++-- .../sevenLargeScreen/headNoise/leftBottom.vue | 2 +- .../sevenLargeScreen/headNoise/leftCenter.vue | 4 +- src/views/sevenLargeScreen/indexL.vue | 8 +- .../rainfallMonitoring/centerTop.vue | 94 +++++++------ .../rainfallMonitoring/leftBottom.vue | 126 +++++++++--------- .../rainfallMonitoring/leftCenter.vue | 5 +- .../rainfallMonitoring/rightBottom.vue | 92 ++++++++++--- .../rainfallMonitoring/rightCenter.vue | 48 +++---- .../rainfallMonitoring/rightTop.vue | 53 ++++---- 12 files changed, 279 insertions(+), 207 deletions(-) diff --git a/src/api/modules/headNoise.ts b/src/api/modules/headNoise.ts index ca81cdf..6acbf0f 100644 --- a/src/api/modules/headNoise.ts +++ b/src/api/modules/headNoise.ts @@ -18,7 +18,6 @@ export const selectDustNoiseDataApi = (params: {}) => { return http.post(BASEURL + `/xmgl/dustNoiseData/queryTodayTrendGroupByHour`, params); }; - //查询环境设备最新一条实时数据 export const getRealTimeDustNoiseDataApi = (params: {}) => { return http.post(BASEURL + `/xmgl/dustNoiseData/getRealTimeDustNoiseData`, params); @@ -63,4 +62,16 @@ export const getRealTimeRainRecordApi = (params: {}) => { // 晴雨表 export const getRainWeatherDataApi = (params: {}) => { return http.post(BASEURL + `/xmgl/rainBigScreen/getWeatherData`, params); -}; \ No newline at end of file +}; +//查询空气质量统计 +export const getRainAirQualityStatisticsApi = (params: {}) => { + return http.post(BASEURL + `/xmgl/rainBigScreen/getAirQualityStatistics`, params); +}; +//今日报警统计 +export const getRainAlarmCountTotalApi = (params: {}) => { + return http.post(BASEURL + `/xmgl/rainBigScreen/selectRainAlarmCountTotal`, params); +}; +//分页列表查询雨量监测报警记录信息 +export const getRainAlarmPage = (params: {}) => { + return http.get(BASEURL + `/xmgl/rainAlarm/page`, params); +}; diff --git a/src/views/commandScreen/commandCenter/rightAll.vue b/src/views/commandScreen/commandCenter/rightAll.vue index cfdcdca..a5cfd50 100644 --- a/src/views/commandScreen/commandCenter/rightAll.vue +++ b/src/views/commandScreen/commandCenter/rightAll.vue @@ -394,7 +394,7 @@ const getSpecialTrend = async (showLoading: boolean, val: number, isRight?: bool console.log("特殊作业风险预测趋势", res.result); randerInfo2.dataList = [ { - name: activeInfo.rightCount == 1 ? "恶劣天气影响风险概率预测" : "隐患未消项影响风险概率预测", + name: activeInfo.rightCount == 1 ? "恶劣天气影响风险概率预测" : "隐患未销项影响风险概率预测", value: [ res.result.specialOperationFireSafety, res.result.highJobSafe, @@ -1681,7 +1681,7 @@ let dataList2 = ref([ // emits("openDialog", { // index: 7, -// title: params.name + "未消项目", +// title: params.name + "未销项目", // majorInfo: { // isOverdueRectification: 0, // isNotQualified: 1, diff --git a/src/views/sevenLargeScreen/headNoise/centerTop.vue b/src/views/sevenLargeScreen/headNoise/centerTop.vue index 67b8c3e..9d43aa4 100644 --- a/src/views/sevenLargeScreen/headNoise/centerTop.vue +++ b/src/views/sevenLargeScreen/headNoise/centerTop.vue @@ -76,24 +76,23 @@ const getRealTimeDustNoiseData = async () => { }); if (res.result) { plantCap.value = res.result; - } - // else { - // plantCap.value = { - // crc: "--", - // humidity: "--", - // noise: "--", - // plateHumidity: "--", - // plateTemperature: "--", - // pm10: "--", - // pm25: "--", - // pressure: "--", - // temperature: "--", - // tsp: "--", - // voltage: "--", - // winddirectionName: "--", - // windspeed: "--" - // }; - // } + } else { + plantCap.value = { + crc: "--", + humidity: "--", + noise: "--", + plateHumidity: "--", + plateTemperature: "--", + pm10: "--", + pm25: "--", + pressure: "--", + temperature: "--", + tsp: "--", + voltage: "--", + winddirectionName: "--", + windspeed: "--" + }; + } //发送编号 mitts.emit("currentDevDetail", currentDevDetail); }; diff --git a/src/views/sevenLargeScreen/headNoise/leftBottom.vue b/src/views/sevenLargeScreen/headNoise/leftBottom.vue index 75e06bf..d17adb1 100644 --- a/src/views/sevenLargeScreen/headNoise/leftBottom.vue +++ b/src/views/sevenLargeScreen/headNoise/leftBottom.vue @@ -16,7 +16,7 @@ v-for="(item, index) in noiseList" :key="index" :label="item.label" - :value="item.value" + :value="item.label" @click="checkChange(item.label)" /> diff --git a/src/views/sevenLargeScreen/headNoise/leftCenter.vue b/src/views/sevenLargeScreen/headNoise/leftCenter.vue index 5c87be4..f248214 100644 --- a/src/views/sevenLargeScreen/headNoise/leftCenter.vue +++ b/src/views/sevenLargeScreen/headNoise/leftCenter.vue @@ -10,7 +10,7 @@
{{ offlineDevNum }}
-
+
@@ -23,7 +23,7 @@

暂无数据

-
+ diff --git a/src/views/sevenLargeScreen/indexL.vue b/src/views/sevenLargeScreen/indexL.vue index c698f09..c93c95f 100644 --- a/src/views/sevenLargeScreen/indexL.vue +++ b/src/views/sevenLargeScreen/indexL.vue @@ -377,10 +377,10 @@ let menuList = ref([ companyPath: "/sewageMonitor", menuName: "污水监测" }, - // { - // companyPath: "/rainfallMonitoring", - // menuName: "雨量监测" - // } + { + companyPath: "/rainfallMonitoring", + menuName: "雨量监测" + } ] }, { diff --git a/src/views/sevenLargeScreen/rainfallMonitoring/centerTop.vue b/src/views/sevenLargeScreen/rainfallMonitoring/centerTop.vue index bc68a79..c24f732 100644 --- a/src/views/sevenLargeScreen/rainfallMonitoring/centerTop.vue +++ b/src/views/sevenLargeScreen/rainfallMonitoring/centerTop.vue @@ -16,13 +16,23 @@
-
温度:{{ plantCap.temperature || plantCap.temperature == '0' ? plantCap.temperature : "--" }}℃
-
湿度:{{ plantCap.humidity || plantCap.humidity == '0' ? plantCap.humidity : "--" }}%RH
-
PM2.5:{{ plantCap.pm25 || plantCap.pm25 == '0' ? plantCap.pm25 : "--" }}ug/m³
-
TSP:{{ plantCap.tsp || plantCap.tsp == '0' ? plantCap.tsp : "--" }}ug/m³
-
PM10:{{ plantCap.pm10 || plantCap.pm10 == '0' ? plantCap.pm10 : "--" }}ug/m³
-
噪声:{{ plantCap.noise || plantCap.noise == '0' ? plantCap.noise : "--" }}dB
-
风速:{{ plantCap.windspeed || plantCap.windspeed == '0' ? plantCap.windspeed : "--" }}m/s
+
+ 空气温度:{{ plantCap.airTemperature || plantCap.airTemperature == "0" ? plantCap.airTemperature : "--" }}℃ +
+
+ 空气湿度:{{ plantCap.airHumidity || plantCap.airHumidity == "0" ? plantCap.airHumidity : "--" }}%RH +
+
+ 大气压:{{ plantCap.atmosphericPressure || plantCap.atmosphericPressure == "0" ? plantCap.atmosphericPressure : "--" }}Kpa +
+
+ 今日雨量:{{ plantCap.currentRainfall || plantCap.currentRainfall == "0" ? plantCap.currentRainfall : "--" }}mm +
+
+ 昨日雨量:{{ plantCap.dailyRainfall || plantCap.dailyRainfall == "0" ? plantCap.dailyRainfall : "--" }}mm +
+
风力:{{ plantCap.windForce || plantCap.windForce == "0" ? plantCap.windForce : "--" }}级
+
风速:{{ plantCap.windSpeed || plantCap.windSpeed == "0" ? plantCap.windSpeed : "--" }}m/s
@@ -34,37 +44,37 @@ import mitts from "@/utils/bus"; //兄弟组件传值 import { ref, reactive, onMounted } from "vue"; const store = GlobalStore(); let deviceName = ref(""); -let noiseList = ref([]); +let noiseList = ref([] as any[]); let plantCap = ref({ crc: "--", - humidity: "--", - noise: "--", + airHumidity: "--", + windForce: "--", plateHumidity: "--", plateTemperature: "--", - pm10: "--", - pm25: "--", + dailyRainfall: "--", + atmosphericPressure: "--", pressure: "--", - temperature: "--", - tsp: "--", + airTemperature: "--", + currentRainfall: "--", voltage: "--", winddirectionName: "--", - windspeed: "--" -}); -let currentDevDetail = reactive({}); + windSpeed: "--" +} as any); +let currentDevDetail = reactive({} as any); //切换设备 -const realTimeMonitor = val => { +const realTimeMonitor = (val: any) => { currentDevDetail = val; getRealTimeDustNoiseData(); }; //获取设备下拉 const getList = async () => { - const res = await getRainDevlApi({ projectSn: store.sn }); + const res: any = await getRainDevlApi({ projectSn: store.sn }); console.log("获取设备下拉", res); if (res.result.length > 0) { noiseList.value = res.result; deviceName.value = res.result[0].devName; currentDevDetail = res.result[0]; - + getRealTimeDustNoiseData(); } }; @@ -76,27 +86,29 @@ const getRealTimeDustNoiseData = async () => { }); if (res.result) { plantCap.value = res.result; - } - // else { - // plantCap.value = { - // crc: "--", - // humidity: "--", - // noise: "--", - // plateHumidity: "--", - // plateTemperature: "--", - // pm10: "--", - // pm25: "--", - // pressure: "--", - // temperature: "--", - // tsp: "--", - // voltage: "--", - // winddirectionName: "--", - // windspeed: "--" - // }; - // } + } else { + plantCap.value = { + crc: "--", + airHumidity: "--", + windForce: "--", + plateHumidity: "--", + plateTemperature: "--", + dailyRainfall: "--", + atmosphericPressure: "--", + pressure: "--", + airTemperature: "--", + currentRainfall: "--", + voltage: "--", + winddirectionName: "--", + windSpeed: "--" + }; + } //发送编号 mitts.emit("currentDevDetail", currentDevDetail); }; + + + onMounted(() => { getList(); }); @@ -122,10 +134,10 @@ onMounted(() => { font-family: OPPOSansH; } } - .content{ + .content { position: relative; - width: 100%; - height: 100%; + width: 100%; + height: 100%; } .selectRight { diff --git a/src/views/sevenLargeScreen/rainfallMonitoring/leftBottom.vue b/src/views/sevenLargeScreen/rainfallMonitoring/leftBottom.vue index 1907f63..148225d 100644 --- a/src/views/sevenLargeScreen/rainfallMonitoring/leftBottom.vue +++ b/src/views/sevenLargeScreen/rainfallMonitoring/leftBottom.vue @@ -2,7 +2,7 @@
- - - - -
+ + + +
-
+
- @@ -36,23 +35,23 @@ import * as echarts from "echarts"; import Card from "@/components/card.vue"; import mitts from "@/utils/bus"; //兄弟组件传值 const store = GlobalStore(); -let dustData_24 = ref([]); -let xData = ref([]); -let yData = ref([]); +let dustData_24 = ref([] as any[]); +let xData = ref([] as any[]); +let yData = ref([] as any[]); let chart = ref(); -let yUnit = ref("单位:ug/m³") as any; +let yUnit = ref("Kpa") as any; const noiseList = [ { value: 0, - label: "PM2.5" + label: "大气压" }, { value: 1, - label: "PM10" + label: "今日雨量" }, { value: 2, - label: "噪声" + label: "昨日雨量" }, // { // value: 3, @@ -64,19 +63,19 @@ const noiseList = [ }, { value: 5, - label: "TSP" + label: "风力" }, { value: 6, - label: "温度" + label: "空气温度" }, { value: 7, - label: "湿度" + label: "空气湿度" } ]; let receive = ref("" as any); -let selectValue = ref("PM2.5" as any); +let selectValue = ref("大气压" as any); function drawChart() { let myEchart = echarts.init(document.getElementById("myEcharts")); let option = { @@ -267,7 +266,7 @@ function drawChart() { // } } //获取趋势图数据 -const getList = async type => { +const getList = async (type: any) => { //当前日期 // let now = new Date(); // let yy = now.getFullYear(); //年 @@ -278,47 +277,45 @@ const getList = async type => { // time += mm + "-"; // if (dd < 10) time += "0"; // time += dd; - const res = await selectRainDustNoiseDataApi({ + const res: any = await selectRainDustNoiseDataApi({ // searchDate: time, - deviceId: type, + devSn: type, projectSn: store.sn }); console.log("左下角趋势图", res.result); dustData_24.value = res.result; xData.value = []; yData.value = []; - res.result.forEach(item => { + res.result.forEach((item: any) => { xData.value.push(item.time); - yData.value.push(item.pm25); + yData.value.push(item.atmosphericPressure); }); drawChart(); + checkChange(selectValue.value); }; const checkChange = (val: any) => { yData.value = []; - dustData_24.value.forEach(item => { - if (val == "PM2.5") { - yData.value.push(item.pm25); - yUnit.value = "ug/m³"; - } else if (val == "PM10") { - yData.value.push(item.pm10); - yUnit.value = "ug/m³"; - } else if (val == "噪声") { - yData.value.push(item.noise); - yUnit.value = "dB"; - } else if (val == "夜晚噪音") { - yData.value.push(item.nightNoise); - yUnit.value = "dB"; + dustData_24.value.forEach((item: any) => { + if (val == "大气压") { + yData.value.push(item.atmosphericPressure); + yUnit.value = "Kpa"; + } else if (val == "今日雨量") { + yData.value.push(item.currentRainfall); + yUnit.value = "mm"; + } else if (val == "昨日雨量") { + yData.value.push(item.dailyRainfall); + yUnit.value = "mm"; + } else if (val == "风力") { + yData.value.push(item.windForce); + yUnit.value = "级"; } else if (val == "风速") { - yData.value.push(item.windspeed); + yData.value.push(item.windSpeed); yUnit.value = "m/s"; - } else if (val == "TSP") { - yData.value.push(item.tsp); - yUnit.value = "ug/m³"; - } else if (val == "温度") { - yData.value.push(item.temperature); + } else if (val == "空气温度") { + yData.value.push(item.airTemperature); yUnit.value = "℃"; - } else if (val == "湿度") { - yData.value.push(item.humidity); + } else if (val == "空气湿度") { + yData.value.push(item.airHumidity); yUnit.value = "%RH"; } }); @@ -335,14 +332,13 @@ onMounted(async () => { // }, // false // ); - checkChange(selectValue.value); - mitts.on("currentDevDetail", e => { - receive.value = e.deviceId; - getList(e.deviceId); + mitts.on("currentDevDetail", (e: any) => { + console.log(11111, e); + receive.value = e.devSn; + getList(e.devSn); }); - }); -// +// onBeforeUnmount(async () => { mitts.off("currentDevDetail"); echarts.dispose; @@ -350,17 +346,17 @@ onBeforeUnmount(async () => {