班主任查看报表添加额外信息

梁保满
1 parent 22095aba
Showing 28 changed files with 114 additions and 46 deletions
src/api/axios.js
src/components/charts/lineChart.vue
src/components/exportDia.vue
src/store/index.js
src/views/admin/device/index.vue
src/views/basic/ask/archiving.vue
src/views/basic/ask/index.vue
src/views/basic/ask/list.vue
src/views/basic/device/index.vue
src/views/basic/setUp/account.vue
src/views/basic/setUp/clazz.vue
src/views/basic/setUp/school.vue
src/views/basic/setUp/student.vue
src/views/basic/setUp/teacher.vue
src/views/basic/test/analysis.vue
src/views/basic/test/components/contrast.vue
src/views/basic/test/components/multipleSubTest.vue
src/views/basic/test/components/multipleTest.vue
src/views/basic/test/components/scoreSet.vue
src/views/basic/test/components/test.vue
@@ -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) => {
@@ -57,6 +57,7 @@ export default {
           },
           axisLabel: {
             color: "#333",
+            interval: 0
           },
         },
         yAxis: {
@@ -25,10 +25,13 @@
           <el-table-column prop="studentName" label="姓名" align="center"></el-table-column>
           <el-table-column label="班名" align="center">
             <template slot-scope="scoped">{{
-              scoped.row.classRank || scoped.row.rank }}</template>
+              scoped.row.classRank || scoped.row.rank || scoped.row.examList[0].classRank }}</template>
           </el-table-column>
-          <el-table-column prop="correctRate" label="总正确率" align="center"><template slot-scope="scoped">{{
-            scoped.row.correctRate|| scoped.row.scoringRate }}%</template></el-table-column>
+          <el-table-column prop="correctRate" :label="this.lastLabel" align="center"><template slot-scope="scoped">
+              <span v-if="scoped.row.correctRate || scoped.row.scoringRate">{{
+                scoped.row.correctRate || scoped.row.scoringRate }}%</span>
+              <span v-else>{{ scoped.row.examList[0].score }}</span>
+            </template></el-table-column>
         </el-table>
       </ul>
       <div class="dialog-footer" slot="footer">
@@ -44,7 +47,11 @@ export default {
   name: "exportDia",
   props: {
     diaShow: Boolean,
-    exportStudent: Array
+    exportStudent: Array,
+    lastLabel: {
+      type: String,
+      default: '总正确率'
+    }
   },
   data() {
     return {
@@ -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,
@@ -284,7 +284,7 @@ export default {
     };
   },
   created() {
-    this.code = localStorage.getItem("csCode") || "";
+    this.code = this.$store.getters.csCode;
     this.stationReport();
     this._QueryData();
   },
@@ -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;
@@ -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;
@@ -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 = []
@@ -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;
@@ -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;
@@ -200,7 +200,7 @@ export default {
     }
   },
   async created() {
-    this.code = localStorage.getItem("csCode") || "";
+    this.code = this.$store.getters.csCode;
     this._QueryData();
     this._QuerySubject();
   },
@@ -214,7 +214,7 @@ export default {
     },
   },
   created() {
-    this.code = localStorage.getItem("csCode") || "";
+    this.code = this.$store.getters.csCode;
     this._QueryDataSchool();
     this._QueryDataGrade();
     this._QuerySectionList();
@@ -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;
@@ -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();
@@ -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 || ""
@@ -131,7 +131,6 @@ export default {
   props: {
     role: "",
     ids: Array,
-    classId: String,
     subjectName: String,
     title: String,
   },
@@ -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,
       });
@@ -31,7 +31,7 @@
         <LineChart id="lineChart" :params="chartData" :xAxis="xAxis" :formatterYAxis="false" />
       </div>
     </el-dialog>
-    <ExportDia :exportStudent="exportStudent" :diaShow="diaShow" @cancel="cancel" @exportData="exportData" />
+    <ExportDia :exportStudent="exportStudent" :diaShow="diaShow" @cancel="cancel" @exportData="exportData" lastLabel="总分"/>
   </div>
   <!-- 单科多卷 -->
 </template>
@@ -161,7 +161,7 @@ export default {
     upSuccess(res) {
       this.$message.success("导入成功");
       this.diaUp = false;
-      this._QueryData()
+      this.closeScoreSet()
     },
     async downExcel() {
       //模板下载
@@ -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 {
@@ -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;
@@ -62,13 +62,11 @@
           <el-table-column prop="subjectName" label="科目" align="center"></el-table-column>
           <el-table-column prop="classList" label="班级" align="center">
             <template slot-scope="scoped">
-              <span v-for="(item, index) in scoped.row.classList">{{
-                `${index == 0 ? '' : '/'}` + item.className
-              }}</span>
+              <span v-for="(item, index) in scoped.row.classNames">{{ `${index == 0 ? '' : '/'}` + item }}</span>
             </template>
           </el-table-column>
           <el-table-column prop="title" label="试卷名称" align="center"></el-table-column>
-          <el-table-column prop="score" label="卷面分" align="center"></el-table-column>
+          <el-table-column prop="examPaperScore" label="卷面分" align="center"></el-table-column>
           <el-table-column label="操作" align="center">
             <template slot-scope="scoped">
               <el-button type="primary" circle size="mini" icon="el-icon-arrow-right"
@@ -126,8 +124,7 @@ export default {
     }
   },
   async created() {
-    this.code = localStorage.getItem("csCode") || "";
-
+    this.code = this.$store.getters.csCode;
     this.init()
   },
   mounted() {
@@ -147,6 +144,7 @@ export default {
       const queryData = this.$route.query.params
       queryData ? this.query = { ...this.query, ...JSON.parse(queryData) } : ''
       console.log(this.query)
+      this.$store.commit('setClasses', this.query.classId.join(','))
       if (this.query.classId.length > 1) {
         this.isMultipleClass = true
       }
@@ -225,11 +223,12 @@ export default {
     },
     // 多班对比
     linkContrast(obj) {
+      console.log(obj)
       this.$router.push({
         path: "/testAnalysis",
         query: {
-          ids: obj.ids,
-          classId: obj.classList.map(item => item.classId).join(),
+          ids: obj.ids.join(','),
+          classId: obj.classIds.join(','),
           subjectName: obj.subjectName,
           title: obj.title,
           type: 4
@@ -284,7 +283,7 @@ export default {
       for (let key in this.query) {
         if (this.query[key] != "") {
           if (key == 'classId') {
-            if (query.classId?.length == 1) {
+            if (this.query.classId?.length == 1) {
               query.classId = this.query[key][0]
             } else {
               query.classIds = [...this.query[key]]
@@ -303,8 +302,35 @@ export default {
       });
       this.loading = false;
       if (status === 0) {
-        this.tableData = (data?.list && [...data?.list]) || [];
-        this.total = data?.count || 0;
+        if (this.query.classId.length > 1) {
+          //多班级
+          let tableObj = {};
+          data?.list?.map((item) => {
+            if (tableObj[item.examPaperId]) {
+              tableObj[item.examPaperId].ids.push(item.id)
+              tableObj[item.examPaperId].classIds.push(item.classId)
+              tableObj[item.examPaperId].classNames.push(item.className)
+            } else {
+              tableObj[item.examPaperId] = {
+                ids: [item.id],
+                examPaperId: item.examPaperId,
+                classIds: [item.classId],
+                classNames: [item.className],
+                title: item.title,
+                examPaperScore: item.examPaperScore,
+                subjectName: item.subjectName
+              }
+            }
+          });
+          Object.keys(tableObj).map(keys => {
+            if (tableObj[keys].classIds.length > 1) {
+              this.tableData.push(tableObj[keys])
+            }
+          })
+        } else {
+          this.tableData = (data?.list && [...data?.list]) || [];
+          this.total = data?.count || 0;
+        }
       } else {
         this.$message.error(info);
       }
@@ -142,7 +142,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;
@@ -190,7 +190,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;
@@ -257,7 +257,7 @@ export default {
     },
   },
   created() {
-    this.code = localStorage.getItem("csCode") || "";
+    this.code = this.$store.getters.csCode;
     this._Init(this.$store.getters.info.showRoleName);
     this._QueryData();
   },
@@ -86,7 +86,7 @@ export default {
     };
   },
   created() {
-    this.code = getURLParams("code") || localStorage.getItem("csCode") || "";
+    this.code = getURLParams("code") || this.$store.getters.csCode;
     this.path = this.$route.path;
   },
   methods: {
@@ -194,7 +194,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;
@@ -115,7 +115,7 @@ export default {
   },
   created() {
     this.url = this.$route.query?.url || "";
-    this.code = getURLParams("code") || localStorage.getItem("csCode") || "";
+    this.code = getURLParams("code") || this.$store.getters.csCode;
     this.dockkey = getURLParams("dockkey") || "";
     if (this.code || this.dockkey) {
       this.loading = true;