Showing
4 changed files
with
24 additions
and
20 deletions
| ... | @@ -20,12 +20,12 @@ output=map | ... | @@ -20,12 +20,12 @@ output=map |
| 20 | npm run build | 20 | npm run build |
| 21 | 21 | ||
| 22 | # 移除Git服务器目录下项目文件夹 | 22 | # 移除Git服务器目录下项目文件夹 |
| 23 | -# rm -r $path"/${output:?}/images" | 23 | +rm -r $path"/${output:?}/images" |
| 24 | rm -r $path"/${output:?}/index.html" | 24 | rm -r $path"/${output:?}/index.html" |
| 25 | rm -r $path"/${output:?}/static" | 25 | rm -r $path"/${output:?}/static" |
| 26 | 26 | ||
| 27 | # 把本地编译输出文件夹添加到服务器目录 | 27 | # 把本地编译输出文件夹添加到服务器目录 |
| 28 | -# mv "${output:?}/images" $path"/${output:?}" | 28 | +mv "${output:?}/images" $path"/${output:?}" |
| 29 | mv "${output:?}/index.html" $path"/${output:?}" | 29 | mv "${output:?}/index.html" $path"/${output:?}" |
| 30 | mv "${output:?}/static" $path"/${output:?}" | 30 | mv "${output:?}/static" $path"/${output:?}" |
| 31 | 31 | ... | ... |
| ... | @@ -215,7 +215,7 @@ var spotInfo = [ | ... | @@ -215,7 +215,7 @@ var spotInfo = [ |
| 215 | }, | 215 | }, |
| 216 | { | 216 | { |
| 217 | name: '观音殿', | 217 | name: '观音殿', |
| 218 | - position: [120.58801, 31.314724], | 218 | + position: [120.58791, 31.314799], |
| 219 | icon: 'https://cdn.ipadbiz.cn/xys/map/%E6%AE%BF%E5%A0%82@2x.png', | 219 | icon: 'https://cdn.ipadbiz.cn/xys/map/%E6%AE%BF%E5%A0%82@2x.png', |
| 220 | details: [ | 220 | details: [ |
| 221 | { | 221 | { |
| ... | @@ -233,20 +233,20 @@ var spotInfo = [ | ... | @@ -233,20 +233,20 @@ var spotInfo = [ |
| 233 | [120.587815, 31.313439], | 233 | [120.587815, 31.313439], |
| 234 | ], | 234 | ], |
| 235 | }, | 235 | }, |
| 236 | - { | 236 | + // { |
| 237 | - name: '藏经楼', | 237 | + // name: '藏经楼', |
| 238 | - position: [120.587481, 31.316285], | 238 | + // position: [120.587481, 31.316285], |
| 239 | - icon: 'https://cdn.ipadbiz.cn/xys/map/%E6%AE%BF%E5%A0%82@2x.png', | 239 | + // icon: 'https://cdn.ipadbiz.cn/xys/map/%E6%AE%BF%E5%A0%82@2x.png', |
| 240 | - details: [ | 240 | + // details: [ |
| 241 | - { | 241 | + // { |
| 242 | - name: '藏经楼', | 242 | + // name: '藏经楼', |
| 243 | - note: '', | 243 | + // note: '', |
| 244 | - url: '', | 244 | + // url: '', |
| 245 | - }, | 245 | + // }, |
| 246 | - ], | 246 | + // ], |
| 247 | - window_type: 'normal', | 247 | + // window_type: 'normal', |
| 248 | - path: [], | 248 | + // path: [], |
| 249 | - }, | 249 | + // }, |
| 250 | { | 250 | { |
| 251 | name: '西花园湖心亭', | 251 | name: '西花园湖心亭', |
| 252 | position: [120.58653, 31.315118], | 252 | position: [120.58653, 31.315118], | ... | ... |
| ... | @@ -282,6 +282,8 @@ export default { | ... | @@ -282,6 +282,8 @@ export default { |
| 282 | line-height: 1.5; | 282 | line-height: 1.5; |
| 283 | float: left; | 283 | float: left; |
| 284 | color: #7A6C6C; | 284 | color: #7A6C6C; |
| 285 | + font-size: 0.9rem; | ||
| 286 | + margin-top: 0.5rem; | ||
| 285 | } | 287 | } |
| 286 | 288 | ||
| 287 | .info-control { | 289 | .info-control { | ... | ... |
| 1 | <!-- | 1 | <!-- |
| 2 | * @Date: 2023-05-19 14:54:27 | 2 | * @Date: 2023-05-19 14:54:27 |
| 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com | 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com |
| 4 | - * @LastEditTime: 2023-06-28 16:39:41 | 4 | + * @LastEditTime: 2023-06-29 11:33:19 |
| 5 | * @FilePath: /map-demo/src/views/index.vue | 5 | * @FilePath: /map-demo/src/views/index.vue |
| 6 | * @Description: 地图主体页面 | 6 | * @Description: 地图主体页面 |
| 7 | --> | 7 | --> |
| ... | @@ -90,7 +90,7 @@ | ... | @@ -90,7 +90,7 @@ |
| 90 | 90 | ||
| 91 | <script> | 91 | <script> |
| 92 | // import { mapState } from 'vuex' | 92 | // import { mapState } from 'vuex' |
| 93 | -import coord from '@/common/tiantan_v2' | 93 | +import coord from '@/common/map_data' |
| 94 | import _ from 'lodash'; | 94 | import _ from 'lodash'; |
| 95 | import $ from 'jquery'; | 95 | import $ from 'jquery'; |
| 96 | //引入定义的信息窗组件 | 96 | //引入定义的信息窗组件 |
| ... | @@ -929,7 +929,8 @@ export default { | ... | @@ -929,7 +929,8 @@ export default { |
| 929 | setTimeout(() => { | 929 | setTimeout(() => { |
| 930 | // 地图zooms调整 | 930 | // 地图zooms调整 |
| 931 | this.map.setZoom(18); | 931 | this.map.setZoom(18); |
| 932 | - this.map.setZoomAndCenter(18, [this.xys_lng, this.xys_lat]); | 932 | + // this.map.setZoomAndCenter(18, [this.xys_lng, this.xys_lat]); |
| 933 | + this.map.setZoomAndCenter(18, [120.587382, 31.313900]); | ||
| 933 | }, 100); | 934 | }, 100); |
| 934 | this.removeNavRoute() | 935 | this.removeNavRoute() |
| 935 | }, | 936 | }, |
| ... | @@ -1288,3 +1289,4 @@ export default { | ... | @@ -1288,3 +1289,4 @@ export default { |
| 1288 | font-size: 0.8rem; | 1289 | font-size: 0.8rem; |
| 1289 | } | 1290 | } |
| 1290 | </style> | 1291 | </style> |
| 1292 | +@/common/map_data | ... | ... |
-
Please register or login to post a comment