From 81f54040c2cb65537c6c6e1db8358a39a57dea0d Mon Sep 17 00:00:00 2001
From: mayisheng <admin>
Date: Mon, 15 Aug 2022 16:14:01 +0800
Subject: [PATCH] 1

---
 src/components/serviceNavBar/index.vue |  199 +++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 157 insertions(+), 42 deletions(-)

diff --git a/src/components/serviceNavBar/index.vue b/src/components/serviceNavBar/index.vue
index 4a76bf5..9e12ce1 100644
--- a/src/components/serviceNavBar/index.vue
+++ b/src/components/serviceNavBar/index.vue
@@ -5,7 +5,7 @@
                 <img class="icon deblurring" :src="headerLog" alt />
                 <span>{{ title }}</span>
             </div>
-            <img class="close" src="/img/navicon/close.png" alt @click="closeModel" />
+            <img class="close deblurring" src="/img/navicon/close.png" alt @click="closeModel" />
         </template>
         <template slot="public-box-content">
             <div class="tab" v-show="false">
@@ -36,12 +36,13 @@
 import { mapGetters } from 'vuex'
 import { getList, getLifeList } from '@/api/pc/service/index'
 
+let ourLayer = null
+
 export default {
     name: 'ServiceNavBar',
     data () {
         return {
-            itemNavList: [],
-            ourLayer: null
+            itemNavList: []
         }
     },
     props: {
@@ -57,7 +58,6 @@
     },
     computed: {
         ...mapGetters([
-            'viewer',
             'popupBgUrl',
             'pupupQRUrl',
             // 点信息
@@ -69,12 +69,13 @@
             // 介绍
             'introduceText',
             // 全景地址
-            'panoramaUrl'
+            'panoramaUrl',
+            'twoOrThree'
         ])
     },
     created () {
         this.titleList = []
-        // 三江校区//"土木楼"//"科学园"//"黄河路"//"红旗校区"
+        // 三江社区//"土木楼"//"科学园"//"黄河路"//"红旗社区"
         getList().then((res) => {
             res.data.data.forEach((item) => {
                 // console.log(item, "see");
@@ -90,8 +91,38 @@
             this.getChilsNavs(this.titleList[0].key)
         })
     },
+    watch: {
+        twoOrThree: {
+            handler (newData, oldData) {
+                if (newData == '三 维') {
+                    if (ourLayer != null) {
+                        ourLayer.eachOverlay((item) => {
+                            const position = this.coordinate(item.attrParam.x)
+
+                            item.position = new global.DC.Position(Number(position.lng), Number(position.lat), 0)
+                        })
+                    }
+                } else {
+                    if (ourLayer != null) {
+                        ourLayer.eachOverlay((item) => {
+                            item.position = new global.DC.Position(Number(item.attrParam.jd), Number(item.attrParam.wd), 50)
+                        })
+                    }
+                }
+            },
+            immediate: true
+        }
+    },
     mounted () { },
     methods: {
+        coordinate (item) {
+            const arr = item.split(',')
+
+            return {
+                lng: arr[0],
+                lat: arr[1]
+            }
+        },
         closeModel () {
             this.$parent.closeModel()
         },
@@ -109,13 +140,13 @@
             const that = this
             //   console.log(this.arcCode, "see22");
             // 判断是否是当前所需要图层并创建 属性为 this.arrCode
-            if (this.ourLayer != null) {
-                this.ourLayer.clear()
+            if (ourLayer != null) {
+                ourLayer.clear()
             } else {
-                this.ourLayer = new global.DC.HtmlLayer('Layer' + this.arcCode)
-                this.viewer.addLayer(this.ourLayer)
+                ourLayer = new global.DC.HtmlLayer('Layer' + this.arcCode)
+                global.viewer.addLayer(ourLayer)
             }
-            //   console.log(this.ourLayer, "see");
+            //   console.log(ourLayer, "see");
             getLifeList({ lifetype: this.arcCode, campus: campus }).then((res) => {
                 res.data.data.records.forEach((item) => {
                     //   console.log(item, "see");
@@ -125,15 +156,31 @@
                         details: item
                     })
                     // 创建图标 做生活设施分层标签
-                    that.addDivIcon(item, this.ourLayer)
+                    that.addDivIcon(item, ourLayer)
                 })
             })
         },
         addDivIcon (item, mylayer) {
+            let obj = {}
+
+            if (item.x && item.x != '') {
+                const position = this.coordinate(item.x)
+                obj = {
+                    lng: position.lng, lat: position.lat
+                }
+            } else {
+                obj = {
+                    lng: item.jd, lat: item.wd
+                }
+            }
             const that = this
-            const divIcon = new global.DC.DivIcon(
-                new global.DC.Position(Number(item.jd), Number(item.wd), 0),
-                `
+
+            let divIcon = null
+
+            if (this.twoOrThree == '三 维') {
+                divIcon = new global.DC.DivIcon(
+                    new global.DC.Position(Number(obj.lng), Number(obj.lat), 0),
+                    `
                               <div class="tag-entitys-box">
                                   <div class="tag-content">
                                       ${item.mechanismname}
@@ -143,7 +190,25 @@
                                   </div>
                               </div>
                           `
-            )
+                )
+            } else {
+                divIcon = new global.DC.DivIcon(
+                    new global.DC.Position(Number(item.jd), Number(item.wd), 50),
+                    `
+                              <div class="tag-entitys-box">
+                                  <div class="tag-content">
+                                      ${item.mechanismname}
+                                  </div>
+                                  <div class="tag-angle-content">
+                                      <img src="https://map.hit.edu.cn/images/tarrow_xq.png">
+                                  </div>
+                              </div>
+                          `
+                )
+            }
+
+            divIcon.attrParam = item
+
             // 订阅事件
             divIcon.on(global.DC.MouseEventType.CLICK, (e) => {
                 // console.log(item, "see");
@@ -157,6 +222,18 @@
             mylayer.addOverlay(divIcon)
         },
         mapPopup (param) {
+            let obj = {}
+
+            if (param.x && param.x != '') {
+                const position = this.coordinate(param.x)
+                obj = {
+                    lng: position.lng, lat: position.lat
+                }
+            } else {
+                obj = {
+                    lng: param.jd, lat: param.wd
+                }
+            }
             var result = param
             this.$store.commit('CLEAR_ALL', null)
 
@@ -164,14 +241,7 @@
 
             this.$store.commit('SET_POPUPBGURL', imgArr[0])
             this.$store.commit('SET_POPUPQRURL', result.codeurl)
-            this.$store.commit('SET_POINTPOSITION', [
-                Number(result.jd),
-                Number(result.wd),
-                Number(result.gd),
-                Number(result.heading),
-                Number(result.pitch),
-                Number(result.roll)
-            ])
+
             this.$store.commit('SET_STATENAME', result.mechanismname)
             this.$store.commit('SET_SITENAME', result.address)
             this.$store.commit('SET_TELEPHONE', result.telephone)
@@ -183,26 +253,68 @@
                 this.$store.commit('SET_MONITORURL', result.videourl)
             }
 
-            this.newPopup(result)
-            this.viewer.flyToPosition(
-                new global.DC.Position(
-                    Number(result.jd),
-                    Number(result.wd),
-                    300,
+            this.newPopup(result, obj)
+
+            if (this.twoOrThree == '三 维') {
+                this.$store.commit('SET_POINTPOSITION', [
+                    Number(obj.lng),
+                    Number(obj.lat),
+                    Number(result.gd),
                     Number(result.heading),
                     Number(result.pitch),
                     Number(result.roll)
-                ),
-                function () { },
-                3
-            )
+                ])
+
+                global.viewer.flyToPosition(
+                    new global.DC.Position(
+                        Number(obj.lng),
+                        Number(obj.lat),
+                        300,
+                        Number(result.heading),
+                        Number(result.pitch),
+                        Number(result.roll)
+                    ),
+                    function () { },
+                    3
+                )
+            } else {
+                this.$store.commit('SET_POINTPOSITION', [
+                    Number(result.jd),
+                    Number(result.wd),
+                    Number(result.gd),
+                    Number(result.heading),
+                    Number(result.pitch),
+                    Number(result.roll)
+                ])
+
+                global.viewer.flyToPosition(
+                    new global.DC.Position(
+                        Number(result.jd),
+                        Number(result.wd),
+                        300,
+                        Number(result.heading),
+                        Number(result.pitch),
+                        Number(result.roll)
+                    ),
+                    function () { },
+                    3
+                )
+            }
         },
-        newPopup (item) {
-            const position = global.DC.Transform.transformWGS84ToCartesian(
-                new global.DC.Position(Number(item.jd), Number(item.wd), Number(item.gd))
-            )
+        newPopup (item, obj) {
+            let position
+            if (this.twoOrThree == '三 维') {
+                position = global.DC.Transform.transformWGS84ToCartesian(
+                    new global.DC.Position(Number(obj.lng), Number(obj.lat), Number(item.gd))
+                )
+            } else {
+                position = global.DC.Transform.transformWGS84ToCartesian(
+                    new global.DC.Position(Number(item.jd), Number(item.wd), Number(item.gd))
+                )
+            }
+
             // eslint-disable-next-line no-unused-vars
-            var popup = new global.DC.DivForms(this.viewer, {
+            var popup = new global.DC.DivForms(global.viewer, {
                 domId: 'divFormsDomBox',
                 position: [position]
             })
@@ -213,11 +325,14 @@
         }
     },
     destroyed () {
-        if (this.ourLayer != null) {
-            this.ourLayer.remove()
-            this.ourLayer = null
+        if (ourLayer != null) {
+            ourLayer.remove()
+            ourLayer = null
         }
+
         this.$store.commit('SET_DETAILSPOPUP', false)
+        this.$store.commit('SET_PANORAMAPOPUP', false)
+        this.$store.commit('SET_MONITORPOPUP', false)
     }
 }
 </script>

--
Gitblit v1.9.3