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 | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 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 7b1edcd..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" @@ -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" @@ -290,6 +290,8 @@ <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> @@ -323,6 +325,8 @@ <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> @@ -462,6 +466,8 @@ <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> @@ -495,6 +501,8 @@ <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> @@ -793,6 +801,13 @@ condition: false, }, { + equipNo: "1025", + imgType: "1", + positionX: 0.6, + positionY: 21, + condition: false, + }, + { equipNo: "1012", imgType: "1", positionX: 0.6, @@ -848,6 +863,13 @@ imgType: "1", positionX: 0.6, positionY: 20, + condition: false, + }, + { + equipNo: "1026", + imgType: "1", + positionX: 0.6, + positionY: 21, condition: false, }, { @@ -1659,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; @@ -1668,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; @@ -1675,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; } -- Gitblit v1.9.3