合并冲突

src/router/index.js

@@ -276,6 +276,15 @@ const routes = [
           title: '标准清单发布/更新流程'
         }
       },
+      {
+        path: '/wfhxzgStep1',
+        name: 'wfhxzgStep1',
+        component: () => import('@/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue'),
+        meta: {
+          requireAuth: true,
+          title: '未符合项整改流程'
+        }
+      },
       {
         path: '/xmpgStep1',
         name: 'xmpgStep1',
@@ -285,6 +294,42 @@ const routes = [
           title: '项目合规评估流程'
         }
       },
+      {
+        path: '/wfhxzgStep2',
+        name: 'wfhxzgStep2',
+        component: () => import('@/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue'),
+        meta: {
+          requireAuth: true,
+          title: '未符合项整改发布/更新流程'
+        }
+      },
+      {
+        path: '/wfhxzgStep3',
+        name: 'wfhxzgStep3',
+        component: () => import('@/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue'),
+        meta: {
+          requireAuth: true,
+          title: '未符合项整改/更新流程'
+        }
+      },
+      {
+        path: '/wfhxzgStep4',
+        name: 'wfhxzgStep4',
+        component: () => import('@/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue'),
+        meta: {
+          requireAuth: true,
+          title: '未符合项整改/更新流程'
+        }
+      },
+      {
+        path: '/wfhxzgStep5',
+        name: 'wfhxzgStep5',
+        component: () => import('@/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue'),
+        meta: {
+          requireAuth: true,
+          title: '未符合项整改/更新流程'
+        }
+      },
       {
         path: '/bzrkStep1',
         name: 'bzrkStep1',
@@ -357,6 +402,105 @@ const routes = [
           title: '标准调研流程'
         }
       },
+      {
+        path: '/bzzqyjStep1',
+        name: 'bzzqyjStep1',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue'),
+        meta: {
+          requireAuth: true,
+          title: '标准征求意见流程'
+        }
+      },
+      {
+        path: '/bzzqyjStep2',
+        name: 'bzzqyjStep2',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue'),
+        meta: {
+          requireAuth: true,
+          title: '标准征求意见流程'
+        }
+      },
+      {
+        path: '/bzzqyjStep3',
+        name: 'bzzqyjStep3',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue'),
+        meta: {
+          requireAuth: true,
+          title: '标准征求意见流程'
+        }
+      },
+      {
+        path: '/bzzqyjStep4',
+        name: 'bzzqyjStep4',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue'),
+        meta: {
+          requireAuth: true,
+          title: '标准征求意见流程'
+        }
+      },
+      {
+        path: '/bzzqyjStep5',
+        name: 'bzzqyjStep5',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue'),
+        meta: {
+          requireAuth: true,
+          title: '标准调研流程'
+        }
+      },
+      {
+        path: '/bzdyStep4',
+        name: 'bzdyStep4',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzdy/step4.vue'),
+        meta: {
+          requireAuth: true,
+          title: '标准调研流程'
+        }
+      },
+      {
+        path: '/bzdyStep5',
+        name: 'bzdyStep5',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzdy/step5.vue'),
+        meta: {
+          requireAuth: true,
+          title: '标准调研流程'
+        }
+      },
+      {
+        path: '/bzdyStep6',
+        name: 'bzdyStep6',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzdy/step6.vue'),
+        meta: {
+          requireAuth: true,
+          title: '标准调研流程'
+        }
+      },
+      {
+        path: '/bzdyStep7',
+        name: 'bzdyStep7',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzdy/step7.vue'),
+        meta: {
+          requireAuth: true,
+          title: '标准调研流程'
+        }
+      },
+      {
+        path: '/bzdyStep8',
+        name: 'bzdyStep8',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzdy/step8.vue'),
+        meta: {
+          requireAuth: true,
+          title: '标准调研流程'
+        }
+      },
+      {
+        path: '/bzdyStep9',
+        name: 'bzdyStep9',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzdy/step9.vue'),
+        meta: {
+          requireAuth: true,
+          title: '标准调研流程'
+        }
+      },
       {
         path: '/zqyjStep1',
         name: 'zqyjStep1',
@@ -991,6 +1135,17 @@ const routes = [
           title: '标准法规属性管理详情页'
         }
       },
+      {
+        path: '/standLawsAttrTreeDetails/:id?/:dictionaryName?/:dictionType?/:isRelate?/:relateDicId?',
+        name: 'standLawsAttrTreeDetails',
+        component: () =>
+          import('@/pages/config/pages/standLawsAttrManage/pages/standLawsAttrTreeDetails'),
+        meta: {
+          requireAuth: true,
+          parentPath: '/standLawsAttrManage',
+          title: '标准法规属性管理详情页'
+        }
+      },
       {
         path: '/attributeCustom',
         name: 'AttributeCustom',