From 19724b0969eb2f91b38efb262a6ef4de04d6b0c5 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期二, 14 十月 2025 12:07:58 +0800
Subject: [PATCH] 新增“有货状态”显示及数据处理逻辑支持在Home.vue和 LineComponent.vue中新增了“有货状态”显示功能，为 RGV 和堆垛机对象添加了 InStock属性。 修改了 Home.vue 的 created生命周期和 LineComponent.vue的 update 方法，增加了对 inStock数据的处理逻辑。删除了三个旧的二进制文件，新增了六个新的二进制文件，可能与项目构建或依赖更新相关。优化了任务分配和状态判断逻辑，确保任务执行更加准确和高效。
---
项目代码/WCS/WIDESEAWCS_Client/src/views/Home.vue | 283 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 246 insertions(+), 37 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/views/Home.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/views/Home.vue"
index 67ec81d..4150230 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/views/Home.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/views/Home.vue"
@@ -79,7 +79,7 @@
url="api/Equipment/GetLineInfoByNo" />
</div>
</div>
- <div style="margin-top: 118px;"></div>
+ <div style="margin-top: 108px;"></div>
<div v-for="(group, index) in groupedLines(linescopy2)" :key="index">
<div class="positionY-group">
<LineInfoCopy v-for="(line, lineIndex) in group.lines" :key="lineIndex"
@@ -88,7 +88,7 @@
url="api/Equipment/GetLineInfoByNo" />
</div>
</div>
- <div style="margin-top: 115px;"></div>
+ <div style="margin-top: 58px;"></div>
<div v-for="(group, index) in groupedLines(linescopy3)" :key="index">
<div class="positionY-group">
<LineInfoCopy v-for="(line, lineIndex) in group.lines" :key="lineIndex"
@@ -97,7 +97,7 @@
url="api/Equipment/GetLineInfoByNo" />
</div>
</div>
- <div style="margin-top: 112px;"></div>
+ <div style="margin-top: 58px;"></div>
<div v-for="(group, index) in groupedLines(linescopy4)" :key="index">
<div class="positionY-group">
<LineInfoCopy v-for="(line, lineIndex) in group.lines" :key="lineIndex"
@@ -105,7 +105,7 @@
:positionY="line.positionY" :condition="line.condition" />
</div>
</div>
- <div style="margin-top: 109px;"></div>
+ <div style="margin-top: 115px;"></div>
<div v-for="(group, index) in groupedLines(linescopy5)" :key="index">
<div class="positionY-group">
<LineInfoCopy v-for="(line, lineIndex) in group.lines" :key="lineIndex"
@@ -113,7 +113,7 @@
:positionY="line.positionY" :condition="line.condition" />
</div>
</div>
- <div style="margin-top: 107px;"></div>
+ <div style="margin-top: 115px;"></div>
<div v-for="(group, index) in groupedLines(linescopy6)" :key="index">
<div class="positionY-group">
<LineInfoCopy v-for="(line, lineIndex) in group.lines" :key="lineIndex"
@@ -239,6 +239,13 @@
</el-row>
<el-row :gutter="20" type="flex" justify="start" align="top" tag="div" style="margin-bottom: 10px;">
<el-col :span="24" :offset="0" :push="0" :pull="0" tag="div">
+ <el-form-item label="鏈夎揣鐘舵��:">
+ <j-el-description :value="RGV01.InStock" type="primary" ellipsis></j-el-description>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="20" type="flex" justify="start" align="top" tag="div" style="margin-bottom: 10px;">
+ <el-col :span="24" :offset="0" :push="0" :pull="0" tag="div">
<el-form-item label="鎶ヨ淇℃伅:">
<j-el-description :value="RGV01.Alarm" type="primary" ellipsis></j-el-description>
</el-form-item>
@@ -264,14 +271,70 @@
<el-row :gutter="20" type="flex" justify="start" align="top" tag="div">
<el-col :span="16" :offset="0" :push="0" :pull="0" tag="div">
<el-form-item label="鍙栬揣浣�:">
- <el-input size="large" v-model="formRGV.SourceAddress" style="width: 800px" placeholder="鍙栬揣浣�" />
+ <!-- <el-input size="large" v-model="formRGV.SourceAddress" style="width: 800px" placeholder="鍙栬揣浣�" /> -->
+ <el-select size="large" v-model="formRGV.SourceAddress" placeholder="璇烽�夋嫨鍙栬揣浣�">
+ <el-option label="1037" value="1" />
+ <el-option label="1035" value="2" />
+ <el-option label="1033" value="3" />
+ <el-option label="1031" value="4" />
+ <el-option label="1023" value="5" />
+ <el-option label="1021" value="6" />
+ <el-option label="1019" value="8" />
+ <el-option label="1017" value="9" />
+ <el-option label="1011" value="11" />
+ <el-option label="1009" value="12" />
+ <el-option label="1007" value="13" />
+ <el-option label="1005" value="14" />
+ <el-option label="1030" value="15" />
+ <el-option label="1029" value="16" />
+ <el-option label="1028" value="17" />
+ <el-option label="1027" value="18" />
+ <el-option label="1016" value="19" />
+ <el-option label="1015" value="20" />
+ <el-option label="1014" value="21" />
+ <el-option label="1013" value="22" />
+ <el-option label="1040" value="23" />
+ <el-option label="1039" value="24" />
+ <el-option label="1004" value="25" />
+ <el-option label="1002" value="26" />
+ <el-option label="1026" value="7" />
+ <el-option label="1025" value="10" />
+ </el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20" type="flex" justify="start" align="top" tag="div">
<el-col :span="16" :offset="0" :push="0" :pull="0" tag="div">
<el-form-item label="鏀捐揣浣�:">
- <el-input size="large" v-model="formRGV.TargetAddress" style="width: 800px" placeholder="鏀捐揣浣�" />
+ <!-- <el-input size="large" v-model="formRGV.TargetAddress" style="width: 800px" placeholder="鏀捐揣浣�" /> -->
+ <el-select size="large" v-model="formRGV.TargetAddress" placeholder="璇烽�夋嫨鏀捐揣浣�">
+ <el-option label="1037" value="1" />
+ <el-option label="1035" value="2" />
+ <el-option label="1033" value="3" />
+ <el-option label="1031" value="4" />
+ <el-option label="1023" value="5" />
+ <el-option label="1021" value="6" />
+ <el-option label="1019" value="8" />
+ <el-option label="1017" value="9" />
+ <el-option label="1011" value="11" />
+ <el-option label="1009" value="12" />
+ <el-option label="1007" value="13" />
+ <el-option label="1005" value="14" />
+ <el-option label="1030" value="15" />
+ <el-option label="1029" value="16" />
+ <el-option label="1028" value="17" />
+ <el-option label="1027" value="18" />
+ <el-option label="1016" value="19" />
+ <el-option label="1015" value="20" />
+ <el-option label="1014" value="21" />
+ <el-option label="1013" value="22" />
+ <el-option label="1040" value="23" />
+ <el-option label="1039" value="24" />
+ <el-option label="1004" value="25" />
+ <el-option label="1002" value="26" />
+ <el-option label="1026" value="7" />
+ <el-option label="1025" value="10" />
+ </el-select>
</el-form-item>
</el-col>
</el-row>
@@ -359,6 +422,13 @@
</el-row>
<el-row :gutter="20" type="flex" justify="start" align="top" tag="div" style="margin-bottom: 10px;">
<el-col :span="24" :offset="0" :push="0" :pull="0" tag="div">
+ <el-form-item label="鏈夎揣鐘舵��:">
+ <j-el-description :value="RGV02.InStock" type="primary" ellipsis></j-el-description>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="20" type="flex" justify="start" align="top" tag="div" style="margin-bottom: 10px;">
+ <el-col :span="24" :offset="0" :push="0" :pull="0" tag="div">
<el-form-item label="鎶ヨ淇℃伅:">
<j-el-description :value="RGV02.Alarm" type="primary" ellipsis></j-el-description>
</el-form-item>
@@ -384,14 +454,70 @@
<el-row :gutter="20" type="flex" justify="start" align="top" tag="div">
<el-col :span="16" :offset="0" :push="0" :pull="0" tag="div">
<el-form-item label="鍙栬揣浣�:">
- <el-input size="large" v-model="formRGV.SourceAddress" style="width: 800px" placeholder="鍙栬揣浣�" />
+ <!-- <el-input size="large" v-model="formRGV.SourceAddress" style="width: 800px" placeholder="鍙栬揣浣�" /> -->
+ <el-select size="large" v-model="formRGV.SourceAddress" placeholder="璇烽�夋嫨鍙栬揣浣�">
+ <el-option label="1037" value="1" />
+ <el-option label="1035" value="2" />
+ <el-option label="1033" value="3" />
+ <el-option label="1031" value="4" />
+ <el-option label="1023" value="5" />
+ <el-option label="1021" value="6" />
+ <el-option label="1019" value="8" />
+ <el-option label="1017" value="9" />
+ <el-option label="1011" value="11" />
+ <el-option label="1009" value="12" />
+ <el-option label="1007" value="13" />
+ <el-option label="1005" value="14" />
+ <el-option label="1030" value="15" />
+ <el-option label="1029" value="16" />
+ <el-option label="1028" value="17" />
+ <el-option label="1027" value="18" />
+ <el-option label="1016" value="19" />
+ <el-option label="1015" value="20" />
+ <el-option label="1014" value="21" />
+ <el-option label="1013" value="22" />
+ <el-option label="1040" value="23" />
+ <el-option label="1039" value="24" />
+ <el-option label="1004" value="25" />
+ <el-option label="1002" value="26" />
+ <el-option label="1026" value="7" />
+ <el-option label="1025" value="10" />
+ </el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20" type="flex" justify="start" align="top" tag="div">
<el-col :span="16" :offset="0" :push="0" :pull="0" tag="div">
<el-form-item label="鏀捐揣浣�:">
- <el-input size="large" v-model="formRGV.TargetAddress" style="width: 800px" placeholder="鏀捐揣浣�" />
+ <!-- <el-input size="large" v-model="formRGV.TargetAddress" style="width: 800px" placeholder="鏀捐揣浣�" /> -->
+ <el-select size="large" v-model="formRGV.TargetAddress" placeholder="璇烽�夋嫨鏀捐揣浣�">
+ <el-option label="1037" value="1" />
+ <el-option label="1035" value="2" />
+ <el-option label="1033" value="3" />
+ <el-option label="1031" value="4" />
+ <el-option label="1023" value="5" />
+ <el-option label="1021" value="6" />
+ <el-option label="1019" value="8" />
+ <el-option label="1017" value="9" />
+ <el-option label="1011" value="11" />
+ <el-option label="1009" value="12" />
+ <el-option label="1007" value="13" />
+ <el-option label="1005" value="14" />
+ <el-option label="1030" value="15" />
+ <el-option label="1029" value="16" />
+ <el-option label="1028" value="17" />
+ <el-option label="1027" value="18" />
+ <el-option label="1016" value="19" />
+ <el-option label="1015" value="20" />
+ <el-option label="1014" value="21" />
+ <el-option label="1013" value="22" />
+ <el-option label="1040" value="23" />
+ <el-option label="1039" value="24" />
+ <el-option label="1004" value="25" />
+ <el-option label="1002" value="26" />
+ <el-option label="1026" value="7" />
+ <el-option label="1025" value="10" />
+ </el-select>
</el-form-item>
</el-col>
</el-row>
@@ -479,6 +605,13 @@
</el-row>
<el-row :gutter="20" type="flex" justify="start" align="top" tag="div" style="margin-bottom: 10px;">
<el-col :span="24" :offset="0" :push="0" :pull="0" tag="div">
+ <el-form-item label="鏈夎揣鐘舵��:">
+ <j-el-description :value="RGV03.InStock" type="primary" ellipsis></j-el-description>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="20" type="flex" justify="start" align="top" tag="div" style="margin-bottom: 10px;">
+ <el-col :span="24" :offset="0" :push="0" :pull="0" tag="div">
<el-form-item label="鎶ヨ淇℃伅:">
<j-el-description :value="RGV03.Alarm" type="primary" ellipsis></j-el-description>
</el-form-item>
@@ -504,14 +637,48 @@
<el-row :gutter="20" type="flex" justify="start" align="top" tag="div">
<el-col :span="16" :offset="0" :push="0" :pull="0" tag="div">
<el-form-item label="鍙栬揣浣�:">
- <el-input size="large" v-model="formRGV.SourceAddress" style="width: 800px" placeholder="鍙栬揣浣�" />
+ <!-- <el-input size="large" v-model="formRGV.SourceAddress" style="width: 800px" placeholder="鍙栬揣浣�" /> -->
+ <el-select size="large" v-model="formRGV.SourceAddress" placeholder="璇烽�夋嫨鍙栬揣浣�">
+ <el-option label="3031" value="1" />
+ <el-option label="3029" value="2" />
+ <el-option label="3027" value="3" />
+ <el-option label="3025" value="4" />
+ <el-option label="3023" value="5" />
+ <el-option label="3021" value="6" />
+ <el-option label="3019" value="7" />
+ <el-option label="3017" value="8" />
+ <el-option label="3015" value="9" />
+ <el-option label="3013" value="10" />
+ <el-option label="3011" value="11" />
+ <el-option label="3009" value="12" />
+ <el-option label="3008" value="13" />
+ <el-option label="3006" value="14" />
+ <el-option label="3004" value="15" />
+ </el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20" type="flex" justify="start" align="top" tag="div">
<el-col :span="16" :offset="0" :push="0" :pull="0" tag="div">
<el-form-item label="鏀捐揣浣�:">
- <el-input size="large" v-model="formRGV.TargetAddress" style="width: 800px" placeholder="鏀捐揣浣�" />
+ <!-- <el-input size="large" v-model="formRGV.TargetAddress" style="width: 800px" placeholder="鏀捐揣浣�" /> -->
+ <el-select size="large" v-model="formRGV.TargetAddress" placeholder="璇烽�夋嫨鏀捐揣浣�">
+ <el-option label="3031" value="1" />
+ <el-option label="3029" value="2" />
+ <el-option label="3027" value="3" />
+ <el-option label="3025" value="4" />
+ <el-option label="3023" value="5" />
+ <el-option label="3021" value="6" />
+ <el-option label="3019" value="7" />
+ <el-option label="3017" value="8" />
+ <el-option label="3015" value="9" />
+ <el-option label="3013" value="10" />
+ <el-option label="3011" value="11" />
+ <el-option label="3009" value="12" />
+ <el-option label="3008" value="13" />
+ <el-option label="3006" value="14" />
+ <el-option label="3004" value="15" />
+ </el-select>
</el-form-item>
</el-col>
</el-row>
@@ -604,14 +771,14 @@
}, {
equipNo: "2002",
imgType: "1",
- positionX: 26,
+ positionX: 27.5,
positionY: 8,
condition: false,
},
{
equipNo: "2001",
imgType: "1",
- positionX: 26,
+ positionX: 27.5,
positionY: 8,
condition: false,
},
@@ -619,14 +786,14 @@
{
equipNo: "2004",
imgType: "1",
- positionX: 26,
+ positionX: 27.5,
positionY: 20,
condition: false,
},
{
equipNo: "2003",
imgType: "1",
- positionX: 26,
+ positionX: 27.5,
positionY: 20,
condition: false,
},
@@ -655,6 +822,13 @@
condition: false,
},
{
+ equipNo: "1025",
+ imgType: "1",
+ positionX: 0.6,
+ positionY: 21,
+ condition: false,
+ },
+ {
equipNo: "1012",
imgType: "1",
positionX: 0.6,
@@ -663,28 +837,28 @@
}, {
equipNo: "2006",
imgType: "1",
- positionX: 26,
+ positionX: 27.5,
positionY: 8,
condition: false,
},
{
equipNo: "2005",
imgType: "1",
- positionX: 26,
+ positionX: 27.5,
positionY: 8,
condition: false,
},
{
equipNo: "2008",
imgType: "1",
- positionX: 26,
+ positionX: 27.5,
positionY: 20,
condition: false,
},
{
equipNo: "2007",
imgType: "1",
- positionX: 26,
+ positionX: 27.5,
positionY: 20,
condition: false,
},
@@ -713,6 +887,13 @@
condition: false,
},
{
+ equipNo: "1026",
+ imgType: "1",
+ positionX: 0.6,
+ positionY: 21,
+ condition: false,
+ },
+ {
equipNo: "1020",
imgType: "1",
positionX: 0.6,
@@ -721,28 +902,28 @@
}, {
equipNo: "2010",
imgType: "1",
- positionX: 26,
+ positionX: 27.5,
positionY: 8,
condition: false,
},
{
equipNo: "2009",
imgType: "1",
- positionX: 26,
+ positionX: 27.5,
positionY: 8,
condition: false,
},
{
equipNo: "2012",
imgType: "1",
- positionX: 26,
+ positionX: 27.5,
positionY: 20,
condition: false,
},
{
equipNo: "2011",
imgType: "1",
- positionX: 26,
+ positionX: 27.5,
positionY: 20,
condition: false,
},
@@ -779,28 +960,28 @@
}, {
equipNo: "2014",
imgType: "1",
- positionX: 26,
+ positionX: 27.5,
positionY: 8,
condition: false,
},
{
equipNo: "2013",
imgType: "1",
- positionX: 26,
+ positionX: 27.5,
positionY: 8,
condition: false,
},
{
equipNo: "2016",
imgType: "1",
- positionX: 26,
+ positionX: 27.5,
positionY: 20,
condition: false,
},
{
equipNo: "2015",
imgType: "1",
- positionX: 26,
+ positionX: 27.5,
positionY: 20,
condition: false,
},
@@ -837,28 +1018,28 @@
}, {
equipNo: "2018",
imgType: "1",
- positionX: 26,
+ positionX: 27.5,
positionY: 8,
condition: false,
},
{
equipNo: "2017",
imgType: "1",
- positionX: 26,
+ positionX: 27.5,
positionY: 8,
condition: false,
},
{
equipNo: "2020",
imgType: "1",
- positionX: 26,
+ positionX: 27.5,
positionY: 20,
condition: false,
},
{
equipNo: "2019",
imgType: "1",
- positionX: 26,
+ positionX: 27.5,
positionY: 20,
condition: false,
},
@@ -895,28 +1076,28 @@
}, {
equipNo: "2022",
imgType: "1",
- positionX: 26,
+ positionX: 27.5,
positionY: 8,
condition: false,
},
{
equipNo: "2021",
imgType: "1",
- positionX: 26,
+ positionX: 27.5,
positionY: 8,
condition: false,
},
{
equipNo: "2024",
imgType: "1",
- positionX: 26,
+ positionX: 27.5,
positionY: 20,
condition: false,
},
{
equipNo: "2023",
imgType: "1",
- positionX: 26,
+ positionX: 27.5,
positionY: 20,
condition: false,
},
@@ -1269,6 +1450,7 @@
DeviceName: "",
DeviceCOde: "",
StackerAlarm: "",
+ InStock:"",
},
RGVFirst: false,
RGVSecond: false,
@@ -1290,6 +1472,7 @@
DeviceName: "",
DeviceCode: "RGV01",
Alarm:"",
+ InStock:"",
},
RGV02: {
Automatic: "",
@@ -1300,6 +1483,7 @@
DeviceName: "",
DeviceCode: "RGV02",
Alarm:"",
+ InStock:"",
},
RGV03: {
Automatic: "",
@@ -1310,6 +1494,7 @@
DeviceName: "",
DeviceCode: "RGV03",
Alarm:"",
+ InStock:"",
},
formRGV: {
TaskType: "",
@@ -1487,7 +1672,7 @@
},
created() {
eventBus.on('stackerData', eventData => {
-
+
const stackerComponentsMap = {
"SC01": 'stacker1',
"SC02": 'stacker2',
@@ -1506,8 +1691,13 @@
this.StackerCrane.LevelPoint = eventData.data.levelPoint;
this.StackerCrane.DeviceName = eventData.data.deviceName;
this.StackerCrane.DeviceCode = eventData.data.deviceCode;
+ this.StackerCrane.CurrentTaskNum = eventData.data.currentTaskNum;
this.StackerCrane.StackerAlarm = eventData.data.stackerAlarm;
-
+ if(eventData.data.inStock){
+ this.StackerCrane.InStock="鏈夎揣";
+ }else{
+ this.StackerCrane.InStock="绌洪棽";
+ }
this.$nextTick(() => {
this.$refs[componentKey].moveDot(this.StackerCrane);
});
@@ -1521,23 +1711,42 @@
this.RGV01.Fault = x.data.fault == null ? "鏁呴殰" : x.data.fault;
this.RGV01.Running = x.data.running == null ? "鏁呴殰" : x.data.running;
this.RGV01.LevelPoint = x.data.levelPoint;
+ this.RGV01.CurrentTaskNum = x.data.currentTaskNum;
this.RGV01.DeviceName = x.data.deviceName;
this.RGV01.DeviceCode = x.data.deviceCode;
this.RGV01.Alarm = x.data.alarm;
+ if(x.data.inStock){
+ this.RGV01.InStock="鏈夎揣";
+ }else{
+ this.RGV01.InStock="绌洪棽";
+ }
+
} else if (x.data.deviceCode == "RGV02") {
this.RGV02.Automatic = x.data.automatic == null ? "鏁呴殰" : x.data.automatic;
this.RGV02.Fault = x.data.fault == null ? "鏁呴殰" : x.data.fault;
this.RGV02.Running = x.data.running == null ? "鏁呴殰" : x.data.running;
this.RGV02.LevelPoint = x.data.levelPoint;
this.RGV02.DeviceName = x.data.deviceName;
+ this.RGV02.CurrentTaskNum = x.data.currentTaskNum;
this.RGV02.Alarm = x.data.alarm;
+ if(x.data.inStock){
+ this.RGV02.InStock="鏈夎揣";
+ }else{
+ this.RGV02.InStock="绌洪棽";
+ }
} else if (x.data.deviceCode == "RGV03") {
this.RGV03.Automatic = x.data.automatic == null ? "鏁呴殰" : x.data.automatic;
this.RGV03.Fault = x.data.fault == null ? "鏁呴殰" : x.data.fault;
this.RGV03.Running = x.data.running == null ? "鏁呴殰" : x.data.running;
this.RGV03.LevelPoint = x.data.levelPoint;
this.RGV03.DeviceName = x.data.deviceName;
+ this.RGV03.CurrentTaskNum = x.data.currentTaskNum;
this.RGV03.Alarm = x.data.alarm;
+ if(x.data.inStock){
+ this.RGV03.InStock="鏈夎揣";
+ }else{
+ this.RGV03.InStock="绌洪棽";
+ }
}
});
--
Gitblit v1.9.3