git-svn-id: https://192.168.57.71/svn/lyggkj@133 1a6f6e3a-4066-fe46-b609-79c204482ece

gkaq/yjpt-flex/trunk/locale/zh_CN/common.properties

@@ -58,6 +58,9 @@ btn.wharf=\u5371\u8d27\u4f01\u4e1a\u4fe1\u606f\u7edf\u8ba1
 btn.storage=\u5b58\u50a8\u8bbe\u65bd\u4fe1\u606f\u7edf\u8ba1
 btn.administrative=\u6cd5\u4eba\u884c\u653f\u8bb8\u53ef
 btn.message=\u6d88\u606f\u7ba1\u7406
+btn.status=\u50a8\u7f50\u4fe1\u606f\u76d1\u63a7
+btn.yh=\u9690\u60a3\u8bb0\u5f55
+btn.whsb=\u5371\u8d27\u4f5c\u4e1a\u7533\u62a5\u8bb0\u5f55
 
 col.code=\u7f16\u7801
 col.id=ID

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/common/component/ui/button/IconButton.mxml

@@ -112,6 +112,12 @@
 			[Embed(source="resource/yjpt/list/message.png")]
 			public var icon_message:Class;
 			
+			[Embed(source="resource/yjpt/list/yhjl.png")]
+			public var icon_yh:Class;
+			
+			[Embed(source="resource/yjpt/list/whsb.png")]
+			public var icon_whsb:Class;
+			
 			private var _type:String;
 			public function set type(val:String):void{
 				_type=val;
@@ -216,6 +222,12 @@
 						case "message":
 							icon.source = icon_message;
 							break;
+						case "yh":
+							icon.source = icon_yh;
+							break;
+						case "whsb":
+							icon.source = icon_whsb;
+							break;
 						default:
 							break;
 					}

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/model/check/DcModel.as

@@ -94,13 +94,17 @@ package com.jtgh.yjpt.model.check
 		}
 
 		public function editOrView(view:DisplayObject,x:Number,y:Number,title:String):void
-		{
+		{ 
+			//选中的信息
 			var records:ArrayCollection = dcLayout.getSelectedRecords();
 			if(records.length != 1){
 				Utils.showInfoMessage("msg.select.one");
 				return;
 			}
 			var dcId:Number=records[0].id;
+			
+			
+			//根据id获得督查信息的entity
 			Utils.callRemote("dcController","getDcxxById",function(r:ResultEvent):void{
 				var bc:BusinessContext=r.result as BusinessContext;
 				if("delete"==bc.result){
@@ -124,7 +128,23 @@ package com.jtgh.yjpt.model.check
 						if(fileList2!=null && fileList2.length>0){
 							view["DC_FJ3"].text="";
 						}
-					}				
+					}
+					
+					//危险危险区域是储罐时要显示储罐的信息
+					if(dcVo.yhqy=="2" ){
+						view["szcgStr"].visible=true;
+						view["szcgStr"].includeInLayout=true;
+						view["szcg"].visible=true;
+						view["szcg"].includeInLayout=true;
+					} else if(dcVo.yhqy=="1" ){
+						view["szcgStr"].visible=false;
+						view["szcgStr"].includeInLayout=false;
+						view["szcg"].visible=false;
+						view["szcg"].includeInLayout=false;
+						view["szcg"].selectedIndex=0;
+					}
+			
+					
 					if("-1"==dcVo.mqzt&&ObjectUtil.dateCompare(dcVo.jhwcsj,new Date())<0&&view is DcView){
 						//查看页面，如果为整改并且超出整改计划时间
 						(view as DcView).gqFlag=true;
@@ -190,19 +210,19 @@ package com.jtgh.yjpt.model.check
 					Alert.show(resourceManager.getString("common","msg.no.edit"),resourceManager.getString("common","tip"));
 					return;
 				}
-			}else{
-				
 			}
+			
 			dcEdit=new DcEdit();
 			if(vo.byzd1=="0"){
 				dcEdit.jcyj.visible=false;
 				dcEdit.jclxtext.visible=false;
 			}
 			dcEdit.dcModel=this;
+			dcVo = vo;
 			Utils.popupWindow(resourceManager.getString("common","btn.edit"),dcEdit,SystemModel.getInstance().getMainLayout(),null,800,600);	
-			dcEdit.addEventListener(FlexEvent.CREATION_COMPLETE,function():void{
-				editOrView(dcEdit,800,600,resourceManager.getString("common","btn.edit"));
-			});
+			//dcEdit.addEventListener(FlexEvent.CREATION_COMPLETE,function():void{
+				//editOrView(dcEdit,800,600,resourceManager.getString("common","btn.edit"));
+			//});
 		}
 		public function dotb(vo:DcVo):void
 		{
@@ -351,12 +371,21 @@ package com.jtgh.yjpt.model.check
 
 		public function doView():void
 		{
+			if(dcLayout.getSelectedRecords().length==0)
+			{
+				Alert.show(resourceManager.getString("common","msg.select"));
+				return;
+			}
+			var vo:DcVo = dcLayout.grid.selectedItem as DcVo;
+			 
+			
 			dcView=new DcView();
 			dcView.dcModel=this;
+			dcVo = vo;
 			Utils.popupWindow(resourceManager.getString("common","btn.view"),dcView,SystemModel.getInstance().getMainLayout(),null,0,0);	
-			dcView.addEventListener(FlexEvent.CREATION_COMPLETE,function():void{
-				editOrView(dcView,0,0,resourceManager.getString("common","btn.view"));
-			});
+//			dcView.addEventListener(FlexEvent.CREATION_COMPLETE,function():void{
+//				editOrView(dcView,0,0,resourceManager.getString("common","btn.view"));
+//			});
 		}
 		public function doHisView(vo:DcVo):void{
 			dcView=new DcView();
@@ -1194,6 +1223,9 @@ package com.jtgh.yjpt.model.check
 			dcVo.yhzl=tempVo.yhzl;
 			dcVo.yhfl=tempVo.yhfl;
 			dcVo.yhqy=tempVo.yhqy;
+			if(dcVo.yhqy=="2"){
+				dcVo.cg=tempVo.cg;
+			}
 			dcVo.yhjb=tempVo.yhjb;
 			dcVo.byzd1=tempVo.byzd1;
 			dcVo.jcyj=tempVo.jcyj;

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/model/yjgl/zdwxyfb/xxlr/CgModel.as

@@ -584,16 +584,7 @@ package com.jtgh.yjpt.model.yjgl.zdwxyfb.xxlr
 				cgztLayout.query_tbsj1.dateTime,cgztLayout.query_tbsj2.dateTime)	
 		}
 		
-		public function pageQueryYh(pager:SinglePageRequestVo):void
-		{
-			
-			Utils.callRemote("cgController","listYh",function(r:ResultEvent):void{
-				var bc:BusinessContext = r.result as BusinessContext;
-				yhList = bc.getAttribute("records") as ArrayCollection;
-				var pageVo:SinglePageRequestVo = yhOfCgLayout.pager.pageVo;
-				pageVo.totalCount = bc.getAttribute("totalCount") as int;
-			},pager,cgVo)	
-		}
+	
 		public function pageQueryWhsb(pager:SinglePageRequestVo):void
 		{
 			
@@ -656,6 +647,10 @@ package com.jtgh.yjpt.model.yjgl.zdwxyfb.xxlr
 			cgztLayout.pager.doQuery();
 		}
 		
+		/**
+		 * 查看隐患记录 
+		 * 隐患查看按钮的onclick事件
+		 */
 		public function doViewYhxx(event:MouseEvent):void{
 			var records:ArrayCollection = zdwxyView.cg.getSelectedRecords();
 			if(records.length != 1){
@@ -665,9 +660,9 @@ package com.jtgh.yjpt.model.yjgl.zdwxyfb.xxlr
 			cgVo=zdwxyView.cg.dataGrid.selectedItem as CgVo;
 			this.functionId=Utils.getFunctionId(zdwxyView); 
 			yhOfCgLayout= new YhOfCgLayout;
-			yhOfCgLayout.thisModel=this;
+			yhOfCgLayout.cgVo=cgVo;
 			Utils.popupWindow("隐患记录",yhOfCgLayout as DisplayObject,cgView as DisplayObject,function():void{
-			},800, 400);
+			},800, 550);
 		}
 		
 		public function doViewWhsq(event:MouseEvent):void{
@@ -684,51 +679,7 @@ package com.jtgh.yjpt.model.yjgl.zdwxyfb.xxlr
 			},0, 400);
 		}
 		
-		public function toViewYh(event:MouseEvent):void{
-			//检查选中项
-			if(yhOfCgLayout.dataGrid.selectedIndex==-1){
-				Utils.showInfoMessage("msg.select.one");
-				return;
-			}
-			var zcyhView:ZcyhView=new ZcyhView;
-			zcyhView.zcModel= new ZcModel;
-			zcyhView.thisData=yhOfCgLayout.dataGrid.selectedItem as ZcyhVo;
-			if(zcyhView["zpShow"])
-				(zcyhView["zpShow"]).removeAllElements();
-			if(zcyhView["zghzpShow"])
-				(zcyhView["zghzpShow"]).removeAllElements();
-			for each(var yhzp:ByteArray in zcyhView.thisData.yhzp){
-				var image:mx.controls.Image=new mx.controls.Image;
-				image.width=90;
-				image.height=90;
-				image.source=yhzp;
-				image.useHandCursor=true;
-				image.addEventListener(MouseEvent.CLICK,Utils.showImageHandler);
-				if(zcyhView["zpShow"]){
-					zcyhView["zpShow"].addElement(image);
-				}else {
-					zcyhView.addEventListener(FlexEvent.CREATION_COMPLETE,function():void{
-						zcyhView["zpShow"].addElement(image);
-					});
-				}
-			}
-			for each(var zghzp:ByteArray in zcyhView.thisData.zghzp){
-				var image1:mx.controls.Image=new mx.controls.Image;
-				image1.width=90;
-				image1.height=90;
-				image1.source=zghzp;
-				image1.useHandCursor=true;
-				image1.addEventListener(MouseEvent.CLICK,Utils.showImageHandler);
-				if(zcyhView["zghzpShow"]){
-					zcyhView["zghzpShow"].addElement(image1);
-				}else {
-					zcyhView.addEventListener(FlexEvent.CREATION_COMPLETE,function():void{
-						zcyhView["zghzpShow"].addElement(image1);
-					});
-				}
-			}
-			Utils.popupWindow(resourceManager.getString("common","btn.view"),zcyhView,yhOfCgLayout,null,650,450)	
-		}
+
 		
 		/**
 		 * 双击显示查看用户

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/Check/DcEdit.mxml

@@ -22,6 +22,7 @@
 			import com.jtgh.yjpt.vo.gg.GgVo;
 			import com.jtgh.yjpt.vo.gkgq.GqVo;
 			import com.jtgh.yjpt.vo.jyr.JyrVo;
+			import com.jtgh.yjpt.vo.yjgl.zdwxyfb.CgVo;
 			
 			import mx.collections.ArrayCollection;
 			import mx.events.CloseEvent;
@@ -87,6 +88,23 @@
 					save.visible=false;
 					save.includeInLayout=false;
 				}
+				
+				//危险危险区域是储罐时要显示储罐的信息
+				if(model.dcVo.yhqy=="2" ){
+					szcgStr.visible=true;
+					szcgStr.includeInLayout=true;
+					szcg.visible=true;
+					szcg.includeInLayout=true;
+				} else if(model.dcVo.yhqy=="1" ){
+					szcgStr.visible=false;
+					szcgStr.includeInLayout=false;
+					szcg.visible=false;
+					szcg.includeInLayout=false;
+					szcg.selectedIndex=0;
+				}
+				
+				szcg.parentId=model.dcVo.bdcdw;
+			   
 			}
 			public function doDownload(acc:AccessoryVo):void
 			{
@@ -396,6 +414,11 @@
 				dcModel.dcVo.jcyj=jcyj.selectedVO as GgVo;
 				dcModel.dcVo.yhfl=yhfl.textValue as String;
 				dcModel.dcVo.yhqy=yhqy.textValue as String;
+				//隱患區域是儲罐
+				if(dcModel.dcVo.yhqy == "2"){
+					dcModel.dcVo.cg= szcg.selectedVO as CgVo;
+				}
+				
 				if(yzg.selected){dcModel.dcVo.mqzt="1";}
 				else if(wzg.selected){dcModel.dcVo.mqzt="0";}
 				else if(yqzg.selected){dcModel.dcVo.mqzt="2";}
@@ -436,9 +459,9 @@
 					for each(file in zghzpList){
 						if(!Utils.checkUploadFileSize(file))
 						{
-							var arr:Array = new Array();
-							arr.push(Global.upload_file_size);
-							Utils.showInfoMessage("msg.upload.FileSizeOutOfRange",arr);
+							var arr3:Array = new Array();
+							arr3.push(Global.upload_file_size);
+							Utils.showInfoMessage("msg.upload.FileSizeOutOfRange",arr3);
 							break;
 						}
 						file.upload(request,"file");
@@ -505,9 +528,9 @@
 					for each(file in zghzpList){
 						if(!Utils.checkUploadFileSize(file))
 						{
-							var arr:Array = new Array();
-							arr.push(Global.upload_file_size);
-							Utils.showInfoMessage("msg.upload.FileSizeOutOfRange",arr);
+							var arr5:Array = new Array();
+							arr5.push(Global.upload_file_size);
+							Utils.showInfoMessage("msg.upload.FileSizeOutOfRange",arr5);
 							break;
 						}
 						file.upload(request,"file");
@@ -580,9 +603,9 @@
 					for each(file in zghzpList){
 						if(!Utils.checkUploadFileSize(file))
 						{
-							var arr:Array = new Array();
-							arr.push(Global.upload_file_size);
-							Utils.showInfoMessage("msg.upload.FileSizeOutOfRange",arr);
+							var arr7:Array = new Array();
+							arr7.push(Global.upload_file_size);
+							Utils.showInfoMessage("msg.upload.FileSizeOutOfRange",arr7);
 							break;
 						}
 						file.upload(request,"file");
@@ -658,9 +681,9 @@
 					for each(file in zghzpList){
 						if(!Utils.checkUploadFileSize(file))
 						{
-							var arr:Array = new Array();
-							arr.push(Global.upload_file_size);
-							Utils.showInfoMessage("msg.upload.FileSizeOutOfRange",arr);
+							var arr2:Array = new Array();
+							arr2.push(Global.upload_file_size);
+							Utils.showInfoMessage("msg.upload.FileSizeOutOfRange",arr2);
 							break;
 						}
 						file.upload(request,"file");
@@ -689,6 +712,25 @@
 				},dcModel.dcVo.id,type,0,dcModel.dcVo.tbdyid);
 
 			}
+			
+			protected function yhqy_changeHandler(event:IndexChangeEvent):void
+			{
+				if((yhqy.textValue as String)=="2" ){
+					szcgStr.visible=true;
+					szcgStr.includeInLayout=true;
+					szcg.visible=true;
+					szcg.includeInLayout=true;
+					if(dcModel!=null){
+						szcg.reload(bdcdw.selectedVO as JyrVo);
+					}				
+				} else if((yhqy.textValue as String)=="1" ){
+					szcgStr.visible=false;
+					szcgStr.includeInLayout=false;
+					szcg.visible=false;
+					szcg.includeInLayout=false;
+					szcg.selectedIndex=0;
+				}
+			}
 
 		]]>
 	</fx:Script>
@@ -739,17 +781,22 @@
 		<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
 			<cus:QLabel text="{resourceManager.getString('check','yhfl')}" textAlign="right" width="135" />
 			<cus:QComboBox id="yhfl"  dataField="{dcModel.dcVo.yhfl}"  comboxClass="YhflSelect"  hasBlank="true"  width="200"/>
-			<cus:QLabel text="{resourceManager.getString('check','yhqy')}" textAlign="right" width="120" />
-			<cus:QComboBox id="yhqy" dataField="{dcModel.dcVo.yhqy}" width="200" comboxClass="YhqySelect"   hasBlank="true"/>
+			<cus:QLabel text="{resourceManager.getString('check','yhjb')}" textAlign="right" width="120" notNull="true"/>
+			<cus:QComboBox id="yhjb" selectedVO="{dcModel.dcVo.yhjb}" width="200" comboxClass="CodeSelect" codeType="{Constants.GROUP_CODE_YHJB}" hasBlank="true" enabled="{!isJyr}"/>
+			<!--<s:HGroup width="341" verticalAlign="middle" horizontalAlign="left"></s:HGroup>-->
+		</s:HGroup>
+		<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
+			<cus:QLabel text="{resourceManager.getString('check','yhqy')}" textAlign="right" width="135" />
+			<cus:QComboBox id="yhqy" dataField="{dcModel.dcVo.yhqy}" width="200" comboxClass="YhqySelect" hasBlank="true" change="yhqy_changeHandler(event)"/>
+			<cus:QLabel id="szcgStr"  text="{resourceManager.getString('check','szcg')}" textAlign="right" width="120" visible="false" includeInLayout="false"/>
+			<cus:QComboBox id="szcg" selectedVO="{dcModel.dcVo.cg}" width="200" comboxClass="CgSelect"   hasBlank="true" visible="false" includeInLayout="false"/>
 		</s:HGroup>
+		
 		<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
-			<s:HGroup width="341" verticalAlign="middle" horizontalAlign="left">
-				<cus:QLabel text="{resourceManager.getString('check','yhjb')}" textAlign="right" width="135" notNull="true"/>
-				<cus:QComboBox id="yhjb" selectedVO="{dcModel.dcVo.yhjb}" width="200" comboxClass="CodeSelect" codeType="{Constants.GROUP_CODE_YHJB}" hasBlank="true" enabled="{!isJyr}"/>
-			</s:HGroup>
-			<cus:QLabel text="{resourceManager.getString('check','jhwcsj')}" textAlign="right" width="120"/>
+			<cus:QLabel text="{resourceManager.getString('check','jhwcsj')}" textAlign="right" width="135"/>
 			<ui:DateTime id="jhwcsj" dateTime="{dcModel.dcVo.jhwcsj}" width="200" />
 		</s:HGroup>
+		
 		<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
 			<cus:QLabel text="{resourceManager.getString('check','jdjcgl.jdjcnr')}" textAlign="right" width="135" notNull="true"/><!-- 隐患名称 -->
 			<cus:QTextArea height="100" text="@{dcModel.dcVo.jdjcnr}" width="532" editable="{!isJyr}" maxChars="200"/>

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/Check/DcView.mxml

@@ -8,6 +8,7 @@
 	<fx:Script>
 		<![CDATA[
 			import com.anychart.axesPlot.data.data3D.ZPointSettings;
+			import com.jtgh.yjpt.common.BusinessContext;
 			import com.jtgh.yjpt.common.Global;
 			import com.jtgh.yjpt.common.PrintParam;
 			import com.jtgh.yjpt.common.PrintTypes;
@@ -15,6 +16,7 @@
 			import com.jtgh.yjpt.common.util.PrintUtil;
 			import com.jtgh.yjpt.common.util.Utils;
 			import com.jtgh.yjpt.model.check.DcModel;
+			import com.jtgh.yjpt.vo.check.DcVo;
 			import com.jtgh.yjpt.vo.common.AccessoryVo;
 			
 			import mx.collections.ArrayCollection;
@@ -22,6 +24,8 @@
 			import mx.events.FlexEvent;
 			import mx.managers.CursorManager;
 			import mx.rpc.events.ResultEvent;
+			import mx.utils.ObjectUtil;
+			
 			[Bindable]
 			public var dcModel:DcModel;
 			public var zpfjList:ArrayCollection=new ArrayCollection;
@@ -36,19 +40,98 @@
 				downLoadFunction(acc);
 			}
 			public function init(e:Event):void{
-				thisView = this;
-				var label:Label;
-				var i:int;
-				var filevo:AccessoryVo;
-				if(dcModel.fileList!=null){
-					for(i =0;i<dcModel.fileList.length;i++){
-						filevo = dcModel.fileList.getItemAt(i) as AccessoryVo;
-						if(Constants.GGDM_NAME_FILETYPE_NO != filevo.type.name){
-							label= this[filevo.type.name.replace(".","_")] as Label;
-							label.text = "";
+				//根据id获得督查信息的entity
+				Utils.callRemote("dcController","getDcxxById",function(r:ResultEvent):void{
+					var bc:BusinessContext=r.result as BusinessContext;
+					var dcVo:DcVo=new DcVo;
+					var fileList:ArrayCollection;
+					//var view:DcView = thisView;
+					
+						dcVo=bc.getAttribute("dc") as DcVo;
+						fileList = bc.getAttribute("cs") as ArrayCollection;
+						 
+							var filevo:AccessoryVo;
+							var label:Label;
+							if(fileList!=null){
+								for(var i :int =0;i<fileList.length;i++){
+									filevo = fileList.getItemAt(i) as AccessoryVo;
+									if(Constants.GGDM_NAME_FILETYPE_NO != filevo.type.name){
+										label= this[filevo.type.name.replace(".","_")] as Label;
+										label.text = "";
+									}
+								}
+							}
+							var fileList2:ArrayCollection = bc.getAttribute("yq") as ArrayCollection;
+							if(fileList2!=null && fileList2.length>0){
+								DC_FJ3.text="";
+							}
+						 
+						
+						//危险危险区域是储罐时要显示储罐的信息
+						if(dcVo.yhqy=="2" ){
+							szcgStr.visible=true;
+							szcgStr.includeInLayout=true;
+							szcg.visible=true;
+							szcg.includeInLayout=true;
+						} else if(dcVo.yhqy=="1" ){
+							szcgStr.visible=false;
+							szcgStr.includeInLayout=false;
+							szcg.visible=false;
+							szcg.includeInLayout=false;
+							szcg.selectedIndex=0;
 						}
-					}
-				}
+						
+						
+						if("-1"==dcVo.mqzt&&ObjectUtil.dateCompare(dcVo.jhwcsj,new Date())<0&&thisView is DcView){
+							//查看页面，如果为整改并且超出整改计划时间
+							(thisView as DcView).gqFlag=true;
+							(thisView as DcView).needWarn=true;
+						}
+						if(zpShow)
+							(zpShow).removeAllElements();
+						if(zghzpShow)
+							(zghzpShow).removeAllElements();
+						if(zpfjList)
+							zpfjList.removeAll();
+						if(zghzpList)
+							zghzpList.removeAll();
+						var zpfjList:ArrayCollection=bc.getAttribute("zpfj") as ArrayCollection;
+						dcVo.zpfj=zpfjList;
+						for each(var zpfj:ByteArray in zpfjList){
+							var image:mx.controls.Image=new mx.controls.Image;
+							image.width=90;
+							image.height=90;
+							image.source=zpfj;
+							image.useHandCursor=true;
+							image.addEventListener(MouseEvent.CLICK,Utils.showImageHandler);
+							if(zpShow){
+								zpShow.addElement(image);
+							}else {
+								thisView.addEventListener(FlexEvent.CREATION_COMPLETE,function():void{
+									zpShow.addElement(image);
+								});
+							}
+						}
+						var zghzpList:ArrayCollection=bc.getAttribute("zghzp") as ArrayCollection;
+						dcVo.zghzp=zghzpList;
+						for each(var zghzp:ByteArray in zghzpList){
+							var image1:mx.controls.Image=new mx.controls.Image;
+							image1.width=90;
+							image1.height=90;
+							image1.source=zghzp;
+							image1.useHandCursor=true;
+							image1.addEventListener(MouseEvent.CLICK,Utils.showImageHandler);
+							if(zghzpShow){
+								zghzpShow.addElement(image1);
+							}else {
+								thisView.addEventListener(FlexEvent.CREATION_COMPLETE,function():void{
+									zghzpShow.addElement(image1);
+								});
+							}
+						}
+					 
+				},dcModel.dcVo.id)
+				
 			}
 			/**
 			 * 下载
@@ -222,21 +305,25 @@
 				<cus:QComboBox id="yhzl" selectedVO="{dcModel.dcVo.yhzl}" width="200" comboxClass="CodeSelect" codeType="" parentId="{dcModel.dcVo.yhdl.id.toString()}"  hasBlank="true" enabled="false"/>
 			</s:HGroup>
 			<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
-				<cus:QLabel text="{resourceManager.getString('check','jclx')}" textAlign="right" width="135" notNull="true"/>
+				<cus:QLabel text="{resourceManager.getString('check','jclx')}" textAlign="right" width="135" />
 				<cus:QComboBox id="jclx"  comboxClass="ZxjcSelect"  hasBlank="true" dataField="{dcModel.dcVo.byzd1}"  width="200" enabled="false"/>
-				<cus:QLabel text="{resourceManager.getString('check','jcyj')}" textAlign="right" width="120" notNull="true"/>
+				<cus:QLabel text="{resourceManager.getString('check','jcyj')}" textAlign="right" width="120" />
 				<cus:QComboBox id="jcyj" selectedVO="{dcModel.dcVo.jcyj}" width="200" comboxClass="JcyjSelect"   hasBlank="true" enabled="false"/>
 			</s:HGroup>
 			<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
 				<cus:QLabel text="{resourceManager.getString('check','yhfl')}" textAlign="right" width="135" />
 				<cus:QComboBox id="yhfl"  dataField="{dcModel.dcVo.yhfl}"  comboxClass="YhflSelect"  hasBlank="false"  width="200" enabled="false"/>
-				<cus:QLabel text="{resourceManager.getString('check','yhqy')}" textAlign="right" width="120" />
+				<cus:QLabel text="{resourceManager.getString('check','yhjb')}" textAlign="right" width="120"/>
+				<cus:QComboBox id="yhjb" selectedVO="{dcModel.dcVo.yhjb}" width="200" comboxClass="CodeSelect" codeType="{Constants.GROUP_CODE_YHJB}" hasBlank="true" enabled="false"/>
+			</s:HGroup>
+			<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
+				<cus:QLabel text="{resourceManager.getString('check','yhqy')}" textAlign="right" width="135" />
 				<cus:QComboBox id="yhqy" dataField="{dcModel.dcVo.yhqy}" width="200" comboxClass="YhqySelect"   hasBlank="false" enabled="false"/>
+				<cus:QLabel id="szcgStr"  text="{resourceManager.getString('check','szcg')}" textAlign="right" width="120" enabled="false" visible="false" includeInLayout="false"/>
+				<cus:QComboBox id="szcg" selectedVO="{dcModel.dcVo.cg}" width="200" comboxClass="CgSelect" hasBlank="true" enabled="false" visible="false" includeInLayout="false"/>
 			</s:HGroup>
 			<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
-				<cus:QLabel text="{resourceManager.getString('check','yhjb')}" textAlign="right" width="135"/>
-				<cus:QComboBox id="yhjb" selectedVO="{dcModel.dcVo.yhjb}" width="200" comboxClass="CodeSelect" codeType="{Constants.GROUP_CODE_YHJB}" hasBlank="true" enabled="false"/>
-				<cus:QLabel text="{resourceManager.getString('check','jhwcsj')}" textAlign="right" width="120"/>
+				<cus:QLabel text="{resourceManager.getString('check','jhwcsj')}" textAlign="right" width="135"/>
 				<ui:DateField id="jhwcsj" styleName="{gqFlag?'redText':''}" selectedDate="@{dcModel.dcVo.jhwcsj}" width="200" enabled="false"/>
 			</s:HGroup>
 			<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/yjgl/zdwxyfb/xxlr/CgView.mxml

@@ -494,7 +494,7 @@
 					<ui:DateField selectedDate="@{cgModel.cgVo.tbsj}" width="612" enabled="false"/>
 				</s:HGroup>
 			</s:VGroup>
-			<s:BorderContainer width="100%" borderVisible="false" height="32" backgroundColor="#23A5B8">
+			<!--<s:BorderContainer width="100%" borderVisible="false" height="32" backgroundColor="#23A5B8">
 				<s:layout>
 					<s:HorizontalLayout horizontalAlign="center" verticalAlign="middle" paddingLeft="5"/>
 				</s:layout>
@@ -507,7 +507,7 @@
 					<mx:LinkButton label="危货作业申报记录" 
 								   click="cgModel.doViewWhsq(event)"/>			
 				</s:HGroup>
-			</s:VGroup>
+			</s:VGroup>-->
 		</s:VGroup>
 	</s:BorderContainer>
 	<s:HGroup width="100%" horizontalAlign="center">

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/yjgl/zdwxyfb/xxlr/YhOfCgLayout.mxml

@@ -3,49 +3,145 @@
 				xmlns:s="library://ns.adobe.com/flex/spark"
 				xmlns:mx="library://ns.adobe.com/flex/mx"
 				xmlns:ui="com.jtgh.yjpt.common.component.ui.*"
-				xmlns:xxlr="com.jtgh.yjpt.view.yjgl.zdwxyfb.xxlr.*"
-				width="100%" height="100%" creationComplete="creationComplete(event)" 
-				xmlns:cus="com.jtgh.yjpt.common.cus.*" xmlns:button="com.jtgh.yjpt.common.component.ui.button.*" >
+				width="100%" height="100%" creationComplete="init(event)"
+				xmlns:renderer="com.jtgh.yjpt.common.component.renderer.*" 
+				xmlns:cus="com.jtgh.yjpt.common.cus.*" 
+				xmlns:button="com.jtgh.yjpt.common.component.ui.button.*">
 	<fx:Script>
 		<![CDATA[
-			import com.jtgh.yjpt.model.yjgl.zdwxyfb.xxlr.CgModel;
+			import com.anychart.axesPlot.scales.dateTime.DateUtils;
+			import com.jtgh.yjpt.common.BusinessContext;
+			import com.jtgh.yjpt.common.Global;
+			import com.jtgh.yjpt.common.MyEvent;
+			import com.jtgh.yjpt.common.component.ui.Pager;
+			import com.jtgh.yjpt.common.util.Utils;
+			import com.jtgh.yjpt.vo.common.CodeVo;
+			import com.jtgh.yjpt.vo.common.SinglePageRequestVo;
+			import com.jtgh.yjpt.vo.yjgl.zdwxyfb.CgVo;
 			
+			import mx.collections.ArrayCollection;
 			import mx.events.FlexEvent;
+			import mx.events.IndexChangedEvent;
+			import mx.formatters.DateFormatter;
+			import mx.managers.CursorManager;
+			import mx.rpc.events.ResultEvent;
 			
 			import spark.components.gridClasses.GridColumn;
+			
+			public const DC_INDEX:Number=0; 
+			public const ZC_INDEX:Number=1;
+			public var cgVo:CgVo;
+			
 			[Bindable]
-			public var thisModel:CgModel;
+			public var index:Number=DC_INDEX;//tab index ,default show first tab content 
 			
-			/**
-			 *初始化
-			 */
-			protected function creationComplete(event:FlexEvent):void
-			{
-				this.pager.doQuery();				
+			[Bindable]
+			public var dcList:ArrayCollection=new ArrayCollection(); 
+			[Bindable]
+			public var zcList:ArrayCollection=new ArrayCollection();
+			
+			[Bindable]
+			public var selectMode:String="singleRow";
+			 
+			 
+			
+			protected function init(event:FlexEvent):void{
+				  
+				dcPager.doQuery();
+				this.tab.addEventListener(IndexChangedEvent.CHANGE,function(e:IndexChangedEvent):void{
+					if(e.newIndex==DC_INDEX){
+						 
+						dcPager.doQuery();
+					}
+				 
+					if(e.newIndex==ZC_INDEX) {						
+						 
+						zcPager.doQuery();
+					}
+				});
 			}
-			private function labelFun(item:Object, column:GridColumn):String
+			
+			public function doQuery(e:Event):void{
+				if(index==DC_INDEX){
+					dcPager.doQuery();
+				}
+				 
+				if(index==ZC_INDEX) {
+					zcPager.doQuery();
+				}	
+			}
+			
+			//督查
+			protected function query_dc(pager:SinglePageRequestVo):void{
+				Utils.callRemote("cgController","listDcYh",function(r:ResultEvent):void{
+					var bc:BusinessContext = r.result as BusinessContext;
+					dcList = bc.getAttribute("records") as ArrayCollection;
+					var pageVo:SinglePageRequestVo = dcPager.pageVo;
+					pageVo.totalCount = bc.getAttribute("totalCount") as int;
+				},pager,cgVo)				
+			}
+			
+	 
+			//自查		
+			protected function query_zc(pager:SinglePageRequestVo):void{
+					Utils.callRemote("cgController","listYh",function(r:ResultEvent):void{
+						var bc:BusinessContext = r.result as BusinessContext;
+						zcList = bc.getAttribute("records") as ArrayCollection;
+						var pageVo:SinglePageRequestVo = zcPager.pageVo;
+						pageVo.totalCount = bc.getAttribute("totalCount") as int;
+					},pager,cgVo)	
+				 		
+			}
+			
+			
+			//序号
+			private function labelFun(item:Object,column:GridColumn):String
 			{
-				return (this.pager.pageVo.page*10+this.dataGrid.dataProvider.getItemIndex(item)+1).toString();
+				if(index == DC_INDEX){
+					return (this.dcPager.pageVo.page*10+this.dcGrid.dataProvider.getItemIndex(item)+1).toString();
+				}
+			 
+				if(index == ZC_INDEX){
+					return (this.zcPager.pageVo.page*10+this.zcGrid.dataProvider.getItemIndex(item)+1).toString();
+				} 	
+				return (this.dcPager.pageVo.page*10+this.dcGrid.dataProvider.getItemIndex(item)+1).toString();
 			}
-
-		
 			
-		]]>
+		  
+			
+		]]>			
 	</fx:Script>
-	<s:VGroup width="100%">
-		<s:DataGrid id="dataGrid" width="100%" borderAlpha="1" minHeight="330" height="100%"
-					doubleClickEnabled="true"  verticalScrollPolicy="off" horizontalScrollPolicy="off"
-					rowHeight="30" selectionMode="singleRow" textAlign="center" dataProvider="{thisModel.yhList}"
-					doubleClick="{thisModel.toViewYh(event)}">
-			<s:columns>
-				<s:ArrayList>
-					<ui:DataGridColumn dataField="xmmc" headerText="{resourceManager.getString('check','zcyh.xmmc')}"/>
-					<ui:DataGridColumn dataField="yhjbName" editable="false"  headerText="{resourceManager.getString('check','zcyh.yhjb')}"/>
-					<ui:DataGridColumn dataField="mqzt_s" editable="false"  headerText="{resourceManager.getString('check','mqzt')}"/>
-					<ui:DataGridColumn dataField="jhwcsj_s" editable="false"  headerText="{resourceManager.getString('check','jhwcsj')}"/>
-				</s:ArrayList> 
-			</s:columns>
-		</s:DataGrid>
-		<ui:Pager id="pager" queryFunction="{thisModel.pageQueryYh}"/>
-	</s:VGroup>
-</ui:QueryLayout>
+	  
+	<mx:TabNavigator id="tab" width="100%" height="100%" selectedIndex="@{index}" minHeight="350">
+		<s:NavigatorContent label="督查隐患">
+			<s:VGroup width="100%" gap="0" horizontalAlign="left" verticalAlign="middle">
+				<ui:DataGrid id="dcGrid" width="100%" selectionMode="{selectMode}" dataProvider="{dcList}" minHeight="330"
+							 verticalScrollPolicy="off" horizontalScrollPolicy="on">
+					<ui:columns><s:ArrayList>	
+									<ui:DataGridColumn dataField="jdjcnr" headerText="{resourceManager.getString('check','zcyh.xmmc')}"/>
+									<ui:DataGridColumn dataField="yhjbName" editable="false"  headerText="{resourceManager.getString('check','zcyh.yhjb')}"/>
+									<ui:DataGridColumn dataField="mqztName" editable="false"  headerText="{resourceManager.getString('check','mqzt')}"/>
+									<ui:DataGridColumn dataField="jhwcsj_s" editable="false"  headerText="{resourceManager.getString('check','jhwcsj')}"/>
+								</s:ArrayList></ui:columns>
+				</ui:DataGrid>
+				<ui:Pager id="dcPager"  queryFunction="{query_dc}"/>
+			</s:VGroup>
+		</s:NavigatorContent>
+	  
+		<s:NavigatorContent label="自查隐患">
+			<s:VGroup width="100%" gap="0" horizontalAlign="left" verticalAlign="middle">
+				<ui:DataGrid id="zcGrid" width="100%" selectionMode="{selectMode}" dataProvider="{zcList}" minHeight="330"
+							 verticalScrollPolicy="off" horizontalScrollPolicy="on">
+					<ui:columns><s:ArrayList >	
+									<ui:DataGridColumn dataField="xmmc" headerText="{resourceManager.getString('check','zcyh.xmmc')}"/>
+									<ui:DataGridColumn dataField="yhjbName" editable="false"  headerText="{resourceManager.getString('check','zcyh.yhjb')}"/>
+									<ui:DataGridColumn dataField="mqzt_s" editable="false"  headerText="{resourceManager.getString('check','mqzt')}"/>
+									<ui:DataGridColumn dataField="jhwcsj_s" editable="false"  headerText="{resourceManager.getString('check','jhwcsj')}"/>
+								</s:ArrayList></ui:columns>
+				</ui:DataGrid>
+				<ui:Pager id="zcPager"  queryFunction="{query_zc}"/>
+			</s:VGroup>		
+		</s:NavigatorContent>
+	</mx:TabNavigator>	
+	
+</ui:QueryLayout>

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/yjgl/zdwxyfb/xxlr/ZdwxyfbLayout.mxml

@@ -220,6 +220,7 @@
 	</fx:Script>
 
 	<s:HGroup width="100%" height="40" gap="10" paddingLeft="10" horizontalAlign="left" verticalAlign="middle">
+		
 		<button:IconButton id="add" type="add" toolTip="{resourceManager.getString('common','btn.add')}"  visible="{Global.BUTTON_STATUS}" includeInLayout="{Global.BUTTON_STATUS}"
 						   click="doAdd(event)"/>
 		<button:IconButton id="del" type="delete" toolTip="{resourceManager.getString('common','btn.del')}" visible="{Global.BUTTON_STATUS}" includeInLayout="{Global.BUTTON_STATUS}"
@@ -240,7 +241,9 @@
 						   visible="{Global.OPEN_MAP==YesNoSelect.YES &amp;&amp; Global.user.sfyxckdt==YesNoSelect.YES}"
 						   includeInLayout="{Global.OPEN_MAP==YesNoSelect.YES &amp;&amp; Global.user.sfyxckdt==YesNoSelect.YES}"/>
 		<button:IconButton id="copy" type="bgzy"  toolTip="复制" click="cgModel.doCopy(event)" enabled="{tab.selectedIndex==0}"/>
-		<button:IconButton id="status" type="check"  toolTip="{resourceManager.getString('common','btn.status')}" click="cgModel.doViewZt(event)"  enabled="{tab.selectedIndex==0}" visible="{Global.BUTTON_STATUS}" includeInLayout="{Global.BUTTON_STATUS}" />
+		<button:IconButton id="status" type="check" toolTip="{resourceManager.getString('common','btn.status')}" click="cgModel.doViewZt(event)"  enabled="{tab.selectedIndex==0}" visible="{Global.BUTTON_STATUS}" includeInLayout="{Global.BUTTON_STATUS}" />
+		<button:IconButton id="yh" type="yh" toolTip="{resourceManager.getString('common','btn.yh')}" click="cgModel.doViewYhxx(event)" enabled="{tab.selectedIndex==0}"  />
+		<button:IconButton id="whsb" type="whsb" toolTip="{resourceManager.getString('common','btn.whsb')}" click="cgModel.doViewWhsq(event)"  enabled="{tab.selectedIndex==0}"  />
 	</s:HGroup >
 	<mx:TabNavigator id="tab" width="100%" height="100%" selectedIndex="@{index}" minHeight="500">
 		<s:NavigatorContent label="储罐">

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/vo/check/DcVo.as

@@ -12,10 +12,13 @@ package com.jtgh.yjpt.vo.check
 	import com.jtgh.yjpt.vo.gg.GgVo;
 	import com.jtgh.yjpt.vo.gkgq.GqVo;
 	import com.jtgh.yjpt.vo.jyr.JyrVo;
+	import com.jtgh.yjpt.vo.yjgl.zdwxyfb.CgVo;
+	import com.jtgh.yjpt.common.TypeBase;
 	
 	import mx.collections.ArrayCollection;
 	import mx.resources.IResourceManager;
 	import mx.resources.ResourceManager;
+	import mx.formatters.DateFormatter;
 
 	[Bindable]
 	[RemoteClass(alias="com.jtgh.yjpt.entity.check.DcEntity")]
@@ -201,10 +204,15 @@ package com.jtgh.yjpt.vo.check
 		 * 隐患中类
 		 */
 		public var yhzl:CodeVo;
+		
 		/**
 		 * 隐患级别
 		 */
 		public var yhjb:CodeVo;
+		public function get yhjbName():String{
+			return null==yhjb?"":yhjb.localeName;
+		}
+		
 		/**
 		 * 整改投入资金
 		 */
@@ -244,6 +252,13 @@ package com.jtgh.yjpt.vo.check
 		 * 计划完成时间
 		 */
 		public var jhwcsj:Date;
+		
+		public function get jhwcsj_s():String{
+			var fr:DateFormatter=new DateFormatter();
+			fr.formatString=TypeBase.DT_FMT_1;
+			return fr.format(jhwcsj)
+		}
+		
 
 		/**
 		 * 整改结果（整改完成）
@@ -370,6 +385,12 @@ package com.jtgh.yjpt.vo.check
 				return task.startUser.name;
 			return "";
 		}
+		
+		
+		/**
+		 * 所在储罐
+		 */
+		public var cg:CgVo;
 
 	}
 }

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/vo/check/ZcyhVo.as

@@ -64,17 +64,19 @@ package com.jtgh.yjpt.vo.check
 		 * 隐患中类
 		 */
 		public var yhzl:CodeVo;
+		
 		/**
 		 * 隐患级别
 		 */
 		public var yhjb:CodeVo;
+		public function get yhjbName():String{
+			return null==yhjb?"":yhjb.localeName;
+		}
+		
 		/**
 		 * 所在储罐
 		 */
 		public var cg:CgVo;
-		public function get yhjbName():String{
-			return null==yhjb?"":yhjb.localeName;
-		}
 		
 		/**
 		 * 备注
@@ -123,11 +125,6 @@ package com.jtgh.yjpt.vo.check
 		 * 计划完成时间
 		 */
 		public var jhwcsj:Date;
-		
-		/**
-		 *发现日期
-		 */
-		public var fxrq:Date;
 
 		public function get jhwcsj_s():String{
 			var fr:DateFormatter=new DateFormatter();
@@ -135,6 +132,12 @@ package com.jtgh.yjpt.vo.check
 			return fr.format(jhwcsj)
 		}
 
+		
+		/**
+		 *发现日期
+		 */
+		public var fxrq:Date;
+		
 		/**
 		 * 整改结果（整改完成）
 		 */