diff --git a/src/views/comprehensive/knrdtime/index.vue b/src/views/comprehensive/knrdtime/index.vue
index 5df71b4..26a709c 100644
--- a/src/views/comprehensive/knrdtime/index.vue
+++ b/src/views/comprehensive/knrdtime/index.vue
@@ -130,7 +130,7 @@
         <el-upload center class="upload-demo" drag :auto-upload="false" :limit="1" :on-exceed="handleExceed" action=""
           :file-list="fileList" :on-change="fileChoose">
           <i class="el-icon-upload"></i>
-          <div class="el-upload__text">将文件拖到此处，或<em>点击选择</em></div>
+          <div class="el-upload__text">将文件拖到此处,或<em>点击选择</em></div>
           <div class="el-upload__tip" slot="tip">只能上传xlsx/xls文件 <el-link @click="downloadMode" type="primary"
               size="mini">下载模板</el-link>
           </div>
@@ -285,7 +285,7 @@ export default {
 
     // 下载申请信息模板
     downloadMode() {
-      // 第一个sheet工作簿，如果需要创建多个，对应let多个sheetXdata即可
+      // 第一个sheet工作簿,如果需要创建多个,对应let多个sheetXdata即可
       let sheet1data = [
         {
           学号: "",
@@ -300,7 +300,7 @@ export default {
       var sheet1 = XLSX.utils.json_to_sheet(sheet1data);
       // 创建一个新的空的workbook      
       var wb = XLSX.utils.book_new();
-      // 为每一个工作簿设置名称并添加到workbook（excel表）中
+      // 为每一个工作簿设置名称并添加到workbook(excel表)中
       XLSX.utils.book_append_sheet(wb, sheet1, "审核时间上传导入模板");
       const workbookBlob = workbook2blob(wb);  // 辅助函数workbook2blob
       // 下载文档并添加文件名称
@@ -334,11 +334,11 @@ export default {
     },
     handleExceed(files, fileList) {
       this.$message.warning(
-        `当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`
+        `当前限制选择 1 个文件,本次选择了 ${files.length} 个文件,共选择了 ${files.length + fileList.length} 个文件`
       );
     },
     handleClose(done) {
-      this.$confirm('确认关闭？').then(_ => {
+      this.$confirm('确认关闭?').then(_ => {
         this.tableData = [];
         this.fileList = [];
         done();
@@ -446,7 +446,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除困难认定审核时间编号为"' + ids + '"的数据项？').then(function () {
+      this.$modal.confirm('是否确认删除困难认定审核时间编号为"' + ids + '"的数据项?').then(function () {
         return delKnrdtime(ids);
       }).then(() => {
         this.getList();
diff --git a/src/views/comprehensive/knzzGlApply/cpnt/GlApply.vue b/src/views/comprehensive/knzzGlApply/cpnt/GlApply.vue
index f667d15..cc681d6 100644
--- a/src/views/comprehensive/knzzGlApply/cpnt/GlApply.vue
+++ b/src/views/comprehensive/knzzGlApply/cpnt/GlApply.vue
@@ -291,10 +291,10 @@
                         style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding:1.02pt 2.48pt; vertical-align:middle; width:197.8pt">
                         <p style="line-height:15pt; margin:0pt; orphans:0; text-align:justify; widows:0"><span
                                 style="font-family:仿宋; font-size:12pt">成绩排名</span><span
-                                style="font-family:仿宋; font-size:12pt">（</span><span
+                                style="font-family:仿宋; font-size:12pt">(</span><span
                                 style="font-family:仿宋; font-size:12pt">专业</span><span
-                                style="font-family:仿宋; font-size:12pt">）</span><span
-                                style="font-family:仿宋; font-size:12pt">：</span><span
+                                style="font-family:仿宋; font-size:12pt">)</span><span
+                                style="font-family:仿宋; font-size:12pt">:</span><span
                                 style="font-family:仿宋; font-size:12pt; ">
                                 <input style="width: 60px;" v-model="formData.majorRank" type="text"
                                     class="underline-input" placeholder="请输入名次">
@@ -302,13 +302,13 @@
                                 <input style="width: 80px;" v-model="formData.majorNum" type="text"
                                     class="underline-input" placeholder="请输入总人数">
                             </span>
-                            <span style="font-family:仿宋; font-size:12pt">（名次/总人数）</span>
+                            <span style="font-family:仿宋; font-size:12pt">(名次/总人数)</span>
                         </p>
                     </td>
                     <td colspan="4"
                         style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding:1.02pt 2.48pt; vertical-align:middle; width:228.4pt">
                         <p style="line-height:15pt; margin:0pt; orphans:0; text-align:justify; widows:0"><span
-                                style="font-family:仿宋; font-size:12pt">实行综合考评排名：
+                                style="font-family:仿宋; font-size:12pt">实行综合考评排名:
                                 <el-radio-group v-model="formData.isCph">
                                     <el-radio :label="'是'">是</el-radio>
                                     <el-radio :label="'否'">否</el-radio>
@@ -324,18 +324,18 @@
                                 style="font-family:仿宋; font-size:12pt">必修课
                                 <input style="width: 100px;" v-model="formData.bxk" type="text" class="underline-input"
                                     placeholder="请输入必修课门数">
-                                门，其中及格以上<input style="width: 110px;" v-model="formData.jg" type="text"
+                                门,其中及格以上<input style="width: 110px;" v-model="formData.jg" type="text"
                                     class="underline-input" placeholder="请输入及格以上门数">
                                 门</span></p>
                     </td>
                     <td colspan="4"
                         style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding:1.02pt 2.48pt; vertical-align:middle; width:228.4pt">
                         <p style="line-height:15pt; margin:0pt; orphans:0; text-align:justify; widows:0"><span
-                                style="font-family:仿宋; font-size:12pt">如是，排名</span><span
-                                style="font-family:仿宋; font-size:12pt">（</span><span
+                                style="font-family:仿宋; font-size:12pt">如是,排名</span><span
+                                style="font-family:仿宋; font-size:12pt">(</span><span
                                 style="font-family:仿宋; font-size:12pt">班级</span><span
-                                style="font-family:仿宋; font-size:12pt">）</span><span
-                                style="font-family:仿宋; font-size:12pt">：</span></p>
+                                style="font-family:仿宋; font-size:12pt">)</span><span
+                                style="font-family:仿宋; font-size:12pt">:</span></p>
                         <p style="line-height:15pt; margin:0pt; orphans:0; text-align:justify; widows:0"><span
                                 style="font-family:仿宋; font-size:12pt;">
                                 <input style="width: 60px;" v-model="formData.classRank" type="text"
@@ -343,7 +343,7 @@
                                 /
                                 <input style="width: 80px;" v-model="formData.classNum" type="text"
                                     class="underline-input" placeholder="请输入总人数">
-                            </span><span style="font-family:仿宋; font-size:12pt">（名次/总人数）</span></p>
+                            </span><span style="font-family:仿宋; font-size:12pt">(名次/总人数)</span></p>
                     </td>
                 </tr>
                 <tr style="height:109.55pt">
@@ -352,7 +352,7 @@
                         <p style="line-height:15pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
                                 style="font-family:仿宋; font-size:12pt">申请理由</span></p>
                         <p style="line-height:15pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-                                style="font-family:仿宋; font-size:12pt">（100-150）</span></p>
+                                style="font-family:仿宋; font-size:12pt">(100-150)</span></p>
                     </td>
                     <td colspan="12"
                         style="position: relative; border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:426.8pt">
@@ -362,7 +362,7 @@
                             </span></p>
                         <p
                             style="position: absolute;bottom: 0;right:0; line-height:15pt; margin:0pt; text-align:right; widows:0">
-                            <span style="font-family:仿宋; font-size:12pt">申请人签名：
+                            <span style="font-family:仿宋; font-size:12pt">申请人签名:
                                 <el-upload style="display: inline;" :before-upload="boolImg"
                                     accept="image/jpg,image/jpeg,image/png,image/bmp" :limit="1" class="avatar-uploader"
                                     :action="upload.url" :headers="upload.headers" :show-file-list="false"
@@ -393,9 +393,9 @@
                         <p style="line-height:15pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
                                 style="font-family:仿宋; font-size:12pt">&#xa0;</span></p> -->
                         <p style="line-height:15pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-                                style="font-family:仿宋; font-size:12pt">该同学符合申请条件，同意推荐该同学申请国家励志奖学金</span></p>
+                                style="font-family:仿宋; font-size:12pt">该同学符合申请条件,同意推荐该同学申请国家励志奖学金</span></p>
                         <p style="line-height:15pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-                                style="font-family:仿宋; font-size:12pt">辅导员（签名）：</span></p>
+                                style="font-family:仿宋; font-size:12pt">辅导员(签名):</span></p>
                         <p style="line-height:15pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
                                 style="font-family:仿宋; font-size:12pt">  </span><span
                                 style="font-family:仿宋; font-size:12pt">   </span><span
@@ -428,7 +428,7 @@
                         <p style="line-height:15pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
                                 style="font-family:仿宋; font-size:12pt">&#xa0;</span></p>
                         <p style="line-height:15pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-                                style="font-family:仿宋; font-size:12pt">（公章） </span><span
+                                style="font-family:仿宋; font-size:12pt">(公章) </span><span
                                 style="font-family:仿宋; font-size:12pt"> </span><span
                                 style="font-family:仿宋; font-size:12pt">年</span><span
                                 style="font-family:仿宋; font-size:12pt"> </span><span
@@ -447,17 +447,17 @@
                         style="position: relative; border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:426.8pt">
                         <p
                             style="line-height:25pt; margin:16.2pt 0pt 8.1pt; orphans:0; text-align:justify; text-indent:21pt; widows:0">
-                            <span style="font-family:仿宋; font-size:12pt">经评审，并在校内公示</span><span
+                            <span style="font-family:仿宋; font-size:12pt">经评审,并在校内公示</span><span
                                 style="font-family:仿宋; font-size:12pt; text-decoration:underline"> </span><span
                                 style="font-family:仿宋; font-size:12pt; text-decoration:underline">5 </span><span
-                                style="font-family:仿宋; font-size:12pt">个工作日，无异议，现报请批准该同学获得国家</span><span
+                                style="font-family:仿宋; font-size:12pt">个工作日,无异议,现报请批准该同学获得国家</span><span
                                 style="font-family:仿宋; font-size:12pt">励志</span><span
-                                style="font-family:仿宋; font-size:12pt">奖学金。</span>
+                                style="font-family:仿宋; font-size:12pt">奖学金.</span>
                         </p>
                         <p style="line-height:15pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
                                 style="font-family:仿宋; font-size:12pt"> </span><span
                                 style="font-family:仿宋; font-size:12pt">                                  </span><span
-                                style="font-family:仿宋; font-size:12pt">（公章）</span><span
+                                style="font-family:仿宋; font-size:12pt">(公章)</span><span
                                 style="font-family:仿宋; font-size:12pt">  </span><span
                                 style="font-family:仿宋; font-size:12pt">年</span><span
                                 style="font-family:仿宋; font-size:12pt">  </span><span
@@ -484,7 +484,7 @@
             </table>
         </div>
         <div style="margin: 0 auto;width: fit-content;">
-            证明材料（1、个人上学年成绩单；2、辅导员签字的综测排名截图）
+            证明材料(1、个人上学年成绩单;2、辅导员签字的综测排名截图)
             <FileUpload v-model="formData.hardFile" />
             <el-button style="display: block;margin: 0 auto;width: fit-content;" type="success" plain
                 @click="doApply">提交申请</el-button>
@@ -734,7 +734,7 @@ export default {
     border-bottom-color: #007bff;
 }
 
-/* 可选：禁用自动填充背景色 */
+/* 可选:禁用自动填充背景色 */
 .underline-inputt:-webkit-autofill,
 .underline-input:-webkit-autofill:focus {
     -webkit-box-shadow: 0 0 0 1000px white inset !important;
diff --git a/src/views/poverty/povertyapply/jtjjkn.vue b/src/views/poverty/povertyapply/jtjjkn.vue
index a3a9439..ac91857 100644
--- a/src/views/poverty/povertyapply/jtjjkn.vue
+++ b/src/views/poverty/povertyapply/jtjjkn.vue
@@ -1862,7 +1862,7 @@ import {mz_list} from "@/api/helpFunc";
       },
       fdySave(){
         // 添加保存确认提示
-        this.$confirm('保存后，还能继续修改表单信息，是否继续？', '提示', {
+        this.$confirm('保存后,还能继续修改表单信息,是否继续?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'info'
@@ -1895,11 +1895,11 @@ import {mz_list} from "@/api/helpFunc";
         // 根据操作类型显示不同的确认提示
         let confirmMessage = '';
         if (stu == 0) {
-          confirmMessage = '保存后，还能继续修改表单信息，是否继续？';
+          confirmMessage = '保存后,还能继续修改表单信息,是否继续?';
         } else if (stu == 1) {
-          confirmMessage = '即将提交，提交后，将不能修改，是否继续？';
+          confirmMessage = '即将提交,提交后,将不能修改,是否继续?';
         } else {
-          confirmMessage = '即将提交，提交后，将不能修改，是否继续？';
+          confirmMessage = '即将提交,提交后,将不能修改,是否继续?';
         }
 
         this.$confirm(confirmMessage, '提示', {
diff --git a/src/views/routine/school/learning.vue b/src/views/routine/school/learning.vue
index 0803d44..39a7b3d 100644
--- a/src/views/routine/school/learning.vue
+++ b/src/views/routine/school/learning.vue
@@ -143,7 +143,7 @@
       <!-- 辅导员审核 -->
       <el-table-column label="辅导员审批" align="center" prop="status">
         <template slot-scope="scope">
-          <!-- 审批状态（0、待审批；1、已通过； -->
+          <!-- 审批状态(0、待审批;1、已通过; -->
           <el-tag v-if="scope.row.status == 0">待审批</el-tag>
           <el-tag type="success" v-else-if="scope.row.status == 1"
             >已通过</el-tag
@@ -164,7 +164,7 @@
       <!-- <el-table-column label="学工审批状态" align="center" prop="xgstatus" /> -->
       <el-table-column label="学工审批状态" align="center" prop="xgstatus">
         <template slot-scope="scope">
-          <!-- 审批状态（0、待审批；1、已通过； -->
+          <!-- 审批状态(0、待审批;1、已通过; -->
           <el-tag v-if="scope.row.xgstatus == 0 || scope.row.xgstatus == null ">待审批</el-tag>
           <el-tag type="success" v-else-if="scope.row.xgstatus == 1"
             >已通过</el-tag
@@ -257,25 +257,6 @@
           />
         </el-form-item>
 
-        <!-- 学工姓名 -->
-        <el-form-item label="学工处" prop="xgname" :rules="rules.reason1">
-          <el-input
-            v-model="form.xgname"
-            placeholder="请输入学工处审批人名字"
-          />
-        </el-form-item>
-
-         <el-form-item label="审批时间" prop="xgtime" :rules="rules.reason4">
-          <el-date-picker
-            clearable
-            v-model="form.xgtime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择审批时间"
-          >
-          </el-date-picker>
-        </el-form-item>
-
         <el-form-item label="学工意见" prop="xgopinion" :rules="rules.reason2">
           <el-input
             v-model="form.xgopinion"
@@ -503,7 +484,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-        .confirm('是否确认删除测试编号为"' + ids + '"的数据项？')
+        .confirm('是否确认删除测试编号为"' + ids + '"的数据项?')
         .then(function () {
           return delSchool(ids);
         })
diff --git a/src/views/stuCQS/basedata/class-info/index.vue b/src/views/stuCQS/basedata/class-info/index.vue
index 856802d..17d0fa3 100644
--- a/src/views/stuCQS/basedata/class-info/index.vue
+++ b/src/views/stuCQS/basedata/class-info/index.vue
@@ -20,6 +20,9 @@
       <el-form-item label="班级名称" prop="className">
         <el-input v-model="queryParams.className" placeholder="请输入班级名称" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
+      <el-form-item label="辅导员名" prop="teacherName">
+        <el-input v-model="queryParams.teacherName" placeholder="请输入辅导员名" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
       <!-- <el-form-item label="院系" prop="deptId">
         <el-input v-model="queryParams.deptId" placeholder="请输入院系" clearable @keyup.enter.native="handleQuery" />
       </el-form-item> -->
@@ -290,7 +293,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const classIds = row.classId || this.ids;
-      this.$modal.confirm('是否确认删除班级信息编号为"' + classIds + '"的数据项？').then(function () {
+      this.$modal.confirm('是否确认删除班级信息编号为"' + classIds + '"的数据项?').then(function () {
         return delClass(classIds);
       }).then(() => {
         this.getList();
diff --git a/src/views/stuCQS/basedata/class-info/xw.vue b/src/views/stuCQS/basedata/class-info/xw.vue
index cb25a4c..39c78a0 100644
--- a/src/views/stuCQS/basedata/class-info/xw.vue
+++ b/src/views/stuCQS/basedata/class-info/xw.vue
@@ -22,6 +22,10 @@
                 <el-input v-model="queryParams.className" placeholder="请输入班级名称" clearable
                     @keyup.enter.native="handleQuery" />
             </el-form-item>
+            <el-form-item label="辅导员名" prop="teacherName">
+                <el-input v-model="queryParams.teacherName" placeholder="请输入辅导员名" clearable
+                    @keyup.enter.native="handleQuery" />
+            </el-form-item>
             <!-- <el-form-item label="院系" prop="deptId">
         <el-input v-model="queryParams.deptId" placeholder="请输入院系" clearable @keyup.enter.native="handleQuery" />
       </el-form-item> -->
@@ -303,7 +307,7 @@ export default {
         /** 删除按钮操作 */
         handleDelete(row) {
             const classIds = row.classId || this.ids;
-            this.$modal.confirm('是否确认删除班级信息编号为"' + classIds + '"的数据项？').then(function () {
+            this.$modal.confirm('是否确认删除班级信息编号为"' + classIds + '"的数据项?').then(function () {
                 return delClass(classIds);
             }).then(() => {
                 this.getList();
diff --git a/src/views/stuCQS/basedata/stuinfo/teacherOwn.vue b/src/views/stuCQS/basedata/stuinfo/teacherOwn.vue
index e6a7173..dc0f073 100644
--- a/src/views/stuCQS/basedata/stuinfo/teacherOwn.vue
+++ b/src/views/stuCQS/basedata/stuinfo/teacherOwn.vue
@@ -8,14 +8,9 @@
                             <el-input size="mini" v-model="search.stuNo"></el-input>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="4">
-                        <el-form-item label-width="10px">
-                            <el-button icon="el-icon-search" type="primary" size="mini" @click="doSearch">搜索</el-button>
-                            <el-button icon="el-icon-refresh" size="mini" @click="doRefresh">重置</el-button>
-                        </el-form-item>
-                    </el-col>
+
                     <el-col :span="10">
-                        <el-form-item label="班级" label-width="40px">
+                        <el-form-item label="班级" label-width="50px">
                             <el-select style="width: 100%;" size="mini" @change="changeSelect"
                                 v-model="search.className">
                                 <el-option v-for="(v, i) in class_list" :key="i" :label="v.className"
@@ -32,18 +27,25 @@
                             </el-select>
                         </el-form-item>
                     </el-col>
+
+                    <el-col :span="6">
+                        <el-form-item label="学年" label-width="50px">
+                            <el-select size="mini" @change="changeYear" v-model="search.stuYearName" placeholder="选择学年"
+                                clearable>
+                                <el-option :key="i" v-for="(v, i) in stu_year_list" :value="v.stuYearName"
+                                    :label="v.stuYearName"></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
                     <el-col :span="2">
                         <el-form-item label="" label-width="10px">
                             <el-button type="success" size="mini" @click="exportV = true">导出</el-button>
                         </el-form-item>
                     </el-col>
                     <el-col :span="4">
-                        <el-form-item label="学年" label-width="40px">
-                            <el-select size="mini" @change="changeYear" v-model="search.stuYearName" placeholder="选择学年"
-                                clearable>
-                                <el-option :key="i" v-for="(v, i) in stu_year_list" :value="v.stuYearName"
-                                    :label="v.stuYearName"></el-option>
-                            </el-select>
+                        <el-form-item label-width="10px">
+                            <el-button icon="el-icon-search" type="primary" size="mini" @click="doSearch">搜索</el-button>
+                            <el-button icon="el-icon-refresh" size="mini" @click="doRefresh">重置</el-button>
                         </el-form-item>
                     </el-col>
                     <el-col :span="4">
@@ -322,7 +324,7 @@ export default {
 
                 // 创建一个新的空的workbook
                 var wb = XLSX.utils.book_new();
-                // 为每一个工作簿设置名称并添加到workbook（excel表）中
+                // 为每一个工作簿设置名称并添加到workbook(excel表)中
                 XLSX.utils.book_append_sheet(wb, sheet1, "综合成绩");
                 const workbookBlob = workbook2blob(wb);  // 辅助函数workbook2blob
                 // 下载文档并添加文件名称
@@ -392,7 +394,7 @@ export default {
 
                 // 创建一个新的空的workbook
                 var wb = XLSX.utils.book_new();
-                // 为每一个工作簿设置名称并添加到workbook（excel表）中
+                // 为每一个工作簿设置名称并添加到workbook(excel表)中
                 XLSX.utils.book_append_sheet(wb, sheet1, "综合成绩");
                 const workbookBlob = workbook2blob(wb);  // 辅助函数workbook2blob
                 // 下载文档并添加文件名称
diff --git a/src/views/stuCQS/classScore/ce.vue b/src/views/stuCQS/classScore/ce.vue
index ffa1950..ca0d392 100644
--- a/src/views/stuCQS/classScore/ce.vue
+++ b/src/views/stuCQS/classScore/ce.vue
@@ -68,7 +68,7 @@
                 <el-upload center class="upload-demo" drag :auto-upload="false" :limit="1" :on-exceed="handleExceed"
                     action="" :file-list="fileList" :on-change="fileChoose">
                     <i class="el-icon-upload"></i>
-                    <div class="el-upload__text">将文件拖到此处，或<em>点击选择</em></div>
+                    <div class="el-upload__text">将文件拖到此处,或<em>点击选择</em></div>
                     <div class="el-upload__tip" slot="tip">只能上传xlsx/xls文件 <el-link @click="downloadMode" type="primary"
                             size="mini">下载模板</el-link>
                     </div>
@@ -192,12 +192,12 @@ export default {
 
         // 下载申请信息模板
         downloadMode() {
-            // 第一个sheet工作簿，如果需要创建多个，对应let多个sheetXdata即可
+            // 第一个sheet工作簿,如果需要创建多个,对应let多个sheetXdata即可
             let sheet1data = [
                 {
                     stuNo: "20210001",
                     ce_score: 96,
-                    "操作提示": "第一条为样板数据，stuNo表示学号，ce_score表示学生的综合评价成绩"
+                    "操作提示": "第一条为样板数据,stuNo表示学号,ce_score表示学生的综合评价成绩"
                 },
             ];
             // let sheet2data = []; // 第二个sheet工作簿
@@ -205,7 +205,7 @@ export default {
             var sheet1 = XLSX.utils.json_to_sheet(sheet1data);
             // 创建一个新的空的workbook      
             var wb = XLSX.utils.book_new();
-            // 为每一个工作簿设置名称并添加到workbook（excel表）中
+            // 为每一个工作簿设置名称并添加到workbook(excel表)中
             XLSX.utils.book_append_sheet(wb, sheet1, "综合评价导入模板");
             const workbookBlob = workbook2blob(wb);  // 辅助函数workbook2blob
             // 下载文档并添加文件名称
@@ -280,11 +280,11 @@ export default {
         },
         handleExceed(files, fileList) {
             this.$message.warning(
-                `当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`
+                `当前限制选择 1 个文件,本次选择了 ${files.length} 个文件,共选择了 ${files.length + fileList.length} 个文件`
             );
         },
         handleClose(done) {
-            this.$confirm('确认关闭？').then(_ => {
+            this.$confirm('确认关闭?').then(_ => {
                 this.excelData = [];
                 this.fileList = [];
                 done();
@@ -457,7 +457,7 @@ export default {
 
                 // 创建一个新的空的workbook
                 var wb = XLSX.utils.book_new();
-                // 为每一个工作簿设置名称并添加到workbook（excel表）中
+                // 为每一个工作簿设置名称并添加到workbook(excel表)中
                 XLSX.utils.book_append_sheet(wb, sheet1, "综合评价");
                 const workbookBlob = workbook2blob(wb);  // 辅助函数workbook2blob
                 // 下载文档并添加文件名称
diff --git a/src/views/stuCQS/good/fdy.vue b/src/views/stuCQS/good/fdy.vue
index a184cf9..05cccf7 100644
--- a/src/views/stuCQS/good/fdy.vue
+++ b/src/views/stuCQS/good/fdy.vue
@@ -185,13 +185,13 @@
                                     <ol>
                                         <h3>学业奖学金</h3>
                                         <li>
-                                            一等奖学金：平均学分绩班级排名前3%，学年综合素质测评班级排名前50%；
+                                            一等奖学金:平均学分绩班级排名前3%,学年综合素质测评班级排名前50%;
                                         </li>
                                         <li>
-                                            二等奖学金：平均学分绩级排名前6%，学年综合素质测评班级排名前50%；
+                                            二等奖学金:平均学分绩级排名前6%,学年综合素质测评班级排名前50%;
                                         </li>
                                         <li>
-                                            三等奖学金：平均学分绩班级排名前9%，学年综合素质测评班级排名前50%
+                                            三等奖学金:平均学分绩班级排名前9%,学年综合素质测评班级排名前50%
                                         </li>
                                     </ol>
 
@@ -201,20 +201,20 @@
                                     <ol>
                                         <h3>三好学生</h3>
                                         <li>
-                                            德、智、体、美、劳全面发展，平时注重道德修养，勤俭节约，弘扬正能量，树立良好形象。
+                                            德、智、体、美、劳全面发展,平时注重道德修养,勤俭节约,弘扬正能量,树立良好形象.
                                         </li>
                                         <li>
-                                            以身作则，为人表率，具有较强的集体观念和集体荣誉感。热心为同学服务，待人诚恳、谦虚、有礼貌。
+                                            以身作则,为人表率,具有较强的集体观念和集体荣誉感.热心为同学服务,待人诚恳、谦虚、有礼貌.
                                         </li>
                                         <li>
-                                            积极参加学校开展的第二课堂活动，第二课堂成绩单学分认定为优秀。在各级各类活动（竞赛）中成绩突出。
+                                            积极参加学校开展的第二课堂活动,第二课堂成绩单学分认定为优秀.在各级各类活动(竞赛)中成绩突出.
                                         </li>
                                         <li>
-                                            积极参加体育锻炼及其他文体活动，身体健康，体能考核成绩为良好及以上。(体测成绩80分以上)
+                                            积极参加体育锻炼及其他文体活动,身体健康,体能考核成绩为良好及以上.(体测成绩80分以上)
                                         </li>
                                         <li>
-                                            参评学年各科平均学分绩75分以上（含75分），考查课“中等”及以上，平均学分绩班级排名前30%，学年综合素质测评班级排名前30%
-                                            <!-- ，学年青年大学习学习率达100%。 -->
+                                            参评学年各科平均学分绩75分以上(含75分),考查课"中等"及以上,平均学分绩班级排名前30%,学年综合素质测评班级排名前30%
+                                            <!-- ,学年青年大学习学习率达100%. -->
                                         </li>
                                     </ol>
                                 </div>
@@ -223,20 +223,20 @@
                                     <ol>
                                         <h3>优秀学生干部</h3>
                                         <li>
-                                            关心集体，吃苦在前，以身作则，能起到模范带头作用。
+                                            关心集体,吃苦在前,以身作则,能起到模范带头作用.
                                         </li>
                                         <li>
-                                            具有较强的工作能力和组织能力，工作认真负责，责任心强，团结同学，热心为同学服务，工作效果好。社会实践工作取得较好成绩，在学生中有较高威信。
+                                            具有较强的工作能力和组织能力,工作认真负责,责任心强,团结同学,热心为同学服务,工作效果好.社会实践工作取得较好成绩,在学生中有较高威信.
                                         </li>
                                         <li>
-                                            积极参加学校开展的第二课堂活动，第二课堂成绩单学分认定为优秀。在各级各类活动（竞赛）中成绩突出。
+                                            积极参加学校开展的第二课堂活动,第二课堂成绩单学分认定为优秀.在各级各类活动(竞赛)中成绩突出.
                                         </li>
                                         <li>
-                                            积极参加体育锻炼及其他文体活动，身体健康，体能考核成绩为良好及以上。
+                                            积极参加体育锻炼及其他文体活动,身体健康,体能考核成绩为良好及以上.
                                         </li>
                                         <li>
-                                            参评学年各科平均学分绩为70分以上（含70分），平均学分绩班级排名前40%，学年综合素质测评班级排名前50%
-                                            <!-- ，学年青年大学习学习率达100%。 -->
+                                            参评学年各科平均学分绩为70分以上(含70分),平均学分绩班级排名前40%,学年综合素质测评班级排名前50%
+                                            <!-- ,学年青年大学习学习率达100%. -->
                                         </li>
                                         <span @click="lookMore"
                                             style="text-decoration: underline;color: lightskyblue;cursor: pointer;">查看更多</span>
@@ -319,7 +319,7 @@
                 <el-option v-for="(v, i) in class_list" :key="i" clearable :value="v.classId"
                     :label="v.className"></el-option>
             </el-select>
-            <div style="font-size: small;margin: 10px 0 10px 10px; color: red;">*学年、奖项是必选项，班级不选就默认导出全部。</div>
+            <div style="font-size: small;margin: 10px 0 10px 10px; color: red;">*学年、奖项是必选项,班级不选就默认导出全部.</div>
             <el-button @click="doExport">导出</el-button>
         </el-dialog>
 
@@ -587,7 +587,7 @@ export default {
 
                 // 创建一个新的空的workbook
                 var wb = XLSX.utils.book_new();
-                // 为每一个工作簿设置名称并添加到workbook（excel表）中
+                // 为每一个工作簿设置名称并添加到workbook(excel表)中
                 XLSX.utils.book_append_sheet(wb, sheet1, fileName);
                 const workbookBlob = workbook2blob(wb);  // 辅助函数workbook2blob
                 // 下载文档并添加文件名称
@@ -595,7 +595,7 @@ export default {
 
 
             } else {
-                this.$message.info("出错啦，刷新试试");
+                this.$message.info("出错啦,刷新试试");
             }
 
 
diff --git a/src/views/survey/leave/fdy.vue b/src/views/survey/leave/fdy.vue
index 6560822..74cbc02 100644
--- a/src/views/survey/leave/fdy.vue
+++ b/src/views/survey/leave/fdy.vue
@@ -39,12 +39,12 @@
         </el-row>
         <el-table v-loading="loading" :data="itineraryList" @selection-change="handleSelectionChange">
             <el-table-column type="selection" width="20" align="center" />
-            <el-table-column label="#" align="center" prop="returnSchoolId" />
+            <!-- <el-table-column label="#" align="center" prop="returnSchoolId" /> -->
             <el-table-column label="主题" align="center" prop="surveyName" />
             <el-table-column label="学号" align="center" prop="stuNo" width="120" />
             <el-table-column label="姓名" align="center" prop="name" />
             <el-table-column label="班级" align="center" prop="className" width="200" />
-            <el-table-column label="联系电话" align="center" prop="phone" width="140" />
+            <!-- <el-table-column label="联系电话" align="center" prop="phone" width="120" /> -->
             <el-table-column label="家长是否知晓" align="center" prop="famKnow" width="100" />
             <el-table-column label="是否离校" align="center">
                 <template slot-scope="scope">
@@ -52,6 +52,8 @@
                 </template>
             </el-table-column>
             <el-table-column label="预计离校时间" align="center" prop="willLeaveTime" width="140" />
+            <el-table-column label="预计返校时间" align="center" prop="scheduledReturnTime" width="140" />
+            <el-table-column label="预计留校时间" align="center" prop="willStayTime" width="140" />
             <el-table-column label="去向地" align="center" prop="willAddr" width="140" />
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                 <template slot-scope="scope">