Commit d2b1994c authored by forevertyler's avatar forevertyler

fix:表格

parent d4031d51
...@@ -5,7 +5,7 @@ VUE_APP_LOCAL_PORT = '8059' ...@@ -5,7 +5,7 @@ VUE_APP_LOCAL_PORT = '8059'
VUE_APP_WS_API = 'ws://localhost:8000' VUE_APP_WS_API = 'ws://localhost:8000'
VUE_APP_BASE_API = 'http://192.168.2.15:8059' VUE_APP_BASE_API = 'http://192.168.2.15:8059'
VUE_APP_LOCAL_API = 'http://192.168.2.37:9005' VUE_APP_LOCAL_API = 'http://192.168.2.37:9015'
VUE_APP_D3Tileset = 'http://192.168.2.15:8080/Apps/assets/media/rushanruibo' VUE_APP_D3Tileset = 'http://192.168.2.15:8080/Apps/assets/media/rushanruibo'
VUE_APP_SYS_PORT = '8060' VUE_APP_SYS_PORT = '8060'
......
var ServiceURL = 'http://192.168.2.37:9005'; var ServiceURL = 'http://192.168.10.11:9005';
// var ServiceURL = 'http://192.168.2.37:9005';
window.VUE_APP_API = {ServiceURL:ServiceURL} window.VUE_APP_API = {ServiceURL:ServiceURL}
File added
...@@ -374,7 +374,7 @@ var Highchart = function(){ ...@@ -374,7 +374,7 @@ var Highchart = function(){
//series = addAlarmLine(data.alarm, data.lists, series, opts.warningLine); //series = addAlarmLine(data.alarm, data.lists, series, opts.warningLine);
// 识别最大值 // 识别最大值
var maxVal = chartData && chartData.maxVal > alarmData.maxAlarm ? chartData.maxVal : alarmData.maxAlarm; // var maxVal = chartData && chartData.maxVal > alarmData.maxAlarm ? chartData.maxVal : alarmData.maxAlarm;
var option = { var option = {
chart: { chart: {
type: data.chartType, type: data.chartType,
...@@ -428,7 +428,7 @@ var Highchart = function(){ ...@@ -428,7 +428,7 @@ var Highchart = function(){
gridLineColor:'#0F5680', gridLineColor:'#0F5680',
//minorGridLineWidth: 5, //minorGridLineWidth: 5,
//gridLineWidth: 5, //gridLineWidth: 5,
max:opts.maxValDev ? maxVal + maxVal * opts.maxValDev : null, // max:opts.maxValDev ? maxVal + maxVal * opts.maxValDev : null,
}, },
plotOptions: { plotOptions: {
column: { column: {
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment