跳转旧平台入口权限设置，集团管理员账号搜索问题，设备状态导出功能

梁保满
1 parent 7be21664
Showing 3 changed files with 9 additions and 5 deletions
src/views/analysis/index.vue
src/views/layout/header/header.vue
src/views/setUp/account.vue
@@ -204,7 +204,7 @@ export default {
       this.exportLoading = true;
  
       const exportUsageAnalysis = this.role != "ROLE_JITUAN"?this.$request.exportUsageAnalysis:
-      this.type ==1?this.$request.exportSchoolContrast:this.$request.exportGradeContrast
+      this.$request.exportSchoolContrast
       const data = await exportUsageAnalysis({ ...query });
       this.exportLoading = false;
       if (data) {
@@ -96,9 +96,13 @@ export default {
   },
   created() {
     this.code = localStorage.getItem("csCode") || "";
-    this.role = this.$store.getters.info.permissions.find(
-      (item) => item.roleName == this.$store.getters.info.showRoleName
-    )?.role;
+    let role = "";
+    this.$store.getters.info.permissions.map((item) => {
+      if (item.roleName == this.$store.getters.info.showRoleName) {
+        role = item.role;
+      }
+    });
+    this.role = role ? role : this.$store.getters.info.permissions[0].role;
     this.isCollapse = this.$store.getters.isCollapse;
   },
   methods: {
@@ -115,7 +115,7 @@
           v-if="role == 'ROLE_JITUAN'"
           type="primary"
           round
-          @click="_QueryData(4)"
+          @click="(page = 1), _QueryData(4)"
           >筛选</el-button
         >
       </div>