初步完成多进多出 线号标签

HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiNetWorkStateNew/Index.cshtml

@@ -259,7 +259,7 @@
 		var b14 = false;
 		var b21 = true;
 		var b31 = true;
-		var b32 = false;
+		var b32 = true;
 		var b33 = true;
 		var b34 = true;
 		var b35 = false;
@@ -333,7 +333,7 @@
 				width: 30,
 				height: 30,
 			})
-			group.add(false32)
+			//group.add(false32)
 
 			const f35 = new LeaferUI.Line({
 				id: 'line35',
@@ -406,7 +406,19 @@
 			}
 		})
 		group.add(line11);
-
+		var line11_name = new LeaferUI.Text({
+			x: (875-350-75)/2+350+75,
+			y: (310-210)/2+210,
+			width: 50,
+			fill: fill_top_name,
+			text: 'EL01',
+			textAlign: 'center',
+			verticalAlign: 'middle',
+			textWrap: 'none',
+			padding: 0,
+			fontSize: 12
+		})
+		group.add(line11_name);
 
 		const image_appserver = new LeaferUI.Image({
 			x: 650,
@@ -456,6 +468,19 @@
 			}
 		})
 		group.add(line12);
+		var line12_name = new LeaferUI.Text({
+			x: (875 - 650 - 75) / 2 + 650 + 75,
+			y: (310 - 210) / 2 + 210,
+			width: 50,
+			fill: fill_top_name,
+			text: 'EL02',
+			textAlign: 'center',
+			verticalAlign: 'middle',
+			textWrap: 'none',
+			padding: 0,
+			fontSize: 12
+		})
+		group.add(line12_name);
 
 		const image_appserver3d = new LeaferUI.Image({
 			x: 950,
@@ -505,6 +530,19 @@
 			}
 		})
 		group.add(line13);
+		var line13_name = new LeaferUI.Text({
+			x: (950 + 75 - 875) / 2 + 875,
+			y: (310 - 210) / 2 + 210,
+			width: 50,
+			fill: fill_top_name,
+			text: 'EL03',
+			textAlign: 'center',
+			verticalAlign: 'middle',
+			textWrap: 'none',
+			padding: 0,
+			fontSize: 12
+		})
+		group.add(line13_name);
 
 		const image_appserver2d = new LeaferUI.Image({
 			x: 1250,
@@ -554,7 +592,19 @@
 			}
 		})
 		group.add(line14);
-
+		var line14_name = new LeaferUI.Text({
+			x: (1250 + 75 - 875) / 2 + 875,
+			y: (310 - 210) / 2 + 210,
+			width: 50,
+			fill: fill_top_name,
+			text: 'EL04',
+			textAlign: 'center',
+			verticalAlign: 'middle',
+			textWrap: 'none',
+			padding: 0,
+			fontSize: 12
+		})
+		group.add(line14_name);
 
 		const image_exchange = new LeaferUI.Image({
 			x: 800,
@@ -639,7 +689,19 @@
 			}
 		})
 		group.add(line21);
-
+		var line21_name = new LeaferUI.Text({
+			x: (1300-945) / 2 + 945,
+			y: (400-400) / 2 + 400,
+			width: 50,
+			fill: fill_top_name,
+			text: 'EL05',
+			textAlign: 'center',
+			verticalAlign: 'middle',
+			textWrap: 'none',
+			padding: 0,
+			fontSize: 12
+		})
+		group.add(line21_name);
 
 		
 		const image_PLC = new LeaferUI.Image({
@@ -690,7 +752,19 @@
 			}
 		})
 		group.add(line31);
-
+		var line31_name = new LeaferUI.Text({
+			x: (875-200-75) / 2 + 200+75,
+			y: (650 - 520) / 2 + 520,
+			width: 50,
+			fill: fill_top_name,
+			text: 'EL06',
+			textAlign: 'center',
+			verticalAlign: 'middle',
+			textWrap: 'none',
+			padding: 0,
+			fontSize: 12
+		})
+		group.add(line31_name);
 
 		const image_PLC2 = new LeaferUI.Image({
 			x: 500,
@@ -705,7 +779,7 @@
 			y: 150 + 500+140+10,
 			width: 134,
 			fill: fill_top_name,
-			text: 'S7 300',
+			text: '子站#1 ET200',
 			textAlign: 'center',
 			verticalAlign: 'middle',
 			textWrap: 'none',
@@ -728,7 +802,8 @@
 		group.add(image_PLC2_address)
 		const line32 = new LeaferUI.Line({
 			id: 'line32',
-			points: [500 + 75, 650, 875, 520],
+			//points: [500 + 75, 650, 875, 520],
+			points: [334, 725, 500, 725],
 			strokeWidth: 2,
 			stroke: '#cecece',
 			shadow: {
@@ -740,7 +815,19 @@
 			}
 		})
 		group.add(line32);
-
+		var line32_name = new LeaferUI.Text({
+			x: (500-334) / 2 + 334,
+			y: (725-725) / 2 + 725-5,
+			width: 50,
+			fill: fill_top_name,
+			text: 'EL07',
+			textAlign: 'center',
+			verticalAlign: 'middle',
+			textWrap: 'none',
+			padding: 0,
+			fontSize: 12
+		})
+		group.add(line32_name);
 
 		const image_et = new LeaferUI.Image({
 			x: 800,
@@ -755,7 +842,7 @@
 			y: 150 + 500 + 140 + 10,
 			width: 134,
 			fill: fill_top_name,
-			text: '子站#1 ET200',
+			text: '子站#2 ET200',
 			textAlign: 'center',
 			verticalAlign: 'middle',
 			textWrap: 'none',
@@ -778,7 +865,8 @@
 		group.add(image_et_address)
 		const line33 = new LeaferUI.Line({
 			id: 'line33',
-			points: [800 + 75, 650, 875, 520],
+			//points: [800 + 75, 650, 875, 520],
+			points: [634, 725, 800, 725],
 			strokeWidth: 2,
 			stroke: '#cecece',
 			shadow: {
@@ -790,7 +878,19 @@
 			}
 		})
 		group.add(line33);
-
+		var line33_name = new LeaferUI.Text({
+			x: (800 - 634) / 2 + 634,
+			y: (725 - 725) / 2 + 725-5,
+			width: 50,
+			fill: fill_top_name,
+			text: 'EL08',
+			textAlign: 'center',
+			verticalAlign: 'middle',
+			textWrap: 'none',
+			padding: 0,
+			fontSize: 12
+		})
+		group.add(line33_name);
 
 		const image_et2 = new LeaferUI.Image({
 			x: 1100,
@@ -805,7 +905,7 @@
 			y: 150 + 500 + 140 + 10,
 			width: 134,
 			fill: fill_top_name,
-			text: '子站#2 S7 200',
+			text: 'S7 300',
 			textAlign: 'center',
 			verticalAlign: 'middle',
 			textWrap: 'none',
@@ -840,7 +940,19 @@
 			}
 		})
 		group.add(line34);
-
+		var line34_name = new LeaferUI.Text({
+			x: (1100+75-875) / 2 + 875,
+			y: (650 - 520) / 2 + 520,
+			width: 50,
+			fill: fill_top_name,
+			text: 'EL09',
+			textAlign: 'center',
+			verticalAlign: 'middle',
+			textWrap: 'none',
+			padding: 0,
+			fontSize: 12
+		})
+		group.add(line34_name);
 
 		const image_computer = new LeaferUI.Image({
 			x: 1400,
@@ -890,7 +1002,19 @@
 			}
 		})
 		group.add(line35);
-
+		var line35_name = new LeaferUI.Text({
+			x: (1400 + 75 - 875) / 2 + 875,
+			y: (650 - 520) / 2 + 520,
+			width: 50,
+			fill: fill_top_name,
+			text: 'EL10',
+			textAlign: 'center',
+			verticalAlign: 'middle',
+			textWrap: 'none',
+			padding: 0,
+			fontSize: 12
+		})
+		group.add(line35_name);