Commit 189da653a577dae2f57a507c909fab3097c94231
1 parent
7be21664
跳转旧平台入口权限设置,集团管理员账号搜索问题,设备状态导出功能
Showing
3 changed files
with
9 additions
and
5 deletions
src/views/analysis/index.vue
@@ -204,7 +204,7 @@ export default { | @@ -204,7 +204,7 @@ export default { | ||
204 | this.exportLoading = true; | 204 | this.exportLoading = true; |
205 | 205 | ||
206 | const exportUsageAnalysis = this.role != "ROLE_JITUAN"?this.$request.exportUsageAnalysis: | 206 | const exportUsageAnalysis = this.role != "ROLE_JITUAN"?this.$request.exportUsageAnalysis: |
207 | - this.type ==1?this.$request.exportSchoolContrast:this.$request.exportGradeContrast | 207 | + this.$request.exportSchoolContrast |
208 | const data = await exportUsageAnalysis({ ...query }); | 208 | const data = await exportUsageAnalysis({ ...query }); |
209 | this.exportLoading = false; | 209 | this.exportLoading = false; |
210 | if (data) { | 210 | if (data) { |
src/views/layout/header/header.vue
@@ -96,9 +96,13 @@ export default { | @@ -96,9 +96,13 @@ export default { | ||
96 | }, | 96 | }, |
97 | created() { | 97 | created() { |
98 | this.code = localStorage.getItem("csCode") || ""; | 98 | this.code = localStorage.getItem("csCode") || ""; |
99 | - this.role = this.$store.getters.info.permissions.find( | ||
100 | - (item) => item.roleName == this.$store.getters.info.showRoleName | ||
101 | - )?.role; | 99 | + let role = ""; |
100 | + this.$store.getters.info.permissions.map((item) => { | ||
101 | + if (item.roleName == this.$store.getters.info.showRoleName) { | ||
102 | + role = item.role; | ||
103 | + } | ||
104 | + }); | ||
105 | + this.role = role ? role : this.$store.getters.info.permissions[0].role; | ||
102 | this.isCollapse = this.$store.getters.isCollapse; | 106 | this.isCollapse = this.$store.getters.isCollapse; |
103 | }, | 107 | }, |
104 | methods: { | 108 | methods: { |
src/views/setUp/account.vue
@@ -115,7 +115,7 @@ | @@ -115,7 +115,7 @@ | ||
115 | v-if="role == 'ROLE_JITUAN'" | 115 | v-if="role == 'ROLE_JITUAN'" |
116 | type="primary" | 116 | type="primary" |
117 | round | 117 | round |
118 | - @click="_QueryData(4)" | 118 | + @click="(page = 1), _QueryData(4)" |
119 | >筛选</el-button | 119 | >筛选</el-button |
120 | > | 120 | > |
121 | </div> | 121 | </div> |