From dbde3162fd361dcba4316b58754ccecf39a81a9f Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期一, 09 六月 2025 08:52:18 +0800
Subject: [PATCH] 修改问题
---
Web/src/views/device/alarmManage/index.vue | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/Web/src/views/device/alarmManage/index.vue b/Web/src/views/device/alarmManage/index.vue
index 13e490c..11ef7a2 100644
--- a/Web/src/views/device/alarmManage/index.vue
+++ b/Web/src/views/device/alarmManage/index.vue
@@ -11,12 +11,12 @@
<el-table-column prop="alarmName" label="鎻忚堪" align="center"></el-table-column>
<el-table-column prop="stationNum" label="浣嶇疆" align="center"></el-table-column>
<el-table-column prop="alarmTime" label="鏃堕棿" align="center"></el-table-column>
- <el-table-column label="鎿嶄綔" width="80" align="center" fixed="right" show-overflow-tooltip="">
+ <!-- <el-table-column label="鎿嶄綔" width="80" align="center" fixed="right" show-overflow-tooltip="">
<template #default="scope">
<el-button icon="ele-Check" size="small" text="" type="primary"
@click="topUpAlarm(scope.row)">鎭㈠</el-button>
</template>
- </el-table-column>
+ </el-table-column> -->
</el-table>
<el-pagination v-model:currentPage="tableParams.page" v-model:page-size="tableParams.pageSize"
:total="tableParams.total" :page-sizes="[10, 20, 50, 100, 200, 500]" size="small" background=""
@@ -66,15 +66,16 @@
import { ElMessageBox, ElMessage } from "element-plus";
import { cellsDataLine, cellsDataOne, cellsDataTwo, cellsDataThree } from './data';
import { auth } from '/@/utils/authFunction';
+import Index from '../deviceInfo/index.vue';
//杩炴帴signalR 鐩戝惉鍙樻洿
onMounted(async () => {
signalR.off('PublicAlarm');
signalR.on('PublicAlarm', (dataArray: any) => {
dataArray.forEach(data => {
- console.log(data);
// 鏇存柊 tableData
const index = tableData.value.findIndex(t => t.id == data.id);
+
if (index === -1 && data.status == 1) {
// 濡傛灉涓嶅瓨鍦紝娣诲姞鏂版暟鎹�
tableData.value.unshift(data);
@@ -211,15 +212,15 @@
})
.then(async () => {
var param = Object.assign(row);
- console.log(row.stationNum);
- console.log(layer.value);
+ console.log("row.stationNum:"+row.stationNum);
+ console.log("layer.value:"+layer.value);
var data = {
LocatNo: row.stationNum,//宸ヤ綅
Layer: layer.value,//妤煎眰
}
var res = await WriteInfo(data);
- console.log(res.data.result);
+ console.log("res.data.result:"+res.data.result);
// await topUpWcsTask(param);
// handleQuery();
// handleQuery2();
--
Gitblit v1.8.0