{{ item.orgDomain }}
- {{ item.majorType }}
+ {{ orgDomainTranslate(item.orgDomain) }}
+ {{ majorTypeTranslate(item.majorType) }}
{{ item.keyword1 }}
{{ item.keyword2 }}
{{ item.keyword3 }}
@@ -306,12 +306,12 @@ export default {
type2: 0,
type3: 0,
isFind: false,
- searchTags: []
+ searchTags: [],
+ orgData: [],
};
},
mounted() {
-
this.$nextTick(function() {
this.closeSearch();
});
@@ -390,7 +390,6 @@ export default {
apiCase.usernameList(5).then(res => {
if (res.status == 200) {
this.ankingList = res.result;
- console.log(res);
}
});
},
@@ -416,6 +415,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 +429,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;
From 9b7e21cf137b8931d31d62fd0be1ec9df6d7ce0e Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Mon, 13 Jun 2022 16:15:31 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/portal/case/Detail.vue | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/views/portal/case/Detail.vue b/src/views/portal/case/Detail.vue
index 71f98594..bf035b4b 100644
--- a/src/views/portal/case/Detail.vue
+++ b/src/views/portal/case/Detail.vue
@@ -361,6 +361,8 @@ export default {
}
}
+ }else{
+ this.$message.error(res.message)
}
});
},
From 71b2aa90a8ce31e8c72aaf2e213368bbc814f042 Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Mon, 13 Jun 2022 16:21:47 +0800
Subject: [PATCH 07/13] =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=A1=88=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/PortalHeader.vue | 7 ++++---
src/layout/components/TopNav/Index.vue | 4 ++--
src/store/getters.js | 1 +
src/store/modules/user.js | 18 ++++++++++++++----
src/utils/caseShow.js | 16 ++++++++++++++++
src/views/Index.vue | 4 ++--
6 files changed, 39 insertions(+), 11 deletions(-)
create mode 100644 src/utils/caseShow.js
diff --git a/src/components/PortalHeader.vue b/src/components/PortalHeader.vue
index e236872f..06963b98 100644
--- a/src/components/PortalHeader.vue
+++ b/src/components/PortalHeader.vue
@@ -7,7 +7,7 @@
@@ -29,7 +29,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 {
From a9327359ae7a5729f2feaba0cc822c0a1cf3d6f9 Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Mon, 13 Jun 2022 16:32:45 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/PortalHeader.vue | 2 --
src/views/portal/case/Detail.vue | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/components/PortalHeader.vue b/src/components/PortalHeader.vue
index 06963b98..5d953cc7 100644
--- a/src/components/PortalHeader.vue
+++ b/src/components/PortalHeader.vue
@@ -128,8 +128,6 @@ export default {
};
},
mounted() {
- console.log(this.caseShow,'caseShow');
- //console.log(this.userInfo,'111');
this.sex = this.userInfo.sex;
this.$store.dispatch('refrashMsg');
this.loadBoeData();
diff --git a/src/views/portal/case/Detail.vue b/src/views/portal/case/Detail.vue
index bf035b4b..0a39e7ac 100644
--- a/src/views/portal/case/Detail.vue
+++ b/src/views/portal/case/Detail.vue
@@ -14,7 +14,7 @@
{{ caseDetail.title }}
- {{item.cases.title}}
+ {{item.cases.title}}
@@ -12,7 +12,7 @@
- {{item.cases.summary}}
+ {{item.cases.summary}}
-
@@ -91,6 +91,7 @@
{{ orgDomainTranslate(caseDetail.orgDomain) }}
+ {{ orgDomainTranslate(item.orgDomain) }}
+ {{ orgDomainTranslate(item.orgDomainParent) }}
{{ majorTypeTranslate(caseDetail.majorType) }}
{{ caseDetail.keyword1 }}
{{ caseDetail.keyword2 }}
diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue
index 20336b0c..31c8b7e7 100644
--- a/src/views/portal/case/Index.vue
+++ b/src/views/portal/case/Index.vue
@@ -19,7 +19,7 @@
{{ orgDomainTranslate(item.orgDomain) }}
+ {{ orgDomainTranslate(item.orgDomainParent) }}
{{ majorTypeTranslate(item.majorType) }}
{{ item.keyword1 }}
{{ item.keyword2 }}
@@ -584,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;
}
From 1ac252265908e1f7032adab27e0980e1edc78b7e Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Mon, 13 Jun 2022 17:27:49 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/portal/case/Detail.vue | 4 ++--
src/views/portal/qa/Index.vue | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/portal/case/Detail.vue b/src/views/portal/case/Detail.vue
index 73236c9f..3ddf5afd 100644
--- a/src/views/portal/case/Detail.vue
+++ b/src/views/portal/case/Detail.vue
@@ -25,8 +25,8 @@
-
{{ orgDomainTranslate(item.orgDomain) }}
- {{ orgDomainTranslate(item.orgDomainParent) }}
+ {{ orgDomainTranslate(caseDetail.orgDomain) }}
+ {{ orgDomainTranslate(caseDetail.orgDomainParent) }}
{{ majorTypeTranslate(caseDetail.majorType) }}
{{ caseDetail.keyword1 }}
{{ caseDetail.keyword2 }}
diff --git a/src/views/portal/qa/Index.vue b/src/views/portal/qa/Index.vue
index 7a15dc0a..25c70122 100644
--- a/src/views/portal/qa/Index.vue
+++ b/src/views/portal/qa/Index.vue
@@ -65,7 +65,7 @@
-
+
![]()
From 0afd998cd0b3eaeac17706b5adae7b9dfc819a5f Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Mon, 13 Jun 2022 17:53:16 +0800
Subject: [PATCH 12/13] =?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/Article/shareItems.vue | 13 ++++++++++++-
src/components/Case/caseItems.vue | 21 +++++++++++++++++++--
src/components/Course/shareItem.vue | 13 ++++++++++++-
src/components/Qa/shareList.vue | 13 ++++++++++++-
src/views/portal/qa/Index.vue | 2 +-
5 files changed, 56 insertions(+), 6 deletions(-)
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 156af184..b968f451 100644
--- a/src/components/Case/caseItems.vue
+++ b/src/components/Case/caseItems.vue
@@ -4,7 +4,7 @@
【已查看】
- 【未查看】
+ 【未查看】
@@ -52,7 +52,21 @@ 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{
+ 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)
@@ -64,6 +78,9 @@ export default {
}
})
}
+ }
+ 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/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/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/views/portal/qa/Index.vue b/src/views/portal/qa/Index.vue
index 25c70122..dc9e26ca 100644
--- a/src/views/portal/qa/Index.vue
+++ b/src/views/portal/qa/Index.vue
@@ -65,7 +65,7 @@
-
-->
+
![]()
From 3c996e01494e33d7af463578bfe0a7cec7866574 Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Mon, 13 Jun 2022 18:25:01 +0800
Subject: [PATCH 13/13] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/portal/case/Detail.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/portal/case/Detail.vue b/src/views/portal/case/Detail.vue
index 3ddf5afd..96c2f8c6 100644
--- a/src/views/portal/case/Detail.vue
+++ b/src/views/portal/case/Detail.vue
@@ -25,8 +25,8 @@
-
{{ orgDomainTranslate(caseDetail.orgDomain) }}
- {{ orgDomainTranslate(caseDetail.orgDomainParent) }}
+ {{ orgDomainTranslate(caseDetail.orgDomain) }}
+ {{ orgDomainTranslate(caseDetail.orgDomainParent) }}
{{ majorTypeTranslate(caseDetail.majorType) }}
{{ caseDetail.keyword1 }}
{{ caseDetail.keyword2 }}