diff --git a/src/api/apis/apis.js b/src/api/apis/apis.js
index c3248fe..2bfd73e 100644
--- a/src/api/apis/apis.js
+++ b/src/api/apis/apis.js
@@ -745,6 +745,14 @@ export default {
data,
});
},
+ // 学校学段
+ sectionList(data) {
+ return service({
+ url: setUpUrls.sectionList,
+ method: "POST",
+ data,
+ });
+ },
/**
* 集团管理员-学校管理
diff --git a/src/api/urls/apis.js b/src/api/urls/apis.js
index bf9faac..de130aa 100644
--- a/src/api/urls/apis.js
+++ b/src/api/urls/apis.js
@@ -185,6 +185,8 @@ export default {
studentChangeClass: "/api_html/school/manager/studentChangeClass",
// 升级年级
upgradeGrade: "/api_html/school/manager/upgradeGrade",
+ // 学校学段
+ sectionList: "/api_html/school/manager/sectionList",
// 查询区域列表
diff --git a/src/utils/index.js b/src/utils/index.js
index bffaba2..e6b51f3 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -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
diff --git a/src/views/examinationPaper/archiving.vue b/src/views/examinationPaper/archiving.vue
index 679b9a1..1647931 100644
--- a/src/views/examinationPaper/archiving.vue
+++ b/src/views/examinationPaper/archiving.vue
@@ -183,6 +183,7 @@ export default {
const { data, status, info } = await fetchTypeNames({
classId: this.query.classId,
+ status:1,
type: 0,
});
if (status === 0) {
diff --git a/src/views/examinationPaper/index.vue b/src/views/examinationPaper/index.vue
index e076ae1..1d4aed2 100644
--- a/src/views/examinationPaper/index.vue
+++ b/src/views/examinationPaper/index.vue
@@ -269,6 +269,10 @@ export default {
});
},
toAdd(query) {
+ if (!this.query.classId) {
+ this.$message.warning("没有任课班级,请先设置。");
+ return;
+ }
let routerItem = {
path: "/examinationPaperAdd",
};
diff --git a/src/views/standard/ask/archiving.vue b/src/views/standard/ask/archiving.vue
index 3eb9668..5e3d438 100644
--- a/src/views/standard/ask/archiving.vue
+++ b/src/views/standard/ask/archiving.vue
@@ -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) {
diff --git a/src/views/standard/ask/index.vue b/src/views/standard/ask/index.vue
index 72272c9..bdae3b0 100644
--- a/src/views/standard/ask/index.vue
+++ b/src/views/standard/ask/index.vue
@@ -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) {
diff --git a/src/views/standard/setUp/school.vue b/src/views/standard/setUp/school.vue
index 848521d..c0fd17a 100644
--- a/src/views/standard/setUp/school.vue
+++ b/src/views/standard/setUp/school.vue
@@ -175,8 +175,8 @@
{{
@@ -257,6 +257,7 @@
label="学号"
fixed
align="center"
+ width="120"
>