157f001c by jikai

Merge remote-tracking branch 'origin/master'

2 parents ee37d160 be15915c
This file is too large to display.
......@@ -248,7 +248,6 @@
},
importantPrograme(e) {
debugger
if (!this.isimportan1) {
this.isimportan1 = true;
} else {
......
......@@ -10,7 +10,6 @@
<span>通视分析</span>
<span @click="closePop" class="close">×</span>
</div>
<div class="func-input">
<span>观察点高度</span>
<el-input-number v-model="num" controls-position="right" @change="handleChange"
......@@ -18,7 +17,6 @@
</el-input-number>
<span style="margin-left: 12px;"></span>
</div>
<div class="func-btn">
<div class="btn-wrapper add-bg" @click="startAnalysis">
<img style="width: 20px; height: 20px; margin: 0 5px 0 44px" src="../assets/icon_开始分析.png" alt="">
......@@ -29,7 +27,6 @@
<span>清除分析结果</span>
</div>
</div>
</div>
</div>
</template>
......@@ -43,7 +40,6 @@
return {
step: 0.01,
num: 1,
// isAnalysis: true
}
},
mounted() {
......@@ -62,7 +58,6 @@
stopAnalysis() {
this.viewpoint.remove();
}
}
}
</script>
......@@ -113,7 +108,6 @@
display: inline-block;
}
.title-bt {
display: flex;
justify-content: space-between;
......@@ -136,8 +130,6 @@
padding: 18px 24px;
}
.func-btn {
display: flex;
padding: 18px 24px 37px 24px;
......
......@@ -251,7 +251,7 @@
,Eenlarge() {
this.viewer.camera.zoomIn(300);
}
,EEnarrow() {
,Enarrow() {
this.viewer.camera.zoomOut(300);
}
,Ecoordinate() {
......