diff --git a/src/api/apis/apis.js b/src/api/apis/apis.js
index f561bb4..2e00b37 100644
--- a/src/api/apis/apis.js
+++ b/src/api/apis/apis.js
@@ -235,5 +235,13 @@ export default {
       data
     })
   },
+  //  发卡记录
+  cardList(data) {
+    return service({
+      url: setUpUrls.cardList,
+      method: 'POST',
+      data
+    })
+  },
   
 }
diff --git a/src/api/urls/apis.js b/src/api/urls/apis.js
index 75d57d8..6b5ef80 100644
--- a/src/api/urls/apis.js
+++ b/src/api/urls/apis.js
@@ -58,4 +58,6 @@ export default {
   addAppConfig: "/api_html/school/manager/addAppConfig",
   //    修改授课端应用配置
   updateAppConfig: "/api_html/school/manager/updateAppConfig",
+  // 发卡记录
+  cardList: "/api_html/school/manager/cardList",
 }
diff --git a/src/views/analysis/index.vue b/src/views/analysis/index.vue
index 217956a..6994152 100644
--- a/src/views/analysis/index.vue
+++ b/src/views/analysis/index.vue
@@ -1,13 +1,289 @@
 <template>
-  <div>使用分析</div>
+  <div>
+    <back-box>
+      <template slot="title">
+        <span>使用分析</span>
+      </template>
+    </back-box>
+    <div class="page-content">
+      <div class="answer-header">
+        <div class="sel-box">
+          <el-select
+            class="sel"
+            v-model="query.gradeName"
+            placeholder="选择年级"
+            @change="_QueryData(1)"
+          >
+            <el-option
+              v-for="item in gradeList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+          <div class="d1">
+            <el-date-picker
+              v-model="query.startDay"
+              type="date"
+              @change="handleChangeTimeStart"
+              placeholder="选择日期时间"
+              value-format="yyyy-MM-dd"
+            >
+            </el-date-picker>
+            ~
+            <el-date-picker
+              v-model="query.endDay"
+              type="date"
+              placeholder="选择日期时间"
+              @change="handleChangeTimeEnd"
+              value-format="yyyy-MM-dd"
+            >
+            </el-date-picker>
+          </div>
+          <p class="p1">
+            <span @click="setDate(1)" :class="[date == 1 ? 'active' : '', 's1']"
+              >今天</span
+            >
+            <span @click="setDate(2)" :class="[date == 2 ? 'active' : '', 's1']"
+              >本周</span
+            >
+            <span @click="setDate(3)" :class="[date == 3 ? 'active' : '', 's1']"
+              >本月</span
+            >
+            <span @click="setDate(4)" :class="[date == 4 ? 'active' : '', 's1']"
+              >本季度</span
+            >
+          </p>
+          <el-button type="primary" round @click="_QueryData()">筛选</el-button>
+        </div>
+      </div>
+      <div class="table-box">
+        <div class="radio-box" v-if="this.$store.getters.info.showRoleName == '集团管理员'">
+          <el-radio-group v-model="type" @change="changeType">
+          <el-radio-button :label="1">学校使用对比</el-radio-button>
+          <el-radio-button :label="2">学段使用对比</el-radio-button>
+        </el-radio-group>
+        </div>
+        <el-table
+          :data="tableData"
+          :border="false"
+          style="width: 100%"
+          show-summary
+        >
+          <el-table-column align="center" label="科目" prop="sub">
+          </el-table-column>
+          <el-table-column
+            align="center"
+            v-for="(item, index) in dataList"
+            :key="index"
+            :label="item.name"
+          >
+            <template>
+              <el-table-column
+                :prop="'keshi' + index"
+                label="课时数"
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                :prop="'celian' + index"
+                label="测练数"
+                align="center"
+              ></el-table-column>
+            </template>
+          </el-table-column>
+        </el-table>
+        <p
+          class="down"
+          v-if="this.$store.getters.info.showRoleName != '集团管理员'"
+        >
+          <el-button plain round icon="fa fa-cloud-download"
+            >导出报表</el-button
+          >
+        </p>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
+import { formatDate } from "@/utils";
 export default {
+  data() {
+    return {
+      date: "", //今天-本周-本月-本季度
+      type:1, //集团管理员 表格切换
+      query: {
+        //搜索条件
+        gradeName: "",
+        startDay: "",
+        endDay: "",
+        day: "",
+      },
+      gradeList: [],
+      tableData: [
+        {
+          sub: "科目一",
+          keshi0: 1,
+          celian0: 1,
+          keshi1: 2,
+          celian1: 2,
+        },
+        {
+          sub: "科目一",
+          keshi0: 3,
+          celian0: 4,
+          keshi1: 5,
+          celian1: 6,
+        },
+      ],
+      dataList: [
+        //table循环用数据
+        {
+          name: "初一",
+          keshi: 1,
+          celian: 1,
+        },
+        {
+          name: "初二",
+          keshi: 2,
+          celian: 2,
+        },
+      ],
+    };
+  },
+  created() {
+    this._QueryDataGrade();
+    // this.setDate(1);
+    let startDay = this.query?.startDay;
+    if (!startDay) {
+      this.query.startDay = new Date();
+      this.query.endDay = new Date();
+    }
+  },
+  methods: {
+    changeType(val){
+      // this._QueryData(val)
+    },
+    setDate(index) {
+      const that = this;
+      this.date = index == this.date ? "" : index;
+      let aYear = new Date().getFullYear();
+      let aMonth = new Date().getMonth() + 1;
+      that.query.day = "";
+      that.query.startDay = "";
+      that.query.endDay = "";
+      switch (index) {
+        case 1:
+          that.query.day = formatDate(new Date(), "yyyy-MM-dd");
+          that.query.startDay = that.query.day;
+          that.query.endDay = that.query.day;
+          break;
+        case 2:
+          let day = new Date().getDay();
+          if (day == 0) {
+            //中国式星期天是一周的最后一天
+            day = 7;
+          }
+          let aTime = new Date().getTime() - 24 * 60 * 60 * 1000 * day;
+          that.query.startDay = formatDate(new Date(aTime), "yyyy-MM-dd");
+          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
+          break;
+        case 3:
+          aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
+          that.query.startDay = `${aYear}-${aMonth}-01`;
+          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
+          break;
+        case 4:
+          if (aMonth > 1 && aMonth < 4) {
+            aMonth = "01";
+          } else if (aMonth > 3 && aMonth < 7) {
+            aMonth = "04";
+          } else if (aMonth > 6 && aMonth < 10) {
+            aMonth = "07";
+          } else {
+            aMonth = "10";
+          }
 
-}
+          aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
+          that.query.startDay = `${aYear}-${aMonth}-01`;
+          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
+          break;
+      }
+      this.page = 1;
+      this._QueryData();
+    },
+    handleChangeTimeStart(val) {
+      this.query.day = "";
+      this.date = "";
+      if (this.query.endDay) {
+        if (new Date(val).getTime() > new Date(this.query.endDay).getTime()) {
+          this.$message.error("任务结束时间不能任务开始时间前面，请重新设置");
+          this.query.startDay = "";
+        }
+      }
+    },
+    handleChangeTimeEnd(val) {
+      this.query.day = "";
+      this.date = "";
+      if (this.query.startDay) {
+        if (new Date(val).getTime() < new Date(this.query.startDay).getTime()) {
+          this.$message.error("任务结束时间不能任务开始时间前面，请重新设置");
+          this.query.endDay = "";
+        }
+      }
+    },
+    async _QueryData() {
+      this.loading = true;
+      //多课时对比
+      let query = {};
+      for (let key in this.query) {
+        if (this.query[key] != "") {
+          query[key] = this.query[key];
+        }
+      }
+      const { data, status, info } = await this.$request.fetchQuizList({
+        ...query,
+      });
+      this.loading = false;
+      if (status === 0) {
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QueryDataGrade() {
+      //年级数据
+      const { data, status, info } = await this.$request.gradeList();
+      if (status === 0) {
+        this.gradeList =
+          data.list?.map((item) => {
+            return {
+              value: item.gradeName,
+              label: item.gradeName,
+              id: item.grade,
+            };
+          }) || [];
+        this.gradeList.unshift({
+          value: "",
+          label: "全部",
+        });
+        this.query.gradeName = this.gradeList[0]?.value;
+      } else {
+        this.$message.error(info);
+      }
+    },
+  },
+};
 </script>
 
-<style>
-
+<style lang="scss" scoped>
+.table-box {
+  padding: 0 20px;
+}
+.radio-box{
+  padding-bottom:12px;
+}
+.down {
+  padding-top: 20px;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/card/index.vue b/src/views/card/index.vue
index 18784ae..f553d11 100644
--- a/src/views/card/index.vue
+++ b/src/views/card/index.vue
@@ -1,13 +1,185 @@
 <template>
-  <div>发卡管理</div>
+  <div>
+    <back-box>
+      <template slot="title">
+        <span>发卡记录</span>
+      </template>
+    </back-box>
+    <div class="page-content">
+      <div class="answer-header">
+        <div class="sel-box">
+          <el-cascader
+            class="sel"
+            collapse-tags
+            clearable
+            placeholder="选择班级"
+            v-model="query.classId"
+            :options="gradeList"
+            :props="props"
+            :show-all-levels="false"
+          ></el-cascader>
+          <el-input
+            placeholder="请输入学生姓名"
+            v-model="query.studentName"
+            class="input-with-select"
+            @keyup.enter.native="_QueryData(2)"
+          >
+            <el-button
+              slot="append"
+              icon="el-icon-search"
+              @click="_QueryData(1)"
+            ></el-button>
+          </el-input>
+          <el-input
+            placeholder="请输入学生学号"
+            v-model="query.studentCode"
+            class="input-with-select"
+            @keyup.enter.native="_QueryData(3)"
+          >
+            <el-button
+              slot="append"
+              icon="el-icon-search"
+              @click="_QueryData(2)"
+            ></el-button>
+          </el-input>
+          <el-button type="primary" round @click="_QueryData(1)"
+            >筛选</el-button
+          >
+        </div>
+      </div>
+      <div class="table-box">
+        <el-table :data="tableData" border style="width: 100%">
+          <el-table-column
+            align="center"
+            label="答题器编码"
+            prop="sn"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="班级"
+            prop="className"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="学生姓名"
+            prop="studentName"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="学号"
+            prop="studentId"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="类型"
+            prop="type"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="描述"
+            prop="desc"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="操作时间"
+            prop="time"
+          ></el-table-column>
+        </el-table>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
 export default {
-
-}
+  data() {
+    return {
+      props: { multiple: true, checkStrictly: false },
+      query: {
+        classId: [],
+        studentName: "",
+        studentCode: "",
+      },
+      gradeList: [],
+      tableData: [
+        {
+          sn: 2543641,
+          className: "xxx",
+          studentName: "xxxx",
+          studentId: 563456,
+          type: "换卡",
+          desc: "xxxxx",
+          time: "20:00:00",
+        },
+      ],
+    };
+  },
+  created() {
+    this._QueryGradeList();
+  },
+  methods: {
+    // 查找班级
+    async _QueryGradeList() {
+      this.loading = true;
+      const { data, status, info } = await this.$request.gradeList();
+      console.log(status);
+      if (status === 0) {
+        if (!!data.list) {
+          this.gradeList =
+            data.list?.map((item) => {
+              let gradeList = {
+                value: item.grade,
+                label: item.gradeName,
+              };
+              gradeList.children =
+                item.classList?.map((items) => {
+                  return {
+                    value: items.classCode,
+                    label: items.className,
+                  };
+                }) || [];
+              return gradeList;
+            }) || [];
+        }
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QueryData(type) {
+      let query = {};
+      query.gradeName = this.query.gradeName;
+      query.classId = this.query.classId;
+      if (type == 1) {
+        query.classId = this.query.classId;
+        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 = "";
+      }
+      this.loading = true;
+      const { data, status, info } = await this.$request.cardList({
+        ...query,
+      });
+      this.loading = false;
+      console.log(status);
+      if (status === 0) {
+        this.tableData = data.list || [];
+      } else {
+        this.$message.error(info);
+      }
+    },
+  },
+};
 </script>
 
-<style>
-
+<style lang="scss" scoped>
+.table-box{
+  padding:0 20px;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index 9372cb3..1a7afe2 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -296,7 +296,7 @@
                   :show-all-levels="false"
                   @change="_QueryData(false)"
                 ></el-cascader>
-                <span class="sel">共选择5个授课端</span>
+                <span class="sel">共选择{{selectionTabIds.length}}个授课端</span>
                 <el-button plan round @click="autoUpDate(false)"
                   >开启自动更新</el-button
                 >
@@ -612,6 +612,7 @@ export default {
       this.loadingUpDate = false;
       if (data && !data.code) {
         this._QueryData(false);
+        this.selectionTabIds = []
         this.$message.success("开启自动更新成功");
       } else {
         this.$message.error(data.message);
@@ -630,6 +631,7 @@ export default {
       });
       this.loadingUpDate = false;
       if (data && !data.code) {
+        this.selectionTabIds = []
         this._QueryData(false);
         this.$message.success("关闭自动更新成功");
       } else {
diff --git a/src/views/setUp/student.vue b/src/views/setUp/student.vue
index 747d1d3..d1a616c 100644
--- a/src/views/setUp/student.vue
+++ b/src/views/setUp/student.vue
@@ -172,6 +172,7 @@
             <el-date-picker
               v-model="formClass.intoSchoolYear"
               type="year"
+              value-format="yyyy"
               placeholder="选择年"
             >
             </el-date-picker>
diff --git a/src/views/setUp/teacher.vue b/src/views/setUp/teacher.vue
index e26a7f0..facd31c 100644
--- a/src/views/setUp/teacher.vue
+++ b/src/views/setUp/teacher.vue
@@ -225,7 +225,7 @@
         :rules="rulesTeacher"
         label-width="160px"
       >
-       <el-form-item v-show="isAdd || (!isAdd && setTercherType == 2)" label="教师姓名：">
+       <el-form-item v-show="!isAdd && setTercherType == 2" label="教师姓名：">
           <span>{{formTeacher.teacherName}}</span>
         </el-form-item>
         <el-form-item
@@ -426,6 +426,7 @@ export default {
       this.teacherDetail = { ...obj };
     },
     editTeacher(type) {
+      this.diaTeacher = true;
       this.setTercherType = type
       this.isAdd = false;
       for (let key in this.teacherDetail) {
@@ -436,7 +437,6 @@ export default {
         }
       }
       this.toTeacherForm();
-      this.diaTeacher = true;
     },
     addTeacher() {
       //添加教师
@@ -526,12 +526,6 @@ export default {
       //教师角色数据转换为form格式数据
       this.formTeacher.roleList = [];
       this.formTeacher.managerList?.map((item) => {
-        console.log(
-          this.classList.find(
-            (items) =>
-              items.value == item.classId || items.label == item.className
-          )
-        );
         this.formTeacher.roleList.push({
           id: randomWord(true, 16, 20),
           roleId: 6,