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/orgnav/teaching.vue |   49 +++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/src/pcviews/orgnav/teaching.vue b/src/pcviews/orgnav/teaching.vue
index db380f5..5b028e2 100644
--- a/src/pcviews/orgnav/teaching.vue
+++ b/src/pcviews/orgnav/teaching.vue
@@ -1,15 +1,52 @@
-<template>
-  <div>
-      校内机构导览
-  </div>
+/*
+ * @Author: Morpheus
+ * @Name: 教学与科研机构
+ * @Date: 2021-11-15 10:02:12
+ * @Last Modified by: Morpheus
+ * @Last Modified time: 2021-12-15 14:44:35
+ */
+ <template>
+    <div>
+        <org-nav-bar :navList="list"
+                     :title="title"></org-nav-bar>
+    </div>
 </template>
 
 <script>
+import { getList } from '@/api/pc/orgnav/index'
 export default {
-
+    data () {
+        return {
+            title: '教学与科研机构',
+            list: []
+        }
+    },
+    created () {
+        getList({ type: 2 }).then(res => {
+            res.data.data.records.forEach(item => {
+                this.list.push({
+                    navTitle: item.mechanismname,
+                    icon: '/img/navicon/tag.png',
+                    longitude: item.jd,
+                    latitude: item.wd,
+                    alt: item.gd,
+                    heading: item.heading,
+                    pitch: item.pitch,
+                    roll: item.roll,
+                    bgImg: item.tpurl,
+                    QRImg: item.codeurl
+                })
+            })
+        })
+    },
+    methods: {
+        closeModel () {
+            this.$store.dispatch('delVisitedViews', this.$route)
+            this.$router.push('/pcLayout/default')
+        }
+    }
 }
 </script>
 
 <style>
-
 </style>

--
Gitblit v1.9.3