Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Hale

2018-09-12 ee945ee8d3199e91df76e7b320d2c37f5efc599a

 System/MainInterfacePanel/TaskListTip.cs

@@ -448,10 +448,21 @@
            int type = 0;

            if (jumpTask == 0)//跳到默认选中

            {

                if (_list.Contains(taskmodel.GetNowTaskID))

                if (taskmodel.GetNowTaskID != taskmodel.TaskupToDate)//默认的和最新选中的不一致时

                {

                    type = _list.IndexOf(taskmodel.GetNowTaskID);

                    if (_list.Contains(taskmodel.TaskupToDate))

                    {

                        type = _list.IndexOf(taskmodel.TaskupToDate);

                    }

                    taskmodel.TaskupToDate = taskmodel.GetNowTaskID;

                }

                else

                {

                    if (_list.Contains(taskmodel.GetNowTaskID))

                    {

                        type = _list.IndexOf(taskmodel.GetNowTaskID);

                    }

                }       
            }

            else

            {