From 54da8a22c438e1495b9c5fbae75ca9d4b5ca7335 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期一, 02 九月 2024 16:04:37 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
Web/src/views/device/alarmManage/index.vue | 62 +++++++++++--------------------
1 files changed, 22 insertions(+), 40 deletions(-)
diff --git a/Web/src/views/device/alarmManage/index.vue b/Web/src/views/device/alarmManage/index.vue
index b063f04..6235e26 100644
--- a/Web/src/views/device/alarmManage/index.vue
+++ b/Web/src/views/device/alarmManage/index.vue
@@ -5,16 +5,13 @@
<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="paginatedData" border style="width: 100%" v-loading="loading"
+ <el-table :data="tableData" 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">
@@ -52,11 +49,29 @@
</template>
<script lang="ts" setup>
-import { ref, reactive, onMounted, computed } from 'vue';
+import { ref, reactive,onMounted } from 'vue';
+import { Splitpanes, Pane } from 'splitpanes';
import 'splitpanes/dist/splitpanes.css';
+import { Vue2 } from 'vue-demi';
import { listWcsAlarmInfo, resetWcsAlarmInfo } from '/@/api/wcs/wcsAlarmInfo';
import { signalR } from './signalR';
-
+//杩炴帴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 cellsDataLine = [
{ Id: 1, Code: '001', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
@@ -1905,41 +1920,8 @@
//澶嶄綅鎶ヨ
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 isPlain1 = ref(false);//涓�灞�
--
Gitblit v1.8.0