mirror of
https://git.rwth-aachen.de/acs/public/villas/web/
synced 2025-03-09 00:00:01 +01:00
Add last changes
This commit is contained in:
Markus Grigull
parent
a860811240
commit
5e07229f3f
11 changed files with 94 additions and 112 deletions
|
|
@ -7,6 +7,8 @@ export default Ember.Controller.extend({
|
|||
|
||||
freq575Value: 0,
|
||||
|
||||
_waitForStateUpdate: false,
|
||||
|
||||
init: function() {
|
||||
this.set('state', 1);
|
||||
|
||||
|
|
|
|||
|
|
@ -61,29 +61,29 @@ header {
|
|||
color: #103B7D;
|
||||
background-color: #fff;
|
||||
|
||||
height: 100px;
|
||||
height: 60px;
|
||||
top: 0;
|
||||
|
||||
border-bottom: 3px solid #bbb;
|
||||
}
|
||||
|
||||
header #title {
|
||||
font-size: 35px;
|
||||
font-size: 25px;
|
||||
font-weight: 100;
|
||||
text-align: left;
|
||||
text-rendering: optimizeLegibility;
|
||||
-webkit-text-rendering: optimizeLegiblity;
|
||||
-moz-text-rendering: optimizeLegibitliy;
|
||||
|
||||
padding: 10px 0 20px 30px;
|
||||
padding: 15px 0 20px 30px;
|
||||
|
||||
float: left;
|
||||
}
|
||||
|
||||
header #logos {
|
||||
height: 100px;
|
||||
height: 60px;
|
||||
|
||||
padding-top: 10px;
|
||||
padding-top: 15px;
|
||||
|
||||
float: right;
|
||||
}
|
||||
|
|
@ -100,21 +100,21 @@ footer {
|
|||
}
|
||||
|
||||
#main {
|
||||
top: 100px;
|
||||
bottom: 25px;
|
||||
top: 60px;
|
||||
bottom: 0px;
|
||||
|
||||
left: 20px;
|
||||
right: 20px;
|
||||
}
|
||||
|
||||
.svg-image {
|
||||
width: 120%;
|
||||
width: 80%;
|
||||
height: auto;
|
||||
}
|
||||
|
||||
.svg-logo {
|
||||
width: auto;
|
||||
height: 80px;
|
||||
height: 30px;
|
||||
|
||||
padding-right: 30px;
|
||||
|
||||
|
|
@ -122,19 +122,19 @@ footer {
|
|||
}
|
||||
|
||||
#rwth-logo {
|
||||
margin-top: 15px;
|
||||
margin-top: 10px;
|
||||
|
||||
height: 40px !important;
|
||||
height: 15px !important;
|
||||
}
|
||||
|
||||
#DS-image {
|
||||
width: auto;
|
||||
height: 300px;
|
||||
height: 405px;
|
||||
}
|
||||
|
||||
#TS-image {
|
||||
width: auto;
|
||||
height: 350px;
|
||||
height: 410px;
|
||||
}
|
||||
|
||||
h1 {
|
||||
|
|
@ -145,8 +145,7 @@ h1 {
|
|||
}
|
||||
|
||||
h2 {
|
||||
font-size: 1.3em;
|
||||
font-weight: bold;
|
||||
font-size: 1.2em;
|
||||
|
||||
text-align: left;
|
||||
|
||||
|
|
@ -154,7 +153,7 @@ h2 {
|
|||
}
|
||||
|
||||
h3 {
|
||||
font-size: 0.95em;
|
||||
font-size: 0.85em;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
|
|
@ -163,19 +162,18 @@ h4 {
|
|||
}
|
||||
|
||||
p {
|
||||
font-size: 0.85em;
|
||||
font-size: 0.65em;
|
||||
}
|
||||
|
||||
.gauge {
|
||||
padding-left: 20px;
|
||||
padding-top: 0px;
|
||||
padding-top: 20px;
|
||||
|
||||
float: left;
|
||||
}
|
||||
|
||||
.alarm {
|
||||
float: right;
|
||||
padding-left: 20px;
|
||||
padding-top: 20px;
|
||||
}
|
||||
|
||||
button {
|
||||
|
|
@ -183,20 +181,24 @@ button {
|
|||
color #FFF;
|
||||
background-color: #ccf;
|
||||
|
||||
font-size: 30px;
|
||||
font-size: 20px;
|
||||
font-weight: bold;
|
||||
|
||||
width: 250px;
|
||||
height: 50px;
|
||||
height: 80px;
|
||||
}
|
||||
|
||||
button:disabled {
|
||||
border: 3px solid gray;
|
||||
background-color: #ccc;
|
||||
border: 3px solid gray !important;
|
||||
background-color: #ccc !important;
|
||||
}
|
||||
|
||||
#init-button {
|
||||
|
||||
}
|
||||
|
||||
#event-button {
|
||||
border: 3px solid red;
|
||||
background-color: #fcc;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -209,8 +211,8 @@ button:disabled {
|
|||
margin: 0;
|
||||
/*padding: 0;*/
|
||||
|
||||
padding-top: 10px;
|
||||
padding-bottom: 10px;
|
||||
padding-top: 0px;
|
||||
padding-bottom: 0px;
|
||||
|
||||
border: 0;
|
||||
|
||||
|
|
@ -225,7 +227,7 @@ overflow: hidden;
|
|||
height: 50%;
|
||||
|
||||
/*padding: 20px 10px 20px 10px;*/
|
||||
padding: 10px;
|
||||
padding: 2px;
|
||||
|
||||
vertical-align: top;
|
||||
}
|
||||
|
|
@ -238,20 +240,21 @@ overflow: hidden;
|
|||
width: 100%;
|
||||
height: 100%;
|
||||
|
||||
padding: 20px;
|
||||
padding: 10px;
|
||||
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.layout-page h2 {
|
||||
text-align: center;
|
||||
|
||||
font-size: 1em;
|
||||
|
||||
margin: 0;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
|
||||
.layout-page h3 {
|
||||
text-align: center;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
.page-grid {
|
||||
|
|
|
|||
|
|
@ -1,22 +1,14 @@
|
|||
<section id="lapMashupApp">
|
||||
<header class="row">
|
||||
<div id="title">
|
||||
ERIC Lab
|
||||
<br />
|
||||
European Real-Time Integrated Co-Simulation Lab
|
||||
European Real-Time Integrated Co-Simulation Demo
|
||||
</div>
|
||||
<div id="logos">
|
||||
<img src={{"assets/images/EU.svg"}} class="svg-logo" />
|
||||
<img src={{"assets/images/RWTH.svg"}} class="svg-logo" id="rwth-logo" />
|
||||
<img src={{"assets/images/PoliTo.svg"}} class="svg-logo" />
|
||||
<img src={{"assets/images/flexmeter_logo.svg"}} class="svg-logo" />
|
||||
</div>
|
||||
</header>
|
||||
|
||||
{{outlet}}
|
||||
</section>
|
||||
|
||||
|
||||
<footer class="row">
|
||||
<p>© 2015 - Institute for Automation of Complex Power Systems</p>
|
||||
</footer>
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
<section class="row" id="main">
|
||||
<table class="grid">
|
||||
<tr>
|
||||
<td style="padding-top: 20px;">
|
||||
<td style="padding-top: 5px;">
|
||||
<div class="layout-page">
|
||||
<h2>Transmission system simulation</h2>
|
||||
<table class="page-grid">
|
||||
<tr style="height: 25%">
|
||||
<tr style="height: 15%">
|
||||
<td style="width: 25%" rowspan="2">
|
||||
<h3>
|
||||
Italy - Piedmont region
|
||||
|
|
@ -17,45 +18,42 @@
|
|||
{{/if}}
|
||||
</td>
|
||||
<td style="width: 50%; padding-left: 20px">
|
||||
<h2>Transmission system simulation</h2>
|
||||
|
||||
|
||||
</td>
|
||||
<td style="width: 25%">
|
||||
<img src={{"assets/images/TS_section/TS_fig1.svg"}} class="svg-image" style="float: right" />
|
||||
</td>
|
||||
</tr>
|
||||
<tr style="height: 75%">
|
||||
<tr style="height: 85%">
|
||||
<td style="width: 40%">
|
||||
<div style="padding-top: 0px">
|
||||
<p style="padding-left: 60px; padding-top: 30px;">
|
||||
Piedmont Region - Italy
|
||||
<ul>
|
||||
<li>Surface area: 25,4 km²</li>
|
||||
<li>Inhabitants: 4,45 m</li>
|
||||
</ul>
|
||||
|
||||
380-220kV transmission system:
|
||||
<ul>
|
||||
<li>90 buses, 20 generators and 110 lines</li>
|
||||
<li>Electric power capacity: 8458 MW</li>
|
||||
</ul>
|
||||
</p>
|
||||
|
||||
</div>
|
||||
</td>
|
||||
<td style="width: 35%">
|
||||
<h3>
|
||||
Frequency measuerement<br />
|
||||
at STURA substation
|
||||
</h3>
|
||||
{{d3-alarm value=freq575Value alarmZones=freq575AlarmZones}}
|
||||
{{d3-gauge label="Freq" value=freq575Value minValue=49 maxValue=51 minorTicks=4 size=180 greenZones=freq575GreenZones yellowZones=freq575YellowZones}}
|
||||
<p style="">
|
||||
Piedmont Region - Italy
|
||||
<ul>
|
||||
<li>Surface area: 25400 km²</li>
|
||||
<li>Inhabitants: 4.45 million</li>
|
||||
<li>Electric power capacity: 8458 MW</li>
|
||||
</ul>
|
||||
</p>
|
||||
<div style="padding-top: 40px;">
|
||||
{{d3-alarm value=freq575Value alarmZones=freq575AlarmZones}}
|
||||
{{d3-gauge label="Freq" value=freq575Value minValue=49 maxValue=51 minorTicks=4 size=120 greenZones=freq575GreenZones yellowZones=freq575YellowZones}}
|
||||
</div>
|
||||
<div style="width: 100%; margin-top: 150px">
|
||||
<h3 style="padding-left: 10px">
|
||||
Frequency measurement<br />
|
||||
at STURA substation
|
||||
</h3>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</td>
|
||||
<td style="padding-top: 20px;">
|
||||
<td style="padding-top: 5px;">
|
||||
<div class="layout-page">
|
||||
<table class="page-grid">
|
||||
<tr style="height: 25%">
|
||||
|
|
@ -70,7 +68,7 @@
|
|||
</tr>
|
||||
<tr style="height: 75%">
|
||||
<td style="width: 50%" colspan="2">
|
||||
<h3>
|
||||
<h3 style="text-align: center">
|
||||
Distribution grid monitoring
|
||||
<br />
|
||||
Voltage measurement
|
||||
|
|
@ -79,11 +77,11 @@
|
|||
{{line-chart data=Voltage203937 height="90%" xaxisLength=120 minValue=0.90 maxValue=1.05 label="RMS voltage [pu]"}}
|
||||
</td>
|
||||
<td style="width: 50%" colspan="2">
|
||||
<div style="position: relative; top: 25%; left: 30%">
|
||||
<button {{action 'resetData'}} disabled={{initState}} id="init-button">Reset</button>
|
||||
<div style="position: relative; top: 15%; left: 30%">
|
||||
<button {{action 'resetData'}} disabled={{initState}} id="init-button">NORMAL<br />sunny + low demand</button>
|
||||
</div>
|
||||
<div style="position: relative; top: 40%; left: 30%">
|
||||
<button {{action 'eventData'}} disabled={{eventState}} id="event-button">Event</button>
|
||||
<div style="position: relative; top: 30%; left: 30%">
|
||||
<button {{action 'eventData'}} disabled={{eventState}} id="event-button">ABNORMAL<br />cloudy + high demand</button>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
@ -92,11 +90,12 @@
|
|||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="padding-bottom: 20px;">
|
||||
<td style="padding-bottom: 5px;">
|
||||
<div class="layout-page">
|
||||
<h2>Distribution system simulation</h2>
|
||||
<table class="page-grid">
|
||||
<tr>
|
||||
<td style="width: 40%" rowspan="2">
|
||||
<td style="width: 80%" rowspan="2">
|
||||
<h3>
|
||||
Italy - Piedmont - Turin
|
||||
</h3>
|
||||
|
|
@ -107,24 +106,16 @@
|
|||
<img src={{"assets/images/DS_section/DSmap_m2.gif"}} id="DS-image" />
|
||||
{{/if}}
|
||||
</td>
|
||||
<td style="width: 35%; padding-left: 20px">
|
||||
<h2>Distribution system simulation</h2>
|
||||
</td>
|
||||
<td style="width: 25%">
|
||||
<img src={{"assets/images/DS_section/DS_fig1.svg"}} class="svg-image" style="float: right" />
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2">
|
||||
<p style="padding-left: 40px; padding-right: 20px">
|
||||
<p style="">
|
||||
Turin - Piedmont - Italy<br />
|
||||
22kV distribution system:<br />
|
||||
<ul>
|
||||
<li>Five Medium Voltage lines derived from Stura HV/MV substation (220/22 kV)</li>
|
||||
<li>50 buses, 49 lines</li>
|
||||
<li>742 mono-phase and 8293 three-phase LV customers</li>
|
||||
<li>6 MV customers</li>
|
||||
<li>4 PV generators</li>
|
||||
<li>Medium Voltage lines derived from Stura HV/MV</li>
|
||||
<li>Total length of lines: 38,54 km</li>
|
||||
</ul>
|
||||
</p>
|
||||
|
|
@ -134,7 +125,7 @@
|
|||
|
||||
</div>
|
||||
</td>
|
||||
<td style="padding-bottom: 20px;">
|
||||
<td style="padding-bottom: 5px;">
|
||||
<div class="layout-page">
|
||||
<table class="page-grid">
|
||||
<tr style="height: 25%">
|
||||
|
|
@ -149,7 +140,7 @@
|
|||
</tr>
|
||||
<tr style="height: 75%">
|
||||
<td style="width: 50%; padding-left: 0px" colspan="2">
|
||||
<h3>
|
||||
<h3 style="text-align: center">
|
||||
Prosumer: Consumption and generation profiles
|
||||
</h3>
|
||||
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@
|
|||
y="-7763.5024" />
|
||||
<g
|
||||
id="g3129-0-8"
|
||||
transform="matrix(5.6319941,0,0,-5.7141574,-3252.0677,-6443.9718)">
|
||||
transform="matrix(5.6319941,0,0,-5.7141574,-3278.9378,-6448.2144)">
|
||||
<g
|
||||
id="g3131-7"
|
||||
clip-path="url(#clipPath3133-3-4)">
|
||||
|
|
@ -662,20 +662,20 @@
|
|||
</g>
|
||||
<text
|
||||
id="text3415-6-0"
|
||||
x="-3287.8584"
|
||||
y="-7704.0244"
|
||||
x="-3289.2725"
|
||||
y="-7699.7817"
|
||||
style="font-size:39.0313797px;fill:#aa0000;stroke:none">
|
||||
<tspan
|
||||
style="font-size:85px;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
|
||||
x="-3287.8584"
|
||||
x="-3289.2725"
|
||||
sodipodi:role="line"
|
||||
y="-7704.0244"
|
||||
id="tspan3514-1">Joint Research Centre</tspan>
|
||||
y="-7699.7817"
|
||||
id="tspan3514-1" />
|
||||
<tspan
|
||||
style="font-size:85px;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
|
||||
x="-3287.8584"
|
||||
x="-3289.2725"
|
||||
sodipodi:role="line"
|
||||
y="-7597.7744"
|
||||
y="-7593.5317"
|
||||
id="tspan3111">JRC Ispra</tspan>
|
||||
</text>
|
||||
<rect
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 54 KiB After Width: | Height: | Size: 54 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 757 KiB After Width: | Height: | Size: 747 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 773 KiB After Width: | Height: | Size: 722 KiB |
|
|
@ -633,7 +633,7 @@
|
|||
x="-3570.4153"
|
||||
sodipodi:role="line"
|
||||
y="-7981.3813"
|
||||
id="tspan3514">Joint Research Centre</tspan>
|
||||
id="tspan3514" />
|
||||
<tspan
|
||||
style="font-size:85px;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
|
||||
x="-3570.4153"
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 62 KiB After Width: | Height: | Size: 62 KiB |
|
|
@ -173,15 +173,15 @@
|
|||
inkscape:pageopacity="0.0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="0.50000002"
|
||||
inkscape:cx="520.11892"
|
||||
inkscape:cy="588.23848"
|
||||
inkscape:cx="520.17953"
|
||||
inkscape:cy="427.63791"
|
||||
inkscape:document-units="px"
|
||||
inkscape:current-layer="layer1"
|
||||
showgrid="false"
|
||||
inkscape:window-width="1920"
|
||||
inkscape:window-height="1018"
|
||||
inkscape:window-x="-8"
|
||||
inkscape:window-y="1072"
|
||||
inkscape:window-width="944"
|
||||
inkscape:window-height="1002"
|
||||
inkscape:window-x="960"
|
||||
inkscape:window-y="1080"
|
||||
inkscape:window-maximized="1"
|
||||
fit-margin-top="0"
|
||||
fit-margin-left="0"
|
||||
|
|
@ -213,21 +213,15 @@
|
|||
y="-7051.5024" />
|
||||
<text
|
||||
id="text3415-6"
|
||||
x="-3388.2561"
|
||||
y="-7011.9927"
|
||||
x="-3370.2561"
|
||||
y="-6951.9927"
|
||||
style="font-size:39.0313797px;fill:#aa0000;stroke:none">
|
||||
<tspan
|
||||
style="font-size:85px;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
|
||||
x="-3388.2561"
|
||||
x="-3370.2561"
|
||||
sodipodi:role="line"
|
||||
y="-7011.9927"
|
||||
id="tspan3002">RWTH Aachen</tspan>
|
||||
<tspan
|
||||
style="font-size:85px;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
|
||||
x="-3388.2561"
|
||||
sodipodi:role="line"
|
||||
y="-6905.7427"
|
||||
id="tspan3075">University</tspan>
|
||||
y="-6951.9927"
|
||||
id="tspan3075">RWTH Aachen University</tspan>
|
||||
</text>
|
||||
<image
|
||||
y="-7098.9473"
|
||||
|
|
@ -238,7 +232,7 @@
|
|||
height="464.59662"
|
||||
width="343.854" />
|
||||
<g
|
||||
transform="matrix(2.3166009,0,0,2.3166009,-3828.0727,-8446.2982)"
|
||||
transform="matrix(2.3166009,0,0,2.3166009,-3814.0727,-8478.2982)"
|
||||
id="layer1-9"
|
||||
inkscape:label="Ebene 1">
|
||||
<g
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 52 KiB After Width: | Height: | Size: 51 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 355 KiB After Width: | Height: | Size: 904 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 355 KiB After Width: | Height: | Size: 904 KiB |
Loading…
Add table
Reference in a new issue