From 0f669d13fae5029ce090c07e83bc3a076c9e2eec Mon Sep 17 00:00:00 2001 From: tangjiang <465264938@qq.com> Date: Wed, 11 Dec 2019 16:52:12 +0800 Subject: [PATCH] upate style --- demo.html | 5 ++++- js/demo.js | 8 ++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/demo.html b/demo.html index afc7c3e..8e7f7a4 100644 --- a/demo.html +++ b/demo.html @@ -1542,7 +1542,10 @@ // 根据更新后的option重新画图 function redrawGraph() { $('.fixed-left').css({left: 0}).addClass('collpased'); - $('.screen-btn').css({left: '360px'}); + // $('.screen-btn').css({left: '360px'}); + if (!$('.fixed-left').hasClass('active')) { + $('.screen-btn').css({left: '360px'}); + } $('.collpase-icon').addClass('icon-shouqi').removeClass('icon-zhankai'); optionGraph.series[0].data = Object.values(currentGraph.nodes); optionGraph.series[0].links = Object.values(currentGraph.links); diff --git a/js/demo.js b/js/demo.js index e4d393e..da7a288 100644 --- a/js/demo.js +++ b/js/demo.js @@ -4,7 +4,7 @@ * @Github: * @Date: 2019-12-11 09:17:17 * @LastEditors: tangjiang - * @LastEditTime: 2019-12-11 16:37:08 + * @LastEditTime: 2019-12-11 16:50:36 */ $(document).ready(function () { @@ -29,15 +29,10 @@ $(document).ready(function () { $('.fixed-left').css({ left: '-400px'}).removeClass('collpased').removeClass('active'); $('.left_echart').css({left: '-400px'}); $('.screen-btn').css({left: '-50px'}); - // $('.map_header').css({left: 0}); - // $('.collpase-icon').remove('icon-zhankai').add('icon-shouqi'); - // $('.collpase-icon').addClass('icon-zhankai').remove('icon-shouqi'); } else { $('.fixed-left').css({ left: '0px' }).addClass('collpased'); $('.left_echart').css({left: '0px'}); $('.screen-btn').css({ left: '360px' }); - // $('.map_header').css({left: '400px'}); - // $('.collpase-icon').remove('icon-shouqi').add('icon-zhankai'); } if ($('.collpase-icon').hasClass('icon-zhankai')) { @@ -49,6 +44,7 @@ $(document).ready(function () { // 收缩左侧侧边栏 $('.collpase-icon').on('click', function() { + if ($('.fixed-left').hasClass('active')) return; showOrHideSlider(); // $(this).hasClass('icon-zhankai') // ? $(this).removeClass('icon-zhankai').addClass('icon-shouqi')