diff --git a/src/api/axios.js b/src/api/axios.js index 720a7c3..70fd450 100644 --- a/src/api/axios.js +++ b/src/api/axios.js @@ -24,6 +24,13 @@ service.interceptors.request.use( const source = axios.CancelToken.source(); store.commit("setTokenSources", [source.token, source.cancel]); config.cancelToken = source.token; + const role = store.getters.info.showRole || store.getters.info.permissions[0].role; + if (role == "ROLE_BANZHUREN") { + const classes = store.getters.classes + config.manager = 1 + config.classes = classes + } + console.log(config) return config; }, (error) => { diff --git a/src/components/charts/lineChart.vue b/src/components/charts/lineChart.vue index 7cf3ae4..768badb 100644 --- a/src/components/charts/lineChart.vue +++ b/src/components/charts/lineChart.vue @@ -57,6 +57,7 @@ export default { }, axisLabel: { color: "#333", + interval: 0 }, }, yAxis: { diff --git a/src/components/exportDia.vue b/src/components/exportDia.vue index 7961ee8..87032b9 100644 --- a/src/components/exportDia.vue +++ b/src/components/exportDia.vue @@ -25,10 +25,13 @@ + scoped.row.classRank || scoped.row.rank || scoped.row.examList[0].classRank }} - +
@@ -44,7 +47,11 @@ export default { name: "exportDia", props: { diaShow: Boolean, - exportStudent: Array + exportStudent: Array, + lastLabel: { + type: String, + default: '总正确率' + } }, data() { return { diff --git a/src/store/index.js b/src/store/index.js index dd7c510..bb2260c 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -25,6 +25,7 @@ const store = new Vuex.Store({ ? JSON.parse(localStorage.getItem("addRouters")) : [], //动态路由 tokenSources: new Map(), //正在请求接口（切换取消请求） + classes: localStorage.getItem("classes") || "", //班主任选择班级查询报表（用于教学班学生筛选） }, mutations: { setToken(state, token) { @@ -71,6 +72,10 @@ const store = new Vuex.Store({ delTokenSources(state, data) { state.tokenSources.delete(data); }, + setClasses(state, data) { + state.classes = data; + localStorage.setItem("classes", data); + } }, actions: { Login({ state, commit }, params) { @@ -192,9 +197,10 @@ const store = new Vuex.Store({ getters: { addRouters: (state) => state.addRouters, token: (state) => state.token, - code: (state) => state.csCode, + csCode: (state) => state.csCode, info: (state) => state.info, routers: (state) => state.routers, + classes: (state) => state.classes, logoShow: (state) => state.layoutStore.logoShow, isCollapse: (state) => state.layoutStore.isCollapse, uniquerouter: (state) => state.layoutStore.uniquerouter, diff --git a/src/views/admin/device/index.vue b/src/views/admin/device/index.vue index 8c39245..63a6fd7 100644 --- a/src/views/admin/device/index.vue +++ b/src/views/admin/device/index.vue @@ -284,7 +284,7 @@ export default { }; }, created() { - this.code = localStorage.getItem("csCode") || ""; + this.code = this.$store.getters.csCode; this.stationReport(); this._QueryData(); }, diff --git a/src/views/basic/ask/archiving.vue b/src/views/basic/ask/archiving.vue index 5e3d438..028d4f0 100644 --- a/src/views/basic/ask/archiving.vue +++ b/src/views/basic/ask/archiving.vue @@ -494,7 +494,7 @@ export default { }; }, async created() { - this.code = localStorage.getItem("csCode") || ""; + this.code = this.$store.getters.csCode; this.role = this.$store.getters.info.showRole || this.$store.getters.info.permissions[0].role; diff --git a/src/views/basic/ask/index.vue b/src/views/basic/ask/index.vue index 78c54dd..f3d9a48 100644 --- a/src/views/basic/ask/index.vue +++ b/src/views/basic/ask/index.vue @@ -77,7 +77,7 @@ export default { }; }, async created() { - this.code = localStorage.getItem("csCode") || ""; + this.code = this.$store.getters.csCode; this.role = this.$store.getters.info.showRole || this.$store.getters.info.permissions[0].role; diff --git a/src/views/basic/ask/list.vue b/src/views/basic/ask/list.vue index e6b99c4..ab5c069 100644 --- a/src/views/basic/ask/list.vue +++ b/src/views/basic/ask/list.vue @@ -93,9 +93,7 @@ export default { } }, async created() { - this.code = localStorage.getItem("csCode") || ""; - const queryData = this.$route.query.params - queryData ? this.query = { ...this.query, ...JSON.parse(queryData) } : '' + this.code = this.$store.getters.csCode; this.init() }, watch: { @@ -109,12 +107,15 @@ export default { methods: { //初始化 init() { + const queryData = this.$route.query.params + queryData ? this.query = { ...this.query, ...JSON.parse(queryData) } : '' this.role = this.$store.getters.info.showRole || this.$store.getters.info.permissions[0].role; if (this.role != "ROLE_PERSONAL") { this._QueryGdClass() }; + this.$store.commit('setClasses', this.query.classId) this.page = 1 this.total = 0 this.tableData = [] diff --git a/src/views/basic/device/index.vue b/src/views/basic/device/index.vue index 53a0750..ea34f7c 100644 --- a/src/views/basic/device/index.vue +++ b/src/views/basic/device/index.vue @@ -387,7 +387,7 @@ export default { }; }, created() { - this.code = localStorage.getItem("csCode") || ""; + this.code = this.$store.getters.csCode; this.role = this.$store.getters.info.showRole || this.$store.getters.info.permissions[0].role; diff --git a/src/views/basic/setUp/account.vue b/src/views/basic/setUp/account.vue index b8d3638..9e64b3f 100644 --- a/src/views/basic/setUp/account.vue +++ b/src/views/basic/setUp/account.vue @@ -435,7 +435,7 @@ export default { }; }, created() { - this.code = localStorage.getItem("csCode") || ""; + this.code = this.$store.getters.csCode; this.role = this.$store.getters.info.showRole || this.$store.getters.info.permissions[0].role; diff --git a/src/views/basic/setUp/clazz.vue b/src/views/basic/setUp/clazz.vue index 05ccd41..8534a5a 100644 --- a/src/views/basic/setUp/clazz.vue +++ b/src/views/basic/setUp/clazz.vue @@ -200,7 +200,7 @@ export default { } }, async created() { - this.code = localStorage.getItem("csCode") || ""; + this.code = this.$store.getters.csCode; this._QueryData(); this._QuerySubject(); }, diff --git a/src/views/basic/setUp/school.vue b/src/views/basic/setUp/school.vue index 003999e..5bb5742 100644 --- a/src/views/basic/setUp/school.vue +++ b/src/views/basic/setUp/school.vue @@ -214,7 +214,7 @@ export default { }, }, created() { - this.code = localStorage.getItem("csCode") || ""; + this.code = this.$store.getters.csCode; this._QueryDataSchool(); this._QueryDataGrade(); this._QuerySectionList(); diff --git a/src/views/basic/setUp/student.vue b/src/views/basic/setUp/student.vue index 304ef86..edf218d 100644 --- a/src/views/basic/setUp/student.vue +++ b/src/views/basic/setUp/student.vue @@ -289,7 +289,7 @@ export default { }, }, async created() { - this.code = localStorage.getItem("csCode") || ""; + this.code = this.$store.getters.csCode; this.role = this.$store.getters.info.showRole || this.$store.getters.info.permissions[0].role; diff --git a/src/views/basic/setUp/teacher.vue b/src/views/basic/setUp/teacher.vue index 189c58b..3fb436d 100644 --- a/src/views/basic/setUp/teacher.vue +++ b/src/views/basic/setUp/teacher.vue @@ -313,7 +313,7 @@ export default { } }, async created() { - this.code = localStorage.getItem("csCode") || ""; + this.code = this.$store.getters.csCode; this._QueryData(4); await this._QueryDataGrade(); // this._RoleList(); diff --git a/src/views/basic/test/analysis.vue b/src/views/basic/test/analysis.vue index ef0c5df..b1f57fb 100644 --- a/src/views/basic/test/analysis.vue +++ b/src/views/basic/test/analysis.vue @@ -41,7 +41,7 @@ export default { this.$store.getters.info.showRole || this.$store.getters.info.permissions[0].role; this.id = this.$route.query.id || ""; - this.ids = this.$route.query.ids && this.$route.query.ids.split(",") || ""; + this.ids = this.$route.query.ids && this.$route.query.ids.split(",") || []; this.type = this.$route.query.type this.classId = this.$route.query.classId || ""; this.title = this.$route.query.title || "" diff --git a/src/views/basic/test/components/contrast.vue b/src/views/basic/test/components/contrast.vue index e6b284b..ba34a34 100644 --- a/src/views/basic/test/components/contrast.vue +++ b/src/views/basic/test/components/contrast.vue @@ -131,7 +131,6 @@ export default { props: { role: "", ids: Array, - classId: String, subjectName: String, title: String, }, diff --git a/src/views/basic/test/components/multipleSubTest.vue b/src/views/basic/test/components/multipleSubTest.vue index 85ed32a..825b1ab 100644 --- a/src/views/basic/test/components/multipleSubTest.vue +++ b/src/views/basic/test/components/multipleSubTest.vue @@ -52,8 +52,8 @@ export default { props: { role: "", ids: Array, - classIds: Array, - subjectNames: Array, + classId: String, + subjectName: String, }, data() { return { @@ -135,13 +135,34 @@ export default { }, //查看雷达图 openChart(obj) { + this.chartTitle = obj.studentName + '-多科-多课时作答表现图' - let subjectList = obj.dataList.map(item => item.subjectName) + let max = 0; + let subjectList = obj.dataList.map(item => { + let score = Number(item.highestScore || item.score) + max = score > max ? score : max + return item.subjectName + }) + max += 10 + max = max > 150 ? 150 : max + this.chartData = { + indicator: [ + { + name: '', max: max, + axisLabel: { + show: true, + showMaxLabel: true, + }, + }, + ], + seriesData: [] + } subjectList.map((item, index) => { if (index < 1) { this.chartData.indicator[index].name = item + this.chartData.indicator[index].max = max } else { - this.chartData.indicator.push({ name: item, max: 100 }) + this.chartData.indicator.push({ name: item, max: max }) } }) // 为了美观 @@ -149,7 +170,7 @@ export default { let num = this.chartData.indicator.length for (let i = 0; i < 6; i++) { if (i >= num) { - this.chartData.indicator.push({ name: "", max: 100 }) + this.chartData.indicator.push({ name: "", max: max }) } } } @@ -174,7 +195,7 @@ export default { async phaseExamReport() { this.loading = true; const { data, status, info } = await this.$request.cTPhaseExamReport({ - classIds: this.classId.split(','), + classId: this.classId, examIds: this.ids, subjectNames: this.subjectList, }); diff --git a/src/views/basic/test/components/multipleTest.vue b/src/views/basic/test/components/multipleTest.vue index 7a65127..7a99da5 100644 --- a/src/views/basic/test/components/multipleTest.vue +++ b/src/views/basic/test/components/multipleTest.vue @@ -31,7 +31,7 @@
- + diff --git a/src/views/basic/test/components/scoreSet.vue b/src/views/basic/test/components/scoreSet.vue index f21ef7c..6ea21e1 100644 --- a/src/views/basic/test/components/scoreSet.vue +++ b/src/views/basic/test/components/scoreSet.vue @@ -161,7 +161,7 @@ export default { upSuccess(res) { this.$message.success("导入成功"); this.diaUp = false; - this._QueryData() + this.closeScoreSet() }, async downExcel() { //模板下载 diff --git a/src/views/basic/test/components/test.vue b/src/views/basic/test/components/test.vue index 061177c..c320dc2 100644 --- a/src/views/basic/test/components/test.vue +++ b/src/views/basic/test/components/test.vue @@ -651,7 +651,7 @@ div::-webkit-scrollbar-thumb { background-color: #ffebec; font-size: 14px; color: #fd9795; - margin: 10px 20px 0 20px; + margin: 0 20px 10px 20px; display: flex; &-p { diff --git a/src/views/basic/test/index.vue b/src/views/basic/test/index.vue index 588b00a..6de3128 100644 --- a/src/views/basic/test/index.vue +++ b/src/views/basic/test/index.vue @@ -87,7 +87,7 @@ export default { }; }, async created() { - this.code = localStorage.getItem("csCode") || ""; + this.code = this.$store.getters.csCode; this.role = this.$store.getters.info.showRole || this.$store.getters.info.permissions[0].role; diff --git a/src/views/basic/test/list.vue b/src/views/basic/test/list.vue index a266f1e..c0c083c 100644 --- a/src/views/basic/test/list.vue +++ b/src/views/basic/test/list.vue @@ -62,13 +62,11 @@ - +