Sfoglia il codice sorgente

特工更新了样式。

Chenshilong 8 anni fa
parent
commit
7aa6cfe46a

+ 48 - 68
web/building_saas/css/main.css

@@ -8,7 +8,7 @@ body {
     font-size: 0.9rem
 }
 .btn.disabled, .btn:disabled {
-  color:#999
+    color:#999
 }
 /*自定义css*/
 .header {
@@ -25,10 +25,10 @@ body {
     line-height: inherit
 }
 .top-msg{
-  position: fixed;
-  top:0;
-  width:100%;
-  z-index: 999
+    position: fixed;
+    top:0;
+    width:100%;
+    z-index: 999
 }
 .in-1{padding-left:0px!important}
 .in-2{padding-left:21px!important}
@@ -67,45 +67,45 @@ body {
     color: #333
 }
 .main-nav .nav-tabs{
-  border-bottom: none
+    border-bottom: none
 }
 .content {
     border-left: 1px solid #ccc;
     margin-left: 29px;
     background: #fff
 }
-.toolsbar {
-  border-bottom: 1px solid #ccc
+.toolsbar,.toolsbar-f {
+    border-bottom: 1px solid #ccc
 }
 .tools-btn {
     height: 30px;
     line-height: 30px;
 }
-.toolsbar .tools-btn.btn:hover {
+.toolsbar .tools-btn.btn:hover,.toolsbar-f .tools-btn.btn:hover {
     background: #f7f7f9;
 }
 .main-side {
     border-left: 1px solid #ccc;
     overflow-y: hidden;
 }
-.main-data-top{
-  overflow: hidden;
-  width:100%
+.main-data-top,.main-data-full{
+    overflow: hidden;
+    width:100%
 }
 .main-content.col-lg-8{
-  width:66.666667%
+    width:66.666667%
 }
 .main-content.col-lg-12{
-  width:100%
+    width:100%
 }
 .main-side.col-lg-4{
-  width: 33.333333%;
+    width: 33.333333%;
 }
 .main-side.col-lg-0{
-  width:0%;
+    width:0%;
 }
 .sidebar-bottom,.sidebar-bottom .col-lg-6,.sidebar-bottom .col-lg-12 {
-  height:200px
+    height:200px
 }
 .top-content, .fluid-content {
     overflow: auto;
@@ -121,7 +121,7 @@ body {
     padding: 0.2em 0.5em
 }
 .side-tabs .nav-tabs .nav-item {
-  z-index: 999
+    z-index: 999
 }
 .side-tabs .nav-tabs {
     border-bottom: none;
@@ -248,80 +248,60 @@ body {
     overflow: auto;
 }
 .poj-list span.poj-icon {
-  padding-right:7px;
-  color:#ccc
+    padding-right:7px;
+    color:#ccc
 }
 .poj-list a.tree-open,.poj-list a.tree-close{
-  width:15px;
-  display: inline-block;
+    width:15px;
+    display: inline-block;
 }
 .print-toolsbar{
-  padding:5px
+    padding:5px
 }
 .print-toolsbar .panel {
-  display:inline-block;
-  vertical-align:top;
-  background:#f7f7f9
+    display:inline-block;
+    vertical-align:top;
+    background:#f7f7f9
 }
 .print-toolsbar .panel .panel-foot{
-  text-align: center;
-  font-size: 12px
+    text-align: center;
+    font-size: 12px
 }
 .print-list {
-  border-right:1px solid #ccc
+    border-right:1px solid #ccc
 }
 .print-list .form-list {
-  overflow: auto
+    overflow: auto
 }
 .print-list .list-tools{
-  height:50px;
-  padding:10px 0;
-  border-bottom:1px solid #f2f2f2
+    height:50px;
+    padding:10px 0;
+    border-bottom:1px solid #f2f2f2
 }
 .pageContainer {
-  background: #ededed;
-  text-align: center
+    background: #ededed;
+    text-align: center
 }
 .pageContainer .page{
-  border:9px solid transparent;
-  display: inline-block;
+    border:9px solid transparent;
+    display: inline-block;
 }
 .pageContainer .page img{
-  width:inherit;
-  height: inherit;
+    width:inherit;
+    height: inherit;
+}
+.modal-auto-height {
+    height: 400px;
+    overflow-y: auto;
 }
 .modal-fixed-height {
-  height: 400px;
-  overflow-y: auto;
-  width:100%
+    height: 400px;
+    overflow-y: hidden;
 }
 .sidebar-tools-bar {
-  background:#fff
+    background:#fff
 }
 .side-search-box{
-  background:#fff;
-  border-bottom:1px solid #ddd
-}
-
-/* .grid { height: 500px !important; margin:0 10px 10px 40px;}*/
-.grid .gc-cell.c1 {
-    text-align: right;}
-.gc-grid{
-    border:0 !important;
-}
-.gc-column-header-cell ,.gc-corner-header-cell{
-    border-top: 1px solid rgba(0,0,0,.2);
-}
-.gc-cell,.gc-column-header-cell,select{
-    font-size: 0.9rem!important;
-}
-.gc-cell select{
-    height: auto;
-}
-.grid{
-    overflow: hidden;
-    width:100%;
-    height: 100%;
+    background:#fff;
+    border-bottom:1px solid #ddd
 }
-/*
-.gc-cell span{font-size: 12px !important}*/

+ 14 - 16
web/building_saas/js/global.js

@@ -2,6 +2,7 @@
 function autoFlashHeight(){
     var headerHeight = $(".header").height();
     var toolsbarHeight = $(".toolsbar").height();
+    var ftoolsbarHeight = $(".toolsbar-f").height();
     var bottomContentHeight = $(".bottom-content").height();
     var toolsBarHeightQ = $(".tools-bar-height-q").height();
     var toolsBarHeightD = $(".tools-bar-height-d").height();
@@ -10,23 +11,20 @@ function autoFlashHeight(){
     $(".main-data-top").height($(window).height()-headerHeight-toolsbarHeight-bottomContentHeight-1);
     $(".main-data-full").height($(window).height()-headerHeight-toolsbarHeight-1);
     $(".main-data-full-fl").height($(window).height()-headerHeight-toolsbarHeight-37);
+    $(".main-data-not").height($(window).height()-headerHeight-1);
     $(".main-data-side-search").height($(window).height()-headerHeight-toolsbarHeight-64);
     $(".side-content").height($(window).height()-headerHeight );
-    $(".poj-list").height($(window).height()-headerHeight-toolsbarHeight);
+    $(".poj-list").height($(window).height()-headerHeight-ftoolsbarHeight);
     $(".form-list").height($(window).height()-headerHeight-50 );
-    $(".grid").height($(window).height()-headerHeight-toolsbarHeight-50);
-
 };
-// 获取get参数
-function getQueryString(name) {
-    var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
-    var r = window.location.search.substr(1).match(reg);
-    if (r != null) return unescape(r[2]); return null;
-}
 $(window).resize(autoFlashHeight);
 /*全局自适应高度结束*/
 $(function(){
-$("body").click(function(event){
+    /*侧滑*/
+    $(".open-sidebar").click(function(){
+        $(".slide-sidebar").animate({width:"800"}).addClass("open");
+    });
+    $("body").click(function(event){
         var e = event || window.event; //浏览器兼容性
         if(!$(event.target).is('a')) {
             var elem = event.target || e.srcElement;
@@ -40,10 +38,10 @@ $("body").click(function(event){
         }
 
     });
-/*侧滑*/
-/*工具提示*/
-$('*[data-toggle=tooltip]').mouseover(function() {
- $(this).tooltip('show');
-  });
-/*工具提示*/
+    /*侧滑*/
+    /*工具提示*/
+    $(function () {
+        $('[data-toggle="tooltip"]').tooltip()
+    });
+    /*工具提示*/
 });

+ 2 - 2
web/building_saas/main/html/calc_program_manage.html

@@ -13,11 +13,11 @@
     <div class="container-fluid">
         <div class="row">
         <div class="col-lg-3 p-0">
-            <div class="main-data-full" id="mainSpread">
+            <div class="main-data-not" id="mainSpread">
             </div>
         </div>
         <div class="col-lg-9 p-0">
-            <div class="main-data-full" id="detailSpread">
+            <div class="main-data-not" id="detailSpread">
             </div>
         </div>
     </div>