Browse Source

修改多个测量结果时echar不显示问题

zhangjiaxin 3 years ago
parent
commit
c8f124752a

+ 3 - 0
Bin/x64/Debug/Resources/HTML/chartsMore.html

@@ -77,6 +77,9 @@
                 settri();
                
             }
+            if (type == '') {
+                setpie();
+            }
             setTimeout(function () {
                 var img = new Image();
                 img.src = myChart.getDataURL({

+ 1 - 1
Bin/x64/Debug/Resources/XMLData/AppResource_ZH.xml

@@ -778,7 +778,7 @@
 	  <Control name="str1" text="序号" />
 	  <Control name="str8" text="颗粒名" />
 	  <Control name="str9" text="代表色" />
-	  <Control name="str10" text="最大颗粒" />
+	  <Control name="str10" text="等效圆直径" />
 	  <Control name="str11" text="总数" />
 	  <Control name="partcletype0" text="过小颗粒" />
 	  <Control name="partcletype1" text="过大颗粒" />

+ 5 - 1
OTSIncAReportApp/1-UI/Control_ECharts/EChart_ParticlesComposition.cs

@@ -1075,7 +1075,11 @@ namespace OTSIncAReportApp.Control_ECharts
         {
             //int idx = m_ReportApp.m_DataMgrFun.GetPropIndexByPropItemName(m_ReportApp.SourceGridData.ConditionItemList, OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
             //int sel = m_ReportApp.SourceGridData.ConditionItemList[idx].comboDownList.IndexOf(m_ReportApp.SourceGridData.ConditionItemList[idx].itemVal.ToString());
-            int sel = m_conditionChoose.m_SourceGridData.GetPropIndexByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
+
+
+            //int sel = m_conditionChoose.m_SourceGridData.GetPropIndexByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
+
+            int sel = m_conditionChoose.m_SourceGridData.ProItemProIndex();
             string filedAndParticl = "";
             if (sel == 1)
             {

+ 29 - 0
OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/OTSSampleReportInfo/OTSSampleReportInfo.cs

@@ -187,6 +187,20 @@ namespace OTSIncAReportApp.OTSSampleReportInfo
 
 
     };
+    /// <summary>
+    /// 数据源类型
+    /// </summary>
+    public enum DATA_SOURCR_TYPE
+    {
+        //分析颗粒
+        Analytical_particle=0,
+        //选择颗粒
+        Select_particles=1,
+        //无效颗粒
+        Invalid_particles=2
+    }
+
+
     public enum  IMAGEGRID_DIS_TYPE
     {
        
@@ -300,6 +314,21 @@ namespace OTSIncAReportApp.OTSSampleReportInfo
             }
             return -1;
         }
+
+        public int ProItemProIndex()
+        {
+            
+            for (int i = 0; i < ConditionItemList[1].comboDownList.Count; i++)
+            {
+               if(ConditionItemList[1].itemDisplayVal.ToString()== ConditionItemList[1].comboDownList[i].ToString())
+                {
+                    return i;
+                }
+            }
+            return -1;
+        }
+
+
         public object GetPropItemDisplayValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS in_orpgi)
         {
             for (int i = 0; i < ConditionItemList.Count; i++)