Merge branch 'WJC' into wxr4

wxr

2021-04-28 cc48110a814477bc0d01615f9844aea6ff2b609f

 HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs

@@ -142,6 +142,7 @@
            }
            else
            {

                var onePortAutomation = new OnePortAutomation();
                MainPage.BasePageView.AddChidren(onePortAutomation);
                onePortAutomation.Show();
@@ -376,6 +377,14 @@

                        }
                        break;
                    case 4:
                    case 6:
                    case 9:
                        {
                            iconInt = 3;

                        }
                        break;
                }

                if (!iconIntValue.Contains(iconInt))
@@ -467,6 +476,12 @@
                            strIcon = "LogicIcon/selectTheFun.png";
                        }
                        break;
                    case 3:
                        {

                            strIcon = "LogicIcon/shiwaitianqi.png";
                        }
                        break;
                    case 11:
                        {
                            //分割条件和目标的图标