From 5c7c3cc18ce38ec6897808d63359cf774b958a30 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 31 Dec 2021 09:05:59 +0800
Subject: [PATCH] 冲突
---
src/pcviews/orgnav/teaching.vue | 43 ++++++++++++++++++++++++++++++++++---------
1 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/src/pcviews/orgnav/teaching.vue b/src/pcviews/orgnav/teaching.vue
index 57e84aa..595e871 100644
--- a/src/pcviews/orgnav/teaching.vue
+++ b/src/pcviews/orgnav/teaching.vue
@@ -3,25 +3,43 @@
* @Name: 教学与科研机构
* @Date: 2021-11-15 10:02:12
* @Last Modified by: Morpheus
- * @Last Modified time: 2021-12-21 15:12:33
+ * @Last Modified time: 2021-12-30 14:26:13
*/
<template>
<div>
- <org-nav-bar :navList="list"
- :title="title"></org-nav-bar>
+
</div>
</template>
<script>
import { getList } from '@/api/pc/orgnav/index'
+
+import { mapGetters } from 'vuex'
+
export default {
data () {
return {
- title: '教学与科研机构',
list: []
}
},
- created () {
+ computed: {
+ ...mapGetters([
+ // 校内导航的显示关闭
+ 'orgNavBarFlag',
+ 'arcNavBarFlag'
+ ])
+ },
+ mounted () {
+ if (this.arcNavBarFlag == true) {
+ this.$store.commit('SET_ARCNAVBARTITLE', '')
+ this.$store.commit('SET_ARCNAVBARCODE', '')
+ this.$store.commit('SET_ARCNAVBARFLAG', false)
+ }
+ this.$store.commit('SET_ORGNAVBARTITLE', '教学与科研机构')
+ this.$store.commit('SET_ORGNAVBARLIST', [])
+
+ this.$store.commit('SET_ORGNAVBARFLAG', true)
+
getList({ type: 4 }).then(res => {
res.data.data.records.forEach(item => {
this.list.push({
@@ -37,15 +55,22 @@
QRImg: item.codeurl,
address: item.address,
telephone: item.telephone,
- introduce: item.introduce
+ introduce: item.introduce,
+ videourl: item.videourl
})
})
+
+ this.$store.commit('SET_ORGNAVBARLIST', this.list)
})
},
methods: {
- closeModel () {
- this.$store.dispatch('delVisitedViews', this.$route)
- this.$router.push('/pcLayout/default')
+
+ },
+ beforeDestroy () {
+ if (this.orgNavBarFlag == true) {
+ this.$store.commit('SET_ORGNAVBARTITLE', '')
+ this.$store.commit('SET_ORGNAVBARLIST', [])
+ this.$store.commit('SET_ORGNAVBARFLAG', false)
}
}
}
--
Gitblit v1.9.3