储罐状态

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

gkaq/yjpt-flex/trunk/html-template/index.template.html

@@ -54,7 +54,7 @@
             attributes.name = "${application}";
             attributes.align = "middle";
             swfobject.embedSWF(
-                "${swf}.swf?version=4.1.2", "flashContent", 
+                "${swf}.swf?version=4.1.3", "flashContent", 
                 "${width}", "${height}", 
                 swfVersionStr, xiSwfUrlStr, 
                 flashvars, params, attributes);

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

@@ -58,7 +58,7 @@ 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=\u72b6\u6001
+btn.status=\u50a8\u7f50\u4fe1\u606f\u76d1\u63a7
 
 col.code=\u7f16\u7801
 col.id=ID

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

@@ -54,7 +54,7 @@ m002002003_c=\u5e94\u6025\u6f14\u7ec3\u586b\u62a5
 m002002_c=\u5e94\u6025\u57f9\u8bad\u3001\u6f14\u7ec3\u548c\u6f14\u4e60\u586b\u62a5
 m002005=\u4e8b\u6545\u6848\u4f8b\u7ba1\u7406
 m002005_c=\u4e8b\u6545\u6848\u4f8b\u586b\u62a5
-m002007=\u91cd\u5927\u5371\u9669\u6e90\u5f55\u5165
+m002007=\u50a8\u7f50\u4fe1\u606f\u7ba1\u7406
 m002007001=\u4fe1\u606f\u5f55\u5165
 m002007001_c=\u4fe1\u606f\u5f55\u5165
 m002007_c=\u50a8\u7f50\u4fe1\u606f\u586b\u62a5

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/common/ClassRegistry.as

@@ -90,6 +90,7 @@ package com.jtgh.yjpt.common
 	import com.jtgh.yjpt.vo.yjgl.YjyxVo;
 	import com.jtgh.yjpt.vo.yjgl.zdwxyfb.CgVo;
 	import com.jtgh.yjpt.vo.yjgl.zdwxyfb.CgztVo;
+	import com.jtgh.yjpt.vo.yjgl.zdwxyfb.CgsyVo;
 	import com.jtgh.yjpt.vo.yjgl.zdwxyfb.QskVo;
 	import com.jtgh.yjpt.vo.yjgl.zdwxyfb.ZbhjjbqkVo;
 	import com.jtgh.yjpt.vo.yjzyxxgl.GkqyxxwhVo;
@@ -230,6 +231,7 @@ package com.jtgh.yjpt.common
 		FrxzxkVo;
 		XksbVo;
 		CgztVo;
+		CgsyVo;
 		
 		// Select
 		CodeSelect;

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/common/IconResource.as

@@ -19,6 +19,28 @@ public var iconDel:Class;
 [Bindable]
 [Embed(source="resource/images/export.png")]
 public var iconExport:Class;
+
+/**
+ * Gree
+ */
+[Bindable]
+[Embed(source="resource/images/zt_gree.png")]
+public var ztGree:Class;
+
+/**
+ * Red
+ */
+[Bindable]
+[Embed(source="resource/images/zt_red.png")]
+public var ztRed:Class;
+
+/**
+ * Yellow
+ */
+[Bindable]
+[Embed(source="resource/images/zt_yellow.png")]
+public var ztYellow:Class;
+
 //*********************以上是列表中功能按钮图标************************
 // ************************导航菜单相关图片**********************************
 [Embed(source="resource/yjpt/nav/icon_nav_button01.png")]

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/common/TypeBase.as

@@ -32,5 +32,6 @@ package com.jtgh.yjpt.common
 		public static var MULTIBUTTON:String = "multibutton";
 		public static var TEXTINPUT:String="textInput";
 		public static var GIFIMAGE:String="gifimage";
+		public static var IMAGE:String="image";
 	}
 }

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/common/component/renderer/GifImageRenderer.as

@@ -1,7 +1,7 @@
 package com.jtgh.yjpt.common.component.renderer
 {
 	import com.jtgh.yjpt.common.util.Utils;
-	import com.ldfsoft.flex.player.GIFPlayer;
+	//import com.ldfsoft.flex.player.GIFPlayer;
 	
 	import flash.net.URLRequest;
 	
@@ -23,8 +23,8 @@ package com.jtgh.yjpt.common.component.renderer
 		[Bindable]
 		public var group:HGroup = new HGroup();
 		
-		[Bindable]
-		private var gifPlay:GIFPlayer=new GIFPlayer();
+	//	[Bindable]
+	//	private var gifPlay:GIFPlayer=new GIFPlayer();
 		
 		[Bindable]
 		public var zt:String; 
@@ -53,7 +53,7 @@ package com.jtgh.yjpt.common.component.renderer
 			} else if(zt=="3")  {
 				req=new URLRequest("resource/images/zt_yellow.gif");	
 			}
-			gifPlay.load(req);													
+	//		gifPlay.load(req);													
 			group.width=0;
 			group.height=0;
 			group.horizontalCenter=0;
@@ -61,7 +61,7 @@ package com.jtgh.yjpt.common.component.renderer
 			group.addElement(image);
 			image.x=-12;
 			image.y=-12
-			image.addChild(gifPlay); 	
+	//		image.addChild(gifPlay); 	
 			this.addElement(group);
 		}
 	}

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/common/component/renderer/ImageRenderer.as

@@ -0,0 +1,63 @@
+package com.jtgh.yjpt.common.component.renderer
+{
+	import com.jtgh.yjpt.common.util.Utils;
+	
+	import flash.net.URLRequest;
+	
+	import mx.controls.Image;
+	import mx.events.FlexEvent;
+	
+	import spark.components.HGroup;
+	import spark.components.gridClasses.GridItemRenderer;
+	
+	
+	public class ImageRenderer extends GridItemRenderer
+	{	
+		include "../../IconResource.as";
+		public function ImageRenderer()
+		{
+			super();
+			this.addEventListener(FlexEvent.CREATION_COMPLETE,creation_complete);
+		}
+		
+		[Bindable]
+		public var group:HGroup = new HGroup();
+				
+		[Bindable]
+		public var zt:String; 
+		
+		[Bindable]
+		public var fieldName:String; 
+		
+		[Bindable]
+		public var image:Image = new Image();
+		
+		override public function set data(val:Object):void
+		{
+			super.data=val;
+			if(val!=null){
+				zt=val[fieldName]==null?"":val[fieldName].toString();
+			}
+			if(zt=="1")
+			{
+				image.source=ztGree;																								
+			} else if(zt=="2") {
+				image.source=ztRed;			
+			} else if(zt=="3")  {
+				image.source=ztYellow;			
+			}	else{
+				image.source=ztGree;			
+			}
+		}
+		
+		private function creation_complete(e:FlexEvent):void{							
+			group.percentWidth=100;
+			group.percentHeight=100;
+			group.horizontalAlign="center";
+			group.verticalAlign="middle";
+			
+			group.addElement(image);		
+			this.addElement(group);
+		}
+	}
+}

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/common/component/ui/DataGridColumn.as

@@ -3,6 +3,7 @@ package com.jtgh.yjpt.common.component.ui
 	import com.jtgh.yjpt.common.TypeBase;
 	import com.jtgh.yjpt.common.component.renderer.CheckBoxItemRenderer;
 	import com.jtgh.yjpt.common.component.renderer.GifImageRenderer;
+	import com.jtgh.yjpt.common.component.renderer.ImageRenderer;
 	import com.jtgh.yjpt.common.component.renderer.LinkButtonRenderer;
 	import com.jtgh.yjpt.common.component.renderer.MultiButtonItemRenderer;
 	import com.jtgh.yjpt.common.component.renderer.TextInputRenderer;
@@ -99,6 +100,10 @@ package com.jtgh.yjpt.common.component.ui
 				_myRenderer = new ClassFactory(GifImageRenderer );
 				_myRenderer.properties = {fieldName:_fieldName	
 				};
+			}else if(TypeBase.IMAGE==colType){
+				_myRenderer = new ClassFactory(ImageRenderer );
+				_myRenderer.properties = {fieldName:_fieldName	
+				};
 			}
 			this.itemRenderer = _myRenderer;
 		}

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/common/util/Constants.as

@@ -295,7 +295,9 @@ package com.jtgh.yjpt.common.util
 		/**储罐所属类型*/
 		public static var FJSSLX_CG:String = "10000998";
 		/** 安全评价机构备案 **/
-		public static var FJSSLX_AQPJJGBA:Number = 10000291;
+		public static var FJSSLX_AQPJJGBA:Number = 10000291;	
+		/***人员基本信息**/
+		public static var FJSSLX_RYJBXX:String="10000366";
 		/** 安全设置专项验收标志 */
 		public static var GGDM_ID_AQSSZXYS:Number = 10000280;
 		/** 安全设置专项验收流程-资料审查 */

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

@@ -15,6 +15,7 @@ package com.jtgh.yjpt.model.yjgl.zdwxyfb.xxlr
 	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.vo.yjgl.zdwxyfb.CgsyVo;
 	import com.jtgh.yjpt.vo.yjgl.zdwxyfb.CgztVo;
 	import com.jtgh.yjpt.vo.yjgl.zdwxyfb.ZbhjjbqkVo;
 	
@@ -300,6 +301,17 @@ package com.jtgh.yjpt.model.yjgl.zdwxyfb.xxlr
 			cgVo.szd=cgEdit.szd.selectedVO as CodeVo;
 			cgVo.gq=cgEdit.szgq.selectedVO as GqVo;
 			cgVo.dwmc=cgEdit.dwmc.selectedVO as JyrVo;
+			if(cgVo.cgsy==null){
+				cgVo.cgsy=new CgsyVo;
+			}
+			if(cgEdit.zdwd!=null){
+				cgVo.cgsy.zdwd= cgEdit.zdwd.text;
+				cgVo.cgsy.zxwd= cgEdit.zxwd.text;
+				cgVo.cgsy.zdyl= cgEdit.zdyl.text;
+				cgVo.cgsy.zxyl= cgEdit.zxyl.text;
+				cgVo.cgsy.zdyw= cgEdit.zdyw.text;
+				cgVo.cgsy.zxyw= cgEdit.zxyw.text;
+			} 
 			if(cgVo.zdwxy_n){
 				cgVo.gkzdwxybh=null;
 				cgVo.gkzdwxybabh=null;

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/jyrxxgl/ryqk/RyjbxxAdd.mxml

@@ -11,24 +11,23 @@
 	
 	<fx:Script>
 		<![CDATA[
-			import com.anychart.context.AboutAnyChart;
 			import com.jtgh.yjpt.common.Global;
 			import com.jtgh.yjpt.common.TypeBase;
 			import com.jtgh.yjpt.common.util.Constants;
+			import com.jtgh.yjpt.common.util.Utils;
 			import com.jtgh.yjpt.model.jyrxxgl.ryqk.RyjbxxAddModel;
-			import com.jtgh.yjpt.model.jyrxxgl.ryqk.RyjbxxModel;
-			import com.jtgh.yjpt.vo.jyrxxgl.RyjbxxVo;
+			import com.jtgh.yjpt.vo.common.AccessoryVo;
 			
 			import mx.collections.ArrayCollection;
-			import mx.controls.Alert;
 			import mx.events.FlexEvent;
-			
+			import mx.managers.CursorManager;
 			[Bindable]
 			public var model:RyjbxxAddModel = new RyjbxxAddModel();
 			[Bindable]
 			public var enable:Boolean = true;
 			[Bindable]
 			public var functionId:Number;
+			public var uploadFile:FileReference=new FileReference;
 			
 			protected function creationComplete(event:FlexEvent):void
 			{
@@ -37,33 +36,110 @@
 					model.vo.ssjyr=Global.user.jyrjcxx;
 					model.vo.szd=Global.user.szd;
 				}
+				browseFile.addEventListener(MouseEvent.CLICK,selectFile);
+				uploadFile.addEventListener(Event.SELECT,selectFileHandle);
+				uploadFile.addEventListener(Event.COMPLETE, uploadCompleteHandler);
+				uploadFile.addEventListener(DataEvent.UPLOAD_COMPLETE_DATA,uploadCompleteDataHandler)
 			} 
+			public function selectFile(e:Event):void
+			{
+				var images:FileFilter=new FileFilter("Images(*.jpg;*.gif;*.png;*.bmp)", "*.jpg;*.gif;*.png;*.bmp");
+				uploadFile.browse([images]);
+			}
 			
+			private function doDeleteFile(vo:AccessoryVo):void
+			{
+				var delFileList:ArrayCollection = new ArrayCollection();
+				if(vo!=null)
+					delFileList.addItem(vo);
+				Utils.callRemote("accessoryController","deleteFj",null,model.vo.id,Constants.FJSSLX_RYJBXX,0,model.vo.tbdyid);
+			}
+			/**
+			 * 文件上传
+			 */ 
+			private function selectFileHandle(e:Event):void{
+				// 验证上传文件大小
+				if(!Utils.checkUploadFileSize(uploadFile))
+				{
+					var arr:Array = new Array();
+					arr.push(Global.upload_file_size);
+					Utils.showInfoMessage("msg.upload.FileSizeOutOfRange",arr);
+					return;
+				}
+				if(model.vo.zp!=null)
+				{
+					doDeleteFile(model.vo.zp);
+				}
+				model.vo.zp=new AccessoryVo;
+				model.vo.zp.name = uploadFile.name;
+				var params:URLVariables = new URLVariables();
+				params.entityId=model.vo.id;
+				params.entityType=Constants.FJSSLX_RYJBXX;
+				params.type=0;
+				var url:String;
+				url = Utils.getBaseUrl()+"upload.do;jsessionid="+Global.jsessionid;
+				var request:URLRequest = new URLRequest(url);
+				request.data = params;
+				request.method = URLRequestMethod.POST;
+				uploadFile.upload(request,"file");
+				CursorManager.setBusyCursor();
+			}
+			private function uploadCompleteHandler(e:Event):void
+			{
+				CursorManager.removeBusyCursor();
+			}
+			private function uploadCompleteDataHandler(event:DataEvent):void
+			{
+				if(event.data)
+					model.vo.zp.id = new Number(event.data);
+				//加载图片
+				uploadFile.load();
+				uploadFile.addEventListener(Event.COMPLETE,showTx);
+			}
+			/**
+			 * 头像显示
+			 */
+			private function showTx(e:Event):void
+			{
+				this.tx.source=uploadFile.data;
+			}
 		]]>
 	</fx:Script>
 	<s:VGroup width="100%" height="100%" paddingBottom="5"  paddingLeft="5"
 			  paddingRight="15" paddingTop="5">
 		<s:HGroup width="100%" verticalAlign="middle">
-			<cus:QLabel width="18%"  text="姓名"  notNull="true"/>
-			<cus:QTextInput width="30%" id="xm" text="@{model.vo.xm}" editable="{enable}"/>
-		</s:HGroup>
-		<s:HGroup width="100%" verticalAlign="middle">
-			<cus:QLabel width="18%"  text="证件类型"  notNull="true"/>
-			<cus:QComboBox id="zjlx" codeType="{Constants.GROUP_CODE_ZJLX}"
-						   comboxClass="CodeSelect" hasBlank="true"
-						   selectedVO="{model.vo.zjlx}" width="30%"
-						   enabled="{enable}"/>
-			<cus:QLabel width="18%"  text="证件号码"  notNull="true"/>
-			<cus:QTextInput width="30%" id="sfzh" text="@{model.vo.sfzh}" editable="{enable}" />
-		</s:HGroup>
-		<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
-			<cus:QLabel text="所在地" width="18%" notNull="true"/>
-			<cus:QComboBox id="szd" comboxClass="SzdEditSelect" hasBlank="false"
-						   selectedVO="{model.vo.szd==null?Global.user.szd:model.vo.szd}" width="30%" parentId="{Global.szd.id}"/>
-			<cus:QLabel text="所在港区" width="18%" notNull="true"/>
-			<cus:QComboBox id="szgq"  comboxClass="GqBySzdSelect" parentId="{model.vo.szd==null?Global.user.szd:model.vo.szd}"
-						   selectedVO="{model.vo.ssgq}" hasBlank="false" width="30%" enabled="{enable}"/>
-		</s:HGroup>
+			<s:VGroup width="50%">
+				<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
+					<cus:QLabel width="36%"  text="姓名"  notNull="true"/>
+					<cus:QTextInput width="60%" id="xm" text="@{model.vo.xm}" editable="{enable}"/>
+				</s:HGroup>
+				<s:HGroup width="100%" verticalAlign="middle">
+					<cus:QLabel width="36%"  text="证件类型"  notNull="true"/>
+					<cus:QComboBox id="zjlx" codeType="{Constants.GROUP_CODE_ZJLX}"
+								   comboxClass="CodeSelect" hasBlank="true"
+								   selectedVO="{model.vo.zjlx}" width="60%"
+								   enabled="{enable}"/>
+				</s:HGroup>
+				<s:HGroup width="100%" verticalAlign="middle">
+					<cus:QLabel width="36%"  text="证件号码"  notNull="true"/>
+					<cus:QTextInput width="60%" id="sfzh" text="@{model.vo.sfzh}" editable="{enable}" />
+				</s:HGroup>
+				<s:HGroup width="100%" verticalAlign="middle">
+					<cus:QLabel text="所在地" width="36%" notNull="true"/>
+					<cus:QComboBox id="szd" comboxClass="SzdEditSelect" hasBlank="false"
+							   selectedVO="{model.vo.szd==null?Global.user.szd:model.vo.szd}" width="60%" parentId="{Global.szd.id}"/>					
+				</s:HGroup>
+				<s:HGroup width="100%" verticalAlign="middle">
+					<cus:QLabel text="所在港区" width="36%" notNull="true"/>
+					<cus:QComboBox id="szgq"  comboxClass="GqBySzdSelect" parentId="{model.vo.szd==null?Global.user.szd:model.vo.szd}"
+								   selectedVO="{model.vo.ssgq}" hasBlank="false" width="60%" enabled="{enable}"/>
+				</s:HGroup>
+			</s:VGroup>
+			<s:VGroup width="50%" horizontalAlign="left">
+				<s:Image id="tx"  width="96" height="96"/>
+				<s:Button id="browseFile" width="96" label="{resourceManager.getString('common','btn.uploadPhoto')}" enabled="{enable}"/>
+			</s:VGroup>
+		</s:HGroup>	
 		<s:HGroup width="100%" verticalAlign="middle">
 			<cus:QLabel width="18%" text="{resourceManager.getString('common','gkjyr')}"  notNull="true"/>
 			<cus:QComboBox id="qymc"  comboxClass="JyrSelect" parentId="{Global.szd}"

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/jyrxxgl/ryqk/RyjbxxLayout.mxml

@@ -119,7 +119,7 @@
 					<ui:DataGridColumn dataField="zsmcName"  headerText="证书名称" width="100" showDataTips="true" dataTipField="zsmcName"/>
 					<ui:DataGridColumn dataField="zszlName"  headerText="证书种类" width="100" showDataTips="true" dataTipField="zszlName"/>	
 					<ui:DataGridColumn dataField="zsbhName"  headerText="证书编号"  width="100" showDataTips="true" dataTipField="zsbhName"/>
-					<ui:DataGridColumn dataField="yxqName"  headerText="有效期" width="100" showDataTips="true" dataTipField="yxqName"  dateFormatString="YYYY-MM-DD"/>	
+					<ui:DataGridColumn dataField="yxqName"  headerText="有效期" width="100" showDataTips="true" dataTipField="yxqString"  dateFormatString="YYYY-MM-DD"/>	
 							
 					<ui:DataGridColumn dataField="szdName"  headerText="所在地" width="80" showDataTips="true" dataTipField="szdName"/>
 					<ui:DataGridColumn dataField="gqName"  headerText="所在港区" width="80" showDataTips="true" dataTipField="gqName"/>

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

@@ -534,6 +534,28 @@
 				</s:HGroup>
 			</s:VGroup>
 		</mx:VBox>
+		<mx:VBox width="100%" height="100%" label="储罐适用范围">
+			<s:VGroup width="100%" height="100%"  paddingRight="5" paddingTop="5" paddingLeft="5" paddingBottom="5">
+				<s:HGroup width="100%" verticalAlign="middle">
+					<cus:QLabel text="最大温度(℃)" width="200"/>
+					<cus:QTextInput id="zdwd" text="{cgModel.cgVo.zdwd}" width="200" type="double"/>
+					<cus:QLabel text="最小温度(℃)" width="200"/>
+					<cus:QTextInput id="zxwd" text="{cgModel.cgVo.zxwd}" width="200" type="double"/>
+				</s:HGroup>
+				<s:HGroup width="100%" verticalAlign="middle">
+					<cus:QLabel text="最大压力(MPa)" width="200"/>
+					<cus:QTextInput id="zdyl" text="{cgModel.cgVo.zdyl}" width="200" type="double"/>
+					<cus:QLabel text="最小压力(MPa)" width="200"/>
+					<cus:QTextInput id="zxyl" text="{cgModel.cgVo.zxyl}" width="200" type="double"/>
+				</s:HGroup>
+				<s:HGroup width="100%" verticalAlign="middle">
+					<cus:QLabel text="最大液位" width="200"/>
+					<cus:QTextInput id="zdyw" text="{cgModel.cgVo.zdyw}" width="200" type="double"/>
+					<cus:QLabel text="最小液位" width="200"/>
+					<cus:QTextInput id="zxyw" text="{cgModel.cgVo.zxyw}" width="200" type="double"/>
+				</s:HGroup>		
+			</s:VGroup>
+		</mx:VBox>
 		<mx:VBox width="100%" height="100%" label="港区内储存剧毒化学品和港口重大危险源周边环境基本情况">
 			<cus:QLabel width="100%" textAlign="center" textalign="center" text="{resourceManager.getString('yjgl','cg.zbhjqk')}"/>
 			<s:VGroup width="100%" height="100%"  paddingRight="5" paddingTop="5" paddingLeft="5" paddingBottom="5">

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

@@ -154,14 +154,13 @@
 						<s:GridColumn dataField="cgqmj_s" headerText="{resourceManager.getString('yjgl','cg.cgqmj')}"/>
 						<s:GridColumn dataField="cggs_s" headerText="{resourceManager.getString('yjgl','cg.cggs')}"/>-->
 						<s:GridColumn dataField="cgmc" headerText="{resourceManager.getString('yjgl','cg.cgmc')}" />
-						<s:GridColumn dataField="cgcz_s" headerText="{resourceManager.getString('yjgl','cg.cgcz')}"/>
-						<s:GridColumn dataField="hxpmc" width="150" showDataTips="true" dataTipField="hxpmc" headerText="{resourceManager.getString('yjgl','cg.hxpmc')}"/>
 						<s:GridColumn dataField="qyccbh" headerText="{resourceManager.getString('yjgl','cg.qyccbh')}"/>
 						<s:GridColumn dataField="cgrj_s" headerText="{resourceManager.getString('yjgl','cg.cgrj')}(万立方)"/>
-						<s:GridColumn dataField="gkzdwxybh" headerText="{resourceManager.getString('yjgl','cg.gkzdwxybh')}" width="160"/>
-						<s:GridColumn dataField="szdName" headerText="{resourceManager.getString('yjgl','cg.szd')}" />
-						<s:GridColumn dataField="gqName" headerText="{resourceManager.getString('yjgl','cg.szgq')}" />
-						<ui:DataGridColumn headerText="状态" type="{TypeBase.GIFIMAGE}"  fieldName="zt"/>
+						<s:GridColumn dataField="hz" width="150" showDataTips="true" dataTipField="hz" headerText="货种"/>
+						<s:GridColumn dataField="wd" headerText="温度"/>
+						<s:GridColumn dataField="yl" headerText="压力"/>
+						<s:GridColumn dataField="yw" headerText="液位" />
+						<ui:DataGridColumn headerText="状态" type="{TypeBase.IMAGE}"  fieldName="zt"/>
 						<!--<s:GridColumn dataField="tcsj" labelFunction="sjFun" headerText="{resourceManager.getString('yjgl','cg.tcsj')}"/>
 						<s:GridColumn dataField="tbr" headerText="{resourceManager.getString('yjgl','cg.tbr')}"/>
 						<s:GridColumn dataField="tbsj" labelFunction="sjFun" headerText="{resourceManager.getString('yjgl','cg.tbsj')}"/>-->

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

@@ -328,6 +328,52 @@
 				<s:layout>
 					<s:HorizontalLayout horizontalAlign="center" verticalAlign="middle" paddingLeft="5"/>
 				</s:layout>
+				<cus:QLabel width="100%" textAlign="left" text="储罐适用范围"/>
+			</s:BorderContainer>
+			<s:VGroup width="100%" height="100%"  paddingRight="5" paddingTop="5" paddingLeft="5" paddingBottom="5" verticalAlign="middle">
+				<s:HGroup width="100%" verticalAlign="middle">
+					<cus:QLabel text="最大温度(℃)" width="200"/>
+					<cus:QTextInput  text="{cgModel.cgVo.zdwd}" width="200" editable="false"/>
+					<cus:QLabel text="最小温度(℃)" width="200"/>
+					<cus:QTextInput  text="{cgModel.cgVo.zxwd}" width="200" editable="false"/>
+				</s:HGroup>
+				<s:HGroup width="100%" verticalAlign="middle">
+					<cus:QLabel text="最大压力(MPa)" width="200"/>
+					<cus:QTextInput  text="{cgModel.cgVo.zdyl}" width="200" editable="false"/>
+					<cus:QLabel text="最小压力(MPa)" width="200"/>
+					<cus:QTextInput text="{cgModel.cgVo.zxyl}" width="200" editable="false"/>
+				</s:HGroup>
+				<s:HGroup width="100%" verticalAlign="middle">
+					<cus:QLabel text="最大液位" width="200"/>
+					<cus:QTextInput  text="{cgModel.cgVo.zdyw}" width="200" editable="false"/>
+					<cus:QLabel text="最小液位" width="200"/>
+					<cus:QTextInput  text="{cgModel.cgVo.zxyw}" width="200" editable="false"/>
+				</s:HGroup>
+			</s:VGroup>
+			<s:BorderContainer width="100%" borderVisible="false" height="32" backgroundColor="#23A5B8">
+				<s:layout>
+					<s:HorizontalLayout horizontalAlign="center" verticalAlign="middle" paddingLeft="5"/>
+				</s:layout>
+				<cus:QLabel width="100%" textAlign="left" text="储罐监控信息"/>
+			</s:BorderContainer>
+			<s:VGroup width="100%" height="100%"  paddingRight="5" paddingTop="5" paddingLeft="5" paddingBottom="5" verticalAlign="middle">
+				<s:HGroup width="100%" verticalAlign="middle">
+					<cus:QLabel text="货种" width="200"/>
+					<cus:QTextInput  text="{cgModel.cgVo.hz}" width="200" editable="false"/>
+					<cus:QLabel text="温度(℃)" width="200"/>
+					<cus:QTextInput  text="{cgModel.cgVo.wd}" width="200" editable="false"/>
+				</s:HGroup>
+				<s:HGroup width="100%" verticalAlign="middle">
+					<cus:QLabel text="压力(MPa)" width="200"/>
+					<cus:QTextInput  text="{cgModel.cgVo.yl}" width="200" editable="false"/>
+					<cus:QLabel text="液位" width="200"/>
+					<cus:QTextInput  text="{cgModel.cgVo.yw}" width="200" editable="false"/>
+				</s:HGroup>
+			</s:VGroup>
+			<s:BorderContainer width="100%" borderVisible="false" height="32" backgroundColor="#23A5B8">
+				<s:layout>
+					<s:HorizontalLayout horizontalAlign="center" verticalAlign="middle" paddingLeft="5"/>
+				</s:layout>
 				<cus:QLabel width="100%" textAlign="left" text="港区内储存剧毒化学品和港口重大危险源周边环境基本情况"/>
 			</s:BorderContainer>
 			<s:VGroup width="100%" height="100%"  paddingRight="5" paddingTop="5" paddingLeft="5" paddingBottom="5" verticalAlign="middle">

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

@@ -14,6 +14,7 @@
 			import mx.events.CloseEvent;
 			import mx.events.FlexEvent;
 			import mx.rpc.events.ResultEvent;
+			import mx.utils.StringUtil;
 			
 			[Bindable]
 			public var vo:CgztVo;
@@ -31,6 +32,7 @@
 					Alert.show("填报时间为空","提示");
 					return;
 				}
+				vo.zt=getZtValid();
 				vo.tbsj=tbsj.dateTime;
 				vo.cg=cgVo;
 				Utils.callRemote("cgController","saveZt",function(r:ResultEvent):void{
@@ -44,12 +46,37 @@
 			
 			}
 			
+			private function getZtValid():String{
+				if(cgVo!=null && cgVo.cgsy!=null){
+					//温度
+					if(cgVo.cgsy.zdwd!=null&& StringUtil.trim(cgVo.cgsy.zdwd)!=""
+						&& vo.wd!=null&&StringUtil.trim(vo.wd)!=""
+						&&new Number(vo.wd)>new Number(cgVo.cgsy.zdwd) ){return "2";	}
+					if(cgVo.cgsy.zxwd!=null&& StringUtil.trim(cgVo.cgsy.zxwd)!=""
+						&& vo.wd!=null&&StringUtil.trim(vo.wd)!=""
+						&&new Number(vo.wd)<new Number(cgVo.cgsy.zxwd) ){return "2";	}
+					//压力
+					if(cgVo.cgsy.zdyl!=null&& StringUtil.trim(cgVo.cgsy.zdyl)!=""
+						&& vo.yl!=null&&StringUtil.trim(vo.yl)!=""
+						&&new Number(vo.yl)>new Number(cgVo.cgsy.zdyl) ){return "2";	}
+					if(cgVo.cgsy.zxyl!=null&& StringUtil.trim(cgVo.cgsy.zxyl)!=""
+						&& vo.yl!=null&&StringUtil.trim(vo.yl)!=""
+						&&new Number(vo.yl)>new Number(cgVo.cgsy.zxyl) ){return "2";	}
+					//液位
+					if(cgVo.cgsy.zdyw!=null&& StringUtil.trim(cgVo.cgsy.zdyw)!=""
+						&& vo.yw!=null&&StringUtil.trim(vo.yw)!=""
+						&&new Number(vo.yw)>new Number(cgVo.cgsy.zdyw) ){return "2";	}
+					if(cgVo.cgsy.zxyw!=null&& StringUtil.trim(cgVo.cgsy.zxyw)!=""
+						&& vo.yw!=null&&StringUtil.trim(vo.yw)!=""
+						&&new Number(vo.yw)>new Number(cgVo.cgsy.zxyw) ){return "2";	}
+				} 
+				return "1";
+			}
 			protected function creationCompleteHandler(event:FlexEvent):void
 			{
 				if(vo.tbsj==null){
 					tbsj.dateTime=new Date();
-				}
-				
+				}				
 			}
 			
 		]]>
@@ -57,19 +84,19 @@
 	<s:VGroup width="100%" height="100%" verticalAlign="middle" horizontalAlign="center" >
 		<s:HGroup width="100%" horizontalAlign="center">
 			<cus:QLabel  text="储罐名称" width="13%"  />
-			<ui:TextInput text="{cgVo.qyccbh}"  width="30%" enabled="false"/>
+			<ui:TextInput text="{cgVo.cgmc}"  width="30%" enabled="false"/>
 			<cus:QLabel  text="货种"  width="13%" />
 			<ui:TextInput text="@{vo.hz}"  width="30%"/>
 		</s:HGroup>
 		<s:HGroup width="100%" horizontalAlign="center">
-			<cus:QLabel text="温度" width="13%"  />
-			<ui:TextInput text="@{vo.wd}"  width="30%"/>
-			<cus:QLabel  text="压力" width="13%"  />
-			<ui:TextInput text="@{vo.yl}"  width="30%"/>
+			<cus:QLabel text="温度(℃)" width="13%"  />
+			<cus:QTextInput text="@{vo.wd}"  width="30%" type="double"/>
+			<cus:QLabel  text="压力(MPa)" width="13%"  />
+			<cus:QTextInput text="@{vo.yl}"  width="30%" type="double"/>
 		</s:HGroup>
 		<s:HGroup width="100%" horizontalAlign="center">
 			<cus:QLabel  text="液位" width="13%"  />
-			<ui:TextInput text="@{vo.yw}"  width="30%"/>
+			<cus:QTextInput text="@{vo.yw}"  width="30%" type="double"/>
 			<cus:QLabel text="填报时间" width="13%" notNull="true"/>
 			<ui:DateTime id="tbsj" dateTime="{vo.tbsj}"  width="30%" hasTime="true"/>
 		</s:HGroup>	

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

@@ -84,7 +84,7 @@
 					<s:GridColumn dataField="yl" headerText="压力"/>
 					<s:GridColumn dataField="yw" headerText="液位" />
 					<s:GridColumn dataField="tbsj" labelFunction="sjFun" headerText="{resourceManager.getString('yjgl','cg.tbsj')}"/>	
-					<ui:DataGridColumn headerText="状态" type="{TypeBase.GIFIMAGE}"  fieldName="zt"/>
+					<ui:DataGridColumn headerText="状态" type="{TypeBase.IMAGE}"  fieldName="zt"/>
 					<!--<s:GridColumn id="zt" headerText="状态">
 						<s:itemRenderer>
 							<fx:Component>  

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/vo/yjgl/zdwxyfb/CgVo.as

@@ -667,7 +667,110 @@ package com.jtgh.yjpt.vo.yjgl.zdwxyfb
 			return "NaN"==this.zdwxycgrl.toString()?"":this.zdwxycgrl.toString();
 		}
 		
-		public var zt:String="1";
+		public var cgzt:CgztVo;
+		/**
+		 * 获取储罐信息
+		 * 温度
+		 */
+		public function get wd():String{
+			if(cgzt!=null){
+				return cgzt.wd;
+			}
+			return "";
+		}
+		/**
+		 * 获取储罐信息
+		 * 货种
+		 */
+		public function get hz():String{
+			if(cgzt!=null){
+				return cgzt.hz;
+			}
+			return "";
+		}
+		/**
+		 * 获取储罐信息
+		 * 压力
+		 */
+		public function get yl():String{
+			if(cgzt!=null){
+				return cgzt.yl;
+			}
+			return "";
+		}
+		/**
+		 * 获取储罐信息
+		 * 液位
+		 */
+		public function get yw():String{
+			if(cgzt!=null){
+				return cgzt.yw;
+			}
+			return "";
+		}
+		/**
+		 * 获取储罐信息
+		 * 状态
+		 */
+		public function get zt():String{
+			if(cgzt!=null){
+				return cgzt.zt;
+			}
+			return "";
+		}
+		
+		public var cgsy:CgsyVo;
+		
+		/**
+		 * 获取储罐信息
+		 * 温度
+		 */
+		public function get zdwd():String{
+			if(cgsy!=null){
+				return cgsy.zdwd;
+			}
+			return "";
+		}
+		public function get zxwd():String{
+			if(cgsy!=null){
+				return cgsy.zxwd;
+			}
+			return "";
+		}
+
+		/**
+		 * 获取储罐信息
+		 * 压力
+		 */
+		public function get zdyl():String{
+			if(cgsy!=null){
+				return cgsy.zdyl;
+			}
+			return "";
+		}
+		public function get zxyl():String{
+			if(cgsy!=null){
+				return cgsy.zxyl;
+			}
+			return "";
+		}
+		/**
+		 * 获取储罐信息
+		 * 液位
+		 */
+		public function get zdyw():String{
+			if(cgsy!=null){
+				return cgsy.zdyw;
+			}
+			return "";
+		}
+		public function get zxyw():String{
+			if(cgsy!=null){
+				return cgsy.zxyw;
+			}
+			return "";
+		}
+		
 	}
 }
 

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/vo/yjgl/zdwxyfb/CgsyVo.as

@@ -0,0 +1,33 @@
+package com.jtgh.yjpt.vo.yjgl.zdwxyfb
+{
+	import com.jtgh.yjpt.vo.BaseVo;
+
+	[Bindable]
+	[RemoteClass(alias="com.jtgh.yjpt.entity.yjgl.zdwxyfb.CgsyEntity")]
+	public class CgsyVo extends BaseVo
+	{
+		public function CgsyVo()
+		{
+		}
+		public var id:Number;
+		/** 储罐 */
+		public var cg:CgVo;
+		/** 温度 */
+		public var zdwd:String;
+		/** 温度 */
+		public var zxwd:String;
+		/** 压力 */
+		public var zdyl:String;
+		/** 压力 */
+		public var zxyl:String;
+		/** 液位 */
+		public var zdyw:String;
+		/** 液位 */
+		public var zxyw:String;
+		public function get cgName():String{
+			if(cg!=null)
+				return cg.cgmc;
+			return "";
+		}
+	}
+}

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/vo/yjgl/zdwxyfb/CgztVo.as

@@ -26,7 +26,7 @@ package com.jtgh.yjpt.vo.yjgl.zdwxyfb
 		public var zt:String="1";
 		public function get cgName():String{
 			if(cg!=null)
-				return cg.qyccbh;
+				return cg.cgmc;
 			return "";
 		}
 	}