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

client_Wu Xijin

2018-09-04 e54f6e22bb26fb06bdd407803f988b86b40df697

 System/MainInterfacePanel/TaskListTip.cs

@@ -200,7 +200,7 @@
        {

            TaskScheduling();    

            TheTaskToGenerate();

            TaskJump(_id);

            TaskJump();

        }



        private void SetLength()

@@ -422,19 +422,12 @@
            return mapConfig != null && mapConfig.MapFBType != 0;

        }



        private void TaskJump(int TaskID=0)

        private void TaskJump()

        {

            int type = 0;

            if (TaskID == 0)

            if (_list.Contains(taskmodel.TaskupToDate))

            {

                type= _list.IndexOf(taskmodel.GetNowTaskID);

            }

            else

            {

                if (_list.Contains(TaskID))

                {

                    type = _list.IndexOf(TaskID);

                }           
                type = _list.IndexOf(taskmodel.TaskupToDate);

            }

            if (_list.Count <= 2 || type <= 0)

            {