下载模板跨域，集团管理员选择角色范围，登出缓存问题

梁保满
1 parent 8a092267
Showing 9 changed files with 56 additions and 33 deletions
src/api/axios.js
src/store/index.js
src/views/layout/header/header.vue
src/views/personal/setUp/student.vue
src/views/standard/device/index.vue
src/views/standard/setUp/account.vue
src/views/standard/setUp/student.vue
src/views/standard/setUp/teacher.vue
vue.config.js
@@ -81,7 +81,7 @@ service.interceptors.response.use(
           });
           router.push({ path: "/login" });
         }
-        return
+        return Promise.resolve(data); 
       }
       Message.closeAll();
       Message({
@@ -112,15 +112,15 @@ const store = new Vuex.Store({
                 duration: 3 * 1000,
               });
             }
-          } else {
-            Message({
-              message: response.info,
-              type: "error",
-              duration: 3 * 1000,
-            });
           }
         })
-        .catch(() => { });
+        .catch((err) => {
+          Message({
+            message: err,
+            type: "error",
+            duration: 3 * 1000,
+          });
+        });
     },
     CSLogin({ state, commit }, code) {
       request
@@ -303,8 +303,8 @@ export default {
         } else {
           localStorage.setItem("token", "");
           this.$store.commit("setToken", "");
-          this.$store.commit("setInfo", {});
-          this.$store.commit("setRouters", []);
+          this.$store.commit("setInfo", "");
+          this.$store.commit("setRouters", "");
           this.$store.commit("resetTabnavBox");
           this.$router.push({
             path: "/login",
@@ -450,9 +450,11 @@ export default {
       let { data, info, status } = await this.$request.studentTemplateUrl();
       this.loadingDown = false;
       if (status == 0) {
-        getBlob(data.downloadUrl).then((res) => {
-          downloadFile("学生模板", res);
-        });
+        const a = document.createElement("a");
+        a.href = data.downloadUrl;
+        document.body.appendChild(a);
+        a.click();
+        a.remove();
       } else {
         this.$message.error(info);
       }
@@ -803,9 +803,11 @@ export default {
         id: this.id,
       });
       if (status == 0) {
-        getBlob(data.downloadUrl).then((res) => {
-          downloadFile("基站模版", res);
-        });
+        const a = document.createElement("a");
+        a.href = data.downloadUrl;
+        document.body.appendChild(a);
+        a.click();
+        a.remove();
       } else {
         this.$message.error(info);
       }
@@ -305,11 +305,13 @@
         </el-form-item>
         <el-form-item
           label="选择管辖范围："
-          :prop="formAddCount.roleId == 3 ? 'regionId' : 'schoolId'"
+          :prop="
+            permissionLevel(formAddCount.roleId) == 5 ? 'regionId' : 'schoolId'
+          "
         >
           <el-col :span="12">
             <el-select
-              v-show="formAddCount.roleId == 3"
+              v-show="permissionLevel(formAddCount.roleId) == 5"
               class="sel"
               v-model="formAddCount.regionId"
               placeholder="选择管辖范围"
@@ -322,7 +324,7 @@
               ></el-option>
             </el-select>
             <el-select
-              v-show="formAddCount.roleId == 4"
+              v-show="permissionLevel(formAddCount.roleId) == 4"
               class="sel"
               v-model="formAddCount.schoolId"
               placeholder="选择管辖范围"
@@ -429,7 +431,9 @@ export default {
   },
   created() {
     this.code = localStorage.getItem("csCode") || "";
-    this.role = this.$store.getters.info.showRole || this.$store.getters.info.permissions[0].role;
+    this.role =
+      this.$store.getters.info.showRole ||
+      this.$store.getters.info.permissions[0].role;
     if (this.role == "ROLE_JITUAN") {
       this._TenantRoleList();
       this._RegionList();
@@ -440,6 +444,15 @@ export default {
     this._QueryData(4);
   },
   methods: {
+    permissionLevel(id) {
+      let permissionLevel;
+      this.tenantRoleList.map((item) => {
+        if (item.id == id) {
+          permissionLevel = item.permissionLevel;
+        }
+      });
+      return permissionLevel;
+    },
     async refreshAcc() {
       //长水账号同步
       if (this.syncLoading) return;
@@ -449,7 +462,6 @@ export default {
       if (status === 0) {
         this.$message.success("同步中，请稍后刷新重试～");
         // this._QueryData(4);
-
       } else {
         this.$message.error(info);
       }
@@ -461,7 +473,7 @@ export default {
         showClose: true,
         message: `成功（${res.data.success}）`,
         type: "success",
-        duration:5000
+        duration: 5000,
       });
       this.diaUp = false;
       this._QueryData(4);
@@ -288,7 +288,9 @@ export default {
   },
   async created() {
     this.code = localStorage.getItem("csCode") || "";
-    this.role = this.$store.getters.info.showRole || this.$store.getters.info.permissions[0].role;
+    this.role =
+      this.$store.getters.info.showRole ||
+      this.$store.getters.info.permissions[0].role;
     await this._QueryDataGrade();
     await this._QueryClass();
     this._QueryData(3);
@@ -341,7 +343,7 @@ export default {
         showClose: true,
         message: `成功（${res.data.success}）`,
         type: "success",
-        duration:5000
+        duration: 5000,
       });
       //导入成功
       this.diaUp = false;
@@ -457,15 +459,17 @@ export default {
         this.$message.error(info);
       }
     },
-     async downExcel() {
+    async downExcel() {
       this.loadingDown = true;
       let { data, info, status } =
         await this.$request.studentClickerTemplateUrl();
       this.loadingDown = false;
       if (status == 0) {
-        getBlob(data.downloadUrl).then((res) => {
-          downloadFile("学生答题器绑定模板", res);
-        });
+        const a = document.createElement("a");
+        a.href = data.downloadUrl;
+        document.body.appendChild(a);
+        a.click();
+        a.remove();
       } else {
         this.$message.error(info);
       }
@@ -448,7 +448,7 @@ export default {
         showClose: true,
         message: `成功（${res.data.success}）`,
         type: "success",
-        duration:5000
+        duration: 5000,
       });
       this.diaUp = false;
       this._QueryData(10);
@@ -783,9 +783,11 @@ export default {
       let { data, status, info } = await this.$request.teacherTemplate();
       debugger;
       if (status == 0) {
-        getBlob(data.downloadUrl).then((res) => {
-          downloadFile("教师名单模板", res);
-        });
+        const a = document.createElement("a");
+        a.href = data.downloadUrl;
+        document.body.appendChild(a);
+        a.click();
+        a.remove();
       } else {
         this.$message.error(info);
       }
@@ -22,7 +22,8 @@ module.exports = {
     },
     proxy: {
       "/": {
-        target:"http://121.40.127.171",
+        // target:"http://121.40.127.171",
+        target:"http://ezquiz.sunvotecloud.cn",
         changeOrigin: true,
         ws:true,
       },