From b367d8d20a1b46e9a17a772f2b7b557dd3c6395c Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期一, 03 十一月 2025 13:53:45 +0800
Subject: [PATCH] 1
---
项目代码/WCS/WIDESEAWCS_Client/src/views/Home.vue | 108 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 77 insertions(+), 31 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 2e9ad25..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: 50px;"></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: 50px;"></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"
@@ -234,6 +234,13 @@
<el-col :span="12" :offset="0" :push="0" :pull="0" tag="div">
<el-form-item label="褰撳墠姘村钩浣嶇疆锛�">
<j-el-description :value="RGV01.LevelPoint" 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.InStock" type="primary" ellipsis></j-el-description>
</el-form-item>
</el-col>
</el-row>
@@ -415,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>
@@ -591,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>
@@ -750,14 +771,14 @@
}, {
equipNo: "2002",
imgType: "1",
- positionX: 28,
+ positionX: 27.5,
positionY: 8,
condition: false,
},
{
equipNo: "2001",
imgType: "1",
- positionX: 28,
+ positionX: 27.5,
positionY: 8,
condition: false,
},
@@ -765,14 +786,14 @@
{
equipNo: "2004",
imgType: "1",
- positionX: 28,
+ positionX: 27.5,
positionY: 20,
condition: false,
},
{
equipNo: "2003",
imgType: "1",
- positionX: 28,
+ positionX: 27.5,
positionY: 20,
condition: false,
},
@@ -816,28 +837,28 @@
}, {
equipNo: "2006",
imgType: "1",
- positionX: 28,
+ positionX: 27.5,
positionY: 8,
condition: false,
},
{
equipNo: "2005",
imgType: "1",
- positionX: 28,
+ positionX: 27.5,
positionY: 8,
condition: false,
},
{
equipNo: "2008",
imgType: "1",
- positionX: 28,
+ positionX: 27.5,
positionY: 20,
condition: false,
},
{
equipNo: "2007",
imgType: "1",
- positionX: 28,
+ positionX: 27.5,
positionY: 20,
condition: false,
},
@@ -881,28 +902,28 @@
}, {
equipNo: "2010",
imgType: "1",
- positionX: 28,
+ positionX: 27.5,
positionY: 8,
condition: false,
},
{
equipNo: "2009",
imgType: "1",
- positionX: 28,
+ positionX: 27.5,
positionY: 8,
condition: false,
},
{
equipNo: "2012",
imgType: "1",
- positionX: 28,
+ positionX: 27.5,
positionY: 20,
condition: false,
},
{
equipNo: "2011",
imgType: "1",
- positionX: 28,
+ positionX: 27.5,
positionY: 20,
condition: false,
},
@@ -939,28 +960,28 @@
}, {
equipNo: "2014",
imgType: "1",
- positionX: 28,
+ positionX: 27.5,
positionY: 8,
condition: false,
},
{
equipNo: "2013",
imgType: "1",
- positionX: 28,
+ positionX: 27.5,
positionY: 8,
condition: false,
},
{
equipNo: "2016",
imgType: "1",
- positionX: 28,
+ positionX: 27.5,
positionY: 20,
condition: false,
},
{
equipNo: "2015",
imgType: "1",
- positionX: 28,
+ positionX: 27.5,
positionY: 20,
condition: false,
},
@@ -997,28 +1018,28 @@
}, {
equipNo: "2018",
imgType: "1",
- positionX: 28,
+ positionX: 27.5,
positionY: 8,
condition: false,
},
{
equipNo: "2017",
imgType: "1",
- positionX: 28,
+ positionX: 27.5,
positionY: 8,
condition: false,
},
{
equipNo: "2020",
imgType: "1",
- positionX: 28,
+ positionX: 27.5,
positionY: 20,
condition: false,
},
{
equipNo: "2019",
imgType: "1",
- positionX: 28,
+ positionX: 27.5,
positionY: 20,
condition: false,
},
@@ -1055,28 +1076,28 @@
}, {
equipNo: "2022",
imgType: "1",
- positionX: 28,
+ positionX: 27.5,
positionY: 8,
condition: false,
},
{
equipNo: "2021",
imgType: "1",
- positionX: 28,
+ positionX: 27.5,
positionY: 8,
condition: false,
},
{
equipNo: "2024",
imgType: "1",
- positionX: 28,
+ positionX: 27.5,
positionY: 20,
condition: false,
},
{
equipNo: "2023",
imgType: "1",
- positionX: 28,
+ positionX: 27.5,
positionY: 20,
condition: false,
},
@@ -1429,6 +1450,7 @@
DeviceName: "",
DeviceCOde: "",
StackerAlarm: "",
+ InStock:"",
},
RGVFirst: false,
RGVSecond: false,
@@ -1450,6 +1472,7 @@
DeviceName: "",
DeviceCode: "RGV01",
Alarm:"",
+ InStock:"",
},
RGV02: {
Automatic: "",
@@ -1460,6 +1483,7 @@
DeviceName: "",
DeviceCode: "RGV02",
Alarm:"",
+ InStock:"",
},
RGV03: {
Automatic: "",
@@ -1470,6 +1494,7 @@
DeviceName: "",
DeviceCode: "RGV03",
Alarm:"",
+ InStock:"",
},
formRGV: {
TaskType: "",
@@ -1647,7 +1672,7 @@
},
created() {
eventBus.on('stackerData', eventData => {
-
+
const stackerComponentsMap = {
"SC01": 'stacker1',
"SC02": 'stacker2',
@@ -1666,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);
});
@@ -1685,6 +1715,12 @@
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;
@@ -1693,6 +1729,11 @@
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;
@@ -1701,6 +1742,11 @@
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