diff --git a/src/api/apis/apis.js b/src/api/apis/apis.js
index 30f8138..c3248fe 100644
--- a/src/api/apis/apis.js
+++ b/src/api/apis/apis.js
@@ -345,8 +345,8 @@ export default {
       data
     });
   },
-   //任课老师-学生测练统计
-   tStudentExamReport(data) {
+  //任课老师-学生测练统计
+  tStudentExamReport(data) {
     return service({
       url: setUpUrls.tStudentExamReport,
       method: "POST",
@@ -910,6 +910,15 @@ export default {
       method: "POST",
     });
   },
+  //  导出设备列表
+  tenantExportDevice(data) {
+    return service({
+      url: setUpUrls.tenantExportDevice,
+      method: "POST",
+      data,
+      responseType: 'arraybuffer',
+    });
+  },
 
   /** 个人版  */
   //  修改个人信息
diff --git a/src/api/urls/apis.js b/src/api/urls/apis.js
index fea6104..bf9faac 100644
--- a/src/api/urls/apis.js
+++ b/src/api/urls/apis.js
@@ -228,6 +228,8 @@ export default {
   exportGradeContrast: "/api_html/tenant/exportGradeContrast",
   //  同步教师账号
   syncUser: "/api_html/tenant/syncUser",
+  //  导出设备列表
+  tenantExportDevice: "/api_html/tenant/exportDevice",
 
 
   // 个人版首页统计数据
diff --git a/src/views/admin/account/index.vue b/src/views/admin/account/index.vue
index a1ac1b7..b1f16e2 100644
--- a/src/views/admin/account/index.vue
+++ b/src/views/admin/account/index.vue
@@ -43,6 +43,7 @@
           placeholder="请输入账号名称"
           v-model="query.loginName"
           class="input-with-select"
+          clearable
           @keyup.enter.native="(page = 1), _QueryData()"
         >
           <el-button
diff --git a/src/views/examinationPaper/edit.vue b/src/views/examinationPaper/edit.vue
index 83ac7cb..5d8fa13 100644
--- a/src/views/examinationPaper/edit.vue
+++ b/src/views/examinationPaper/edit.vue
@@ -2,7 +2,7 @@
   <div>
     <back-box>
       <template slot="title">
-        <span>修改答案</span>
+        <span>{{type == 1?'修改试卷':'修改答案'}}</span>
       </template>
     </back-box>
     <div class="content">
@@ -14,8 +14,12 @@
           }}老师修改了答案
         </p></template
       >
-      <div class="answer-title">
-        <p class="name">{{ form.title || title }}</p>
+      <div class="answer-title" :class="type == 1?'t-left':''">
+        <p class="name-box" v-if="type == 1">
+          <span>试卷名称：</span>
+          <el-input class="ipt-name" v-model="form.title"></el-input>
+        </p>
+        <p class="name" v-else>{{ form.title }}</p>
         <p class="totals">卷面总分：{{ allScore }}分</p>
       </div>
       <template v-if="questionList[0]?.subQuestions">
@@ -528,7 +532,7 @@ export default {
       this.$store.getters.info.showRole ||
       this.$store.getters.info.permissions[0].role;
     this.type = this.$route.query.type || 1;
-    this.title = this.$route.query.title || "";
+    this.form.title = this.$route.query.title || "";
     this._QueryDetail();
   },
   methods: {
@@ -903,7 +907,10 @@ export default {
           questionList: questionList,
         };
       }
-      const { data, status, info } = await modifyPaper(params);
+      const { data, status, info } = await modifyPaper({
+        title: this.form.title,
+        ...params,
+      });
       if (status == 0) {
         this.$router.go(-1);
       } else {
@@ -1120,10 +1127,26 @@ export default {
   color: #333;
   font-weight: 700;
   padding: 20px 0;
+  &.t-left{
+    text-align: left;
+  }
   .totals {
     font-size: 16px;
-    color: #888;
+    color: #666;
+    font-weight: normal;
+  }
+  .name-box {
+    display: flex;
+    white-space: nowrap;
+    align-items: center;
+    margin-bottom: 10px;
+    font-size: 16px;
     font-weight: normal;
+    :deep(.el-input__inner) {
+      font-size: 16px;
+      color: #333;
+      font-weight: 700;
+    }
   }
 }
 .question-title {
diff --git a/src/views/standard/card/index.vue b/src/views/standard/card/index.vue
index 9b9cc43..6d8d405 100644
--- a/src/views/standard/card/index.vue
+++ b/src/views/standard/card/index.vue
@@ -8,62 +8,92 @@
 
     <div class="page-content">
       <div class="answer-header">
-        <div class="sel-box" v-if="role == 'ROLE_XUEXIAO'">
-          <el-cascader
-            @change="(page = 1), _QueryData(1)"
-            size="small"
+        <div class="sel-box">
+          <template v-if="role == 'ROLE_XUEXIAO'">
+            <el-cascader
+              @change="(page = 1), _QueryData(1)"
+              size="small"
+              class="sel"
+              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="(page = 1), _QueryData(2)"
+            >
+              <el-button
+                slot="append"
+                icon="el-icon-search"
+                @click="(page = 1), _QueryData(2)"
+              ></el-button>
+            </el-input>
+            <el-input
+              placeholder="请输入学生学号"
+              v-model="query.studentCode"
+              class="input-with-select"
+              @keyup.enter.native="(page = 1), _QueryData(3)"
+            >
+              <el-button
+                slot="append"
+                icon="el-icon-search"
+                @click="(page = 1), _QueryData(3)"
+              ></el-button>
+            </el-input>
+          </template>
+          <template v-if="role == 'ROLE_JITUAN'">
+            <el-select
+              class="sel2"
+              v-model="query.schoolId"
+              placeholder="选择学校"
+              @change="(page = 1), _QueryData(1)"
+            >
+              <el-option
+                v-for="item in schoolList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </template>
+          <el-select
             class="sel"
-            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="(page = 1), _QueryData(2)"
-          >
-            <el-button
-              slot="append"
-              icon="el-icon-search"
-              @click="(page = 1), _QueryData(2)"
-            ></el-button>
-          </el-input>
-          <el-input
-            placeholder="请输入学生学号"
-            v-model="query.studentCode"
-            class="input-with-select"
-            @keyup.enter.native="(page = 1), _QueryData(3)"
+            v-model="query.operationType"
+            placeholder="选择类型"
           >
-            <el-button
-              slot="append"
-              icon="el-icon-search"
-              @click="(page = 1), _QueryData(3)"
-            ></el-button>
-          </el-input>
+            <el-option label="全部" value=""></el-option>
+            <el-option label="发卡" :value="0"></el-option>
+            <el-option label="补卡" :value="1"></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>
           <el-button type="primary" round @click="(page = 1), _QueryData(4)"
             >筛选</el-button
           >
         </div>
-        <div class="sel-box" v-if="role == 'ROLE_JITUAN'">
-          <el-select
-            class="sel2"
-            v-model="schoolId"
-            placeholder="选择学校"
-            @change="(page = 1), _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"
@@ -162,8 +192,11 @@ export default {
         classId: "",
         studentName: "",
         studentCode: "",
+        operationType: "",
+        schoolId: "",
+        startDay: "",
+        endDay: "",
       },
-      schoolId: "",
       schoolList: [],
       gradeList: [],
       tableData: [],
@@ -186,6 +219,22 @@ export default {
     this._QueryData();
   },
   methods: {
+    handleChangeTimeStart(val) {
+      if (this.query.endDay) {
+        if (new Date(val).getTime() > new Date(this.query.endDay).getTime()) {
+          this.$message.error("任务结束时间不能任务开始时间前面，请重新设置");
+          this.query.startDay = "";
+        }
+      }
+    },
+    handleChangeTimeEnd(val) {
+      if (this.query.startDay) {
+        if (new Date(val).getTime() < new Date(this.query.startDay).getTime()) {
+          this.$message.error("任务结束时间不能任务开始时间前面，请重新设置");
+          this.query.endDay = "";
+        }
+      }
+    },
     // 查找班级
     async _QueryGradeList() {
       this.loading = true;
@@ -227,14 +276,19 @@ export default {
               value: item.id,
             };
           }) || [];
-        this.schoolId = (this.schoolList && this.schoolList[0].value) || "";
+        this.schoolList.unshift({
+          label: "全部",
+          value: "",
+        });
+        this.query.schoolId = this.schoolList[0].value || "";
       } else {
         this.$message.error(info);
       }
     },
-    async _QueryData(type) {
+    serQuery(type) {
       let query = {};
       if (this.role == "ROLE_XUEXIAO") {
+        delete query.schoolId;
         query.gradeName = this.query.gradeName;
         if (type == 1) {
           query.classId = this.query.classId[1] ? this.query.classId[1] : "";
@@ -253,8 +307,23 @@ export default {
           query.classId = this.query.classId[1] ? this.query.classId[1] : "";
         }
       } else if (this.role == "ROLE_JITUAN") {
-        query.schoolId = this.schoolId;
+        query = this.query.schoolId
+          ? {
+              schoolId: this.query.schoolId,
+            }
+          : {};
+        if (type != 1) {
+          this.query.operationType
+            ? (query["operationType"] = this.query.operationType)
+            : "";
+          this.query.startDay ? (query["startDay"] = this.query.startDay) : "";
+          this.query.endDay ? (query["endDay"] = this.query.endDay) : "";
+        }
       }
+      return query;
+    },
+    async _QueryData(type) {
+      let query = this.serQuery(type);
       this.loading = true;
       const { data, status, info } = await this.$request.cardList({
         ...query,
@@ -271,10 +340,18 @@ export default {
       }
     },
     async downExl() {
+      let query = {};
+      this.query.operationType
+        ? (query["operationType"] = this.query.operationType)
+        : "";
+      this.query.startDay ? (query["startDay"] = this.query.startDay) : "";
+      this.query.endDay ? (query["endDay"] = this.query.endDay) : "";
       //报表导出
       if (this.exportLoading == true) return;
       this.exportLoading = true;
-      const data = await this.$request.exportClickersLog();
+      const data = await this.$request.exportClickersLog({
+        ...query,
+      });
       this.exportLoading = false;
       if (data && !data.code) {
         let blob = new Blob([data], {
@@ -298,7 +375,15 @@ export default {
 .down {
   padding: 16px 20px;
 }
-.answer-header .sel-box .sel2 {
-  width: 300px;
+.answer-header {
+  .sel-box {
+    .sel2 {
+      width: 300px;
+      margin-right: 20px;
+    }
+    .d1 {
+      margin-right: 20px;
+    }
+  }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/standard/device/index.vue b/src/views/standard/device/index.vue
index 37bca11..e66ae47 100644
--- a/src/views/standard/device/index.vue
+++ b/src/views/standard/device/index.vue
@@ -82,6 +82,7 @@
                   placeholder="请输入设备编码"
                   v-model="query.sn"
                   class="input-with-select"
+                  clearable
                   @keyup.enter.native="_QueryData(true)"
                 >
                   <el-button
@@ -105,6 +106,7 @@
                 prop="frequency"
                 label="频点"
                 align="center"
+                width="60"
               ></el-table-column>
               <el-table-column
                 prop="pairingCode"
@@ -149,8 +151,15 @@
                 prop="onlineTime"
                 label="最近上报"
                 align="center"
+                width="160"
+              ></el-table-column>
+              <el-table-column
+                prop="createdTime"
+                label="创建时间"
+                align="center"
+                width="160"
               ></el-table-column>
-              <el-table-column label="状态" align="center"
+              <el-table-column label="状态" align="center" width="60"
                 ><template slot-scope="scope">
                   {{
                     scope.row.onlineStatus == 1
@@ -236,6 +245,20 @@
                   placeholder="请输入设备编码"
                   v-model="query.sn"
                   class="input-with-select"
+                  clearable
+                  @keyup.enter.native="_QueryData(true)"
+                >
+                  <el-button
+                    slot="append"
+                    icon="el-icon-search"
+                    @click="_QueryData(true)"
+                  ></el-button>
+                </el-input>
+                <el-input
+                  placeholder="学生姓名"
+                  v-model="query.studentName"
+                  class="input-with-select"
+                  clearable
                   @keyup.enter.native="_QueryData(true)"
                 >
                   <el-button
@@ -254,8 +277,9 @@
                 prop="sn"
                 label="设备编码"
                 align="center"
+                width="160"
               ></el-table-column>
-              <el-table-column label="学生信息" align="center"
+              <el-table-column label="学生信息" align="center" width="120"
                 ><template slot-scope="scoped"
                   ><p
                     v-for="(item, index) in scoped.row.studentList"
@@ -276,13 +300,19 @@
                 prop="gradeName"
                 label="年级"
                 align="center"
+                width="120"
                 ><template slot-scope="scoped">
                   <p v-for="(item, index) in scoped.row.classList" :key="index">
                     {{ item.gradeName }}
                   </p>
                 </template></el-table-column
               >
-              <el-table-column prop="class" label="关联班级" align="center">
+              <el-table-column
+                prop="class"
+                label="关联班级"
+                align="center"
+                width="160"
+              >
                 <template slot-scope="scoped">
                   <p v-for="(item, index) in scoped.row.classList" :key="index">
                     {{ item.className }}
@@ -303,8 +333,9 @@
                 prop="latestReportTime"
                 label="最后答题时间"
                 align="center"
+                width="160"
               ></el-table-column>
-              <el-table-column label="操作" align="center"
+              <el-table-column label="操作" align="center" width="80"
                 ><template slot-scope="scoped">
                   <el-tooltip effect="dark" content="日志" placement="top">
                     <el-button
@@ -359,7 +390,7 @@
                 label="设备编码"
                 align="center"
               ></el-table-column>
-              <el-table-column prop="class" label="关联班级" align="center"
+              <el-table-column prop="class" label="关联班级" align="center" width="100"
                 ><template slot-scope="scoped">
                   <p v-for="(item, index) in scoped.row.classList" :key="index">
                     {{ item.className }}
@@ -373,6 +404,18 @@
                 align="center"
               ></el-table-column>
               <el-table-column
+                v-if="role == 'ROLE_JITUAN'"
+                prop="gradeName"
+                label="年级"
+                align="center"
+                width="80"
+                ><template slot-scope="scoped">
+                  <p v-for="(item, index) in scoped.row.classList" :key="index">
+                    {{ item.gradeName }}
+                  </p>
+                </template></el-table-column
+              >
+              <el-table-column
                 prop="lastUpdateTime"
                 label="最近更新"
                 align="center"
@@ -391,8 +434,9 @@
                 prop="otaVersionName"
                 label="版本号"
                 align="center"
+                width="80"
               ></el-table-column>
-              <el-table-column label="状态" align="center"
+              <el-table-column label="状态" align="center"  width="80"
                 ><template slot-scope="scope">
                   {{
                     scope.row.onlineStatus == 1
@@ -402,8 +446,8 @@
                       : "离线"
                   }}
                 </template></el-table-column
-              >
-              <el-table-column label="自动更新" align="center"
+               >
+              <el-table-column label="自动更新" align="center"  width="100"
                 ><template slot-scope="scoped">
                   <el-switch
                     v-model="scoped.row.upgradeFlag"
@@ -544,6 +588,7 @@ export default {
       this.query.classId = [];
       this.query.onlineStatus = "";
       this.query.sn = "";
+      this.query.studentName = "";
       this.query.type = "";
       if (val == 1) {
         this.stationReport();
@@ -555,17 +600,16 @@ export default {
   },
   data() {
     return {
-      exportLoading: false,
-      isAdd: false, //添加还是修改基站
-      role: "",
       code: "",
+      role: "",
       loading: false,
+      exportLoading: false,
+      isAdd: false, //添加还是修改基站
       url: "/api_html/school/manager/importStation",
       diaUp: false,
       diaAnswerEqu: false,
-      gradeList: [],
-      gradeListAll: [],
-      schoolAll: [],
+      gradeList: [], //年级列表
+      schoolAll: [], //所有学校刘表
       school: {}, //校园账号所属学校信息
       props: {
         multiple: true,
@@ -577,6 +621,7 @@ export default {
         onlineStatus: "",
         sn: "",
         type: "",
+        studentName: "",
       },
       statusList: [
         { label: "全部", value: "" },
@@ -594,6 +639,7 @@ export default {
         { label: "3月以上", value: 6 },
       ],
       form: {
+        //修改/添加基站信息
         deviceId: "",
         sn: "",
         frequency: "",
@@ -607,17 +653,17 @@ export default {
         pairingCode: [
           { required: true, message: "请输入配对码", trigger: "blur" },
         ],
-        classIds: [{ required: true, message: "请选择班级", trigger: "blur" }],
+        // classIds: [{ required: true, message: "请选择班级", trigger: "blur" }],
       },
       tableData: [],
       total: 0,
       count: 0,
       chartData: [],
       chartData2: [],
-      selectionTabIds: [],
+      selectionTabIds: [], //已选择授课段
       page: 1,
       size: 20,
-      isBack: false,
+      isBack: false, //是否是日志页面回来
     };
   },
   created() {
@@ -849,8 +895,13 @@ export default {
       //报表导出
       if (this.exportLoading == true) return;
       let query = this.setQuery();
+      const exportDevice =
+        this.role != "ROLE_JITUAN"
+          ? this.$request.exportDevice
+          : this.$request.tenantExportDevice;
+
       this.exportLoading = true;
-      const data = await this.$request.exportDevice({
+      const data = await exportDevice({
         ...query,
         deviceType: this.type,
       });
@@ -1023,6 +1074,8 @@ export default {
       let query = {};
       if (this.query.sn) {
         query.sn = this.query.sn;
+      } else if (this.query.studentName) {
+        query.studentName = this.query.studentName;
       } else {
         if (this.type == 1) {
           this.query.onlineStatus !== ""
@@ -1202,4 +1255,13 @@ export default {
     }
   }
 }
+.answer-header .sel-box .input-with-select {
+  margin-right: 20px;
+  :deep(.el-input__suffix) {
+    right: -5px;
+  }
+  :deep(.el-button) {
+    padding: 12px 16px 12px 10px;
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/views/standard/setUp/account.vue b/src/views/standard/setUp/account.vue
index fd4f698..e0e279f 100644
--- a/src/views/standard/setUp/account.vue
+++ b/src/views/standard/setUp/account.vue
@@ -86,8 +86,9 @@
             role != 'ROLE_JITUAN' ? '请输入老师账号' : '请输入账号名称'
           "
           v-model="query.loginName"
-          class="input-with-select"
+          class="input-with-select sel"
           type="number"
+          clearable
           oninput="if(value.length > 11) value = value.slice(0,11)"
           @keyup.enter.native="(page = 1), _QueryData(2)"
         >
@@ -98,11 +99,11 @@
           ></el-button>
         </el-input>
         <el-input
-          v-if="role != 'ROLE_JITUAN'"
           placeholder="请输入老师姓名"
           maxlength="30"
           v-model="query.realName"
           class="input-with-select"
+          clearable
           @keyup.enter.native="(page = 1), _QueryData(3)"
         >
           <el-button
@@ -227,6 +228,7 @@
             <el-input
               placeholder="请输入联系电话"
               v-model.trim="formCount.loginName"
+              clearable
               maxlength="11"
             >
             </el-input>
@@ -237,6 +239,7 @@
             <el-input
               placeholder="请输入教师姓名"
               v-model.trim="formCount.realName"
+              clearable
               maxlength="11"
             >
             </el-input>
@@ -262,6 +265,7 @@
               placeholder="请输入联系电话"
               v-model.trim="formAddCount.phone"
               type="number"
+              clearable
               oninput="if(value.length > 11) value = value.slice(0,11)"
             >
             </el-input>
@@ -272,6 +276,7 @@
             <el-input
               placeholder="请输入密码"
               v-model.trim="formAddCount.password"
+              clearable
               maxlength="18"
             >
             </el-input>
@@ -282,6 +287,7 @@
             <el-input
               placeholder="请输入姓名"
               v-model.trim="formAddCount.realName"
+              clearable
               maxlength="30"
             >
             </el-input>
@@ -686,7 +692,6 @@ export default {
         query = { ...this.query };
       }
       if (this.role == "ROLE_JITUAN") {
-        delete query.realName;
         query.regionIds = [];
         query.schoolIds = [];
         query.schoolId?.map((item) => {
@@ -703,6 +708,15 @@ export default {
             }
           }
         });
+        if (type == 2) {
+          this.query.realName = "";
+          query.loginName = this.query.loginName;
+        } else if (type == 3) {
+          this.query.loginName = "";
+          query.realName = this.query.realName;
+        } else {
+          query = { ...this.query };
+        }
         delete query.schoolId;
       }
       return query;
@@ -752,4 +766,14 @@ export default {
 .table-box {
   padding: 0 20px;
 }
+.answer-header{
+  .sel-box{
+    .sel{
+      margin-right:20px;
+    }
+  }
+  :deep(.el-input-group__append){
+    padding:0 20px 0 12px;
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/views/standard/setUp/school.vue b/src/views/standard/setUp/school.vue
index cd7abc9..848521d 100644
--- a/src/views/standard/setUp/school.vue
+++ b/src/views/standard/setUp/school.vue
@@ -57,6 +57,10 @@
             <span class="s1">所属集团：</span>
             <span class="s2">{{ school.tenantName || "--" }}</span>
           </li>
+          <li class="school-item">
+            <span class="s1">基站登录密码 ：</span>
+            <span class="s2">{{ school.stationPwd || "--" }}</span>
+          </li>
         </ul>
         <div class="grade-box">
           <p class="h-title">
@@ -187,6 +191,16 @@
             ></el-input>
           </el-col>
         </el-form-item>
+        <el-form-item label="基站登录密码：" prop="stationPwd">
+          <el-col :span="10">
+            <el-input
+              maxlength="6"
+              v-model="formSchool.stationPwd"
+              show-password
+              placeholder="请输入基站登录密码"
+            ></el-input>
+          </el-col>
+        </el-form-item>
         <el-form-item label="联系人：" prop="contactPerson"
           ><el-col :span="10"
             ><el-input
@@ -279,6 +293,7 @@ export default {
         //修改学校
         sections: "",
         managePwd: "",
+        stationPwd: "",
         contactPerson: "",
         contactPhone: "",
       },
@@ -293,6 +308,15 @@ export default {
             trigger: "blur",
           },
         ],
+        stationPwd: [
+          { required: true, message: "请填写基站登陆密码", trigger: "blur" },
+          {
+            min: 6,
+            max: 6,
+            message: "长度为 6 个字符",
+            trigger: "blur",
+          },
+        ],
       },
       formGrade: {
         //修改年级
@@ -368,6 +392,10 @@ export default {
         this.$message.error("请填写密码！");
         return;
       }
+      if (!this.formSchool.stationPwd) {
+        this.$message.error("请填写基站登录密码！");
+        return;
+      }
       if (this.loading) {
         return;
       }