From 69404eb005e1f975435c50450039bd59ac780335 Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Thu, 22 Feb 2024 17:35:57 +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/largeMachinery.ts | 12 +- .../largeMachinery/asphaltMixer/topRight.vue | 118 +++++++++---- .../concreteMixingPlant/topRight.vue | 118 +++++++++---- .../largeMachinery/hangBasket/topLeft.vue | 16 +- .../waterStabilizedMixer/topRight.vue | 118 +++++++++---- .../concreteMonitor/leftTop.vue | 167 +++++++++--------- .../concreteMonitor/rightBottom.vue | 3 +- .../foundationPitMonitor/topLeft.vue | 22 +-- 8 files changed, 354 insertions(+), 220 deletions(-) diff --git a/src/api/modules/largeMachinery.ts b/src/api/modules/largeMachinery.ts index 436f515..4bcbc07 100644 --- a/src/api/modules/largeMachinery.ts +++ b/src/api/modules/largeMachinery.ts @@ -72,6 +72,10 @@ export const concreteMaterialDataList = (params: {}) => { export const countUseStatus = (params: {}) => { return http.post(BASEURL + `/xmgl/concreteMixStationData/countUseStatus`, params); }; +// 设备列表 +export const concreteMaterialEquipList = (params: {}) => { + return http.get(BASEURL + `/xmgl/concreteMixStationDev/list`, params); +}; // 沥青拌合站 // 1.各设备产量 @@ -101,7 +105,10 @@ export const concreteMaterialDataList2 = (params: {}) => { export const countUseStatus2 = (params: {}) => { return http.post(BASEURL + `/xmgl/pitchMixStationProdData/countUseStatus`, params); }; - +// 设备列表 +export const concreteMaterialEquipList2 = (params: {}) => { + return http.get(BASEURL + `/xmgl/pitchMixStationDev/list`, params); +}; // 水稳拌合站 // 1.各设备产量 export const countConcreteMixStationDataTrend3 = (params: {}) => { @@ -129,6 +136,9 @@ export const concreteMaterialDataList3 = (params: {}) => { export const countUseStatus3 = (params: {}) => { return http.post(BASEURL + `/xmgl/stableWaterMixStationData/countUseStatus`, params); }; +export const concreteMaterialEquipList3 = (params: {}) => { + return http.get(BASEURL + `/xmgl/stableWaterMixStationDev/list`, params); +}; // 压力试验机 // 统计试验合格率 试验次数统计 diff --git a/src/views/sevenLargeScreen/largeMachinery/asphaltMixer/topRight.vue b/src/views/sevenLargeScreen/largeMachinery/asphaltMixer/topRight.vue index 5805b01..729b00e 100644 --- a/src/views/sevenLargeScreen/largeMachinery/asphaltMixer/topRight.vue +++ b/src/views/sevenLargeScreen/largeMachinery/asphaltMixer/topRight.vue @@ -2,6 +2,11 @@
+
+ + + +
今日
近7天
@@ -21,14 +26,21 @@ import { onMounted, ref } from "vue"; import * as echarts from "echarts"; import Card from "@/components/card.vue"; -import { countMaterialName2 } from "@/api/modules/largeMachinery"; +import { countMaterialName2, concreteMaterialEquipList2 } from "@/api/modules/largeMachinery"; import { GlobalStore } from "@/stores"; import { noop } from "@vueuse/core"; const store = GlobalStore(); const airType = ref(1); +// 选中的设备 +const selectEquipSn = ref(); +const equipList = ref([]); // 选中 let checked = ref(1); +// 设备选择改变 +const equipChange = () => { + getMemberCareList(); +}; function getNowData(type: any) { checked.value = type; // 初始化option @@ -300,9 +312,22 @@ function drawEchart() { }; echartsTest.setOption(option, true); } +// 查设备列表 +const getEquipList = async () => { + const res: any = await concreteMaterialEquipList2({}); + console.log("查设备列表", res); + equipList.value = res.result; +}; // let noData = ref(false as any); const getMemberCareList = async () => { - const res: any = await countMaterialName2({ projectSn: store.sn, type: checked.value }); + let requestData:any = { + projectSn: store.sn, + type: checked.value + }; + if (selectEquipSn.value) { + requestData.devSn = selectEquipSn.value; + } + const res: any = await countMaterialName2(requestData); console.log("原材料用量统计", res); if (res.result.data.length > 0) { let dataArr = res.result.data; @@ -335,6 +360,7 @@ const getMemberCareList = async () => { }; onMounted(async () => { + getEquipList(); getMemberCareList(); }); @@ -360,6 +386,51 @@ onMounted(async () => { width: 100%; height: 100%; position: relative; + + .select-left { + width: 30%; + position: absolute; + z-index: 10; + left: 5%; + top: 4.5%; + color: #fff; + } + .select-right { + width: 40%; + display: flex; + position: absolute; + z-index: 10; + color: #fff; + font-size: 10px; + text-align: center; + line-height: 20px; + right: -1%; + top: 5%; + .selected { + height: 5%; + background: url("@/assets/images/dustNoise/rightImg2.png") no-repeat; + background-size: 100% 100%; + cursor: pointer; + } + .day { + padding: 0 6%; + margin-right: 5%; + z-index: 99; + } + .week { + padding: 0 6%; + margin-right: 5%; + z-index: 99; + } + .month { + padding: 0 6%; + z-index: 99; + } + .active { + background: url("@/assets/images/dustNoise/rightImg.png") no-repeat; + background-size: 100% 100%; + } + } } .num { width: 66px; @@ -381,48 +452,19 @@ onMounted(async () => { // background: url("@/assets/images/dustNoise/motionEffect.webp") no-repeat; // background-size: cover; // } -.select-right { - width: 40%; - display: flex; - position: absolute; - z-index: 10; - color: #fff; - font-size: 10px; - text-align: center; - line-height: 20px; - right: -1%; - top: 5%; - .selected { - height: 5%; - background: url("@/assets/images/dustNoise/rightImg2.png") no-repeat; - background-size: 100% 100%; - cursor: pointer; - } - .day { - padding: 0 6%; - margin-right: 5%; - z-index: 99; - } - .week { - padding: 0 6%; - margin-right: 5%; - z-index: 99; - } - .month { - padding: 0 6%; - z-index: 99; - } - .active { - background: url("@/assets/images/dustNoise/rightImg.png") no-repeat; - background-size: 100% 100%; - } -} .time { position: absolute; z-index: 999; left: 37%; margin-top: -18%; } + +:deep(.el-input__inner) { + color: #fff; +} +:deep(.el-select .el-input .el-select__caret) { + color: #fff; +} ::v-deep .el-input__wrapper { width: 85%; height: 0%; diff --git a/src/views/sevenLargeScreen/largeMachinery/concreteMixingPlant/topRight.vue b/src/views/sevenLargeScreen/largeMachinery/concreteMixingPlant/topRight.vue index 9ce4e5f..665d597 100644 --- a/src/views/sevenLargeScreen/largeMachinery/concreteMixingPlant/topRight.vue +++ b/src/views/sevenLargeScreen/largeMachinery/concreteMixingPlant/topRight.vue @@ -2,6 +2,11 @@
+
+ + + +
今日
近7天
@@ -21,14 +26,21 @@ import { onMounted, ref } from "vue"; import * as echarts from "echarts"; import Card from "@/components/card.vue"; -import { countMaterialName } from "@/api/modules/largeMachinery"; +import { countMaterialName, concreteMaterialEquipList } from "@/api/modules/largeMachinery"; import { GlobalStore } from "@/stores"; import { noop } from "@vueuse/core"; const store = GlobalStore(); const airType = ref(1); +// 选中的设备 +const selectEquipSn = ref(); +const equipList = ref([]); // 选中 let checked = ref(1); +// 设备选择改变 +const equipChange = () => { + getMemberCareList(); +}; function getNowData(type: any) { checked.value = type; // 初始化option @@ -108,7 +120,7 @@ function drawEchart() { color: "#ccc", fontSize: 14, lineHeight: 40, - fontWeight: "normal", + fontWeight: "normal" } }, legend: { @@ -300,9 +312,22 @@ function drawEchart() { }; echartsTest.setOption(option, true); } +// 查设备列表 +const getEquipList = async () => { + const res: any = await concreteMaterialEquipList({}); + console.log("查设备列表", res); + equipList.value = res.result; +}; // let noData = ref(false as any); const getMemberCareList = async () => { - const res: any = await countMaterialName({ projectSn: store.sn, type: checked.value }); + let requestData:any = { + projectSn: store.sn, + type: checked.value + }; + if (selectEquipSn.value) { + requestData.devSn = selectEquipSn.value; + } + const res: any = await countMaterialName(requestData); console.log("原材料用量统计", res); if (res.result.data.length > 0) { let dataArr = res.result.data; @@ -335,6 +360,7 @@ const getMemberCareList = async () => { }; onMounted(async () => { + getEquipList(); getMemberCareList(); }); @@ -360,6 +386,50 @@ onMounted(async () => { width: 100%; height: 100%; position: relative; + .select-left { + width: 30%; + position: absolute; + z-index: 10; + left: 5%; + top: 4.5%; + color: #fff; + } + .select-right { + width: 40%; + display: flex; + position: absolute; + z-index: 10; + color: #fff; + font-size: 10px; + text-align: center; + line-height: 20px; + right: -1%; + top: 5%; + .selected { + height: 5%; + background: url("@/assets/images/dustNoise/rightImg2.png") no-repeat; + background-size: 100% 100%; + cursor: pointer; + } + .day { + padding: 0 6%; + margin-right: 5%; + z-index: 99; + } + .week { + padding: 0 6%; + margin-right: 5%; + z-index: 99; + } + .month { + padding: 0 6%; + z-index: 99; + } + .active { + background: url("@/assets/images/dustNoise/rightImg.png") no-repeat; + background-size: 100% 100%; + } + } } .num { width: 66px; @@ -381,48 +451,18 @@ onMounted(async () => { // background: url("@/assets/images/dustNoise/motionEffect.webp") no-repeat; // background-size: cover; // } -.select-right { - width: 40%; - display: flex; - position: absolute; - z-index: 10; - color: #fff; - font-size: 10px; - text-align: center; - line-height: 20px; - right: -1%; - top: 5%; - .selected { - height: 5%; - background: url("@/assets/images/dustNoise/rightImg2.png") no-repeat; - background-size: 100% 100%; - cursor: pointer; - } - .day { - padding: 0 6%; - margin-right: 5%; - z-index: 99; - } - .week { - padding: 0 6%; - margin-right: 5%; - z-index: 99; - } - .month { - padding: 0 6%; - z-index: 99; - } - .active { - background: url("@/assets/images/dustNoise/rightImg.png") no-repeat; - background-size: 100% 100%; - } -} .time { position: absolute; z-index: 999; left: 37%; margin-top: -18%; } +:deep(.el-input__inner) { + color: #fff; +} +:deep(.el-select .el-input .el-select__caret) { + color: #fff; +} ::v-deep .el-input__wrapper { width: 85%; height: 0%; diff --git a/src/views/sevenLargeScreen/largeMachinery/hangBasket/topLeft.vue b/src/views/sevenLargeScreen/largeMachinery/hangBasket/topLeft.vue index ad95b8b..807a01c 100644 --- a/src/views/sevenLargeScreen/largeMachinery/hangBasket/topLeft.vue +++ b/src/views/sevenLargeScreen/largeMachinery/hangBasket/topLeft.vue @@ -8,35 +8,35 @@
-->
{{ 1 }}#
-
{{ warnType[realTimeData.rearBeamFixedAnchor1].name || "-" }}
+
{{ warnType[realTimeData.rearBeamFixedAnchor1].name || "-" }}
{{ 2 }}#
-
{{ warnType[realTimeData.rearBeamFixedAnchor2].name || "-" }}
+
{{ warnType[realTimeData.rearBeamFixedAnchor2].name || "-" }}
{{ 3 }}#
-
{{ warnType[realTimeData.rearBeamFixedAnchor3].name || "-" }}
+
{{ warnType[realTimeData.rearBeamFixedAnchor3].name || "-" }}
{{ 4 }}#
-
{{ warnType[realTimeData.rearBeamFixedAnchor4].name || "-" }}
+
{{ warnType[realTimeData.rearBeamFixedAnchor4].name || "-" }}
{{ 5 }}#
-
{{ warnType[realTimeData.rearBeamFixedAnchor5].name || "-" }}
+
{{ warnType[realTimeData.rearBeamFixedAnchor5].name || "-" }}
{{ 6 }}#
-
{{ warnType[realTimeData.rearBeamFixedAnchor6].name || "-" }}
+
{{ warnType[realTimeData.rearBeamFixedAnchor6].name || "-" }}
{{ 7 }}#
-
{{ warnType[realTimeData.rearBeamFixedAnchor7].name || "-" }}
+
{{ warnType[realTimeData.rearBeamFixedAnchor7].name || "-" }}
{{ 8 }}#
-
{{ warnType[realTimeData.rearBeamFixedAnchor8].name || "-" }}
+
{{ warnType[realTimeData.rearBeamFixedAnchor8].name || "-" }}
-
+
@@ -103,7 +114,8 @@ const BASEURL = import.meta.env.VITE_API_URL; // 打开点位详情弹窗 // const historyRef = ref(); const openHistoryDialog = () => { - closeDialog(); + // closeDialog(); + // showDialog.value = true; // historyRef.value.openDialog(); // console.log(historyRef.value); }; @@ -158,8 +170,9 @@ const getPointList = async () => { let currentIndex = ref(1 as any); let showDialog = ref(false as any); function openDialog(item: any) { - // currentIndex.value = item.id; - // showDialog.value = true; + console.log(item) + currentIndex.value = item.id; + showDialog.value = true; } function closeDialog() { showDialog.value = false; @@ -170,39 +183,25 @@ onMounted(async () => { getMemberCareList(); }); -const list = ref([ - { - id: 1, - alarmState: 1, - xMap: 150, - yMap: 70, - pointName: "测温-大波浪1" - }, - { - id: 2, - alarmState: 2, - xMap: 120, - yMap: 70, - pointName: "测温-大波浪2" - }, - { - id: 3, - alarmState: 1, - xMap: 180, - yMap: 90, - pointName: "测温-大波浪3" - }, - { - id: 4, - alarmState: 3, - xMap: 80, - yMap: 100, - pointName: "测温-大波浪4" - } -]); +const list = ref([] as any);