From fa3ac93010bea3805438ee3ab0a182bfbf7423da Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期一, 27 五月 2024 16:19:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/dry/bigScreen/BigEqp.vue | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/views/dry/bigScreen/BigEqp.vue b/src/views/dry/bigScreen/BigEqp.vue
index db3904b..19a10ef 100644
--- a/src/views/dry/bigScreen/BigEqp.vue
+++ b/src/views/dry/bigScreen/BigEqp.vue
@@ -122,10 +122,11 @@
margin-left: 100px;
font-size: 22px;
background: sandybrown;
- height: 60px;
+
border-radius: 10px;
- line-height: 0;
- padding: 29px;
+ line-height: 25px;
+ max-width: 500px;
+ padding: 15px;
font-weight: bold;" >
{{ realData?.warnMsg }}
</div>
@@ -383,6 +384,7 @@
import { queryById, listAll } from '../api/DryEquipment.api'
import { dryEquipment } from '../dataDefine/DryEquipment.data'
import { useUserStore } from '/@/store/modules/user'
+ import { getTenantId, getToken } from '/@/utils/auth'
const domRef = ref<Nullable<HTMLElement>>(null)
const { enter, toggle, exit, isFullscreen } = useFullscreen()
@@ -1345,7 +1347,7 @@
if (eqp.value) {
eqp.value = eqps.value[eqpNum.value]
// console.log("888",eqp.value);
- let tenantId = 1003
+ let tenantId = getTenantId()
let eqpCode = eqp.value.code
let queryRealTimeUrl = '/dry/real/getRealTimeData'
defHttp.get({ url: queryRealTimeUrl, params: { tenantid: tenantId, machineid: eqpCode } }).then((res) => {
@@ -1912,7 +1914,7 @@
.eqpStatus {
width: 848px;
- height: 300px;
+
}
.rightInfo {
display: flex;
--
Gitblit v1.9.3