From ae038d50b068a02c4fe53725095dc952bf75b797 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Wed, 15 Dec 2021 17:36:21 +0800
Subject: [PATCH] 冲突
---
src/pcviews/arc/edifact.vue | 61 +++---------------------------
1 files changed, 7 insertions(+), 54 deletions(-)
diff --git a/src/pcviews/arc/edifact.vue b/src/pcviews/arc/edifact.vue
index 048bea7..dbab888 100644
--- a/src/pcviews/arc/edifact.vue
+++ b/src/pcviews/arc/edifact.vue
@@ -1,15 +1,14 @@
/*
* @Author: Morpheus
* @Name: 行政办公
- * @Date: 2021-11-15 17:10:23
+ * @Date: 2021-11-15 17:14:47
* @Last Modified by: Morpheus
- * @Last Modified time: 2021-11-15 17:12:12
- *
- /
- <template>
+ * @Last Modified time: 2021-12-15 11:48:39
+ */
+<template>
<div>
- <arc-nav-bar :navList="list"
- :title="title"></arc-nav-bar>
+ <arc-nav-bar :title="title"
+ :arcCode="code"></arc-nav-bar>
</div>
</template>
@@ -18,56 +17,10 @@
data () {
return {
title: '行政办公',
- list: []
+ code: 1
}
},
created () {
- this.list = [
- {
- navTitle: '学校办公室',
- icon: '/img/navicon/tag.png'
- },
- {
- navTitle: '组织部',
- icon: '/img/navicon/tag.png'
- },
- {
- navTitle: '宣传部',
- icon: '/img/navicon/tag.png'
- },
- {
- navTitle: '博物馆',
- icon: '/img/navicon/tag.png'
- },
- {
- navTitle: '统战部',
- icon: '/img/navicon/tag.png'
- },
- {
- navTitle: '纪委办公室',
- icon: '/img/navicon/tag.png'
- },
- {
- navTitle: '巡查办公室',
- icon: '/img/navicon/tag.png'
- },
- {
- navTitle: '学生工作部（处）/团委',
- icon: '/img/navicon/tag.png'
- },
- {
- navTitle: '研究生工作部',
- icon: '/img/navicon/tag.png'
- },
- {
- navTitle: '保卫部',
- icon: '/img/navicon/tag.png'
- },
- {
- navTitle: '工会',
- icon: '/img/navicon/tag.png'
- }
- ]
},
methods: {
closeModel () {
--
Gitblit v1.9.3