Commit 09e09964 by lixinming

no message

parent adb65f61
...@@ -74,8 +74,8 @@ ...@@ -74,8 +74,8 @@
ret["api21"] = getKeyValue("营商业务互动性", excelData.营商业务互动性, false, false,false); ret["api21"] = getKeyValue("营商业务互动性", excelData.营商业务互动性, false, false,false);
ret["api22"] = { title:"图片", data:{ ret["api22"] = { title:"图片", data:{
"1":"qyrh1.png", "img1":"qyrh1.png",
"2":"qyrh2.png" "img2":"qyrh2.png"
} }; } };
res.send(ret); res.send(ret);
......
...@@ -170,7 +170,6 @@ export function getChartData(title, dataMap, unit, percent ) { ...@@ -170,7 +170,6 @@ export function getChartData(title, dataMap, unit, percent ) {
count += 1; count += 1;
data.data.total += value; data.data.total += value;
} }
data.yStepValue = Math.ceil(data.yMaxValue - data.yMinValue / count);
for (let key in dataMap) { for (let key in dataMap) {
let value = parseFloat(dataMap[key]); let value = parseFloat(dataMap[key]);
...@@ -183,6 +182,7 @@ export function getChartData(title, dataMap, unit, percent ) { ...@@ -183,6 +182,7 @@ export function getChartData(title, dataMap, unit, percent ) {
data.data.list.push(onceInfo) data.data.list.push(onceInfo)
} }
data.yMinValue = getChartMin(data.yMinValue); data.yMinValue = getChartMin(data.yMinValue);
data.yStepValue = getChartStepNumber(Math.ceil((data.yMaxValue - data.yMinValue) / count));
return data; return data;
} }
...@@ -217,7 +217,7 @@ export function getMoreYChartData(title, dataMap, percent, unit ) { ...@@ -217,7 +217,7 @@ export function getMoreYChartData(title, dataMap, percent, unit ) {
onceData.total += value; onceData.total += value;
} }
onceData.yStepValue = Math.ceil(onceData.yMaxValue - onceData.yMinValue / onceData.total); onceData.yStepValue = getChartStepNumber(Math.ceil(onceData.yMaxValue - onceData.yMinValue / onceData.total));
let thisUnit; let thisUnit;
if (percent) { if (percent) {
...@@ -251,6 +251,8 @@ export function getMoreYChartData(title, dataMap, percent, unit ) { ...@@ -251,6 +251,8 @@ export function getMoreYChartData(title, dataMap, percent, unit ) {
export function getSingleYAndMoreData(title, dataMap, percent, unit) { export function getSingleYAndMoreData(title, dataMap, percent, unit) {
let data = { title, dataList:[], yMaxValue:0, yMinValue:new Date().valueOf(), yStepValue:0, unit:"", total : 0 }; let data = { title, dataList:[], yMaxValue:0, yMinValue:new Date().valueOf(), yStepValue:0, unit:"", total : 0 };
let maxCount = 0;
for (let subDataName in dataMap) { for (let subDataName in dataMap) {
let onceData = { title:subDataName, list:[] }; let onceData = { title:subDataName, list:[] };
let thisDataCount = 0; let thisDataCount = 0;
...@@ -258,11 +260,15 @@ export function getSingleYAndMoreData(title, dataMap, percent, unit) { ...@@ -258,11 +260,15 @@ export function getSingleYAndMoreData(title, dataMap, percent, unit) {
let analysisMap = objKeyReplace(dataMap[subDataName]) let analysisMap = objKeyReplace(dataMap[subDataName])
let thisData = analysisMap.dataMap; let thisData = analysisMap.dataMap;
let thisMax = 0;
for (let key in thisData) { for (let key in thisData) {
let value = parseFloat(dataMap[key]); let value = parseFloat(dataMap[key]);
thisDataCount += value; thisDataCount += value;
thisMax += 1;
} }
maxCount = Math.max(maxCount, thisMax);
let thisUnit; let thisUnit;
if (percent) thisUnit = "%"; if (percent) thisUnit = "%";
else if (typeof unit == 'object') { else if (typeof unit == 'object') {
...@@ -287,11 +293,20 @@ export function getSingleYAndMoreData(title, dataMap, percent, unit) { ...@@ -287,11 +293,20 @@ export function getSingleYAndMoreData(title, dataMap, percent, unit) {
data.yMinValue = getChartMin(data.yMinValue); data.yMinValue = getChartMin(data.yMinValue);
data.yStepValue = Math.ceil(data.yMaxValue - data.yMinValue / data.total); data.yStepValue = getChartStepNumber( Math.ceil((data.yMaxValue - data.yMinValue) / maxCount));
return data; return data;
} }
function getChartStepNumber(number) {
let lenth = `${number}`.length;
let count = 1;
for (let i = 1; i < lenth; i++) {
count = count * 10;
}
return number + count - (number % count)
}
//字符模板 //字符模板
export function getStringMoreData(title, valueList) { export function getStringMoreData(title, valueList) {
let result = { title, data:{} }; let result = { title, data:{} };
......
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