From 2190be42c0d77be84fed82d387f2a34da7fe4acc Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期四, 07 八月 2025 16:17:07 +0800
Subject: [PATCH] 1
---
项目代码/WCS/WIDESEAWCS_Client/src/views/Home.vue | 242 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 202 insertions(+), 40 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 113d024..2e9ad25 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"
@@ -63,9 +63,9 @@
<el-col :span="8">
<div class="line-container">
<div class="RGVline"></div>
- <div :class="updateRGVOne()" :style="{ marginTop: RGV01.LevelPoint + 'px' }"
+ <div :class="updateRGVOne()" :style="{ transform: `translateY(${1280-RGV01.LevelPoint*0.00303627639+50}px)` }"
@click="mouseClickRGVFirst">1</div>
- <div :class="updateRGVTwo()" :style="{ marginTop: 1000 + 'px' }" @click="mouseClickSecond">2
+ <div :class="updateRGVTwo()" :style="{ transform: `translateY(${1280-RGV02.LevelPoint*0.00374041519+100}px)` }" @click="mouseClickSecond">2
</div>
</div>
</el-col>
@@ -88,7 +88,7 @@
url="api/Equipment/GetLineInfoByNo" />
</div>
</div>
- <div style="margin-top: 115px;"></div>
+ <div style="margin-top: 50px;"></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: 50px;"></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"
@@ -164,9 +164,8 @@
<el-row :gutter="20" class="cardWidthrow">
<el-col :span="12">
<div>
-
- <el-row :gutter="20" style="height:1000px;margin-top:50px;">
- <span style="position: relative; top: 150px;left: 30px;">绗簩灞�</span>
+ <el-row :gutter="20" style="height:1000px;margin-top:10px;">
+ <span style="position: relative; top: 100px;left: 30px;">绗簩灞�</span>
<div>
<div v-for="(group, index) in groupedLines(linescopy13)" :key="index">
<div class="positionY-group">
@@ -180,7 +179,7 @@
<div class="line-containerThird">
<div class="lineThird"></div>
<div :class="updateRGVThird()"
- :style="{ transform: `translateX(${RGV03.LevelPoint}px)`, marginTop: '3px' }"
+ :style="{ transform: `translateX(${1280-RGV03.LevelPoint*0.003397667+200}px)`, marginTop: '3px' }"
@click="mouseClickThird">3</div>
</div>
<div style="margin-top:180px;margin-right:100px">
@@ -265,14 +264,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>
@@ -385,14 +440,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>
@@ -505,14 +616,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>
@@ -605,14 +750,14 @@
}, {
equipNo: "2002",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 8,
condition: false,
},
{
equipNo: "2001",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 8,
condition: false,
},
@@ -620,14 +765,14 @@
{
equipNo: "2004",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 20,
condition: false,
},
{
equipNo: "2003",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 20,
condition: false,
},
@@ -656,6 +801,13 @@
condition: false,
},
{
+ equipNo: "1025",
+ imgType: "1",
+ positionX: 0.6,
+ positionY: 21,
+ condition: false,
+ },
+ {
equipNo: "1012",
imgType: "1",
positionX: 0.6,
@@ -664,28 +816,28 @@
}, {
equipNo: "2006",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 8,
condition: false,
},
{
equipNo: "2005",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 8,
condition: false,
},
{
equipNo: "2008",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 20,
condition: false,
},
{
equipNo: "2007",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 20,
condition: false,
},
@@ -714,6 +866,13 @@
condition: false,
},
{
+ equipNo: "1026",
+ imgType: "1",
+ positionX: 0.6,
+ positionY: 21,
+ condition: false,
+ },
+ {
equipNo: "1020",
imgType: "1",
positionX: 0.6,
@@ -722,28 +881,28 @@
}, {
equipNo: "2010",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 8,
condition: false,
},
{
equipNo: "2009",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 8,
condition: false,
},
{
equipNo: "2012",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 20,
condition: false,
},
{
equipNo: "2011",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 20,
condition: false,
},
@@ -780,28 +939,28 @@
}, {
equipNo: "2014",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 8,
condition: false,
},
{
equipNo: "2013",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 8,
condition: false,
},
{
equipNo: "2016",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 20,
condition: false,
},
{
equipNo: "2015",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 20,
condition: false,
},
@@ -838,28 +997,28 @@
}, {
equipNo: "2018",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 8,
condition: false,
},
{
equipNo: "2017",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 8,
condition: false,
},
{
equipNo: "2020",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 20,
condition: false,
},
{
equipNo: "2019",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 20,
condition: false,
},
@@ -896,28 +1055,28 @@
}, {
equipNo: "2022",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 8,
condition: false,
},
{
equipNo: "2021",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 8,
condition: false,
},
{
equipNo: "2024",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 20,
condition: false,
},
{
equipNo: "2023",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 20,
condition: false,
},
@@ -1522,6 +1681,7 @@
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;
@@ -1531,6 +1691,7 @@
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;
} else if (x.data.deviceCode == "RGV03") {
this.RGV03.Automatic = x.data.automatic == null ? "鏁呴殰" : x.data.automatic;
@@ -1538,6 +1699,7 @@
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;
}
@@ -1585,7 +1747,7 @@
margin-bottom: 10px;
} */
.title {
- height: 1500px;
+ height: 1800px;
}
.cardWidth {
@@ -1595,7 +1757,7 @@
}
.cardWidthrow {
- height: 40%;
+ height: 00%;
width: 100%;
/* margin-top: 10px; */
box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);
--
Gitblit v1.9.3