事件列表页面调整

src/router/index.js

@@ -5,6 +5,7 @@ import Main from './../views/Main.vue'
 import Indes from './../views/indes.vue'//首页
 import My from './../views/my.vue'//我的
 import IncidentList from './../views/incidentList.vue'//事件列表
+import IncidentNewList from './../views/IncidentNewList.vue'//事件列表(new)
 import WorkList from './../views/workList.vue'//上下班记录查看
 import NewIncident from './../views/newIncident.vue'//新建事件
 import Inspection from './../views/inspection.vue'//巡检列表
@@ -49,11 +50,11 @@ export default new Router({
     beforeEnter:(to, from, next)=>{
       console.log(from.fullPath);
       console.log(to.fullPath);
-      if(to.fullPath == '/main'){
+      if(to.fullPath == '/main' || to.fullPath == '/main/indes'){
         let loginUser = JSON.parse(localStorage.getItem('loginUser'));
         if(loginUser){
           if(loginUser.role.some(v => v.rolecode == 'first-line support' || v.rolecode == 'second-line support')){
-            next('/main/incidentList/todo/0');
+            next('/main/incidentNewList/todo/1544');
           }else{
             next('/main/indes');
           }
@@ -66,7 +67,6 @@ export default new Router({
     },
     children: [{
       path: '/',
-      // redirect: '/main/incidentList/todo/0'
       redirect: '/main/indes'
     },
     {
@@ -86,6 +86,15 @@ export default new Router({
       children: []
     },
     {
+      path: '/main/incidentNewList/:type/:status/:isToday?',
+      name: 'IncidentNewList',
+      component: IncidentNewList,
+      meta: {
+        allowBack: false
+      },
+      children: []
+    },
+    {
       path: '/main/workList/:type/:status',
       name: 'WorkList',
       component: WorkList,

src/views/Main.vue

@@ -8,7 +8,7 @@
                 <i class="iconfont icon-shouyexian"></i>
                 <span>首页</span>
             </router-link>
-            <router-link to="/main/incidentList/todo/0" class="link" active-class="active">
+            <router-link to="/main/incidentNewList/todo/1544" class="link" active-class="active">
                 <i class="iconfont icon-baoxiuxian"></i>
                 <span>事件</span>
             </router-link>

src/views/indes.vue

@@ -279,7 +279,7 @@ export default {
         errorCount: 0 //今日迟到
       }, //统计数据
       newStatisticsLoading: false, //统计数据Loading
-      isShowNewStatistics: true
+      isShowNewStatistics: false
     };
   },
   methods: {
@@ -391,7 +391,7 @@ export default {
       this.$router.push({ path: "/noticeList" });
     },
     toIncidentList(searchType) {
-      this.$router.push({ path: "/main/incidentList/" + searchType + '/0' });
+      this.$router.push({ path: "/main/incidentNewList/" + searchType + '/1544' });
     },
     // toKnowList() {
     //   this.$router.push({ path: "/knowList" });