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/teaching.vue | 174 +--------------------------------------------------------
1 files changed, 4 insertions(+), 170 deletions(-)
diff --git a/src/pcviews/arc/teaching.vue b/src/pcviews/arc/teaching.vue
index 6ddc52b..cf891e0 100644
--- a/src/pcviews/arc/teaching.vue
+++ b/src/pcviews/arc/teaching.vue
@@ -3,12 +3,12 @@
* @Name: 教学科研
* @Date: 2021-11-15 17:14:47
* @Last Modified by: Morpheus
- * @Last Modified time: 2021-11-19 14:06:53
+ * @Last Modified time: 2021-12-15 11:48:26
*/
<template>
<div>
- <arc-nav-bar :navList="list"
- :title="title"></arc-nav-bar>
+ <arc-nav-bar :title="title"
+ :arcCode="code"></arc-nav-bar>
</div>
</template>
@@ -17,176 +17,10 @@
data () {
return {
title: '教学科研',
- list: []
+ code: 2
}
},
created () {
- this.list = [
- {
- title: '西大直街',
- flag: true,
- 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'
- }
- ]
- },
- {
- title: '黄河路',
- flag: false,
- 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'
- }
- ]
- },
- {
- title: '科学园',
- flag: false,
- list: [
- {
- navTitle: '一期小园',
- icon: '/img/navicon/tag.png'
- },
- {
- navTitle: '科学园A栋',
- icon: '/img/navicon/tag.png'
- },
- {
- navTitle: '科学园B1栋',
- icon: '/img/navicon/tag.png'
- },
- {
- navTitle: '科学园B2栋',
- icon: '/img/navicon/tag.png'
- },
- {
- navTitle: '科学园B3栋',
- icon: '/img/navicon/tag.png'
- },
- {
- navTitle: '科学园C1栋',
- icon: '/img/navicon/tag.png'
- },
- {
- navTitle: '科学园C2栋',
- icon: '/img/navicon/tag.png'
- },
- {
- navTitle: '科学园C3栋',
- icon: '/img/navicon/tag.png'
- },
- {
- navTitle: '科学园D栋',
- icon: '/img/navicon/tag.png'
- },
- {
- navTitle: '科学园E栋',
- icon: '/img/navicon/tag.png'
- },
- {
- navTitle: '科技创新大厦',
- icon: '/img/navicon/tag.png'
- }
- ]
- },
- {
- title: '土木楼',
- flag: false,
- list: [
- {
- navTitle: '土木楼',
- icon: '/img/navicon/tag.png'
- },
- {
- navTitle: '机电学院实验楼',
- icon: '/img/navicon/tag.png'
- }
- ]
- }
- ]
},
methods: {
closeModel () {
--
Gitblit v1.9.3