优化

src/router/index.js

@@ -53,7 +53,7 @@ export default new Router({
       },
     },
     {
-      path: '/main/incidentList/:type/:isToday?',
+      path: '/main/incidentList/:type/:status/:isToday?',
       name: 'IncidentList',
       component: IncidentList,
       meta: {

src/views/Main.vue

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

src/views/incidentList.vue

@@ -422,6 +422,9 @@ export default {
           this.searchType = "all";
         }
       }
+      if(this.$route.params.status){
+        this.searchState = this.$route.params.status ? Number(this.$route.params.status) : 0;
+      }
     },
     typeChange() {
       this.loadShow = true;

src/views/indes.vue

@@ -39,22 +39,24 @@
       <!-- 统计信息 -->
       <div
         class="newStatistics"
-        v-if="!newStatisticsLoading && isShowNewStatistics"
+        v-if="!newStatisticsLoading && isShowNewStatistics && isAll"
       >
         <div class="buildOrder">
           <div
             class="buildOrderItem" 
-            @click="goTo('/main/incidentList/all/today')"
+            @click="goTo('/main/incidentList/all/0/today')"
           >
             <div class="s_num">{{ newStatistics.createOrders }}</div>
             <div>今日建单</div>
           </div>
           <div
             class="buildOrderItem" 
-            @click="goTo('/main/incidentList/todo/')"
+            @click="goTo('/main/incidentList/all/1544')"
           >
-            <div class="s_num">{{ newStatistics.todoOrders }}</div>
-            <div>待处理</div>
+            <!-- <div class="s_num">{{ newStatistics.todoOrders }}</div> -->
+            <div class="s_num">{{ newStatistics.doingOrders }}</div>
+            <!-- <div>待处理</div> -->
+            <div>所有处理中</div>
           </div>
         </div>
         <div class="attendance" v-if="ifWorking == 1">
@@ -267,14 +269,12 @@ export default {
         errorCount: 0 //今日迟到
       }, //统计数据
       newStatisticsLoading: false, //统计数据Loading
-      isShowNewStatistics: false
+      isShowNewStatistics: true
     };
   },
   methods: {
     goTo(url){
-      if(this.isAll){
-        this.$router.push(url);
-      }
+      this.$router.push(url);
     },
     scan() {
       // this.$router.push({name:'ScanResult',params:{data:'[{"name":"资产名称","value":"哈哈哈"},{"name":"数量","value":"12"}]'}});
@@ -357,7 +357,7 @@ export default {
       this.$router.push({ path: "/noticeList" });
     },
     toIncidentList(searchType) {
-      this.$router.push({ path: "/main/incidentList/" + searchType + '/' });
+      this.$router.push({ path: "/main/incidentList/" + searchType + '/0' });
     },
     // toKnowList() {
     //   this.$router.push({ path: "/knowList" });
@@ -401,11 +401,11 @@ export default {
     if (menu) {
       this.isAll = menu.some(v => v.link == "shijianliebiao_all");
     }
-    this.isShowNewStatistics = this.loginUser.role.some(
-      v =>
-        v.rolecode == "incident-category-manager" ||
-        v.rolecode == "incident manager"
-    );
+    // this.isShowNewStatistics = this.loginUser.role.some(
+    //   v =>
+    //     v.rolecode == "incident-category-manager" ||
+    //     v.rolecode == "incident manager"
+    // );
     var that = this;
     that.valConfig = JSON.parse(localStorage.getItem("valConfig")) - 0;
     that.loginUser.group.forEach(element => {

src/views/my.vue

@@ -286,7 +286,7 @@ export default {
     // 跳转到事件列表
     toIncidentList(searchType) {
       if(!(searchType === 'all' && !this.isAll)){
-        this.$router.push({ path: "/main/incidentList/" + searchType + '/' });
+        this.$router.push({ path: "/main/incidentList/" + searchType + '/0' });
       }
     },
     // 巡检列表