修改bug

src/pages/account/login/index.vue

@@ -36,6 +36,7 @@
         </div>
 
         <el-dialog title="绑定手机号" :visible.sync="phoneVisible" :close-on-click-modal="false" width="30%">
+            依据国家政策法规，需绑定手机号进行实网络实名才可登录使用本平台
             <el-form ref="form" label-width="60px">
                 <el-form-item label="手机号">
                     <el-input style="width: 100%;" placeholder="请输入手机号" v-model="phone" maxlength="11"></el-input>

src/pages/achievement/list/index.vue

@@ -210,10 +210,15 @@ export default {
                 pageNum: this.page,
                 pageSize: this.pageSize
             };
-
             this.$post(this.api.getAchievementInfo, data).then(res => {
-                this.listData = res.page.records;
+                console.log(res)
-                this.total = res.page.total;
+                if(this.projectPermissions == 0){
+                    this.listData = res.page;
+                    this.total = res.total;
+                }else{
+                    this.listData = res.page.records;
+                    this.total = res.page.total;
+                }
                 this.$nextTick(() => {
                     this.loadIns.close();
                 });
@@ -231,6 +236,7 @@ export default {
             return true;
         },
         entry(row) { // 成绩管理
+            console.log(row)
             if (this.projectPermissions === 1) {
                 let list = row.classList.map(i => {
                     return { id: i.id.toString(), name: i.className };

src/pages/assessment/list/index.vue

@@ -5,7 +5,7 @@
             <ul class="filter">
                 <li>
                     <label>考核时间</label>
-                    <el-radio-group v-model="form.month">
+                    <el-radio-group v-model="form.month" @change="initData">
                         <el-radio v-for="(item,index) in dateList" :key="index" :label="item.id" border>{{ item.name }}</el-radio>
                     </el-radio-group>
                     <el-date-picker v-model="date" align="right" unlink-panels type="daterange" style="width: 300px;margin-left: 10px;" start-placeholder="开始日期" end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" clearable></el-date-picker>

src/pages/student/list/index.vue

@@ -214,8 +214,8 @@
                             </el-row>
                         </el-form>
                         <span slot="footer" class="dialog-footer" v-if="!isDetail">
-                            <el-button type="primary" @click="saveData(0)">保存</el-button>
+                            <el-button type="primary" :disabled='disableds' @click="saveData(0)">保存</el-button>
-                            <el-button v-if="isAdd" type="primary" @click="saveData(1)">保存并继续添加</el-button>
+                            <el-button v-if="isAdd" type="primary" :disabled='disableds' @click="saveData(1)">保存并继续添加</el-button>
                             <el-button size="small" @click="closeStudent">取消</el-button>
                         </span>
                     </el-dialog>
@@ -346,7 +346,7 @@ export default {
                     { required: true, message: "请输入名称", trigger: "blur" }
                 ],
                 account: [
-                    { validator: accountPass, trigger: 'blur' }
+                    { required: true,validator: accountPass, trigger: 'blur' }
                     // { required: true, message: "请输入账号", trigger: "blur" },
                     // {
                     //     pattern: /^[A-Za-z0-9]*$/,
@@ -358,7 +358,7 @@ export default {
                     { required: true, message: "请输入学生姓名", trigger: "blur" }
                 ],
                 workNumber: [
-                    { validator: workNumberPass, trigger: 'blur' }
+                    { required: true,validator: workNumberPass, trigger: 'blur' }
                     // { required: true, message: "请输入学生学号", trigger: "blur" },
                     // {
                     //     pattern: /^[A-Za-z0-9]*$/,
@@ -405,7 +405,8 @@ export default {
             exportCode: "",
             headers: {
                 token: util.local.get(Setting.tokenKey)
-            }
+            },
+            disableds:false
         };
     },
     mounted() {
@@ -741,6 +742,7 @@ export default {
                     url = `${this.api.checkWorkNumOrAccount}?platformId=${Setting.platformId}&type=1&accountId=${this.form.accountId}&account=${this.form.account}&workNumber=`;
                 }
                 this.$post(url).then(res => {
+                    this.disableds = false
                     if (this.isAdd && this.form.accountId) {
                         this.$refs.form.clearValidate();
                         this.form = {
@@ -758,6 +760,7 @@ export default {
                     }
                     this.accountReapeat = false;
                 }).catch(err => {
+                    this.disableds = true
                     if (this.isAdd) {
                         this.showTree = false;
                         this.$post(`${this.api.getDetailByAccount}?workNumber=${this.form.workNumber}&platformId=${Setting.platformId}&type=1`).then(res => {
@@ -990,7 +993,7 @@ export default {
                     this.exportCode = res.data.exportCode;
                     this.uploadFaild = true;
                 }
-                util.successMsg(`上传成功${res.data.successNum}，上传失败${res.data.failureNum}`);
+                util.successMsg(`本次上传有${res.data.failureNum}个失败`);
             } else {
                 res.message ? util.errorMsg(res.message) : util.errorMsg("上传失败，请检查数据");
             }

src/pages/system/list/staff.vue

@@ -144,7 +144,7 @@ export default {
             if (value === '') {
                 callback(new Error('请输入职工工号'));
             } else {
-                var pattern = /^[0-9]*$/;
+                var pattern = /^[a-zA-Z0-9]*$/;
                 if(pattern.test(value)){
                     this.workNumberChange();
                     callback();
@@ -311,6 +311,7 @@ export default {
         },
         getRoleData() { // 获取角色数据
             this.$get(`${this.api.roleList}?page=1&size=100&name=''&platformId=1`).then(res => {
+                console.log(res)
                 this.roleList = res.rolePage.records;
             }).catch(res => {});
         },
@@ -340,7 +341,8 @@ export default {
             this.$get(`${this.api.staffDetail}?accountId=${accountId}`).then(res => {
                 let { data } = res;
                 this.teacherForm = data;
-                this.teacherForm.roleValue = data.roleAndDeptList.map(i => i.roleId);
+                this.roleList = data.roleAndDeptList
+                this.teacherForm.roleValue = data.roleAndDeptList.map(i => i.roleName);
                 this.teacherForm.roleAndDeptList = data.roleAndDeptList.map(i => {
                     i.cascaderValue = [i.staffArchitectureId, i.gradeId]
                     return i;
@@ -450,7 +452,8 @@ export default {
                         cascaderValue: []
                     };
                     if (value.includes(i.id) && !ids.includes(i.id)) {
-                        obj.roleId = i.id;
+                        console.log(i)
+                        obj.roleId = i.roleId;
                         obj.roleName = i.roleName;
                         this.teacherForm.roleAndDeptList.push(obj);
                     }

src/styles/common.scss

@@ -38,6 +38,7 @@
   font-size: 14px !important;
   background-color: $--color-primary !important;
   border-radius: 4px !important;
+  border: none;
 }
 
 .el-input {