Переглянути джерело

修改Echart三元相图,颗粒尺寸等效圆面积显示不正确进行修改

zhangjiaxin 3 роки тому
батько
коміт
fdbfdff7ce

+ 1 - 0
Bin/x64/Debug/Config/ProData/DefaultTriTemplateFile.tpf

@@ -7,4 +7,5 @@
   <Member TemplateId="5" TemplateName="CaO.TiN.Al2O3" Element="Ca.Ti.Al" Group="CaO-Ca.TiN-Ti.Al2O3-Al" />
   <Member TemplateId="6" TemplateName="Mn.Ni.Co" Element=".Ni." Group="Mn-.Ni-Ni.Co-" />
   <Member TemplateId="20210913145438" TemplateName="CaO.CaS.Al2O3" Element="Ca.S,Ca.Al" Group="CaO-Ca.CaS-S,Ca.Al2O3-Al" />
+  <Member TemplateId="20211223164219" TemplateName="MnS.CaS.Al2O3" Element="Mn.Ca.Al" Group="MnS-Mn.CaS-Ca.Al2O3-Al" />
 </XMLData>

+ 2 - 2
Bin/x64/Debug/Config/ProData/ReportTemplateConfig.xml

@@ -60,7 +60,7 @@
       <MB2>CaO.SiO2.Al2O3</MB2>
       <MB3>MnO.S.Al2O3</MB3>
       <MB4>CaO.TiN.Al2O3</MB4>
-      <MB5>CaO.CaS.Al2O3</MB5>
+      <MB5>MnS.CaS.Al2O3</MB5>
     </list_lbv_syxt_mblb>
     <list_lbv_syxt_mblb_index>
       <MBIndex0>0</MBIndex0>
@@ -68,7 +68,7 @@
       <MBIndex2>2</MBIndex2>
       <MBIndex3>3</MBIndex3>
       <MBIndex4>4</MBIndex4>
-      <MBIndex5>6</MBIndex5>
+      <MBIndex5>7</MBIndex5>
     </list_lbv_syxt_mblb_index>
   </M_SYXT>
   <M_KLLBXX>

+ 19 - 3
Bin/x64/Debug/Resources/HTML/charts.html

@@ -684,8 +684,22 @@
                     list.push(line);
                 }
             }
-
-
+            //三元相图颗粒颜色
+            var colorListrT = [
+                '#0f4471',
+                '#FFD700',
+                '#ff5722',
+                '#5628b4',
+                '#20BF55',
+                '#f23557',
+                '#118df0',
+                '#FF00FF',
+                '#d3327b',
+                '#ae318a',
+                '#993090',
+                '#6f3071', '#7711AF', '#CF77FF', '#AE004F', '#F35872', '#FA7729',
+                '#FFC526', '#F8E71C', '#34ADAE', '#3DDFD2', '#A0FFFF'
+            ];
             for (var i = 0; i < json.ListPartSize.length; i++) {
 
                 var d1 = {
@@ -697,7 +711,9 @@
                         normal:
                         {
                             borderWidth: 0.5,
-                            borderColor: '#000' }
+                             borderColor: '#000',
+                             color: colorListrT[i]
+                         }
                     },
                     data: json.ListPoint[i]
 

+ 4 - 4
OTSIncAReportApp/1-UI/Control_Grids/CompositionDistributionGrid.cs

@@ -224,11 +224,11 @@ namespace OTSIncAReportGrids
                         if (con == "CIRCLE")
                         {
                             double Area = Convert.ToDouble(dt.Rows[i][gridView.Columns[k].Name]);
-                            gridView.Rows[add_rowindex].Cells[k].Value = Math.Round(Math.Sqrt(Area / Math.PI), 2);
+                            gridView.Rows[add_rowindex].Cells[k].Value = Math.Round(Math.Sqrt(Area / Math.PI)* 2,2);
                         }
                         else
                         {
-                            gridView.Rows[add_rowindex].Cells[k].Value = Math.Round(Convert.ToDouble(dt.Rows[i][gridView.Columns[k].Name]), 2);
+                            gridView.Rows[add_rowindex].Cells[k].Value = Math.Round( Convert.ToDouble(dt.Rows[i][gridView.Columns[k].Name])* 2,2);
                         }
                         gridView.Rows[add_rowindex].Cells[k].Style.BackColor = Color.Azure;
                     }
@@ -282,11 +282,11 @@ namespace OTSIncAReportGrids
                         if (con == "CIRCLE")
                         {
                             double Area = Convert.ToDouble(dt.Rows[i][gridView.Columns[k].Name]);
-                            gridView.Rows[add_rowindex].Cells[k].Value = Math.Round(Math.Sqrt(Area / Math.PI), 2);
+                            gridView.Rows[add_rowindex].Cells[k].Value = Math.Round(Math.Sqrt(Area / Math.PI) * 2,2);
                         }
                         else
                         {
-                            gridView.Rows[add_rowindex].Cells[k].Value = Math.Round(Convert.ToDouble(dt.Rows[i][gridView.Columns[k].Name]), 2);
+                            gridView.Rows[add_rowindex].Cells[k].Value = Math.Round(Convert.ToDouble(dt.Rows[i][gridView.Columns[k].Name])*2, 2);
                         }
                         gridView.Rows[add_rowindex].Cells[k].Style.BackColor = Color.Azure;
                     }

+ 6 - 1
OTSIncAReportApp/3-ServiceCenter/DataOperation/DataAccess/ParticleData.cs

@@ -182,8 +182,13 @@ namespace OTSIncAReportApp.DataOperation.DataAccess
             {
                 sqlp = sqlp + " where '" + fieldAndPartic + "' like ('%,'||fieldid||'-'||particleid||',%')";
             }
-
             DataTable DT = dbHelper.ExecuteDataTable(sqlp, null);
+            for (int i=0;i< DT.Rows.Count;i++)
+            {
+                DT.Rows[i]["Area"] = Math.Sqrt((double)DT.Rows[i]["Area"]/Math.PI) * 2;
+            }
+
+           
             return DT;
         }