From a5df2aae1ec044733ed4a0b1dcc6b85cb94298a2 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Sat, 8 Aug 2020 20:39:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                         |   8 +-
 public/bigScreen/css/index.css | 209 +++++++++++++++++++++++++++++----
 public/bigScreen/index.html    |   8 +-
 3 files changed, 191 insertions(+), 34 deletions(-)

diff --git a/app.js b/app.js
index 4b4cb0be0..0ba9148d2 100644
--- a/app.js
+++ b/app.js
@@ -34,10 +34,10 @@ let opts = {
 //app.use('/callComponent',proxy('https://app.demo.winqi.cn/',opts));
 //app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012/',opts));
 //app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts));
-//app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts));
-//app.use('/app',proxy('http://api.demo.winqi.cn:8012',opts));
-app.use('/callComponent',proxy('http://192.168.1.16:8012',opts));
-app.use('/app',proxy('http://192.168.1.16:8012',opts));
+app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts));
+app.use('/app',proxy('http://api.demo.winqi.cn:8012',opts));
+//app.use('/callComponent',proxy('http://192.168.1.16:8012',opts));
+//app.use('/app',proxy('http://192.168.1.16:8012',opts));
 
 //app.listen(3000);
 app.use(express.json());
diff --git a/public/bigScreen/css/index.css b/public/bigScreen/css/index.css
index 95a9915aa..ae2e82590 100644
--- a/public/bigScreen/css/index.css
+++ b/public/bigScreen/css/index.css
@@ -1,26 +1,183 @@
-body{padding: 10px; background: url(../images/bg_body.jpg) no-repeat;}
-ul{margin: 0; padding: 0;}
-header{width:1900px; height: 83px; line-height: 83px; color: #FFFFFF; font-size: 30px; letter-spacing: 10px; background: url(../images/bg_title.png) no-repeat; margin: 0 auto; text-align: center;}
-.container{width: 1900px;}
-.col-lg-3,.col-lg-6{padding: 0; margin: 0;}
-.m-20{margin-top: 20px;}
-.title{width: 100%; height: 60px; font-size: 20px; color: #ff9000; line-height: 60px; padding-left: 20px; background: url(../images/title_icon.png) left center no-repeat; float: left;}
-.box1{width: 455px; height: 400px; padding: 0 0 25px 25px; background: url(../images/bg_box1.png) no-repeat; float: left;}
-.box1_con{width: 455px; height: 340px; float: left;}
-.box2{width: 455px; height: 537px; padding: 0 0 25px 25px; background: url(../images/bg_box2.png) no-repeat; float: left;}
-.box2_con{width: 455px; height: 500px; float: left;}
-.box3{width: 950px; height: 500px; padding: 0 25px 25px 25px; background: url(../images/bg_box3.png) no-repeat; float: left;}
-.box3_con{width: 950px; height: 470px; float: left;}
-.box3_con .box3_con_left{width: 270px; height: 380px; float: left; margin-top: 30px;}
-.box3_con .box3_con_right{ height: 470px; margin: 0 auto;}
-.box3_con_right .box3_con_right_top{ height: 120px;}
-.box3_con_right .box3_con_right_bot{width: 900px; height: 270px; margin-top: 30px;}
-.data_bg{width: 180px; height: 120px; background: url(../images/data_icon.png) no-repeat; margin-left: 40px; text-align: center; font-size: 24px; color: #FFFFFF; padding-top: 20px;}
-small{font-size: 18px; color: #FF9000;}
-.box4{width: 950px; height: 435px; padding: 0 25px 25px 25px; background: url(../images/bg_box4.png) no-repeat; float: left;}
-.box4_con{width: 950px; height: 370px; float: left;}
-.box5{width: 455px; height: 957px; padding: 0 25px 25px 25px; background: url(../images/bg_box5.png) no-repeat; float: right; }
-.box5_con{width: 455px; height: 957px; float: left;}
-.box5_con_top{width: 420px; height: 320px; float: left;}
-.box5_con_bot{width: 455px; height: 550px; float: left;}
-.box5_con_bot li{width: 390px; height: 60px; line-height: 60px; list-style: none; border-bottom: 1px dashed #dbdbdb; color: #F5F5F5; overflow: hidden;}
+body {
+    padding: 10px;
+    background: url(../images/bg_body.jpg) no-repeat;
+    width: 100%;
+}
+
+ul {
+    margin: 0;
+    padding: 0;
+}
+
+header {
+    width: 100%;
+    height: 83px;
+    line-height: 83px;
+    color: #FFFFFF;
+    font-size: 30px;
+    letter-spacing: 10px;
+    background: url(../images/bg_title.png) no-repeat 100%;
+    margin: 0 auto;
+    text-align: center;
+    background-size: 100% 100%;
+}
+
+.container {
+    width: 100%;
+}
+
+.col-lg-3, .col-lg-6 {
+    padding: 0;
+    margin: 0;
+}
+
+.m-20 {
+    margin-top: 20px;
+}
+
+.title {
+    width: 90%;
+    height: 60px;
+    font-size: 20px;
+    color: #ff9000;
+    line-height: 60px;
+    padding-left: 20px;
+    background: url(../images/title_icon.png) left center no-repeat;
+    float: left;
+}
+
+.box1 {
+    width: 95%;
+    height: 400px;
+    padding: 0 0 25px 25px;
+    background: url(../images/bg_box1.png) no-repeat  100%;
+    background-size: 100% 100%;
+    float: left;
+}
+
+.box1_con {
+    width: 95%;
+    height: 340px;
+    float: left;
+}
+
+.box2 {
+    width: 95%;
+    height: 537px;
+    padding: 0 0 25px 25px;
+    background: url(../images/bg_box2.png) no-repeat 100%;
+    background-size: 100% 100%;
+    float: left;
+}
+
+.box2_con {
+    width: 95%;
+    height: 500px;
+    float: left;
+}
+
+.box3 {
+    width: 100%;
+    height: 500px;
+    padding: 0 25px 25px 25px;
+    background: url(../images/bg_box3.png) no-repeat 100%;
+    background-size: 100% 100%;
+
+    float: left;
+}
+
+.box3_con {
+    width: 100%;
+    height: 470px;
+    float: left;
+}
+
+.box3_con .box3_con_left {
+    width: 100%;
+    height: 380px;
+    float: left;
+    margin-top: 30px;
+}
+
+.box3_con .box3_con_right {
+    height: 100%;
+    margin: 0 auto;
+}
+
+.box3_con_right .box3_con_right_top {
+    height: 120px;
+}
+
+.box3_con_right .box3_con_right_bot {
+    width: 100%;
+    height: 270px;
+    margin-top: 30px;
+}
+
+.data_bg {
+    height: 120px;
+    background: url(../images/data_icon.png) no-repeat 100%;
+    background-size: 96% 100%;
+    text-align: center;
+    font-size: 24px;
+    color: #FFFFFF;
+    padding-top: 20px;
+}
+
+small {
+    font-size: 18px;
+    color: #FF9000;
+}
+
+.box4 {
+    width: 100%;
+    height: 435px;
+    padding: 0 25px 25px 25px;
+    background: url(../images/bg_box4.png) no-repeat 100%;
+    background-size: 100% 100%;
+
+    float: left;
+}
+
+.box4_con {
+    width: 100%;
+    height: 370px;
+    float: left;
+}
+
+.box5 {
+    height: 957px;
+    padding: 0 25px 25px 25px;
+    background: url(../images/bg_box5.png) no-repeat 100%;
+    background-size: 96% 100%;
+
+    float: right;
+}
+
+.box5_con {
+    width: 100%;
+    height: 957px;
+    float: left;
+}
+
+.box5_con_top {
+    width: 100%;
+    height: 320px;
+    float: left;
+}
+
+.box5_con_bot {
+    width: 100%;
+    height: 550px;
+    float: left;
+}
+
+.box5_con_bot li {
+    width: 100%;
+    height: 60px;
+    line-height: 60px;
+    list-style: none;
+    border-bottom: 1px dashed #dbdbdb;
+    color: #F5F5F5;
+    overflow: hidden;
+}
\ No newline at end of file
diff --git a/public/bigScreen/index.html b/public/bigScreen/index.html
index a0aba61dc..d2e62ab05 100644
--- a/public/bigScreen/index.html
+++ b/public/bigScreen/index.html
@@ -43,16 +43,16 @@
 						<div class="box3_con_right">
 							<div class="box3_con_right_top">
 								<div class="row">
-									<div class="col-lg-4 data_bg">
+									<div class="col-lg-3 data_bg">
 										<p>12569栋</p><small>楼栋总数</small>
 									</div>
-									<div class="col-lg-4 data_bg">
+									<div class="col-lg-3 data_bg">
 										<p>178人</p><small>业主总数</small>
 									</div>
-									<div class="col-lg-4 data_bg">
+									<div class="col-lg-3 data_bg">
 										<p>12569个</p><small>车位总数</small>
 									</div>
-									<div class="col-lg-4 data_bg">
+									<div class="col-lg-3 data_bg">
 										<p>12375台</p><small>设备总数</small>
 									</div>
 								</div>