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/arc/teaching.vue |   38 +++++++++++++++++++++++++++++---------
 1 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/src/pcviews/arc/teaching.vue b/src/pcviews/arc/teaching.vue
index cf891e0..d7562b0 100644
--- a/src/pcviews/arc/teaching.vue
+++ b/src/pcviews/arc/teaching.vue
@@ -3,29 +3,49 @@
  * @Name: 教学科研
  * @Date: 2021-11-15 17:14:47
  * @Last Modified by: Morpheus
- * @Last Modified time: 2021-12-15 11:48:26
+ * @Last Modified time: 2021-12-30 14:54:33
  */
 <template>
     <div>
-        <arc-nav-bar :title="title"
-                     :arcCode="code"></arc-nav-bar>
+
     </div>
 </template>
 
 <script>
+
+import { mapGetters } from 'vuex'
+
 export default {
     data () {
         return {
-            title: '教学科研',
-            code: 2
+
         }
     },
-    created () {
+    computed: {
+        ...mapGetters([
+            // 校内导航的显示关闭
+            'orgNavBarFlag',
+            'arcNavBarFlag'
+        ])
+    },
+    mounted () {
+        if (this.orgNavBarFlag == true) {
+            this.$store.commit('SET_ORGNAVBARTITLE', '')
+            this.$store.commit('SET_ORGNAVBARLIST', [])
+            this.$store.commit('SET_ORGNAVBARFLAG', false)
+        }
+        this.$store.commit('SET_ARCNAVBARTITLE', '教学科研')
+        this.$store.commit('SET_ARCNAVBARCODE', 2)
+        this.$store.commit('SET_ARCNAVBARFLAG', true)
     },
     methods: {
-        closeModel () {
-            this.$store.dispatch('delVisitedViews', this.$route)
-            this.$router.push('/pcLayout/default')
+
+    },
+    beforeDestroy () {
+        if (this.arcNavBarFlag == true) {
+            this.$store.commit('SET_ARCNAVBARTITLE', '')
+            this.$store.commit('SET_ARCNAVBARCODE', '')
+            this.$store.commit('SET_ARCNAVBARFLAG', false)
         }
     }
 }

--
Gitblit v1.9.3