From 220db80e605945ced1b33443020933206b0915db Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期四, 24 七月 2025 14:56:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'bak/master' into master-lpyun
---
src/views/dry/bigScreen/BigWorkShop.vue | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/src/views/dry/bigScreen/BigWorkShop.vue b/src/views/dry/bigScreen/BigWorkShop.vue
index e823370..9ca3231 100644
--- a/src/views/dry/bigScreen/BigWorkShop.vue
+++ b/src/views/dry/bigScreen/BigWorkShop.vue
@@ -285,12 +285,18 @@
import { router } from '/@/router'
import { defHttp } from '/@/utils/http/axios'
import { useUserStore } from '/@/store/modules/user'
+ import {setAuthCache} from "/@/utils/auth";
+ import {TENANT_ID} from "/@/enums/cacheEnum";
const eqpNum = ref(4)
const eqpMap = ref(new Map())
const eqpCodes = ref(['GM001', 'GM002', 'GM003', 'GM004', 'GM005', 'GM006', 'GM007', 'GM008'])
const eqps = ref([] as dryEquipment[])
const title = ref('鏅鸿兘骞茬嚗杞﹂棿')
const userStore = useUserStore()
+ const tenantId = ref(router.currentRoute.value.query.tenantId | userStore.getTenant)
+ setAuthCache(TENANT_ID, tenantId.value)
+ console.log('tenantId1', router.currentRoute.value.query.tenantId)
+ console.log('tenantId2', userStore.getTenant)
const envHum = ref(0)
const envTemp = ref(0)
const originWeight = ref(0)
@@ -301,7 +307,7 @@
const steamAvg = ref(0)
const wattAvg = ref(0)
- // console.log(userStore.dictItems.title)
+ console.log(userStore.dictItems.title)
userStore.dictItems.title?.forEach((element) => {
if (element.value === 'bigscreentitle') {
title.value = element.text
@@ -314,7 +320,7 @@
const nowDate = ref()
function listAllEqp() {
- listAll({ enable: 'Y' })
+ defHttp.get({ url: '/dry/real/queryAllEqps', params: { tenantId: tenantId.value,enable: 'Y' } })
.then((result) => {
// (`output->result`, result)
eqps.value = result
@@ -340,9 +346,9 @@
}
function queryWorkShopStatistics() {
- let tenantId = userStore.getTenant
- defHttp.get({ url: '/dry/real/workshopStatistics', params: { tenantid: tenantId } }).then((res) => {
- // console.log(`output->res`, res)
+
+ defHttp.get({ url: '/dry/real/workshopStatistics', params: { tenantid: tenantId.value } }).then((res) => {
+ console.log(`output->res`, res)
steam.value = res.steam
watt.value = res.watt
envHum.value = res.envHum
@@ -358,17 +364,19 @@
}
function queryRealTime(eqp: dryEquipment) {
- let tenantId = userStore.getTenant
+
let eqpCode = eqp.code
let queryRealTimeUrl = '/dry/real/getRealTimeData'
- defHttp.get({ url: queryRealTimeUrl, params: { tenantid: tenantId, machineid: eqpCode } }).then((res) => {
+ defHttp.get({ url: queryRealTimeUrl, params: { tenantid: tenantId.value, machineid: eqpCode } }).then((res) => {
if (res && res.trendVo) {
res.tempValue = [res.windTemp, 100]
res.totalRemain = res.remain
- if (res.detailList) {
+ if (res.detailList && res.detailList.length > 0) {
// 骞茬嚗鍓╀綑鏃堕棿=宸ュ崟棰勮鍓╀綑-锛堝綋鍓嶅共鐕ユ椂闂�-鏈�鍚庝竴娆¤褰曞共鐕ユ椂闂达級
res.totalRemain = res.remain - (res.dryTime - res.detailList[res.detailList.length - 1].totalTime)
- }
+ } else {
+ res.totalRemain = res.remain - res.dryTime
+ }
if (res.totalRemain < 0) {
res.totalRemain = 0
}
@@ -408,7 +416,7 @@
}
function showInfo(data) {
- return data ? (data.fault ? data.fault : data.warning ? data.warning : data.orderStatus ? covertStatus(data.orderStatus+'') : '绌洪棽') : '绌洪棽'
+ return data ? (data.fault ? data.fault : data.warning ? data.warning : data.level ? data.level : '绌洪棽') : '绌洪棽'
}
function covertStatus(status){
--
Gitblit v1.9.3