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 | 290 +++++++++++++++++++++++++++++----------------------------
1 files changed, 149 insertions(+), 141 deletions(-)
diff --git a/Web/src/views/device/alarmManage/index.vue b/Web/src/views/device/alarmManage/index.vue
index b063f04..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">
@@ -37,9 +37,9 @@
</div>
</div>
<div class="grid-container">
- <div v-for="cell in cellsData" :key="cell.Id">
+ <div v-for="cell in cellsData">
<!-- IsUse鐘舵�� 0:姝ｅ父 1锛氭湁鐗╁搧 2锛氶潪宸ヤ綅 3锛氬皬杞﹁矾绾� 4锛氭晠闅� -->
- <div v-if="cell.IsShow === 0"
+ <div v-if="cell.IsShow === 0"
:class="['grid-item', { 'active': cell.IsUse === 1 }, { 'active2': cell.IsUse === 2 }, { 'active3': cell.IsUse === 3 }, { 'active3': cell.IsUse === 3 }, { 'active4': cell.IsUse === 4 }]">
<div>{{ cell.Code }}</div>
</div>
@@ -56,7 +56,67 @@
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');
+ 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);
+ tableParams.value.total = tableData.value.length;
+ } else {
+ if (data.status == 1) {
+ // 濡傛灉鐘舵�佷负 1锛屾洿鏂版暟鎹�
+ if (index !== -1) {
+ tableData.value.splice(index, 1, data);
+ }
+ } else {
+ // 濡傛灉鐘舵�佷笉鏄� 1锛屾姤璀︽秷闄�
+ if (index !== -1) {
+ tableData.value.splice(index, 1);
+ }
+ }
+ }
+ // 鏇存柊杈撻�佺嚎鏁版嵁
+ updateCellData(cellsDataOne.value, data);
+ updateCellData(cellsDataTwo.value, data);
+ updateCellData(cellsDataThree.value, data);
+ });
+ });
+});
+// 鏇存柊杈撻�佺嚎鏁版嵁鐨勯�氱敤鍑芥暟
+function updateCellData(cellsData: any[], data: any) {
+ const foundCell = cellsData.find(cell => cell.Code === data.stationNum);
+ if (foundCell) {
+ if (data.status == 1) {
+ foundCell.IsUse = 4;
+ }
+ else {
+ foundCell.IsUse = 0;
+ }
+ }
+}
+// 鏀瑰彉椤甸潰瀹归噺
+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 = [
{ Id: 1, Code: '001', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
@@ -112,7 +172,7 @@
{ Id: 51, Code: '051', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
];
//涓�灞傝緭閫佺嚎鏁版嵁
-const cellsDataOne = [
+const cellsDataOne = ref([
{ Id: 1, Code: '147', IsShow: 0, IsUse: 0 },
{ Id: 2, Code: '', IsShow: 1, IsUse: 0 },
{ Id: 3, Code: '145', IsShow: 0, IsUse: 0 },
@@ -725,9 +785,9 @@
{ Id: 610, Code: '', IsShow: 1, IsUse: 0 },
{ Id: 611, Code: '', IsShow: 1, IsUse: 0 },
{ Id: 612, Code: '', IsShow: 1, IsUse: 0 },
-];
+]);
//浜屽眰杈撻�佺嚎鏁版嵁
-const cellsDataTwo = [
+const cellsDataTwo = ref([
{ Id: 1, Code: '', IsShow: 0, IsUse: 2 },
{ Id: 2, Code: '', IsShow: 1, IsUse: 0 },
{ Id: 3, Code: '', IsShow: 0, IsUse: 2 },
@@ -1340,9 +1400,9 @@
{ Id: 610, Code: '', IsShow: 1, IsUse: 0 },
{ Id: 611, Code: '', IsShow: 1, IsUse: 0 },
{ Id: 612, Code: '', IsShow: 1, IsUse: 0 },
-];
+]);
//涓夊眰杈撻�佺嚎鏁版嵁
-const cellsDataThree = [
+const cellsDataThree = ref([
{ Id: 1, Code: '', IsShow: 0, IsUse: 2 },
{ Id: 2, Code: '', IsShow: 1, IsUse: 0 },
{ Id: 3, Code: '', IsShow: 0, IsUse: 2 },
@@ -1547,56 +1607,56 @@
{ Id: 202, Code: '', IsShow: 0, IsUse: 2 },
{ Id: 203, Code: '', IsShow: 1, IsUse: 0 },
{ Id: 204, Code: '', IsShow: 0, IsUse: 2 },
- { Id:205 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:206 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:207 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:208 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:209 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:210 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:211 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:212 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:213 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:214 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:215 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:216 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:217 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:218 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:219 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:220 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:221 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:222 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:223 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:224 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:225 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:226 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:227 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:228 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:229 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:230 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:231 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:232 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:233 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:234 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:235 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:236 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:237 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:238 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:239 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:240 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:241 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:242 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:243 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:244 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:245 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:246 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:247 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:248 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:249 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:250 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:251 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:252 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:253 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:254 , Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 205, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 206, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 207, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 208, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 209, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 210, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 211, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 212, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 213, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 214, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 215, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 216, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 217, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 218, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 219, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 220, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 221, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 222, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 223, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 224, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 225, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 226, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 227, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 228, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 229, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 230, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 231, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 232, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 233, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 234, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 235, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 236, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 237, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 238, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 239, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 240, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 241, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 242, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 243, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 244, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 245, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 246, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 247, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 248, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 249, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 250, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 251, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 252, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 253, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 254, Code: '', IsShow: 0, IsUse: 3 },
{ Id: 255, Code: '', IsShow: 0, IsUse: 3 },
{ Id: 256, Code: '', IsShow: 1, IsUse: 0 },
{ Id: 257, Code: '', IsShow: 1, IsUse: 0 },
@@ -1853,9 +1913,9 @@
{ Id: 508, Code: '', IsShow: 1, IsUse: 0 },
{ Id: 509, Code: '', IsShow: 1, IsUse: 0 },
{ Id: 510, Code: '', IsShow: 1, IsUse: 0 },
-];
+]);
//鍔犺浇杈撻�佺嚎鏁版嵁
-let cellsData=ref<any>([]);
+let cellsData = ref<any>([]);
const tableParams = ref({
page: 1,
@@ -1870,101 +1930,45 @@
tableData.value = res.data.result;
tableParams.value.total = tableData.value.length;
- //澶勭悊涓�妤艰緭閫佺嚎鏁版嵁
- tableData.value.forEach((item) => {
- const foundCell = cellsDataOne.find(cell => cell.Code === item.stationNum);
- if (foundCell) {
- foundCell.IsUse = 4;
- }
- });
+ // 鏇存柊杈撻�佺嚎鏁版嵁
+ updateCells(cellsDataOne.value);
+ updateCells(cellsDataTwo.value);
+ updateCells(cellsDataThree.value);
+
//鍔犺浇杈撻�佺嚎鏁版嵁
- cellsData.value =cellsDataOne;
-
- //澶勭悊浜屾ゼ杈撻�佺嚎鏁版嵁
- tableData.value.forEach((item) => {
- const foundCell = cellsDataTwo.find(cell => cell.Code === item.stationNum);
- if (foundCell) {
- foundCell.IsUse = 4;
- }
- });
-
- //澶勭悊涓夋ゼ杈撻�佺嚎鏁版嵁
- tableData.value.forEach((item) => {
- const foundCell = cellsDataThree.find(cell => cell.Code === item.stationNum);
- if (foundCell) {
- foundCell.IsUse = 4;
- }
- });
+ cellsData.value = cellsDataOne.value;
console.log(tableParams.value.total);
loading.value = false;
};
-
+// 鏇存柊杈撻�佺嚎鏁版嵁鐨勯�氱敤鍑芥暟
+function updateCells(cellsData: any[]) {
+ tableData.value.forEach((item) => {
+ updateCellData(cellsData, item);
+ });
+}
handleQuery();
//澶嶄綅鎶ヨ
const reset = async () => {
- await resetWcsAlarmInfo();
+ await resetWcsAlarmInfo({ layer: layer.value });
+ ElMessage.success("澶嶄綅鎴愬姛");
+ // 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);//涓�灞�
-const isPlain2 = ref(true);//浜屽眰
-const isPlain3 = ref(true);//涓夊眰
+const layer = ref(1);
//鍒囨崲灞傚钩闈�
function floorTogglePlain(buttonNumber) {
+ layer.value = buttonNumber;
if (buttonNumber === 1) {
- isPlain1.value = !isPlain1.value;
- isPlain2.value = true;
- isPlain3.value = true;
//鍒囨崲杈撻�佺嚎鏁版嵁
- cellsData.value = cellsDataOne;
+ cellsData.value = cellsDataOne.value;
} else if (buttonNumber === 2) {
- isPlain2.value = !isPlain2.value;
- isPlain1.value = true;
- isPlain3.value = true;
//鍒囨崲杈撻�佺嚎鏁版嵁
- cellsData.value = cellsDataTwo;
+ cellsData.value = cellsDataTwo.value;
} else if (buttonNumber === 3) {
- isPlain3.value = !isPlain3.value;
- isPlain1.value = true;
- isPlain2.value = true;
//鍒囨崲杈撻�佺嚎鏁版嵁
- cellsData.value = cellsDataThree;
+ cellsData.value = cellsDataThree.value;
}
}
</script>
@@ -2080,8 +2084,9 @@
/* 姣忚楂樺害 */
gap: 0px;
/* Gap between cells */
-
- margin-top: -20px;;
+
+ margin-top: -20px;
+ ;
}
.grid-item {
@@ -2115,13 +2120,16 @@
.active2>div {
display: none;
}
+
.active3 {
background-color: #fff;
- border:1px solid red;
+ border: 1px solid red;
}
+
.active3>div {
display: none;
}
+
.active4 {
background-color: red;
}
--
Gitblit v1.8.0