From d3e1346d52806f00d21eba23cabf9cfa4f61d7d4 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期四, 05 九月 2024 16:34:00 +0800
Subject: [PATCH] 测试页面，修复bug
---
Web/src/views/device/deviceInfo/index.vue | 127 +++++++++++++++++++++++++++++-------------
1 files changed, 87 insertions(+), 40 deletions(-)
diff --git a/Web/src/views/device/deviceInfo/index.vue b/Web/src/views/device/deviceInfo/index.vue
index 3d13bff..9d46727 100644
--- a/Web/src/views/device/deviceInfo/index.vue
+++ b/Web/src/views/device/deviceInfo/index.vue
@@ -37,9 +37,12 @@
</el-col>
<el-col :span="21">
<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="floorStates.isPlain1"
+ @click="floorTogglePlain(1)">涓�灞傚钩闈�</el-button>
+ <el-button type="primary" :plain="floorStates.isPlain2"
+ @click="floorTogglePlain(2)">浜屽眰骞抽潰</el-button>
+ <el-button type="primary" :plain="floorStates.isPlain3"
+ @click="floorTogglePlain(3)">涓夊眰骞抽潰</el-button>
</div>
<div style="margin: 40px; height: 50%;">
<div class="grid-container-line">
@@ -71,7 +74,7 @@
<script lang="ts" setup>
import { ref, reactive, onMounted } from 'vue';
-import { listStatus } from '/@/api/wcs/wcsPlc';
+import { listStatus, listPosition } from '/@/api/wcs/wcsPlc';
import { signalR } from './signalR';
const state = ref<any>({});
@@ -83,6 +86,24 @@
state.value = res.data.result.modService;
stackers.value = res.data.result.listPlc.filter(s => s.type == 0);
conveyors.value = res.data.result.listPlc.filter(s => s.type == 1 || s.type == 4);
+
+ var res2 = await listPosition();
+ res2.data.result.forEach(s => {
+ if (s.type == 0) {
+ // 鏇存柊鍫嗗灈鏈烘暟鎹�
+ const foundCell = cellsDataLine.value.find(cell => cell.Code === s.stationNum);
+ if (foundCell) {
+ //淇敼楂樺害
+ foundCell.BoxHeight = s.boxHeight;
+ }
+ }
+ else if (s.type == 1) {
+ // 鏇存柊杈撻�佺嚎鏁版嵁
+ updateCellData(cellsDataOne, s);
+ updateCellData(cellsDataTwo, s);
+ updateCellData(cellsDataThree, s);
+ }
+ });
};
handleQuery();
@@ -110,71 +131,100 @@
signalR.on('UpdateService', (data: any) => {
state.value = data;
});
+ signalR.off('PublicPosition');
+ signalR.on('PublicPosition', (data: any) => {
+
+ if (data.type == 1) {
+ // 鏇存柊杈撻�佺嚎鏁版嵁
+ updateCellData(cellsDataOne, data);
+ updateCellData(cellsDataTwo, data);
+ updateCellData(cellsDataThree, data);
+ }
+ else if (data.type == 0) {
+ // 鏇存柊鍫嗗灈鏈烘暟鎹�
+ const foundCell = cellsDataLine.value.find(cell => cell.Code === data.stationNum);
+ if (foundCell) {
+ //淇敼楂樺害
+ foundCell.BoxHeight = data.boxHeight;
+ }
+ }
+ });
});
const handleSwitchChange = (field: string, value: boolean) => {
- signalR.invoke('UpdateService',state.value);
+ const param = { [field]: value };
+ debugger;
+ signalR.invoke('UpdateService', param);
};
+// 鏇存柊杈撻�佺嚎鏁版嵁鐨勯�氱敤鍑芥暟
+function updateCellData(cellsData: any[], data: any) {
+ const foundCell = cellsData.find(cell => cell.Code === data.stationNum);
+ if (foundCell) {
+ if (data.boHaveItem) {
+ foundCell.IsUse = 1;
+ }
+ else {
+ foundCell.IsUse = 0;
+ }
+ }
+}
const activeName = ['1', '2', '3'];
-const value1 = ref(false);
-const value2 = ref(false);
-const value3 = ref(false);
//鍫嗗灈鏈烘暟鎹�
-const cellsDataLine = [
+const cellsDataLine = ref([
{ Id: 1, Code: '001', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
- { Id: 2, Code: '002', LineCode: '01', EndLocat: '01010101', IsShow: 0, IsUse: 0, BoxHeight: 10 },
+ { Id: 2, Code: '10', LineCode: '01', EndLocat: '01010101', IsShow: 0, IsUse: 0, BoxHeight: 0 },
{ Id: 3, Code: '003', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 4, Code: '004', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 5, Code: '005', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
- { Id: 6, Code: '006', LineCode: '02', EndLocat: '', IsShow: 0, IsUse: 0, BoxHeight: 50 },
+ { Id: 6, Code: '20', LineCode: '02', EndLocat: '', IsShow: 0, IsUse: 0, BoxHeight: 0 },
{ Id: 7, Code: '007', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 8, Code: '008', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 9, Code: '009', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 10, Code: '010', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 11, Code: '011', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
- { Id: 12, Code: '012', LineCode: '03', EndLocat: '', IsShow: 0, IsUse: 0, BoxHeight: 10 },
+ { Id: 12, Code: '30', LineCode: '03', EndLocat: '', IsShow: 0, IsUse: 0, BoxHeight: 0 },
{ Id: 13, Code: '013', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 14, Code: '014', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 15, Code: '015', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 16, Code: '016', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
- { Id: 17, Code: '017', LineCode: '04', EndLocat: '', IsShow: 0, IsUse: 0, BoxHeight: 10 },
+ { Id: 17, Code: '40', LineCode: '04', EndLocat: '', IsShow: 0, IsUse: 0, BoxHeight: 0 },
{ Id: 18, Code: '018', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 19, Code: '019', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 20, Code: '020', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 21, Code: '021', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 22, Code: '022', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
- { Id: 23, Code: '023', LineCode: '05', EndLocat: '', IsShow: 0, IsUse: 0, BoxHeight: 200 },
+ { Id: 23, Code: '50', LineCode: '05', EndLocat: '', IsShow: 0, IsUse: 0, BoxHeight: 0 },
{ Id: 24, Code: '024', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 25, Code: '025', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 26, Code: '026', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 27, Code: '027', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
- { Id: 28, Code: '028', LineCode: '06', EndLocat: '', IsShow: 0, IsUse: 0, BoxHeight: 0 },
+ { Id: 28, Code: '60', LineCode: '06', EndLocat: '', IsShow: 0, IsUse: 0, BoxHeight: 0 },
{ Id: 29, Code: '029', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 30, Code: '030', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 31, Code: '031', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 32, Code: '032', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 33, Code: '033', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
- { Id: 34, Code: '034', LineCode: '07', EndLocat: '', IsShow: 0, IsUse: 0, BoxHeight: 10 },
+ { Id: 34, Code: '70', LineCode: '07', EndLocat: '', IsShow: 0, IsUse: 0, BoxHeight: 0 },
{ Id: 35, Code: '035', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 36, Code: '036', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 37, Code: '037', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 38, Code: '038', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
- { Id: 39, Code: '039', LineCode: '08', EndLocat: '', IsShow: 0, IsUse: 0, BoxHeight: 10 },
+ { Id: 39, Code: '80', LineCode: '08', EndLocat: '', IsShow: 0, IsUse: 0, BoxHeight: 0 },
{ Id: 40, Code: '040', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 41, Code: '041', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 42, Code: '042', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 43, Code: '043', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 44, Code: '044', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
- { Id: 45, Code: '045', LineCode: '09', EndLocat: '', IsShow: 0, IsUse: 0, BoxHeight: 10 },
+ { Id: 45, Code: '90', LineCode: '09', EndLocat: '', IsShow: 0, IsUse: 0, BoxHeight: 0 },
{ Id: 46, Code: '046', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 47, Code: '047', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 48, Code: '048', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 49, Code: '049', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
- { Id: 50, Code: '050', LineCode: '10', EndLocat: '', IsShow: 0, IsUse: 0, BoxHeight: 10 },
+ { Id: 50, Code: '100', LineCode: '10', EndLocat: '', IsShow: 0, IsUse: 0, BoxHeight: 0 },
{ Id: 51, Code: '051', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
-];
+]);
//涓�灞傝緭閫佺嚎鏁版嵁
const cellsDataOne = [
@@ -1924,29 +1974,26 @@
//杈撻�佺嚎鏁版嵁
let cellsData = ref(cellsDataOne);
-const isPlain1 = ref(false);//涓�灞�
-const isPlain2 = ref(true);//浜屽眰
-const isPlain3 = ref(true);//涓夊眰
+
+// 灞傚钩闈㈢姸鎬�
+const floorStates = ref({
+ isPlain1: false,
+ isPlain2: true,
+ isPlain3: true
+});
+
//鍒囨崲灞傚钩闈�
function floorTogglePlain(buttonNumber) {
- if (buttonNumber === 1) {
- isPlain1.value = !isPlain1.value;
- isPlain2.value = true;
- isPlain3.value = true;
+ const floorData = [cellsDataOne, cellsDataTwo, cellsDataThree];
- cellsData.value = cellsDataOne;
- } else if (buttonNumber === 2) {
- isPlain2.value = !isPlain2.value;
- isPlain1.value = true;
- isPlain3.value = true;
-
- cellsData.value = cellsDataTwo;
- } else if (buttonNumber === 3) {
- isPlain3.value = !isPlain3.value;
- isPlain1.value = true;
- isPlain2.value = true;
-
- cellsData.value = cellsDataThree;
+ if (buttonNumber >= 1 && buttonNumber <= 3) {
+ const index = buttonNumber - 1;
+ floorStates.value = {
+ isPlain1: index !== 0,
+ isPlain2: index !== 1,
+ isPlain3: index !== 2
+ };
+ cellsData.value = floorData[index];
}
}
</script>
--
Gitblit v1.8.0