From 76598d96c0e09ee541334a18ea4a74069c8c433e Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Fri, 1 Mar 2024 16:50:16 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/modules/headNoise.ts | 14 +- src/assets/images/videoFour.png | Bin 0 -> 511 bytes src/assets/images/videoFour1.png | Bin 0 -> 470 bytes .../sevenLargeScreen/headNoise/centerTop.vue | 22 +- .../headNoise/data-dialog.vue | 122 ++++++++ .../headNoise/history-alarm-list.vue | 263 +++++++++++++++++ .../headNoise/history-list.vue | 262 +++++++++++++++++ .../sevenLargeScreen/headNoise/index.vue | 26 +- .../headNoise/rightCenter.vue | 49 +++- src/views/sevenLargeScreen/indexL.vue | 8 +- .../laborManagement/data-dialog.vue | 118 ++++++++ .../laborManagement/index.vue | 21 +- .../laborManagement/leftTop.vue | 11 +- .../laborManagement/member-count-list.vue | 271 ++++++++++++++++++ .../videoManagement/index.vue | 15 + 15 files changed, 1165 insertions(+), 37 deletions(-) create mode 100644 src/assets/images/videoFour.png create mode 100644 src/assets/images/videoFour1.png create mode 100644 src/views/sevenLargeScreen/headNoise/data-dialog.vue create mode 100644 src/views/sevenLargeScreen/headNoise/history-alarm-list.vue create mode 100644 src/views/sevenLargeScreen/headNoise/history-list.vue create mode 100644 src/views/sevenLargeScreen/laborManagement/data-dialog.vue create mode 100644 src/views/sevenLargeScreen/laborManagement/member-count-list.vue diff --git a/src/api/modules/headNoise.ts b/src/api/modules/headNoise.ts index 2554015..e1905e9 100644 --- a/src/api/modules/headNoise.ts +++ b/src/api/modules/headNoise.ts @@ -9,6 +9,10 @@ export const getCurrentDayAirQualityApi = (params: {}) => { export const environmentDevList = (params: {}) => { return http.post(BASEURL + `/xmgl/environmentDev/list`, params); }; +//设备情况-实时数据 +export const environmentDevRealData = (params: {}) => { + return http.post(BASEURL + `/xmgl/dustNoiseData/selectDustNoisePageList`, params); +}; //趋势图-查询环境设备实时数据---近24小时数据 // export const selectDustNoiseDataApi = (params: {}) => { @@ -38,7 +42,15 @@ export const getAirQualityStatisticsApi = (params: {}) => { return http.post(BASEURL + `/xmgl/airQualityAnalysis/getAirQualityStatistics`, params); }; -//今日报警统计 +//历史报警统计 export const getAlarmCountTotalApi = (params: {}) => { return http.post(BASEURL + `/xmgl/environmentAlarm/selectEnvironmentAlarmCountTotal`, params); }; +//历史报警统计数据 +export const getAlarmCountTotalList = (params: {}) => { + return http.post(BASEURL + `/xmgl/environmentAlarm/list`, params); +}; +//历史报警类型列表 +export const getAlarmTypeList = (params: {}) => { + return http.post(BASEURL + `/xmgl/environmentAlarmType/list`, params); +}; diff --git a/src/assets/images/videoFour.png b/src/assets/images/videoFour.png new file mode 100644 index 0000000000000000000000000000000000000000..aac3d920d07fb954b7f50052564e47a9b8c5263c GIT binary patch literal 511 zcmV4^&tc#ct_u0Q~3}EdY$2^H0op*9hlu$4t)vmVlob=S=|m2sD3DxD21%Tq(vEt&LPj0kO!*m1MT!nCa0u z_p4*{5=6ZL{!1gg$2Ae%16TomZk#s)Dx=;!QKlGit(9Y29by?eM9I7n*bV1UGSh45 z5Ld>*8~6VX=UIQkn#t*{XA@Rq&{Ii5obLY2`a0*?K1{}&YbMadboUMyhNhM9t!*X$ z-o{K*QDu$nM3@Tp!N@Zb>m)PiF9LGOpygP0HUIgI;dIIIy1cZaQgv3|F5jcUw8(@5Q+<^H?GHP1NHf)zIiXTuSOG*{W$^TJ5A1GXOSDm&Xd|0#jm^Ii5S<83>6PTKz(;1wB08 z%zV8fPdn4KVJh6g&6AyvoSqk{CX14~%d?WO*3*~v)OuT+;Hs(#uBuW9%N&fLU0qX( zkeO3?>hVGU%8ga*k+secDd!|l?D=-uJOZ;S3u4}#o)$L zx^jxx`4A3Gh8Qsx3#
-
实时数据
+
+ 实时数据 + 历史数据 +
@@ -33,6 +36,7 @@ import { GlobalStore } from "@/stores"; import { environmentDevList, getRealTimeDustNoiseDataApi } from "@/api/modules/headNoise"; import mitts from "@/utils/bus"; //兄弟组件传值 import { ref, reactive, onMounted } from "vue"; +const emits = defineEmits(["openDialog"]) const store = GlobalStore(); let deviceName = ref(""); let noiseList = ref([]); @@ -53,6 +57,10 @@ let plantCap = ref({ sprayStatus: "--" }); let currentDevDetail = reactive({}); +// 打开历史数据弹框 +const openHistoryData = () => { + emits("openDialog",{type: 1}) +} //切换设备 const realTimeMonitor = val => { console.log("切换设备", val); @@ -112,7 +120,9 @@ onMounted(() => { background-size: 100% 100%; .title { height: 7%; - line-height: 33px; + // line-height: 33px; + display: flex; + align-items: center; text-align: left; font-size: calc(100vw * 18 / 1920); color: #ffffff; @@ -122,6 +132,14 @@ onMounted(() => { i { margin-left: 50px; font-family: OPPOSansH; + margin-right: auto; + } + .show-more{ + cursor: pointer; + font-size: 12px; + font-family: Source Han Sans CN-Regular, Source Han Sans CN; + color: #4ac0f3; + margin-right: 20px; } } .content{ diff --git a/src/views/sevenLargeScreen/headNoise/data-dialog.vue b/src/views/sevenLargeScreen/headNoise/data-dialog.vue new file mode 100644 index 0000000..91f7c9c --- /dev/null +++ b/src/views/sevenLargeScreen/headNoise/data-dialog.vue @@ -0,0 +1,122 @@ + + + + + diff --git a/src/views/sevenLargeScreen/headNoise/history-alarm-list.vue b/src/views/sevenLargeScreen/headNoise/history-alarm-list.vue new file mode 100644 index 0000000..177b41f --- /dev/null +++ b/src/views/sevenLargeScreen/headNoise/history-alarm-list.vue @@ -0,0 +1,263 @@ + + + + + diff --git a/src/views/sevenLargeScreen/headNoise/history-list.vue b/src/views/sevenLargeScreen/headNoise/history-list.vue new file mode 100644 index 0000000..1a27323 --- /dev/null +++ b/src/views/sevenLargeScreen/headNoise/history-list.vue @@ -0,0 +1,262 @@ + + + + + diff --git a/src/views/sevenLargeScreen/headNoise/index.vue b/src/views/sevenLargeScreen/headNoise/index.vue index 9a16c73..457d8a0 100644 --- a/src/views/sevenLargeScreen/headNoise/index.vue +++ b/src/views/sevenLargeScreen/headNoise/index.vue @@ -7,18 +7,19 @@
-
+
-
+
+
- diff --git a/src/views/sevenLargeScreen/headNoise/rightCenter.vue b/src/views/sevenLargeScreen/headNoise/rightCenter.vue index f5df40e..3a630d2 100644 --- a/src/views/sevenLargeScreen/headNoise/rightCenter.vue +++ b/src/views/sevenLargeScreen/headNoise/rightCenter.vue @@ -1,5 +1,5 @@