成绩管理统计等

src/api/index.js

@@ -331,7 +331,7 @@ export default {
     saveGrade: `occupationlab/occupationlab/staff/saveGrade`, //新增年级
     updateGrade: `occupationlab/occupationlab/staff/updateGrade`, //编辑年级
     deleteGrade: `occupationlab/occupationlab/staff/deleteGrade`, //删除年级
-    // 员工管理
+    // 教师管理
     saveStaff: `occupationlab/occupationlab/staff/saveStaff`, //新增员工
     staffDetail: `occupationlab/occupationlab/staff/staffDetail`, //员工详情
     modifyStaff: `occupationlab/occupationlab/staff/modifyStaff`, //编辑员工

src/pages/achievement/info/course.vue

@@ -10,13 +10,6 @@
 
     <el-card shadow="hover"
              class="m-b-20">
-      <!-- <el-radio-group v-model="classId"
-                      size="small">
-        <el-radio v-for="(item, i) in classList"
-                  :key="i"
-                  :label="item.id"
-                  @change="initData">{{ item.className }}</el-radio>
-      </el-radio-group> -->
       <el-tabs v-model="classId"
                @tab-click="classChange">
         <el-tab-pane v-for="(item, i) in classList"
@@ -301,7 +294,7 @@ export default {
       accountId: this.$route.query.accountId,
       id: +this.$route.query.id,
       cid: +this.$route.query.cid,
-      classId: this.$route.query.classId ? +this.$route.query.classId : '',
+      classId: this.$route.query.classId || '',
       classList: [],
       keyword: "",
       searchTimer: null,
@@ -339,7 +332,7 @@ export default {
     }
   },
   mounted () {
-    this.classId = +this.$route.query.classId || ''
+    this.classId = this.$route.query.classId || ''
     this.getClass()
   },
   methods: {
@@ -389,6 +382,9 @@ export default {
     // 获取班级下拉框数据
     getClass () {
       this.$post(this.api.allClassesInOurSchool).then(({ data }) => {
+        data.forEach(e => {
+          e.id = e.id + ''
+        })
         if (data.length && !this.classId) this.classId = data[0].id
         this.classList = data
         this.initData()
@@ -432,7 +428,9 @@ export default {
         })
         list = practice ? res.userScoreList.records : res.listOfAssessmentResults.records
       }
+      const curClass = this.classList.find(e => e.id == this.classId)
       list.forEach(e => {
+        e.className = curClass ? curClass.className : ''
         e.goodsName = this.goodsName
         e.cid = this.cid
       })
@@ -565,6 +563,7 @@ export default {
       for (const i in this.stageNumber) {
         data[+(i.replace('num', '')) - 1] = this.stageNumber[i]
       }
+      console.log("🚀 ~ getChart ~ data:", data)
       let myChart = echarts.init(document.getElementById("chart"));
       myChart.setOption({
         title: { text: "实验分数分布图" },
@@ -579,7 +578,6 @@ export default {
         yAxis: {
           name: "人数",
           type: "value",
-          interval: 5,
           minInterval: 5,
         },
         series: [{

src/pages/achievement/info/project.vue

@@ -547,7 +547,6 @@ export default {
         yAxis: {
           name: this.permissions ? "人数" : '成绩报告数量',
           type: "value",
-          interval: 5,
           minInterval: 5,
         },
         series: [{

src/pages/project/add/index.vue

@@ -629,8 +629,9 @@ export default {
         });
       }
     },
-    scoreChange (row, index, val) { // 暂时解决，输入分数，页面没有更新
+    scoreChange (row, i) {
-      this.projectJudgmentData.splice(index, 1, row);
+      row.score = row.score.replace(/[^\d]/g, '')
+      this.projectJudgmentData.splice(i, 1, row);
     },
     delJudgePoint (index) { // 删除判分点
       this.$confirm("确定要删除吗？", "提示", {

src/pages/screen/index.vue

@@ -397,8 +397,12 @@ export default {
   data () {
     return {
       token: Util.local.get(Setting.tokenKey),
-      time: 0,
+      time: 2,
       times: [
+        {
+          id: 2,
+          name: '年'
+        },
         {
           id: 0,
           name: '月'

src/pages/system/list/index.vue

@@ -51,7 +51,7 @@ export default {
     },
     initTabs () {
       const { btns } = this
-      const tab1 = btns.includes('/system/list:员工管理')
+      const tab1 = btns.includes('/system/list:教师管理')
       const tab2 = btns.includes('/system/list:角色权限')
       const tab3 = btns.includes('/system/list:系统logo设置')
       tab1 || delete this.tabs.staff

src/pages/system/list/staff.vue

@@ -18,15 +18,15 @@
           </li>
         </ul>
         <div>
-          <el-button v-auth="'员工管理:新增员工'"
+          <el-button v-auth="'教师管理:新增教师'"
                      type="info"
                      round
                      @click="addTeacher">新增教师</el-button>
-          <el-button v-auth="'员工管理:批量导入'"
+          <el-button v-auth="'教师管理:批量导入'"
                      type="primary"
                      round
                      @click="batchImport">批量导入</el-button>
-          <el-button v-auth="'员工管理:批量删除'"
+          <el-button v-auth="'教师管理:批量删除'"
                      type="primary"
                      round
                      @click="delAllSelection">批量删除</el-button>
@@ -68,16 +68,16 @@
                          width="200"
                          align="center">
           <template slot-scope="scope">
-            <el-button v-auth="'员工管理:员工查看'"
+            <el-button v-auth="'教师管理:教师查看'"
                        type="text"
                        @click="showTeacher(scope.row)">查看</el-button>
-            <el-button v-auth="'员工管理:员工编辑'"
+            <el-button v-auth="'教师管理:教师编辑'"
                        type="text"
                        @click="editTeacher(scope.row)">编辑</el-button>
-            <el-button v-auth="'员工管理:重置密码'"
+            <el-button v-auth="'教师管理:重置密码'"
                        type="text"
                        @click="resetPassword(scope.row)">重置密码</el-button>
-            <el-button v-auth="'员工管理:员工删除'"
+            <el-button v-auth="'教师管理:教师删除'"
                        type="text"
                        @click="delTeacher(scope.row)">删除</el-button>
           </template>
@@ -218,7 +218,7 @@ export default {
       isAdd: false,
       teacherVisible: false,
       roleList: [], // 角色列表
-      orgList: [], // 员工组织架构列表
+      orgList: [], // 教师组织架构列表
       casProps: {
         value: 'id'
       },
@@ -267,7 +267,7 @@ export default {
       phoneRepeat: false,
       emailRepeat: false,
 
-      listData: [], // 员工列表数据
+      listData: [], // 教师列表数据
       keyword: "",
       page: 1,
       pageSize: 10,
@@ -278,9 +278,9 @@ export default {
       uploadList: [], // 上传文件列表
       uploadFaild: false, // 上传失败
 
-      gradeId: "", // 员工年级ID
+      gradeId: "", // 教师年级ID
-      staffArchitectureId: "", // 员工部门ID
+      staffArchitectureId: "", // 教师部门ID
-      submiting: false // 新增编辑员工防抖标识
+      submiting: false // 新增编辑教师防抖标识
     };
   },
   components: {
@@ -325,7 +325,7 @@ export default {
       this.page = 1
       this.getData()
     },
-    getData () { // 获取员工列表数据
+    getData () { // 获取教师列表数据
       let data = {
         keyWord: this.keyword,
         pageNum: this.page,
@@ -351,7 +351,7 @@ export default {
         // this.roleList = res.rolePage.records;
       }).catch(res => { });
     },
-    closeTeacher () { // 关闭新增/编辑员工对话框
+    closeTeacher () { // 关闭新增/编辑教师对话框
       this.form = {
         accountId: "",
         account: "",
@@ -366,13 +366,13 @@ export default {
       this.$refs.form.clearValidate();
       this.teacherVisible = false;
     },
-    addTeacher () { // 新增员工
+    addTeacher () { // 新增教师
       this.isDetail = false;
       this.isAdd = true;
       this.teacherVisible = true;
       this.orgList = this.$refs.org.orgList;
     },
-    getStaffDetail (accountId) { // 获取员工详情
+    getStaffDetail (accountId) { // 获取教师详情
       this.$get(`${this.api.staffDetail}?accountId=${accountId}`).then(res => {
         let { data } = res;
         this.form = data;

src/pages/system/list/staffSide.vue

@@ -6,7 +6,7 @@
             style="margin-bottom: 0">教师组织架构</h6>
         <el-button type="text"
                    @click="addMajor"
-                   v-auth="'员工管理:新增专业'">添加</el-button>
+                   v-auth="'教师管理:新增专业'">添加</el-button>
       </div>
       <org-tree :data="orgList"
                 show-checkbox
@@ -22,18 +22,18 @@
               slot-scope="{ node, data }">
           <span style="display: inline-block; margin-right: 20px">{{ node.label }}</span>
           <span>
-            <el-button v-auth="'员工管理:新增专业'"
+            <el-button v-auth="'教师管理:新增专业'"
                        type="text"
                        icon="el-icon-edit-outline"
                        @click="() => handleEdit(node, data)">
             </el-button>
-            <el-button v-auth="'员工管理:编辑专业'"
+            <el-button v-auth="'教师管理:编辑专业'"
                        v-if="node.level === 1"
                        type="text"
                        icon="el-icon-circle-plus-outline"
                        @click="() => handleAdd(node, data)">
             </el-button>
-            <el-button v-auth="'员工管理:删除专业'"
+            <el-button v-auth="'教师管理:删除专业'"
                        type="text"
                        icon="el-icon-delete"
                        @click="() => handleDel(node, data)">