我的页面统计

src/router/index.js

@@ -85,7 +85,7 @@ export default new Router({
       children: []
     },
     {
-      path: '/main/incidentNewList/:type/:status/:isToday?',
+      path: '/main/incidentNewList/:searchType/:searchState?/:belongtoMe?/:isToday?',
       name: 'IncidentNewList',
       component: IncidentNewList,
       meta: {

src/views/IncidentNewList.vue

@@ -300,7 +300,6 @@ export default {
       searchsState:[],//状态列表
       searchType: "todo",
       searchState: 1544,
-      type: "todo",
       isToday: "",
       sum: 10,
       idx: 0,
@@ -826,20 +825,28 @@ export default {
       };
     },
     getParamsState() {
-      if (this.$route.params.type) {
-        this.type = this.$route.params.type;
-        this.isToday = this.$route.params.isToday;
-        if (this.type === "todo") {
-          this.searchType = "todo";
-        } else if (this.type === "done") {
-          this.searchType = "done";
-        } else {
-          this.searchType = "all";
+      console.log(this.$route.params);
+
+      if(this.evt){
+        this.evt.selected = this.$route.params.searchType;
+        this.evt.belongtoMe = this.$route.params.belongtoMe;
+      }else{
+        this.evt = {
+          selected: this.$route.params.searchType,
+          belongtoMe: this.$route.params.belongtoMe,
         }
       }
-      if(this.$route.params.status){
-        this.searchState = this.$route.params.status ? Number(this.$route.params.status) : undefined;
+      this.searchType = this.$route.params.searchType;
+
+      this.searchState = this.$route.params.searchState;
+      if(this.$route.params.searchState === undefined){
+        this.tabTypeIdActive = 1;
+      }else if(this.$route.params.searchState === 1543){
+        this.tabTypeIdActive = 2;
+      }else if(this.$route.params.searchState === 1544){
+        this.tabTypeIdActive = 3;
       }
+
     },
     typeChange(tab) {
       this.tabTypeIdActive = tab.id;
@@ -898,13 +905,16 @@ export default {
         searchType: this.searchType,
         idx: 0,
         sum: 1,
-        belongtoMe: this.evt ? this.evt.belongtoMe : false,
-        incident: { temporary: true,statusId }
+        incident: {
+          belongtoMe: this.evt ? this.evt.belongtoMe : false,
+          temporary: true,
+          statusId
+        }
       };
-      if(this.evt && this.evt.category.id){
+      if(this.evt && this.evt.category && this.evt.category.id){
         postData.incident.levelCategory = this.evt.category;
       }
-      if(this.evt && this.evt.area.id){
+      if(this.evt && this.evt.area && this.evt.area.id){
         postData.incident.place = {
           area: this.evt.area
         }
@@ -957,16 +967,16 @@ export default {
         searchType: this.searchType,
         idx: this.idx,
         sum: this.sum,
-        belongtoMe: this.evt ? this.evt.belongtoMe : false,
         incident: {
+          belongtoMe: this.evt ? this.evt.belongtoMe : false,
           temporary: true,
           statusId:this.searchState || undefined,
         }
       };
-      if(this.evt && this.evt.category.id){
+      if(this.evt && this.evt.category && this.evt.category.id){
         postData.incident.levelCategory = this.evt.category;
       }
-      if(this.evt && this.evt.area.id){
+      if(this.evt && this.evt.area && this.evt.area.id){
         postData.incident.place = {
           area: this.evt.area
         }

src/views/my.vue

@@ -39,44 +39,53 @@
       <div class="label">我的事件工单</div>
       <div class="tit">
         <div>全部</div>
-        <div @click="toIncidentList('all')">
-          {{ incidentCount.incidentAll || 0 }}条&nbsp;&nbsp;&nbsp;>
-        </div>
       </div>
       <div class="rapirMessage">
-        <div class="status" @click="toIncidentList('todo')">
+        <div class="status" @click="toIncidentList({searchState: 1543, searchType: 'todo', belongtoMe: false})">
           <div>
             <svg class="icon" aria-hidden="true">
               <use xlink:href="#icon-daishouli"></use>
             </svg>
           </div>
           <div>
-            <span>待处理</span>
-            <span>{{ incidentCount.incidentTodo || 0 }}</span>
+            <span>待接单</span>
+            <span>{{ incidentCount.todoCount || 0 }}</span>
           </div>
         </div>
-        <div class="status" @click="toIncidentList('done')">
+
+        <div class="status" @click="toIncidentList({searchState: 1544, searchType: 'todo', belongtoMe: false})">
           <div>
             <svg class="icon" aria-hidden="true">
               <use xlink:href="#icon-yijiejue"></use>
             </svg>
           </div>
           <div>
-            <span>处理过</span>
-            <span>{{ incidentCount.incidentDone || 0 }}</span>
+            <span>待处理</span>
+            <span>{{ incidentCount.doingCount || 0 }}</span>
           </div>
         </div>
-        <!-- <div class="status" @click="toIncidentList('create')">
+        <div class="status" @click="toIncidentList({searchState: undefined, searchType: 'done', belongtoMe: false})">
+          <div>
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-chulizhong"></use>
+            </svg>
+          </div>
+          <div>
+            <span>与我关联</span>
+            <span>{{ incidentCount.irelateCount || 0 }}</span>
+          </div>
+        </div>
+        <div class="status" @click="toIncidentList({searchState: undefined, searchType: 'done', belongtoMe: true})">
           <div>
             <svg class="icon" aria-hidden="true">
               <use xlink:href="#icon-daipingjia"></use>
             </svg>
           </div>
           <div>
-            <span>我创建</span>
-            <span>{{ incidentCount.incidentCreate || 0 }}</span>
+            <span>我处理的</span>
+            <span>{{ incidentCount.idoCount || 0 }}</span>
           </div>
-        </div> -->
+        </div>
       </div>
     </div>
     <div class="myRapir">
@@ -91,7 +100,6 @@
       </div>
       <div class="rapirMessage">
         <div class="status">
-          <!-- <div class="status" @click="toIncidentList(1594)"> -->
           <div>
             <svg class="icon" aria-hidden="true">
               <use xlink:href="#icon-chulizhong"></use>
@@ -284,10 +292,15 @@ export default {
       );
     },
     // 跳转到事件列表
-    toIncidentList(searchType) {
-      if(!(searchType === 'all' && !this.isAll)){
-        this.$router.push({ path: "/main/incidentList/" + searchType + '/0' });
-      }
+    toIncidentList(data) {
+      this.$router.push({
+        name: "IncidentNewList",
+        params: {
+          searchType: data.searchType,
+          searchState: data.searchState,
+          belongtoMe: data.belongtoMe,
+        },
+      });
     },
     // 巡检列表
     toinspectionList(state) {