修改比例
This commit is contained in:
parent
0864369b35
commit
36950a331e
@ -87,13 +87,13 @@ export default {
|
||||
return this.zoom * 8;
|
||||
},
|
||||
p() {
|
||||
return this.fine * 2;
|
||||
return this.fine * 1;
|
||||
},
|
||||
w() {
|
||||
return this.zoom * 4 + this.fine * 4 + this.p*2;
|
||||
return this.zoom * 4 + this.fine * 6 + this.p*2;
|
||||
},
|
||||
h() {
|
||||
return this.zoom * 8 + this.fine * 4 + this.p*2;
|
||||
return this.zoom * 8 + this.fine * 6 + this.p*2;
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
|
@ -1,44 +1,44 @@
|
||||
<template>
|
||||
<div class="separator" :style="{width: w+'px', height: h+'px'}">
|
||||
<point class="point" :color="color" :zoom="zoom" :fine="fine" :style="{top: zoom*3+'px'}" />
|
||||
<point class="point" :color="color" :zoom="zoom" :fine="fine" :style="{top: zoom*5+p*2+'px' }" />
|
||||
</div>
|
||||
<div class="separator" :style="{width: w+'px', height: h+'px'}">
|
||||
<point class="point" :color="color" :zoom="zoom" :fine="fine" :style="{top: zoom*4+p*1+'px'}" />
|
||||
<point class="point" :color="color" :zoom="zoom" :fine="fine" :style="{top: zoom*6+p*2+'px' }" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import Point from './point';
|
||||
|
||||
export default {
|
||||
name: 'separator',
|
||||
name: 'Separator',
|
||||
components: {
|
||||
Point
|
||||
},
|
||||
props: {
|
||||
zoom: {
|
||||
type: Number,
|
||||
required: true,
|
||||
required: true
|
||||
},
|
||||
fine: {
|
||||
type: Number,
|
||||
required: true,
|
||||
required: true
|
||||
},
|
||||
color: {
|
||||
type: String,
|
||||
required: true,
|
||||
required: true
|
||||
}
|
||||
},
|
||||
components: {
|
||||
Point
|
||||
},
|
||||
computed: {
|
||||
p() {
|
||||
return this.fine * 1;
|
||||
},
|
||||
w() {
|
||||
return this.fine * 3;
|
||||
return this.fine * 4;
|
||||
},
|
||||
h() {
|
||||
return this.zoom * 8 + this.fine * 6 + this.p*2;
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
<style rel="stylesheet/scss" lang="scss" scoped>
|
||||
|
@ -38,7 +38,7 @@
|
||||
@runPlanViewShow="runPlanViewShow"
|
||||
@faultChooseShow="faultChooseShow"
|
||||
@runQuestLoadShow="runQuestLoadShow"
|
||||
@runAddRolesLoadShow="runAddRolesLoadShow"
|
||||
@runAddRolesLoadShow="runAddRolesLoadShow"
|
||||
@switchMode="switchMode"
|
||||
/>
|
||||
|
||||
@ -472,19 +472,19 @@ export default {
|
||||
async runQuestLoadShow() {
|
||||
this.$refs.addQuest.doShow();
|
||||
},
|
||||
async runAddRolesLoadShow(){
|
||||
async runAddRolesLoadShow() {
|
||||
// this.$refs.addQuest.doShow();
|
||||
let row={id:this.$route.query.scriptId}
|
||||
const row={id: this.$route.query.scriptId};
|
||||
this.$refs.addQuest.handleLoad(1, row);
|
||||
},
|
||||
// 选择脚本
|
||||
async selectQuest(row, id,mapLocation,roleName) {
|
||||
async selectQuest(row, id, mapLocation, roleName) {
|
||||
try {
|
||||
|
||||
|
||||
const res = await loadScript(row.id, id, this.group);
|
||||
if (res && res.code == 200) {
|
||||
this.questId = parseInt(row.id);
|
||||
if(mapLocation){
|
||||
if (mapLocation) {
|
||||
const newMapLocation={'offsetX': mapLocation.x, 'offsetY': mapLocation.y, 'scaleRate': mapLocation.scale};
|
||||
Vue.prototype.$jlmap.setOptions(newMapLocation);
|
||||
}
|
||||
|
@ -7,8 +7,6 @@
|
||||
<system-time
|
||||
class="display-time"
|
||||
:time="time"
|
||||
:zoom="4"
|
||||
:fine="1.5"
|
||||
/>
|
||||
|
||||
</template>
|
||||
@ -74,7 +72,7 @@ export default {
|
||||
}
|
||||
|
||||
.display-time{
|
||||
padding: 5px;
|
||||
padding: 3px 5px;
|
||||
box-shadow: 0px 0px 5px #eee;
|
||||
border-radius: 3px;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user