Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	src/pages/localTool/standAutoSplit/index.vue
#	src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue

src/router/index.js

@@ -341,7 +341,7 @@ const routes = [
       },
       {
         path: '/wfhxzgStep1',
-        name: 'wfhxzgStep2',
+        name: 'wfhxzgStep1',
         component: () => import('@/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue'),
         meta: {
           requireAuth: true,
@@ -1717,7 +1717,7 @@ router.beforeEach((to, from, next) => {
   // if (processCenter) {
   //   if (to.meta.process) {
   //     if (store.getters.getHandleInfo.prcType === to.meta.process.prcType &&
-  //       (store.getters.getHandleInfo.taskInfo === to.meta.process.taskInfo ||
+  //       (store.getters.getHandleInfo. === to.meta.process.taskInfo ||
   //       (to.meta.process.taskInfo.__proto__.constructor === Array && to.meta.process.taskInfo.includes(store.getters.getHandleInfo.taskInfo)))) {
   //       next()
   //     } else {