Merge branch 'master' of https://git.agilestar.cn/spfm-group/spfm-market-front into bianww

# Conflicts:
#	src/router/index.js

src/router/index.js

@@ -1726,6 +1726,57 @@ const routes = [{
             path: '/knowledgeTypetop',
             name: 'knowledgeTypetop',
             component: (resolve) => require( /* webpackChunkName: "system" */ ['../pages/main/knowledgetop/knowledgeType'], resolve)
+        },
+        {
+            meta: {
+                name: 'IT知识库',
+                keepAlive: false
+            },
+            path: '/itknowledgetop',
+            name: 'itknowledgetop',
+            component: (resolve) => require( /* webpackChunkName: "system" */ ['../pages/main/itknowledgetop/index'], resolve)
+        },
+        {
+            meta: {
+                name: 'IT知识库',
+                keepAlive: false
+            },
+            path: '/itknowledgeManagement',
+            name: 'itknowledgeManagement',
+            component: (resolve) => require( /* webpackChunkName: "system" */ ['../pages/main/itknowledgetop/knowledgeManagement'], resolve)
+        }, {
+            meta: {
+                name: '新增知识库',
+                keepAlive: false
+            },
+            path: '/additknowledgetop',
+            name: 'additknowledgetop',
+            component: (resolve) => require( /* webpackChunkName: "system" */ ['../pages/main/itknowledgetop/addKnowledge'], resolve)
+        },
+        {
+            meta: {
+                name: '知识库目录',
+                keepAlive: false
+            },
+            path: '/itknowledgeCatalogtop',
+            name: 'itknowledgeCatalogtop',
+            component: (resolve) => require( /* webpackChunkName: "system" */ ['../pages/main/itknowledgetop/catalog'], resolve)
+        }, {
+            meta: {
+                name: '知识库审核',
+                keepAlive: false
+            },
+            path: '/itknowledgeExaminetop',
+            name: 'itknowledgeExaminetop',
+            component: (resolve) => require( /* webpackChunkName: "system" */ ['../pages/main/itknowledgetop/knowledgeExamine'], resolve)
+        }, {
+            meta: {
+                name: '知识库类型',
+                keepAlive: false
+            },
+            path: '/itknowledgeTypetop',
+            name: 'itknowledgeTypetop',
+            component: (resolve) => require( /* webpackChunkName: "system" */ ['../pages/main/itknowledgetop/knowledgeType'], resolve)
         },{
             meta: {
                 name: '业务时长查询',
@@ -1818,6 +1869,42 @@ const routes = [{
                 }
             ]
         },
+        {
+            meta: { name: '日志查询', keepAlive: false },
+            path: '/logQueryList',
+            name: 'logQueryList',
+            component: (resolve) => require( /* webpackChunkName: "system" */
+                ['../pages/main/logQuery/logQueryList.vue'], resolve)
+        },
+        {
+            meta: {
+                name: '经分文件收集',
+                keepAlive: false
+            },
+            path: '/collect',
+            name: 'collect',
+            component: (resolve) => require( /* webpackChunkName: "system" */ ['../pages/main/collect/index'], resolve)
+        },
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
     ]
 },