From 97dc174b26461df1395394c02401bb51dd6376bc Mon Sep 17 00:00:00 2001
From: bsw215583320 <baoshiwei121@163.com>
Date: 星期一, 04 十二月 2023 08:03:53 +0800
Subject: [PATCH] 增加opc设备维护和控制功能
---
src/views/dry/bigScreen/BigWorkShop.vue | 51 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 11 deletions(-)
diff --git a/src/views/dry/bigScreen/BigWorkShop.vue b/src/views/dry/bigScreen/BigWorkShop.vue
index 9c9db95..c5c59a1 100644
--- a/src/views/dry/bigScreen/BigWorkShop.vue
+++ b/src/views/dry/bigScreen/BigWorkShop.vue
@@ -19,12 +19,12 @@
<div style="display: flex; width: 120px">
<Icon style="color: #ba9853" icon="mdi:home-temperature-outline" :size="28" />
- <div style="font-size: 20px; line-height: 26px"> 26 鈩� </div>
+ <div style="font-size: 20px; line-height: 26px"> {{envTemp}} 鈩� </div>
</div>
<div style="display: flex">
<Icon style="color: #ba9853" icon="wi:humidity" :size="28" />
- <div style="font-size: 20px; line-height: 26px"> 53 %rh </div>
+ <div style="font-size: 20px; line-height: 26px"> {{envHum}} %rh </div>
</div>
</div>
<div class="feed">
@@ -58,7 +58,7 @@
鐢甸噺娑堣��
</div>
<div class="stat_value">
- 462
+ {{dianneng.toFixed(2)}}
<span class="font16">
Kwh
</span>
@@ -79,7 +79,7 @@
钂告苯娑堣��
</div>
<div class="stat_value">
- 683
+ {{zhengqi.toFixed(2)}}
<span class="font16">
m鲁
</span>
@@ -285,6 +285,7 @@
</div>
</div>
</div>
+
<div class="footer">
<div >{{ nowDate }}</div>
@@ -311,6 +312,13 @@
const eqps = ref([] as dryEquipment[])
const title = ref("鍏版郸鏅鸿兘骞茬嚗杞﹂棿")
const userStore = useUserStore()
+ const envHum = ref();
+ const envTemp = ref();
+ const zhengqi = ref();
+ const dianneng = ref()
+
+ const steam = ref();
+ const watt = ref()
console.log(userStore.dictItems.title)
userStore.dictItems.title?.forEach(element => {
if (element.value === "bigscreentitle") {
@@ -343,18 +351,34 @@
function updateRealTime() {
//console.log(`output->瀹氭椂鍒锋柊鏁版嵁`)
- eqps.value.forEach((item) => {
- queryRealTime(item)
+ zhengqi.value = 0;
+ dianneng.value = 0
+
+ new Promise(async function(resolve){
+
+ await eqps.value.forEach(async (item) => {
+ await queryRealTime(item)
+ })
+ resolve()
+
+ console.log("鎵ц瀹屾垚");
+ }).then(()=>{
+ console.log("then:::::" + dianneng.value,zhengqi.value );
+
+ steam.value = zhengqi.value
+ watt.value = dianneng.value
})
+
+
}
- function queryRealTime(eqp: dryEquipment) {
-
+ async function queryRealTime(eqp: dryEquipment) {
+ console.log("sdkfjlasjdflkajsldfjlsd")
let tenantId = userStore.getTenant
let eqpCode = eqp.code
let queryRealTimeUrl = '/dry/real/getRealTimeData'
- defHttp.get({ url: queryRealTimeUrl, params: { tenantid: tenantId, machineid: eqpCode } }).then((res) => {
- //console.log(`output->res`, res)
+ await defHttp.get({ url: queryRealTimeUrl, params: { tenantid: tenantId, machineid: eqpCode } }).then( async (res) => {
+ console.log(`output->res`, res)
if (res && res.trendVo) {
res.tempValue = [res.windTemp, 100]
res.totalRemain = res.remain
@@ -367,6 +391,11 @@
}
res.percent = ((res.dryTime / (res.dryTime + res.totalRemain)) * 100).toFixed(2)
+ envHum.value = res.envHum
+ envTemp.value = res.envTemp
+ zhengqi.value += res.steam
+ dianneng.value += res.watt
+ console.log("zhengqi:::" , res.steam);
} else {
res = {
tempValue: [0, 100],
@@ -627,7 +656,7 @@
}
.stat_value {
- font-size: 32px
+ font-size: 28px
}
.herb_weight {
--
Gitblit v1.9.3