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/service/transfer.vue | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/src/pcviews/service/transfer.vue b/src/pcviews/service/transfer.vue
index f460510..49b5d24 100644
--- a/src/pcviews/service/transfer.vue
+++ b/src/pcviews/service/transfer.vue
@@ -3,7 +3,7 @@
* @Name: 圈存机
* @Date: 2021-11-15 17:14:47
* @Last Modified by: Morpheus
- * @Last Modified time: 2021-12-22 11:21:20
+ * @Last Modified time: 2021-12-30 14:31:32
*/
<template>
<div>
@@ -14,6 +14,9 @@
</template>
<script>
+
+import { mapGetters } from 'vuex'
+
export default {
data () {
return {
@@ -23,6 +26,23 @@
}
},
created () {
+ if (this.orgNavBarFlag == true) {
+ this.$store.commit('SET_ORGNAVBARTITLE', '')
+ this.$store.commit('SET_ORGNAVBARLIST', [])
+ this.$store.commit('SET_ORGNAVBARFLAG', false)
+ }
+ if (this.arcNavBarFlag == true) {
+ this.$store.commit('SET_ARCNAVBARTITLE', '')
+ this.$store.commit('SET_ARCNAVBARCODE', '')
+ this.$store.commit('SET_ARCNAVBARFLAG', false)
+ }
+ },
+ computed: {
+ ...mapGetters([
+ // 校内导航的显示关闭
+ 'orgNavBarFlag',
+ 'arcNavBarFlag'
+ ])
},
methods: {
closeModel () {
--
Gitblit v1.9.3