Commit 547ab9cb by 牛晓林

adjust for 1440

parent 088531f5
...@@ -8,7 +8,7 @@ git commit -m $msg ...@@ -8,7 +8,7 @@ git commit -m $msg
git push git push
Remove-Item -Recurse -Force D:\\projects\\supervise\\supervise\\src\\main\\resources\\static Remove-Item -Recurse -Force D:\\projects\\supervise\\supervise\\src\\main\\resources\\static
mkdir D:\\projects\\supervise\\supervise\\src\\main\\resources\\static mkdir D:\\projects\\supervise\\supervise\\src\\main\\resources\\static
Copy-Item D:\\projects\\map\\dist\\map\\* -Destination D:\\projects\\supervise\\supervise\\src\\main\\resources\\static -Recurse Copy-Item .\\dist\\map\\* -Destination D:\\projects\\supervise\\supervise\\src\\main\\resources\\static -Recurse
cd ../supervise/supervise cd ../supervise/supervise
git pull git pull
git add . git add .
......
...@@ -176,7 +176,7 @@ fieldset{ ...@@ -176,7 +176,7 @@ fieldset{
.tooltip { .tooltip {
position: relative; position: relative;
display: inline-block; display: inline-block;
margin-top: 1.6em; margin-top: 1.2em;
text-align: center; text-align: center;
width:70px; width:70px;
} }
...@@ -251,7 +251,7 @@ fieldset{ ...@@ -251,7 +251,7 @@ fieldset{
##Screen = B/w 1025px to 1280px ##Screen = B/w 1025px to 1280px
*/ */
@media (min-width: 1025px) and (max-width: 1380px) { @media (min-width: 1025px) and (max-width: 1440px) {
.main{ .main{
.left{ .left{
width:250px; width:250px;
...@@ -262,6 +262,14 @@ fieldset{ ...@@ -262,6 +262,14 @@ fieldset{
width:24%!important; width:24%!important;
} }
//CSS //CSS
.function{
>.tooltip{
margin-bottom:0;
}
}
fieldset{
margin-bottom: 2em;
}
} }
......
...@@ -268,6 +268,9 @@ export class MainComponent implements OnInit { ...@@ -268,6 +268,9 @@ export class MainComponent implements OnInit {
this.http.get<any>(this.s.basePath + "/scetion/list").subscribe(res => { this.http.get<any>(this.s.basePath + "/scetion/list").subscribe(res => {
this.allsecs = res.data; this.allsecs = res.data;
}); });
//response to 1440*900
} }
proj2Change($event, type) { proj2Change($event, type) {
this.map.clearOverlays(); this.map.clearOverlays();
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
} }
#playWnd{ #playWnd{
width:1000px; width:900px;
height: 500px; height: 500px;
// border:1px solid red; // border:1px solid red;
} }
......
...@@ -299,8 +299,12 @@ export class VideoComponent implements OnInit { ...@@ -299,8 +299,12 @@ export class VideoComponent implements OnInit {
// }) // })
// }) // })
var width=$(document).width() var width=$(document).width()
var ratio = 0.75;
if(window.screen.width==1440){
ratio = 0.65;
}
var height=$(document).height() var height=$(document).height()
oWebControl.JS_Resize(width*0.75, height*0.75); // 初始化后resize一次,规避firefox下首次显示窗口后插件窗口未与DIV窗口重合问题 oWebControl.JS_Resize(width*ratio, height*0.75); // 初始化后resize一次,规避firefox下首次显示窗口后插件窗口未与DIV窗口重合问题
}); });
}); });
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment