luolei 5 rokov pred
rodič
commit
4349c47c9b
3 zmenil súbory, kde vykonal 12 pridanie a 10 odobranie
  1. 5 3
      src/css/console.less
  2. 6 6
      src/js/console.js
  3. 1 1
      src/js/index.js

+ 5 - 3
src/css/console.less

@@ -2,6 +2,7 @@
 
 body.console {
   overflow: auto;
+  overflow-y: hidden;
   background: @activeBg;
 }
 .echarts {
@@ -31,6 +32,7 @@ body.console {
   background: @activeBg;
   min-width: 1185px;
   padding: 10px;
+  padding-bottom: 0px;
   box-sizing: border-box;
   ul {
     padding: 0 40px;
@@ -177,7 +179,6 @@ body.console {
 .pubEchartB {
   width: 55%;
   display: inline-block;
-  margin-bottom: 10px;
   background-color: #fff;
   border-top: 10px solid @activeBg;
   border-left: 10px solid @activeBg;
@@ -219,8 +220,9 @@ body.console {
   right: 0;
   padding-right: 30px;
   box-sizing: border-box;
-  max-height: 180px;
+  height: 180px;
   overflow: auto;
+  margin-top: -90px;
   table {
     width: 100%;
   }
@@ -481,7 +483,7 @@ body.console {
     width: 100px;
     height: 26px;
     line-height: 28px;
-    border: 1px solid #E2E5EF;
+    border: 1px solid #506597;
     padding-right: 20px;
     padding-left: 10px;
     position: relative;

+ 6 - 6
src/js/console.js

@@ -71,7 +71,7 @@ function getDetails(){
         $(".container",parent.document).removeClass("console-cont");
     })
     $(".paymoney.pubEchart .title").click(function(){
-        $(parent.document).find("#contentIframe").attr("src","dayDetail.html")
+        $(parent.document).find("#contentIframe").attr("src",slideType==1?"dayDetail.html":"payDetail.html")
         $(".container",parent.document).removeClass("console-cont");
     })
     $(".defect .partTitlePub").click(function(){//from 1 console / 2  deptConsole
@@ -558,7 +558,7 @@ function lineChartSpecial(dataX,dataY){
         myCharts.resize()
     });
     option = {
-        color: ['#3398DB'],
+        color: ['#37C4FC'],
         tooltip: {
             trigger: 'axis',
             position: 'right',
@@ -650,7 +650,7 @@ function barChartPay(dataX,dataY){
         myCharts.resize()
     });
     option = {
-        color: ['#3398DB'],
+        color: ['#37C4FC'],
         tooltip: {
             trigger: 'axis',
             position: 'right',
@@ -1183,9 +1183,9 @@ function panDetail(data){
         `
     }
     $(".explainPanT table").html(strAll);
-    $(".explainPan").css({
-        marginTop:-($(".explainPan").height()/2-20)+'px'
-    })
+    // $(".explainPan").css({
+    //     marginTop:-($(".explainPan").height()/2-20)+'px'
+    // })
 }
 function panDetailB(data){
     let color = ['#F2637B','#975FE4', '#399FFF', '#37CBCB', '#4CCB73','#FAD336','#F2637B','#975FE4', '#399FFF', '#37CBCB', '#4CCB73','#FAD336'];

+ 1 - 1
src/js/index.js

@@ -12,7 +12,7 @@ $(function(){
   //菜单展开收起
   sureChangeWord()
   $(".main").css({
-    height:$(window).height()-60+'px'
+    height:$(window).height()-52+'px'
   })
   $("body").on('focus',".modalAction input",function(){
     $(this).attr("type","password")