区域接口增加统一参数

src/views/layout.vue

@@ -82,7 +82,7 @@ export default {
           regionid: this.powerParams.objectid
         }).then((data) => {
           if (data.code === 0) {
-            this.belongName = data.obj.regionName;
+            this.belongName = data.obj.regionName || "--";
           } else {
             this.belongName = "";
             this.$Message.error(data.msg);

src/views/regionSection/applicationManage/applicationGroup.vue

@@ -259,6 +259,11 @@ export default {
       ]
     };
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   mounted() {
     this.searchList();
   },
@@ -316,6 +321,8 @@ export default {
     // 获取列表
     getList() {
       appgroup_list({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
         appgroupName: this.searchForm.appgroupName
@@ -353,6 +360,8 @@ export default {
             ? appgroup_edit
             : appgroup_add;
           let form = {
+            rtype: this.powerParams.rtype,
+            objectid: this.powerParams.objectid,
             appgroupName: this.wallpaperInfo.appgroupName,
             iconPath: this.wallpaperInfo.iconPath,
             comm: this.wallpaperInfo.comm,
@@ -411,6 +420,8 @@ export default {
         content: "您确定删除选中数据吗？",
         onOk: () => {
           appgroup_delete({
+            rtype: this.powerParams.rtype,
+            objectid: this.powerParams.objectid,
             appgroupid: row.appgroupid,
             rversion: row.rversion
           }).then((res) => {

src/views/regionSection/applicationManage/applicationManage.vue

@@ -877,6 +877,11 @@ export default {
       ]
     };
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   created() {
     this.userInfo = JSON.parse(
       localStorage.getItem("xh_control_userInfo")
@@ -891,7 +896,11 @@ export default {
     },
     // 查看
     toView(row) {
-      app_detail({ appid: row.appid }).then((res) => {
+      app_detail({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        appid: row.appid
+      }).then((res) => {
         if (res.code === 0) {
           this.viewInfo = {
             show: true,
@@ -927,7 +936,11 @@ export default {
     },
     //查看型号
     see_device(row) {
-      app_detail({ appid: row.appid }).then((res) => {
+      app_detail({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        appid: row.appid
+      }).then((res) => {
         if (res.code === 0) {
           this.deviceInfo = {
             show: true,
@@ -943,6 +956,8 @@ export default {
     enabledChange(row) {
       let api = row.enable === 1 ? app_edit_enable : app_edit_unenable;
       api({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
         appid: row.appid,
         rversion: row.rversion
       }).then((data) => {
@@ -958,7 +973,11 @@ export default {
       console.log(row);
       if (type === 1) {
         //下载
-        app_detail({ appid: row.appid }).then((res) => {
+        app_detail({
+          rtype: this.powerParams.rtype,
+          objectid: this.powerParams.objectid,
+          appid: row.appid
+        }).then((res) => {
           if (res.code === 0) {
             this.downloadInfo = {
               show: true,
@@ -1100,6 +1119,8 @@ export default {
     init() {
       //获取分组列表
       appgroup_list({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
         page: 1,
         size: 100,
         appgroupName: ""
@@ -1120,7 +1141,11 @@ export default {
       });
 
       //获取区域学校
-      region_list_rs({ regionid: this.userInfo.regionid }).then((res) => {
+      region_list_rs({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        regionid: this.powerParams.objectid
+      }).then((res) => {
         if (res.code === 0) {
           this.getHandleData(res.obj[0]);
           this.curRegion = res.obj;
@@ -1143,7 +1168,9 @@ export default {
       //获取区域学校
       this.showLoading = true;
       region_list_rs({
-        regionid: this.userInfo.regionid,
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        regionid: this.powerParams.objectid,
         regionName: this.wallpaperInfo.schoolname
       }).then((res) => {
         this.showLoading = false;
@@ -1224,6 +1251,8 @@ export default {
     getList() {
       this.showLoading = true;
       app_list({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
         appName: this.searchForm.appName
@@ -1320,6 +1349,8 @@ export default {
           }
           let appImg = this.wallpaperInfo.appImg.join(";");
           let form = {
+            rtype: this.powerParams.rtype,
+            objectid: this.powerParams.objectid,
             appName: this.wallpaperInfo.appName,
             enable: this.wallpaperInfo.enable,
             appType: this.wallpaperInfo.appType,
@@ -1386,7 +1417,11 @@ export default {
 
     // 编辑
     toEdit(row) {
-      app_detail({ appid: row.appid }).then((res) => {
+      app_detail({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        appid: row.appid
+      }).then((res) => {
         if (res.code === 0) {
           this.school_list = JSON.parse(JSON.stringify(this.curRegion));
           this.wallpaperInfo = {
@@ -1468,16 +1503,19 @@ export default {
         title: "提示",
         content: "您确定删除选中数据吗？",
         onOk: () => {
-          app_delete({ appid: row.appid, rversion: row.rversion }).then(
-            (res) => {
-              if (res.code === 0) {
-                this.$Message.success(res.msg);
-                this.searchList();
-              } else {
-                this.$Message.error(res.msg);
-              }
+          app_delete({
+            rtype: this.powerParams.rtype,
+            objectid: this.powerParams.objectid,
+            appid: row.appid,
+            rversion: row.rversion
+          }).then((res) => {
+            if (res.code === 0) {
+              this.$Message.success(res.msg);
+              this.searchList();
+            } else {
+              this.$Message.error(res.msg);
             }
-          );
+          });
         },
         onCancel: () => {}
       });

src/views/regionSection/log/admin.vue

@@ -94,6 +94,11 @@ export default {
       ]
     };
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   created() {
     this.userInfo = JSON.parse(
         localStorage.getItem("xh_control_userInfo")
@@ -124,12 +129,14 @@ export default {
       let _enddate = this.searchForm.dataRange[1];
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
       logOperate_list({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        regionid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
         begindate: _begindate,
         enddate: _enddate,
-        name: this.searchForm.name,
-        regionid: this.userInfo.regionid
+        name: this.searchForm.name
       }).then((data) => {
         if (data.code === 0) {
           this.searchForm.list = data.obj.data;

src/views/regionSection/log/appLaunch.vue

@@ -122,6 +122,11 @@ export default {
       ]
     };
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   created() {
     this.userInfo = JSON.parse(
       localStorage.getItem("xh_control_userInfo")
@@ -152,12 +157,14 @@ export default {
       let _enddate = this.searchForm.dataRange[1];
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
       logAppStart_list_start({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        regionid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
         begindate: _begindate,
         enddate: _enddate,
-        name: this.searchForm.name,
-        regionid: this.userInfo.regionid
+        name: this.searchForm.name
       }).then((data) => {
         if (data.code === 0) {
           this.searchForm.list = data.obj.data;

src/views/regionSection/log/applicationDownload.vue

@@ -114,6 +114,11 @@ export default {
       ]
     };
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   created() {
     this.userInfo = JSON.parse(
       localStorage.getItem("xh_control_userInfo")
@@ -144,12 +149,14 @@ export default {
       let _enddate = this.searchForm.dataRange[1];
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
       logAppDown_list({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        regionid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
         begindate: _begindate,
         enddate: _enddate,
-        name: this.searchForm.name,
-        regionid: this.userInfo.regionid
+        name: this.searchForm.name
       }).then((data) => {
         if (data.code === 0) {
           this.searchForm.list = data.obj.data;

src/views/regionSection/log/deviceEvents.vue

@@ -150,6 +150,11 @@ export default {
       ]
     };
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   created() {
     this.userInfo = JSON.parse(
       localStorage.getItem("xh_control_userInfo")
@@ -180,13 +185,15 @@ export default {
       let _enddate = this.searchForm.dataRange[1];
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
       logdoperate_list_event({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        regionid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
         doEvent: this.searchForm.doEvent,
         begindate: _begindate,
         enddate: _enddate,
-        name: this.searchForm.name,
-        regionid: this.userInfo.regionid
+        name: this.searchForm.name
       }).then((data) => {
         if (data.code === 0) {
           this.searchForm.list = data.obj.data;

src/views/regionSection/log/deviceExport.vue

@@ -95,6 +95,11 @@ export default {
       ]
     };
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   created() {
     this.userInfo = JSON.parse(
       localStorage.getItem("xh_control_userInfo")
@@ -121,10 +126,12 @@ export default {
     // 获取列表
     getList() {
       logDeviceBind_list({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        regionid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
-        name: this.searchForm.name,
-        regionid: this.userInfo.regionid
+        name: this.searchForm.name
       }).then((data) => {
         if (data.code === 0) {
           this.searchForm.list = data.obj.data;

src/views/regionSection/log/deviceInstallation.vue

@@ -127,6 +127,11 @@ export default {
       ]
     };
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   created() {
     this.userInfo = JSON.parse(
       localStorage.getItem("xh_control_userInfo")
@@ -157,12 +162,14 @@ export default {
       let _enddate = this.searchForm.dataRange[1];
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
       logAppStart_list_install({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        regionid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
         begindate: _begindate,
         enddate: _enddate,
-        name: this.searchForm.name,
-        regionid: this.userInfo.regionid
+        name: this.searchForm.name
       }).then((data) => {
         if (data.code === 0) {
           this.searchForm.list = data.obj.data;

src/views/regionSection/log/deviceLocation.vue

@@ -3,26 +3,26 @@
     <div class="search_header">
       <div class="search_left">
         <DatePicker
-            v-model="searchForm.dataRange"
-            @on-change="searchList()"
-            :editable="false"
-            :transfer="true"
-            format="yyyy-MM-dd"
-            type="daterange"
-            placement="bottom-start"
-            placeholder="请选择日期范围"
-            style="margin-right: 10px; width: 220px"
+          v-model="searchForm.dataRange"
+          @on-change="searchList()"
+          :editable="false"
+          :transfer="true"
+          format="yyyy-MM-dd"
+          type="daterange"
+          placement="bottom-start"
+          placeholder="请选择日期范围"
+          style="margin-right: 10px; width: 220px"
         ></DatePicker>
         <Input
-            v-model="searchForm.name"
-            placeholder="请输入登录名、事件"
-            search
-            @on-search="searchList()"
-            style="width: 180px"
+          v-model="searchForm.name"
+          placeholder="请输入登录名、事件"
+          search
+          @on-search="searchList()"
+          style="width: 180px"
         />
       </div>
       <Button type="primary" class="primary_btn" @click="toExport()"
-      >导出</Button
+        >导出</Button
       >
     </div>
     <div class="table_wrap">
@@ -30,15 +30,15 @@
     </div>
     <div class="page_wrap">
       <Page
-          :transfer="true"
-          :total="searchForm.total"
-          :current="searchForm.page"
-          :page-size="searchForm.size"
-          :page-size-opts="[10, 20, 40, 60]"
-          @on-change="pageChange"
-          @on-page-size-change="pageSizeChange"
-          show-total
-          show-sizer
+        :transfer="true"
+        :total="searchForm.total"
+        :current="searchForm.page"
+        :page-size="searchForm.size"
+        :page-size-opts="[10, 20, 40, 60]"
+        @on-change="pageChange"
+        @on-page-size-change="pageSizeChange"
+        show-total
+        show-sizer
       ></Page>
     </div>
   </div>
@@ -66,8 +66,8 @@ export default {
           width: 70,
           render: (h, params) => {
             return h(
-                "span",
-                params.index +
+              "span",
+              params.index +
                 (this.searchForm.page - 1) * this.searchForm.size +
                 1
             );
@@ -112,9 +112,14 @@ export default {
       ]
     };
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   created() {
     this.userInfo = JSON.parse(
-        localStorage.getItem("xh_control_userInfo")
+      localStorage.getItem("xh_control_userInfo")
     ).content;
     this.searchList();
   },
@@ -142,12 +147,14 @@ export default {
       let _enddate = this.searchForm.dataRange[1];
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
       logDeviceLogin_list({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        regionid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
         begindate: _begindate,
         enddate: _enddate,
-        name: this.searchForm.name,
-        regionid: this.userInfo.regionid
+        name: this.searchForm.name
       }).then((data) => {
         if (data.code === 0) {
           this.searchForm.list = data.obj.data;

src/views/regionSection/log/devicePush.vue

@@ -105,6 +105,11 @@ export default {
       ]
     };
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   created() {
     this.userInfo = JSON.parse(
       localStorage.getItem("xh_control_userInfo")
@@ -135,12 +140,14 @@ export default {
       let _enddate = this.searchForm.dataRange[1];
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
       logPush_list({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        regionid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
         begindate: _begindate,
         enddate: _enddate,
-        name: this.searchForm.name,
-        regionid: this.userInfo.regionid
+        name: this.searchForm.name
       }).then((data) => {
         if (data.code === 0) {
           this.searchForm.list = data.obj.data;

src/views/regionSection/log/violatingDevice.vue

@@ -193,6 +193,11 @@ export default {
       ]
     };
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   created() {
     this.userInfo = JSON.parse(
       localStorage.getItem("xh_control_userInfo")
@@ -223,13 +228,15 @@ export default {
       let _enddate = this.searchForm.dataRange[1];
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
       logdoperate_list_violate({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        regionid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
         doEvent: this.searchForm.doEvent,
         begindate: _begindate,
         enddate: _enddate,
-        name: this.searchForm.name,
-        regionid: this.userInfo.regionid
+        name: this.searchForm.name
       }).then((data) => {
         if (data.code === 0) {
           this.searchForm.list = data.obj.data;

src/views/regionSection/networkManage/whitelist.vue

@@ -330,6 +330,11 @@ export default {
       ]
     };
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   created() {
     this.userInfo = JSON.parse(
       localStorage.getItem("xh_control_userInfo")
@@ -340,7 +345,11 @@ export default {
   methods: {
     init() {
       //获取区域学校
-      region_list_rs({ regionid: this.userInfo.regionid }).then((res) => {
+      region_list_rs({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        regionid: this.powerParams.objectid
+      }).then((res) => {
         if (res.code === 0) {
           this.getHandleData(res.obj[0]);
           this.curRegion = res.obj;
@@ -382,7 +391,9 @@ export default {
     getSchool() {
       //获取区域学校
       region_list_rs({
-        regionid: this.userInfo.regionid,
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        regionid: this.powerParams.objectid,
         name: this.whiteLibraryInfo.schoolname
       }).then((res) => {
         if (res.code === 0) {
@@ -424,7 +435,9 @@ export default {
         page: this.searchForm.page,
         size: this.searchForm.size,
         whiteName: this.searchForm.whiteName,
-        regionid: this.userInfo.regionid
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        regionid: this.powerParams.objectid
       }).then((data) => {
         if (data.code === 0) {
           this.searchForm.list = data.obj.data;
@@ -468,9 +481,11 @@ export default {
           }
           let api = this.whiteLibraryInfo.whiteid ? white_edit : white_add;
           let form = {
+            rtype: this.powerParams.rtype,
+            objectid: this.powerParams.objectid,
+            regionid: this.powerParams.objectid,
             whiteName: this.whiteLibraryInfo.whiteName,
             targetSchool: this.whiteLibraryInfo.targetSchool,
-            regionid: this.userInfo.regionid,
             website: this.whiteLibraryInfo.website,
             comm: this.whiteLibraryInfo.comm,
             schoolids: this.whiteLibraryInfo.schoolids
@@ -494,7 +509,11 @@ export default {
     },
     // 查看
     toView(row) {
-      white_detail({ whiteid: row.whiteid }).then((res) => {
+      white_detail({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        whiteid: row.whiteid
+      }).then((res) => {
         if (res.code === 0) {
           this.viewInfo = {
             show: true,
@@ -516,7 +535,11 @@ export default {
     // 编辑
     toEdit(row) {
       this.school_list = JSON.parse(JSON.stringify(this.curRegion));
-      white_detail({ whiteid: row.whiteid }).then((res) => {
+      white_detail({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        whiteid: row.whiteid
+      }).then((res) => {
         if (res.code === 0) {
           this.whiteLibraryInfo = {
             show: true,
@@ -550,6 +573,8 @@ export default {
         content: "您确定删除选中数据吗？",
         onOk: () => {
           white_delete({
+            rtype: this.powerParams.rtype,
+            objectid: this.powerParams.objectid,
             whiteid: row.whiteid,
             rversion: row.rversion
           }).then((data) => {

src/views/regionSection/networkManage/whitelistLibrary.vue

@@ -111,6 +111,11 @@ export default {
       ]
     };
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   created() {
     this.userInfo = JSON.parse(
       localStorage.getItem("xh_control_userInfo")
@@ -137,6 +142,8 @@ export default {
     // 获取列表
     getList() {
       whiteLibrary_list({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
         name: this.searchForm.name
@@ -159,8 +166,10 @@ export default {
           '</span>" 加到白名单？',
         onOk: () => {
           whiteLibrary_add_white({
-            wlid: row.wlid,
-            regionid: this.userInfo.regionid
+            rtype: this.powerParams.rtype,
+            objectid: this.powerParams.objectid,
+            regionid: this.powerParams.objectid,
+            wlid: row.wlid
           }).then((data) => {
             if (data.code === 0) {
               this.searchList();

src/views/regionSection/notice/index.vue

@@ -3,22 +3,22 @@
     <div class="search_header">
       <div class="search_left">
         <DatePicker
-            v-model="searchForm.dataRange"
-            @on-change="searchList()"
-            :editable="false"
-            :transfer="true"
-            format="yyyy-MM-dd"
-            type="daterange"
-            placement="bottom-start"
-            placeholder="请选择日期范围"
-            style="margin-right: 10px; width: 220px"
+          v-model="searchForm.dataRange"
+          @on-change="searchList()"
+          :editable="false"
+          :transfer="true"
+          format="yyyy-MM-dd"
+          type="daterange"
+          placement="bottom-start"
+          placeholder="请选择日期范围"
+          style="margin-right: 10px; width: 220px"
         ></DatePicker>
         <Input
-            v-model="searchForm.title"
-            placeholder="请输入标题"
-            search
-            @on-search="searchList()"
-            style="width: 150px"
+          v-model="searchForm.title"
+          placeholder="请输入标题"
+          search
+          @on-search="searchList()"
+          style="width: 150px"
         />
       </div>
     </div>
@@ -33,23 +33,23 @@
     </div>
     <div class="page_wrap">
       <Page
-          :transfer="true"
-          :total="searchForm.total"
-          :current="searchForm.page"
-          :page-size="searchForm.size"
-          :page-size-opts="[10, 20, 40, 60]"
-          @on-change="pageChange"
-          @on-page-size-change="pageSizeChange"
-          show-total
-          show-sizer
+        :transfer="true"
+        :total="searchForm.total"
+        :current="searchForm.page"
+        :page-size="searchForm.size"
+        :page-size-opts="[10, 20, 40, 60]"
+        @on-change="pageChange"
+        @on-page-size-change="pageSizeChange"
+        show-total
+        show-sizer
       ></Page>
     </div>
     <!-- 查看 -->
     <Modal
-        class="modal1"
-        :mask-closable="false"
-        v-model="viewInfo.show"
-        title="查看"
+      class="modal1"
+      :mask-closable="false"
+      v-model="viewInfo.show"
+      title="查看"
     >
       <div class="notice_title">{{ viewInfo.noticeTitle }}</div>
       <div class="notice_create">
@@ -96,8 +96,8 @@ export default {
           width: 70,
           render: (h, params) => {
             return h(
-                "span",
-                params.index +
+              "span",
+              params.index +
                 (this.searchForm.page - 1) * this.searchForm.size +
                 1
             );
@@ -129,9 +129,14 @@ export default {
       ]
     };
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   created() {
     this.userInfo = JSON.parse(
-        localStorage.getItem("xh_control_userInfo")
+      localStorage.getItem("xh_control_userInfo")
     ).content;
     this.searchList();
   },
@@ -159,6 +164,8 @@ export default {
       let _enddate = this.searchForm.dataRange[1];
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
       notice_list_region({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
         title: this.searchForm.title,
@@ -176,6 +183,8 @@ export default {
     // 查看
     toView(row) {
       notice_detail_region({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
         noticeid: row.noticeid
       }).then((data) => {
         if (data.code === 0) {
@@ -188,7 +197,7 @@ export default {
             noticeType: data.obj.noticeType,
             regions: data.obj.noticeType === 1 ? [] : data.obj.regions
           };
-          console.log(data.obj.noticeContent)
+          console.log(data.obj.noticeContent);
         } else {
           this.$Message.error(data.msg);
         }
@@ -229,7 +238,7 @@ export default {
 }
 .notice_content {
   font-size: 16px;
-  /deep/ img{
+  /deep/ img {
     width: 100%;
   }
 }

src/views/regionSection/regionManage/adminManage.vue

@@ -413,6 +413,11 @@ export default {
       userInfo: {}
     };
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   created() {
     this.userInfo = JSON.parse(
       localStorage.getItem("xh_control_userInfo")
@@ -423,7 +428,10 @@ export default {
   methods: {
     // 获取搜索区域列表
     getSearchRegionList() {
-      region_list_sel_qy({ regionid: this.userInfo.regionid }).then((data) => {
+      region_list_sel_qy({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        regionid: this.powerParams.objectid }).then((data) => {
         if (data.code === 0) {
           this.searchForm.dropList = data.obj;
         } else {
@@ -450,6 +458,8 @@ export default {
     // 获取列表
     getList() {
       admin_list_qy({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
         enabled: this.searchForm.enabled,
@@ -553,6 +563,8 @@ export default {
           this.adminInfo.show = false;
           let api = this.adminInfo.adminid ? admin_edit : admin_add;
           let form = {
+            rtype: this.powerParams.rtype,
+            objectid: this.powerParams.objectid,
             aname: this.adminInfo.aname,
             loginname: this.adminInfo.loginname,
             loginpwd: this.adminInfo.loginpwd,
@@ -590,7 +602,10 @@ export default {
     },
     // 编辑
     toEdit(row) {
-      admin_detail({ adminid: row.adminid }).then((res) => {
+      admin_detail({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        adminid: row.adminid }).then((res) => {
         if (res.code === 0) {
           this.adminInfo = {
             show: true,
@@ -620,6 +635,8 @@ export default {
         content: "您确定删除选中数据吗？",
         onOk: () => {
           admin_delete({
+            rtype: this.powerParams.rtype,
+            objectid: this.powerParams.objectid,
             adminid: row.adminid,
             rversion: row.rversion
           }).then((data) => {
@@ -637,6 +654,8 @@ export default {
     enabledChange(row) {
       let api = row.enabled === 1 ? admin_enable : admin_disabled;
       api({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
         adminid: row.adminid,
         rversion: row.rversion
       }).then((data) => {

src/views/regionSection/regionManage/regionManage.vue

@@ -198,18 +198,20 @@ export default {
     const reg = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z\d]{8,32}$/;
     // 密码验证
     const pwdCheck = (rule, value, callback) => {
-      if (!reg.test(this.regionInfo.admin.loginpwd)) {
+      if (!reg.test(value)) {
         return callback(new Error("密码格式不正确!"));
       }
+      callback();
     };
     // 重复密码验证
     const pwdAgainCheck = async (rule, value, callback) => {
-      if (!reg.test(this.regionInfo.admin.loginpwd1)) {
+      if (!reg.test(value)) {
         return callback(new Error("密码格式不正确!"));
       }
-      if (this.regionInfo.admin.loginpwd != this.regionInfo.admin.loginpwd1) {
+      if (this.regionInfo.admin.loginpwd != value) {
         return callback(new Error("两次输入密码不一致！"));
       }
+      callback();
     };
     return {
       searchForm: {
@@ -488,7 +490,9 @@ export default {
           this.regionInfo.show = false;
           region_add({
             regionName: this.regionInfo.regionName,
-            regionPid: this.userInfo.regionid,
+            rtype: this.powerParams.rtype,
+            objectid: this.powerParams.objectid,
+            regionPid: this.powerParams.objectid,
             admin: {
               aname: this.regionInfo.admin.aname,
               loginname: this.regionInfo.admin.loginname,
@@ -512,8 +516,10 @@ export default {
       this.$refs.modifyForm.validate((valid) => {
         if (valid) {
           region_edit({
-            regionName: this.modifyRegion.regionName,
+            rtype: this.powerParams.rtype,
+            objectid: this.powerParams.objectid,
             regionid: this.modifyRegion.regionid,
+            regionName: this.modifyRegion.regionName,
             rversion: this.modifyRegion.rversion
           }).then((data) => {
             this.modifyRegion.show = false;
@@ -538,6 +544,8 @@ export default {
     // 查看管理员列表
     toView(row) {
       region_list_admin({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
         regionid: row.regionid
       }).then((data) => {
         if (data.code === 0) {
@@ -551,7 +559,11 @@ export default {
     },
     // 编辑
     toEdit(row) {
-      region_detail({ regionid: row.regionid }).then((res) => {
+      region_detail({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        regionid: row.regionid
+      }).then((res) => {
         if (res.code === 0) {
           this.modifyRegion = {
             show: true,
@@ -571,6 +583,8 @@ export default {
         content: "您确定删除选中数据吗？",
         onOk: () => {
           region_delete({
+            rtype: this.powerParams.rtype,
+            objectid: this.powerParams.objectid,
             regionid: row.regionid,
             rversion: row.rversion
           }).then((data) => {

src/views/regionSection/regionManage/schoolManage.vue

@@ -567,7 +567,9 @@ export default {
     },
     // 获取搜索区域列表
     getSearchRegionList() {
-      region_list_sel_qy({ regionid: this.userInfo.regionid }).then((data) => {
+      region_list_sel_qy({  rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        regionid: this.powerParams.objectid }).then((data) => {
         if (data.code === 0) {
           this.searchForm.dropList = data.obj;
         } else {
@@ -624,7 +626,7 @@ export default {
         areaName: "",
         address: "",
         schoolAbbr: "",
-        regionid: this.userInfo.regionid,
+        regionid: this.powerParams.objectid,
         createAdmin: false,
         admin: {
           aname: "",
@@ -709,6 +711,8 @@ export default {
           this.adminInfo.show = false;
           let api = this.adminInfo.schoolid ? school_edit : school_add;
           let form = {
+            rtype: this.powerParams.rtype,
+            objectid: this.powerParams.objectid,
             schoolName: this.adminInfo.schoolName,
             regionid: this.adminInfo.regionid,
             areaCode: this.adminInfo.areaCode,
@@ -755,7 +759,10 @@ export default {
     toEdit(row) {
       this.marketList = [];
       this.regionList = [];
-      school_detail({ schoolid: row.schoolid }).then((res) => {
+      school_detail({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        schoolid: row.schoolid }).then((res) => {
         if (res.code === 0) {
           let str = res.obj.areaCode;
           let obj1 = { areaCode: "" },
@@ -800,6 +807,8 @@ export default {
         content: "您确定删除选中数据吗？",
         onOk: () => {
           school_delete({
+            rtype: this.powerParams.rtype,
+            objectid: this.powerParams.objectid,
             schoolid: row.schoolid,
             rversion: row.rversion
           }).then((data) => {
@@ -817,6 +826,8 @@ export default {
     enabledChange(row) {
       let api = row.enabled === 1 ? school_enable : school_disabled;
       api({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
         schoolid: row.schoolid,
         rversion: row.rversion
       }).then((data) => {

src/views/regionSection/search/allApps.vue

@@ -34,11 +34,11 @@
         </template>
         <template slot-scope="{ row }" slot="enable">
           <i-switch
-              size="large"
-              v-model="row.enable"
-              :true-value="1"
-              :false-value="2"
-              @on-change="enabledChange(row)"
+            size="large"
+            v-model="row.enable"
+            :true-value="1"
+            :false-value="2"
+            @on-change="enabledChange(row)"
           >
             <span slot="open">启用</span>
             <span slot="close">禁用</span>
@@ -101,8 +101,8 @@
 </template>
 
 <script>
-import { search_list_app} from "@/api/region";
-import {app_edit_enable, app_edit_unenable} from "@/api/appgroup";
+import { search_list_app } from "@/api/region";
+import { app_edit_enable, app_edit_unenable } from "@/api/appgroup";
 export default {
   data() {
     return {
@@ -185,6 +185,11 @@ export default {
       ]
     };
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   created() {
     this.searchList();
   },
@@ -193,6 +198,8 @@ export default {
       let api = row.enable === 1 ? app_edit_enable : app_edit_unenable;
       this.showLoading = true;
       api({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
         appid: row.appid,
         rversion: row.rversion
       }).then((data) => {
@@ -205,9 +212,9 @@ export default {
         }
       });
     },
-    countSlot(){},
-    toView(){},
-    toDel(){},
+    countSlot() {},
+    toView() {},
+    toDel() {},
     // 搜索
     searchList() {
       this.searchForm.page = 1;
@@ -228,6 +235,8 @@ export default {
     getList() {
       this.showLoading = true;
       search_list_app({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
         name: this.searchForm.name,
@@ -236,7 +245,7 @@ export default {
         this.showLoading = false;
         if (data.code === 0) {
           this.searchForm.list = data.obj.data;
-          console.log(this.searchForm.list)
+          console.log(this.searchForm.list);
           this.searchForm.total = data.obj.total;
         } else {
           this.$Message.error(data.msg);

src/views/regionSection/search/allUsers.vue

@@ -106,6 +106,11 @@ export default {
       ]
     };
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   created() {
     this.searchList();
   },
@@ -129,6 +134,8 @@ export default {
     // 获取列表
     getList() {
       search_list_user({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
         name: this.searchForm.name,

src/views/regionSection/search/allWhitelists.vue

@@ -168,12 +168,21 @@ export default {
       ]
     };
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   created() {
     this.searchList();
   },
   methods: {
     toView(row) {
-      white_detail({ whiteid: row.whiteid }).then((res) => {
+      white_detail({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        whiteid: row.whiteid
+      }).then((res) => {
         if (res.code === 0) {
           this.viewInfo = {
             show: true,
@@ -211,6 +220,8 @@ export default {
     // 获取列表
     getList() {
       search_list_white({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
         name: this.searchForm.name

src/views/regionSection/search/clientVersion.vue

@@ -102,6 +102,11 @@ export default {
       ]
     };
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   created() {
     this.searchList();
   },
@@ -125,6 +130,8 @@ export default {
     // 获取列表
     getList() {
       search_list_client({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
         doEvent: this.searchForm.doEvent,

src/views/regionSection/search/device.vue

@@ -85,6 +85,11 @@ export default {
       ]
     };
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   created() {
     this.searchList();
   },
@@ -108,6 +113,8 @@ export default {
     // 获取列表
     getList() {
       search_list_device({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
         name: this.searchForm.name

src/views/regionSection/search/deviceModel.vue

@@ -92,6 +92,11 @@ export default {
       ]
     };
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   created() {
     this.searchList();
   },
@@ -115,6 +120,8 @@ export default {
     // 获取列表
     getList() {
       search_list_dmodel({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
         name: this.searchForm.name,

src/views/regionSection/search/deviceUsers.vue

@@ -85,6 +85,11 @@ export default {
       ]
     };
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   created() {
     this.searchList();
   },
@@ -108,6 +113,8 @@ export default {
     // 获取列表
     getList() {
       search_list_duser({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
         name: this.searchForm.name

src/views/regionSection/setting/device.vue

@@ -52,6 +52,11 @@ export default {
       showLoading: false
     };
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   created() {
     this.userInfo = JSON.parse(
       localStorage.getItem("xh_control_userInfo")
@@ -60,7 +65,10 @@ export default {
   },
   methods: {
     init() {
-      password_detail({}).then((res) => {
+      password_detail({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid
+      }).then((res) => {
         this.showLoading = false;
         if (res.code === 0) {
           if (res.obj) {
@@ -84,6 +92,8 @@ export default {
         return;
       }
       let form = {
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
         trend: this.adminInfo.trend,
         password: this.adminInfo.password
       };

src/views/regionSection/setting/logo.vue

@@ -88,6 +88,11 @@ export default {
       }
     };
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   created() {
     this.userInfo = JSON.parse(
       localStorage.getItem("xh_control_userInfo")
@@ -96,23 +101,26 @@ export default {
   },
   methods: {
     init() {
-      logo_detail({ objectid: this.userInfo.regionid, llevel: 2 }).then(
-        (res) => {
-          this.showLoading = false;
-          if (res.code === 0) {
-            if (res.obj) {
-              this.form = {
-                logoPath: res.obj.logoPath,
-                rversion: res.obj.rversion,
-                objectid: res.obj.objectid,
-                logoid: res.obj.logoid
-              };
-            }
-          } else {
-            this.$Message.error(res.msg);
+      logo_detail({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        regionid: this.powerParams.objectid,
+        llevel: 2
+      }).then((res) => {
+        this.showLoading = false;
+        if (res.code === 0) {
+          if (res.obj) {
+            this.form = {
+              logoPath: res.obj.logoPath,
+              rversion: res.obj.rversion,
+              objectid: res.obj.objectid,
+              logoid: res.obj.logoid
+            };
           }
+        } else {
+          this.$Message.error(res.msg);
         }
-      );
+      });
     },
     upLoad(file) {
       let str = file.name.split(".");
@@ -151,6 +159,8 @@ export default {
     resetting() {
       this.showLoading = true;
       logo_delete({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
         rversion: this.form.rversion,
         logoid: this.form.logoid
       }).then((res) => {
@@ -168,7 +178,9 @@ export default {
       let form = {
         logoPath: this.form.logoPath,
         llevel: 2,
-        objectid: this.userInfo.regionid
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        regionid: this.powerParams.objectid
       };
       console.log(form);
       this.showLoading = true;

src/views/regionSection/setting/powerUp.vue

@@ -59,6 +59,11 @@ export default {
       showLoading: false
     };
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   created() {
     this.userInfo = JSON.parse(
       localStorage.getItem("xh_control_userInfo")
@@ -67,7 +72,9 @@ export default {
   },
   methods: {
     init() {
-      autoapp_detail({ regionid: this.userInfo.regionid }).then((res) => {
+      autoapp_detail({  rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        regionid: this.powerParams.objectid }).then((res) => {
         this.showLoading = false;
         if (res.code === 0) {
           if (res.obj) {
@@ -93,7 +100,9 @@ export default {
         return;
       }
       let form = {
-        regionid: this.userInfo.regionid,
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        regionid: this.powerParams.objectid,
         appPackage: this.adminInfo.appPackage,
         authUrl: this.adminInfo.authUrl,
         singleType: this.adminInfo.singleType

src/views/regionSection/setting/wallpaper.vue

@@ -261,6 +261,11 @@ export default {
       ]
     };
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   created() {
     this.userInfo = JSON.parse(
       localStorage.getItem("xh_control_userInfo")
@@ -339,7 +344,9 @@ export default {
         page: this.searchForm.page,
         size: this.searchForm.size,
         name: this.searchForm.name,
-        regionid: this.userInfo.regionid
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        regionid: this.powerParams.objectid
       }).then((data) => {
         this.showLoading = false;
         if (data.code === 0) {
@@ -388,7 +395,9 @@ export default {
             wname: this.wallpaperInfo.wname,
             hpath: this.wallpaperInfo.hpath,
             wlevel: 2,
-            objectid: this.userInfo.regionid,
+            rtype: this.powerParams.rtype,
+            objectid: this.powerParams.objectid,
+            regionid: this.powerParams.objectid,
             deviceids
           };
           if (this.wallpaperInfo.wallpaperid) {
@@ -414,6 +423,8 @@ export default {
     toView(row) {
       this.showLoading = true;
       wallpaper_detail({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
         wallpaperid: row.wallpaperid
       }).then((data) => {
         this.showLoading = false;
@@ -433,6 +444,8 @@ export default {
     toEdit(row) {
       this.showLoading = true;
       wallpaper_detail({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
         wallpaperid: row.wallpaperid
       }).then((data) => {
         this.showLoading = false;
@@ -482,6 +495,8 @@ export default {
         content: "您确定删除选中数据吗？",
         onOk: () => {
           wallpaper_delete({
+            rtype: this.powerParams.rtype,
+            objectid: this.powerParams.objectid,
             wallpaperid: row.wallpaperid,
             rversion: row.rversion
           }).then((data) => {

src/views/schoolSection/applicationManage/applicationList.vue

@@ -841,6 +841,11 @@ export default {
       ]
     };
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   created() {
     this.userInfo = JSON.parse(
       localStorage.getItem("xh_control_userInfo")
@@ -855,7 +860,11 @@ export default {
     },
     // 查看
     toView(row) {
-      app_detail({ appid: row.appid }).then((res) => {
+      app_detail({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        appid: row.appid
+      }).then((res) => {
         if (res.code === 0) {
           this.viewInfo = {
             show: true,
@@ -891,7 +900,11 @@ export default {
     },
     //查看型号
     see_device(row) {
-      app_detail({ appid: row.appid }).then((res) => {
+      app_detail({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        appid: row.appid
+      }).then((res) => {
         if (res.code === 0) {
           this.deviceInfo = {
             show: true,
@@ -907,6 +920,8 @@ export default {
     enabledChange(row) {
       let api = row.enable === 1 ? app_edit_enable : app_edit_unenable;
       api({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
         appid: row.appid,
         rversion: row.rversion
       }).then((data) => {
@@ -922,12 +937,16 @@ export default {
       console.log(row);
       if (type === 1) {
         //下载
-        app_detail({ appid: row.appid }).then((res) => {
+        app_detail({
+          rtype: this.powerParams.rtype,
+          objectid: this.powerParams.objectid,
+          appid: row.appid
+        }).then((res) => {
           if (res.code === 0) {
             this.downloadInfo = {
               show: true,
               appName: res.obj.appName,
-              apkPath:this.$api.showImageUrl +  res.obj.apkPath
+              apkPath: this.$api.showImageUrl + res.obj.apkPath
             };
             this.$nextTick(() => {
               let qrcodeEl = this.$refs.ScanShare;
@@ -1052,6 +1071,8 @@ export default {
     init() {
       //获取分组列表
       appgroup_list({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
         page: 1,
         size: 100,
         appgroupName: ""
@@ -1137,6 +1158,8 @@ export default {
     getList() {
       this.showLoading = true;
       app_list({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
         appName: this.searchForm.appName,
@@ -1221,6 +1244,8 @@ export default {
           }
           let appImg = this.wallpaperInfo.appImg.join(";");
           let form = {
+            rtype: this.powerParams.rtype,
+            objectid: this.powerParams.objectid,
             appName: this.wallpaperInfo.appName,
             enable: this.wallpaperInfo.enable,
             appType: this.wallpaperInfo.appType,
@@ -1266,7 +1291,11 @@ export default {
     },
     // 编辑
     toEdit(row) {
-      app_detail({ appid: row.appid }).then((res) => {
+      app_detail({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        appid: row.appid
+      }).then((res) => {
         if (res.code === 0) {
           this.school_list = JSON.parse(JSON.stringify(this.curRegion));
           this.wallpaperInfo = {
@@ -1336,16 +1365,19 @@ export default {
         title: "提示",
         content: "您确定删除选中数据吗？",
         onOk: () => {
-          app_delete({ appid: row.appid, rversion: row.rversion }).then(
-            (res) => {
-              if (res.code === 0) {
-                this.$Message.success(res.msg);
-                this.searchList();
-              } else {
-                this.$Message.error(res.msg);
-              }
+          app_delete({
+            rtype: this.powerParams.rtype,
+            objectid: this.powerParams.objectid,
+            appid: row.appid,
+            rversion: row.rversion
+          }).then((res) => {
+            if (res.code === 0) {
+              this.$Message.success(res.msg);
+              this.searchList();
+            } else {
+              this.$Message.error(res.msg);
             }
-          );
+          });
         },
         onCancel: () => {}
       });

src/views/schoolSection/userManage/userManage.vue

@@ -503,6 +503,11 @@ export default {
       }
     };
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   created() {
     this.userInfo = JSON.parse(
       localStorage.getItem("xh_control_userInfo")
@@ -590,7 +595,11 @@ export default {
     },
     //导出
     userExport() {
-      user_export({ schoolid: 1 }).then((res) => {
+      user_export({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        schoolid: this.powerParams.objectid
+      }).then((res) => {
         if (res.code === 0) {
           exportToExcel(
             [
@@ -653,8 +662,10 @@ export default {
             loginpwd: this.addInfo.loginpwd,
             classid: this.addInfo.classid,
             classname: this.addInfo.classname,
+            rtype: this.powerParams.rtype,
+            objectid: this.powerParams.objectid,
+            regionid: this.powerParams.objectid,
             schoolid: this.addInfo.schoolid || 1,
-            regionid: this.userInfo.regionid,
             enabled: this.addInfo.enabled,
             studentno: this.addInfo.studentno,
             userphone: this.addInfo.userphone,
@@ -675,7 +686,12 @@ export default {
     },
     toCare(row) {
       let api = row.care === 1 ? user_un_care : user_care;
-      api({ userid: row.userid, rversion: row.rversion }).then((res) => {
+      api({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        userid: row.userid,
+        rversion: row.rversion
+      }).then((res) => {
         if (res.code === 0) {
           this.searchList();
           this.$Message.success(res.msg);
@@ -685,20 +701,25 @@ export default {
       });
     },
     toDel(row) {
-      user_delete({ userid: row.userid, rversion: row.rversion }).then(
-        (res) => {
-          if (res.code === 0) {
-            this.searchList();
-            this.$Message.success(res.msg);
-          } else {
-            this.$Message.error(res.msg);
-          }
+      user_delete({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        userid: row.userid,
+        rversion: row.rversion
+      }).then((res) => {
+        if (res.code === 0) {
+          this.searchList();
+          this.$Message.success(res.msg);
+        } else {
+          this.$Message.error(res.msg);
         }
-      );
+      });
     },
     enabledChange(row) {
       let api = row.enabled === 1 ? user_enable : user_disabled;
       api({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
         userid: row.userid,
         rversion: row.rversion
       }).then((data) => {
@@ -716,7 +737,11 @@ export default {
     },
     init() {
       this.showLoading = true;
-      class_list({ schoolid: 1 }).then((res) => {
+      class_list({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        schoolid: this.powerParams.objectid
+      }).then((res) => {
         this.showLoading = false;
         if (res.code === 0) {
           this.schoolInfo = res.obj;
@@ -748,9 +773,11 @@ export default {
     getList() {
       this.showLoading = true;
       user_list({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        schoolid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
-        schoolid: this.searchForm.schoolid,
         classid: this.curClass.id,
         care: this.searchForm.care,
         enabled: this.searchForm.enabled,