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 | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/views/dry/bigScreen/BigWorkShop.vue b/src/views/dry/bigScreen/BigWorkShop.vue
index aa59bc9..9ca3231 100644
--- a/src/views/dry/bigScreen/BigWorkShop.vue
+++ b/src/views/dry/bigScreen/BigWorkShop.vue
@@ -292,7 +292,6 @@
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)
@@ -323,7 +322,7 @@
function listAllEqp() {
defHttp.get({ url: '/dry/real/queryAllEqps', params: { tenantId: tenantId.value,enable: 'Y' } })
.then((result) => {
- console.log(`output->result`, result)
+ // (`output->result`, result)
eqps.value = result
result.forEach((item) => {
@@ -332,7 +331,7 @@
updateRealTime()
})
.catch((err) => {
- console.log(`output->err`, err)
+ // console.log(`output->err`, err)
})
}
@@ -395,7 +394,7 @@
})
}
function gotoeqp(num) {
- console.log('璺宠浆鏈哄彴', num)
+ //console.log('璺宠浆鏈哄彴', num)
if (num < eqpCodes.value.length) {
router.push({ path: '/bigEqp', query: { num: num } })
}
@@ -420,6 +419,23 @@
return data ? (data.fault ? data.fault : data.warning ? data.warning : data.level ? data.level : '绌洪棽') : '绌洪棽'
}
+ function covertStatus(status){
+ //console.log('status',status)
+ switch (status) {
+ case '0':
+ return '鍑嗗闃舵'
+ case '1':
+ return '涓婃枡闃舵'
+ case '2':
+ return '骞茬嚗闃舵'
+ case '3':
+ return '鏆傚仠'
+ case '4':
+ return '骞茬嚗瀹屾垚'
+
+ }
+ }
+ console.log("router-param", router.currentRoute.value.params.tenant);
getNowTime()
listAllEqp()
onMounted(() => {
--
Gitblit v1.9.3