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

src/main/webapp/ux/co/co0103/CO01030001U.xml

@@ -678,7 +678,7 @@
 								<w2:column width="120" id="column26" value="G.매출액&lt;br/&gt;[ A*D ]&lt;br/&gt;(VAT제외)" rowSpan="2"></w2:column>
 								<w2:column width="120" id="column27" value="H.매출총이익&lt;br/&gt;[ G-F ]" rowSpan="2"></w2:column>
 								<w2:column width="120" id="column28" value="준공예정원가" rowSpan="2"></w2:column>
-								<w2:column width="120" id="column29" value="준공예정원가율&lt;br/&gt;(도급액대비)" rowSpan="2"></w2:column>
+								<w2:column width="120" id="column29" value="준공예정원가율%&lt;br/&gt;(도급액대비)" rowSpan="2"></w2:column>
 								<w2:column width="120" id="column30" value="I.미청구공사&lt;br/&gt;[ G-J ]&lt;br/&gt;(VAT제외)" rowSpan="2"></w2:column>
 								<w2:column width="120" id="column31" value="J.기성청구액&lt;br/&gt;누계&lt;br/&gt;(VAT제외)" rowSpan="2"></w2:column>
 								<w2:column width="120" id="column32" value="K.기성청구액&lt;br/&gt;누계&lt;br/&gt;(VAT포함)" rowSpan="2"></w2:column>
@@ -739,8 +739,8 @@
 								<w2:column width="70" id="complAmtPlan" textAlign="right" dataType="number" displayFormat="#,###,###" inputType="link"
 									style="text-decoration:underline;">
 								</w2:column>
-								<w2:column width="70" id="complAmtPlanRt" textAlign="right" displayFormat="###.##%" dataType="number" inputType="link"
-									style="text-decoration:underline;">></w2:column>
+								<w2:column width="70" id="complAmtPlanRt" textAlign="right" displayFormat="###.##" dataType="number" inputType="link"
+									style="text-decoration:underline;"></w2:column>
 								<w2:column width="70" id="nonPyrqNasAmt" textAlign="right" dataType="number" displayFormat="#,###,###"></w2:column>
 								<w2:column width="70" id="pyrqNasAmt" textAlign="right" dataType="number" displayFormat="#,###,###"></w2:column>
 								<w2:column width="70" id="pyrqAmt" textAlign="right" dataType="number" displayFormat="#,###,###"></w2:column>
@@ -876,7 +876,7 @@
 								<w2:column id="notAdventCtmnAmt" value="미수금(미경과)" width="100"></w2:column>
 								<w2:column id="nonPyrqNasAmt" value="미청구공사" width="100"></w2:column>
 								<w2:column id="complAmtPlan" value="준공예정원가" width="100"></w2:column>
-								<w2:column id="complAmtPlanRt" value="준공예정원가율&lt;br/&gt;(도급액대비)" width="100"></w2:column>
+								<w2:column id="complAmtPlanRt" value="준공예정원가율%&lt;br/&gt;(도급액대비)" width="100"></w2:column>
 							</w2:row>
 						</w2:header>
 						<w2:gBody id="gBody1" style="">
@@ -895,7 +895,7 @@
 								<w2:column dataType="number" displayFormat="#,###,###" id="complAmtPlan" textAlign="right" width="70" inputType="link"
 									style=";text-decoration:underline;">
 								</w2:column>
-								<w2:column dataType="number" displayFormat="###.##%" id="complAmtPlanRt" textAlign="right" width="70" inputType="link"
+								<w2:column dataType="number" displayFormat="###.##" id="complAmtPlanRt" textAlign="right" width="70" inputType="link"
 									style=";text-decoration:underline;"></w2:column>
 							</w2:row>
 						</w2:gBody>

src/main/webapp/ux/co/co0105/CO01050001U.xml

@@ -129,7 +129,7 @@
 		udcYm.setValue(dateLib.addDays(dateLib.getCurrentDate('yyyyMMdd'), -15).substring(0, 6));	//기준년월
 		scwin.getComboCcgrp();	//본부
 		selCo001.setValue( tabc_layout_contents_1816_body_CO001.getCellData( tabc_layout_contents_1816_body_CO001.getMatchedIndex( "ESBS_CD1" , "Y" , true) , "CODE_CD" ) ); //금액단위
-		selCo002.setValue( tabc_layout_contents_1816_body_CO002.getCellData( tabc_layout_contents_1816_body_CO002.getMatchedIndex( "ESBS_CD1" , "Y" , true) , "CODE_CD" ) ); //조회기준
+		selCo002.setValue( tabc_layout_contents_1816_body_CO002.getCellData( tabc_layout_contents_1816_body_CO002.getMatchedIndex( "ESBS_CD3" , "Y" , true) , "CODE_CD" ) ); //조회기준
 		view01.show();
 		view02.hide();
 		scwin.grdSearch1();
@@ -211,6 +211,7 @@
 			view02.hide();
 			select02.setDisabled( false );
 			select04.setDisabled( false );
+			selCo002.setValue( tabc_layout_contents_1816_body_CO002.getCellData( tabc_layout_contents_1816_body_CO002.getMatchedIndex( "ESBS_CD3" , "Y" , true) , "CODE_CD" ) ); //조회기준
 			scwin.grdSearch1();
 		}
 		if(rdoGubun.getValue() == "02"){
@@ -218,6 +219,7 @@
 			view02.show();
 			select02.setDisabled( false );
 			select04.setDisabled( false );
+			selCo002.setValue( tabc_layout_contents_1816_body_CO002.getCellData( tabc_layout_contents_1816_body_CO002.getMatchedIndex( "ESBS_CD4" , "Y" , true) , "CODE_CD" ) ); //조회기준
 			scwin.grdSearch2();
 		}
 	};
@@ -326,21 +328,25 @@
 					grdData1.setCellColor( i , "adventAmtN" , "blue" );	//미수금(미경과)
 		    	}
 		    	
-		    	var options1 = {
-					"caption": "미수금 현황",
-					"subcaption": "",
-        			"xaxisname": "",
-					"yAxisName": tabc_layout_contents_1816_body_CO001.getCellData( selCo001.getSelectedIndex() , "ESBS_CD3" ),
-					"labelDisplay": "AUTO",
-					"showvalues": "1",
-			        "numberprefix": "",
-			        "numVisiblePlot": "30",
-			        "scrollheight": "12",
-			        "flatScrollBars": "1",
-			        "scrollShowButtons": "1",
-			        "scrollColor": "#cccccc",
-			        "showHoverEffect": "1",
-			        "theme": "fusion",
+				var options1 = {
+					"theme": "fusion",
+                	"caption": "미수금 현황", //그래프명
+			        "subcaption": "", //서브명
+			        "xaxisname": "", //X축 명
+			        "yaxisname": tabc_layout_contents_1816_body_CO001.getCellData( selCo001.getSelectedIndex() , "ESBS_CD3" ), //Y축명
+			        "labelDisplay": "AUTO", //x라벨 표현 방식(AUTO,WRAP,STAGGER,ROTATE,NONE)
+			        "showvalues": "1", //value 표시(0=N,1=Y)
+			        "placeValuesInside": "0", //value 위치(0=OUTSIDE,1=INSIDE)
+			        "rotateValues": "0", //value 표기방법(0=가로,1=세로)
+			        "valueFontColor": "#333333", //valueFontColor
+			        "numDivLines" : "", //x축 단위 표시 갯수
+			        "numberprefix": "", //단위
+			        "numVisiblePlot": "30", //그래프 표시 갯수
+			        "scrollheight": "12", //스크롤높이
+			        "flatScrollBars": "1", //스크롤 스타일
+			        "scrollShowButtons": "1", //스크롤 화살표(0=N,1=Y)
+			        "scrollColor": "#cccccc", //스크롤 색상
+			        "showHoverEffect": "1" //
 				};
 				chart1.setChartAttribute(options1);
 				
@@ -428,21 +434,25 @@
                 dcdataList3.setJSON(result);
 		    	dcdataList3.setRowPosition( 0 );
 		    	
-		    	var options1 = {
-                	"theme": "fusion",
-					"caption": "미청구 현황",
-					"subcaption": "",
-        			"xaxisname": "",
-					"yAxisName": tabc_layout_contents_1816_body_CO001.getCellData( selCo001.getSelectedIndex() , "ESBS_CD3" ),
-					"labelDisplay": "AUTO",
-					"showvalues": "1",
-			        "numberprefix": "",
-			        "numVisiblePlot": "30",
-			        "scrollheight": "12",
-			        "flatScrollBars": "1",
-			        "scrollShowButtons": "1",
-			        "scrollColor": "#cccccc",
-			        "showHoverEffect": "1",
+				var options1 = {
+					"theme": "fusion",
+                	"caption": "미청구 현황", //그래프명
+			        "subcaption": "", //서브명
+			        "xaxisname": "", //X축 명
+			        "yaxisname": tabc_layout_contents_1816_body_CO001.getCellData( selCo001.getSelectedIndex() , "ESBS_CD3" ), //Y축명
+			        "labelDisplay": "AUTO", //x라벨 표현 방식(AUTO,WRAP,STAGGER,ROTATE,NONE)
+			        "showvalues": "1", //value 표시(0=N,1=Y)
+			        "placeValuesInside": "0", //value 위치(0=OUTSIDE,1=INSIDE)
+			        "rotateValues": "0", //value 표기방법(0=가로,1=세로)
+			        "valueFontColor": "#333333", //valueFontColor
+			        "numDivLines" : "", //x축 단위 표시 갯수
+			        "numberprefix": "", //단위
+			        "numVisiblePlot": "30", //그래프 표시 갯수
+			        "scrollheight": "12", //스크롤높이
+			        "flatScrollBars": "1", //스크롤 스타일
+			        "scrollShowButtons": "1", //스크롤 화살표(0=N,1=Y)
+			        "scrollColor": "#cccccc", //스크롤 색상
+			        "showHoverEffect": "1" //
 				};
 				chart2.setChartAttribute(options1);
 				

src/main/webapp/ux/co/co0107/CO01070001U.xml

@@ -478,7 +478,7 @@
 									value="준공<br/>예정원가<br/>(B)=ⓐ+ⓑ" blockSelect="false" displayMode="label" rowSpan="3">
 								</w2:column>
 								<w2:column removeBorderStyle="false" width="50" inputType="text" id="column6"
-									value="준공예정&lt;br/&gt;원가율" blockSelect="false" displayMode="label" rowSpan="3">
+									value="준공예정&lt;br/&gt;원가율%" blockSelect="false" displayMode="label" rowSpan="3">
 								</w2:column>
 								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column7"
 									value="실행예산&lt;br/&gt;초과 Risk&lt;br/&gt;(A) - (B)" blockSelect="false" displayMode="label" rowSpan="3">
@@ -555,7 +555,7 @@
 									displayMode="label" textAlign="right" displayFormat="#,###" dataType="number">
 								</w2:column>
 								<w2:column removeBorderStyle="false" width="70" inputType="text" id="complAmtPlanRt" blockSelect="false"
-									displayMode="label" textAlign="" displayFormat="###.##%" dataType="number">
+									displayMode="label" textAlign="" displayFormat="###.##" dataType="number">
 								</w2:column>
 								<w2:column removeBorderStyle="false" width="70" inputType="text" id="actAmtOver" blockSelect="false"
 									displayMode="label" textAlign="right" displayFormat="#,###" dataType="number">