Merge branch 'master' of http://106.246.249.162:13000/orderqueen/oqpo-view

src/main/webapp/mobile/js/app/main.js

@@ -225,7 +225,9 @@ var mobMainObj = {
 					bar: { groupWidth: "50%" },
 					width: chartWidth,
 				};
-				var chart = new google.charts.Bar(document.getElementById('ITP_PCH_REQ_GRAPH'));
+				const el=document.getElementById('ITP_PCH_REQ_GRAPH');
+				$(el).css('margin-top','16px');
+				var chart = new google.charts.Bar(el);
 				// chart.draw(data, options);
 				console.log("xx draw char req xx", param, data, chart)
 				chart.draw(data, google.charts.Bar.convertOptions(options));
@@ -244,7 +246,9 @@ var mobMainObj = {
 					bar: { groupWidth: "50%" },
 					width: chartWidth,
 				};
-				var chart = new google.charts.Bar(document.getElementById('ITP_PCH_PODR_GRAPH'));
+				const el=document.getElementById('ITP_PCH_PODR_GRAPH');
+				$(el).css('margin-top','16px');
+				var chart = new google.charts.Bar(el);
 				// chart.draw(data, options);
 				chart.draw(data, google.charts.Bar.convertOptions(options));
 
@@ -263,9 +267,9 @@ var mobMainObj = {
 					bars: 'horizontal',
 					width: chartWidth,
 				};
-				console.log("xxxxxxxxxxx drawChartReqUp xxxxxxxxxxx")
-
-				var chart = new google.charts.Bar(document.getElementById('ITP_PCH_REQ_UP_ITEM_GRAPH'));
+				const el=document.getElementById('ITP_PCH_REQ_UP_ITEM_GRAPH');
+				$(el).css('margin-top','40px');
+				var chart = new google.charts.Bar(el);
 				chart.draw(data, options);
 
 			}, 'GET');
@@ -279,14 +283,14 @@ var mobMainObj = {
 				var data = google.visualization.arrayToDataTable( eval(result.chartData) );
 
 				var options = {
-					// title: '정산',
+					title: '',
 					legend: { position: 'left' },
 					width: chartWidth,
 				};
-				var chart = new google.visualization.PieChart(document.getElementById('ITP_STTL_GRAPH'));
-				console.log("xxxxxxxxxxx drawChartcore xxxxxxxxxxx", data, options )
+				const el=document.getElementById('ITP_STTL_GRAPH');
+				var chart = new google.visualization.PieChart(el);
+				$(el).css('margin-top','40px');
 				chart.draw(data, options);
-
 			}, 'GET');
 		},
 		drawLine: function() {
@@ -301,15 +305,14 @@ var mobMainObj = {
 					width: chartWidth + 100,
 					legend: { position: 'top' }
 				};
-
-				var chart = new google.visualization.LineChart(document.getElementById('ITP_SAFE_STCK_GRAPH'));
+				const el=document.getElementById('ITP_SAFE_STCK_GRAPH');
+				$(el).css('margin-top','40px');
+				var chart = new google.visualization.LineChart(el);
 				chart.draw(data, options);
-
 			}, 'GET');
 		},
 		//수주내역 그래프
-		drawChartOrders() {
-			
+		drawChartOrders() {			
 			const key = { brandId:fn_make_user_info.get('brandId'), 
 						spplyId:fn_make_user_info.get('spplyId'), 
 						poType: $('#ITP_FORM_MAIN_SEARCH_ORDERS_TYPE').val() };
@@ -321,7 +324,9 @@ var mobMainObj = {
 					legend: { position: 'left' },
 					width: chartWidth,
 				};	
-				var chart = new google.charts.Bar(document.getElementById('ITP_ORDERS_GRAPH'));
+				const el=document.getElementById('ITP_ORDERS_GRAPH');
+				$(el).css('margin-top','16px');
+				var chart = new google.charts.Bar(el);
 				chart.draw(data, options);
 				
 			}, 'GET');
@@ -341,7 +346,9 @@ var mobMainObj = {
 					legend: { position: 'left' },
 					width: chartWidth,
 				};	
-				var chart = new google.charts.Bar(document.getElementById('ITP_DELI_GRAPH'));
+				const el=document.getElementById('ITP_DELI_GRAPH');
+				$(el).css('margin-top','16px');
+				var chart = new google.charts.Bar(el);
 				chart.draw(data, options);
 				
 			}, 'GET');
@@ -361,11 +368,12 @@ var mobMainObj = {
 					legend: { position: 'left' },
 					width: chartWidth,
 				};	
-				var chart = new google.charts.Bar(document.getElementById('ITP_RELEASE_GRAPH'));
+				const el=document.getElementById('ITP_RELEASE_GRAPH');
+				$(el).css('margin-top','16px');
+				var chart = new google.charts.Bar(el);
 				chart.draw(data, options);
 				
-			}, 'GET');
-			
+			}, 'GET');			
 		},
 		//구매발주 그래프
 		drawChartPodr() {
@@ -381,7 +389,9 @@ var mobMainObj = {
 					bar: { groupWidth: "50%" },
 					width: chartWidth,
 				};	
-				var chart = new google.charts.Bar(document.getElementById('ITP_PCH_PODR_GRAPH'));	
+				const el=document.getElementById('ITP_PCH_PODR_GRAPH');
+				$(el).css('margin-top','16px');
+				var chart = new google.charts.Bar(el);	
 				// chart.draw(data, options);
 				chart.draw(data, google.charts.Bar.convertOptions(options));