Explorar el Código

git-svn-id: https://192.168.57.71/svn/jsgkj@1245 931142cf-59ea-a443-aa0e-51397b428577

xt_xuhao hace 8 años
padre
commit
c0a50070d0
Se han modificado 20 ficheros con 567 adiciones y 53 borrados
  1. 6 1
      gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/model/jyr/JyrEditModel.as
  2. 19 4
      gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/model/zyfzndjy/GkwxhwzyfzblhhzModel.as
  3. 70 0
      gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/Check/count/DcCount.mxml
  4. 16 1
      gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/Check/tj/Zcdcfb.mxml
  5. 5 3
      gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/bagl/yjyaba/YjyabaLayoutNoFlow.mxml
  6. 6 3
      gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/jyr/JyrEdit.mxml
  7. 7 0
      gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/jyr/JyrView.mxml
  8. 1 1
      gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/jyrxxgl/tj/Gkjyrxxtj.mxml
  9. 7 8
      gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/jyrxxgl/tj/whqytj.mxml
  10. 25 17
      gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/sgalgl/Sgalgl.mxml
  11. 18 3
      gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/whsptj/Whfb.mxml
  12. 350 6
      gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/whsptj/WxhwspTj.mxml
  13. 5 1
      gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/yjgl/tj/Yjgltj.mxml
  14. 1 1
      gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/yjgl/tj/Zdwxyfb.mxml
  15. 1 1
      gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/zyfzndjy/FzChoose.mxml
  16. 2 1
      gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/zyfzndjy/GkwxhwzyfzblhhzLayout.mxml
  17. 2 1
      gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/zyfzndjy/GkwxhwzyfzblhhzLayoutNoFlow.mxml
  18. 1 1
      gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/zysqbp/HssbLayout.mxml
  19. 20 0
      gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/zysqbp/count/WhzysbContainerCount.mxml
  20. 5 0
      gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/vo/jyr/JyrVo.as

+ 6 - 1
gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/model/jyr/JyrEditModel.as

@@ -127,6 +127,8 @@ package com.jtgh.yjpt.model.jyr
 		}
 
 		public function init():void {
+			if(vo.dangerSrcUnitNum.toString()=="NaN")
+				thisView.dangerSrcUnitNum.text="";
 			if(vo.zczb.toString()=="NaN")
 				thisView.zczb.text="";
 			if(vo.tzze.toString()=="NaN")
@@ -249,7 +251,10 @@ package com.jtgh.yjpt.model.jyr
 			vo.fzyxq=thisView.fzyxq.dateTime as Date;
 			vo.bayxq=thisView.bayxq.dateTime as Date;
 			vo.qyxz="";
-			vo.byzd1=""
+			vo.byzd1="";
+			//重大危险源单元(个)
+			vo.dangerSrcUnitNum = new Number( thisView.dangerSrcUnitNum.text);
+			
 			var i:Number=0;
 			for(i=0;i<7;i++){
 				var name:String="bw"+i;

+ 19 - 4
gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/model/zyfzndjy/GkwxhwzyfzblhhzModel.as

@@ -4,7 +4,7 @@ package com.jtgh.yjpt.model.zyfzndjy
 	import com.jtgh.yjpt.common.Global;
 	import com.jtgh.yjpt.common.IModule;
 	import com.jtgh.yjpt.common.component.ui.DataGridColumn;
-	import com.jtgh.yjpt.common.component.ui.Pager;
+	import com.jtgh.yjpt.common.component.ui.ZysqbpPager;
 	import com.jtgh.yjpt.common.component.ui.PopImageMX;
 	import com.jtgh.yjpt.common.util.Constants;
 	import com.jtgh.yjpt.common.util.Utils;
@@ -63,10 +63,11 @@ package com.jtgh.yjpt.model.zyfzndjy
 	public class GkwxhwzyfzblhhzModel extends BaseModel
 	{
 		public var thisView:Object;
-		public var pager:Pager;
+		public var pager:ZysqbpPager;
 		public var canLink:Boolean = false;
 		public var fzs:ArrayCollection ;
 		public var editView:Object;
+		public var text:String;//用于 作业“附证”申请 列表页脚显示有附证的企业数量
 		public var thisDataList:ArrayCollection;
 		public static var instance:GkwxhwzyfzblhhzModel=new GkwxhwzyfzblhhzModel;
 		public function GkwxhwzyfzblhhzModel()
@@ -527,6 +528,20 @@ package com.jtgh.yjpt.model.zyfzndjy
 			
 			Utils.callRemote("gkwxhwzyfzblhhzcontroller", queryAction, 
 				resultCallback,Utils.getFunctionId(thisView), pager, jyr,szd,gq,whdj,lcStatus,fddbr);
+			
+			if(queryAction == "list"){
+				Utils.callRemote("gkwxhwzyfzblhhzcontroller", "countValidFz_Jyr", function (r:ResultEvent):void{
+					var bc:BusinessContext = r.result as BusinessContext;
+					var validFzRecords:String  = bc.getAttribute("validFz") as String;
+					var validFzJyrMtRecords:String  = bc.getAttribute("validFzJyrMt") as String;
+					var validFzJyrMtJzxRecords:String  = bc.getAttribute("validFzJyrMtJzx") as String;
+					var validFzJyrCcRecords:String  = bc.getAttribute("validFzJyrCc") as String;
+					text = "附证在有效期之内的危货港口经营人共有<font color='#ff0000'>" + validFzRecords + "</font>" + "个,码头企业<font color='#ff0000'>" 
+					     + validFzJyrMtRecords + "</font>" + "个,其中危险货物集装箱码头经营人<font color='#ff0000'>"+ validFzJyrMtJzxRecords +"</font>个,仓储企业<font color='#ff0000'>"
+						 + validFzJyrCcRecords + "</font>个";
+					
+				},szd,gq,whdj);
+			}
 		}
 
 		/**
@@ -720,7 +735,7 @@ package com.jtgh.yjpt.model.zyfzndjy
 			editView.vo= vo;
 			editView.view=view;
 			editView.model=this;
-			Utils.popupWindow("附证发放信息", editView as DisplayObject, thisView as DisplayObject,null,880,720);
+			Utils.popupWindow("附证发放信息", editView as DisplayObject, thisView as DisplayObject,null,880,550);
 		}
 		/**
 		 * 附证新增行操作
@@ -768,7 +783,7 @@ package com.jtgh.yjpt.model.zyfzndjy
 			editView.mode = Constants.mode_edit;
 			editView.view=view;
 			editView.model=this;
-			Utils.popupWindow("附证发放信息", editView as DisplayObject, thisView as DisplayObject,null,880,720);
+			Utils.popupWindow("附证发放信息", editView as DisplayObject, thisView as DisplayObject,null,880,550);
 		}
 		
 		/**

+ 70 - 0
gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/Check/count/DcCount.mxml

@@ -25,7 +25,23 @@
 			public var flag:Boolean=true;
 			[Bindable]
 			public var charDataList:ArrayCollection=new ArrayCollection();
+			[Bindable]
+			public var tj1:ArrayCollection=new ArrayCollection();
+			[Bindable]
+			public var tj2:ArrayCollection=new ArrayCollection();
+			[Bindable]
+			public var tj3:ArrayCollection=new ArrayCollection();
 
+			private function labelFun(data:Object, field:String, index:Number, percentValue:Number):String
+			{
+				var str:String;
+				var len:Number=String(data.NUM).length;
+				if(len<4)
+					str="      ";
+				else 
+					str="              "
+				return data.NAME+str;
+			}
 			public function downLond(event:MouseEvent):void{
 				if(tjsjq.dateTime==null){
 					Alert.show("请选择统计的开始时间", "提示");
@@ -73,6 +89,9 @@
 				Utils.callRemote("dcController","countEvent",function (r:ResultEvent):void{
 					var bc:BusinessContext=r.result as BusinessContext;
 					charDataList=bc.getAttribute("countList") as ArrayCollection;
+					tj1=bc.getAttribute("tj1") as ArrayCollection;
+					tj2=bc.getAttribute("tj2") as ArrayCollection;
+					tj3=bc.getAttribute("tj3") as ArrayCollection;
 				},szd1,tjsjq,tjsjz);
 			}
 
@@ -169,6 +188,57 @@
 					</mx:groupedColumns>
 				</mx:AdvancedDataGrid>
 			</mx:VBox>
+			
+				<s:HGroup width="100%" height="100%" >
+					<mx:Legend right="4" top="4" dataProvider="{colChart}"/>
+					<mx:ColumnChart id="colChart"  width="100%"
+									showDataTips="true" height="200" dataProvider="{tj1}" >
+						<mx:horizontalAxis>
+							<mx:CategoryAxis  id="xx" categoryField="NAME" />
+						</mx:horizontalAxis>
+						<mx:verticalAxis>
+							<mx:LinearAxis/>
+						</mx:verticalAxis>
+						<mx:series>
+							<mx:ColumnSeries displayName="隐患总数" yField="YHNUM" id="dc1"  maxColumnWidth="20" chromeColor="#F9837F"  labelPosition="inside" labelAlign="top" >
+								<mx:fill>
+									<s:SolidColor color="#F9847F"/>
+								</mx:fill>
+							</mx:ColumnSeries>
+							<mx:ColumnSeries displayName="已整改数量" yField="YZGNUM" id="dc2"  maxColumnWidth="20" chromeColor="#F9837F"  labelPosition="inside" labelAlign="top" >
+								<mx:fill>
+									<s:SolidColor color="#30BAAA"/>
+								</mx:fill>
+							</mx:ColumnSeries>
+							<mx:ColumnSeries displayName="重大隐患数量" yField="ZDYHNUM" id="dc3"  maxColumnWidth="20" chromeColor="#F9837F"  labelPosition="inside" labelAlign="top" >
+								<mx:fill>
+									<s:SolidColor color="#80347F"/>	
+								</mx:fill>
+							</mx:ColumnSeries>
+						</mx:series>
+					</mx:ColumnChart>
+				</s:HGroup>
+				
+			<s:HGroup  width="100%"   horizontalAlign="left" verticalAlign="middle">
+				<s:HGroup width="50%" height="100%" >
+					<mx:Legend dataProvider="{pie1}" height="200"/>
+					<mx:PieChart id="pie1" showDataTips="true" dataProvider="{tj2}" height="200">
+						<mx:series>
+							<mx:PieSeries id="pieSeries1" field="NUM" nameField="NAME" labelPosition="callout" fontSize="14"  labelFunction="labelFun" 
+										  itemRenderer="com.jtgh.yjpt.view.jyrxxgl.tj.PieRenderer" />
+						</mx:series>
+					</mx:PieChart>
+				</s:HGroup>
+				<s:HGroup width="50%" height="100%" >
+					<mx:Legend dataProvider="{pie2}" height="200"/>
+					<mx:PieChart id="pie2" showDataTips="true" dataProvider="{tj3}" height="200">
+						<mx:series>
+							<mx:PieSeries id="pieSeries2" field="NUM" nameField="NAME" labelPosition="callout" fontSize="14"  labelFunction="labelFun" 
+										  itemRenderer="com.jtgh.yjpt.view.jyrxxgl.tj.PieRenderer" />
+						</mx:series>
+					</mx:PieChart>
+				</s:HGroup>
+			</s:HGroup>
 		</s:VGroup>
 	</s:VGroup>
 </s:VGroup>

+ 16 - 1
gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/Check/tj/Zcdcfb.mxml

@@ -21,9 +21,11 @@
 			import mx.events.FlexEvent;
 			import mx.formatters.DateFormatter;
 			import mx.rpc.events.ResultEvent;
+			import spark.events.IndexChangeEvent;
 			[Bindable]
 			private var list:ArrayCollection;
 			private var max:Number=0;
+			private var type:String ="YYYY";
 			public var szd:String=null;
 			protected function group1_creationCompleteHandler(event:FlexEvent):void
 			{
@@ -54,7 +56,7 @@
 
 					if(max<20){yz.maximum=max+1;}
 					else{yz.maximum=Math.ceil(max*1.05);}
-				},szd)
+				},szd,type)
 			}
 			private function getTime():String
 			{
@@ -102,6 +104,18 @@
 				}
 				return null;
 			}
+			
+			protected function tj(event:IndexChangeEvent):void
+			{
+				if(0==event.newIndex)
+				{
+					type="YYYY";
+				}else if(1==event.newIndex)
+				{
+					type="YYYYMM";
+				}
+				doQuery();
+			}
 
 		]]>
 	</fx:Script>
@@ -111,6 +125,7 @@
 				<s:HorizontalLayout horizontalAlign="center" verticalAlign="middle"/>
 			</s:layout>
 			<s:Label text="自查隐患/督查隐患数量分布" width="100%" fontFamily="宋体" fontSize="14" color="#ffffff" fontWeight="bold" paddingLeft="10"/>
+			<cus:QComboBox width="100" comboxClass="TjTimeSelect" change="tj(event)" selectedIndex="0" text="{resourceManager.getString('select','tj.year')}"/>
 		</s:BorderContainer>
 		<s:HGroup width="100%" height="100%">
 			<s:VGroup  height="100%">

+ 5 - 3
gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/bagl/yjyaba/YjyabaLayoutNoFlow.mxml

@@ -96,7 +96,8 @@
 	</s:VGroup>
 	<!-- 显示一览记录 -->
 	<ui:DataGrid id="dataGrid" width="100%" selectionMode="singleRow">	
-		<ui:columns><s:ArrayList>
+		<ui:columns>
+			<s:ArrayList>
 				<ui:DataGridColumn  labelFunction="labelFun" headerText="{resourceManager.getString('yjzyxxgl','yjzjk.xh')}" width="40"/>	
 				<ui:DataGridColumn dataField="babh"    headerText="备案编号" />
 				<ui:DataGridColumn dataField="yamc"    headerText="预案名称" />
@@ -111,7 +112,7 @@
 				<ui:DataGridColumn dataField="txsj" headerText="填写时间" dateFormatString="YYYY-MM-DD" />
 				<ui:DataGridColumn dataField="szdName" headerText="{resourceManager.getString('bagl','bagl.szd')}"/>
 				<ui:DataGridColumn dataField="gqName" headerText="{resourceManager.getString('bagl','bagl.szgq')}"/>
-
+				<ui:DataGridColumn dataField="bayxqFormat" headerText="备案有效期至"/>
 				<!--ui:DataGridColumn width="120" type="{TypeBase.LINKBUTTON}" linkButtonFunc="{thisModel.downloadFile}"
 								   linkEnableFunc="{thisModel.showFile}" linklabelFunc="{thisModel.showFileName}"
 								   headerText="{resourceManager.getString('bagl','yjyaba.fj')}"/-->
@@ -124,7 +125,8 @@
 				headerText="{resourceManager.getString('workflow','task.startTime')}"/>
 				<ui:DataGridColumn id="col_taskStartUser" dataField="taskStartUser"
 				headerText="{resourceManager.getString('workflow','task.startUser')}"/> -->
-			</s:ArrayList></ui:columns>
+			</s:ArrayList>
+		</ui:columns>
 	</ui:DataGrid>
 	<ui:Pager id="pager" queryFunction="{thisModel.pageQuery}"/>	
 </ui:QueryLayout>

+ 6 - 3
gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/jyr/JyrEdit.mxml

@@ -165,8 +165,7 @@
 	</fx:Script>
 
 	<s:VGroup width="100%" height="100%" id="group"  paddingTop="10">
-		<mx:Accordion width="100%" height="480" headerStyleName="AccordionHeader"
-					  change="vboxClick(event)">
+		<mx:Accordion width="100%" height="480" headerStyleName="AccordionHeader" change="vboxClick(event)">
 			<mx:VBox width="100%" height="100%" label="{resourceManager.getString('jlrxxgl','jyrjcxx')}">
 				<s:VGroup width="100%" height="100%" paddingTop="10" paddingBottom="10">
 					<s:HGroup width="100%"  verticalAlign="middle"  gap="0">
@@ -326,11 +325,15 @@
 						<s:Spacer width="2%" />
 						<ui:Button label="选择" click="showWxhw(event)"  width="5%"/>
 					</s:HGroup>
+					<s:HGroup width="100%" verticalAlign="middle" gap="0" height="54" id="zdwxydy">
+						<cus:QLabel width="13%" text="重大危险源单元(个)"/>
+						<cus:QTextInput id="dangerSrcUnitNum" type="int" text="{thisModel.vo.dangerSrcUnitNum}" width="19%"/>
+					</s:HGroup>
 					<s:HGroup width="100%" verticalAlign="middle" gap="0" height="54" id="sfzdsp">
 						<cus:QLabel width="13%" text="{resourceManager.getString('jlrxxgl','sfzdsp')}"/>
 						<ui:CheckBox label="" selected="@{thisModel.vo.zdsp}" width="19%"/>
 					</s:HGroup>
-					</s:VGroup>
+				</s:VGroup>
 			</mx:VBox>
 			<mx:VBox id="bwboxinfo" width="100%" label="泊位信息">
 				<ui:DataGrid id="bwGrid" width="100%" height="350" doubleClickEnabled="true"  rowHeight="30" dataProvider="{thisModel.bw_add_list}">

+ 7 - 0
gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/jyr/JyrView.mxml

@@ -71,6 +71,9 @@
 					rs.text="";
 				if(model.vo.zzagrysl.toString()=="NaN")
 					zzagrysl.text="";
+				if(model.vo.dangerSrcUnitNum.toString() =="NaN")
+					dangerSrcUnitNum.text = "";
+				
 //				if(model.vo!=null){
 //				if(model.vo.fzyxq!=null&&ObjectUtil.dateCompare(model.vo.fzyxq,new Date())<0){
 //					fzyxq.setStyle("disabledColor","#FF0033");
@@ -417,6 +420,10 @@
 						<cus:QLabel id="zywxhwpmStr" click="shModel.showShyj1('zywxhwpm')" width="13%" />
 						<cus:QTextArea id="zywxhwpm" text="@{model.vo.zywxhwpm}"  width="83%" editable="false" height="54" />
 					</s:HGroup>
+						<s:HGroup width="100%" verticalAlign="middle" gap="0" height="54">
+							<cus:QLabel width="13%" text="重大危险源单元(个)"/>
+							<cus:QTextInput id="dangerSrcUnitNum" type="int" text="{model.vo.dangerSrcUnitNum}" editable="false" width="19%"/>
+						</s:HGroup>
 					</s:VGroup>
 				</s:BorderContainer>
 				<s:BorderContainer  width="100%" height="25" borderWeight="1">

+ 1 - 1
gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/jyrxxgl/tj/Gkjyrxxtj.mxml

@@ -104,7 +104,7 @@
 		<mx:DataGrid id="grid" width="100%" dataProvider="{list}" rowCount="19" textAlign="center" verticalAlign="middle" sortableColumns="false">
 			<mx:columns>
 				<mx:DataGridColumn headerText="所在地" dataField="NAME" itemRenderer="com.jtgh.yjpt.common.component.renderer.TjDataGridItemRenderer" />
-				<mx:DataGridColumn headerText="企业数" dataField="NUM" itemRenderer="com.jtgh.yjpt.common.component.renderer.TjDataGridItemRenderer"/>
+				<!--<mx:DataGridColumn headerText="企业数" dataField="NUM" itemRenderer="com.jtgh.yjpt.common.component.renderer.TjDataGridItemRenderer"/>-->
 				<mx:DataGridColumn headerText="危货企业数" dataField="WHNUM" itemRenderer="com.jtgh.yjpt.common.component.renderer.TjDataGridItemRenderer"/>
 				<mx:DataGridColumn id="tjType" headerText="本年新增危货企业" dataField="YEAR" itemRenderer="com.jtgh.yjpt.common.component.renderer.TjDataGridItemRenderer"/>
 				<mx:DataGridColumn headerText="储罐总数量(个)" dataField="SL" itemRenderer="com.jtgh.yjpt.common.component.renderer.TjDataGridItemRenderer"/>

+ 7 - 8
gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/jyrxxgl/tj/whqytj.mxml

@@ -23,7 +23,7 @@
 			private var max:Number=0;
 			protected function group1_creationCompleteHandler(event:FlexEvent):void
 			{
-				this.qy.labelContainer.y-=12;
+				//this.qy.labelContainer.y-=12;
 				this.whqy.labelContainer.y-=12;
 				if(Global.deployMode==Constants.DEPLOY_MODE_0){
 					sjEnterInto();
@@ -43,7 +43,7 @@
 					//					var newlist:ArrayCollection=new ArrayCollection();
 					colChart.dataProvider=list;
 					xx.categoryField="GQ";
-					qy.yField="QyNum";
+					//qy.yField="QyNum";
 					whqy.yField="WhNum";
 					for each(var o:Object in list)
 					{
@@ -73,7 +73,7 @@
 					}
 					colChart.dataProvider=list;
 					xx.categoryField="DS";
-					qy.yField="QyNum";
+					//qy.yField="QyNum";
 					whqy.yField="WhNum";
 					if(max<20){yz.maximum=max+1;}
 					else{yz.maximum=Math.ceil(max*1.05);}
@@ -137,7 +137,7 @@
 			<s:layout>
 				<s:HorizontalLayout horizontalAlign="center" verticalAlign="middle"/>
 			</s:layout>
-			<s:Label text="港口企业/港口危货企业统计" width="100%" fontFamily="宋体" fontSize="14" color="#ffffff" fontWeight="bold" paddingLeft="10"/>
+			<s:Label text="港口危货企业统计" width="100%" fontFamily="宋体" fontSize="14" color="#ffffff" fontWeight="bold" paddingLeft="10"/>
 		</s:BorderContainer>
 		<s:HGroup width="100%" height="100%">
 			<s:VGroup  height="100%">
@@ -147,8 +147,7 @@
 				<s:Label text="截止{getTime()}"/>
 				<s:Spacer height="15"/>
 			</s:VGroup>
-			<mx:ColumnChart id="colChart"  width="95%"
-							showDataTips="true" height="200" >
+			<mx:ColumnChart id="colChart"  width="95%" showDataTips="true" height="200" >
 				<mx:horizontalAxis>
 					<mx:CategoryAxis  id="xx"/>
 				</mx:horizontalAxis>
@@ -159,11 +158,11 @@
 					<mx:AxisRenderer axis="{xx}" click="labelClick(event)" mouseOver="over(event)" mouseOut="out(event)" buttonMode="true"/>
 				</mx:horizontalAxisRenderers>
 				<mx:series>
-					<mx:ColumnSeries displayName="港口企业"  id="qy"    maxColumnWidth="20"  labelPosition="inside" labelAlign="top">
+					<!--<mx:ColumnSeries displayName="港口企业"  id="qy"    maxColumnWidth="20"  labelPosition="inside" labelAlign="top">
 						<mx:fill>
 							<s:SolidColor color="#30BAAA"/>
 						</mx:fill>
-					</mx:ColumnSeries>
+					</mx:ColumnSeries>-->
 					<mx:ColumnSeries displayName="港口危货企业"   id="whqy"  maxColumnWidth="20" labelPosition="inside" labelAlign="top" >
 						<mx:fill>
 							<s:SolidColor color="#F9847F"/>

+ 25 - 17
gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/sgalgl/Sgalgl.mxml

@@ -152,30 +152,36 @@
 			
 			
 			private function check():Boolean{
+				/*表号 
 				if(StringUtil.trim(bh.text)==""){
 					Utils.showInfoMessage("bh.empty",null,"yjgl");
 					return false;
-				}
+				} */
+				/*制表机关 
 				if(StringUtil.trim(zbjg.text)==""){
 					Utils.showInfoMessage("zbjg.empty",null,"yjgl");
 					return false;
-				}
+				} */
+				/* 批准机关
 				if(StringUtil.trim(pzjg.text)==""){
 					Utils.showInfoMessage("pzjg.empty",null,"yjgl");
 					return false;
-				}
+				} */
+				/* 批准文号
 				if(StringUtil.trim(pzwh.text)==""){
 					Utils.showInfoMessage("pzwh.empty",null,"yjgl");
 					return false;
-				}
+				} */
+				/* 有效期至
 				if(yxqz.dateTime==null){
 					Utils.showInfoMessage("yxq.empty",null,"yjgl");
 					return false;
-				}
+				} */
+				/* 填表单位
 				if(StringUtil.trim(sqdw.text)==""){
 					Utils.showInfoMessage("tbdw.empty",null,"yjgl");
 					return false;
-				}
+				} */
 				if(vo.id.toString()!="NaN"&&sgfssj==null)
 					return true;
 				if(sgfssj==null||sgfssj.dateTime==null){
@@ -194,15 +200,17 @@
 					Utils.showInfoMessage("sgfsgq.empty",null,"yjgl");
 					return false;
 				}
+			/*   事故发生泊位
 				if(sgfsbw==null||sgfsbw.selectedVO==null){
 					Utils.showInfoMessage("sgfsbw.empty",null,"yjgl");
 					return false;
-				}
+				} */
 			
+			/* 	当前泊位用途
 				if(dqbwyt==null||dqbwyt.selectedVO==null){
 					Utils.showInfoMessage("dqbwyt.empty",null,"yjgl");
 					return false;
-				}
+				} */
 				if(sgyy==null||StringUtil.trim(sgyy.text)==""){
 					Utils.showInfoMessage("sgyy.empty",null,"yjgl");
 					return false;
@@ -274,31 +282,31 @@
 					 paddingRight="5" paddingTop="5"  >	
 				<s:HGroup  width="100%" height="25" horizontalAlign="left" verticalAlign="middle">
 					<s:HGroup  width="50%" height="25" horizontalAlign="left" verticalAlign="middle" >
-						<cus:QLabel width="30%" text="{resourceManager.getString('sgalgl','bh')}" textAlign="right"  notNull="true"/>
+						<cus:QLabel width="30%" text="{resourceManager.getString('sgalgl','bh')}" textAlign="right"/>
 						<cus:QTextInput id="bh" width="50%" text="@{vo.bh}"/>
 					</s:HGroup>
 					<s:HGroup  width="50%" height="25" horizontalAlign="left" verticalAlign="middle">
-						<cus:QLabel width="30%" text="{resourceManager.getString('sgalgl','zbjg')}" textAlign="right"  notNull="true"/>
+						<cus:QLabel width="30%" text="{resourceManager.getString('sgalgl','zbjg')}" textAlign="right"/>
 						<cus:QTextInput id="zbjg" width="50%" text="@{vo.zbjg}"  />
 					</s:HGroup>
 				</s:HGroup>
 				<s:HGroup  width="100%" height="25" horizontalAlign="left" verticalAlign="middle">
 					<s:HGroup  width="50%" height="25" horizontalAlign="left" verticalAlign="middle">
-						<cus:QLabel width="30%" text="{resourceManager.getString('sgalgl','pzjg')}" textAlign="right" notNull="true"/>
+						<cus:QLabel width="30%" text="{resourceManager.getString('sgalgl','pzjg')}" textAlign="right"/>
 						<cus:QTextInput id="pzjg" width="50%" text="@{vo.pzjg}"/>
 					</s:HGroup>
 					<s:HGroup  width="50%" height="25" horizontalAlign="left" verticalAlign="middle">
-						<cus:QLabel width="30%" text="{resourceManager.getString('sgalgl','pzwh')}" textAlign="right" notNull="true"/>
+						<cus:QLabel width="30%" text="{resourceManager.getString('sgalgl','pzwh')}" textAlign="right"/>
 						<cus:QTextInput id="pzwh" width="50%" text="@{vo.pzwh}"/>
 					</s:HGroup>
 				</s:HGroup>
 				<s:HGroup  width="100%" height="25" horizontalAlign="left" verticalAlign="middle">
 					<s:HGroup  width="50%" height="25" horizontalAlign="left" verticalAlign="middle">
-						<cus:QLabel width="30%" text="{resourceManager.getString('sgalgl','yxqz')}" textAlign="right" notNull="true"/>
+						<cus:QLabel width="30%" text="{resourceManager.getString('sgalgl','yxqz')}" textAlign="right"/>
 						<ui:DateTime id="yxqz" width="50%" dateTime="{vo.yxqz}"/>
 					</s:HGroup>
 					<s:HGroup  width="50%" height="25" horizontalAlign="left" verticalAlign="middle">
-						<cus:QLabel width="30%" text="{resourceManager.getString('sgalgl','tbdw')}" textAlign="right" notNull="true"/>
+						<cus:QLabel width="30%" text="{resourceManager.getString('sgalgl','tbdw')}" textAlign="right"/>
 						<cus:QTextInput id="sqdw" width="50%" text="@{vo.tbdw}"/>
 					</s:HGroup>
 				</s:HGroup>
@@ -335,17 +343,17 @@
 									   parentId="{vo.szd==null?Global.user.szd:vo.szd}" change="sgdwmc_changeHandler(event)"/>
 					</s:HGroup>
 					<s:HGroup  width="50%" height="25" horizontalAlign="left" verticalAlign="middle">
-						<cus:QLabel width="30%" text="{resourceManager.getString('sgalgl','sgdj')}" textAlign="right" notNull="true"/>
+						<cus:QLabel width="30%" text="{resourceManager.getString('sgalgl','sgdj')}" textAlign="right"/>
 						<cus:QComboBox id="sgdj"   comboxClass="CodeSelect" codeType="{Constants.GROUP_CODE_SGDJ}"  hasBlank="true" width="50%" selectedVO="{vo.sgdj}"/>
 					</s:HGroup>
 				</s:HGroup>
 				<s:HGroup  width="100%" height="25" horizontalAlign="left" verticalAlign="middle">
 					<s:HGroup  width="50%" height="25" horizontalAlign="left" verticalAlign="middle">
-						<cus:QLabel width="30%" text="{resourceManager.getString('sgalgl','sgfsbw')}" textAlign="right" notNull="true"/>
+						<cus:QLabel width="30%" text="{resourceManager.getString('sgalgl','sgfsbw')}" textAlign="right"/>
 						<cus:QComboBox id="sgfsbw"  comboxClass="BwByJyrSelect"  hasBlank="true" width="50%" parentId="{vo.sgdwmc}" selectedVO="{vo.sgfsbw}" />
 					</s:HGroup>
 					<s:HGroup  width="50%" height="25" horizontalAlign="left" verticalAlign="middle">
-						<cus:QLabel width="30%" text="当前泊位用途" textAlign="right" notNull="true"/>
+						<cus:QLabel width="30%" text="当前泊位用途" textAlign="right"/>
 						<cus:QComboBox id="dqbwyt" comboxClass="CodeSelect" codeType="{Constants.GROUP_CODE_BWYT}"  hasBlank="false" width="50%" selectedVO="{vo.bwzyyt}"/>
 					</s:HGroup>
 				</s:HGroup>

+ 18 - 3
gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/whsptj/Whfb.mxml

@@ -19,11 +19,13 @@
 			import mx.events.FlexEvent;
 			import mx.formatters.DateFormatter;
 			import mx.rpc.events.ResultEvent;	
+			import spark.events.IndexChangeEvent;
 			private var szd:String=null;
 			[Bindable]
 			private var list:ArrayCollection;
 			private var spMax:Number=0;
 			private var zxlMax:Number=0;
+			private var type:String ="YYYY";
 			protected function group1_creationCompleteHandler(event:FlexEvent):void
 			{
 				this.sp.labelContainer.y-=12;
@@ -39,7 +41,6 @@
 
 
 			protected function doQuery():void{
-
 				Utils.callRemote("zysqbpController", "countSpZxl", function (r:ResultEvent):void
 				{
 					var bc:BusinessContext=new BusinessContext();
@@ -57,9 +58,9 @@
 					else{spva.maximum=Math.ceil(spMax*1.05);}
 					if(zxlMax<8){zxlva.maximum=zxlMax+1;}
 					else{zxlva.maximum=Math.ceil(zxlMax*1.125);}
-				},szd);
-
+				},szd,type);
 			}
+			
 			private function getTime():String
 			{
 				var fr:DateFormatter=new DateFormatter();
@@ -111,6 +112,19 @@
 				if(event.target is Label)
 					(event.target as Label).setStyle("color",0x000000);
 			}
+			
+			
+			protected function tj(event:IndexChangeEvent):void
+			{
+				if(0==event.newIndex)
+				{
+					type="YYYY";
+				}else if(1==event.newIndex)
+				{
+					type="YYYYMM";
+				}
+				doQuery();
+			}
 
 		]]>
 	</fx:Script>
@@ -120,6 +134,7 @@
 				<s:HorizontalLayout horizontalAlign="center" verticalAlign="middle"/>
 			</s:layout>
 			<s:Label text="港口危货作业审批数量/危货装卸量" width="100%" fontFamily="宋体" fontSize="14" color="#ffffff" fontWeight="bold" paddingLeft="10"/>
+			<cus:QComboBox width="100" comboxClass="TjTimeSelect" change="tj(event)" selectedIndex="0" text="{resourceManager.getString('select','tj.year')}"/>
 		</s:BorderContainer>
 		<s:HGroup width="100%" height="100%">
 			<s:VGroup  height="100%">

+ 350 - 6
gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/whsptj/WxhwspTj.mxml

@@ -1,14 +1,358 @@
 <?xml version="1.0" encoding="utf-8"?>
 <s:VGroup xmlns:fx="http://ns.adobe.com/mxml/2009" 
 		  xmlns:s="library://ns.adobe.com/flex/spark" 
-		  xmlns:mx="library://ns.adobe.com/flex/mx" width="100%" height="100%" xmlns:whsptj="com.jtgh.yjpt.view.whsptj.*">
-	<fx:Declarations>
-		<!-- 将非可视元素(例如服务、值对象)放在此处 -->
-	</fx:Declarations>
-	<whsptj:Whfb width="100%" height="230"/>
+		  xmlns:mx="library://ns.adobe.com/flex/mx" 
+		  xmlns:whsptj="com.jtgh.yjpt.view.whsptj.*"
+		  xmlns:ui="com.jtgh.yjpt.common.component.ui.*"
+		  xmlns:button="com.jtgh.yjpt.common.component.ui.button.*"
+		  width="100%" height="100%"
+		  creationComplete="group1_creationCompleteHandler(event)">
+	<fx:Script>
+		<![CDATA[
+			import com.jtgh.yjpt.common.BusinessContext;
+			import com.jtgh.yjpt.common.Global;
+			import com.jtgh.yjpt.common.PrintParam;
+			import com.jtgh.yjpt.common.PrintTypes;
+			import com.jtgh.yjpt.common.util.Constants;
+			import com.jtgh.yjpt.common.util.PrintUtil;
+			import com.jtgh.yjpt.common.util.Utils;
+			import com.jtgh.yjpt.model.SystemModel;
+			import com.jtgh.yjpt.vo.sys.MenuVo;
+			
+			import mx.collections.ArrayCollection;
+			import mx.events.FlexEvent;
+			import mx.formatters.DateFormatter;
+			import mx.rpc.events.ResultEvent;
+			import mx.controls.Alert;
+			
+			import spark.events.IndexChangeEvent;
+			//import com.jtgh.yjpt.common.util.Utils;
+			
+			//import mx.collections.ArrayCollection;
+			//import mx.events.FlexEvent;
+			//import mx.formatters.DateFormatter;
+			//import mx.rpc.events.ResultEvent;
+			
+			//import spark.events.IndexChangeEvent;
+			
+			// -----------------------上部柱状统计图 begin------------------------ 
+			//private var szd:String=null;
+			[Bindable]
+			private var list:ArrayCollection;
+			private var spMax:Number=0;
+			private var zxlMax:Number=0;
+			private var type:String ="YYYY";
+			
+			[Bindable]
+			private var list2:ArrayCollection;
+//			private var type:String ="YYYY";
+			[Bindable]
+			private var szd:String=null;
+			
+			protected function group1_creationCompleteHandler(event:FlexEvent):void
+			{
+				this.sp.labelContainer.y-=12;
+				this.zxl.labelContainer.y-=12;
+				if(Global.deployMode==Constants.DEPLOY_MODE_1){
+					szd=Global.szd.id.toString();
+				}
+				
+				Utils.callRemote("zysqbpController","getDateRange",function(r:ResultEvent):void{
+					var bc:BusinessContext =  r.result as BusinessContext;
+					start.dateTime = bc.getAttribute("ks") as Date;
+					end.dateTime = bc.getAttribute("js") as Date;
+					//柱状图
+					doQuery(start.dateTime,end.dateTime);
+					//加载左下侧统计列表数据
+					doQuery2(start.dateTime,end.dateTime);
+				});
+				
+			}
+			
+			
+			
+			protected function doQuery(startDate:Date,endDate:Date):void{
+				Utils.callRemote("zysqbpController", "countSpZxl", function (r:ResultEvent):void
+				{
+					var bc:BusinessContext=new BusinessContext();
+					bc=r.result as BusinessContext;
+					list=bc.getAttribute("records") as ArrayCollection;
+					for each(var o:Object in list)
+					{
+						o.ZXLNUM=Number(o.ZXLNUM).toFixed(2);
+						if(null==szd)
+							o.NAME=resourceManager.getString('select',o.NAME);
+						getMax("sp",o.SPNUM);
+						getMax("zxl",o.ZXLNUM);
+					}
+					if(spMax<20){spva.maximum=spMax+1;}
+					else{spva.maximum=Math.ceil(spMax*1.05);}
+					if(zxlMax<8){zxlva.maximum=zxlMax+1;}
+					else{zxlva.maximum=Math.ceil(zxlMax*1.125);}
+				},szd,startDate,endDate);
+			}
+			
+			private function getTime():String
+			{
+				var fr:DateFormatter=new DateFormatter();
+				fr.formatString="YYYY.MM.DD";
+				return fr.format(new Date())
+			}
+			
+			private function getMax(max:String,num:Number):void{
+				if("sp"==max)
+					spMax=spMax<num?num:spMax;
+				else if("zxl"==max)
+					zxlMax=zxlMax<num?num:zxlMax;
+			}
+			
+			protected function labelClick(event:MouseEvent):void
+			{
+				var node:MenuVo = getMenuVo(Global.menuList, "004001");
+				SystemModel.menuClick(node, event.target.text);
+				
+			}
+			
+			private function getMenuVo(list:ArrayCollection, code:String):MenuVo{
+				for(var i:int=0; i<list.length; i++){
+					var node:MenuVo = list.getItemAt(i) as MenuVo;
+					//trace(node.code);
+					if(code == node.code){
+						return node;
+					}else{
+						if(node.children && node.children.length > 0){
+							var vo:MenuVo = getMenuVo(node.children, code);
+							if(vo){
+								return vo;
+							}
+						}
+					}
+				}
+				return null;
+			}
+			
+			protected function over(event:MouseEvent):void
+			{
+				if(event.target is Label)
+					(event.target as Label).setStyle("color",0xE48701);
+				
+			}
+			
+			protected function out(event:MouseEvent):void
+			{
+				if(event.target is Label)
+					(event.target as Label).setStyle("color",0x000000);
+			}
+			
+			
+			/* protected function tj(event:IndexChangeEvent):void
+			{
+				if(0==event.newIndex)
+				{
+					type="YYYY";
+				}else if(1==event.newIndex)
+				{
+					type="YYYYMM";
+				}
+				doQuery();
+			} */
+			//-----------------------上部柱状统计图 end------------------------ 
+			
+			// ------------------------左下方列表统计 begin-------------------------
+			
+		
+			
+		/* 	protected function init(event:FlexEvent):void
+			{
+				if(Constants.DEPLOY_MODE_1==Global.deployMode){
+					szd=Global.szd.id.toString();
+				}
+				doQuery2();
+			} */
+			
+			private function  doQuery2(startDate:Date,endDate:Date):void
+			{
+				Utils.callRemote("zysqbpController","countSp",function(r:ResultEvent):void{
+					var bc:BusinessContext=r.result as BusinessContext;
+					list2=bc.getAttribute("records") as ArrayCollection;
+					var hj:Object=new Object;
+					hj.type="hj";
+					hj.NAME="合计";
+					hj.SSNUM=0;
+					hj.FZNUM=0;
+					hj.XMNUM=0;
+					hj.ZYNUM=0;
+					for each(var o:Object in list2)
+					{
+						if(null==szd){
+							o.NAME=resourceManager.getString("select",o.NAME);
+						}
+						hj.SSNUM+=Number(o.SSNUM);
+						hj.FZNUM+=Number(o.FZNUM);
+						hj.XMNUM+=Number(o.XMNUM);
+						hj.ZYNUM+=Number(o.ZYNUM);
+					}
+					list2.addItem(hj);	
+				},szd,startDate,endDate);
+			}
+			
+			/* private function getTime():String
+			{
+				var fr:DateFormatter=new DateFormatter();
+				fr.formatString="YYYY.MM.DD";
+				return fr.format(new Date())
+			} */
+			
+		/* 	protected function tj(event:IndexChangeEvent):void
+			{
+				if(0==event.newIndex)
+				{
+					type="YYYY";
+				}else if(1==event.newIndex)
+				{
+					type="YYYYMM";
+				}
+				doQuery();
+			} */
+			
+			protected function doPrint(event:MouseEvent):void
+			{
+				if(null==szd){
+					var param:PrintParam=new PrintParam("bdwhspTj");
+					param.setParameter("type", type);
+					param.setParameter("szd",null);
+					PrintUtil.doPrint1(param);
+				}else{
+					var param:PrintParam=new PrintParam("bdwhspTj");
+					param.setParameter("type", type);
+					param.setParameter("szd",szd);
+					PrintUtil.doPrint1(param);
+				}
+			}
+			
+			
+			protected function doPrint1(event:MouseEvent):void
+			{
+				if(null==szd){
+					var param:PrintParam=new PrintParam(PrintTypes.SPTJ);
+					param.setParameter("type", type);
+					param.format="xls";
+					PrintUtil.doPrint(param);
+				}else{
+					var param:PrintParam=new PrintParam(PrintTypes.SJSPTJ);
+					param.setParameter("type", type);
+					param.setParameter("szd",szd+"%");
+					param.format="xls";
+					PrintUtil.doPrint(param);
+				}
+			}
+			// ------------------------左下方列表统计 end---------------------------
+			
+			//统计查询
+			/** 统计处理 */
+			public function search():void
+			{
+				var tjsjq:Date=start.dateTime;
+				var tjsjz:Date=end.dateTime;
+				if(tjsjq==null||tjsjz==null){
+					Alert.show("请选择统计的时间区间","提示");
+					return;
+				}
+				//柱状图
+				doQuery(start.dateTime,end.dateTime);
+				//加载左下侧统计列表数据
+				doQuery2(start.dateTime,end.dateTime);
+			}
+			
+		]]>
+	</fx:Script>
+	<!--<whsptj:Whfb width="100%" height="230"/>-->
+	<!-- **************************上部柱状统计图 begin************************** -->
+	<s:VGroup width="100%" height="100%">
+		<s:BorderContainer  borderVisible="false" height="32" backgroundColor="#23A5B8" width="100%">
+			<s:layout>
+				<s:HorizontalLayout horizontalAlign="center" verticalAlign="middle"/>
+			</s:layout>
+			<s:Label text="港口危货作业审批数量/危货装卸量" width="100%" fontFamily="宋体" fontSize="14" color="#ffffff" fontWeight="bold" paddingLeft="10"/>
+			<!--<cus:QComboBox width="100" comboxClass="TjTimeSelect" change="tj(event)" selectedIndex="0" text="{resourceManager.getString('select','tj.year')}"/>-->
+		</s:BorderContainer>
+		<s:HGroup width="100%" height="100%">
+			<s:VGroup  height="100%">
+				<mx:Legend right="4" top="4" dataProvider="{colChart}"/>
+				<s:Spacer height="100%"/>
+				<!--<s:Label text="截止{getTime()}"/>-->
+				<s:Spacer height="15"/>
+			</s:VGroup>
+			<mx:ColumnChart id="colChart"  width="95%"
+							showDataTips="true" height="200" dataProvider="{list}">
+				<mx:horizontalAxis>
+					<mx:CategoryAxis  id="xx" categoryField="NAME"/>
+				</mx:horizontalAxis>
+				<mx:verticalAxisRenderers>
+					<mx:AxisRenderer placement="left" axis="{spva}"/>
+					<mx:AxisRenderer placement="right" axis="{zxlva}"/>
+				</mx:verticalAxisRenderers>
+				<mx:horizontalAxisRenderers>
+					<mx:AxisRenderer axis="{xx}" click="labelClick(event)" buttonMode="true" mouseOver="over(event)" mouseOut="out(event)"/>
+				</mx:horizontalAxisRenderers>
+				<mx:series>
+					<mx:ColumnSeries displayName="危货作业审批数量(个)" id="sp" yField="SPNUM"  maxColumnWidth="20"  labelPosition="inside" labelAlign="top"  >
+						<mx:verticalAxis>
+							<mx:LinearAxis id="spva"/>
+						</mx:verticalAxis>
+						<mx:fill>
+							<s:SolidColor color="#30BAAA"/>
+						</mx:fill>
+					</mx:ColumnSeries>
+					<mx:ColumnSeries displayName="危险货物装卸量(万吨)" id="zxl"  yField="ZXLNUM" maxColumnWidth="20" chromeColor="#F9837F"  labelPosition="inside" labelAlign="top" >
+						<mx:verticalAxis>
+							<mx:LinearAxis id="zxlva"/>
+						</mx:verticalAxis>
+						<mx:fill>
+							<s:SolidColor color="#F9847F"/>
+						</mx:fill>
+					</mx:ColumnSeries>
+				</mx:series>
+			</mx:ColumnChart>
+		</s:HGroup>
+	</s:VGroup>
+ 
+	<!-- **************************上部柱状统计图 end************************** -->
+	
 	<s:Spacer height="10"/>
 	<s:HGroup width="100%" height="316">
-		<whsptj:Sptj width="50%" height="100%"/>
+		<!--<whsptj:Sptj width="50%" height="100%"/>-->
+		<!-- **************************左下方列表统计 begin************************** -->
+		<s:VGroup width="100%">
+			<s:BorderContainer  borderVisible="false" height="32" backgroundColor="#23A5B8" width="100%">
+				<s:layout>
+					<s:HorizontalLayout horizontalAlign="center" verticalAlign="middle"/>
+				</s:layout>
+				<s:Label text="{null==szd?'全省':'本地'}危货审批统计" width="100%" fontFamily="宋体" fontSize="14" color="#ffffff" fontWeight="bold" paddingLeft="10"/>
+				<!--<cus:QComboBox width="100" comboxClass="TjTimeSelect" change="tj(event)" selectedIndex="0" text="{resourceManager.getString('select','tj.year')}"/>-->
+				<ui:DateTime id="start" width="180"/>
+				<s:Label text="~" width="100%" fontFamily="宋体" fontSize="14" color="#ffffff" fontWeight="bold" paddingLeft="10"/>
+				<ui:DateTime id="end" width="180"/>
+				<button:IconButton id="query" click="search()"
+								   toolTip="{resourceManager.getString('common','btn.query')}"
+								   type="query"/>
+				<s:Spacer width="5"/>
+				<!--<s:Image id="icon" buttonMode="true" width="30" height="30" click="doPrint(event)" source="resource/yjpt/list/print.png"/>-->
+			</s:BorderContainer>
+			<mx:DataGrid id="grid" width="100%" dataProvider="{list2}" rowCount="10" textAlign="center" verticalAlign="middle" sortableColumns="false">
+				<mx:columns>
+					<mx:DataGridColumn headerText="所在地" dataField="NAME" itemRenderer="com.jtgh.yjpt.common.component.renderer.TjDataGridItemRenderer" />
+					<mx:DataGridColumn headerText="作业附证审批" dataField="FZNUM" itemRenderer="com.jtgh.yjpt.common.component.renderer.TjDataGridItemRenderer"/>
+					<mx:DataGridColumn headerText="作业申报审批" dataField="ZYNUM" itemRenderer="com.jtgh.yjpt.common.component.renderer.TjDataGridItemRenderer"/>
+					<mx:DataGridColumn headerText="安全设施专项验收" dataField="SSNUM" itemRenderer="com.jtgh.yjpt.common.component.renderer.TjDataGridItemRenderer"/>
+					<mx:DataGridColumn headerText="建设项目安全条件审查" dataField="XMNUM" itemRenderer="com.jtgh.yjpt.common.component.renderer.TjDataGridItemRenderer"/>
+				</mx:columns>
+			</mx:DataGrid>
+		</s:VGroup>
+		
+		
+		<!-- **************************左下方列表统计 end************************** -->
+		
 		<whsptj:Zxlqs width="50%" height="100%"/>
 	</s:HGroup>
 </s:VGroup>

+ 5 - 1
gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/yjgl/tj/Yjgltj.mxml

@@ -45,6 +45,7 @@
 					hj.RLNUM=0;
 					hj.SGNUM=0;
 					hj.SWNUM=0;
+					hj.DangerSrcUnit = 0;
 					for each(var o:Object in list)
 					{
 						if(null==szd){
@@ -54,7 +55,9 @@
 						hj.RLNUM+=Number(o.RLNUM);
 						hj.SGNUM+=Number(o.SGNUM);
 						hj.SWNUM+=Number(o.SWNUM);
+						hj.DangerSrcUnit+=Number(o.DangerSrcUnit);
 					}
+					//两位小数
 					hj.RLNUM=Number(hj.RLNUM).toFixed(2);
 					list.addItem(hj);	
 				},szd);
@@ -107,7 +110,8 @@
 		<mx:DataGrid id="grid" width="100%" dataProvider="{list}" rowCount="19" textAlign="center" verticalAlign="middle" sortableColumns="false">
 			<mx:columns>
 				<mx:DataGridColumn headerText="所在地" dataField="NAME"  itemRenderer="com.jtgh.yjpt.common.component.renderer.TjDataGridItemRenderer" />
-				<mx:DataGridColumn headerText="重大危险源{'\n'}储罐(个)" dataField="GSNUM" itemRenderer="com.jtgh.yjpt.common.component.renderer.TjDataGridItemRenderer"/>
+				<mx:DataGridColumn headerText="构成重大危险源的{'\n'}储罐(个)" dataField="GSNUM" itemRenderer="com.jtgh.yjpt.common.component.renderer.TjDataGridItemRenderer"/>
+				<mx:DataGridColumn headerText="重大危险源{'\n'}单元(个)" dataField="DangerSrcUnit" itemRenderer="com.jtgh.yjpt.common.component.renderer.TjDataGridItemRenderer"/>
 				<mx:DataGridColumn headerText="重大危险源{'\n'}总容量(万立方)" dataField="RLNUM" itemRenderer="com.jtgh.yjpt.common.component.renderer.TjDataGridItemRenderer"/>
 				<mx:DataGridColumn headerText="事故数" dataField="SGNUM" itemRenderer="com.jtgh.yjpt.common.component.renderer.TjDataGridItemRenderer"/>
 				<mx:DataGridColumn headerText="事故死亡数" dataField="SWNUM" itemRenderer="com.jtgh.yjpt.common.component.renderer.TjDataGridItemRenderer"/>

+ 1 - 1
gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/yjgl/tj/Zdwxyfb.mxml

@@ -124,7 +124,7 @@
 				<mx:AxisRenderer axis="{xx}" click="labelClick(event)" buttonMode="true" mouseOver="over(event)" mouseOut="out(event)"/>
 			</mx:horizontalAxisRenderers>
 			<mx:series>
-				<mx:ColumnSeries displayName="单位:个(重大危险源总个数)" yField="GS"  id="gs" labelPosition="inside" labelAlign="top">
+				<mx:ColumnSeries displayName="单位:个(构成重大危险源的储罐个数)" yField="GS"  id="gs" labelPosition="inside" labelAlign="top">
 					<mx:verticalAxis>
 						<mx:LinearAxis id="gsva"/>								
 					</mx:verticalAxis>

+ 1 - 1
gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/zyfzndjy/FzChoose.mxml

@@ -465,7 +465,7 @@
 			<!--</s:BorderContainer>-->
 			<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
 				<!-- 危货附证货种列表 -->
-				<ui:DataGrid id="fzDataGrid" width="100%" height="200" dataProvider="{wxhwpmArrCol}" editable="true">
+				<ui:DataGrid id="fzDataGrid" width="100%" height="175" dataProvider="{wxhwpmArrCol}" editable="true">
 					<ui:columns>
 						<s:ArrayList>
 							<ui:DataGridColumn   dataField="wxhwpm" headerText="危险货物品名" showDataTips="true" />  

+ 2 - 1
gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/zyfzndjy/GkwxhwzyfzblhhzLayout.mxml

@@ -233,7 +233,8 @@
 					</s:ArrayList>
 				</ui:columns>
 			</ui:DataGrid>
-			<ui:Pager id="pager" queryFunction="{thisModel.pageQuery}" />
+			<!--<ui:Pager id="pager" queryFunction="{thisModel.pageQuery}" />-->
+			<ui:ZysqbpPager id="pager" extraText="{thisModel.text}" queryFunction="{thisModel.pageQuery}"/>
 		</s:VGroup>
 	</s:VGroup>
 	<s:HGroup width="100%"  gap="0" horizontalAlign="left" verticalAlign="middle">

+ 2 - 1
gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/zyfzndjy/GkwxhwzyfzblhhzLayoutNoFlow.mxml

@@ -200,7 +200,8 @@
 					</s:ArrayList>
 				</ui:columns>
 			</ui:DataGrid>
-			<ui:Pager id="pager" queryFunction="{thisModel.pageQuery}" />
+			<!--<ui:Pager id="pager" queryFunction="{thisModel.pageQuery}" />-->
+			<ui:ZysqbpPager id="pager" extraText="{thisModel.text}" queryFunction="{thisModel.pageQuery}"/>
 		</s:VGroup>
 	</s:VGroup>
 </ui:QueryLayout>

+ 1 - 1
gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/zysqbp/HssbLayout.mxml

@@ -168,7 +168,7 @@
 			</s:HGroup>
  			<s:HGroup horizontalAlign="left"  verticalAlign="middle" width="31%" >
 				<cus:QLabel width="130" text="{resourceManager.getString('zysqbp','zysqbp.hssbzt')}"/>
-				<ui:PsComboBox id="merge_comb" dataProvider="{hssbList}" labelField="text" width="180" selectedIndex="0"/>
+				<ui:PsComboBox id="merge_comb" dataProvider="{hssbList}" labelField="text" width="180" selectedIndex="2"/>
 			</s:HGroup>
 		</s:HGroup>
 		<s:HGroup width="100%" gap="0" height="40" horizontalAlign="left" verticalAlign="middle"  >

+ 20 - 0
gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/zysqbp/count/WhzysbContainerCount.mxml

@@ -66,6 +66,8 @@
 			public var charDataList8:ArrayCollection=new ArrayCollection();
 			[Bindable]
 			public var qjdcharDataList:ArrayCollection=new ArrayCollection();
+			[Bindable]
+			public var tj:ArrayCollection=new ArrayCollection();
 
 			[Bindable]
 			public var qyOrszdName:String="所在地";
@@ -143,6 +145,16 @@
 				}
 			}
 
+			private function labelFun(data:Object, field:String, index:Number, percentValue:Number):String
+			{
+				var str:String;
+				var len:Number=String(data.NUM).length;
+				if(len<4)
+					str="      ";
+				else 
+					str="              "
+				return data.NAME+str;
+			}
 
 			protected function qymc_changeHandler(event:IndexChangeEvent):void
 			{
@@ -231,6 +243,7 @@
 						ydFlag=true;
 						qybox.visible=false;
 						charDataList=bc.getAttribute("ydcountList") as ArrayCollection;
+						tj=bc.getAttribute("tj") as ArrayCollection;
 					}
 				},szds,ndName,jdName,qymcName,hzName,mtbwName,
 					query_bgsj_1.dateTime,query_bgsj_2.dateTime,
@@ -406,6 +419,13 @@
 							</mx:AdvancedDataGridColumnGroup>
 						</mx:groupedColumns>
 					</mx:AdvancedDataGrid>
+					<mx:Legend dataProvider="{pie}" height="200"/>
+					<mx:PieChart id="pie" showDataTips="true" dataProvider="{tj}" height="200">
+						<mx:series>
+							<mx:PieSeries id="pieSeries" field="NUM" nameField="NAME" labelPosition="callout" fontSize="14"  labelFunction="labelFun" 
+										  itemRenderer="com.jtgh.yjpt.view.jyrxxgl.tj.PieRenderer" />
+						</mx:series>
+					</mx:PieChart>
 				</mx:HBox>
 				<mx:HBox width="100%"  verticalAlign="middle" visible="{jdFlag}" id="jdBox" includeInLayout="{jdFlag}">	
 					<mx:AdvancedDataGrid  id="dataGrid9"  width="25%" height="500"  dataProvider="{qjdcharDataList}"  borderVisible="true"

+ 5 - 0
gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/vo/jyr/JyrVo.as

@@ -62,6 +62,7 @@ package com.jtgh.yjpt.vo.jyr
 		public var gsyyzzbh:String=null;
 		/**投资总额*/
 		public var tzze:Number;
+
 		public function get tzzeStr():String
 		{
 			if(isNaN(tzze))
@@ -173,6 +174,10 @@ package com.jtgh.yjpt.vo.jyr
 				return "自动审批";
 			return "手动审批";
 		}
+
+		
+		public var dangerSrcUnitNum:Number;
+		 
 		
 		public  var zdspsjq:Date;
 		public function  get zdspsjqStr():String{