mirror of
https://github.com/Karaka-Management/jsOMS.git
synced 2026-01-24 15:38:41 +00:00
Init js vars
This commit is contained in:
parent
055df9df55
commit
ceee8a41d8
|
|
@ -111,10 +111,13 @@
|
|||
|
||||
this.chart.drawGrid(svg, xGrid, yGrid);
|
||||
|
||||
let dataPoint, dataPointEnter,
|
||||
let dataPoint = null,
|
||||
dataPointEnter = null,
|
||||
temp = this.drawData(svg, x, y, dataPointEnter, dataPoint);
|
||||
|
||||
dataPointEnter = temp[0];
|
||||
dataPoint = temp[1];
|
||||
|
||||
this.chart.drawMarker(svg, x, y, dataPointEnter, dataPoint);
|
||||
this.chart.drawLegend(svg, dataPointEnter, dataPoint);
|
||||
this.chart.drawText(svg);
|
||||
|
|
|
|||
|
|
@ -315,6 +315,8 @@
|
|||
}
|
||||
|
||||
if (this.dataSettings.info.visible && this.dataSettings.marker.visible) {
|
||||
temp = dataPointEnter.append('g').attr('class', 'dots');
|
||||
|
||||
let div = this.chartSelect.append("div").attr("class", "charttooltip").style("opacity", 0);
|
||||
div.html(self.axis.x.label.text + ': ' + 100 + "<br/>" + self.axis.y.label.text + ': ' + 100);
|
||||
|
||||
|
|
|
|||
|
|
@ -111,7 +111,8 @@
|
|||
|
||||
this.chart.drawGrid(svg, xGrid, yGrid);
|
||||
|
||||
let dataPoint, dataPointEnter,
|
||||
let dataPoint = null,
|
||||
dataPointEnter = null,
|
||||
temp = this.drawData(svg, x, y, dataPointEnter, dataPoint);
|
||||
dataPointEnter = temp[0];
|
||||
dataPoint = temp[1];
|
||||
|
|
@ -206,6 +207,7 @@
|
|||
{
|
||||
y.domain([yMin, yMax]);
|
||||
|
||||
// todo: n is undefined !!!!
|
||||
rect.transition()
|
||||
.duration(500)
|
||||
.delay(function (d, i)
|
||||
|
|
|
|||
|
|
@ -127,6 +127,8 @@
|
|||
{
|
||||
return y(d.y);
|
||||
});
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
|
||||
zoom = d3.behavior.zoom().x(x).scaleExtent([1, 2]).on('zoom', function ()
|
||||
|
|
@ -190,10 +192,13 @@
|
|||
//svg.selectAll('.x.axis').transition().duration(500).call(xAxis1);
|
||||
//svg.selectAll('.y.axis').transition().duration(500).call(yAxis1);
|
||||
|
||||
let dataPoint, dataPointEnter,
|
||||
let dataPoint = null,
|
||||
dataPointEnter = null,
|
||||
temp = this.drawData(svg, line, dataPointEnter, dataPoint);
|
||||
|
||||
dataPointEnter = temp[0];
|
||||
dataPoint = temp[1];
|
||||
|
||||
this.chart.drawMarker(svg, x, y, dataPointEnter, dataPoint);
|
||||
this.chart.drawLegend(svg, dataPointEnter, dataPoint);
|
||||
this.chart.drawText(svg);
|
||||
|
|
|
|||
|
|
@ -33,7 +33,8 @@
|
|||
+ (this.chart.margin.left) + ","
|
||||
+ (this.chart.margin.top) + ")");
|
||||
|
||||
let dataPoint, dataPointEnter,
|
||||
let dataPoint = null,
|
||||
dataPointEnter = null,
|
||||
temp = this.drawData(svg, dataPointEnter, dataPoint);
|
||||
dataPointEnter = temp[0];
|
||||
dataPoint = temp[1];
|
||||
|
|
|
|||
|
|
@ -145,7 +145,8 @@
|
|||
|
||||
this.chart.drawGrid(svg, xGrid, yGrid);
|
||||
|
||||
let dataPoint, dataPointEnter,
|
||||
let dataPoint = null,
|
||||
dataPointEnter = null,
|
||||
temp = this.drawData(svg, x, y, dataPointEnter, dataPoint);
|
||||
dataPointEnter = temp[0];
|
||||
dataPoint = temp[1];
|
||||
|
|
|
|||
|
|
@ -91,7 +91,8 @@
|
|||
|
||||
this.chart.drawGrid(svg, xGrid, yGrid);
|
||||
|
||||
let dataPoint, dataPointEnter,
|
||||
let dataPoint = null,
|
||||
dataPointEnter = null,
|
||||
temp = this.drawData(svg, x, y, dataPointEnter, dataPoint);
|
||||
dataPointEnter = temp[0];
|
||||
dataPoint = temp[1];
|
||||
|
|
|
|||
|
|
@ -103,7 +103,8 @@
|
|||
|
||||
this.chart.drawGrid(svg, xGrid, yGrid);
|
||||
|
||||
let dataPoint, dataPointEnter,
|
||||
let dataPoint = null,
|
||||
dataPointEnter = null,
|
||||
temp = this.drawData(svg, x, y, dataPointEnter, dataPoint);
|
||||
dataPointEnter = temp[0];
|
||||
dataPoint = temp[1];
|
||||
|
|
|
|||
|
|
@ -103,7 +103,8 @@
|
|||
|
||||
this.chart.drawGrid(svg, xGrid, yGrid);
|
||||
|
||||
let dataPoint, dataPointEnter,
|
||||
let dataPoint = null,
|
||||
dataPointEnter = null,
|
||||
temp = this.drawData(svg, x, y, dataPointEnter, dataPoint);
|
||||
dataPointEnter = temp[0];
|
||||
dataPoint = temp[1];
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user