diff --git a/src/main/java/com/nis/web/controller/dashboard/DashboardController.java b/src/main/java/com/nis/web/controller/dashboard/DashboardController.java index 989774028..6fa1885df 100644 --- a/src/main/java/com/nis/web/controller/dashboard/DashboardController.java +++ b/src/main/java/com/nis/web/controller/dashboard/DashboardController.java @@ -1,17 +1,11 @@ package com.nis.web.controller.dashboard; import java.awt.Color; -import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.FileOutputStream; import java.io.IOException; -import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.StringReader; import java.lang.reflect.Type; -import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -29,7 +23,6 @@ import org.apache.batik.transcoder.TranscoderOutput; import org.apache.batik.transcoder.image.ImageTranscoder; import org.apache.batik.transcoder.image.JPEGTranscoder; import org.apache.batik.transcoder.image.PNGTranscoder; -import org.jcodings.transcode.Transcoder; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; @@ -52,7 +45,6 @@ import com.nis.domain.SysDataDictionaryItem; import com.nis.domain.configuration.WebsiteDomainTopic; import com.nis.util.CodeDicUtils; import com.nis.util.Constants; -import com.nis.util.DateUtil; import com.nis.util.DateUtils; import com.nis.util.DictUtils; import com.nis.util.StringUtil; diff --git a/src/main/webapp/static/pages/scripts/echart.js b/src/main/webapp/static/pages/scripts/echart.js index bc9861d6c..e00ec1547 100644 --- a/src/main/webapp/static/pages/scripts/echart.js +++ b/src/main/webapp/static/pages/scripts/echart.js @@ -39,6 +39,12 @@ // margin:10, }, + navigation: { + buttonOptions: { + x:25, + y: -18, + } + }, exporting: { allowHTML:true, url:'saveAsImage', @@ -52,7 +58,8 @@ }, }, } - } + }, + }, noData:{ style: {//设置字体颜色 @@ -218,6 +225,12 @@ marginTop:50, inverted: true, }, + navigation: { + buttonOptions: { + y:13, + x:-7 + } + }, exporting: { allowHTML:true, url:'saveAsImage', @@ -376,6 +389,11 @@ marginBottom:60, }, + navigation: { + buttonOptions: { + y: 13, + } + }, exporting: { allowHTML:true, url:'saveAsImage', @@ -530,6 +548,11 @@ function echart_2(rs){ plotShadow:false, type: 'pie' }, + navigation: { + buttonOptions: { + y: -8, + } + }, exporting: { allowHTML:true, url:'saveAsImage', @@ -669,6 +692,11 @@ function echart_5(rs){ plotShadow:false, type: 'pie' }, + navigation: { + buttonOptions: { + y: -8, + } + }, exporting: { allowHTML:true, url:'saveAsImage', @@ -809,6 +837,12 @@ function echart_4(rs){ plotShadow:false, type: 'pie' }, + navigation: { + buttonOptions: { + x:-5, + y: -10, + } + }, exporting: { allowHTML:true, url:'saveAsImage', @@ -942,6 +976,12 @@ function echart_6(rs){ plotShadow:false, type: 'pie' }, + navigation: { + buttonOptions: { + x:-5, + y: -10, + } + }, exporting: { allowHTML:true, url:'saveAsImage', @@ -1080,6 +1120,12 @@ function echart_topic_domain(rs){ marginTop:50, marginBottom:10, }, + navigation: { + buttonOptions: { + x:-5, + y:15, + } + }, exporting: { allowHTML:true, url:'saveAsImage',