Merge commit '7803b83c1f3682c1c393913da2a406d659a5c684' into gzb

src/views/schoolSection/deviceManage/removeControlDevice.vue

@@ -149,9 +149,9 @@ export default {
         page: this.searchForm.page,
         size: this.searchForm.size,
         schoolid: this.powerParams.objectid,
-        atype: this.searchForm.atype,
         doEvent: this.searchForm.doEvent,
-        name: this.searchForm.name
+        name: this.searchForm.name,
+        pushType: 2
       }).then((data) => {
         if (data.code === 0) {
           this.searchForm.list = data.obj.data;