Explorar el Código

修改State为Int 初始化状态

wb_han hace 5 años
padre
commit
3d70c2dcb4

+ 1 - 1
HOZProject/FormHOZMain.cs

@@ -580,7 +580,7 @@ namespace HOZProject
                             {
                                 if (tlItem.Code == code)
                                 {
-                                    tlItem.State = state;
+                                    tlItem.State = Convert.ToInt32(state);
                                     break;
                                 }
                             }

+ 1 - 1
HOZProject/MeasureMsgDispose/MeasureMsgManage.cs

@@ -119,7 +119,7 @@ namespace HOZProject
                             {
                                 if (tlItem.Code == args.Step_Code)
                                 {
-                                    tlItem.State = args.State;
+                                    tlItem.State = args.State?1:0;
                                     break;
                                 }
                             }

+ 23 - 23
HOZProject/UserControls/UCTimeLine.cs

@@ -253,30 +253,30 @@ namespace HOZProject
                 {
                     if(label.Tag.ToString() == item.Code)
                     {
-                        #region 原state Int 判断方法
-                        //switch (item.State)
-                        //{
-                        //        //出错
-                        //    case 0:
-                        //        lineColor = Color.Red;
-                        //        break;
-                        //        //完成
-                        //    case 1:
-                        //        lineColor = Color.GreenYellow;
-                        //        break;
-                        //    default:
-                        //        lineColor = TextColors.Light;
-                        //        break;
-                        //} 
-                        #endregion
-                        if (item.State)
+                        #region State Int 判断方法
+                        switch (item.State)
                         {
-                            lineColor = Color.GreenYellow;
-                        }
-                        else
-                        {
-                            lineColor = Color.Red;
+                            //出错
+                            case 0:
+                                lineColor = Color.Red;
+                                break;
+                            //完成
+                            case 1:
+                                lineColor = Color.GreenYellow;
+                                break;
+                            default:
+                                lineColor = TextColors.Light;
+                                break;
                         }
+                        #endregion
+                        //if (item.State)
+                        //{
+                        //    lineColor = Color.GreenYellow;
+                        //}
+                        //else
+                        //{
+                        //    lineColor = Color.Red;
+                        //}
                         break;
                     }
                 }
@@ -315,7 +315,7 @@ namespace HOZProject
         /// Gets or sets the State.
         /// </summary>
         /// <value>The State.</value>
-        public bool State { get; set; }
+        public int State { get; set; }
         /// <summary>
         /// Gets or sets the IsData.
         /// </summary>

+ 1 - 1
HOZProject/UserControls/UControl_ParaInfo.cs

@@ -155,7 +155,7 @@ namespace HOZProject
                     TimeLineItem tlItem = new TimeLineItem();
                     tlItem.Details = nodeList[i].Attributes["Details"].Value;
                     tlItem.Code = nodeList[i].Attributes["Code"].Value;
-                    //tlItem.State = -1;
+                    tlItem.State = -1;
                     tlItem.Title = nodeList[i].Attributes["Title"].Value;
                     tlItem.IsData = Convert.ToBoolean(nodeList[i].Attributes["IsData"].Value);
                     tlItem.Type = nodeList[i].Attributes["Type"].Value;