From 37a4a03e1ddef4f66904dccee54b684e73e9a3b2 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 18 Nov 2022 17:32:27 +0800
Subject: [PATCH] 1

---
 src/pcviews/specialmap/welcome.vue |   70 ++++++++++++----------------------
 1 files changed, 25 insertions(+), 45 deletions(-)

diff --git a/src/pcviews/specialmap/welcome.vue b/src/pcviews/specialmap/welcome.vue
index 8f97887..1240d2d 100644
--- a/src/pcviews/specialmap/welcome.vue
+++ b/src/pcviews/specialmap/welcome.vue
@@ -7,28 +7,14 @@
                 <div class="title">
                     {{ title }}
                     <a href="javascript:void(0);" title="全景浏览">
-                        <img
-                            @click="panoramaPlay"
-                            class="panorama-control deblurring"
-                            src="/zhxy/img/icon/panorama.png"
-                            alt
-                        />
+                        <img @click="panoramaPlay" class="panorama-control deblurring" src="/zhjg/img/icon/panorama.png"
+                            alt />
                     </a>
                     <a href="javascript:void(0);" title="语音介绍">
-                        <img
-                            @click="audioPlay"
-                            class="audio-control deblurring"
-                            :src="audioImgUrl"
-                            alt
-                        />
+                        <img @click="audioPlay" class="audio-control deblurring" :src="audioImgUrl" alt />
                     </a>
                     <a href="javascript:void(0);" title="关闭">
-                        <img
-                            @click="closeModel"
-                            class="close-box deblurring"
-                            src="/zhxy/img/navicon/close.png"
-                            alt
-                        />
+                        <img @click="closeModel" class="close-box deblurring" src="/zhjg/img/navicon/close.png" alt />
                     </a>
                 </div>
             </div>
@@ -55,20 +41,12 @@
                     <div class="title">
                         全景浏览
                         <a href="javascript:void(0);" title="关闭">
-                            <img
-                                @click="(panoramaShow = false), (panoramaUrl = '')"
-                                class="close-box"
-                                src="/zhxy/img/navicon/close.png"
-                                alt
-                            />
+                            <img @click="(panoramaShow = false), (panoramaUrl = '')" class="close-box"
+                                src="/zhjg/img/navicon/close.png" alt />
                         </a>
                     </div>
                     <div class="content">
-                        <iframe
-                            style="width: 100%; height: 100%"
-                            :src="panoramaUrl"
-                            frameborder="0"
-                        ></iframe>
+                        <iframe style="width: 100%; height: 100%" :src="panoramaUrl" frameborder="0"></iframe>
                     </div>
                 </div>
             </div>
@@ -78,7 +56,7 @@
             <div class="header">图层管理</div>
             <ul class="content">
                 <li v-for="(item, index) in layerList" :key="index">
-                    {{item.name}}:
+                    {{ item.name }}:
                     <el-switch v-model="item.flag" @change="switchChange(item)"></el-switch>
                 </li>
             </ul>
@@ -116,7 +94,7 @@
             audioSynth: null,
             audioMsg: null,
             panoramaShow: false,
-            audioImgUrl: '/zhxy/img/icon/start-video.png',
+            audioImgUrl: '/zhjg/img/icon/start-video.png',
             urlDataName: null
         }
     },
@@ -132,7 +110,7 @@
             // this.audioSynth.cancel();
             that.audioFlag = false
             that.audioCourse = false
-            that.audioImgUrl = '/zhxy/img/icon/close-video.png'
+            that.audioImgUrl = '/zhjg/img/icon/close-video.png'
         }
 
         window.onbeforeunload = e => { // 刷新时弹出提示
@@ -236,9 +214,12 @@
                     this.addArcgisLayer(this.layerList[0].url, this.layerList[0].name)
                 }
 
+                if (result.lx.indexOf(';') == -1) result.lx += ';'
+
                 var a = result.lx.split(';')
 
                 a.forEach((item) => {
+                    if (item == '') return
                     var b = item.split('(')
                     var c = b[1].substr(0, b[1].length - 1)
                     var d = c.split(',')
@@ -249,6 +230,7 @@
                         j.push(f)
                     })
                     var k = j.join(';')
+
                     this.pathList.push(k)
                 })
 
@@ -269,14 +251,14 @@
                 if (this.pointList.length > 0) {
                     this.$store.dispatch('pcMoveView', {
                         viewer: global.viewer,
-                        jd: +this.pointList[0].split(',')[0] - 0.0005,
-                        wd: this.pointList[0].split(',')[1]
+                        jd: (Number(+this.pointList[0].split(',')[0]) - 0.0005),
+                        wd: Number(this.pointList[0].split(',')[1])
                     })
                 } else {
                     this.$store.dispatch('pcMoveView', {
                         viewer: global.viewer,
-                        jd: +this.pathList[0].split(';')[0].split(',')[0] - 0.0005,
-                        wd: this.pathList[0].split(';')[0].split(',')[1]
+                        jd: (Number(+this.pathList[0].split(';')[0].split(',')[0]) - 0.0005),
+                        wd: Number(this.pathList[0].split(';')[0].split(',')[1])
                     })
                 }
             })
@@ -286,11 +268,10 @@
 
             polyline.setStyle({
                 width: 6,
-                arcType: true,
                 material: new global.DC.PolylineImageTrailMaterialProperty({
                     color: global.DC.Namespace.Cesium.Color.fromBytes(10, 255, 10),
                     speed: 60,
-                    image: '/zhxy/img/icon/right.png',
+                    image: '/zhjg/img/icon/right.png',
                     repeat: { x: 320, y: 1 }
                 }),
                 clampToGround: true
@@ -304,7 +285,7 @@
                 `
                     <div class="point-entitys-box">
                         <div class="point-logo">
-                            <img src="/zhxy/img/icon/activity.png">
+                            <img src="/zhjg/img/icon/activity.png">
                         </div>
                         <div class="point-title">
                             ${name}
@@ -320,16 +301,16 @@
                 this.audioSynth.speak(this.audioMsg)
                 this.audioFlag = true
                 this.audioCourse = true
-                this.audioImgUrl = '/zhxy/img/icon/start-video.png'
+                this.audioImgUrl = '/zhjg/img/icon/start-video.png'
             } else {
                 if (this.audioCourse == true) {
                     this.audioSynth.pause()
                     this.audioCourse = false
-                    this.audioImgUrl = '/zhxy/img/icon/close-video.png'
+                    this.audioImgUrl = '/zhjg/img/icon/close-video.png'
                 } else {
                     this.audioSynth.resume()
                     this.audioCourse = true
-                    this.audioImgUrl = '/zhxy/img/icon/start-video.png'
+                    this.audioImgUrl = '/zhjg/img/icon/start-video.png'
                 }
             }
         },
@@ -362,7 +343,6 @@
         this.audioSynth.cancel()
         global.viewer.removeLayer(pathLayer)
         global.viewer.removeLayer(pointLayer)
-        // console.log("关闭", "see1");
     }
 }
 </script>
@@ -432,11 +412,11 @@
         padding: 0 16px;
         height: calc(100% - 36px);
 
-        & > div {
+        &>div {
             margin-bottom: 10px;
         }
 
-        & > div:last-child {
+        &>div:last-child {
             margin-bottom: 0px;
         }
 

--
Gitblit v1.9.3