Browse Source

数据展示页修改

CharlesLeocc 3 years ago
parent
commit
136ae408ef

File diff suppressed because it is too large
+ 2 - 2
src/configure.ts


+ 1 - 1
src/login/js/login.js

@@ -1,5 +1,5 @@
 /* CONFIGURE START */
-var HOST_NAME = "192.168.2.248:1111";//"112.51.249.202:1111",//var HOST_NAME = "http://192.168.2.248:1111",
+var HOST_NAME = "112.51.249.202:1111";//"192.168.2.248:1111";//,//var HOST_NAME = "http://192.168.2.248:1111",
 SYS_ADDR = location.href.trim().toLowerCase().replace(/login\/+$/, ""),
     COOKIE_EXPIRES = 1,
     COOKIE_PATH = location.pathname.trim().toLowerCase().replace(/login\/+$/, "");

+ 4 - 3
src/widgets/HomePage/Widget.html

@@ -8,16 +8,17 @@
             <div class='goSys'>
             </div>
             <div class='user'>
-                <img src="/widgets/HomePage/images/touxiang.png">
+                <img src="/widgets/HomePage/images/userHead.png">
                 <span></span>
             </div>
             <div class='close' title='点击退出系统'>
-                <span class='glyphicon glyphicon-off'></span>
+                <!-- <span class='glyphicon glyphicon-off'></span> -->
             </div>
         </div>
     </div>
     <div class='leftPanle'>
         <div class='title'>中民燃气集团</div>
+        <div class="lineBorder"></div>
         <div class='infoList'></div>
     </div>
     <div class='rightPanle'>
@@ -62,4 +63,4 @@
             <div class='echart'></div>
         </div>
     </div>
-</div>
+</div>

+ 43 - 22
src/widgets/HomePage/css/style.scss

@@ -17,7 +17,7 @@
         height: 70px;
         width: 100%;
         line-height: 70px;
-        background-image: linear-gradient(#0077C0, #00498D);
+        background-image: linear-gradient(90deg, #1B70E2, #11B6CF);
         position: relative;
         top: 0px;
         left: 0px;
@@ -60,10 +60,9 @@
         }
 
         .userInfo {
-            position: absolute;
-            // right: 58px;
-            position: absolute;
-            right: 40px;
+            position: relative;
+            float: right;
+            right: 0;
             width: 320px;
             height: 100%;
 
@@ -76,17 +75,24 @@
                 background: url(../images/buttun.png);
                 background-repeat: no-repeat;
                 background-size: 100% 100%;
+                cursor: pointer;
             }
 
             .close{
-                .glyphicon.glyphicon-off{
-                    color: aquamarine;
-                    font-size: 33px;
-                    position: relative;
-                    float: right;
-                    top: 20.5px;
-                    right: 0px;
-                }
+                position: relative;
+                background: url(../images/logout.png);
+                top: 20px;
+                right: 20px;
+                width: 36px;
+                height: 36px;
+                // .glyphicon.glyphicon-off{
+                //     color: aquamarine;
+                //     font-size: 33px;
+                //     position: relative;
+                //     float: right;
+                //     top: 20.5px;
+                //     right: 0px;
+                // }
             }
 
             .user {
@@ -121,25 +127,37 @@
         height: calc(100% - 70px);
         position: relative;
         float: left;
-        background-image: linear-gradient(#00498D, #00498D);
+        background: #FFFFFF;
+        box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.2);
+        //background-image: linear-gradient(#00498D, #00498D);
         // background: #000000;
         .currentCompany{
-            border-left: solid;
-            border-color: rgb(85,147,38);
+            border-left: 5px solid;
+            border-color: #E8811C;
         }
         .title{
             width: 100%;
             height: 70px;
-            color: white;
+            // color: white;
             text-align: center;
             line-height: 70px;
             font-size: 24px;
+            // margin-bottom: 10px;
+            // border-bottom: 3px solid ;
+            // border-bottom-color: #ED8928;
+        }
+        .lineBorder{
+            width: 100%;
+            height: 1px;
+            margin-bottom: 10px;
+            background: linear-gradient(90deg, #227EE7, #5CBE1B, #ED8928);
+            opacity: 0.76;
         }
         .infoList{
             color: rgba(255,255,255,0.8);
         }
         .item{
-            background: rgba(128,128,128,0.4);
+            background-image: url("../images/leftbg.png");
             margin-bottom: 10px;
             height: 70px;
             width: 100%;
@@ -167,7 +185,7 @@
             border-color: rgba(128,128,128,0.50);
         }
         .itemOperation{
-            color:rgb(38,179,210);
+            // color:rgb(38,179,210);
             padding: 7px;
             height: 30px;
             .infoLook{
@@ -194,6 +212,9 @@
         float: left;
         padding: 10px 10px 5px 10px;
         background: rgb(239,240,245);
+        div{
+            border-radius: 6px;
+        }
         .yechart{
             width: 30%;
             height: calc(33% - 10px);
@@ -211,7 +232,7 @@
             float: left;
             margin: 0px 0px 10px 0px;
             box-shadow: 4px 4px 4px rgb(136,136,136);
-            
+
         }
         .bottomechart{
             height: 33%;
@@ -233,11 +254,11 @@
             }
         }
         .gsgxtotal{
-            width: 30%;
+            width: 50%;
             margin: 0px 10px 10px 0px;
         }
         .gssbtotal{
-            width: calc(70% - 10px); 
+            width: calc(50% - 10px);
             margin: 0px 0px 10px 0px;
         }
         .echart{

BIN
src/widgets/HomePage/images/leftbg.png


BIN
src/widgets/HomePage/images/logout.png


BIN
src/widgets/HomePage/images/userHead.png