From d679ed797853014008e45112bcf73d01496352d5 Mon Sep 17 00:00:00 2001 From: 15133876896-BGG25 <2233720980@qq.com> Date: Wed, 7 Jun 2023 17:43:19 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=90=88=E5=B9=B6=E6=9C=BA=E6=A2=B0=E5=88=86?= =?UTF-8?q?=E5=8E=82=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/gas.vue | 164 ++++++++++ .../components/pipe.vue | 289 ++++++++++++++++++ .../components/power2023.vue | 278 +++++++++++++++++ .../generalEnvironmentMechanical/index.vue | 149 +++++---- 4 files changed, 826 insertions(+), 54 deletions(-) create mode 100644 src/views/generalEnvironmentMechanical/components/gas.vue create mode 100644 src/views/generalEnvironmentMechanical/components/pipe.vue create mode 100644 src/views/generalEnvironmentMechanical/components/power2023.vue diff --git a/src/views/generalEnvironmentMechanical/components/gas.vue b/src/views/generalEnvironmentMechanical/components/gas.vue new file mode 100644 index 0000000..6ebd7c6 --- /dev/null +++ b/src/views/generalEnvironmentMechanical/components/gas.vue @@ -0,0 +1,164 @@ + + + + + + + diff --git a/src/views/generalEnvironmentMechanical/components/pipe.vue b/src/views/generalEnvironmentMechanical/components/pipe.vue new file mode 100644 index 0000000..2efa2c2 --- /dev/null +++ b/src/views/generalEnvironmentMechanical/components/pipe.vue @@ -0,0 +1,289 @@ + + + + + diff --git a/src/views/generalEnvironmentMechanical/components/power2023.vue b/src/views/generalEnvironmentMechanical/components/power2023.vue new file mode 100644 index 0000000..4c33b67 --- /dev/null +++ b/src/views/generalEnvironmentMechanical/components/power2023.vue @@ -0,0 +1,278 @@ + + + + + + diff --git a/src/views/generalEnvironmentMechanical/index.vue b/src/views/generalEnvironmentMechanical/index.vue index bd0273d..5ff4e07 100644 --- a/src/views/generalEnvironmentMechanical/index.vue +++ b/src/views/generalEnvironmentMechanical/index.vue @@ -17,12 +17,20 @@
- - -
+
+ + +
-
+
+ + + +
+
+ + +
@@ -33,11 +41,14 @@ import { onMounted, onUnmounted, reactive, ref } from 'vue' import header2 from '@/components/headerBox/header2.vue' import verticalNumLoop from './components/verticalNumLoop.vue' -import power from './components/power.vue'; +import power from './components/power2023.vue'; +import gas from './components/gas.vue' +import pipe from './components/pipe.vue' +import border13 from '@/components/border/Border13.vue' import { getSafeWarningData, getpipeData } from "@/http/realtimeSecurity"; import { getnoiseData } from "@/http/generalEnvironment"; import { getHumitureData, getPmtenData, getPmtwoData } from "@/http/generalEnvironment"; -import { getPowerData } from "@/http/energyConsume"; +import { getPowerData,getconsumeDetail } from "@/http/energyConsume"; import { useSocketStore } from "@/store/moduleSocketMechanics"; import { connectWebsocket, closeWebsocket } from "@/utils/websocket"; import { gettime, clacendTime } from "@/utils/time" @@ -69,10 +80,11 @@ const verticalType = { 'noise': { icon: 'icon-shengyin', title: t('messages.noiseDetection'), unit: 'dB' }, } /**用电量 */ -let listName = ref() -let powerTitle = t('messages.Powerto2023') -let powerSeries = ref() +let powerData=ref({value:{name:[]},seriesVal:[],title:t('messages.Powerto2023')}) +let gasData=ref(0) + +let pipeData=ref({listData:[],top:0}) let headerref = ref() let verticalList: any[] = reactive([]) @@ -130,56 +142,80 @@ async function getSensorData() { } async function getPower_data() { - const { data }: any = await getPowerData({ time: 1 }) - listName.value = data.name + let result: any = await getPowerData({ time: 1 }); + if (result.code == 200) { + let series = []; + result.data.listData.forEach((res) => { + if (res.years == 2023) { + for (let key in res.month) { + series.push({ + name: key + "月", + type: "bar", + stack: res.years, + emphasis: { + focus: "coordinateSystem", + label: { + show: true, + formatter: function (value, index) { + return value.value.toLocaleString(); + }, + }, + }, + data: res.month[key], + }); + } + } + }); + //data0用于初始化计算的数据 + let data0 = []; - let series = [] - data.listData.forEach(res => { - if (res.years == 2023) { - for (let key in res.month) { - series.push({ - name: key + '月', - type: 'bar', - stack: res.years, - emphasis: { - focus: 'coordinateSystem', - label: { - show: true, - formatter: function (value, index) { - return value.value.toLocaleString() - } - } - }, - data: res.month[key] - }) - } + for (let i = 1; i <= result.data.name.length; i++) { + data0.push(0); + } + + series.push({ + name: "", + type: "bar", + data: data0, + color: "#bbf", + stack: result.data.listData[1].years, + // barWidth: 30, + label: { + show: true, + + position: "right", + color: "#fff", + }, + }); + + powerData.value.value=result.data + powerData.value.seriesVal=series + powerData.value.title='机械分厂用电量' + } +} +async function getconsumeDetailfun(){ + let result:any = await getconsumeDetail() + console.log(gasData.value); + if(result.code==200){ + result.data.forEach(res=>{ + if(res.deptName=='喷漆车间' && res.type=='GasDetail'){ + gasData.value=res.usageNum } }) - //data0用于初始化计算的数据 - let data0 = [] - for (let i = 1; i <= data.name.length; i++) { - data0.push(0) - } - - series.push( - { - name: '', - type: 'bar', - data: data0, - color: '#bbf', - stack: data.listData[1].years, - // barWidth: 30, - label: { - show: true, - position: 'right', - color: '#fff' - } - } - ) - powerSeries.value = series + console.log(gasData.value); + + } +} +async function getpipeDatafun() { + let pageValue = '6,7,9,10,11' + let result: any = await getpipeData({ deptIds: pageValue }) + if (result.code == 200) { + pipeData.value.listData=result.data.listData + pipeData.value.top=result.data.top + } } function getWebsocket(val) { @@ -235,8 +271,13 @@ function errWebsocket(val) { onMounted(() => { getSensorData() getPower_data() + getpipeDatafun() + getconsumeDetailfun() connectWebsocket(null, null, getWebsocket, errWebsocket); }) +onUnmounted(() => { + closeWebsocket(); +})