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

gkaq/yjpt-flex/trunk/.actionScriptProperties

@@ -20,12 +20,12 @@
     <application path="Main.mxml"/>
   </applications>
   <modules>
-    <module application="src/Main.mxml" destPath="module/JyrxxModule.swf" optimize="true" sourcePath="src/module/JyrxxModule.as"/>
+    <module application="src/Main.mxml" destPath="module/WxhwspModule.swf" optimize="true" sourcePath="src/module/WxhwspModule.as"/>
     <module application="src/Main.mxml" destPath="module/BaglModule.swf" optimize="true" sourcePath="src/module/BaglModule.as"/>
-    <module application="src/Main.mxml" destPath="module/YjglModule.swf" optimize="true" sourcePath="src/module/YjglModule.as"/>
+    <module application="src/Main.mxml" destPath="module/JyrxxModule.swf" optimize="true" sourcePath="src/module/JyrxxModule.as"/>
     <module application="src/Main.mxml" destPath="module/QlygModule.swf" optimize="true" sourcePath="src/module/QlygModule.as"/>
     <module application="src/Main.mxml" destPath="module/TaskModule.swf" optimize="true" sourcePath="src/module/TaskModule.as"/>
-    <module application="src/Main.mxml" destPath="module/WxhwspModule.swf" optimize="true" sourcePath="src/module/WxhwspModule.as"/>
+    <module application="src/Main.mxml" destPath="module/YjglModule.swf" optimize="true" sourcePath="src/module/YjglModule.as"/>
     <module application="src/Main.mxml" destPath="module/ZcdcModule.swf" optimize="true" sourcePath="src/module/ZcdcModule.as"/>
   </modules>
   <buildCSSFiles/>

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/model/zysqbp/ShbpEditModel.as

@@ -327,8 +327,8 @@ package com.jtgh.yjpt.model.zysqbp
 		public function wxhwclickHandler():void
 		{
 			var view:Wxhwpm=new Wxhwpm();
-		//view.hwpm=thisView.hwpm.text;
-//			view.hint.text=wxhwmcString;
+		    //view.hwpm=thisView.hwpm.text;
+			//view.hint.text=wxhwmcString;
 			view.wxhwmcString=wxhwmcString;
 			view.flag=true;
 			view.selectMode="singleRow";

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/jyr/Wxhwpm.mxml

@@ -47,6 +47,7 @@
 			}
 			protected function query_clickHandler(event:MouseEvent):void
 			{
+				list = new ArrayCollection();				
 				var bhstr:String="%"+StringUtil.trim(bh.text)+"%";
 				var bzstr:String="%"+StringUtil.trim(bz.text)+"%";
 				var mc:String="%"+StringUtil.trim(mcysm.text)+"%";

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

@@ -156,11 +156,11 @@
 						<s:GridColumn dataField="cggs_s" headerText="{resourceManager.getString('yjgl','cg.cggs')}"/>-->
 						<s:GridColumn dataField="cgmc" headerText="{resourceManager.getString('yjgl','cg.cgmc')}" />
 						<s:GridColumn dataField="qyccbh" headerText="{resourceManager.getString('yjgl','cg.qyccbh')}"/>
-						<s:GridColumn dataField="cgrj_s" headerText="{resourceManager.getString('yjgl','cg.cgrj')}(万立方)"/>
+						<s:GridColumn dataField="cgrj_s" headerText="{resourceManager.getString('yjgl','cg.cgrj')}（单位：万m³）"/>
 						<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="液位" />
+						<s:GridColumn dataField="wd" headerText="温度（单位：℃）"/>
+						<s:GridColumn dataField="yl" headerText="压力（单位：MPa）"/>
+						<s:GridColumn dataField="yw" headerText="液位（单位：mm）" />
 						<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')}"/>