From 47ed1ba420ed01ea50e7f9a09247abd0deb531e1 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期五, 30 八月 2024 16:55:16 +0800
Subject: [PATCH] Reapply "报警页面和首页设备实时通讯"
---
Web/src/views/device/alarmManage/index.vue | 53 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 47 insertions(+), 6 deletions(-)
diff --git a/Web/src/views/device/alarmManage/index.vue b/Web/src/views/device/alarmManage/index.vue
index af81810..a0b20b3 100644
--- a/Web/src/views/device/alarmManage/index.vue
+++ b/Web/src/views/device/alarmManage/index.vue
@@ -5,13 +5,16 @@
<el-row style="display: flex;text-align: center;justify-content: center;height: 40px;">
<el-button type="warning" style="width: 95%;height: 30px;" @click="reset">鎶ヨ澶嶄綅</el-button>
</el-row>
- <el-table :data="tableData" border style="width: 100%" v-loading="loading"
+ <el-table :data="paginatedData" border style="width: 100%" v-loading="loading"
:default-sort="{ prop: 'date', order: 'descending' }">
<el-table-column prop="alarmCode" label="鍙橀噺" align="center"></el-table-column>
<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>
+ <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=""
+ @size-change="handleSizeChange" @current-change="handleCurrentChange" layout="prev, pager, next" />
</el-col>
<el-col :span="19">
<div class="card-page">
@@ -48,18 +51,23 @@
</template>
<script lang="ts" setup>
-import { ref, reactive } from 'vue';
-import { Splitpanes, Pane } from 'splitpanes';
+import { ref, reactive, onMounted, computed } from 'vue';
import 'splitpanes/dist/splitpanes.css';
-import { Vue2 } from 'vue-demi';
import { listWcsAlarmInfo, resetWcsAlarmInfo } from '/@/api/wcs/wcsAlarmInfo';
-
+import { signalR } from './signalR';
+const tableParams = ref({
+ page: 1,
+ pageSize: 10,
+ total: 0,
+});
const loading = ref(false);
const tableData = ref<any>([]);
const handleQuery = async () => {
loading.value = true;
var res = await listWcsAlarmInfo({ status: 1 });
tableData.value = res.data.result;
+ tableParams.value.total = tableData.value.length;
+ console.log(tableParams.value.total);
loading.value = false;
};
handleQuery();
@@ -67,8 +75,41 @@
//澶嶄綅鎶ヨ
const reset = async () => {
await resetWcsAlarmInfo();
- await handleQuery();
}
+//杩炴帴signalR 鐩戝惉鍙樻洿
+onMounted(async () => {
+ signalR.off('PublicAlarm');
+ signalR.on('PublicAlarm', (data: any) => {
+ console.log(data)
+ var listAlarm = tableData.value.filter(t => t.id == data.id);
+ if (listAlarm.length == 0) {
+ tableData.value.unshift(data)
+ tableParams.value.total = tableData.value.length;
+ }
+ else {
+ //濡傛灉宸茬粡瀛樺湪灏辨洿鏂版暟鎹�
+ const index = tableData.value.findIndex(t => t.id == data.id);
+ tableData.value.splice(index, 1, data);
+ }
+ });
+});
+
+// 鏀瑰彉椤甸潰瀹归噺
+const handleSizeChange = (val: number) => {
+ tableParams.value.pageSize = val;
+};
+
+// 鏀瑰彉椤电爜搴忓彿
+const handleCurrentChange = (val: number) => {
+ tableParams.value.page = val;
+};
+//琛ㄦ牸鏄剧ず鏁版嵁
+const paginatedData = computed(() => {
+ const start = (tableParams.value.page - 1) * tableParams.value.pageSize
+ const end = start + tableParams.value.pageSize
+ return tableData.value.slice(start, end)
+})
+
//鍫嗗灈鏈烘暟鎹�
const cellsDataLine = [
--
Gitblit v1.8.0