diff --git a/Bench4Q-Web/src/main/java/org/bench4q/web/api/Main.java b/Bench4Q-Web/src/main/java/org/bench4q/web/api/Main.java index 2fdaa230..7b0fa3a9 100644 --- a/Bench4Q-Web/src/main/java/org/bench4q/web/api/Main.java +++ b/Bench4Q-Web/src/main/java/org/bench4q/web/api/Main.java @@ -2,16 +2,11 @@ package org.bench4q.web.api; import java.io.FileOutputStream; import java.io.OutputStream; -import java.util.Date; import java.util.LinkedList; import java.util.List; - import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.bind.Marshaller; - -import org.bench4q.share.helper.MarshalHelper; -import org.bench4q.share.models.master.statistics.ScriptPagesBriefModel; import org.bench4q.web.model.ResultInfoModel; import org.bench4q.web.model.TestResult; diff --git a/Bench4Q-Web/src/main/webapp/script/testResult/graphSelector.js b/Bench4Q-Web/src/main/webapp/script/testResult/graphSelector.js index 8f8a7064..d9b5ca46 100644 --- a/Bench4Q-Web/src/main/webapp/script/testResult/graphSelector.js +++ b/Bench4Q-Web/src/main/webapp/script/testResult/graphSelector.js @@ -9,6 +9,7 @@ var ChartSelector = function(allTree, showTree, chart, addSelectorId, this.addButton = addButton; this.deleteButton = deleteButton; this.createSelector($("#" + addSelectorId), this.excessTree.root); + this.createSelector($("#" + deleteSelectorId), this.showTree.root); this.chart = chart; this.addEventListener(this); }; @@ -190,8 +191,8 @@ ChartSelector.prototype.addGraph = function() { }; ChartSelector.prototype.initChart = function() { var model = new Model(); - model.setSeries(this.getSelectedNames(this.addSelectorId)); - model.setUrl(this.getSlectedVluesArray(this.addSelectorId), this); + model.setSeries(this.getSelectedNames(this.deleteSelectorId)); + model.setUrl(this.getSlectedVluesArray(this.deleteSelectorId), this); model.axis = (model.series + "_Axis"); this.chart.addGraph(model); }; diff --git a/Bench4Q-Web/src/main/webapp/script/testResult/resultNew.js b/Bench4Q-Web/src/main/webapp/script/testResult/resultNew.js index f49b5b31..02627bf4 100644 --- a/Bench4Q-Web/src/main/webapp/script/testResult/resultNew.js +++ b/Bench4Q-Web/src/main/webapp/script/testResult/resultNew.js @@ -4,11 +4,11 @@ var testStatus; $(function() { var testPlanId = getvars()['testPlanId']; var testPlan = getTestInfo(testPlanId); - // getTestBrief(); +// getTestBrief(); loadPageResult(testPlanId, testPlan.scripts); - - var behavior=new Behavior(); - behavior.loadBehaviorResults(testPlanId, testPlan.scripts); + +// var behavior = new Behavior(); +// behavior.loadBehaviorResults(testPlanId, testPlan.scripts); var tree = getResultTree(testPlanId); var chart = new Chart(); chart.createChart($("#chart")); @@ -16,9 +16,9 @@ $(function() { getShowTreePathValues(tree)); chartSelector.initChart(); graphButtonListener(chartSelector); -// var behaviorResult = new BehaviorResult(); -// behaviorResult.getResult(testPlanId, getScriptList(testPlanId)); -// // var pageResult = new PageResult(); + // var behaviorResult = new BehaviorResult(); + // behaviorResult.getResult(testPlanId, getScriptList(testPlanId)); + // // var pageResult = new PageResult(); // pageResult.getResult(testPlanId, getScriptList(testPlanId)); var urlContentTypeDistribution = new UrlContentTypeDistribution( "url-distribution", testPlanId);