Merge branch 'master' of http://211.38.140.247:3000/sgc/sgc-portal

src/main/webapp/ux/co/co0109/CO01090001P.xml

@@ -169,7 +169,7 @@
 				};
 				chart1.applyStyle("font", "captionFont", options2, ["caption"]);
 				
-				//chart1.setPlotColor(["#aa0752","#f2c500","#165387"]);
+				chart1.setPlotColor(["#0075c2","#1aaf5d","#165387"]);
 				
 				chart1.refresh();
 				

src/main/webapp/ux/co/co0109/CO01090001U.xml

@@ -92,7 +92,6 @@
 		udcYm.setValue(dateLib.addDays(dateLib.getCurrentDate('yyyyMMdd'), -15).substring(0, 6));	//기준년월
 		scwin.getComboCcgrp();	//본부
 		selCo001.setValue( tabc_layout_contents_1824_body_CO001.getCellData( tabc_layout_contents_1824_body_CO001.getMatchedIndex( "ESBS_CD1" , "Y" , true) , "CODE_CD" ) ); //금액단위
-		AAAAA.hide();
 		scwin.grdSearch1();
     };
 
@@ -305,6 +304,8 @@
 				};
 				chart1.applyStyle("font", "captionFont", options2, ["caption"]);
 				
+				chart1.setPlotColor(["#0075c2","#1aaf5d","#165387","#165387"]);
+				
 				chart1.refresh();
 				
 				dataPlotClick = function(eventObj, dataObj) {
@@ -314,9 +315,6 @@
 		        x = chart1.fc();
 		        x.addEventListener ("dataPlotClick" , dataPlotClick );
 		        chart1.draw();
-		
-				//option = "[[{'id':'orcoContAmt','renderas':'Dot'},{'id':'orcoActAmt','renderas':'Dot'},{'id':'complAmtPlan','renderas':'Dot'},{'id':'risk','renderas':'Dot'}]]";
-	            //chart1.setChartColumnRef('data:dcdataList1','ccNm',option);
 				
 				//chart2
 				var options1 = {
@@ -349,6 +347,8 @@
 				};
 				chart2.applyStyle("font", "captionFont", options2, ["caption"]);
 				
+				chart2.setPlotColor(["#aa0752"]);
+				
 				chart2.refresh();
 				
 				dataPlotClick = function(eventObj, dataObj) {
@@ -483,10 +483,13 @@
 					<xf:group class="" id="" style="">
 						<w2:fusionchart accessibility="false" chartType="ScrollColumn2D" drawType="javascript" id="chart1" labelNode="ccNm"
 							ref="data:dcdataList1" runflashAt="IE6,IE7,IE8" seriesColumns="[['orcoContAmt','orcoActAmt','complAmtPlan','risk']]" seriesType="advanced"
-							style="height:640px;">
+							style="height:440px;">
 						</w2:fusionchart>
 					</xf:group>
-					<xf:group class="" id="AAAAA" style="">
+					<xf:group class="dfbox" id="dfbox1" style="">
+						<xf:group class="dfbox pt0" id="" style=""></xf:group>
+					</xf:group>
+					<xf:group class="" id="" style="">
 						<w2:fusionchart accessibility="false" chartType="ScrollColumn2D" drawType="javascript" id="chart2" labelNode="ccNm"
 							ref="data:dcdataList1" runflashAt="IE6,IE7,IE8" seriesColumns="[['risk']]" seriesType="advanced"
 							style="height: 440px;">