diff --git a/src/api/apis/apis.js b/src/api/apis/apis.js
index 8bcc268..be2452f 100644
--- a/src/api/apis/apis.js
+++ b/src/api/apis/apis.js
@@ -490,6 +490,7 @@ export default {
       url: setUpUrls.teacherTemplate,
       method: "POST",
       data,
+      responseType: 'arraybuffer',
     });
   },
   //  教师导出
@@ -694,6 +695,15 @@ export default {
       data,
     });
   },
+  //  发卡数据导出
+  exportClickersLog(data) {
+    return service({
+      url: setUpUrls.exportClickersLog,
+      method: "POST",
+      data,
+      responseType: 'arraybuffer',
+    });
+  },
 
   /**
    * 集团管理员-学校管理
diff --git a/src/api/urls/apis.js b/src/api/urls/apis.js
index 97583b7..a8eb3ef 100644
--- a/src/api/urls/apis.js
+++ b/src/api/urls/apis.js
@@ -172,6 +172,8 @@ export default {
   exportUsageAnalysis: "/api_html/school/manager/exportUsageAnalysis",
   // 发卡应用下载
   latestClickersApp: "/api_html/school/manager/latestClickersApp",
+  // 发卡导出
+  exportClickersLog: "/api_html/school/manager/exportClickersLog",
 
 
   // 查询区域列表
diff --git a/src/assets/nav/setUpConglomerate.png b/src/assets/nav/setUpConglomerate.png
index 615c6cc..618d034 100644
--- a/src/assets/nav/setUpConglomerate.png
+++ b/src/assets/nav/setUpConglomerate.png
diff --git a/src/views/index/mainIndex.vue b/src/views/index/mainIndex.vue
index 5e8f3ee..0fbbd39 100644
--- a/src/views/index/mainIndex.vue
+++ b/src/views/index/mainIndex.vue
@@ -117,6 +117,10 @@
             <p class="p1">使用分析</p>
             <p class="p2">按学校、学段统计使用频率。</p>
           </div>
+          <div class="text" v-else-if="item.path == '/card'">
+            <p class="p1">发卡记录</p>
+            <p class="p2">查看发卡、换卡记录信息。</p>
+          </div>
         </li>
       </template>
     </ul>
@@ -157,78 +161,77 @@
         </li>
       </template>
     </ul>
-     <ul class="nav-list" v-if="type == 'ROLE_PERSONAL'">
-        <li class="nav-item item1" @click="links('/examinationPaper')">
-          <img class="icon" src="../../assets/nav/setUpAccount.png" alt="" />
-          <div class="text">
-            <p class="p1">备题组卷</p>
-            <p class="p2" v-if="dataInfo.paperCount">
-              管理 {{ dataInfo.paperCount }}套答题卡，
-            </p>
-          </div>
-        </li>
-        <li class="nav-item item1" @click="links('/setUpStudent')">
-          <img class="icon" src="../../assets/nav/setUpSchool.png" alt="" />
-          <div class="text">
-            <p class="p1">班级名单</p>
-            <p class="p2" v-if="dataInfo.classCount">
-              管理{{ dataInfo.classCount }}个班级的学生名单，
-            </p>
-          </div>
-        </li>
-        <li class="nav-item item2" @click="links('/portrait')">
-          <img class="icon" src="../../assets/nav/device.png" alt="" />
+    <ul class="nav-list" v-if="type == 'ROLE_PERSONAL'">
+      <li class="nav-item item1" @click="links('/examinationPaper')">
+        <img class="icon" src="../../assets/nav/setUpAccount.png" alt="" />
+        <div class="text">
+          <p class="p1">备题组卷</p>
+          <p class="p2" v-if="dataInfo.paperCount">
+            管理 {{ dataInfo.paperCount }}套答题卡，
+          </p>
+        </div>
+      </li>
+      <li class="nav-item item1" @click="links('/setUpStudent')">
+        <img class="icon" src="../../assets/nav/setUpSchool.png" alt="" />
+        <div class="text">
+          <p class="p1">班级名单</p>
+          <p class="p2" v-if="dataInfo.classCount">
+            管理{{ dataInfo.classCount }}个班级的学生名单，
+          </p>
+        </div>
+      </li>
+      <li class="nav-item item2" @click="links('/portrait')">
+        <img class="icon" src="../../assets/nav/device.png" alt="" />
+        <div class="text">
+          <p class="p1">学生画像</p>
+          <p class="p2" v-if="dataInfo.stationCount">
+            共分析{{ dataInfo.stationCount }}名学生成绩
+          </p>
+        </div>
+      </li>
+      <li class="item3">
+        <div class="nav-item item1 item-child2" @click="links('/ask')">
+          <img class="icon" src="../../assets/nav/card.png" alt="" />
+          <p class="p1">随堂问报表</p>
+          <p class="p2" v-if="dataInfo.classPeriodCount">
+            对{{ dataInfo.classPeriodCount }}套随堂问答题记录分析
+          </p>
+        </div>
+        <div class="nav-item item1 item-child3" @click="links('/test')">
+          <img class="icon" src="../../assets/nav/analysis.png" alt="" />
+          <p class="p1">即时测报表</p>
+          <p class="p2" v-if="dataInfo.examCount">
+            对{{ dataInfo.examCount }}套即时测答题记录分析
+          </p>
+        </div>
+        <div class="nav-item item1 item-child1" @click="links('/down')">
+          <img class="icon" src="../../assets/nav/down.png" alt="" />
           <div class="text">
-            <p class="p1">学生画像</p>
-            <p class="p2" v-if="dataInfo.stationCount">
-              共分析{{ dataInfo.stationCount }}名学生成绩
-            </p>
-          </div>
-        </li>
-        <li class="item3">
-          <div class="nav-item item1 item-child2" @click="links('/ask')">
-            <img class="icon" src="../../assets/nav/card.png" alt="" />
-            <p class="p1">随堂问报表</p>
-            <p class="p2" v-if="dataInfo.classPeriodCount">
-              对{{ dataInfo.classPeriodCount }}套随堂问答题记录分析
-            </p>
-          </div>
-          <div class="nav-item item1 item-child3" @click="links('/test')">
-            <img class="icon" src="../../assets/nav/analysis.png" alt="" />
-            <p class="p1">即时测报表</p>
-            <p class="p2" v-if="dataInfo.examCount">
-              对{{ dataInfo.examCount }}套即时测答题记录分析
-            </p>
+            <p class="p1">软件下载</p>
+            <p class="p2">授课端软件最新版本1.2.0。</p>
           </div>
-          <div class="nav-item item1 item-child1" @click="links('/down')">
-            <img class="icon" src="../../assets/nav/down.png" alt="" />
-            <div class="text">
-              <p class="p1">软件下载</p>
-              <p class="p2">授课端软件最新版本1.2.0。</p>
-            </div>
-          </div>
-        </li>
-      
+        </div>
+      </li>
     </ul>
     <ul class="nav-list" v-if="type == 'ROLE_PINGTAI'">
-        <li class="nav-item item1" @click="links('/account')">
-          <img class="icon" src="../../assets/nav/setUpAccount.png" alt="" />
-          <div class="text">
-            <p class="p1">账号管理</p>
-          </div>
-        </li>
-        <li class="nav-item item1" @click="links('/device')">
-          <img class="icon" src="../../assets/nav/device.png" alt="" />
-          <div class="text">
-            <p class="p1">设备管理</p>
-          </div>
-        </li>
-        <li class="nav-item item2" @click="links('/clientVersion')">
-          <img class="icon" src="../../assets/nav/down.png" alt="" />
-          <div class="text">
-            <p class="p1">授课端版本管理</p>
-          </div>
-        </li>
+      <li class="nav-item item1" @click="links('/account')">
+        <img class="icon" src="../../assets/nav/setUpAccount.png" alt="" />
+        <div class="text">
+          <p class="p1">账号管理</p>
+        </div>
+      </li>
+      <li class="nav-item item1" @click="links('/device')">
+        <img class="icon" src="../../assets/nav/device.png" alt="" />
+        <div class="text">
+          <p class="p1">设备管理</p>
+        </div>
+      </li>
+      <li class="nav-item item2" @click="links('/clientVersion')">
+        <img class="icon" src="../../assets/nav/down.png" alt="" />
+        <div class="text">
+          <p class="p1">授课端版本管理</p>
+        </div>
+      </li>
     </ul>
   </div>
 </template>
@@ -241,12 +244,12 @@ export default {
       type: "",
       navList: [],
       dataInfo: {},
-      code:""
+      code: "",
     };
   },
   watch: {
     "$store.getters.info.showRoleName": function (val) {
-      this._Init(val)
+      this._Init(val);
       this._QueryData();
     },
   },
@@ -265,7 +268,9 @@ export default {
       });
     },
     _Init(val) {
-      this.type = this.$store.getters.info.showRole || this.$store.getters.info.permissions[0].role;
+      this.type =
+        this.$store.getters.info.showRole ||
+        this.$store.getters.info.permissions[0].role;
       this.navList = this.$store.getters.addRouters.map((item) => {
         return {
           name: item.name,
@@ -318,7 +323,7 @@ export default {
         this.$message.error(info);
       }
     },
-     async personalIndex() {
+    async personalIndex() {
       const { data, status, info } = await this.$request.personalIndex();
       if (status === 0) {
         this.dataInfo = { ...data };
@@ -404,7 +409,7 @@ export default {
         height: calc(50% - 8px);
         flex-wrap: wrap;
         padding: 12px 0 12px 30px;
-        margin-right:20px;
+        margin-right: 20px;
         .icon {
           width: 60px;
           height: 60px;
@@ -466,7 +471,6 @@ export default {
       height: 240px;
       display: flex;
       flex-wrap: wrap;
-
     }
     .item4 {
       width: calc(50% - 10px);
diff --git a/src/views/standard/card/index.vue b/src/views/standard/card/index.vue
index 2a09e0e..14944fb 100644
--- a/src/views/standard/card/index.vue
+++ b/src/views/standard/card/index.vue
@@ -8,7 +8,7 @@
 
     <div class="page-content">
       <div class="answer-header">
-        <div class="sel-box">
+        <div class="sel-box" v-if="role == 'ROLE_XUEXIAO'">
           <el-cascader
             @change="_QueryData(1)"
             size="small"
@@ -48,6 +48,22 @@
             >筛选</el-button
           >
         </div>
+        <div class="sel-box" v-if="role == 'ROLE_JITUAN'">
+          <el-select
+            class="sel2"
+            v-model="schoolId"
+            placeholder="选择学校"
+            @change="_QueryData(true)"
+          >
+            <el-option
+              v-for="item in schoolList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </div>
       </div>
       <el-empty
         :image-size="100"
@@ -113,14 +129,26 @@
           </el-pagination>
         </div>
       </div>
+      <p class="down" v-if="tableData.length">
+        <el-button
+          type="primary"
+          plain
+          round
+          icon="fa fa-cloud-download"
+          @click="downExl"
+          >导出报表</el-button
+        >
+      </p>
     </div>
   </div>
 </template>
 
 <script>
+import { downloadFile } from "utils";
 export default {
   data() {
     return {
+      role: "",
       loading: false,
       props: { multiple: false },
       query: {
@@ -128,6 +156,8 @@ export default {
         studentName: "",
         studentCode: "",
       },
+      schoolId: "",
+      schoolList: [],
       gradeList: [],
       tableData: [],
       page: 1,
@@ -135,8 +165,17 @@ export default {
       total: 0,
     };
   },
-  created() {
-    this._QueryGradeList();
+  async created() {
+    this.role =
+      this.$store.getters.info.showRole ||
+      this.$store.getters.info.permissions[0].role;
+    this.loading = true;
+    if (this.role == "ROLE_XUEXIAO") {
+      this._QueryGradeList();
+    } else if (this.role == "ROLE_JITUAN") {
+      await this._QuerySchool();
+    }
+
     this._QueryData();
   },
   methods: {
@@ -171,23 +210,42 @@ export default {
       this.page = page;
       this._QueryData(4);
     },
+    async _QuerySchool() {
+      const { data, status, info } = await this.$request.schoolList();
+      if (status === 0) {
+        this.schoolList =
+          data.list?.map((item) => {
+            return {
+              label: item.schoolName,
+              value: item.id,
+            };
+          }) || [];
+        this.schoolId = (this.schoolList && this.schoolList[0].value) || "";
+      } else {
+        this.$message.error(info);
+      }
+    },
     async _QueryData(type) {
       let query = {};
-      query.gradeName = this.query.gradeName;
-      if (type == 1) {
-        query.classId = this.query.classId[1] ? this.query.classId[1] : "";
-        this.query.studentCode = "";
-        this.query.studentName = "";
-      } else if (type == 2) {
-        query.studentName = this.query.studentName;
-        this.query.classId = "";
-        this.query.studentCode = "";
-      } else if (type == 3) {
-        query.studentCode = this.query.studentCode;
-        this.query.classId = "";
-        this.query.studentName = "";
-      } else {
-        query = { ...this.query };
+      if (this.role == "ROLE_XUEXIAO") {
+        query.gradeName = this.query.gradeName;
+        if (type == 1) {
+          query.classId = this.query.classId[1] ? this.query.classId[1] : "";
+          this.query.studentCode = "";
+          this.query.studentName = "";
+        } else if (type == 2) {
+          query.studentName = this.query.studentName;
+          this.query.classId = "";
+          this.query.studentCode = "";
+        } else if (type == 3) {
+          query.studentCode = this.query.studentCode;
+          this.query.classId = "";
+          this.query.studentName = "";
+        } else {
+          query = { ...this.query };
+        }
+      } else if (this.role == "ROLE_JITUAN") {
+        query.schoolId = this.schoolId;
       }
       this.loading = true;
       const { data, status, info } = await this.$request.cardList({
@@ -204,6 +262,28 @@ export default {
         this.$message.error(info);
       }
     },
+    async downExl() {
+      //报表导出
+      if (this.exportLoading == true) return;
+      let query = {};
+      if (this.role == "ROLE_XUEXIAO") {
+        query = { ...this.query };
+      } else if (this.role == "ROLE_JITUAN") {
+        query.schoolId = this.schoolId;
+      }
+
+      this.exportLoading = true;
+      const data = await this.$request.exportClickersLog({ ...query });
+      this.exportLoading = false;
+      if (data) {
+        let blob = new Blob([data], {
+          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+        });
+        downloadFile("发卡记录.xlsx", blob);
+      } else {
+        this.$message.error("下载失败");
+      }
+    },
   },
 };
 </script>
@@ -212,4 +292,10 @@ export default {
 .table-box {
   padding: 0 20px;
 }
+.down {
+  padding: 16px 20px;
+}
+.answer-header .sel-box .sel2 {
+  width: 300px;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/standard/setUp/teacher.vue b/src/views/standard/setUp/teacher.vue
index 1ad3687..1c216c9 100644
--- a/src/views/standard/setUp/teacher.vue
+++ b/src/views/standard/setUp/teacher.vue
@@ -773,15 +773,13 @@ export default {
     },
     async downExcel() {
       let { data, status, info } = await this.$request.teacherTemplate();
-      debugger;
-      if (status == 0) {
-        const a = document.createElement("a");
-        a.href = data.downloadUrl;
-        document.body.appendChild(a);
-        a.click();
-        a.remove();
+      if (data && !data.code) {
+        let blob = new Blob([data], {
+          type: "application/vnd.ms-excel;charset=utf-8",
+        });
+        downloadFile(`教师名单模版.xlsx`, blob);
       } else {
-        this.$message.error(info);
+        this.$message.error(data.info);
       }
     },
     async exportTeacherExl() {
@@ -814,6 +812,13 @@ export default {
   .teacher-ul {
     max-height: 60vh;
     overflow-y: scroll;
+    &::-webkit-scrollbar {
+      width: 6px;
+    }
+    &::-webkit-scrollbar-thumb {
+      border-radius: 10px;
+      background-color: #ccc;
+    }
   }
   .teacher-list {
     width: 240px;
@@ -822,7 +827,7 @@ export default {
       height: 40px;
       line-height: 40px;
       background: #eee;
-      border-radius: 10px 10px 0 0;
+      // border-radius: 10px 10px 0 0;
     }
     .teacher-item {
       font-size: 16px;
@@ -843,6 +848,7 @@ export default {
   .teacher-detail {
     flex: 1;
     position: relative;
+    padding-left: 10px;
     .icon-box {
       position: absolute;
       top: 12px;
diff --git a/src/views/standard/test/index.vue b/src/views/standard/test/index.vue
index 5f894ad..e65176d 100644
--- a/src/views/standard/test/index.vue
+++ b/src/views/standard/test/index.vue
@@ -572,6 +572,7 @@ export default {
       });
     },
     toPortrait(obj) {
+      //暂时不上线
       return
       if (this.$store.getters.code) {
         return;