zhangxc 4 лет назад
Родитель
Сommit
9ade5f4c08
2 измененных файлов с 25 добавлено и 7 удалено
  1. 15 5
      src/js/graphMap.js
  2. 10 2
      src/js/medicalTermMap.js

+ 15 - 5
src/js/graphMap.js

@@ -66,14 +66,21 @@ function drawGraph(data,resultShowId) {
         legend: [{
             type: 'scroll',
             bottom: 0,
-            icon: 'circle',
+            //  left: 0,
+             itemWidth: 8,
+             itemHeight: 8,
+             itemGap: 20,
+             icon: 'circle',
+             width: 766,
+             verticalAlign:'top',
+            //  borderColor:'#E6E6E6',
+            //  borderWidth:'1px',
             padding:[20, 40, 0, 20],
             backgroundColor: "#FFFFFF",
             // orient: 'vertical',
             data: legends.slice(0,showLegendNum).map(function (a) {
                 return a.name;
             }),
-            
         }],
         series: [
             {
@@ -85,6 +92,7 @@ function drawGraph(data,resultShowId) {
                 roam: 'move',
                 edgeSymbol: ['circle', 'arrow'],
                 edgeSymbolSize: [1, 5],
+                padding:[50,50,50,50],
                 edgeLabel: {
                     // cursor:'pointer',
                     normal: {
@@ -155,7 +163,8 @@ function drawGraph(data,resultShowId) {
         myChart.resize(); 
      })
     myChart.on('click',dataClick);
-    myChart.setOption(option);
+    myChart.setOption(option,true);
+    const legendsSlice =  legends.slice(0,showLegendNum)
     if(legends.length > showLegendNum){
         $('.legendSlideUp').toggleClass('legendSlideUp')
         $('.legendIcon').css('display',"block")
@@ -163,14 +172,15 @@ function drawGraph(data,resultShowId) {
         $('.legendSlideUp').toggleClass('legendSlideUp')
         $('.legendIcon').css('display',"none")
     }
-    $('.legendIconImg').on('click',function(){
+    $('.legendIconImg').on('click',function(e){
+        e.stopPropagation()
         $('.legendIconImg').toggleClass('legendSlideUp')
         if(option.legend[0].type=='scroll'){
             option.legend[0].type='plain'
             option.legend[0].data = legends
         }else{
             option.legend[0].type='scroll'
-            option.legend[0].data = legends.slice(0,showLegendNum)
+            option.legend[0].data = legendsSlice
         }
        
         myChart.setOption(option);

+ 10 - 2
src/js/medicalTermMap.js

@@ -5,6 +5,7 @@ require("./../css/medicalTermMap.less");
 require('./../resources/images/empty2.png');
 const { post, api } = require('./api.js');
 const { medicalTermDefaultMap } = require('./utils.js');
+const e = require("express");
 
 window.select_type="disease";
 window.select_name="疾病";
@@ -145,7 +146,13 @@ function drawGraph(data,resultShowId) {
         legend: [{
             type: 'scroll',
             bottom: 0,
-            icon: 'circle',
+            //  left: 0,
+             itemWidth: 8,
+             itemHeight: 8,
+             itemGap: 20,
+             icon: 'circle',
+             width: 766,
+             verticalAlign:'top',
             padding:[20, 40, 0, 20],
             // cursor:'pointer',
             backgroundColor: "#FFFFFF",
@@ -241,7 +248,8 @@ function drawGraph(data,resultShowId) {
         $('.legendSlideUp').toggleClass('legendSlideUp')
         $('.legendIcon').css('display',"none")
     }
-    $('.legendIconImg').on('click',function(){
+    $('.legendIconImg').on('click',function(e){
+        e.stopPropagation()
         $('.legendIconImg').toggleClass('legendSlideUp')
         if(option.legend[0].type=='scroll'){
             option.legend[0].type='plain'