From b1252f19181f6cc1758403fea4f70dcdb1dbe239 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 26 Jan 2022 09:30:01 +0800
Subject: [PATCH] 部分内容更改

---
 src/components/map/components/dimension.vue |  109 ++++++++++++---------
 src/pcviews/service/service.vue             |    8 +
 src/styles/entitys/text-entitys.scss        |   23 +++
 src/pcviews/service/alleyway.vue            |    8 +
 src/pcviews/service/showers.vue             |    6 +
 src/pcviews/service/aed.vue                 |    8 +
 src/pcviews/service/transfer.vue            |    8 +
 src/pcviews/service/canteen.vue             |    6 +
 src/components/map/index.vue                |   71 ++++++++++++++
 src/pcviews/service/copy.vue                |    8 +
 src/pcviews/service/bank.vue                |    8 +
 public/img/leftnav/map-activity.png         |    0 
 public/img/leftnav/map-panorama.png         |    0 
 src/pcviews/service/supermarket.vue         |    8 +
 src/pcviews/service/medical.vue             |    8 +
 src/components/leftNav/index.vue            |    2 
 src/pcviews/service/express.vue             |    6 +
 src/pcviews/service/park.vue                |    8 +
 public/img/leftnav/map-monitor.png          |    0 
 19 files changed, 221 insertions(+), 74 deletions(-)

diff --git a/public/img/leftnav/map-activity.png b/public/img/leftnav/map-activity.png
index c64c5bd..8380079 100644
--- a/public/img/leftnav/map-activity.png
+++ b/public/img/leftnav/map-activity.png
Binary files differ
diff --git a/public/img/leftnav/map-monitor.png b/public/img/leftnav/map-monitor.png
index 77958e3..02e2f7f 100644
--- a/public/img/leftnav/map-monitor.png
+++ b/public/img/leftnav/map-monitor.png
Binary files differ
diff --git a/public/img/leftnav/map-panorama.png b/public/img/leftnav/map-panorama.png
index 62fb862..d37dbb6 100644
--- a/public/img/leftnav/map-panorama.png
+++ b/public/img/leftnav/map-panorama.png
Binary files differ
diff --git a/src/components/leftNav/index.vue b/src/components/leftNav/index.vue
index c3e7a14..6b845ec 100644
--- a/src/components/leftNav/index.vue
+++ b/src/components/leftNav/index.vue
@@ -171,7 +171,7 @@
                         new that.DC.Position(Number(item.jd), Number(item.wd), 0),
                         `
                         <div  class="way-entitys-box">
-                            <div  class="way-title" style="border: white 1px solid; padding-left: 2px;font-size: 12px; background: #0066ff;  width: 12px;line-height: 13px; padding:2px 1px 2px 1px; color:white;">
+                            <div  class="way-title" style="border: white 1px solid; font-size: 0.875rem; background: #0066ff;  width: 18px; line-height: 14px; padding: 6px 2px 6px 2px; color: white; text-align: center;">
                                  ${item.roadname}
                             </div>
                             <div  class="way-sign-box">
diff --git a/src/components/map/components/dimension.vue b/src/components/map/components/dimension.vue
index 3f97207..8a41a99 100644
--- a/src/components/map/components/dimension.vue
+++ b/src/components/map/components/dimension.vue
@@ -141,6 +141,23 @@
                         originalColor: new that.DC.Namespace.Cesium.Color()
                     }
 
+                    const videoLayer = new that.DC.CameraVideoLayer('video-layer').addTo(that.viewer)
+
+                    const cameraVideo = new that.DC.CameraVideo(new that.DC.Position(
+                        114.03935976, 27.62939045,
+                        100.25,
+                        4.2,
+                        -90
+                    ), document.getElementById('video'))
+                    cameraVideo.setStyle({
+                        fov: 30,
+                        far: 120,
+                        near: 1,
+                        aspectRatio: 1.3,
+                        alpha: 0.7
+                    })
+                    videoLayer.addOverlay(cameraVideo)
+
                     that.tileset.on(that.DC.MouseEventType.CLICK, e => {
                         that.viewer.scene.globe.depthTestAgainstTerrain = false
 
@@ -295,7 +312,7 @@
                     that.viewer.camera.setView({
                         // Cesium的坐标是以地心为原点,一向指向南美洲,一向指向亚洲,一向指向北极州
                         // fromDegrees()方法,将经纬度和高程转换为世界坐标
-                        destination: that.DC.Namespace.Cesium.Cartesian3.fromDegrees(114.039779, 27.629696, 600.0),
+                        destination: that.DC.Namespace.Cesium.Cartesian3.fromDegrees(114.039779, 27.629696, 500.0),
                         orientation: {
                             // 指向
                             heading: that.DC.Namespace.Cesium.Math.toRadians(0, 0),
@@ -305,7 +322,6 @@
                         }
                     })
 
-                    that.viewer.on(that.DC.SceneEventType.CAMERA_CHANGED, that.camerAzoom())
                     // 最小
                     that.viewer.scene.screenSpaceCameraController.minimumZoomDistance = 200
                     // 最大
@@ -460,7 +476,7 @@
                             that.viewer.camera.setView({
                                 // Cesium的坐标是以地心为原点,一向指向南美洲,一向指向亚洲,一向指向北极州
                                 // fromDegrees()方法,将经纬度和高程转换为世界坐标
-                                destination: that.DC.Namespace.Cesium.Cartesian3.fromDegrees(114.039779, 27.629696, 600.0),
+                                destination: that.DC.Namespace.Cesium.Cartesian3.fromDegrees(114.039779, 27.629696, 500.0),
                                 orientation: {
                                     // 指向
                                     heading: that.DC.Namespace.Cesium.Math.toRadians(0, 0),
@@ -471,6 +487,47 @@
                             })
                         }
                     }
+
+                    that.viewer.on(that.DC.SceneEventType.CAMERA_CHANGED, () => {
+                        if (that.dimensionValue != undefined && that.dimensionValue != '真三维') {
+                            const height = Math.ceil(that.viewer.camera.positionCartographic.height)
+
+                            that.viewer.camera.setView({
+                                orientation: {
+                                    // 指向
+                                    heading: that.DC.Namespace.Cesium.Math.toRadians(0, 0),
+                                    // 视角
+                                    pitch: that.DC.Namespace.Cesium.Math.toRadians(-90),
+                                    roll: 0.0
+                                }
+                            })
+
+                            if (height < 200) {
+                                that.viewer.camera.setView({
+                                    destination: that.DC.Namespace.Cesium.Cartesian3.fromRadians(that.viewer.camera.positionCartographic.longitude, that.viewer.camera.positionCartographic.latitude, 200),
+                                    orientation: {
+                                        // 指向
+                                        heading: that.DC.Namespace.Cesium.Math.toRadians(0, 0),
+                                        // 视角
+                                        pitch: that.DC.Namespace.Cesium.Math.toRadians(-90),
+                                        roll: 0.0
+                                    }
+                                })
+                            };
+                            if (height > 1000) {
+                                that.viewer.camera.setView({
+                                    destination: that.DC.Namespace.Cesium.Cartesian3.fromRadians(that.viewer.camera.positionCartographic.longitude, that.viewer.camera.positionCartographic.latitude, 1000),
+                                    orientation: {
+                                        // 指向
+                                        heading: that.DC.Namespace.Cesium.Math.toRadians(0, 0),
+                                        // 视角
+                                        pitch: that.DC.Namespace.Cesium.Math.toRadians(-90),
+                                        roll: 0.0
+                                    }
+                                })
+                            }
+                        }
+                    })
                 }
             }
         }
@@ -509,8 +566,6 @@
                 // }))
                 that.silhouetteBlue.selected = []
                 that.tilesetLayer.show = true
-                that.viewer.off(that.DC.SceneEventType.CAMERA_CHANGED, that.camerAzoom())
-
                 // 最小
                 that.viewer.scene.screenSpaceCameraController.minimumZoomDistance = 1.0
                 // 最大
@@ -560,7 +615,7 @@
                 that.viewer.camera.setView({
                     // Cesium的坐标是以地心为原点,一向指向南美洲,一向指向亚洲,一向指向北极州
                     // fromDegrees()方法,将经纬度和高程转换为世界坐标
-                    destination: that.DC.Namespace.Cesium.Cartesian3.fromDegrees(114.039779, 27.629696, 600.0),
+                    destination: that.DC.Namespace.Cesium.Cartesian3.fromDegrees(114.039779, 27.629696, 500.0),
                     orientation: {
                         // 指向
                         heading: that.DC.Namespace.Cesium.Math.toRadians(0, 0),
@@ -569,54 +624,12 @@
                         roll: 0.0
                     }
                 })
-
-                that.viewer.on(that.DC.SceneEventType.CAMERA_CHANGED, that.camerAzoom())
                 // 最小
                 that.viewer.scene.screenSpaceCameraController.minimumZoomDistance = 200
                 // 最大
                 that.viewer.scene.screenSpaceCameraController.maximumZoomDistance = 1000
                 // 视角旋转
                 that.viewer.scene.screenSpaceCameraController.enableTilt = false
-            }
-        },
-
-        camerAzoom () {
-            var that = this
-            const height = Math.ceil(that.viewer.camera.positionCartographic.height)
-
-            that.viewer.camera.setView({
-                orientation: {
-                    // 指向
-                    heading: that.DC.Namespace.Cesium.Math.toRadians(0, 0),
-                    // 视角
-                    pitch: that.DC.Namespace.Cesium.Math.toRadians(-90),
-                    roll: 0.0
-                }
-            })
-
-            if (height < 200) {
-                that.viewer.camera.setView({
-                    destination: that.DC.Namespace.Cesium.Cartesian3.fromRadians(that.viewer.camera.positionCartographic.longitude, that.viewer.camera.positionCartographic.latitude, 200),
-                    orientation: {
-                        // 指向
-                        heading: that.DC.Namespace.Cesium.Math.toRadians(0, 0),
-                        // 视角
-                        pitch: that.DC.Namespace.Cesium.Math.toRadians(-90),
-                        roll: 0.0
-                    }
-                })
-            };
-            if (height > 1000) {
-                that.viewer.camera.setView({
-                    destination: that.DC.Namespace.Cesium.Cartesian3.fromRadians(that.viewer.camera.positionCartographic.longitude, that.viewer.camera.positionCartographic.latitude, 1000),
-                    orientation: {
-                        // 指向
-                        heading: that.DC.Namespace.Cesium.Math.toRadians(0, 0),
-                        // 视角
-                        pitch: that.DC.Namespace.Cesium.Math.toRadians(-90),
-                        roll: 0.0
-                    }
-                })
             }
         }
     }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 80ce431..5320856 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -4,6 +4,18 @@
          style="height: 100%; width: 100%;"
          @click="mapClick($event)">
 
+        <video id="video"
+               style="position: fixed;
+                visibility: hidden;"
+               muted
+               autoplay
+               loop
+               crossorigin
+               controls>
+            <source src="http://dc.dvgis.cn/examples/data/demo.mp4"
+                    type="video/mp4" />
+        </video>
+
         <div style="
             position: fixed;
             left: 4px;
@@ -57,6 +69,65 @@
             areaLayer: null
         }
     },
+    watch: {
+        searchPopupFlag: {
+            immediate: true,
+            handler (newVal, oldVal) {
+                if (newVal == true) {
+                    if (this.$route.path.indexOf('/pcLayout/default/service') != -1) {
+                        this.$store.dispatch('delVisitedViews', this.$route)
+                        this.$router.push('/pcLayout/default')
+                    }
+
+                    if (this.$route.path.indexOf('/orgnav') != -1) {
+                        this.$store.dispatch('delVisitedViews', this.$route)
+                        this.$router.push('/pcLayout/default')
+                        this.$store.commit('SET_ORGNAVBARTITLE', '')
+                        this.$store.commit('SET_ORGNAVBARLIST', [])
+                        this.$store.commit('SET_ORGNAVBARFLAG', false)
+                    }
+
+                    if (this.orgNavBarFlag == true) {
+                        this.$store.commit('SET_ORGNAVBARTITLE', '')
+                        this.$store.commit('SET_ORGNAVBARLIST', [])
+                        this.$store.commit('SET_ORGNAVBARFLAG', false)
+                    }
+
+                    if (this.$route.path.indexOf('/arc') != -1) {
+                        this.$store.dispatch('delVisitedViews', this.$route)
+                        this.$router.push('/pcLayout/default')
+                        this.$store.commit('SET_ARCNAVBARTITLE', '')
+                        this.$store.commit('SET_ARCNAVBARCODE', '')
+                        this.$store.commit('SET_ARCNAVBARFLAG', false)
+                    }
+
+                    if (this.arcNavBarFlag == true) {
+                        this.$store.commit('SET_ARCNAVBARTITLE', '')
+                        this.$store.commit('SET_ARCNAVBARCODE', '')
+                        this.$store.commit('SET_ARCNAVBARFLAG', false)
+                    }
+                }
+            }
+        },
+
+        orgNavBarFlag: {
+            immediate: true,
+            handler (newVal, oldVal) {
+                if (newVal == true) {
+                    this.$store.commit('SET_SEARCHPOPUPFLAG', false)
+                }
+            }
+        },
+
+        arcNavBarFlag: {
+            immediate: true,
+            handler (newVal, oldVal) {
+                if (newVal == true) {
+                    this.$store.commit('SET_SEARCHPOPUPFLAG', false)
+                }
+            }
+        }
+    },
     computed: {
         ...mapGetters([
             'viewer',
diff --git a/src/pcviews/service/aed.vue b/src/pcviews/service/aed.vue
index ac1547d..a106c2e 100644
--- a/src/pcviews/service/aed.vue
+++ b/src/pcviews/service/aed.vue
@@ -3,7 +3,7 @@
  * @Name: AED
  * @Date: 2021-11-15 17:14:47
  * @Last Modified by: Morpheus
- * @Last Modified time: 2021-12-30 14:29:35
+ * @Last Modified time: 2022-01-25 09:29:14
  */
 <template>
     <div>
@@ -36,12 +36,16 @@
             this.$store.commit('SET_ARCNAVBARCODE', '')
             this.$store.commit('SET_ARCNAVBARFLAG', false)
         }
+        if (this.searchPopupFlag == true) {
+            this.$store.commit('SET_SEARCHPOPUPFLAG', false)
+        }
     },
     computed: {
         ...mapGetters([
             // 社区内导航的显示关闭
             'orgNavBarFlag',
-            'arcNavBarFlag'
+            'arcNavBarFlag',
+            'searchPopupFlag'
         ])
     },
     methods: {
diff --git a/src/pcviews/service/alleyway.vue b/src/pcviews/service/alleyway.vue
index e14c8c2..b315ec8 100644
--- a/src/pcviews/service/alleyway.vue
+++ b/src/pcviews/service/alleyway.vue
@@ -3,7 +3,7 @@
  * @Name: 出入口
  * @Date: 2021-11-15 17:14:47
  * @Last Modified by: Morpheus
- * @Last Modified time: 2021-12-30 14:30:43
+ * @Last Modified time: 2022-01-25 09:29:24
  */
 <template>
     <div>
@@ -36,12 +36,16 @@
             this.$store.commit('SET_ARCNAVBARCODE', '')
             this.$store.commit('SET_ARCNAVBARFLAG', false)
         }
+        if (this.searchPopupFlag == true) {
+            this.$store.commit('SET_SEARCHPOPUPFLAG', false)
+        }
     },
     computed: {
         ...mapGetters([
             // 社区内导航的显示关闭
             'orgNavBarFlag',
-            'arcNavBarFlag'
+            'arcNavBarFlag',
+            'searchPopupFlag'
         ])
     },
     methods: {
diff --git a/src/pcviews/service/bank.vue b/src/pcviews/service/bank.vue
index 4728775..2821caa 100644
--- a/src/pcviews/service/bank.vue
+++ b/src/pcviews/service/bank.vue
@@ -3,7 +3,7 @@
  * @Name: 银行网点
  * @Date: 2021-11-15 17:14:47
  * @Last Modified by: Morpheus
- * @Last Modified time: 2021-12-30 14:30:51
+ * @Last Modified time: 2022-01-25 09:29:31
  */
 <template>
     <div>
@@ -36,12 +36,16 @@
             this.$store.commit('SET_ARCNAVBARCODE', '')
             this.$store.commit('SET_ARCNAVBARFLAG', false)
         }
+        if (this.searchPopupFlag == true) {
+            this.$store.commit('SET_SEARCHPOPUPFLAG', false)
+        }
     },
     computed: {
         ...mapGetters([
             // 社区内导航的显示关闭
             'orgNavBarFlag',
-            'arcNavBarFlag'
+            'arcNavBarFlag',
+            'searchPopupFlag'
         ])
     },
     methods: {
diff --git a/src/pcviews/service/canteen.vue b/src/pcviews/service/canteen.vue
index 37ea33b..291ac6f 100644
--- a/src/pcviews/service/canteen.vue
+++ b/src/pcviews/service/canteen.vue
@@ -36,12 +36,16 @@
             this.$store.commit('SET_ARCNAVBARCODE', '')
             this.$store.commit('SET_ARCNAVBARFLAG', false)
         }
+        if (this.searchPopupFlag == true) {
+            this.$store.commit('SET_SEARCHPOPUPFLAG', false)
+        }
     },
     computed: {
         ...mapGetters([
             // 社区内导航的显示关闭
             'orgNavBarFlag',
-            'arcNavBarFlag'
+            'arcNavBarFlag',
+            'searchPopupFlag'
         ])
     },
     methods: {
diff --git a/src/pcviews/service/copy.vue b/src/pcviews/service/copy.vue
index 271b50a..3bdf809 100644
--- a/src/pcviews/service/copy.vue
+++ b/src/pcviews/service/copy.vue
@@ -3,7 +3,7 @@
  * @Name: 打字复印
  * @Date: 2021-11-15 17:14:47
  * @Last Modified by: Morpheus
- * @Last Modified time: 2021-12-30 14:31:00
+ * @Last Modified time: 2022-01-25 09:29:40
  */
 <template>
     <div>
@@ -36,12 +36,16 @@
             this.$store.commit('SET_ARCNAVBARCODE', '')
             this.$store.commit('SET_ARCNAVBARFLAG', false)
         }
+        if (this.searchPopupFlag == true) {
+            this.$store.commit('SET_SEARCHPOPUPFLAG', false)
+        }
     },
     computed: {
         ...mapGetters([
             // 社区内导航的显示关闭
             'orgNavBarFlag',
-            'arcNavBarFlag'
+            'arcNavBarFlag',
+            'searchPopupFlag'
         ])
     },
     methods: {
diff --git a/src/pcviews/service/express.vue b/src/pcviews/service/express.vue
index 17746d9..2170b31 100644
--- a/src/pcviews/service/express.vue
+++ b/src/pcviews/service/express.vue
@@ -36,12 +36,16 @@
             this.$store.commit('SET_ARCNAVBARCODE', '')
             this.$store.commit('SET_ARCNAVBARFLAG', false)
         }
+        if (this.searchPopupFlag == true) {
+            this.$store.commit('SET_SEARCHPOPUPFLAG', false)
+        }
     },
     computed: {
         ...mapGetters([
             // 社区内导航的显示关闭
             'orgNavBarFlag',
-            'arcNavBarFlag'
+            'arcNavBarFlag',
+            'searchPopupFlag'
         ])
     },
     methods: {
diff --git a/src/pcviews/service/medical.vue b/src/pcviews/service/medical.vue
index 683432c..9a13c69 100644
--- a/src/pcviews/service/medical.vue
+++ b/src/pcviews/service/medical.vue
@@ -3,7 +3,7 @@
  * @Name: 社区内医疗
  * @Date: 2021-11-15 17:14:47
  * @Last Modified by: Morpheus
- * @Last Modified time: 2021-12-30 14:31:10
+ * @Last Modified time: 2022-01-25 09:29:54
  */
 <template>
     <div>
@@ -36,12 +36,16 @@
             this.$store.commit('SET_ARCNAVBARCODE', '')
             this.$store.commit('SET_ARCNAVBARFLAG', false)
         }
+        if (this.searchPopupFlag == true) {
+            this.$store.commit('SET_SEARCHPOPUPFLAG', false)
+        }
     },
     computed: {
         ...mapGetters([
             // 社区内导航的显示关闭
             'orgNavBarFlag',
-            'arcNavBarFlag'
+            'arcNavBarFlag',
+            'searchPopupFlag'
         ])
     },
     methods: {
diff --git a/src/pcviews/service/park.vue b/src/pcviews/service/park.vue
index c3f452a..e36301b 100644
--- a/src/pcviews/service/park.vue
+++ b/src/pcviews/service/park.vue
@@ -3,7 +3,7 @@
  * @Name: 停车场
  * @Date: 2021-11-15 17:14:47
  * @Last Modified by: Morpheus
- * @Last Modified time: 2021-12-30 14:31:15
+ * @Last Modified time: 2022-01-25 09:29:59
  */
 <template>
     <div>
@@ -36,12 +36,16 @@
             this.$store.commit('SET_ARCNAVBARCODE', '')
             this.$store.commit('SET_ARCNAVBARFLAG', false)
         }
+        if (this.searchPopupFlag == true) {
+            this.$store.commit('SET_SEARCHPOPUPFLAG', false)
+        }
     },
     computed: {
         ...mapGetters([
             // 社区内导航的显示关闭
             'orgNavBarFlag',
-            'arcNavBarFlag'
+            'arcNavBarFlag',
+            'searchPopupFlag'
         ])
     },
     methods: {
diff --git a/src/pcviews/service/service.vue b/src/pcviews/service/service.vue
index 1ec16d7..cd30e5e 100644
--- a/src/pcviews/service/service.vue
+++ b/src/pcviews/service/service.vue
@@ -3,7 +3,7 @@
  * @Name: 通信营业厅
  * @Date: 2021-11-15 17:14:47
  * @Last Modified by: Morpheus
- * @Last Modified time: 2021-12-21 11:42:12
+ * @Last Modified time: 2022-01-25 09:30:05
  */
 <template>
     <div>
@@ -36,12 +36,16 @@
             this.$store.commit('SET_ARCNAVBARCODE', '')
             this.$store.commit('SET_ARCNAVBARFLAG', false)
         }
+        if (this.searchPopupFlag == true) {
+            this.$store.commit('SET_SEARCHPOPUPFLAG', false)
+        }
     },
     computed: {
         ...mapGetters([
             // 社区内导航的显示关闭
             'orgNavBarFlag',
-            'arcNavBarFlag'
+            'arcNavBarFlag',
+            'searchPopupFlag'
         ])
     },
     methods: {
diff --git a/src/pcviews/service/showers.vue b/src/pcviews/service/showers.vue
index f1353ea..8d0cc89 100644
--- a/src/pcviews/service/showers.vue
+++ b/src/pcviews/service/showers.vue
@@ -36,12 +36,16 @@
             this.$store.commit('SET_ARCNAVBARCODE', '')
             this.$store.commit('SET_ARCNAVBARFLAG', false)
         }
+        if (this.searchPopupFlag == true) {
+            this.$store.commit('SET_SEARCHPOPUPFLAG', false)
+        }
     },
     computed: {
         ...mapGetters([
             // 社区内导航的显示关闭
             'orgNavBarFlag',
-            'arcNavBarFlag'
+            'arcNavBarFlag',
+            'searchPopupFlag'
         ])
     },
     methods: {
diff --git a/src/pcviews/service/supermarket.vue b/src/pcviews/service/supermarket.vue
index 8acc17f..74925a7 100644
--- a/src/pcviews/service/supermarket.vue
+++ b/src/pcviews/service/supermarket.vue
@@ -3,7 +3,7 @@
  * @Name: 购物超市
  * @Date: 2021-11-15 17:14:47
  * @Last Modified by: Morpheus
- * @Last Modified time: 2021-12-30 14:31:31
+ * @Last Modified time: 2022-01-25 09:30:12
  */
 <template>
     <div>
@@ -36,12 +36,16 @@
             this.$store.commit('SET_ARCNAVBARCODE', '')
             this.$store.commit('SET_ARCNAVBARFLAG', false)
         }
+        if (this.searchPopupFlag == true) {
+            this.$store.commit('SET_SEARCHPOPUPFLAG', false)
+        }
     },
     computed: {
         ...mapGetters([
             // 社区内导航的显示关闭
             'orgNavBarFlag',
-            'arcNavBarFlag'
+            'arcNavBarFlag',
+            'searchPopupFlag'
         ])
     },
     methods: {
diff --git a/src/pcviews/service/transfer.vue b/src/pcviews/service/transfer.vue
index 994ccac..48605be 100644
--- a/src/pcviews/service/transfer.vue
+++ b/src/pcviews/service/transfer.vue
@@ -3,7 +3,7 @@
  * @Name: 圈存机
  * @Date: 2021-11-15 17:14:47
  * @Last Modified by: Morpheus
- * @Last Modified time: 2021-12-30 14:31:32
+ * @Last Modified time: 2022-01-25 09:30:17
  */
 <template>
     <div>
@@ -36,12 +36,16 @@
             this.$store.commit('SET_ARCNAVBARCODE', '')
             this.$store.commit('SET_ARCNAVBARFLAG', false)
         }
+        if (this.searchPopupFlag == true) {
+            this.$store.commit('SET_SEARCHPOPUPFLAG', false)
+        }
     },
     computed: {
         ...mapGetters([
             // 社区内导航的显示关闭
             'orgNavBarFlag',
-            'arcNavBarFlag'
+            'arcNavBarFlag',
+            'searchPopupFlag'
         ])
     },
     methods: {
diff --git a/src/styles/entitys/text-entitys.scss b/src/styles/entitys/text-entitys.scss
index 26fc62b..08707a3 100644
--- a/src/styles/entitys/text-entitys.scss
+++ b/src/styles/entitys/text-entitys.scss
@@ -7,6 +7,7 @@
     align-items: center;
     justify-content: center;
     flex-direction: column;
+
     .tag-content {
         font-size: 1.1rem;
         font-weight: 900;
@@ -14,15 +15,18 @@
         -webkit-text-stroke-color: #fff;
         -webkit-text-stroke-width: 0.6px;
     }
+
     .tag-angle-content {
         width: $imgsize;
         height: $imgsize;
+
         img {
             width: 100%;
             height: 100%;
         }
     }
 }
+
 .mobiletag-entitys-box-pink {
     // 手机地图点  勿删  粉色
     height: 28px;
@@ -30,6 +34,7 @@
     align-items: center;
     justify-content: center;
     flex-direction: column;
+
     .tag-content {
         font-size: 1.1rem;
         font-weight: 900;
@@ -37,15 +42,18 @@
         -webkit-text-stroke-color: #fff;
         -webkit-text-stroke-width: 0.6px;
     }
+
     .tag-angle-content {
         width: $imgsize;
         height: $imgsize;
+
         img {
             width: 100%;
             height: 100%;
         }
     }
 }
+
 .tag-entitys-box {
     height: 28px;
 
@@ -77,6 +85,7 @@
     .point-logo {
         height: 40px;
         text-align: center;
+
         img {
             height: 40px;
         }
@@ -121,8 +130,14 @@
     }
 
     .park-sign-box {
-        width: 22;
         text-align: center;
+
+        &>div:first-child {
+            img {
+                width: 22px;
+                height: 22px;
+            }
+        }
     }
 }
 
@@ -144,7 +159,7 @@
         line-height: 24px;
         text-align: center;
         font-weight: 700;
-        color: #009bff;
+        color: #0054d3;
         text-shadow: 0 0 2px #fff;
     }
 
@@ -158,10 +173,10 @@
     text-align: center;
 
     div {
-        line-height: 24px;
+        line-height: 10px;
         text-align: center;
         font-weight: 700;
-        color: #009bff;
+        color: #0054d3;
         text-shadow: 0 0 2px #fff;
     }
 

--
Gitblit v1.9.3