diff --git a/components/classInfoWorkBlank.vue b/components/classInfoWorkBlank.vue new file mode 100644 index 0000000..fd4515a --- /dev/null +++ b/components/classInfoWorkBlank.vue @@ -0,0 +1,110 @@ + + + + + \ No newline at end of file diff --git a/pages.json b/pages.json index 44cbdd3..302dba5 100644 --- a/pages.json +++ b/pages.json @@ -688,6 +688,13 @@ { "navigationBarTitleText" : "主任模型列表" } + }, + { + "path" : "pages/miniClass/classInfoWork", + "style" : + { + "navigationBarTitleText" : "评分员/记分员/学委班级详情页面" + } } ], "globalStyle": { diff --git a/pages/course/chapterDetailAndorid.vue b/pages/course/chapterDetailAndorid.vue index 0f6fa95..2edd4f4 100644 --- a/pages/course/chapterDetailAndorid.vue +++ b/pages/course/chapterDetailAndorid.vue @@ -1015,14 +1015,14 @@ } .noanser.lock { position: relative; align-items: center; - .lockView{ height: 300rpx; display: block !important; padding: 20rpx; color: #fff; border-radius: 10rpx; + .lockView{ min-height:100; display: block !important; padding: 20rpx; color: #fff; border-radius: 10rpx; position: absolute; top: 0; left: 0; z-index: 2; width: 100%; background-color: rgba(0, 0, 0, .8); .btnBox{ padding-top: 20rpx; } } } - .noanser { + .noanser { margin-top: 20rpx; margin-bottom: 20rpx; padding: 20rpx; background-color: rgba(255, 255, 255, .6); text-align: center; diff --git a/pages/mine/mine/index.vue b/pages/mine/mine/index.vue index d21545b..155479b 100644 --- a/pages/mine/mine/index.vue +++ b/pages/mine/mine/index.vue @@ -467,7 +467,7 @@ } } // 是班长 - if (this.roleObj.isMonitor) { + if (this.roleObj.isCommittee) { var n = this.pageList.find(item => { return item.name == '班级管理' }) diff --git a/pages/miniClass/DirectorModalList.vue b/pages/miniClass/DirectorModalList.vue index a5b55e7..b8fdf03 100644 --- a/pages/miniClass/DirectorModalList.vue +++ b/pages/miniClass/DirectorModalList.vue @@ -2,18 +2,10 @@ - + - - - + @@ -35,15 +35,16 @@ 【普通班】 【联合班】 【精英班】 - + {{item.title}} 目标学员人数：{{item.number}} 人 - + + 班内职务：{{item.roleName}} + 进入班级 @@ -58,7 +59,7 @@ + @click="onPageJump('/pages/miniClass/classInfoMan',item)"> @@ -71,15 +72,16 @@ 【普通班】 【联合班】 【精英班】 - + {{item.title}} 目标学员人数：{{item.number}} 人 - + + 班内职务：{{item.roleName}} + 进入班级 @@ -98,7 +100,7 @@ + @click="onPageJump('/pages/miniClass/classInfoMan',item)"> @@ -111,15 +113,16 @@ 【普通班】 【联合班】 【精英班】 - + {{item.title}} 目标学员人数：{{item.number}} 人 + + + 班内职务：{{item.roleName}} - 进入班级 @@ -227,7 +230,8 @@ status: 3, // 0 不显示, 1 加载中，2 加载全部完成，3 暂无数据 page: 1, flag: true, // 函数是否执行完 - + roleObj:{}, + roleCode:undefined }; }, //第一次加载 @@ -240,6 +244,7 @@ this.pageTitle = e.title this.pid = e.pid console.log(e, '传入分类id') + this.getUserRole() // this.getData() // this.getCateList(this.tagId) }, @@ -274,13 +279,15 @@ async onShow() { // 隐藏原生的tabbar // uni.hideTabBar(); + this.roleCode = await this.getUserRole() + // console.log('this.roleCode----',this.roleCode); this.classList = await this.getData('1','2') this.learningClassList = await this.getData('1','1') this.preClassList = await this.getData('1','0') // this.getLearingClassList() }, components: { - musicPlay + // musicPlay }, //方法 methods: { @@ -296,86 +303,30 @@ }, surl(imageurl) { return `url(${imageurl})` - }, - // 待开班 - getPreClassList() { - uni.showLoading({ - title: "加载中" + }, + async getUserRole(){ + var code = undefined + await this.$http.post("common/class/getRoleType").then( (res) => { + this.roleObj = res.result + if(this.roleObj.isMonitor){ + code = '1' + return + }else if(this.roleObj.isdMonitor){ + code = '2' + return + }else if(this.roleObj.isLearn){ + code = '3' + return + }else if(this.roleObj.isComment){ + code = '4' + return + }else if(this.roleObj.isCount){ + code = '5' + return + } }) - $http.request({ - url: "common/class/MyClassList", - method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档 - data: { - "role": "1", - "state": '0', //小班状态0待开班1已开班2完成 - "type": '' // 班类型 0小班 1联合班 2精英班 - }, - header: { //默认 无 说明：请求头 - 'Content-Type': 'application/json' - }, - }) - .then(res => { - if (res.code == 0) { - if (res.result.length > 0) { - this.preClassList = res.result - - } else { - this.preClassList = [] - } - } - // uni.hideLoading() - this.getData() - }).catch(e => { - // uni.hideLoading() - // this.getData() - console.log(e, '数据报错') - // this.status = 3 - uni.showToast({ - title: `获取数据失败`, - icon: 'error' - }) - }); - }, - // 学习中 - getLearingClassList() { - uni.showLoading({ - title: "加载中" - }) - $http.request({ - url: "common/class/MyClassList", - method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档 - data: { - "role": "1", - "state": '1', //小班状态0待开班1已开班2完成 - "type": '' // 班类型 0小班 1联合班 2精英班 - }, - header: { //默认 无 说明：请求头 - 'Content-Type': 'application/json' - }, - }) - .then(res => { - if (res.code == 0) { - if (res.result.length > 0) { - this.learningClassList = res.result - - } else { - this.learningClassList = [] - } - } - this.getPreClassList() - uni.hideLoading() - }).catch(e => { - uni.hideLoading() - this.getPreClassList() - - console.log(e, '数据报错') - // this.status = 3 - uni.showToast({ - title: `获取数据失败`, - icon: 'error' - }) - }); - }, + return code + }, goCreateClass() { console.log('this.addType', this.addType); if (this.addType != undefined) { @@ -419,7 +370,7 @@ url: "common/class/MyClassList", method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档 data: { - "role": role, + "isCommittee": role, "state": state, //小班状态0待开班1已开班2完成 "type": '' // 班类型 0小班 1联合班 2精英班 }, @@ -427,10 +378,24 @@ 'Content-Type': 'application/json' }, }) - .then(res => { + .then( async res => { if (res.code == 0) { if (res.result.length > 0) { // this.classList = res.result + res.result.forEach(async item => { + item.roleName = '' + item.roleCode = [] + if(item.role.length > 0){ + var _roleList = item.role + _roleList = _roleList.map( item => { + return item.role + }) + item.roleCode = _roleList + item.roleName = await this.getRoleName(_roleList) + console.log('res.result.roleName',res.result.roleName); + } + }) + _list = res.result } else { // this.classList = [] @@ -452,19 +417,63 @@ }); return _list }, + async getRoleName(list) { + var _roleName = '' + // var _code = '' + await list.forEach(item => { + switch (item) { + case '66': + _roleName += '主任'; + break; + case '0': + _roleName += ' 学员'; + break; + case '1': + _roleName += ' 班长'; + break; + case '2': + _roleName += ' 副班长'; + break; + case '3': + _roleName += ' 学习委员'; + break; + case '4': + _roleName += ' 评分员'; + break; + case '5': + _roleName += ' 记分员'; + break; + } + }) + return _roleName + }, + // 跳转 - async onPageJump(url, id, have) { - var isStudent = await this.getRealRole(id) - console.log('isStudent',isStudent); - if(isStudent){ - uni.navigateTo({ - url:`/pages/miniClass/classInfo?id=${id}` - }) - }else{ + async onPageJump(url, val) { + // var isStudent = await this.getRealRole(id) + var _url = '' + console.log('item---',val); + var nn = 0 + if(val.roleCode.length > 0){ + + val.roleCode.forEach(item=>{ + if(item == '主任' || item == '副主任' || item == '1' || item == '2' ){ + console.log('符合主任',url); + + nn++ + } + }) + } + console.log('符合主任', _url); + if(nn > 0){ + _url = url + }else{ + _url = "/pages/miniClass/classInfoWork" + } uni.navigateTo({ - url: `${url}?id=${id}&have=${have}` + url: `${_url}?id=${val.id}` }); - } + }, // 获取真实的身份信息 async getRealRole(id) { @@ -617,12 +626,12 @@ .jianjie { line-height: 30rpx; - height: 60rpx; + margin-bottom: 10rpx; overflow: hidden; overflow: hidden !important; - margin-top: 10rpx; + font-size: 24rpx; - @include bov(); + // @include bov(); color: #9c9c9c; } diff --git a/pages/miniClass/addClass.vue b/pages/miniClass/addClass.vue index 20cbc26..c95fe66 100644 --- a/pages/miniClass/addClass.vue +++ b/pages/miniClass/addClass.vue @@ -4,13 +4,13 @@ - + + - - + --> + + - + --> *班级名称: @@ -139,6 +139,7 @@ modelLIst: [ // { value: 0, text: "请选择" }, ], + modelTitle:undefined }; }, //第一次加载 @@ -146,8 +147,8 @@ console.log('收到的值', e); // this.pageType = e.type this.form.type = e.type - // this.modeType = e.type - + this.form.modelId = parseInt(e.modelId) + this.modelTitle = e.modelTitle if(e.id){ this.pageType = '编辑' this.form.id = e.id @@ -339,6 +340,7 @@ }) return } + console.log('*****',this.form.modelId); var _url = '' this.form.id ? _url = 'common/class/editClass' : _url = "common/class/addClass" $http.request({ @@ -367,7 +369,7 @@ this.fileList1 = [] this.fileList2 = [] uni.navigateTo({ - url:'/pages/miniClass/miniClassMan' + url:`/pages/miniClass/miniClassMan?id=${this.form.modelId}&modelTitle=${this.modelTitle}` }) // this.$nextTick(() => { // uni.navigateBack({ diff --git a/pages/miniClass/addHomeWork.vue b/pages/miniClass/addHomeWork.vue index ab41f51..e9f31e3 100644 --- a/pages/miniClass/addHomeWork.vue +++ b/pages/miniClass/addHomeWork.vue @@ -5,11 +5,11 @@ - + + - + --> *标题: @@ -123,7 +123,7 @@ }, pageType: '', - pageName:'' + pageName:'' }; }, //第一次加载 diff --git a/pages/miniClass/classInfo.vue b/pages/miniClass/classInfo.vue index 58e709c..316cfab 100644 --- a/pages/miniClass/classInfo.vue +++ b/pages/miniClass/classInfo.vue @@ -29,6 +29,27 @@ 人数{{students.length}}/{{thisClass.number}}人 管理成员点击查看 + + + + 表现分 + + + + + + 作业得分 + 3分 + + 医案得分 + 6分 + + 心得得分 + 10分 + 思考题分 + 2分 + + + @@ -237,6 +259,7 @@ export default { data() { return { + horizontal: 'right', vertical: 'bottom', direction: 'vertical', @@ -265,12 +288,17 @@ thisClass: {}, students: [], - tabId: '0', + tabId: '3', curTagIndex: 0, scrollable: false, pPage:0, // 已开班 - tabList02: [{ + tabList02: [ + { + name: '班内提交', + id: '3' + }, + { name: '班内课程', id: '0' }, @@ -281,10 +309,7 @@ { name: '班内学员', id: '2' - }, { - name: '班内提交', - id: '3' - } + } ], // 待开班 tabList01: [{ @@ -366,14 +391,7 @@ this.taskList = [] this.getList() uni.stopPullDownRefresh() - }, - onBackPress() { - if (this.$refs.fab.isShow) { - this.$refs.fab.close() - return true - } - return false - }, + }, onShow() { this.getClassInfo() @@ -790,6 +808,14 @@ } }); }, + clickHelp(){ + uni.showModal({ + title:'说明', + content:"表现分占最终总成绩的40%，由作业,医案,心得,思考题四部分构成，每部分各占四分之一，且每部分最高为10分，总计40分。", + showCancel:false, + confirmText:'好的' + }) + }, showmoreTask(){ uni.navigateTo({ url:`/pages/miniClass/classCaskList?id=${this.thisClass.id}&type=${this.tijiaoTitleId}` @@ -847,7 +873,9 @@ this.courses = res.result.courses this.students = res.result.students this.refresh = true - + if(this.thisClass.state != 0){ + this.getList() + } } uni.hideLoading() }).catch(e => { @@ -901,12 +929,19 @@ .btn{display: inline-block; border-radius: 20rpx ; padding: 10rpx 20rpx; background-color: $themeColor; color: #fff;} } .taskEdit{color: $themeColor; display: inline-block; padding-left: 20rpx;} + .scoreTitle{text-align: center; margin-bottom: 20rpx; + .titles{display: inline-block; padding: 6rpx 20rpx; background-color: #258feb; + border-radius: 0 0 30rpx 30rpx ; color: #fff; + text{ font-size: 40rpx !important;} + } + span{display: block;} + } .pingfenBox { border: 2px dotted #bed4ee; padding: 20rpx; - background-color: rgba(255, 255, 255, .6); + background-color: #fff; border-radius: 20rpx; - + padding-top: 0; .flex_box { justify-content: space-between; } @@ -1031,6 +1066,9 @@ border-radius: 40rpx; } } + .userScore{ text-align: center; + .mainTxt{font-size: 50rpx; color: $themeColor; font-style: normal; padding-right: 4rpx;} + } .qrcode{width:100%; image{ width: 200rpx;height: 200rpx; diff --git a/pages/miniClass/classInfoMan.vue b/pages/miniClass/classInfoMan.vue index 612b55c..4dbc189 100644 --- a/pages/miniClass/classInfoMan.vue +++ b/pages/miniClass/classInfoMan.vue @@ -18,12 +18,11 @@

班级名称：{{thisClass.title}}

【 班内职务：{{getRoleName}} 】 - - + - + @@ -35,51 +34,20 @@ 修改班级 - + 开班 - + 结班 - + 删除班级 - - - - - - 发布 - - - - - - 作业 - - - - - - 医案 - - - - - - 心得 - - - - - - 思考题 - - + 创建日期 - + + + @@ -194,6 +177,7 @@ + + \ No newline at end of file diff --git a/pages/miniClass/memberSet.vue b/pages/miniClass/memberSet.vue index aa18e3a..3ce7fd3 100644 --- a/pages/miniClass/memberSet.vue +++ b/pages/miniClass/memberSet.vue @@ -7,7 +7,7 @@ - + *班长： @@ -44,7 +44,7 @@ + v-show="roleCode.includes('1') || roleCode.includes('主任') || roleCode.includes('副主任')"> @@ -256,7 +256,7 @@ "monitor": undefined, //班长 "dmonitor": undefined, //2班长 "learner": undefined, //学习委员 - "scorer": [undefined, undefined], //评分员 + "scorer": [undefined, undefined,undefined], //评分员 "counter": [undefined, undefined] //记分员 }, telError: false, diff --git a/pages/miniClass/miniClassMan.vue b/pages/miniClass/miniClassMan.vue index aef3768..1176245 100644 --- a/pages/miniClass/miniClassMan.vue +++ b/pages/miniClass/miniClassMan.vue @@ -2,7 +2,7 @@ - + @@ -12,7 +12,7 @@ - 当前模型名称：{{modelTitle}} + 当前教研室名称：{{modelTitle}} + + 班内职务：{{item.roleName}} + 进入班级 @@ -87,8 +88,9 @@ 目标学员人数：{{item.number}} 人 - + + 班内职务：{{item.roleName}} + 进入班级 @@ -127,8 +129,9 @@ 目标学员人数：{{item.number}} 人 - + + 班内职务：{{item.roleName}} + 进入班级 @@ -300,7 +303,7 @@ methods: { goAddClasss(){ uni.navigateTo({ - url:`/pages/miniClass/addClass?type=${this.modelType}` + url:`/pages/miniClass/addClass?type=${this.modelType}&modelId=${this.modelId}&modelTitle=${this.modelTitle}` }) }, selectChange(e) { @@ -369,11 +372,20 @@ if (res.classEntityList.length > 0) { // this.classList = res.result _list = res.classEntityList + _list.forEach(item => { + item.roleName = '' + if(item.ddirectorId == this.userInfo.id){ + item.roleName = '副主任' + } + if(item.directorId == this.userInfo.id){ + item.roleName = '主任' + } + }) } else { // this.classList = [] _list = [] } - // this.flag = true + console.log('res.classEntityList',res.classEntityList); } uni.hideLoading() }).catch(e => { diff --git a/pages/miniClass/myClassList.vue b/pages/miniClass/myClassList.vue index 5c93ab7..5703df5 100644 --- a/pages/miniClass/myClassList.vue +++ b/pages/miniClass/myClassList.vue @@ -343,7 +343,7 @@ url: "common/class/MyClassList", method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档 data: { - "role": role, + "isCommittee": role, "state": state, //小班状态0待开班1已开班2完成 "type": '' // 班类型 0小班 1联合班 2精英班 }, diff --git a/pages/miniClass/taskDetailForMan.vue b/pages/miniClass/taskDetailForMan.vue index 131bf3d..1dbd964 100644 --- a/pages/miniClass/taskDetailForMan.vue +++ b/pages/miniClass/taskDetailForMan.vue @@ -19,8 +19,9 @@ - - + + 修改 @@ -55,7 +56,7 @@ 等待另一名评分员评分 - 请您评分 + 请您评分 未开始评分 @@ -100,15 +101,16 @@ 分数：{{curReplay.score}} - 未评分 + 未生成成绩