From 1f1fd51a80c6d790e0e797fca3b233399e92ce5e Mon Sep 17 00:00:00 2001
From: bsw215583320 <baoshiwei121@163.com>
Date: 星期二, 09 四月 2024 09:19:14 +0800
Subject: [PATCH] 功能优化
---
src/views/dry/dataDefine/DryEquipment.data.ts | 2 +-
src/views/dashboard/control/index.vue | 3 ++-
src/views/dry/bigScreen/BigEqp.vue | 3 ++-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/views/dashboard/control/index.vue b/src/views/dashboard/control/index.vue
index f376325..9cda79a 100644
--- a/src/views/dashboard/control/index.vue
+++ b/src/views/dashboard/control/index.vue
@@ -333,7 +333,8 @@
function clickButton(cmd, msg) {
console.log("target::::",cmd);
- var params = { msg: msg, code: cmd, tenantId: 1003, machineId: "GM001" };
+ let tenantId = userStore.getTenant;
+ var params = { msg: msg, code: cmd, tenantId: tenantId, machineId: "GM001" };
sendCommand(params).then(res => {
if (res.success) {
addLog("鍝嶅簲", res.message);
diff --git a/src/views/dry/bigScreen/BigEqp.vue b/src/views/dry/bigScreen/BigEqp.vue
index 6c53024..19a10ef 100644
--- a/src/views/dry/bigScreen/BigEqp.vue
+++ b/src/views/dry/bigScreen/BigEqp.vue
@@ -384,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()
@@ -1346,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) => {
diff --git a/src/views/dry/dataDefine/DryEquipment.data.ts b/src/views/dry/dataDefine/DryEquipment.data.ts
index 759f100..215fbd8 100644
--- a/src/views/dry/dataDefine/DryEquipment.data.ts
+++ b/src/views/dry/dataDefine/DryEquipment.data.ts
@@ -31,7 +31,7 @@
dataIndex: 'ip',
},
{
- title: '杞﹂棿id',
+ title: '杞﹂棿',
align: 'center',
dataIndex: 'shopId_dictText',
},
--
Gitblit v1.9.3