From 1a753029ba8f3848af692beb7c1f75b9f2c3b51f Mon Sep 17 00:00:00 2001 From: dell Date: Thu, 17 Oct 2024 09:51:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=85=B4=E4=B8=8A=E4=BC=A0=E7=89=88?= =?UTF-8?q?=E6=9C=AC=20=E7=BD=91=E7=BB=9C=E7=8A=B6=E6=80=81=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=AE=97=E6=B3=95=E6=9C=8D=E5=8A=A1=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/PenMeiNetWorkStateNew/Index.cshtml | 605 ++++++++++-------- 1 file changed, 330 insertions(+), 275 deletions(-) diff --git a/HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiNetWorkStateNew/Index.cshtml b/HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiNetWorkStateNew/Index.cshtml index 1089c19..157aba6 100644 --- a/HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiNetWorkStateNew/Index.cshtml +++ b/HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiNetWorkStateNew/Index.cshtml @@ -566,7 +566,7 @@ var dev2att = devlist.filter(item => item.DeviceName === "dev2")[0]; const image_appserver3d = new LeaferUI.Image({ id: "dev2", - x: 800, + x: 800-200, y: 35, url: '/imagesnet/应用服务器.png', draggable: draggable_dev, @@ -574,7 +574,7 @@ height: 160, }) var image_3d_name = new LeaferUI.Text({ - x: 800, + x: 800-200, y: 35 + 140 + 10, width: 134, fill: fill_top_name, @@ -587,7 +587,7 @@ }) group.add(image_3d_name) var image_3d_address = new LeaferUI.Text({ - x: 800, + x: 800-200, y: 35 + 140 + 25, width: 134, fill: fill_top_name, @@ -601,7 +601,7 @@ group.add(image_3d_address) const line12 = new LeaferUI.Line({ id: 'line_' + dev2att.DeviceName, - points: [800 + 75, 210, 875, 310], + points: [800-200 + 75, 210, 875, 310], strokeWidth: 2, stroke: '#cecece', shadow: { @@ -626,6 +626,60 @@ // fontSize: 12 // }) // group.add(line12_name); + + + var dev10att = devlist.filter(item => item.DeviceName === "dev10")[0]; + const image_appserversf = new LeaferUI.Image({ + id: "dev10", + x: 800+200, + y: 35, + url: '/imagesnet/应用服务器.png', + draggable: draggable_dev, + width: 134, + height: 160, + }) + var image_sf_name = new LeaferUI.Text({ + x: 800+200, + y: 35 + 140 + 10, + width: 134, + fill: fill_top_name, + text: dev10att.DeviceDESCRIPTION, + textAlign: 'center', + verticalAlign: 'middle', + textWrap: 'none', + padding: 0, + fontSize: 12 + }) + group.add(image_sf_name) + var image_sf_address = new LeaferUI.Text({ + x: 800+200, + y: 35 + 140 + 25, + width: 134, + fill: fill_top_name, + text: dev10att.DeviceIP, + textAlign: 'center', + verticalAlign: 'middle', + textWrap: 'none', + padding: 0, + fontSize: 12 + }) + group.add(image_sf_address) + const line110 = new LeaferUI.Line({ + id: 'line_' + dev10att.DeviceName, + points: [800+200 + 75, 210, 875, 310], + strokeWidth: 2, + stroke: '#cecece', + shadow: { + x: 0, + y: 0, + blur: 1, + color: '#cecece', + visible: true, + } + }) + group.add(line110); + + var dev9att = devlist.filter(item => item.DeviceName === "dev9")[0]; const image_computer = new LeaferUI.Image({ id: "dev9", @@ -1043,279 +1097,279 @@ // fontSize: 12 // }) // group.add(line34_name); - var dev4att = devlist.filter(item => item.DeviceName === "dev4")[0]; - const image_cet1 = new LeaferUI.Image({ - id: "dev4", - x: 200, - y: 150 + 500 + 250, - url: '/imagesnet/PLC.png', - draggable: draggable_dev, - width: 134, - height: 160, - }) - var image_cet1_name = new LeaferUI.Text({ - x: 200, - y: 150 + 500 + 140 + 10 + 250, - width: 134, - fill: fill_top_name, - text: dev4att.DeviceDESCRIPTION, - textAlign: 'center', - verticalAlign: 'middle', - textWrap: 'none', - padding: 0, - fontSize: 12 - }) - group.add(image_cet1_name) - var image_cet1_address = new LeaferUI.Text({ - x: 200, - y: 150 + 500 + 140 + 25 + 250, - width: 134, - fill: fill_top_name, - text: dev4att.DeviceIP, - textAlign: 'center', - verticalAlign: 'middle', - textWrap: 'none', - padding: 0, - fontSize: 12 - }) - group.add(image_cet1_address) - const line41 = new LeaferUI.Line({ - id: 'line_' + dev4att.DeviceName, - points: [200 + 75, 650 + 250, 875, 520 + 300], - //[-200 + 75, 650, 875, 520], - // points: [634, 725, 800, 725], - strokeWidth: 2, - stroke: '#cecece', - shadow: { - x: 0, - y: 0, - blur: 1, - color: '#cecece', - visible: true, - } - }) - group.add(line41); - // var line41_name = new LeaferUI.Text({ - // x: -200+75, - // y: (650+250 - 520 -300) / 2 + 520+300, - // width: 50, + // var dev4att = devlist.filter(item => item.DeviceName === "dev4")[0]; + // const image_cet1 = new LeaferUI.Image({ + // id: "dev4", + // x: 200, + // y: 150 + 500 + 250, + // url: '/imagesnet/PLC.png', + // draggable: draggable_dev, + // width: 134, + // height: 160, + // }) + // var image_cet1_name = new LeaferUI.Text({ + // x: 200, + // y: 150 + 500 + 140 + 10 + 250, + // width: 134, // fill: fill_top_name, - // text: 'EL09', + // text: dev4att.DeviceDESCRIPTION, // textAlign: 'center', // verticalAlign: 'middle', // textWrap: 'none', // padding: 0, // fontSize: 12 // }) - // group.add(line41_name); - var dev5att = devlist.filter(item => item.DeviceName === "dev5")[0]; - const image_cet2 = new LeaferUI.Image({ - id: "dev5", - x: 500, - y: 150 + 500 + 250, - url: '/imagesnet/PLC.png', - draggable: draggable_dev, - width: 134, - height: 160, - }) - var image_cet2_name = new LeaferUI.Text({ - x: 500, - y: 150 + 500 + 140 + 10 + 250, - width: 134, - fill: fill_top_name, - text: dev5att.DeviceDESCRIPTION, - textAlign: 'center', - verticalAlign: 'middle', - textWrap: 'none', - padding: 0, - fontSize: 12 - }) - group.add(image_cet2_name) - var image_cet2_address = new LeaferUI.Text({ - x: 500, - y: 150 + 500 + 140 + 25 + 250, - width: 134, - fill: fill_top_name, - text: dev5att.DeviceIP, - textAlign: 'center', - verticalAlign: 'middle', - textWrap: 'none', - padding: 0, - fontSize: 12 - }) - group.add(image_cet2_address) - const line42 = new LeaferUI.Line({ - id: 'line_' + dev5att.DeviceName, - points: [500 + 75, 650 + 250, 875, 520 + 300], - //[-200 + 75, 650, 875, 520], - // points: [634, 725, 800, 725], - strokeWidth: 2, - stroke: '#cecece', - shadow: { - x: 0, - y: 0, - blur: 1, - color: '#cecece', - visible: true, - } - }) - group.add(line42); - var dev6att = devlist.filter(item => item.DeviceName === "dev6")[0]; - const image_cet3 = new LeaferUI.Image({ - id: "dev6", - x: 800, - y: 150 + 500 + 250, - url: '/imagesnet/PLC.png', - draggable: draggable_dev, - width: 134, - height: 160, - }) - var image_cet3_name = new LeaferUI.Text({ - x: 800, - y: 150 + 500 + 140 + 10 + 250, - width: 134, - fill: fill_top_name, - text: dev6att.DeviceDESCRIPTION, - textAlign: 'center', - verticalAlign: 'middle', - textWrap: 'none', - padding: 0, - fontSize: 12 - }) - group.add(image_cet3_name) - var image_cet3_address = new LeaferUI.Text({ - x: 800, - y: 150 + 500 + 140 + 25 + 250, - width: 134, - fill: fill_top_name, - text: dev6att.DeviceIP, - textAlign: 'center', - verticalAlign: 'middle', - textWrap: 'none', - padding: 0, - fontSize: 12 - }) - group.add(image_cet3_address) - const line43 = new LeaferUI.Line({ - id: 'line_' + dev6att.DeviceName, - points: [800 + 75, 650 + 250, 875, 520 + 300], - //[-200 + 75, 650, 875, 520], - // points: [634, 725, 800, 725], - strokeWidth: 2, - stroke: '#cecece', - shadow: { - x: 0, - y: 0, - blur: 1, - color: '#cecece', - visible: true, - } - }) - group.add(line43); - var dev7att = devlist.filter(item => item.DeviceName === "dev7")[0]; - const image_cet4 = new LeaferUI.Image({ - id: "dev7", - x: 1100, - y: 150 + 500 + 250, - url: '/imagesnet/PLC.png', - draggable: draggable_dev, - width: 134, - height: 160, - }) - var image_cet4_name = new LeaferUI.Text({ - x: 1100, - y: 150 + 500 + 140 + 10 + 250, - width: 134, - fill: fill_top_name, - text: dev7att.DeviceDESCRIPTION, - textAlign: 'center', - verticalAlign: 'middle', - textWrap: 'none', - padding: 0, - fontSize: 12 - }) - group.add(image_cet4_name) - var image_cet4_address = new LeaferUI.Text({ - x: 1100, - y: 150 + 500 + 140 + 25 + 250, - width: 134, - fill: fill_top_name, - text: dev7att.DeviceIP, - textAlign: 'center', - verticalAlign: 'middle', - textWrap: 'none', - padding: 0, - fontSize: 12 - }) - group.add(image_cet4_address) - const line44 = new LeaferUI.Line({ - id: 'line_' + dev7att.DeviceName, - points: [1100 + 75, 650 + 250, 875, 520 + 300], - //[-200 + 75, 650, 875, 520], - // points: [634, 725, 800, 725], - strokeWidth: 2, - stroke: '#cecece', - shadow: { - x: 0, - y: 0, - blur: 1, - color: '#cecece', - visible: true, - } - }) - group.add(line44); - var dev8att = devlist.filter(item => item.DeviceName === "dev8")[0]; - const image_cet5 = new LeaferUI.Image({ - id: "dev8", - x: 1400, - y: 150 + 500 + 250, - url: '/imagesnet/PLC.png', - draggable: draggable_dev, - width: 134, - height: 160, - }) - var image_cet5_name = new LeaferUI.Text({ - x: 1400, - y: 150 + 500 + 140 + 10 + 250, - width: 134, - fill: fill_top_name, - text: dev8att.DeviceDESCRIPTION, - textAlign: 'center', - verticalAlign: 'middle', - textWrap: 'none', - padding: 0, - fontSize: 12 - }) - group.add(image_cet5_name) - var image_cet5_address = new LeaferUI.Text({ - x: 1400, - y: 150 + 500 + 140 + 25 + 250, - width: 134, - fill: fill_top_name, - text: dev8att.DeviceIP, - textAlign: 'center', - verticalAlign: 'middle', - textWrap: 'none', - padding: 0, - fontSize: 12 - }) - group.add(image_cet5_address) - const line45 = new LeaferUI.Line({ - id: 'line_' + dev8att.DeviceName, - points: [1400 + 75, 650 + 250, 875, 520 + 300], - //[-200 + 75, 650, 875, 520], - // points: [634, 725, 800, 725], - strokeWidth: 2, - stroke: '#cecece', - shadow: { - x: 0, - y: 0, - blur: 1, - color: '#cecece', - visible: true, - } - }) - group.add(line45); + // group.add(image_cet1_name) + // var image_cet1_address = new LeaferUI.Text({ + // x: 200, + // y: 150 + 500 + 140 + 25 + 250, + // width: 134, + // fill: fill_top_name, + // text: dev4att.DeviceIP, + // textAlign: 'center', + // verticalAlign: 'middle', + // textWrap: 'none', + // padding: 0, + // fontSize: 12 + // }) + // group.add(image_cet1_address) + // const line41 = new LeaferUI.Line({ + // id: 'line_' + dev4att.DeviceName, + // points: [200 + 75, 650 + 250, 875, 520 + 300], + // //[-200 + 75, 650, 875, 520], + // // points: [634, 725, 800, 725], + // strokeWidth: 2, + // stroke: '#cecece', + // shadow: { + // x: 0, + // y: 0, + // blur: 1, + // color: '#cecece', + // visible: true, + // } + // }) + // group.add(line41); + // // var line41_name = new LeaferUI.Text({ + // // x: -200+75, + // // y: (650+250 - 520 -300) / 2 + 520+300, + // // width: 50, + // // fill: fill_top_name, + // // text: 'EL09', + // // textAlign: 'center', + // // verticalAlign: 'middle', + // // textWrap: 'none', + // // padding: 0, + // // fontSize: 12 + // // }) + // // group.add(line41_name); + // var dev5att = devlist.filter(item => item.DeviceName === "dev5")[0]; + // const image_cet2 = new LeaferUI.Image({ + // id: "dev5", + // x: 500, + // y: 150 + 500 + 250, + // url: '/imagesnet/PLC.png', + // draggable: draggable_dev, + // width: 134, + // height: 160, + // }) + // var image_cet2_name = new LeaferUI.Text({ + // x: 500, + // y: 150 + 500 + 140 + 10 + 250, + // width: 134, + // fill: fill_top_name, + // text: dev5att.DeviceDESCRIPTION, + // textAlign: 'center', + // verticalAlign: 'middle', + // textWrap: 'none', + // padding: 0, + // fontSize: 12 + // }) + // group.add(image_cet2_name) + // var image_cet2_address = new LeaferUI.Text({ + // x: 500, + // y: 150 + 500 + 140 + 25 + 250, + // width: 134, + // fill: fill_top_name, + // text: dev5att.DeviceIP, + // textAlign: 'center', + // verticalAlign: 'middle', + // textWrap: 'none', + // padding: 0, + // fontSize: 12 + // }) + // group.add(image_cet2_address) + // const line42 = new LeaferUI.Line({ + // id: 'line_' + dev5att.DeviceName, + // points: [500 + 75, 650 + 250, 875, 520 + 300], + // //[-200 + 75, 650, 875, 520], + // // points: [634, 725, 800, 725], + // strokeWidth: 2, + // stroke: '#cecece', + // shadow: { + // x: 0, + // y: 0, + // blur: 1, + // color: '#cecece', + // visible: true, + // } + // }) + // group.add(line42); + // var dev6att = devlist.filter(item => item.DeviceName === "dev6")[0]; + // const image_cet3 = new LeaferUI.Image({ + // id: "dev6", + // x: 800, + // y: 150 + 500 + 250, + // url: '/imagesnet/PLC.png', + // draggable: draggable_dev, + // width: 134, + // height: 160, + // }) + // var image_cet3_name = new LeaferUI.Text({ + // x: 800, + // y: 150 + 500 + 140 + 10 + 250, + // width: 134, + // fill: fill_top_name, + // text: dev6att.DeviceDESCRIPTION, + // textAlign: 'center', + // verticalAlign: 'middle', + // textWrap: 'none', + // padding: 0, + // fontSize: 12 + // }) + // group.add(image_cet3_name) + // var image_cet3_address = new LeaferUI.Text({ + // x: 800, + // y: 150 + 500 + 140 + 25 + 250, + // width: 134, + // fill: fill_top_name, + // text: dev6att.DeviceIP, + // textAlign: 'center', + // verticalAlign: 'middle', + // textWrap: 'none', + // padding: 0, + // fontSize: 12 + // }) + // group.add(image_cet3_address) + // const line43 = new LeaferUI.Line({ + // id: 'line_' + dev6att.DeviceName, + // points: [800 + 75, 650 + 250, 875, 520 + 300], + // //[-200 + 75, 650, 875, 520], + // // points: [634, 725, 800, 725], + // strokeWidth: 2, + // stroke: '#cecece', + // shadow: { + // x: 0, + // y: 0, + // blur: 1, + // color: '#cecece', + // visible: true, + // } + // }) + // group.add(line43); + // var dev7att = devlist.filter(item => item.DeviceName === "dev7")[0]; + // const image_cet4 = new LeaferUI.Image({ + // id: "dev7", + // x: 1100, + // y: 150 + 500 + 250, + // url: '/imagesnet/PLC.png', + // draggable: draggable_dev, + // width: 134, + // height: 160, + // }) + // var image_cet4_name = new LeaferUI.Text({ + // x: 1100, + // y: 150 + 500 + 140 + 10 + 250, + // width: 134, + // fill: fill_top_name, + // text: dev7att.DeviceDESCRIPTION, + // textAlign: 'center', + // verticalAlign: 'middle', + // textWrap: 'none', + // padding: 0, + // fontSize: 12 + // }) + // group.add(image_cet4_name) + // var image_cet4_address = new LeaferUI.Text({ + // x: 1100, + // y: 150 + 500 + 140 + 25 + 250, + // width: 134, + // fill: fill_top_name, + // text: dev7att.DeviceIP, + // textAlign: 'center', + // verticalAlign: 'middle', + // textWrap: 'none', + // padding: 0, + // fontSize: 12 + // }) + // group.add(image_cet4_address) + // const line44 = new LeaferUI.Line({ + // id: 'line_' + dev7att.DeviceName, + // points: [1100 + 75, 650 + 250, 875, 520 + 300], + // //[-200 + 75, 650, 875, 520], + // // points: [634, 725, 800, 725], + // strokeWidth: 2, + // stroke: '#cecece', + // shadow: { + // x: 0, + // y: 0, + // blur: 1, + // color: '#cecece', + // visible: true, + // } + // }) + // group.add(line44); + // var dev8att = devlist.filter(item => item.DeviceName === "dev8")[0]; + // const image_cet5 = new LeaferUI.Image({ + // id: "dev8", + // x: 1400, + // y: 150 + 500 + 250, + // url: '/imagesnet/PLC.png', + // draggable: draggable_dev, + // width: 134, + // height: 160, + // }) + // var image_cet5_name = new LeaferUI.Text({ + // x: 1400, + // y: 150 + 500 + 140 + 10 + 250, + // width: 134, + // fill: fill_top_name, + // text: dev8att.DeviceDESCRIPTION, + // textAlign: 'center', + // verticalAlign: 'middle', + // textWrap: 'none', + // padding: 0, + // fontSize: 12 + // }) + // group.add(image_cet5_name) + // var image_cet5_address = new LeaferUI.Text({ + // x: 1400, + // y: 150 + 500 + 140 + 25 + 250, + // width: 134, + // fill: fill_top_name, + // text: dev8att.DeviceIP, + // textAlign: 'center', + // verticalAlign: 'middle', + // textWrap: 'none', + // padding: 0, + // fontSize: 12 + // }) + // group.add(image_cet5_address) + // const line45 = new LeaferUI.Line({ + // id: 'line_' + dev8att.DeviceName, + // points: [1400 + 75, 650 + 250, 875, 520 + 300], + // //[-200 + 75, 650, 875, 520], + // // points: [634, 725, 800, 725], + // strokeWidth: 2, + // stroke: '#cecece', + // shadow: { + // x: 0, + // y: 0, + // blur: 1, + // color: '#cecece', + // visible: true, + // } + // }) + // group.add(line45); //group.add(image_cpu) @@ -1331,12 +1385,13 @@ group.add(image_appserver) // group.add(image_appserver2d) group.add(image_appserver3d) + group.add(image_appserversf) - group.add(image_cet1) - group.add(image_cet2) - group.add(image_cet3) - group.add(image_cet4) - group.add(image_cet5) + // group.add(image_cet1) + // group.add(image_cet2) + // group.add(image_cet3) + // group.add(image_cet4) + // group.add(image_cet5) //32IO配置项 const top_row_height_32bit = 25;