+
\ No newline at end of file
Index: arms/js/dashboard/chart/barChartOnPolar.js
===================================================================
diff -u -rb3c1385e85f9b8b735eadcb6df7e117b02b66425 -rd6a8675bcddcb918becf595b68d1ffdd032746b6
--- arms/js/dashboard/chart/barChartOnPolar.js (.../barChartOnPolar.js) (revision b3c1385e85f9b8b735eadcb6df7e117b02b66425)
+++ arms/js/dashboard/chart/barChartOnPolar.js (.../barChartOnPolar.js) (revision d6a8675bcddcb918becf595b68d1ffdd032746b6)
@@ -117,4 +117,71 @@
window.onresize = function() {
myChart.resize();
};
+}
+
+function drawBarOnPolar2(target, categories) {
+ var chartDom = document.getElementById(target);
+ var myChart = echarts.init(chartDom);
+
+ var _categories = (categories === undefined ? ["데이터 없음"] : categories);
+
+ var option = {
+ angleAxis: {
+ type: 'category',
+ data: categories
+ },
+ radiusAxis: {},
+ polar: {},
+ series: [
+ {
+ type: 'bar',
+ data: [1, 2, 3, 4, 3, 5, 1],
+ coordinateSystem: 'polar',
+ name: 'A',
+ stack: 'a',
+ emphasis: {
+ focus: 'series'
+ }
+ },
+ {
+ type: 'bar',
+ data: [2, 4, 6, 1, 3, 2, 1],
+ coordinateSystem: 'polar',
+ name: 'B',
+ stack: 'a',
+ emphasis: {
+ focus: 'series'
+ }
+ },
+ {
+ type: 'bar',
+ data: [1, 2, 3, 4, 1, 2, 5],
+ coordinateSystem: 'polar',
+ name: 'C',
+ stack: 'a',
+ emphasis: {
+ focus: 'series'
+ }
+ },
+ {
+ type: 'bar',
+ data: [2, 2, 2, 2, 4, 2, 1],
+ coordinateSystem: 'polar',
+ name: 'D',
+ stack: 'a',
+ emphasis: {
+ focus: 'series'
+ }
+ }
+ ],
+ legend: {
+ show: true,
+ data: ['A', 'B', 'C', 'D']
+ }
+ };
+ myChart.setOption(option);
+
+ window.onresize = function() {
+ myChart.resize();
+ };
}
\ No newline at end of file
Index: arms/js/dashboard/chart/infographic_custom.css
===================================================================
diff -u -r61c7b7d78fe668cc4ec7ed3bde2f7bd6a3afaf16 -rd6a8675bcddcb918becf595b68d1ffdd032746b6
--- arms/js/dashboard/chart/infographic_custom.css (.../infographic_custom.css) (revision 61c7b7d78fe668cc4ec7ed3bde2f7bd6a3afaf16)
+++ arms/js/dashboard/chart/infographic_custom.css (.../infographic_custom.css) (revision d6a8675bcddcb918becf595b68d1ffdd032746b6)
@@ -2757,8 +2757,7 @@
margin-top: 10px;
margin-bottom: 10px;
/*padding: 0 0 35px;*/
- width: 1080px;
- /*width: 790px;*/
+ width: 880px;
height: initial;
}
.infographic.basic .timeline .graph,
Index: arms/js/dashboard/chart/timeline_custom.js
===================================================================
diff -u -r61c7b7d78fe668cc4ec7ed3bde2f7bd6a3afaf16 -rd6a8675bcddcb918becf595b68d1ffdd032746b6
--- arms/js/dashboard/chart/timeline_custom.js (.../timeline_custom.js) (revision 61c7b7d78fe668cc4ec7ed3bde2f7bd6a3afaf16)
+++ arms/js/dashboard/chart/timeline_custom.js (.../timeline_custom.js) (revision d6a8675bcddcb918becf595b68d1ffdd032746b6)
@@ -16,7 +16,7 @@
startYear: null,
endYear: null,
yearLength: 0,
- maxWidth: 1080,//widgetWidth,//1080,
+ maxWidth: 880,//widgetWidth,//1080,
width: 0,
lastWidth: 0,
lastStart: {
@@ -154,13 +154,16 @@
if (d.startDate <= data[i - 1].endDate) {
return data[i - 1].height + 10;
+ } else {
+ return data[i - 1].height + 20;
}
return 20;
})();
// 타임라인 z-index
d.zIndex = (function () {
+ console.log("i(z-index) =" + i);
if (i === 0) return 9999;
if (d.startDate <= data[i - 1].endDate) {
@@ -171,7 +174,7 @@
})();
// 라벨 높이 레벨을 정한다
- d.labelHeight = d.height * 2 + 10;
+ d.labelHeight = d.height * 2 + 20;
//d.labelHeight = d.height * 2 + 20;
}
},