From cb40c1af86a50608ac7ccac0da3f0f88af8239dc Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期一, 02 九月 2024 13:25:58 +0800
Subject: [PATCH] 添加设备、点位上的字段
---
Web/src/views/device/alarmManage/index.vue | 213 +++++++++++++++++++----------------------------------
1 files changed, 77 insertions(+), 136 deletions(-)
diff --git a/Web/src/views/device/alarmManage/index.vue b/Web/src/views/device/alarmManage/index.vue
index 6ae82e9..348d4e7 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">
@@ -39,7 +36,7 @@
<div class="grid-container">
<div v-for="cell in cellsData" :key="cell.Id">
<div v-if="cell.IsShow === 0"
- :class="['grid-item', { 'active': cell.IsUse === 1 }, { 'active2': cell.IsUse === 2 }]">
+ :class="['grid-item', { 'active': cell.IsUse === 1 }, { 'active2': cell.IsUse === 2 }, { 'active3': cell.IsUse === 3 }]">
<div>{{ cell.Code }}</div>
</div>
</div>
@@ -51,23 +48,18 @@
</template>
<script lang="ts" setup>
-import { ref, reactive, onMounted, computed } from 'vue';
+import { ref, reactive } 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';
-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();
@@ -75,41 +67,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 cellsDataLine = [
@@ -1602,57 +1561,57 @@
{ Id: 202, Code: '202', IsShow: 0, IsUse: 2 },
{ Id: 203, Code: '203', IsShow: 1, IsUse: 0 },
{ Id: 204, Code: '204', IsShow: 0, IsUse: 2 },
- { Id: 205, Code: '205', IsShow: 1, IsUse: 0 },
- { Id: 206, Code: '206', IsShow: 1, IsUse: 0 },
- { Id: 207, Code: '207', IsShow: 1, IsUse: 0 },
- { Id: 208, Code: '208', IsShow: 1, IsUse: 0 },
- { Id: 209, Code: '209', IsShow: 1, IsUse: 0 },
- { Id: 210, Code: '210', IsShow: 1, IsUse: 0 },
- { Id: 211, Code: '211', IsShow: 1, IsUse: 0 },
- { Id: 212, Code: '212', IsShow: 1, IsUse: 0 },
- { Id: 213, Code: '213', IsShow: 1, IsUse: 0 },
- { Id: 214, Code: '214', IsShow: 1, IsUse: 0 },
- { Id: 215, Code: '215', IsShow: 1, IsUse: 0 },
- { Id: 216, Code: '216', IsShow: 1, IsUse: 0 },
- { Id: 217, Code: '217', IsShow: 1, IsUse: 0 },
- { Id: 218, Code: '218', IsShow: 1, IsUse: 0 },
- { Id: 219, Code: '219', IsShow: 1, IsUse: 0 },
- { Id: 220, Code: '220', IsShow: 1, IsUse: 0 },
- { Id: 221, Code: '221', IsShow: 1, IsUse: 0 },
- { Id: 222, Code: '222', IsShow: 1, IsUse: 0 },
- { Id: 223, Code: '223', IsShow: 1, IsUse: 0 },
- { Id: 224, Code: '224', IsShow: 1, IsUse: 0 },
- { Id: 225, Code: '225', IsShow: 1, IsUse: 0 },
- { Id: 226, Code: '226', IsShow: 1, IsUse: 0 },
- { Id: 227, Code: '227', IsShow: 1, IsUse: 0 },
- { Id: 228, Code: '228', IsShow: 1, IsUse: 0 },
- { Id: 229, Code: '229', IsShow: 1, IsUse: 0 },
- { Id: 230, Code: '230', IsShow: 1, IsUse: 0 },
- { Id: 231, Code: '231', IsShow: 1, IsUse: 0 },
- { Id: 232, Code: '232', IsShow: 1, IsUse: 0 },
- { Id: 233, Code: '233', IsShow: 1, IsUse: 0 },
- { Id: 234, Code: '234', IsShow: 1, IsUse: 0 },
- { Id: 235, Code: '235', IsShow: 1, IsUse: 0 },
- { Id: 236, Code: '236', IsShow: 1, IsUse: 0 },
- { Id: 237, Code: '237', IsShow: 1, IsUse: 0 },
- { Id: 238, Code: '238', IsShow: 1, IsUse: 0 },
- { Id: 239, Code: '239', IsShow: 1, IsUse: 0 },
- { Id: 240, Code: '240', IsShow: 1, IsUse: 0 },
- { Id: 241, Code: '241', IsShow: 1, IsUse: 0 },
- { Id: 242, Code: '242', IsShow: 1, IsUse: 0 },
- { Id: 243, Code: '243', IsShow: 1, IsUse: 0 },
- { Id: 244, Code: '244', IsShow: 1, IsUse: 0 },
- { Id: 245, Code: '245', IsShow: 1, IsUse: 0 },
- { Id: 246, Code: '246', IsShow: 1, IsUse: 0 },
- { Id: 247, Code: '247', IsShow: 1, IsUse: 0 },
- { Id: 248, Code: '248', IsShow: 1, IsUse: 0 },
- { Id: 249, Code: '249', IsShow: 1, IsUse: 0 },
- { Id: 250, Code: '250', IsShow: 1, IsUse: 0 },
- { Id: 251, Code: '251', IsShow: 1, IsUse: 0 },
- { Id: 252, Code: '252', IsShow: 1, IsUse: 0 },
- { Id: 253, Code: '253', IsShow: 1, IsUse: 0 },
- { Id: 254, Code: '254', IsShow: 1, IsUse: 0 },
- { Id: 255, Code: '255', IsShow: 1, IsUse: 0 },
+ { Id:205 , Code: '205', IsShow: 0, IsUse: 3 },
+ { Id:206 , Code: '206', IsShow: 0, IsUse: 3 },
+ { Id:207 , Code: '207', IsShow: 0, IsUse: 3 },
+ { Id:208 , Code: '208', IsShow: 0, IsUse: 3 },
+ { Id:209 , Code: '209', IsShow: 0, IsUse: 3 },
+ { Id:210 , Code: '210', IsShow: 0, IsUse: 3 },
+ { Id:211 , Code: '211', IsShow: 0, IsUse: 3 },
+ { Id:212 , Code: '212', IsShow: 0, IsUse: 3 },
+ { Id:213 , Code: '213', IsShow: 0, IsUse: 3 },
+ { Id:214 , Code: '214', IsShow: 0, IsUse: 3 },
+ { Id:215 , Code: '215', IsShow: 0, IsUse: 3 },
+ { Id:216 , Code: '216', IsShow: 0, IsUse: 3 },
+ { Id:217 , Code: '217', IsShow: 0, IsUse: 3 },
+ { Id:218 , Code: '218', IsShow: 0, IsUse: 3 },
+ { Id:219 , Code: '219', IsShow: 0, IsUse: 3 },
+ { Id:220 , Code: '220', IsShow: 0, IsUse: 3 },
+ { Id:221 , Code: '221', IsShow: 0, IsUse: 3 },
+ { Id:222 , Code: '222', IsShow: 0, IsUse: 3 },
+ { Id:223 , Code: '223', IsShow: 0, IsUse: 3 },
+ { Id:224 , Code: '224', IsShow: 0, IsUse: 3 },
+ { Id:225 , Code: '225', IsShow: 0, IsUse: 3 },
+ { Id:226 , Code: '226', IsShow: 0, IsUse: 3 },
+ { Id:227 , Code: '227', IsShow: 0, IsUse: 3 },
+ { Id:228 , Code: '228', IsShow: 0, IsUse: 3 },
+ { Id:229 , Code: '229', IsShow: 0, IsUse: 3 },
+ { Id:230 , Code: '230', IsShow: 0, IsUse: 3 },
+ { Id:231 , Code: '231', IsShow: 0, IsUse: 3 },
+ { Id:232 , Code: '232', IsShow: 0, IsUse: 3 },
+ { Id:233 , Code: '233', IsShow: 0, IsUse: 3 },
+ { Id:234 , Code: '234', IsShow: 0, IsUse: 3 },
+ { Id:235 , Code: '235', IsShow: 0, IsUse: 3 },
+ { Id:236 , Code: '236', IsShow: 0, IsUse: 3 },
+ { Id:237 , Code: '237', IsShow: 0, IsUse: 3 },
+ { Id:238 , Code: '238', IsShow: 0, IsUse: 3 },
+ { Id:239 , Code: '239', IsShow: 0, IsUse: 3 },
+ { Id:240 , Code: '240', IsShow: 0, IsUse: 3 },
+ { Id:241 , Code: '241', IsShow: 0, IsUse: 3 },
+ { Id:242 , Code: '242', IsShow: 0, IsUse: 3 },
+ { Id:243 , Code: '243', IsShow: 0, IsUse: 3 },
+ { Id:244 , Code: '244', IsShow: 0, IsUse: 3 },
+ { Id:245 , Code: '245', IsShow: 0, IsUse: 3 },
+ { Id:246 , Code: '246', IsShow: 0, IsUse: 3 },
+ { Id:247 , Code: '247', IsShow: 0, IsUse: 3 },
+ { Id:248 , Code: '248', IsShow: 0, IsUse: 3 },
+ { Id:249 , Code: '249', IsShow: 0, IsUse: 3 },
+ { Id:250 , Code: '250', IsShow: 0, IsUse: 3 },
+ { Id:251 , Code: '251', IsShow: 0, IsUse: 3 },
+ { Id:252 , Code: '252', IsShow: 0, IsUse: 3 },
+ { Id:253 , Code: '253', IsShow: 0, IsUse: 3 },
+ { Id:254 , Code: '254', IsShow: 0, IsUse: 3 },
+ { Id: 255, Code: '255', IsShow: 0, IsUse: 3 },
{ Id: 256, Code: '256', IsShow: 1, IsUse: 0 },
{ Id: 257, Code: '257', IsShow: 1, IsUse: 0 },
{ Id: 258, Code: '258', IsShow: 1, IsUse: 0 },
@@ -2016,8 +1975,8 @@
}
.grid-item-line-box {
- width: 20px;
- height: 20px;
+ width: 18px;
+ height: 18px;
background-color: rgb(97, 250, 145);
position: absolute;
display: flex;
@@ -2044,7 +2003,6 @@
}
.grid-container {
- margin-top: 10px;
width: 100%;
display: grid;
grid-template-columns: repeat(51, 1fr);
@@ -2053,40 +2011,8 @@
/* 姣忚楂樺害 */
gap: 0px;
/* Gap between cells */
-}
-
-.grid-item {
- background-color: #9c9c9c;
- border: 1px solid #797777;
- text-align: center;
- line-height: 1.4vw;
- /* 琛岄珮 */
- width: 100%;
- /* 鑷�傚簲瀹藉害 */
- height: 100%;
- /* 鑷�傚簲楂樺害 */
- color: #fff;
- font-size: 0.7vw;
-}
-
-.card {
- width: 100%;
- position: absolute;
- border-top: none;
- z-index: 90;
- margin-top: 310px;
-}
-
-.grid-container {
- margin-top: 10px;
- width: 100%;
- display: grid;
- grid-template-columns: repeat(51, 1fr);
- /* 姣忓垪瀹藉害 */
- grid-template-rows: repeat(12, 1fr);
- /* 姣忚楂樺害 */
- gap: 0px;
- /* Gap between cells */
+
+ margin-top: -20px;;
}
.grid-item {
@@ -2103,6 +2029,14 @@
font-size: 0.6vw;
}
+.card {
+ width: 100%;
+ position: absolute;
+ border-top: none;
+ z-index: 90;
+ margin-top: 310px;
+}
+
.active {
background-color: rgb(57, 141, 251);
/* IsUse 涓�1鏃惰儗鏅鑹蹭负钃濊壊 */
@@ -2112,4 +2046,11 @@
.active2>div {
display: none;
}
+.active3 {
+ background-color: #fff;
+ border:1px solid red;
+}
+.active3>div {
+ display: none;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0