zhangxc hace 5 años
padre
commit
b33a413c14
Se han modificado 6 ficheros con 17 adiciones y 16 borrados
  1. 1 1
      src/css/knowledgeMap.less
  2. 7 6
      src/js/graphMap.js
  3. 2 2
      src/js/index.js
  4. 1 1
      src/js/knowledgeTree.js
  5. 2 2
      src/js/medicalTermMap.js
  6. 4 4
      src/js/schemaMap.js

+ 1 - 1
src/css/knowledgeMap.less

@@ -287,7 +287,7 @@
         display: none;
         width: 35px;
         height: 22px;
-        bottom: 40px;
+        bottom: 50px;
         right: 5px;
         background:linear-gradient(90deg,rgba(255,255,255,0) 0%,rgba(255,255,255,1) 100%);
     }

+ 7 - 6
src/js/graphMap.js

@@ -77,6 +77,7 @@ function drawGraph(data,resultShowId) {
             //  borderTopWidth:1,
             padding:[20, 1000, 0, 1000],
             backgroundColor: "#FFFFFF",
+            selected:{},
             // orient: 'vertical',
             data: legends.slice(0,showLegendNum).map(function (a) {
                 return a.name;
@@ -167,7 +168,7 @@ function drawGraph(data,resultShowId) {
     myChart.on('legendselectchanged',function(obj){
         selected = obj.selected
     })
-    myChart.setOption(option,false);
+    myChart.setOption(option,true);
     if(legends.length > showLegendNum){
         $('.legendSlideUp').toggleClass('legendSlideUp')
         $('.legendIcon').css('display',"block")
@@ -188,7 +189,7 @@ function drawGraph(data,resultShowId) {
             option.legend[0].selected = selected
         }
        
-        myChart.setOption(option,false);
+        myChart.setOption(option,true);
     })
 }   
 
@@ -623,15 +624,15 @@ function setTabBottomHei(type){
         $(".tabBottom").css({
             'margin': '0px 0px 0px 0px'
         })
-        $(".tabBottom").css("height",contentHei-80-43-10+'px')
-        $(".ztree").css("height",contentHei-80-43-60-20-24+'px')
+        $(".tabBottom").css("height",contentHei-80-43-10+19+'px')
+        $(".ztree").css("height",contentHei-80-43-60-20-24+19+'px')
 
     }else if(type == 2){
-        $(".tabBottom").css("height",contentHei-80-43-10-20+'px')
+        $(".tabBottom").css("height",contentHei-80-43-10-20+19+'px')
         $(".tabBottom").css({
             'margin': '20px 0px 0px 0px'
         })
-        $(".ztree").css("height",contentHei-80-43-20-20-20+'px')
+        $(".ztree").css("height",contentHei-80-43-20-20-20+19+'px')
     }
  }
 

+ 2 - 2
src/js/index.js

@@ -32,7 +32,7 @@ window.refreshTree = true
  setHei()
  function setHei(){
     const clientHei = $(window).height()
-    const contentHei = clientHei - 80
+    const contentHei = clientHei - 80+19
     $(".left").css("height",contentHei+'px')
     $(".right").css("height",contentHei+'px')
     if(select_type=="疾病"){
@@ -40,7 +40,7 @@ window.refreshTree = true
     }else{
         setTabBottomHei(2)
     }
-    $("#main").css("height",contentHei-20-20+'px')
+    $("#main").css("height",contentHei-20-20-10+'px')
  }
  $(window).resize(function(){
     setHei()

+ 1 - 1
src/js/knowledgeTree.js

@@ -31,7 +31,7 @@ window.refreshTree = true
  setHei()
  function setHei(){
     const clientHei = $(window).height()
-    const contentHei = clientHei - 80
+    const contentHei = clientHei - 80+12
     $(".left").css("height",contentHei+'px')
     $(".right").css("height",contentHei+'px')
     console.log('select_type',select_type)

+ 2 - 2
src/js/medicalTermMap.js

@@ -241,7 +241,7 @@ function drawGraph(data,resultShowId) {
     myChart.on('legendselectchanged',function(obj){
         selected = obj.selected
     })
-    myChart.setOption(option,false);
+    myChart.setOption(option,true);
     if(legends.length > showLegendNum){
         $('.legendSlideUp').toggleClass('legendSlideUp')
         $('.legendIcon').css('display',"block")
@@ -262,7 +262,7 @@ function drawGraph(data,resultShowId) {
             option.legend[0].selected = selected
         }
        
-        myChart.setOption(option,false);
+        myChart.setOption(option,true);
     })
    
 }

+ 4 - 4
src/js/schemaMap.js

@@ -481,15 +481,15 @@ function setTabBottomHei(type){
         $(".tabBottom").css({
             'margin': '0px 0px 0px 0px'
         })
-        $(".tabBottom").css("height",contentHei-80-43-10+'px')
-        $(".ztree").css("height",contentHei-80-43-60-20-24+'px')
+        $(".tabBottom").css("height",contentHei-80-43-10+12+'px')
+        $(".ztree").css("height",contentHei-80-43-60-20-24+12+'px')
 
     }else if(type == 2){
-        $(".tabBottom").css("height",contentHei-80-43-10-20+'px')
+        $(".tabBottom").css("height",contentHei-80-43-10-20+12+'px')
         $(".tabBottom").css({
             'margin': '20px 0px 0px 0px'
         })
-        $(".ztree").css("height",contentHei-80-43-20-20-20+'px')
+        $(".ztree").css("height",contentHei-80-43-20-20-20+12+'px')
     }
  }
  function setSelectName(name){