Merge branch 'respond' into dev

RMS-FrontEnd/src/views/components/task/components/realTime.vue

@@ -106,7 +106,7 @@ export default {
       ],
       queryParams:{
         taskStatus:[0,1,4],
-        reportId:this.reportId?this.reportId:null
+        reportId:this.reportId?this.reportId:0
       }
     };
   },

RMS-FrontEnd/src/views/components/task/components/todoList.vue

@@ -175,7 +175,7 @@ export default {
             size:10,
             createName:'',
             taskStatus:[0,1,2,4,5],
-            reportId:this.reportId?this.reportId:null,
+            reportId:this.reportId?this.reportId:0,
             orderBy:'createTime',
             orderType:'desc',
         },