From c169f7ed6f4ccf24fa302af25508da30a9f89e01 Mon Sep 17 00:00:00 2001 From: lmj <3407000732@qq.com> Date: Thu, 24 Nov 2022 14:24:28 +0800 Subject: [PATCH 01/30] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Course/collectItem.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/Course/collectItem.vue b/src/components/Course/collectItem.vue index 4566783f..18c45da5 100644 --- a/src/components/Course/collectItem.vue +++ b/src/components/Course/collectItem.vue @@ -229,6 +229,7 @@ export default { height: 30px; .uc-coures-name-left{ flex: 1; + font-size: 18px; } .canfavo{ margin-left:auto; From 3e02f4bd58cfa8b68811ad9b62e80bf3cd8fa685 Mon Sep 17 00:00:00 2001 From: daihh Date: Thu, 24 Nov 2022 15:13:53 +0800 Subject: [PATCH 02/30] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E6=9F=A5=E8=AF=A2=20?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=9B=9E=E4=BD=BF=E7=94=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=9F=A5=E8=AF=A2=20=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Course/courseForm.vue | 96 +++++++++++----------- src/components/System/chooseOrg.vue | 94 ++++++++++----------- src/views/course/TeacherList.vue | 118 +++++++++++++-------------- 3 files changed, 154 insertions(+), 154 deletions(-) diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue index bbdefbed..04e4f24f 100644 --- a/src/components/Course/courseForm.vue +++ b/src/components/Course/courseForm.vue @@ -560,10 +560,10 @@ export default { }, confirmChooseOrg(orgInfo){ //console.log(orgInfo,'orgInfo'); - // if(!orgInfo.hrbpId || orgInfo.hrbpId=='0'){ - // this.$message.error("此机构无HRBP审核人信息，请重新选择"); - // return; - // } + if(!orgInfo.hrbpId || orgInfo.hrbpId=='0'){ + this.$message.error("此机构无HRBP审核人信息，请重新选择"); + return; + } this.orgName=orgInfo.name; this.orgKid=orgInfo.kid; //kid已不存在 this.courseInfo.orgId=orgInfo.id; @@ -598,30 +598,30 @@ export default { }), loadUserGroup(){ let $this=this; - apiUserGroup.findByName('').then(rs=>{ - if(rs.status==200){ - let crowdList=[]; - rs.result.forEach(item=>{ - crowdList.push({ - id:item.key, - name:item.value, - disabled:false - }) - }) - this.userGroupList=crowdList; - } - }); - // apiUserBasic.getUserCrowds().then(rs=>{ - // if(rs.status==200){ - // let crowdList=[]; - // rs.result.forEach(item=>{ - // crowdList.push({ - // id:item.kid, - // name:item.audienceName + // apiUserGroup.findByName('').then(rs=>{ + // if(rs.status==200){ + // let crowdList=[]; + // rs.result.forEach(item=>{ + // crowdList.push({ + // id:item.key, + // name:item.value, + // disabled:false // }) - // }) - // } - // }) + // }) + // this.userGroupList=crowdList; + // } + // }); + apiUserBasic.getUserCrowds().then(rs=>{ + if(rs.status==200){ + let crowdList=[]; + rs.result.forEach(item=>{ + crowdList.push({ + id:item.kid, + name:item.audienceName + }) + }) + } + }) }, resOwnerName(code) { if (code == '') { @@ -1383,28 +1383,28 @@ export default { let $this = this; console.log(this.courseInfo.orgId,'this.courseInfo.orgId') //先获取HRBP审核 人员信息，姓名，机构路径，工号，用于邮件中的信息 - // apiUserBasic.getOrgHrbpInfo(this.courseInfo.orgId).then(rs=>{ - // if(rs.status==200 && rs.result){ - // postData.auditUser={ - // email:rs.result.email, - // code:rs.result.userNo, - // name:rs.result.name, - // aid:rs.result.id, - // orgId:rs.result.orgId - // } - // postData.course.orgName=rs.result.orgNamePath+'/'+rs.result.orgName; + apiUserBasic.getOrgHrbpInfo(this.courseInfo.orgId).then(rs=>{ + if(rs.status==200 && rs.result){ + postData.auditUser={ + email:rs.result.email, + code:rs.result.userNo, + name:rs.result.name, + aid:rs.result.id, + orgId:rs.result.orgId + } + postData.course.orgName=rs.result.orgNamePath+'/'+rs.result.orgName; - apiHRBP.getHRBP(this.orgKid).then(rs=>{ - if(rs.status==200 && rs.result.length>0){ - let hrbpUser=rs.result[0]; - postData.auditUser={ - email:hrbpUser.email, - code:hrbpUser.user_no, - name:hrbpUser.real_name, - kid:hrbpUser.user_id, - orgId:hrbpUser.orgnization_id - } - postData.course.orgName=hrbpUser.orgnization_name_path+'/'+$this.orgName; + // apiHRBP.getHRBP(this.orgKid).then(rs=>{ + // if(rs.status==200 && rs.result.length>0){ + // let hrbpUser=rs.result[0]; + // postData.auditUser={ + // email:hrbpUser.email, + // code:hrbpUser.user_no, + // name:hrbpUser.real_name, + // kid:hrbpUser.user_id, + // orgId:hrbpUser.orgnization_id + // } + // postData.course.orgName=hrbpUser.orgnization_name_path+'/'+$this.orgName; apiCourse.submitCourse(postData).then(res => { //this.btnLoading=false; diff --git a/src/components/System/chooseOrg.vue b/src/components/System/chooseOrg.vue index eef1ce99..80c41006 100644 --- a/src/components/System/chooseOrg.vue +++ b/src/components/System/chooseOrg.vue @@ -106,56 +106,56 @@ }else{ let $this=this; if(node.level === 1){ - parentId = '-1'; - // apiUserBasic.findOrgsByKeyword('').then(rs=>{ - // let treeList=[]; - // rs.result.forEach(item=>{ - // let node={ - // id:item.id, - // name:item.name, - // hrbpId:item.hrbpId, - // children:[] - // } - // treeList.push(node); - // }); - // resolve(treeList); - // }); + // parentId = '-1'; + apiUserBasic.findOrgsByKeyword('').then(rs=>{ + let treeList=[]; + rs.result.forEach(item=>{ + let node={ + id:item.id, + name:item.name, + hrbpId:item.hrbpId, + children:[] + } + treeList.push(node); + }); + resolve(treeList); + }); }else{ parentId = node.data.id; - // apiUserBasic.findOrgTreeByOrgId(parentId).then(rs=>{ - // if(rs.status==200){ - // let treeList=[]; - // if(rs.result.length>0 && rs.result[0].treeChildList){ - // rs.result[0].treeChildList.forEach(item=>{ - // let node={ - // id:item.id, - // name:item.name, - // hrbpId:item.hrbpId, - // children:[] - // } - // if(item.treeChildList){ - // $this.readTreeNode(node,item.treeChildList); - // } - // treeList.push(node); - // }); - // } - // resolve(treeList); - // }else{ - // resolve([]); - // } - // }); + apiUserBasic.findOrgTreeByOrgId(parentId).then(rs=>{ + if(rs.status==200){ + let treeList=[]; + if(rs.result.length>0 && rs.result[0].treeChildList){ + rs.result[0].treeChildList.forEach(item=>{ + let node={ + id:item.id, + name:item.name, + hrbpId:item.hrbpId, + children:[] + } + if(item.treeChildList){ + $this.readTreeNode(node,item.treeChildList); + } + treeList.push(node); + }); + } + resolve(treeList); + }else{ + resolve([]); + } + }); } - usergroupApi.userOrgs(parentId).then(res =>{ - if (res.status == 200) { - if(res.result != null && res.result.length > 0){ - resolve(res.result); - }else{ - resolve([]); - } - }else{ - this.$message.error('查询用户的机构失败'); - } - }); + // usergroupApi.userOrgs(parentId).then(res =>{ + // if (res.status == 200) { + // if(res.result != null && res.result.length > 0){ + // resolve(res.result); + // }else{ + // resolve([]); + // } + // }else{ + // this.$message.error('查询用户的机构失败'); + // } + // }); } }, handleSelectionChange(val) { diff --git a/src/views/course/TeacherList.vue b/src/views/course/TeacherList.vue index b76b34a0..6f321b1b 100644 --- a/src/views/course/TeacherList.vue +++ b/src/views/course/TeacherList.vue @@ -208,66 +208,66 @@ export default { type: 'warning' }).then(()=>{ //新的提交流程 - // apiUserBasic.getOrgHrbpInfo(row.orgId).then(rs=>{ - // if(rs.status==200 && rs.result){ - // let req={ - // courseId:row.id, - // email:rs.result.email, - // courseUser:row.sysCreateBy, - // courseName:row.name, - // ucode:rs.result.userNo, - // auditUser:rs.result.name, - // //ukid:hrbpUser.user_id, - // orgId:row.orgId, - // orgName:rs.result.orgNamePath +'/'+rs.result.name - // } - // apiCourse.sumbits(req).then(res=>{ - // if(res.status==200){ - // $this.$message.success('提交成功'); - // row.status=2 - // } - // if(res.status==400){ - // $this.$message.error('提交失败:'+res.message); - // } - // }) - // }else{ - // $this.$message.error("获取HRBP审核人员失败:"+rs.message); - // } - // }); + apiUserBasic.getOrgHrbpInfo(row.orgId).then(rs=>{ + if(rs.status==200 && rs.result){ + let req={ + courseId:row.id, + email:rs.result.email, + courseUser:row.sysCreateBy, + courseName:row.name, + ucode:rs.result.userNo, + auditUser:rs.result.name, + //ukid:hrbpUser.user_id, + orgId:row.orgId, + orgName:rs.result.orgNamePath +'/'+rs.result.name + } + apiCourse.sumbits(req).then(res=>{ + if(res.status==200){ + $this.$message.success('提交成功'); + row.status=2 + } + if(res.status==400){ + $this.$message.error('提交失败:'+res.message); + } + }) + }else{ + $this.$message.error("获取HRBP审核人员失败:"+rs.message); + } + }); - apiOrg.getSimple(row.orgId).then(rrs=>{ - if(rrs.status==200){ - apiHRBP.getHRBP(rrs.result.kid).then(rs=>{ - if(rs.status==200 && rs.result.length>0){ - let hrbpUser=rs.result[0]; - let req={ - courseId:row.id, - email:hrbpUser.email, - courseUser:row.sysCreateBy, - courseName:row.name, - ucode:hrbpUser.user_no, - auditUser:hrbpUser.real_name, - ukid:hrbpUser.user_id, - orgId:row.orgId, - orgName:rs.result.orgnization_name_path+'/'+rrs.result.name - } - apiCourse.sumbits(req).then(res=>{ - if(res.status==200){ - $this.$message.success('提交成功'); - row.status=2 - } - if(res.status==400){ - $this.$message.error('提交失败:'+res.message); - } - }) - }else{ - $this.$message.error("获取HRBP审核人员失败:"+rs.message); - } - }) - }else{ - $this.$message.error("处理资源归属失败，请重新设置资源归属"); - } - }) + // apiOrg.getSimple(row.orgId).then(rrs=>{ + // if(rrs.status==200){ + // apiHRBP.getHRBP(rrs.result.kid).then(rs=>{ + // if(rs.status==200 && rs.result.length>0){ + // let hrbpUser=rs.result[0]; + // let req={ + // courseId:row.id, + // email:hrbpUser.email, + // courseUser:row.sysCreateBy, + // courseName:row.name, + // ucode:hrbpUser.user_no, + // auditUser:hrbpUser.real_name, + // ukid:hrbpUser.user_id, + // orgId:row.orgId, + // orgName:rs.result.orgnization_name_path+'/'+rrs.result.name + // } + // apiCourse.sumbits(req).then(res=>{ + // if(res.status==200){ + // $this.$message.success('提交成功'); + // row.status=2 + // } + // if(res.status==400){ + // $this.$message.error('提交失败:'+res.message); + // } + // }) + // }else{ + // $this.$message.error("获取HRBP审核人员失败:"+rs.message); + // } + // }) + // }else{ + // $this.$message.error("处理资源归属失败，请重新设置资源归属"); + // } + // }) }) }, delItem(row) { From 1e691440d85ece55fe23607b96896824febe7d25 Mon Sep 17 00:00:00 2001 From: lmj <3407000732@qq.com> Date: Thu, 24 Nov 2022 15:19:32 +0800 Subject: [PATCH 03/30] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8F=E8=A7=88?= =?UTF-8?q?=E9=87=8F=E9=94=99=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Portal/interactBar.vue | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/components/Portal/interactBar.vue b/src/components/Portal/interactBar.vue index 0ffa22c6..21f70716 100644 --- a/src/components/Portal/interactBar.vue +++ b/src/components/Portal/interactBar.vue @@ -52,7 +52,10 @@ - {{ formatNum(data.views)}} +
+ {{ formatNum(data.views)}} + +
{{ formatNum(data.views)}} - + + {{ item.title }}
- -
{{item.tip}}-{{ item.content }}
-
{{item.tip}}
- + +
{{item.tip}}-{{ item.content }}
+
{{item.tip}}
+
删除
@@ -314,18 +315,28 @@ export default { // 跳转详情事件11 returnRouter(item) { + apiMessage.updateIsRead([item.id]).then(res => { + if (res.status == 200) { + this.$store.dispatch('refrashMsg'); + // this.queryMessage(true) + item.isRead = true; + } + }); if(item.pageUrl && item.pageUrl.length>10){ - return item.pageUrl; + location.href = item.pageUrl; }else{ if (item.refType == 2) { - return this.webBaseUrl + '/article/detail?id=' + item.refId; + // return this.webBaseUrl + '/article/detail?id=' + item.refId; + this.$router.push('/article/detail?id='+ item.refId); } else if (item.refType == 4||item.refType == 5) { - return this.webBaseUrl + '/qa/answer?id=' + item.refId; + // return this.webBaseUrl + '/qa/answer?id=' + item.refId; + this.$router.push('/qa/answer?id='+ item.refId); } else { // if (item.conType == 10) { // return this.webBaseUrl + '/course/micro?id=' + item.refId; // } else if (item.conType == 20) { - return this.webBaseUrl + '/course/detail?id=' + item.refId; + // return this.webBaseUrl + '/course/detail?id=' + item.refId; + this.$router.push('/course/detail?id='+ item.refId); // } } } From fe3a506419f2a1daeeb4612ebc259c8fb2f56d0d Mon Sep 17 00:00:00 2001 From: daihh Date: Thu, 24 Nov 2022 21:23:45 +0800 Subject: [PATCH 08/30] =?UTF-8?q?=E8=AF=84=E8=AE=BA=E5=9B=9E=E5=A4=8D?= =?UTF-8?q?=EF=BC=8C=E5=8A=A0=E8=BD=BD=E6=9B=B4=E5=A4=9A=EF=BC=8C=EF=BC=8C?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E5=9B=9E=E5=A4=8D=E5=86=85=E5=AE=B9=E8=BF=87?= =?UTF-8?q?=E5=A4=9A=EF=BC=8C=E6=9C=80=E5=A4=9A=E6=98=BE=E7=A4=BA3?= =?UTF-8?q?=E6=9D=A1=EF=BC=8C=E7=82=B9=E5=87=BB=E6=9B=B4=E5=A4=9A=E5=9B=9E?= =?UTF-8?q?=E5=A4=8D=E5=86=8D=E5=88=B73=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Portal/comments.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/components/Portal/comments.vue b/src/components/Portal/comments.vue index 5602f3a4..99a59e1c 100644 --- a/src/components/Portal/comments.vue +++ b/src/components/Portal/comments.vue @@ -113,7 +113,7 @@
-
+
@@ -159,7 +159,7 @@
-
加载更多>>
+
加载更多>>
@@ -384,7 +384,8 @@ }, methods: { loadReplyMore(item){ - item.showAll=true; + item.showNum=item.showNum+3; + //item.showAll=true; }, loadMore() { this.pageIndex +=1; @@ -455,6 +456,7 @@ let ids=[]; let allList=[]; res.result.list.forEach(item=>{ + item.showNum=3; item.answers=item.replys; item.showAll=false; item.avatar=''; From 44aeab29d85ccb12894c7be379706055d63c7d04 Mon Sep 17 00:00:00 2001 From: daihh Date: Fri, 25 Nov 2022 11:25:15 +0800 Subject: [PATCH 09/30] =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/boe/boeAjax.js | 5 ++++- src/components/Course/courseForm.vue | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/api/boe/boeAjax.js b/src/api/boe/boeAjax.js index 03ffde99..e4420088 100644 --- a/src/api/boe/boeAjax.js +++ b/src/api/boe/boeAjax.js @@ -47,6 +47,9 @@ const formRequest=axios.create({ Promise.reject(error) }); formRequest.interceptors.response.use(res => { + console.log(res); + res.data=JSON.parse(res.data); + const code = res.data.status || 200; if(code===200){ return res.data @@ -67,7 +70,7 @@ const formRequest=axios.create({ } }, error => { - console.log('err' + error) + console.log('err',error) let { message } = error; if (message == "Network Error") { message = "网络异常，请稍后重试"; diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue index 4efefea2..f76a5441 100644 --- a/src/components/Course/courseForm.vue +++ b/src/components/Course/courseForm.vue @@ -1382,9 +1382,10 @@ export default { }; this.btnLoading = true; let $this = this; - console.log(this.courseInfo.orgId,'this.courseInfo.orgId') + //console.log(this.courseInfo.orgId,'this.courseInfo.orgId') //先获取HRBP审核 人员信息，姓名，机构路径，工号，用于邮件中的信息 apiUserBasic.getOrgHrbpInfo(this.courseInfo.orgId).then(rs=>{ + if(rs.status==200 && rs.result){ postData.auditUser={ email:rs.result.email, @@ -1430,6 +1431,8 @@ export default { $this.btnLoading = false; this.$message.error('获取审核HRBP失败:'+rs.message); } + }).catch(err=>{ + this.$message.error('获取审核HRBP失败:'+err); }) }, From d42fbe6ba465d9e450ccdaf32d0930c3d80537bc Mon Sep 17 00:00:00 2001 From: daihh Date: Sat, 26 Nov 2022 11:26:07 +0800 Subject: [PATCH 10/30] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=B9iframe?= =?UTF-8?q?=E7=9A=84=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/images/gonggao/close1.png | Bin 0 -> 3664 bytes public/index.html | 6 ++--- src/data/pages.js | 1 + src/views/portal/iframe.vue | 38 +++++++++++++++++++++++++++++++ 4 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 public/images/gonggao/close1.png create mode 100644 src/views/portal/iframe.vue diff --git a/public/images/gonggao/close1.png b/public/images/gonggao/close1.png new file mode 100644 index 0000000000000000000000000000000000000000..3b2810ee7bebcb10f0d510d7751bbde3dc20f88a GIT binary patch literal 3664 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 - if(window.top != window.self){ - window.top.location=window.self.location; - } + // if(window.top != window.self){ + // window.top.location=window.self.location; + // } //u-pre.boe.com b82bf0f37925106413d857aa98e47533 //u.boe.com ea89f02dca369037a73c5e3907e2c14a var _hmt = _hmt || []; diff --git a/src/data/pages.js b/src/data/pages.js index 73065b4b..4938a832 100644 --- a/src/data/pages.js +++ b/src/data/pages.js @@ -94,6 +94,7 @@ export const pages=[ ]; export const iframes=[ + {title:'嵌入测试', path:'/iframe/index',hidden:false,component:'portal/iframe'}, {title:'课件管理', path:'/iframe/course/coursewares',hidden:false,component:'course/Courseware'}, {title:'课程管理', path:'/iframe/course/manages',hidden:false,component:'course/ManageList'}, {title:'考试试题管理', path:'/iframe/exam/questions',hidden:false,component:'exam/Question'}, diff --git a/src/views/portal/iframe.vue b/src/views/portal/iframe.vue new file mode 100644 index 00000000..f9aad76f --- /dev/null +++ b/src/views/portal/iframe.vue @@ -0,0 +1,38 @@ + + + From 50d6f00fdb228d67340a7e006f8f9b267f272e3b Mon Sep 17 00:00:00 2001 From: daihh Date: Mon, 28 Nov 2022 11:30:31 +0800 Subject: [PATCH 11/30] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=96=B0=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=AF=BB=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/boe/boeAjax.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/api/boe/boeAjax.js b/src/api/boe/boeAjax.js index e4420088..728435d2 100644 --- a/src/api/boe/boeAjax.js +++ b/src/api/boe/boeAjax.js @@ -47,9 +47,7 @@ const formRequest=axios.create({ Promise.reject(error) }); formRequest.interceptors.response.use(res => { - console.log(res); - res.data=JSON.parse(res.data); - + console.log(res); const code = res.data.status || 200; if(code===200){ return res.data From f7ced23a134710937b3184159c679a0c44106dbf Mon Sep 17 00:00:00 2001 From: daihh Date: Mon, 28 Nov 2022 11:50:13 +0800 Subject: [PATCH 12/30] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/UserCenter/menu.vue | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/components/UserCenter/menu.vue b/src/components/UserCenter/menu.vue index d7c9e346..90422620 100644 --- a/src/components/UserCenter/menu.vue +++ b/src/components/UserCenter/menu.vue @@ -98,7 +98,12 @@ 旧版管理员界面 - + + +