Merge branch 'release2.2' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into release2.2

OTSIncAReportApp/Control_Graph/Controls/Control_DrawDistrbutionImageAndBSE.cs

@@ -1132,7 +1132,7 @@ namespace OTSIncAReportGraph.Controls
                 m_move_dparticle = in_dparticle;//将显示xray的dparticle记录给全局变量
 
                 delaytimer.Tick += Delaytimer_Tick;
-                delaytimer.Interval = 500;
+                delaytimer.Interval = 100;
                 delaytimer.Start();
 
             }
@@ -1142,12 +1142,13 @@ namespace OTSIncAReportGraph.Controls
 
         private void Delaytimer_Tick(object sender, EventArgs e)
         {
+            delaytimer.Enabled = false;
             if (m_move_dparticle.IsMouseMove == false)
             {
-                delaytimer.Enabled = false;
+                
                 return;
             }
-            delaytimer.Enabled = false;
+          
             //显示xray相关信息
             uint[] Search_xray = new uint[2000];
             uint[] Analysis_xray = new uint[2000];

OTSIncAReportApp/DataOperation/DataAccess/ParticleData.cs

@@ -50,7 +50,7 @@ namespace OTSIncAReportApp.DataOperation.DataAccess
 
             //string sqlp = "select a.*,b.XrayData from IncAData a left join XRayData b on a.FieldId =b.FieldId and a.XrayId= b.XrayIndex";
             //string where = " where 1=1 ";
-            string sqlp = "select * from IncAData";
+            string sqlp = "select a.* from IncAData a ";
             string where = " where 1=1 ";
             if (display == 1)
             {