hookehuyr

新背景图更新

Showing 62 changed files with 13 additions and 13 deletions
......@@ -14,18 +14,18 @@ set -e
path=/Users/huyirui/program/itomix/git/isp/f
# 编译输出文件夹
output=voice
output=map
# 打包
npm run build
# 移除Git服务器目录下项目文件夹
rm -r $path"/${output:?}/images"
# rm -r $path"/${output:?}/images"
rm -r $path"/${output:?}/index.html"
rm -r $path"/${output:?}/static"
# 把本地编译输出文件夹添加到服务器目录
mv "${output:?}/images" $path"/${output:?}"
# mv "${output:?}/images" $path"/${output:?}"
mv "${output:?}/index.html" $path"/${output:?}"
mv "${output:?}/static" $path"/${output:?}"
......@@ -37,4 +37,4 @@ git commit -m '前端网页更新'
git push
# 更新SSH服务器上文件
ssh -p 22 itomix@ipadbiz.cn 'cd /opt/voice/f/voice && git pull'
ssh -p 22 itomix@ipadbiz.cn 'cd /opt/space-dev/ && git pull origin develop'
......
......@@ -93,7 +93,7 @@ export default {
},
infoWindow(val) {
if (val) {
if (this.info?.details[this.isActive]['audio']) {
if (this.info?.details[this.isActive]['audio']) { // 实体有音频时
// 存放到pinia里面控制
this.changeAudio(this.audio);
this.changeAudioStatus('pause');
......
<!--
* @Date: 2023-05-19 14:54:27
* @LastEditors: hookehuyr hookehuyr@gmail.com
* @LastEditTime: 2023-06-12 14:04:04
* @LastEditTime: 2023-06-26 14:31:57
* @FilePath: /map-demo/src/views/index.vue
* @Description: 地图主体页面
-->
......@@ -287,7 +287,7 @@ export default {
showIndoorMap: false,
defaultCursor: 'pointer', // 地图默认鼠标样式
showBuildingBlock: false, // 是否展示地图 3D 楼块
zooms: [17, 20], // 地图显示的缩放级别范围, 默认为 [2, 20] ,取值范围 [2 ~ 30]
zooms: [17, 19], // 地图显示的缩放级别范围, 默认为 [2, 20] ,取值范围 [2 ~ 30]
showLabel: true, // 是否展示地图文字和 POI 信息
zoom: 18, // 设置地图显示的缩放级别
pitch: 0, // 俯仰角度,默认 0,最大值根据地图当前 zoom 级别不断增大,2D地图下无效 。
......@@ -311,7 +311,7 @@ export default {
_.each(coord.spotInfo, (x, i) => {
var marker = new AMap.ElasticMarker({
position: coord.spotInfo[i].position,
zooms: [17, 20],
zooms: [17, 19],
styles: [{
icon: {
img: coord.spotInfo[i].icon,
......@@ -351,7 +351,7 @@ export default {
_.each(coord.toiletInfo, (x, i) => {
var marker = new AMap.ElasticMarker({
position: coord.toiletInfo[i].position,
zooms: [17, 20],
zooms: [17, 19],
styles: [{
icon: {
img: coord.toiletInfo[i].icon,
......@@ -388,7 +388,7 @@ export default {
_.each(coord.warnInfo, (x, i) => {
var marker = new AMap.ElasticMarker({
position: coord.warnInfo[i].position,
zooms: [17, 20],
zooms: [17, 19],
styles: [{
icon: {
img: coord.warnInfo[i].icon,
......@@ -425,7 +425,7 @@ export default {
_.each(coord.activityInfo, (x, i) => {
var marker = new AMap.ElasticMarker({
position: coord.activityInfo[i].position,
zooms: [17, 20],
zooms: [17, 19],
styles: [{
icon: {
img: coord.activityInfo[i].icon,
......@@ -462,7 +462,7 @@ export default {
_.each(coord.publicInfo, (x, i) => {
var marker = new AMap.ElasticMarker({
position: coord.publicInfo[i].position,
zooms: [17, 20],
zooms: [17, 19],
styles: [{
icon: {
img: coord.publicInfo[i].icon,
......@@ -664,7 +664,7 @@ export default {
fail()
};
img.src = `images/tiles/${z}/${x}_${y}.jpg`
img.src = `images/tiles/${z}/${x}_${y}.png`
},
// createTile: function (x, y, z, success, fail) {
// console.warn(z);
......