Commit 41daf621 by chenjinjing

no message

parent 6e1a49e3
...@@ -9,6 +9,10 @@ export function getData(req, res) { ...@@ -9,6 +9,10 @@ export function getData(req, res) {
let moduleData; let moduleData;
switch(parseInt(typeName)) { switch(parseInt(typeName)) {
case MODULEENUM.键值数据:
moduleData = getKeyValueModule();
ret["keyValueApi"] = moduleData;
break;
case MODULEENUM.图表数据: case MODULEENUM.图表数据:
moduleData = getCharModule(); moduleData = getCharModule();
ret["charApi"] = moduleData; ret["charApi"] = moduleData;
...@@ -30,7 +34,7 @@ export function getData(req, res) { ...@@ -30,7 +34,7 @@ export function getData(req, res) {
ret["scatterFigureApi"] = moduleData; ret["scatterFigureApi"] = moduleData;
break; break;
default: default:
moduleData = getKeyValueModule(); moduleData = getScatterFigureModule();
ret["keyValueApi"] = moduleData; ret["keyValueApi"] = moduleData;
break; break;
} }
......
...@@ -37,15 +37,15 @@ export function getStringListModule() { ...@@ -37,15 +37,15 @@ export function getStringListModule() {
export function getScatterFigureModule() { export function getScatterFigureModule() {
let dataList; let dataList;
dataList = generateArr(5, 2, 10, 100, "", "y", "x"); dataList = generateScatterFigureArr(5, 3, 10, 100, "x");
let result = getScatterFigureOutData("撒点图数据", analysisExcelDataOfList(dataList)); let result = getScatterFigureOutData("撒点图数据", analysisExcelDataOfList(dataList, false));
return result; return result;
} }
export function getDataListModule() { export function getDataListModule() {
let dataList; let dataList;
dataList = generateArr(5, 4, 10, 100, "数据名称", "标题"); dataList = generateArr(5, 3, 10, 100, "数据名称", "标题");
let result = getListOutData("列表数据", planarArrBecomeListData(dataList)); let result = getListOutData("列表数据", planarArrBecomeListData(dataList, true));
return result; return result;
} }
...@@ -59,7 +59,7 @@ export function getRadarModule() { ...@@ -59,7 +59,7 @@ export function getRadarModule() {
export function generateArr(x, y, min, max, xName="", yName="", titleName="数据名称") { export function generateArr(x, y, min, max, xName="", yName="", titleName="数据名称") {
var arr = []; var arr = [];
arr[0] = [titleName]; arr[0] = [titleName];
for(var i = 1;i < x; i++){ for(var i = 1;i <= x; i++){
arr[i] = []; arr[i] = [];
arr[i][0] = xName+i; arr[i][0] = xName+i;
for(var j = 1;j < y; j++){ for(var j = 1;j < y; j++){
...@@ -74,3 +74,17 @@ export function generateArr(x, y, min, max, xName="", yName="", titleName="数 ...@@ -74,3 +74,17 @@ export function generateArr(x, y, min, max, xName="", yName="", titleName="数
return arr; return arr;
} }
export function generateScatterFigureArr(x, y, min, max, titleName="数据名称") {
var arr = [];
arr[0] = [titleName];
arr[0][1] = "y";
for(var i = 1;i <= x; i++){
arr[i] = [];
for(var j = 0;j < y; j++){
arr[0][2] = "name";
arr[i][j] = rand(min, max);
}
arr[i][2] = "name"+i;
}
return arr;
}
...@@ -6,4 +6,4 @@ async function lanuch() { ...@@ -6,4 +6,4 @@ async function lanuch() {
} }
lanuch(); lanuch();
\ No newline at end of file
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