From d89bbfdd748109020f3255c80918d0f60b6e842c Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期五, 06 九月 2024 16:56:01 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
Web/src/views/device/alarmManage/index.vue | 25 ++++++++-----------------
1 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/Web/src/views/device/alarmManage/index.vue b/Web/src/views/device/alarmManage/index.vue
index 4013f0a..55db218 100644
--- a/Web/src/views/device/alarmManage/index.vue
+++ b/Web/src/views/device/alarmManage/index.vue
@@ -18,9 +18,9 @@
</el-col>
<el-col :span="19">
<div class="card-page">
- <el-button type="primary" :plain="isPlain1" @click="floorTogglePlain(1)">涓�灞傚钩闈�</el-button>
- <el-button type="primary" :plain="isPlain2" @click="floorTogglePlain(2)">浜屽眰骞抽潰</el-button>
- <el-button type="primary" :plain="isPlain3" @click="floorTogglePlain(3)">涓夊眰骞抽潰</el-button>
+ <el-button type="primary" :plain="layer != 1" @click="floorTogglePlain(1)">涓�灞傚钩闈�</el-button>
+ <el-button type="primary" :plain="layer != 2" @click="floorTogglePlain(2)">浜屽眰骞抽潰</el-button>
+ <el-button type="primary" :plain="layer != 3" @click="floorTogglePlain(3)">涓夊眰骞抽潰</el-button>
</div>
<div style="margin: 40px; height: 50%;">
<div class="grid-container-line">
@@ -56,6 +56,7 @@
import 'splitpanes/dist/splitpanes.css';
import { listWcsAlarmInfo, resetWcsAlarmInfo } from '/@/api/wcs/wcsAlarmInfo';
import { signalR } from './signalR';
+import { ElMessageBox, ElMessage } from "element-plus";
//杩炴帴signalR 鐩戝惉鍙樻洿
onMounted(async () => {
signalR.off('PublicAlarm');
@@ -1950,32 +1951,22 @@
//澶嶄綅鎶ヨ
const reset = async () => {
- await resetWcsAlarmInfo();
+ await resetWcsAlarmInfo({ layer: layer.value });
+ ElMessage.success("澶嶄綅鎴愬姛");
// await handleQuery();
}
-
-const isPlain1 = ref(false);//涓�灞�
-const isPlain2 = ref(true);//浜屽眰
-const isPlain3 = ref(true);//涓夊眰
+const layer = ref(1);
//鍒囨崲灞傚钩闈�
function floorTogglePlain(buttonNumber) {
+ layer.value = buttonNumber;
if (buttonNumber === 1) {
- isPlain1.value = false;
- isPlain2.value = true;
- isPlain3.value = true;
//鍒囨崲杈撻�佺嚎鏁版嵁
cellsData.value = cellsDataOne.value;
} else if (buttonNumber === 2) {
- isPlain2.value = false;
- isPlain1.value = true;
- isPlain3.value = true;
//鍒囨崲杈撻�佺嚎鏁版嵁
cellsData.value = cellsDataTwo.value;
} else if (buttonNumber === 3) {
- isPlain3.value = false;
- isPlain1.value = true;
- isPlain2.value = true;
//鍒囨崲杈撻�佺嚎鏁版嵁
cellsData.value = cellsDataThree.value;
}
--
Gitblit v1.8.0