路由根据权限跳转传参

src/App.vue

@@ -9,7 +9,9 @@ export default {
   data() {
     return {};
   },
-  created() {},
+  created() {
+    this.$store.commit("setPowerAfterRefresh");
+  },
   methods: {}
 };
 </script>

src/api/region.js

@@ -17,7 +17,7 @@ export const region_list_sel_pt = (data) =>
  * 2.1.1.2区域--区域选择列表
  */
 export const region_list_sel_qy = (data) =>
-    setRequest("region/list_sel_qy", data);
+  setRequest("region/list_sel_qy", data);
 /**
  * 2.1.1.2区域--区域学校选择列表
  */

src/router/index.js

@@ -93,7 +93,97 @@ router.beforeEach((to, from, next) => {
             "xh_control_userInfo",
             JSON.stringify(_userInfo)
           );
-          next();
+          let _userPower = localStorage.getItem("xh_control_userPower");
+          if (_userPower) {
+            _userPower = JSON.parse(_userPower);
+            if (_userPower.atype === 3) {
+              if (
+                to.path.startsWith("/platform/") ||
+                to.path.startsWith("/region/")
+              ) {
+                console.log("文件名：router index.vue，退出原因：未获得权限1");
+                next({
+                  path: "/login",
+                  query: to.query
+                });
+              } else {
+                next();
+              }
+            } else if (_userPower.atype === 2) {
+              if (to.path.startsWith("/platform/")) {
+                console.log("文件名：router index.vue，退出原因：未获得权限2");
+                next({
+                  path: "/login",
+                  query: to.query
+                });
+              } else {
+                if (to.path.startsWith("/region/")) {
+                  if (_userPower.regionids.length > 0 && _userPower.schoolid) {
+                    next("/school");
+                  } else {
+                    next();
+                  }
+                } else if (to.path.startsWith("/school/")) {
+                  if (_userPower.regionids.length > 0 && !_userPower.schoolid) {
+                    next("/region");
+                  } else {
+                    next();
+                  }
+                } else {
+                  next();
+                }
+              }
+            } else if (_userPower.atype === 1) {
+              if (to.path.startsWith("/platform/")) {
+                if (_userPower.regionids.length > 0 && _userPower.schoolid) {
+                  next("/school");
+                } else if (
+                  _userPower.regionids.length > 0 &&
+                  !_userPower.schoolid
+                ) {
+                  next("/region");
+                } else {
+                  next();
+                }
+              } else if (to.path.startsWith("/region/")) {
+                if (_userPower.regionids.length === 0 && !_userPower.schoolid) {
+                  next("/platform");
+                } else if (
+                  _userPower.regionids.length > 0 &&
+                  _userPower.schoolid
+                ) {
+                  next("/school");
+                } else {
+                  next();
+                }
+              } else if (to.path.startsWith("/school/")) {
+                if (_userPower.regionids.length === 0 && !_userPower.schoolid) {
+                  next("/platform");
+                } else if (
+                  _userPower.regionids.length > 0 &&
+                  !_userPower.schoolid
+                ) {
+                  next("/region");
+                } else {
+                  next();
+                }
+              } else {
+                next();
+              }
+            } else {
+              console.log("文件名：router index.vue，退出原因：未获得权限3");
+              next({
+                path: "/login",
+                query: to.query
+              });
+            }
+          } else {
+            console.log("文件名：router index.vue，退出原因：未获得权限4");
+            next({
+              path: "/login",
+              query: to.query
+            });
+          }
         } else {
           console.log("文件名：router index.vue，退出原因：超过24小时未登录");
           next({

src/store/index.js

@@ -4,8 +4,136 @@ Vue.use(Vuex);
 
 export default new Vuex.Store({
   state: {
-    userInfo: {}
+    userInfo: {},
+    // 用户权限
+    userPower: {
+      // 1平台管理员 2区域管理员 3学校管理员
+      atype: null,
+      // 进入的区域层级列表
+      regionids: [],
+      // 进入的学校
+      schoolid: null
+    }
   },
-  mutations: {},
-  actions: {}
+  mutations: {
+    // 登录后设置用户信息
+    loginSetUserInfo(state, info) {
+      state.userInfo = info;
+      state.userPower.atype = info.atype;
+      if (state.userPower.atype === 1) {
+        state.userPower.regionids = [];
+        state.userPower.schoolid = null;
+      } else if (state.userPower.atype === 2) {
+        state.userPower.regionids = [info.regionid];
+        state.userPower.schoolid = null;
+      } else if (state.userPower.atype === 3) {
+        state.userPower.regionids = [info.regionid];
+        state.userPower.schoolid = info.schoolid;
+      }
+      localStorage.setItem(
+        "xh_control_userInfo",
+        JSON.stringify({
+          content: info,
+          datetime: new Date().getTime()
+        })
+      );
+      // 登录后设置用户的初始权限
+      localStorage.setItem(
+        "xh_control_userPower",
+        JSON.stringify(state.userPower)
+      );
+    },
+    // 刷新后设置权限
+    setPowerAfterRefresh(state) {
+      let _userInfo = localStorage.getItem("xh_control_userInfo");
+      let _userPower = localStorage.getItem("xh_control_userPower");
+      if (_userInfo && _userPower) {
+        _userPower = JSON.parse(_userPower);
+        state.userPower.atype = _userPower.atype;
+        state.userPower.regionids = _userPower.regionids;
+        state.userPower.schoolid = _userPower.schoolid;
+      } else {
+        state.userPower.atype = null;
+        state.userPower.regionids = [];
+        state.userPower.schoolid = null;
+      }
+    },
+    // 进入区域设置跳转痕迹
+    setEnterRegionPower(state, regionid) {
+      if (!state.userPower.regionids.includes(regionid)) {
+        state.userPower.regionids.push(regionid);
+      }
+      localStorage.setItem(
+        "xh_control_userPower",
+        JSON.stringify(state.userPower)
+      );
+    },
+    // 退出当前区域设置跳转痕迹
+    setQuitRegionPower(state) {
+      if (state.userPower.atype === 1) {
+        if (state.userPower.regionids.length > 0) {
+          state.userPower.regionids.pop();
+        }
+      } else if (state.userPower.atype === 2) {
+        if (state.userPower.regionids.length > 1) {
+          state.userPower.regionids.pop();
+        }
+      }
+      localStorage.setItem(
+        "xh_control_userPower",
+        JSON.stringify(state.userPower)
+      );
+    },
+    // 进入学校设置跳转痕迹
+    setEnterSchoolPower(state, schoolid) {
+      state.userPower.schoolid = schoolid;
+      localStorage.setItem(
+        "xh_control_userPower",
+        JSON.stringify(state.userPower)
+      );
+    },
+    // 退出当前学校设置跳转痕迹
+    setQuitSchoolPower(state) {
+      if (state.userPower.atype === 1 || state.userPower.atype === 2) {
+        state.userPower.schoolid = null;
+      }
+      localStorage.setItem(
+        "xh_control_userPower",
+        JSON.stringify(state.userPower)
+      );
+    }
+  },
+  getters: {
+    powerParams(state) {
+      let _powerParams = {
+        // 1平台 2区域 3学校
+        rtype: null,
+        // 区域ID/学校ID
+        objectid: null
+      };
+      if (
+        state.userPower.schoolid &&
+        (state.userPower.atype === 1 ||
+          state.userPower.atype === 2 ||
+          state.userPower.atype === 3)
+      ) {
+        _powerParams.rtype = 3;
+        _powerParams.objectid = state.userPower.schoolid;
+      } else if (
+        state.userPower.regionids.length > 0 &&
+        (state.userPower.atype === 1 || state.userPower.atype === 2)
+      ) {
+        _powerParams.rtype = 2;
+        let _regionids = [...state.userPower.regionids];
+        _powerParams.objectid = _regionids.pop();
+      } else if (
+        state.userPower.regionids.length === 0 &&
+        state.userPower.atype === 1
+      ) {
+        _powerParams.rtype = 1;
+        _powerParams.objectid = null;
+      }
+      return _powerParams;
+    }
+  }
 });

src/views/layout.vue

@@ -5,6 +5,12 @@
         <img src="@/assets/img/setting/LOGO.png" />
       </div>
       <div class="header_right">
+        <div style="margin-right: 10px" v-if="powerParams.rtype === 2">
+          所属区域【{{ belongName }}】
+        </div>
+        <div style="margin-right: 10px" v-else-if="powerParams.rtype === 3">
+          所属学校【{{ belongName }}】
+        </div>
         <Dropdown
           :transfer="true"
           @on-visible-change="userDropdownVisibleChange"
@@ -37,11 +43,15 @@
 </template>
 
 <script>
+import { region_detail } from "@/api/region";
+import { school_detail } from "@/api/school";
 export default {
   data() {
     return {
       userDropdown: false,
-      userInfo: {}
+      userInfo: {},
+      // 所属名称
+      belongName: ""
     };
   },
   created() {
@@ -49,7 +59,50 @@ export default {
       localStorage.getItem("xh_control_userInfo")
     ).content;
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
+  watch: {
+    $route: {
+      handler() {
+        this.$nextTick(() => {
+          this.getDetail();
+        });
+      },
+      deep: true,
+      immediate: true
+    }
+  },
   methods: {
+    getDetail() {
+      if (this.powerParams.rtype === 2) {
+        region_detail({
+          regionid: this.powerParams.objectid
+        }).then((data) => {
+          if (data.code === 0) {
+            this.belongName = data.obj.regionName;
+          } else {
+            this.belongName = "";
+            this.$Message.error(data.msg);
+          }
+        });
+      } else if (this.powerParams.rtype === 3) {
+        school_detail({
+          schoolid: this.powerParams.objectid
+        }).then((data) => {
+          if (data.code === 0) {
+            this.belongName = data.obj.schoolName;
+          } else {
+            this.belongName = "";
+            this.$Message.error(data.msg);
+          }
+        });
+      } else {
+        this.belongName = "";
+      }
+    },
     // 下拉菜单显示隐藏
     userDropdownVisibleChange(visible) {
       this.userDropdown = visible;

src/views/login/login.vue

@@ -164,6 +164,7 @@ export default {
   created() {
     //登录前清除信息
     localStorage.setItem("xh_control_userInfo", "");
+    localStorage.setItem("xh_control_userPower", "");
     // 在页面加载时获取账号信息
     let userdata = localStorage.getItem("control_user");
     // 如果存在赋值给表单，并且将记住密码勾选
@@ -241,13 +242,7 @@ export default {
             that.wait_flag = false;
             if (res.code == 0) {
               that.$Message.success(res.msg);
-              localStorage.setItem(
-                "xh_control_userInfo",
-                JSON.stringify({
-                  content: res.obj,
-                  datetime: new Date().getTime()
-                })
-              );
+              this.$store.commit("loginSetUserInfo", res.obj);
               let atype = res.obj.atype;
               let path = "";
               //1平台管理员2区域管理员3学校管理员

src/views/platformSection/log/deviceExport.vue

@@ -98,6 +98,11 @@ export default {
   created() {
     this.searchList();
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   methods: {
     // 搜索
     searchList() {
@@ -118,6 +123,8 @@ export default {
     // 获取列表
     getList() {
       logDeviceBind_list({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
         name: this.searchForm.name
@@ -131,7 +138,10 @@ export default {
       });
     },
     toExport(row) {
-      let form = {};
+      let form = {
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid
+      };
       if (row) {
         form.regionid = row.regionid;
       }

src/views/platformSection/networkManage/whitelistLibrary.vue

@@ -277,6 +277,11 @@ export default {
   created() {
     this.searchList();
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   methods: {
     // 搜索
     searchList() {
@@ -297,6 +302,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
@@ -334,6 +341,8 @@ export default {
               ? whiteLibrary_edit
               : whiteLibrary_add;
           let form = {
+            rtype: this.powerParams.rtype,
+            objectid: this.powerParams.objectid,
             name: this.whiteLibraryInfo.name,
             wltype: this.whiteLibraryInfo.wltype,
             comm: this.whiteLibraryInfo.comm,
@@ -393,6 +402,8 @@ export default {
         content: "您确定删除选中数据吗？",
         onOk: () => {
           whiteLibrary_delete({
+            rtype: this.powerParams.rtype,
+            objectid: this.powerParams.objectid,
             wlid: row.wlid,
             rversion: row.rversion
           }).then((data) => {

src/views/platformSection/notice/notice.vue

@@ -258,6 +258,11 @@ export default {
   created() {
     this.searchList();
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   methods: {
     // 搜索
     searchList() {
@@ -282,6 +287,8 @@ export default {
       let _enddate = this.searchForm.dataRange[1];
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
       notice_list({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
         title: this.searchForm.title,
@@ -342,6 +349,8 @@ export default {
           }
           this.noticeInfo.show = false;
           let form = {
+            rtype: this.powerParams.rtype,
+            objectid: this.powerParams.objectid,
             noticeTitle: this.noticeInfo.noticeTitle,
             noticeContent: this.noticeInfo.noticeContent,
             noticeTxt: this.noticeInfo.noticeTxt,
@@ -370,6 +379,8 @@ export default {
     // 查看
     toView(row) {
       notice_detail({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
         noticeid: row.noticeid
       }).then((data) => {
         if (data.code === 0) {
@@ -390,6 +401,8 @@ export default {
     // 编辑
     toEdit(row) {
       notice_detail({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
         noticeid: row.noticeid
       }).then((data) => {
         if (data.code === 0) {
@@ -423,6 +436,8 @@ export default {
         content: "您确定删除选中数据吗？",
         onOk: () => {
           notice_delete({
+            rtype: this.powerParams.rtype,
+            objectid: this.powerParams.objectid,
             noticeid: row.noticeid,
             rversion: row.rversion
           }).then((data) => {

src/views/platformSection/regionManage/adminManage.vue

@@ -434,6 +434,11 @@ export default {
     this.getSearchRegionList();
     this.searchList();
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   methods: {
     // 获取搜索区域列表
     getSearchRegionList() {
@@ -464,6 +469,8 @@ export default {
     // 获取列表
     getList() {
       admin_list_pt({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
         enabled: this.searchForm.enabled,
@@ -570,6 +577,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,
@@ -633,6 +642,8 @@ export default {
         content: "您确定删除选中数据吗？",
         onOk: () => {
           admin_delete({
+            rtype: this.powerParams.rtype,
+            objectid: this.powerParams.objectid,
             adminid: row.adminid,
             rversion: row.rversion
           }).then((data) => {
@@ -650,6 +661,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/platformSection/regionManage/regionManage.vue

@@ -419,6 +419,11 @@ export default {
   created() {
     this.searchList();
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   methods: {
     // 获取短信验证码
     getMsgCode() {
@@ -476,6 +481,8 @@ export default {
     // 获取列表
     getList() {
       region_list_pt({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
         regionName: this.searchForm.regionName
@@ -535,6 +542,8 @@ export default {
           }
           this.regionInfo.show = false;
           region_add({
+            rtype: this.powerParams.rtype,
+            objectid: this.powerParams.objectid,
             regionName: this.regionInfo.regionName,
             regionCode: this.regionInfo.regionCode,
             admin: {
@@ -563,6 +572,8 @@ export default {
         if (valid) {
           this.regionInfo.show = false;
           region_edit({
+            rtype: this.powerParams.rtype,
+            objectid: this.powerParams.objectid,
             regionName: this.modifyRegion.regionName,
             regionCode: this.modifyRegion.regionCode,
             address: this.modifyRegion.address,
@@ -581,7 +592,8 @@ export default {
       });
     },
     // 进入
-    toEnter() {
+    toEnter(row) {
+      this.$store.commit("setEnterRegionPower", row.regionid);
       this.$router.push({
         path: "/region/home",
         query: {}
@@ -590,6 +602,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) {
@@ -623,6 +637,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/index.vue

@@ -264,7 +264,16 @@
           <span>公告</span>
         </router-link>
       </div>
-      <div class="out_region" @click="exitToPreviousLevel()">退出区域</div>
+      <div
+        class="out_region"
+        v-if="
+          (userPower.atype === 1 && userPower.regionids.length > 0) ||
+          (userPower.atype === 2 && userPower.regionids.length > 1)
+        "
+        @click="exitToPreviousLevel()"
+      >
+        退出区域
+      </div>
     </div>
     <div class="section_main">
       <router-view></router-view>
@@ -336,6 +345,10 @@ export default {
         this.$route.path.includes("/region/deviceInstallationLog") ||
         this.$route.path.includes("/region/deviceExport")
       );
+    },
+    // 用户权限
+    userPower() {
+      return this.$store.state.userPower;
     }
   },
   methods: {
@@ -348,7 +361,33 @@ export default {
     },
     // 退出到上一级
     exitToPreviousLevel() {
-      this.$router.push("/platform/home");
+      let power = this.userPower;
+      if (power.atype === 1) {
+        if (power.regionids.length === 1) {
+          this.$store.commit("setQuitRegionPower");
+          if (this.$route.path === "/platform/home") {
+            this.$router.go(0);
+          } else {
+            this.$router.push("/platform/home");
+          }
+        } else if (power.regionids.length > 1) {
+          this.$store.commit("setQuitRegionPower");
+          if (this.$route.path === "/region/home") {
+            this.$router.go(0);
+          } else {
+            this.$router.push("/region/home");
+          }
+        }
+      } else if (power.atype === 2) {
+        if (power.regionids.length > 1) {
+          this.$store.commit("setQuitRegionPower");
+          if (this.$route.path === "/region/home") {
+            this.$router.go(0);
+          } else {
+            this.$router.push("/region/home");
+          }
+        }
+      }
     }
   }
 };

src/views/regionSection/regionManage/regionManage.vue

@@ -366,6 +366,11 @@ export default {
     ).content;
     this.searchList();
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   methods: {
     // 获取短信验证码
     getMsgCode() {
@@ -423,10 +428,12 @@ export default {
     // 获取列表
     getList() {
       region_list_qy({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        regionid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
-        regionName: this.searchForm.regionName,
-        regionid: this.userInfo.regionid
+        regionName: this.searchForm.regionName
       }).then((data) => {
         if (data.code === 0) {
           this.searchForm.list = data.obj.data;
@@ -521,7 +528,8 @@ export default {
       });
     },
     // 进入
-    toEnter() {
+    toEnter(row) {
+      this.$store.commit("setEnterRegionPower", row.regionid);
       this.$router.push({
         path: "/region/home",
         query: {}

src/views/regionSection/regionManage/schoolManage.vue

@@ -314,7 +314,7 @@
 </template>
 
 <script>
-import { region_list_sel_pt, region_list_sel_qy } from "@/api/region";
+import { region_list_sel_qy } from "@/api/region";
 import { login_msg_code } from "@/api/login";
 import { generateRandomString } from "@/utils";
 import {
@@ -508,7 +508,11 @@ export default {
     this.getAreaList();
     this.searchList();
   },
-  mounted() {},
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   methods: {
     //选择省份
     provinceChange(id, type) {
@@ -590,11 +594,13 @@ export default {
     // 获取列表
     getList() {
       school_list({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        regionid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
         areaCode: this.searchForm.areaCodes,
-        schoolName: this.searchForm.schoolName,
-        regionid: this.userInfo.regionid
+        schoolName: this.searchForm.schoolName
       }).then((data) => {
         if (data.code === 0) {
           this.searchForm.list = data.obj.data;
@@ -739,6 +745,7 @@ export default {
     },
     // 进入学校
     toSchool(row) {
+      this.$store.commit("setEnterSchoolPower", row.schoolid);
       this.$router.push({
         path: "/school/home",
         query: {}

src/views/schoolSection/applicationManage/greenBrowser.vue

@@ -169,6 +169,11 @@ export default {
   created() {
     this.searchList();
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   methods: {
     // 搜索
     searchList() {
@@ -188,9 +193,10 @@ export default {
     },
     // 获取列表
     getList() {
-      console.warn("---注意替换regionid---schoolid->");
       browser_list({
-        schoolid: 4,
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        schoolid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
         visitName: this.searchForm.visitName
@@ -204,12 +210,11 @@ export default {
       });
     },
     toAdd() {
-      console.warn("---注意替换regionid---schoolid->");
       this.browserInfo = {
         show: true,
         browserid: null,
         rversion: null,
-        schoolid: 4,
+        schoolid: this.powerParams.objectid,
         visitName: null,
         visitUrl: null
       };
@@ -220,6 +225,8 @@ export default {
           this.browserInfo.show = false;
           let api = this.browserInfo.browserid ? browser_edit : browser_add;
           let form = {
+            rtype: this.powerParams.rtype,
+            objectid: this.powerParams.objectid,
             schoolid: this.browserInfo.schoolid,
             visitName: this.browserInfo.visitName,
             visitUrl: this.browserInfo.visitUrl
@@ -240,12 +247,11 @@ export default {
       });
     },
     toEdit(row) {
-      console.warn("---注意替换regionid---schoolid->");
       this.browserInfo = {
         show: true,
         browserid: row.browserid,
         rversion: row.rversion,
-        schoolid: 4,
+        schoolid: this.powerParams.objectid,
         visitName: row.visitName,
         visitUrl: row.visitUrl
       };
@@ -256,6 +262,8 @@ export default {
         content: "您确定删除选中数据吗？",
         onOk: () => {
           browser_delete({
+            rtype: this.powerParams.rtype,
+            objectid: this.powerParams.objectid,
             browserid: row.browserid,
             rversion: row.rversion
           }).then((data) => {

src/views/schoolSection/deviceManage/breakRuleDevice.vue

@@ -155,6 +155,11 @@ export default {
   created() {
     this.searchList();
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   methods: {
     // 搜索
     searchList() {
@@ -176,14 +181,15 @@ export default {
     getList() {
       this.tableSelection = [];
       device_manager_list_vd({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
-        schoolid: 4,
         handled: this.searchForm.handled,
         name: this.searchForm.name
       }).then((data) => {
         if (data.code === 0) {
-          // this.searchForm.list = data.obj.data;
+          this.searchForm.list = data.obj.data;
           this.searchForm.total = data.obj.total;
         } else {
           this.$Message.error(data.msg);

src/views/schoolSection/deviceManage/deviceManage.vue

@@ -204,6 +204,11 @@ export default {
   created() {
     this.getClassList();
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   methods: {
     classChange(classid) {
       this.searchForm.classid = classid;
@@ -227,9 +232,10 @@ export default {
     },
     // 获取班级列表
     getClassList() {
-      console.warn("class_list----");
       class_list({
-        schoolid: 1
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        schoolid: this.powerParams.objectid
       }).then((data) => {
         if (data.code === 0) {
           this.schoolInfo = {
@@ -247,6 +253,8 @@ export default {
     getList() {
       this.tableSelection = [];
       device_manager_list_d({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
         schoolid: this.schoolInfo.schoolid,
@@ -265,6 +273,8 @@ export default {
     // 设备导出
     toDeviceExport() {
       device_manager_export_d({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
         schoolid: this.schoolInfo.schoolid,
         classid: this.searchForm.classid,
         atype: this.searchForm.atype,
@@ -304,6 +314,8 @@ export default {
     // 安装应用导出
     toInstallingAppExport() {
       device_manager_export_id({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
         schoolid: this.schoolInfo.schoolid,
         classid: this.searchForm.classid
       }).then((data) => {

src/views/schoolSection/deviceManage/inLineDevice.vue

@@ -134,6 +134,11 @@ export default {
   created() {
     this.searchList();
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   methods: {
     // 搜索
     searchList() {
@@ -154,9 +159,11 @@ export default {
     // 获取列表
     getList() {
       device_manager_list_od({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
-        schoolid: 4,
+        schoolid: this.powerParams.objectid,
         atype: this.searchForm.atype,
         doEvent: this.searchForm.doEvent,
         name: this.searchForm.name

src/views/schoolSection/deviceManage/outControlDevice.vue

@@ -137,6 +137,11 @@ export default {
   created() {
     this.searchList();
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   methods: {
     // 搜索
     searchList() {
@@ -157,9 +162,11 @@ export default {
     // 获取列表
     getList() {
       device_manager_list_hd({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
-        schoolid: 4,
+        schoolid: this.powerParams.objectid,
         name: this.searchForm.name,
         atype: this.searchForm.atype,
         doEvent: this.searchForm.doEvent,

src/views/schoolSection/deviceManage/removeControlDevice.vue

@@ -112,6 +112,11 @@ export default {
   created() {
     this.searchList();
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   methods: {
     // 搜索
     searchList() {
@@ -132,9 +137,11 @@ export default {
     // 获取列表
     getList() {
       device_manager_list_od({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
-        schoolid: 4,
+        schoolid: this.powerParams.objectid,
         atype: this.searchForm.atype,
         doEvent: this.searchForm.doEvent,
         name: this.searchForm.name

src/views/schoolSection/index.vue

@@ -242,7 +242,15 @@
           <span>公告</span>
         </router-link>
       </div>
-      <div class="out_region" @click="exitToPreviousLevel()">退出学校</div>
+      <div
+        class="out_region"
+        v-if="
+          (userPower.atype === 1 || userPower.atype === 2) && userPower.schoolid
+        "
+        @click="exitToPreviousLevel()"
+      >
+        退出学校
+      </div>
     </div>
     <div class="section_main">
       <router-view></router-view>
@@ -311,6 +319,10 @@ export default {
         this.$route.path.includes("/school/deviceInstallation") ||
         this.$route.path.includes("/school/deviceExport")
       );
+    },
+    // 用户权限
+    userPower() {
+      return this.$store.state.userPower;
     }
   },
   methods: {
@@ -323,7 +335,15 @@ export default {
     },
     // 退出到上一级
     exitToPreviousLevel() {
-      this.$router.push("/region/home");
+      let power = this.userPower;
+      if ((power.atype === 1 || power.atype === 2) && power.schoolid) {
+        this.$store.commit("setQuitSchoolPower");
+        if (this.$route.path === "/region/home") {
+          this.$router.go(0);
+        } else {
+          this.$router.push("/region/home");
+        }
+      }
     }
   }
 };

src/views/schoolSection/log/admin.vue

@@ -96,6 +96,11 @@ export default {
   created() {
     this.searchList();
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   methods: {
     // 搜索
     searchList() {
@@ -119,9 +124,13 @@ export default {
       _begindate = _begindate ? dateFormat(_begindate, "yyyy-MM-dd") : null;
       let _enddate = this.searchForm.dataRange[1];
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
+      let _regionids = this.$store.state.userPower.regionids;
+      _regionids = [..._regionids];
       logOperate_list({
-        regionid: 1,
-        schoolid: 1,
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        regionid: _regionids.pop(),
+        schoolid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
         begindate: _begindate,

src/views/schoolSection/log/appLaunch.vue

@@ -125,6 +125,11 @@ export default {
   created() {
     this.searchList();
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   methods: {
     // 搜索
     searchList() {
@@ -148,9 +153,13 @@ export default {
       _begindate = _begindate ? dateFormat(_begindate, "yyyy-MM-dd") : null;
       let _enddate = this.searchForm.dataRange[1];
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
+      let _regionids = this.$store.state.userPower.regionids;
+      _regionids = [..._regionids];
       logAppStart_list_start({
-        regionid: 1,
-        schoolid: 1,
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        regionid: _regionids.pop(),
+        schoolid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
         begindate: _begindate,

src/views/schoolSection/log/applicationDownload.vue

@@ -116,6 +116,11 @@ export default {
   created() {
     this.searchList();
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   methods: {
     // 搜索
     searchList() {
@@ -139,9 +144,13 @@ export default {
       _begindate = _begindate ? dateFormat(_begindate, "yyyy-MM-dd") : null;
       let _enddate = this.searchForm.dataRange[1];
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
+      let _regionids = this.$store.state.userPower.regionids;
+      _regionids = [..._regionids];
       logAppDown_list({
-        regionid: 1,
-        schoolid: 1,
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        regionid: _regionids.pop(),
+        schoolid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
         begindate: _begindate,

src/views/schoolSection/log/deviceEvents.vue

@@ -154,6 +154,11 @@ export default {
   created() {
     this.searchList();
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   methods: {
     // 搜索
     searchList() {
@@ -177,9 +182,13 @@ export default {
       _begindate = _begindate ? dateFormat(_begindate, "yyyy-MM-dd") : null;
       let _enddate = this.searchForm.dataRange[1];
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
+      let _regionids = this.$store.state.userPower.regionids;
+      _regionids = [..._regionids];
       logdoperate_list_event({
-        regionid: 3,
-        schoolid: 1,
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        regionid: _regionids.pop(),
+        schoolid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
         doEvent: this.searchForm.doEvent,
@@ -200,9 +209,13 @@ export default {
       _begindate = _begindate ? dateFormat(_begindate, "yyyy-MM-dd") : null;
       let _enddate = this.searchForm.dataRange[1];
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
+      let _regionids = this.$store.state.userPower.regionids;
+      _regionids = [..._regionids];
       logdoperate_list_event({
-        regionid: 3,
-        schoolid: 1,
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        regionid: _regionids.pop(),
+        schoolid: this.powerParams.objectid,
         doEvent: this.searchForm.doEvent,
         begindate: _begindate,
         enddate: _enddate,

src/views/schoolSection/log/deviceExport.vue

@@ -126,6 +126,11 @@ export default {
   created() {
     this.searchList();
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   methods: {
     // 搜索
     searchList() {
@@ -145,9 +150,13 @@ export default {
     },
     // 获取列表
     getList() {
+      let _regionids = this.$store.state.userPower.regionids;
+      _regionids = [..._regionids];
       logDeviceBind_list_school({
-        regionid: 1,
-        schoolid: 1,
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        regionid: _regionids.pop(),
+        schoolid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
         name: this.searchForm.name
@@ -161,9 +170,13 @@ export default {
       });
     },
     toExport() {
+      let _regionids = this.$store.state.userPower.regionids;
+      _regionids = [..._regionids];
       logDeviceBind_list_school({
-        regionid: 1,
-        schoolid: 1,
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        regionid: _regionids.pop(),
+        schoolid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
         name: this.searchForm.name

src/views/schoolSection/log/deviceInstallation.vue

@@ -125,6 +125,11 @@ export default {
   created() {
     this.searchList();
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   methods: {
     // 搜索
     searchList() {
@@ -148,9 +153,13 @@ export default {
       _begindate = _begindate ? dateFormat(_begindate, "yyyy-MM-dd") : null;
       let _enddate = this.searchForm.dataRange[1];
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
+      let _regionids = this.$store.state.userPower.regionids;
+      _regionids = [..._regionids];
       logAppStart_list_install({
-        regionid: 1,
-        schoolid: 1,
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        regionid: _regionids.pop(),
+        schoolid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
         begindate: _begindate,
@@ -170,9 +179,13 @@ export default {
       _begindate = _begindate ? dateFormat(_begindate, "yyyy-MM-dd") : null;
       let _enddate = this.searchForm.dataRange[1];
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
+      let _regionids = this.$store.state.userPower.regionids;
+      _regionids = [..._regionids];
       logAppStart_list_install({
-        regionid: 1,
-        schoolid: 1,
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        regionid: _regionids.pop(),
+        schoolid: this.powerParams.objectid,
         begindate: _begindate,
         enddate: _enddate,
         name: this.searchForm.name

src/views/schoolSection/log/deviceLocation.vue

@@ -115,6 +115,11 @@ export default {
   created() {
     this.searchList();
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   methods: {
     // 搜索
     searchList() {
@@ -138,9 +143,13 @@ export default {
       _begindate = _begindate ? dateFormat(_begindate, "yyyy-MM-dd") : null;
       let _enddate = this.searchForm.dataRange[1];
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
+      let _regionids = this.$store.state.userPower.regionids;
+      _regionids = [..._regionids];
       logDeviceLogin_list({
-        regionid: 1,
-        schoolid: 1,
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        regionid: _regionids.pop(),
+        schoolid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
         begindate: _begindate,
@@ -160,7 +169,13 @@ export default {
       _begindate = _begindate ? dateFormat(_begindate, "yyyy-MM-dd") : null;
       let _enddate = this.searchForm.dataRange[1];
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
+      let _regionids = this.$store.state.userPower.regionids;
+      _regionids = [..._regionids];
       logDeviceLogin_list({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        regionid: _regionids.pop(),
+        schoolid: this.powerParams.objectid,
         begindate: _begindate,
         enddate: _enddate,
         name: this.searchForm.name

src/views/schoolSection/log/devicePush.vue

@@ -107,6 +107,11 @@ export default {
   created() {
     this.searchList();
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   methods: {
     // 搜索
     searchList() {
@@ -130,9 +135,13 @@ export default {
       _begindate = _begindate ? dateFormat(_begindate, "yyyy-MM-dd") : null;
       let _enddate = this.searchForm.dataRange[1];
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
+      let _regionids = this.$store.state.userPower.regionids;
+      _regionids = [..._regionids];
       logPush_list({
-        regionid: 1,
-        schoolid: 1,
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        regionid: _regionids.pop(),
+        schoolid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
         begindate: _begindate,

src/views/schoolSection/log/violatingDevice.vue

@@ -201,6 +201,11 @@ export default {
   created() {
     this.searchList();
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   methods: {
     // 搜索
     searchList() {
@@ -224,9 +229,13 @@ export default {
       _begindate = _begindate ? dateFormat(_begindate, "yyyy-MM-dd") : null;
       let _enddate = this.searchForm.dataRange[1];
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
+      let _regionids = this.$store.state.userPower.regionids;
+      _regionids = [..._regionids];
       logdoperate_list_violate({
-        regionid: 1,
-        schoolid: 1,
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        regionid: _regionids.pop(),
+        schoolid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
         doEvent: this.searchForm.doEvent,
@@ -247,9 +256,13 @@ export default {
       _begindate = _begindate ? dateFormat(_begindate, "yyyy-MM-dd") : null;
       let _enddate = this.searchForm.dataRange[1];
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
+      let _regionids = this.$store.state.userPower.regionids;
+      _regionids = [..._regionids];
       logdoperate_list_violate({
-        regionid: 1,
-        schoolid: 1,
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        regionid: _regionids.pop(),
+        schoolid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
         doEvent: this.searchForm.doEvent,

src/views/schoolSection/networkManage/whitelist.vue

@@ -215,6 +215,11 @@ export default {
   created() {
     this.searchList();
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   methods: {
     // 搜索
     searchList() {
@@ -234,9 +239,12 @@ export default {
     },
     // 获取列表
     getList() {
-      console.warn("---注意替换regionid---->white_list");
+      let _regionids = this.$store.state.userPower.regionids;
+      _regionids = [..._regionids];
       white_list({
-        regionid: 11,
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        regionid: _regionids.pop(),
         page: this.searchForm.page,
         size: this.searchForm.size,
         whiteName: this.searchForm.whiteName
@@ -251,7 +259,8 @@ export default {
     },
     // 新建
     toAdd() {
-      console.warn("---注意替换regionid---schoolids->");
+      let _regionids = this.$store.state.userPower.regionids;
+      _regionids = [..._regionids];
       this.whiteListInfo = {
         show: true,
         whiteid: null,
@@ -260,9 +269,9 @@ export default {
         // 1所有学校2指定学校
         targetSchool: 2,
         website: "",
-        regionid: 11,
+        regionid: _regionids.pop(),
         comm: "",
-        schoolids: [4]
+        schoolids: [this.powerParams.objectid]
       };
     },
     // 保存新建
@@ -275,6 +284,8 @@ export default {
               ? white_edit
               : white_add;
           let form = {
+            rtype: this.powerParams.rtype,
+            objectid: this.powerParams.objectid,
             whiteName: this.whiteListInfo.whiteName,
             targetSchool: this.whiteListInfo.targetSchool,
             website: this.whiteListInfo.website,
@@ -310,7 +321,8 @@ export default {
     },
     // 编辑
     toEdit(row) {
-      console.warn("---注意替换regionid-schoolids--->");
+      let _regionids = this.$store.state.userPower.regionids;
+      _regionids = [..._regionids];
       this.whiteListInfo = {
         show: true,
         whiteid: row.whiteid,
@@ -319,9 +331,9 @@ export default {
         // 1所有学校2指定学校
         targetSchool: 2,
         website: row.website,
-        regionid: 11,
+        regionid: _regionids.pop(),
         comm: row.comm,
-        schoolids: [4]
+        schoolids: [this.powerParams.objectid]
       };
     },
     // 删除
@@ -333,6 +345,8 @@ export default {
         }？`,
         onOk: () => {
           white_delete({
+            rtype: this.powerParams.rtype,
+            objectid: this.powerParams.objectid,
             whiteid: row.whiteid,
             rversion: row.rversion
           }).then((data) => {

src/views/schoolSection/networkManage/whitelistLibrary.vue

@@ -108,6 +108,11 @@ export default {
   created() {
     this.searchList();
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   methods: {
     // 搜索
     searchList() {
@@ -128,6 +133,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
@@ -142,14 +149,17 @@ export default {
     },
     // 添加到白名单
     addToWhitelist(row) {
-      console.warn("---注意替换regionid---->whiteLibrary_add_white");
       this.$Modal.confirm({
         title: "提示",
         content: `确定要将“${row.name}”加到白名单？`,
         onOk: () => {
+          let _regionids = this.$store.state.userPower.regionids;
+          _regionids = [..._regionids];
           whiteLibrary_add_white({
+            rtype: this.powerParams.rtype,
+            objectid: this.powerParams.objectid,
             wlid: row.wlid,
-            regionid: 11
+            regionid: _regionids.pop()
           }).then((data) => {
             if (data.code === 0) {
               this.$Message.success(data.msg);

src/views/schoolSection/notice/notice.vue

@@ -131,6 +131,11 @@ export default {
   created() {
     this.searchList();
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   methods: {
     // 搜索
     searchList() {
@@ -155,6 +160,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,
@@ -172,6 +179,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) {

src/views/schoolSection/setting/deviceSetting.vue

@@ -289,6 +289,11 @@ export default {
   created() {
     this.getPswDetail();
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   methods: {
     toChangeMenu(type) {
       this.menuInfo.selected = type;
@@ -299,12 +304,13 @@ export default {
       }
     },
     resetDetail() {
-      console.warn("------schoolid-------");
       if (this.menuInfo.selected === 1) {
         if (!this.menuInfo.pswDetail.pwid) {
           return;
         }
         password_delete({
+          rtype: this.powerParams.rtype,
+          objectid: this.powerParams.objectid,
           pwid: this.menuInfo.pswDetail.pwid,
           rversion: this.menuInfo.pswDetail.rversion
         }).then((data) => {
@@ -320,6 +326,8 @@ export default {
           return;
         }
         deviceSet_delete({
+          rtype: this.powerParams.rtype,
+          objectid: this.powerParams.objectid,
           dsid: this.menuInfo.setDetail.dsid,
           rversion: this.menuInfo.setDetail.rversion
         }).then((data) => {
@@ -333,9 +341,10 @@ export default {
       }
     },
     getPswDetail() {
-      console.warn("------schoolid-------");
       password_detail({
-        schoolid: 4
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        schoolid: this.powerParams.objectid
       }).then((data) => {
         if (data.code === 0) {
           if (data.obj) {
@@ -354,9 +363,10 @@ export default {
       });
     },
     getSetDetail() {
-      console.warn("------schoolid-------");
       deviceSet_detail({
-        schoolid: 4
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        schoolid: this.powerParams.objectid
       }).then((data) => {
         if (data.code === 0) {
           if (data.obj) {
@@ -405,9 +415,10 @@ export default {
       }
     },
     savePswDetail() {
-      console.warn("------schoolid-------");
       password_edit({
-        schoolid: 4,
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        schoolid: this.powerParams.objectid,
         trend: this.menuInfo.pswDetail.trend,
         password: this.menuInfo.pswDetail.password,
         pwid: this.menuInfo.pswDetail.pwid,
@@ -422,9 +433,10 @@ export default {
       });
     },
     saveSetDetail() {
-      console.warn("------schoolid-------");
       deviceSet_edit({
-        schoolid: 4,
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        schoolid: this.powerParams.objectid,
         dsid: this.menuInfo.setDetail.dsid,
         rversion: this.menuInfo.setDetail.rversion,
         forceBind: this.menuInfo.setDetail.forceBind,

src/views/schoolSection/setting/logo.vue

@@ -55,11 +55,16 @@ export default {
   created() {
     this.getLogoDetail();
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   methods: {
     getLogoDetail() {
-      console.warn("----objectid----");
       logo_detail({
-        objectid: 4,
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
         llevel: 3
       }).then((data) => {
         if (data.code === 0) {
@@ -75,6 +80,8 @@ export default {
         return;
       }
       logo_delete({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
         logoid: this.logoInfo.logoid,
         rversion: this.logoInfo.rversion
       }).then((data) => {
@@ -128,11 +135,11 @@ export default {
         });
     },
     toUploadLogo() {
-      console.warn("----objectid----");
       logo_edit({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
         logoPath: this.logoInfo.logoPath,
-        llevel: this.logoInfo.llevel || 3,
-        objectid: this.logoInfo.objectid || 4,
+        llevel: 3,
         logoid: this.logoInfo.logoid,
         rversion: this.logoInfo.rversion
       }).then((data) => {

src/views/schoolSection/setting/wallpaper.vue

@@ -387,6 +387,11 @@ export default {
     ).content;
     this.searchList();
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   methods: {
     // 搜索
     searchList() {
@@ -406,13 +411,16 @@ export default {
     },
     // 获取列表
     getList() {
-      console.warn("---注意替换regionid--schoolid-->wallpaper_list");
+      let _regionids = this.$store.state.userPower.regionids;
+      _regionids = [..._regionids];
       wallpaper_list({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        schoolid: this.powerParams.objectid,
+        regionid: _regionids.pop(),
         page: this.searchForm.page,
         size: this.searchForm.size,
-        name: this.searchForm.name,
-        regionid: 11,
-        schoolid: 4
+        name: this.searchForm.name
       }).then((data) => {
         if (data.code === 0) {
           this.searchForm.list = data.obj.data;
@@ -424,7 +432,6 @@ export default {
     },
     // 新建
     toAdd() {
-      console.warn("---objectid---->", 4);
       this.wallpaperInfo = {
         show: true,
         wallpaperid: null,
@@ -437,7 +444,7 @@ export default {
         // 2区域3学校
         wlevel: 3,
         // 对应的区域/学校ID
-        objectid: 4,
+        objectid: this.powerParams.objectid,
         deviceids: [],
         deviceList: []
       };
@@ -598,11 +605,12 @@ export default {
           }
           this.wallpaperInfo.show = false;
           let form = {
+            rtype: this.powerParams.rtype,
+            objectid: this.powerParams.objectid,
             wname: this.wallpaperInfo.wname,
             hpath: this.wallpaperInfo.hpath,
             vpath: this.wallpaperInfo.vpath,
             wlevel: this.wallpaperInfo.wlevel,
-            objectid: this.wallpaperInfo.objectid,
             deviceids: this.wallpaperInfo.deviceids
           };
           if (this.wallpaperInfo.wallpaperid && this.wallpaperInfo.rversion) {
@@ -684,7 +692,11 @@ export default {
     },
     getWallpaperDetail(wallpaperid) {
       return new Promise((resolve) => {
-        wallpaper_detail({ wallpaperid }).then((data) => {
+        wallpaper_detail({
+          rtype: this.powerParams.rtype,
+          objectid: this.powerParams.objectid,
+          wallpaperid
+        }).then((data) => {
           if (data.code === 0) {
             resolve(data.obj);
           } else {
@@ -701,6 +713,8 @@ export default {
         content: "您确定删除选中数据吗？",
         onOk: () => {
           wallpaper_delete({
+            rtype: this.powerParams.rtype,
+            objectid: this.powerParams.objectid,
             wallpaperid: row.wallpaperid,
             rversion: row.rversion
           }).then((data) => {