diff --git a/src/components/Article/shareItems.vue b/src/components/Article/shareItems.vue index c1137264..8d926c64 100644 --- a/src/components/Article/shareItems.vue +++ b/src/components/Article/shareItems.vue @@ -65,13 +65,24 @@ export default { }, methods: { jumpRouter(item){ - if(this.type!='myShare'){ + if(item.type){ + if(this.type!='myShare'){ + apiShares.updateIsRead(item.shareId).then(res=>{ + if(res.status==200){ + this.$emit('confirm',item) + } + }) + } + }else{ + if(this.type!='myShare'){ apiShares.updateIsRead(item.id).then(res=>{ if(res.status==200){ this.$emit('confirm',item) } }) } + } + this.$router.push({path:'/article/detail',query:{id:item.objId || item.id}}) // window.open(`${this.webBaseUrl}/article/detail?id=${item.objId}`) }, diff --git a/src/components/Case/caseItems.vue b/src/components/Case/caseItems.vue index 7dec60d5..b968f451 100644 --- a/src/components/Case/caseItems.vue +++ b/src/components/Case/caseItems.vue @@ -4,7 +4,7 @@
【已查看】 - 【未查看】 + 【未查看】
@@ -52,13 +52,35 @@ export default { }, methods:{ jumpRouter(item){ - if(this.type!='myShare'){ - apiShares.updateIsRead(item.id).then(res=>{ + if(item.type){ + if(this.type!='myShare'){ + apiShares.updateIsRead(item.shareId).then(res=>{ if(res.status==200){ this.$emit('confirm',item) + }else{ + this.$message({ + type: 'error', + message: res.message, + }); } }) } + }else{ + if(this.type!='myShare'){ + apiShares.updateIsRead(item.id).then(res=>{ + if(res.status==200){ + this.$emit('confirm',item) + }else{ + this.$message({ + type: 'error', + message: res.message, + }); + } + }) + } + } + console.log(item) + this.$router.push({path:'/case/detail',query:{id:item.cases.id}}) // window.open(`${this.webBaseUrl}/article/detail?id=${item.objId}`) }, diff --git a/src/components/Case/collectList.vue b/src/components/Case/collectList.vue index f1e0d115..2393efd8 100644 --- a/src/components/Case/collectList.vue +++ b/src/components/Case/collectList.vue @@ -4,7 +4,7 @@
- {{item.cases.title}} + {{item.cases.title}}
@@ -12,7 +12,7 @@
- {{item.cases.summary}} + {{item.cases.summary}}
diff --git a/src/components/Course/shareItem.vue b/src/components/Course/shareItem.vue index c40062a0..66c2ccd8 100644 --- a/src/components/Course/shareItem.vue +++ b/src/components/Course/shareItem.vue @@ -106,13 +106,24 @@ export default { return obj; }, jumpRouter(item){ - if(this.type!='myShare'){ + if(item.type){ + if(this.type!='myShare'){ + apiShares.updateIsRead(item.shareId).then(res=>{ + if(res.status==200){ + this.$emit('confirm',item) + } + }) + } + }else{ + if(this.type!='myShare'){ apiShares.updateIsRead(item.id).then(res=>{ if(res.status==200){ this.$emit('confirm',item) } }) } + } + if(item.contentType == 20) { this.$router.push({path:'/course/detail',query:{id:item.objId || item.id}}) } else { diff --git a/src/components/PortalHeader.vue b/src/components/PortalHeader.vue index e236872f..5d953cc7 100644 --- a/src/components/PortalHeader.vue +++ b/src/components/PortalHeader.vue @@ -7,7 +7,7 @@
首页
课程
-
案例
+
案例
文章
问答
@@ -29,7 +29,7 @@ - + @@ -113,7 +113,7 @@ export default { }, computed: { - ...mapGetters(['userInfo', 'userMsg']), + ...mapGetters(['userInfo', 'userMsg','caseShow']), avatarText(){ return userAvatarText(this.userInfo.name); @@ -128,7 +128,6 @@ export default { }; }, mounted() { - //console.log(this.userInfo,'111'); this.sex = this.userInfo.sex; this.$store.dispatch('refrashMsg'); this.loadBoeData(); diff --git a/src/components/Qa/shareList.vue b/src/components/Qa/shareList.vue index 19693a1e..81e040a0 100644 --- a/src/components/Qa/shareList.vue +++ b/src/components/Qa/shareList.vue @@ -73,13 +73,24 @@ export default { }, methods: { jumpRouter(item){ - if(this.type!='myShare'){ + if(item.type){ + if(this.type!='myShare'){ + apiShares.updateIsRead(item.shareId).then(res=>{ + if(res.status==200){ + this.$emit('confirm',item) + } + }) + } + }else{ + if(this.type!='myShare'){ apiShares.updateIsRead(item.id).then(res=>{ if(res.status==200){ this.$emit('confirm',item) } }) } + } + this.$router.push({path:'/qa/answer',query:{id:item.question.id}}) // window.open(`${this.webBaseUrl}/qa/answer?id=${item.question.id}`) }, diff --git a/src/components/Study/manager.vue b/src/components/Study/manager.vue index 325ffcec..6e27f526 100644 --- a/src/components/Study/manager.vue +++ b/src/components/Study/manager.vue @@ -16,7 +16,7 @@
已报名{{study.list.length}}人，共有0人报名未成功，共有{{study.list.length}}人通过审核
- + - +
@@ -39,12 +39,12 @@
- +
- 搜ssz索 + 搜 索
@@ -55,7 +55,7 @@
- + @@ -78,7 +78,7 @@ -
+
diff --git a/src/layout/components/TopNav/Index.vue b/src/layout/components/TopNav/Index.vue index 55bf33e1..5101f2eb 100644 --- a/src/layout/components/TopNav/Index.vue +++ b/src/layout/components/TopNav/Index.vue @@ -9,7 +9,7 @@
- +
@@ -134,7 +134,7 @@ export default { }; }, computed: { - ...mapGetters(['userInfo', 'userMsg']), + ...mapGetters(['userInfo', 'userMsg','caseShow']), showName: function() { //console.log('name='+this.name); //console.log('loginName='+this.loginName); diff --git a/src/store/getters.js b/src/store/getters.js index 45352469..2461ae5d 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -7,6 +7,7 @@ const getters = { cachedViews: state => state.tagsView.cachedViews, avatar: state => state.user.info.avatar, userInfo: state => state.user.info, + caseShow: state => state.user.caseShow, newslist: state => state.user.newslist, orgId: state => state.user.orgId, permissions: state => state.user.permissions, diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 8d315d08..0f8b062c 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -5,6 +5,7 @@ import apiMessage from '@/api/system/message.js' import apiCourse from "@/api/modules/course.js"; import apiBoeCourse from "@/api/boe/course.js"; import apiBoeLogout from "@/api/boe/login.js"; +import caseUser from "@/utils/caseShow.js" const user = { state: { @@ -14,7 +15,8 @@ const user = { messagesBeReviewed: 0,//待审核的消息 studyTaskCount:0,//学习任务数 curIdentity: sessionStorage.getItem("curIdentity") == null ? 1 : sessionStorage.getItem("curIdentity"), // 用户当前选择的身份 1学员 2教师 3管理员 - permissions: [] + permissions: [], + caseShow:false, }, mutations: { SET_Identity: (state, iden) => { @@ -28,7 +30,6 @@ const user = { }, SET_StudyTaskCount: (state, m) => { state.studyTaskCount = m - //console.log(state) }, SET_CurIdentity: (state, iden) => { state.curIdentity = iden @@ -39,7 +40,10 @@ const user = { }, SET_PERMISSIONS: (state, permissions) => { state.permissions = permissions - } + }, + SET_caseShow:(state, iden) => { + state.caseShow = iden + }, }, actions: { refrashMsg({ commit }) { @@ -112,7 +116,6 @@ const user = { InitData({ commit, state }) { let token = getToken(); return new Promise((resolve, reject) => { - //console.log(token); app.initData().then(res =>{ let studyTotalH = 0;// 小时显示 let t1=parseFloat(res.result.studyTotal); @@ -130,6 +133,13 @@ const user = { dfn = res.result.departFullName; } } + if (res.result.userNo != '') { + for(let key in caseUser){ + if(res.result.userNo == key) { + commit('SET_caseShow',true); + } + } + } const user = { aid: res.result.aid, sysId:res.result.sysId, diff --git a/src/utils/caseShow.js b/src/utils/caseShow.js new file mode 100644 index 00000000..6c378221 --- /dev/null +++ b/src/utils/caseShow.js @@ -0,0 +1,16 @@ +/**页面设置的一些常量*/ +const caseUser={ + '00004409': '李玉冰', + '101215': '徐涛', + '00005011': '邱炜玮', + '107863': '苗怡', + '00004928': '夏辉', + '110858': '毛继禹', + '10726944': '王芮', + 'boeutest': '测试小助手', + 'boeuadmin': '运营小助手', + '10181457': '董瑞华', + } + + export default caseUser; + \ No newline at end of file diff --git a/src/views/Index.vue b/src/views/Index.vue index 773c7834..abb9298e 100644 --- a/src/views/Index.vue +++ b/src/views/Index.vue @@ -107,7 +107,7 @@
-
+
推荐案例 @@ -336,7 +336,7 @@ export default { name: 'index', components: { portalHeader,ad, portalFooter, articleImage, portalFloatTools, authorInfo, interactRowBar, interactBar, courseImage }, computed: { - ...mapGetters(['userInfo']) + ...mapGetters(['userInfo','caseShow']) }, data() { return { diff --git a/src/views/course/ManageList.vue b/src/views/course/ManageList.vue index 06c13c86..be8fb855 100644 --- a/src/views/course/ManageList.vue +++ b/src/views/course/ManageList.vue @@ -194,7 +194,7 @@ - + --> - +
-
{{ caseDetail.orgDomain }}
-
{{ caseDetail.majorType }}
+
{{ orgDomainTranslate(caseDetail.orgDomain) }}
+
{{ orgDomainTranslate(caseDetail.orgDomainParent) }}
+
{{ majorTypeTranslate(caseDetail.majorType) }}
{{ caseDetail.keyword1 }}
{{ caseDetail.keyword2 }}
{{ caseDetail.keyword3 }}
@@ -197,7 +198,10 @@ export default { filePath:'' }, ankingList:[], - authorInfo:{ aid: '', name: '', orgInfo: '', avatar: '', code: '',sex:null} + authorInfo:{ aid: '', name: '', orgInfo: '', avatar: '', code: '',sex:null}, + domain: [], + Profess: [], + orgData: [], }; }, mounted() { @@ -207,6 +211,8 @@ export default { if (this.resolveId) { this.getCaseData(); } + this.getdomain(); + this.getProfess(); this.getAnkingData(); this.getPopularity(); this.getPositive(); @@ -216,6 +222,59 @@ export default { ); }, methods: { + getdomain() { + let key = "org_domain"; + apiDict.items(key).then(res => { + if (res.status == 200) { + this.domain = res.result; + if(res.result.length > 0) { + this.orgDomainLevel(res.result) + } + } + }); + }, + getProfess() { + let key = "major_type"; + apiDict.items(key).then(res => { + if (res.status == 200) { + this.Profess = res.result; + } + }); + }, + orgDomainLevel(organization) { + this.orgData = []; + organization.forEach(item=>{ + this.orgData.push(item); + if(item.list && item.list != "" && item.list.length > 0){ + item.list.forEach(it =>{ + this.orgData.push(it); + }) + } + }) + }, + orgDomainTranslate(code){ // 组织领域翻译 + if(code == '') { + return + } + let name = ''; + let data = this.orgData.find(item => item.code == code); + if(data == undefined){ + name = ''; + } else { + name = data.name; + } + return name; + }, + majorTypeTranslate(code){ // 专业分类翻译 + let name = ''; + let data = this.Profess.find(item => item.code == code); + if(data == undefined){ + name = ''; + } else { + name = data.name; + } + return name; + }, zoomBox(){ this.zoomShow = !this.zoomShow; }, @@ -303,6 +362,8 @@ export default { } } + }else{ + this.$message.error(res.message) } }); }, diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue index fce172f9..31c8b7e7 100644 --- a/src/views/portal/case/Index.vue +++ b/src/views/portal/case/Index.vue @@ -19,7 +19,7 @@
搜索条件 - {{ tag }} + {{ tag.value }}
@@ -32,7 +32,7 @@
全部 - {{ item.name}} + {{ item.name}}
@@ -48,9 +48,9 @@
@@ -90,8 +90,9 @@
-
{{ item.orgDomain }}
-
{{ item.majorType }}
+
{{ orgDomainTranslate(item.orgDomain) }}
+
{{ orgDomainTranslate(item.orgDomainParent) }}
+
{{ majorTypeTranslate(item.majorType) }}
{{ item.keyword1 }}
{{ item.keyword2 }}
{{ item.keyword3 }}
@@ -306,12 +307,12 @@ export default { type2: 0, type3: 0, isFind: false, - searchTags: [] + searchTags: [], + orgData: [], }; }, mounted() { - this.$nextTick(function() { this.closeSearch(); }); @@ -390,7 +391,6 @@ export default { apiCase.usernameList(5).then(res => { if (res.status == 200) { this.ankingList = res.result; - console.log(res); } }); }, @@ -416,6 +416,9 @@ export default { apiDict.items(key).then(res => { if (res.status == 200) { this.domain = res.result; + if(res.result.length > 0) { + this.orgDomainLevel(res.result) + } } }); }, @@ -427,6 +430,40 @@ export default { } }); }, + orgDomainLevel(organization) { + this.orgData = []; + organization.forEach(item=>{ + this.orgData.push(item); + if(item.list && item.list != "" && item.list.length > 0){ + item.list.forEach(it =>{ + this.orgData.push(it); + }) + } + }) + }, + orgDomainTranslate(code){ // 组织领域翻译 + if(code == '') { + return + } + let name = ''; + let data = this.orgData.find(item => item.code == code); + if(data == undefined){ + name = ''; + } else { + name = data.name; + } + return name; + }, + majorTypeTranslate(code){ // 专业分类翻译 + let name = ''; + let data = this.Profess.find(item => item.code == code); + if(data == undefined){ + name = ''; + } else { + name = data.name; + } + return name; + }, emitInput(val) { this.keyWord = val; this.isSeach = true; @@ -548,15 +585,24 @@ export default { caseData[i] !== null && caseData[i] !== undefined ) { - if (caseData[i] !== "0") { - this.searchTags.push(caseData[i]); + if (caseData[i] == "0") { + return; + } + if(i == 'majorType'){ + this.searchTags.push({ type:'majorType',value:this.majorTypeTranslate(caseData[i])}) + } + if(i == 'orgDomain'){ + this.searchTags.push({type:'orgDomain',value:this.orgDomainTranslate(caseData[i])}) + } + if(i == 'keyWord'){ + this.searchTags.push({type:'keyWord',value:caseData[i]}) } } } }, tagsClose(tag, index) { for (let i in this.queryCondition) { - if (tag === this.queryCondition[i]) { + if (tag.type === i) { if (i == "majorType") { this.queryCondition.majorType = null; } diff --git a/src/views/portal/course/Micro.vue b/src/views/portal/course/Micro.vue index 568a0576..47563269 100644 --- a/src/views/portal/course/Micro.vue +++ b/src/views/portal/course/Micro.vue @@ -135,12 +135,18 @@
- - {{courseInfo.praises}} + + + + + {{courseInfo.praises}}
- - {{courseInfo.trampleCount}} + + + + + {{courseInfo.trampleCount}}
diff --git a/src/views/portal/qa/Index.vue b/src/views/portal/qa/Index.vue index 7a15dc0a..dc9e26ca 100644 --- a/src/views/portal/qa/Index.vue +++ b/src/views/portal/qa/Index.vue @@ -65,7 +65,7 @@
-
+
diff --git a/src/views/qa/ManageList.vue b/src/views/qa/ManageList.vue index 330825f1..fda89e3b 100644 --- a/src/views/qa/ManageList.vue +++ b/src/views/qa/ManageList.vue @@ -42,7 +42,7 @@ 设置精华 取消精华 -
精华问题
+
精华问题
@@ -52,34 +52,34 @@ border stripe @selection-change="handleSelectionChange" :row-key="getRowKeys"> - - + + - - - - - + + + + + - - + + - + - +