RuiShengZhiNeng/AoTanSiWCS.git

			@@ -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"
			@@ -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>
			@@ -742,14 +750,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,
			},
			@@ -757,14 +765,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,
			},
			@@ -793,6 +801,13 @@
			condition: false,
			},
			{
			equipNo: "1025",
			imgType: "1",
			positionX: 0.6,
			positionY: 21,
			condition: false,
			},
			{
			equipNo: "1012",
			imgType: "1",
			positionX: 0.6,
			@@ -801,28 +816,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,
			},
			@@ -851,6 +866,13 @@
			condition: false,
			},
			{
			equipNo: "1026",
			imgType: "1",
			positionX: 0.6,
			positionY: 21,
			condition: false,
			},
			{
			equipNo: "1020",
			imgType: "1",
			positionX: 0.6,
			@@ -859,28 +881,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,
			},
			@@ -917,28 +939,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,
			},
			@@ -975,28 +997,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,
			},
			@@ -1033,28 +1055,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,
			},
			@@ -1644,6 +1666,7 @@
			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;

			this.$nextTick(() => {
			@@ -1659,6 +1682,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 +1692,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 +1700,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;
			}