bug

梁保满
1 parent af0d559b
Showing 12 changed files with 102 additions and 63 deletions
src/api/apis/apis.js
src/api/urls/apis.js
src/utils/index.js
src/views/examinationPaper/archiving.vue
src/views/examinationPaper/index.vue
src/views/standard/ask/archiving.vue
src/views/standard/ask/index.vue
src/views/standard/setUp/school.vue
src/views/standard/setUp/student.vue
src/views/standard/test/analysis.vue
src/views/standard/test/archiving.vue
src/views/standard/test/index.vue
@@ -745,6 +745,14 @@ export default {
       data,
     });
   },
+  //  学校学段
+  sectionList(data) {
+    return service({
+      url: setUpUrls.sectionList,
+      method: "POST",
+      data,
+    });
+  },
  
   /**
    * 集团管理员-学校管理
@@ -185,6 +185,8 @@ export default {
   studentChangeClass: "/api_html/school/manager/studentChangeClass",
   // 升级年级
   upgradeGrade: "/api_html/school/manager/upgradeGrade",
+  // 学校学段
+  sectionList: "/api_html/school/manager/sectionList",
  
  
   // 查询区域列表
@@ -769,6 +769,7 @@ export function tablePrint(id, title) {
     .el-table__fixed{display:none!important}
     .el-table .el-table__cell.is-center{text-align:center!important}
     .el-table .el-table__cell.is-hidden>*{visibility: inherit;}
+    .el-table__cell.gutter{display:none}
     ul,li{margin:0;padding:0;list-style:none}
     .hui-box{display: flex;text-align: center;}
     .hui-box .s-txt{width: 60px;line-height: 144px;background: #ccc;font-size: 16px;color: #fff;font-weight: 700;border:1px solid #ccc;box-sizing:border-box}
@@ -793,6 +794,6 @@ export function tablePrint(id, title) {
     awin.document.body.append(pTit)
   }
   awin.document.body.append(aDom);
-  awin.print();
-  awin.close()
+  // awin.print();
+  // awin.close()
 }
 \ No newline at end of file
@@ -183,6 +183,7 @@ export default {
  
       const { data, status, info } = await fetchTypeNames({
         classId: this.query.classId,
+        status:1,
         type: 0,
       });
       if (status === 0) {
@@ -269,6 +269,10 @@ export default {
       });
     },
     toAdd(query) {
+      if (!this.query.classId) {
+        this.$message.warning("没有任课班级，请先设置。");
+        return;
+      }
       let routerItem = {
         path: "/examinationPaperAdd",
       };
@@ -514,18 +514,18 @@ export default {
   activated() {
     const that = this;
     BusEvent.$on("keepAlive", async function () {
-        that.query.subjectNames = that.role == "ROLE_BANZHUREN" ? [] : "";
-        await that._QueryClassList();
-        if (!that.query.classId) {
-          return;
-        }
-        await that._QuerySubjectList();
-        await that.setDate(1);
-        let startDay = that.query?.startDay;
-        if (!startDay) {
-          that.query.startDay = new Date();
-          that.query.endDay = new Date();
-        }
+      that.query.subjectNames = that.role == "ROLE_BANZHUREN" ? [] : "";
+      await that._QueryClassList();
+      if (!that.query.classId) {
+        return;
+      }
+      await that._QuerySubjectList();
+      await that.setDate(1);
+      let startDay = that.query?.startDay;
+      if (!startDay) {
+        that.query.startDay = new Date();
+        that.query.endDay = new Date();
+      }
     });
   },
   methods: {
@@ -707,6 +707,9 @@ export default {
       }
     },
     async _QueryData() {
+      if (!this.query.classId) {
+        return;
+      }
       if (this.tabIndex == 1) {
         this.periodReportList();
       } else if (this.tabIndex == 2) {
@@ -550,18 +550,18 @@ export default {
   activated() {
     const that = this;
     BusEvent.$on("keepAlive", async function () {
-        that.query.subjectNames = that.role == "ROLE_BANZHUREN" ? [] : "";
-        await that._QueryClassList();
-        if (!that.query.classId) {
-          return;
-        }
-        await that._QuerySubjectList();
-        await that.setDate(1);
-        let startDay = that.query?.startDay;
-        if (!startDay) {
-          that.query.startDay = new Date();
-          that.query.endDay = new Date();
-        }
+      that.query.subjectNames = that.role == "ROLE_BANZHUREN" ? [] : "";
+      await that._QueryClassList();
+      if (!that.query.classId) {
+        return;
+      }
+      await that._QuerySubjectList();
+      await that.setDate(1);
+      let startDay = that.query?.startDay;
+      if (!startDay) {
+        that.query.startDay = new Date();
+        that.query.endDay = new Date();
+      }
     });
   },
   methods: {
@@ -753,6 +753,9 @@ export default {
       }
     },
     async _QueryData() {
+      if (!this.query.classId) {
+        return;
+      }
       if (this.tabIndex == 1) {
         this.periodReportList();
       } else if (this.tabIndex == 2) {
@@ -175,8 +175,8 @@
           <el-checkbox-group v-model="formSchool.sections">
             <el-checkbox
               v-for="item in sectionsList"
-              :label="item.id"
-              :key="item.id"
+              :label="item.code"
+              :key="item.code"
               >{{ item.name }}</el-checkbox
             >
           </el-checkbox-group>
@@ -330,13 +330,7 @@ export default {
         ],
       },
       subjectName: "",
-      sectionsList: [
-        { id: "1", name: "小学" },
-        { id: "2", name: "初中" },
-        { id: "3", name: "高中" },
-        { id: "4", name: "大学" },
-        { id: "7", name: "高补" },
-      ],
+      sectionsList: [],
       subjectList: [],
       diaUpgradeGrade: false, //班级升级
     };
@@ -346,6 +340,7 @@ export default {
     this._QueryDataSchool();
     this._QueryDataGrade();
     this._QuerySubject();
+    this._QuerySectionList();
   },
   methods: {
     upSuccess(res) {
@@ -456,6 +451,16 @@ export default {
         this.$message.error(info);
       }
     },
+    async _QuerySectionList() {
+      //学校学段
+      const { data, status, info } = await this.$request.sectionList();
+      console.log(status);
+      if (status === 0) {
+        this.sectionsList = data?.list || [];
+      } else {
+        this.$message.error(info);
+      }
+    },
     async _QueryDataSchool() {
       //学校详情
       this.loading = true;
@@ -569,9 +574,9 @@ export default {
         cursor: pointer;
         font-size: 14px;
         color: #999;
-        .fa-level-up{
-          font-size:16px;
-          padding-left:2px;
+        .fa-level-up {
+          font-size: 16px;
+          padding-left: 2px;
         }
         &:hover {
           color: #f30;
@@ -67,18 +67,22 @@
               @click="classDetail(item)"
             >
               <template v-if="!code && role !== 'ROLE_PERSONAL'">
-                <div class="popconfirm-box">
-                  <el-popconfirm
-                    title="确定要将该班级归档吗？"
-                    @confirm="archivingClass(item, index)"
-                  >
-                    <i slot="reference" class="fa fa-file-archive-o"></i>
-                  </el-popconfirm>
-                </div>
-                <i
-                  class="el-icon-edit-outline"
-                  @click.stop="setClass(item)"
-                ></i>
+                <el-tooltip effect="dark" content="班级归档" placement="top">
+                  <div class="popconfirm-box">
+                    <el-popconfirm
+                      title="确定要将该班级归档吗？"
+                      @confirm="archivingClass(item, index)"
+                    >
+                      <i slot="reference" class="fa fa-file-archive-o"></i>
+                    </el-popconfirm>
+                  </div>
+                </el-tooltip>
+                <el-tooltip effect="dark" content="修改班级" placement="top">
+                  <i
+                    class="el-icon-edit-outline"
+                    @click.stop="setClass(item)"
+                  ></i>
+                </el-tooltip>
               </template>
               {{ item.className }}（{{ item.studentCount }}）
             </li>
@@ -524,6 +528,7 @@ export default {
         this.$message.success("归档成功");
         this.classList.splice(index, 1);
         this.setClass(this.classList[index]);
+        this._QueryArchivedNum();
         this.diaClass = false;
       } else {
         this.$message.error(info);
@@ -5,7 +5,7 @@
         <span>单卷分析</span>
       </template>
     </back-box>
-    <div class="tips" v-if="paperModifyLog.modifiedTime || status">
+    <div class="tips" v-if="paperModifyLog.modifiedTime && status">
       <p class="tips-p">
         <i class="fa fa-bell-o"></i>
         {{
@@ -257,6 +257,7 @@
             label="学号"
             fixed
             align="center"
+            width="120"
           ></el-table-column>
           <el-table-column
             prop="studentName"
@@ -463,18 +463,18 @@ export default {
   activated() {
     const that = this;
     BusEvent.$on("keepAlive", async function () {
-        that.query.subjectNames = that.role == "ROLE_BANZHUREN" ? [] : "";
-        await that._QueryClassList();
-        if (!that.query.classId) {
-          return;
-        }
-        await that._QuerySubjectList();
-        await that.setDate(1);
-        let startDay = that.query?.startDay;
-        if (!startDay) {
-          that.query.startDay = new Date();
-          that.query.endDay = new Date();
-        }
+      that.query.subjectNames = that.role == "ROLE_BANZHUREN" ? [] : "";
+      await that._QueryClassList();
+      if (!that.query.classId) {
+        return;
+      }
+      await that._QuerySubjectList();
+      await that.setDate(1);
+      let startDay = that.query?.startDay;
+      if (!startDay) {
+        that.query.startDay = new Date();
+        that.query.endDay = new Date();
+      }
     });
   },
   methods: {
@@ -647,6 +647,9 @@ export default {
     },
     async _QueryData() {
       this.tableData = [];
+      if (!this.query.classId) {
+        return;
+      }
       if (this.tabIndex == 1) {
         this.examReportList();
       } else {
@@ -801,6 +801,9 @@ export default {
       }
     },
     async _QueryData() {
+      if (!this.query.classId) {
+        return;
+      }
       this.tableData = [];
       if (this.tabIndex == 1) {
         this.examReportList();