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/masses.vue |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/pcviews/orgnav/masses.vue b/src/pcviews/orgnav/masses.vue
index 17f630b..d321806 100644
--- a/src/pcviews/orgnav/masses.vue
+++ b/src/pcviews/orgnav/masses.vue
@@ -3,7 +3,7 @@
  * @Name: 党群机构
  * @Date: 2021-11-15 10:02:12
  * @Last Modified by: Morpheus
- * @Last Modified time: 2021-12-14 15:38:17
+ * @Last Modified time: 2021-12-15 14:42:59
  */
  <template>
     <div>
@@ -22,7 +22,7 @@
         }
     },
     created () {
-        getList({ type: 1462593559077318657 }).then(res => {
+        getList({ type: 1 }).then(res => {
             res.data.data.records.forEach(item => {
                 this.list.push({
                     navTitle: item.mechanismname,
@@ -30,6 +30,9 @@
                     longitude: item.jd,
                     latitude: item.wd,
                     alt: item.gd,
+                    heading: item.heading,
+                    pitch: item.pitch,
+                    roll: item.roll,
                     bgImg: item.tpurl,
                     QRImg: item.codeurl
                 })

--
Gitblit v1.9.3