From f4c90cdeda652f0d40d04eefde317626593d19e5 Mon Sep 17 00:00:00 2001
From: jihongshun <1151753686@qq.com>
Date: 星期四, 21 八月 2025 17:16:30 +0800
Subject: [PATCH] 优化左中右联动效果
---
src/views/system/shootPoint/components/shootPointDialog.vue | 9 ++++++---
src/utils/components/init-map.vue | 43 +++++++++++++++++++++++++++----------------
2 files changed, 33 insertions(+), 19 deletions(-)
diff --git a/src/utils/components/init-map.vue b/src/utils/components/init-map.vue
index 9cf9a0a..0ebe244 100644
--- a/src/utils/components/init-map.vue
+++ b/src/utils/components/init-map.vue
@@ -115,11 +115,7 @@
</div>
</div>
- <div class="cesiumButtonGroup">
- <el-button id="groundPoi" @click="addGroundPoi()" type="primary">鍦伴潰鐐�</el-button>
- <el-input v-model="mergeNumber" placeholder="璇疯緭鍏ュ悎骞惰寖鍥�" type="number" style="width: 150px;"></el-input>
- <el-button @click="mergePoint()" type="success">鍚堝苟</el-button>
- </div>
+
<!-- <div class="key-container">
<div class="arrow-row">
<div
@@ -172,7 +168,11 @@
</div>
</div> -->
</div>
-
+ <el-button id="groundPoi" class="groundPoi" @click="addGroundPoi()" type="info" plain >鍦伴潰鐐�</el-button>
+ <div class="cesiumButtonGroup">
+ <el-input v-model="mergeNumber" placeholder="鍚堝苟鑼冨洿" type="number" style="width: 120px;"></el-input>
+ <el-button @click="mergePoint()" type="success">鍚堝苟</el-button>
+ </div>
<!-- 鍔ㄦ�佸潗鏍囥�佸姩鎬佺浉鏈哄弬鏁版樉绀� -->
<!-- <div id="moveResult" class="moveResult">
<div id="moveResultCon" class="moveResultCon"></div>
@@ -1272,13 +1272,14 @@
editAction(action){
// 鐐瑰嚮宸︿晶灏忓浘鏍囷紝鍙充晶鍒囨崲鍒拌 action
this.currentAction = action;
+ console.log(action)
console.log(this.currentAction)
if(action.type == '鎮仠') {
this.time = action.extra.value
} else if(action.type == '鎷嶇収'){
- this.newTakePhoto = action.extra.value
+ this.takePhoto = action.extra.value
}else if(action.type == '寮�濮嬪綍鍍�'){
- this.newTakeVideo = action.extra.value
+ this.takeVideo = action.extra.value
}else if(action.type == '缁撴潫褰曞儚'){
}
},
@@ -1301,7 +1302,7 @@
console.log(this.newTakePhoto)
this.takePhoto = this.newTakePhoto; // 鐐瑰嚮瀵瑰彿鏃讹紝鏇存柊鏁版嵁
this.isEditingPhoto = false; // 缁撴潫缂栬緫
- this.currentAction.extra.value = this.takePhoto
+ this.currentAction.extra.value = this.newTakePhoto
},
cancelEditing() {
this.newTakePhoto = this.takePhoto; // 鐐瑰嚮鍙栨秷鏃讹紝鎭㈠鍘熸暟鎹�
@@ -1314,7 +1315,7 @@
validateVideoInput() {
this.takeVideo = this.newTakeVideo; // 鐐瑰嚮瀵瑰彿鏃讹紝鏇存柊鏁版嵁
this.isEditingVideo = false; // 缁撴潫缂栬緫
- this.currentAction.extra.value = this.takeVideo
+ this.currentAction.extra.value = this.newTakeVideo
},
cancelVideoEditing() {
this.newTakeVideo = this.takeVideo; // 鐐瑰嚮鍙栨秷鏃讹紝鎭㈠鍘熸暟鎹�
@@ -1354,8 +1355,10 @@
<style scoped>
+
.cesium-example{
- height: calc(100vh - 185px);
+ /* height: calc(100vh - 185px); */
+ height: 100%;
}
#cesiumContainer {
margin: 0;
@@ -1370,7 +1373,7 @@
/* padding: 0 5px; */
right: 10px;
/* top: 0px; */
- bottom: 80px;
+ bottom: 30px;
margin: 0;
width: 400px;
height: 300px;
@@ -1436,20 +1439,28 @@
}
.flayDataAll {
background-color:#232323;
- height: calc(100% - 55px);
+ /* height: calc(100% - 55px); */
+ height: calc(100% - 5px);
width: 100%;
}
.flyData{
width: calc(100% - 32px);
- height: calc(100% - 55px);
+ /* height: calc(100% - 55px); */
+ height: calc(100% - 5px);
margin: auto;
color: white;
}
.cesiumButtonGroup{
position: absolute;
- bottom: 0;
+ top: 15px;
+ left: 100px;
/* margin-top: 10px;
margin-left: 10px; */
+}
+.groundPoi {
+ position: absolute;
+ top: 15px;
+ left: 350px;
}
.moveResult{position:absolute;z-index:2;background-color:rgba(47,53,60,1);padding:0 5px;right:50%;bottom:30px;
border:1px solid rgba(255,255,255,.1);box-sizing:content-box;width:220px;height:30px;font-size:14px;text-align:center}
@@ -1518,7 +1529,7 @@
height: 300px;
position: absolute;
right: 10px;
- bottom:80px;
+ bottom:30px;
/* background-color: red; */
z-index: 9;
diff --git a/src/views/system/shootPoint/components/shootPointDialog.vue b/src/views/system/shootPoint/components/shootPointDialog.vue
index d619ffe..75b507d 100644
--- a/src/views/system/shootPoint/components/shootPointDialog.vue
+++ b/src/views/system/shootPoint/components/shootPointDialog.vue
@@ -10,7 +10,7 @@
<el-col :span="4">
<el-card class="noScroll">
<div class="chooseModel">
- <el-button type="primary" @click='chooseModel'>閫夋嫨妯″瀷</el-button>
+ <el-button type="primary" @click='chooseModel'>妯″瀷</el-button>
<div class="modelType">
妯″瀷鍚嶇О锛歿{ modelName }}
</div>
@@ -60,7 +60,7 @@
<span v-for="(action, aIndex) in wp.actions"
:key="action.id"
class="action-icon"
- @click="clickItem(action)">
+ @click.stop="clickItem(action)">
<img src="@/assets/images/xuanting.svg" alt="svg鍥剧墖" v-if="action.type==='鎮仠'" />
<img src="@/assets/images/photo.svg" alt="svg鍥剧墖" v-if="action.type==='鎷嶇収'" />
@@ -93,7 +93,6 @@
</div>
</template>
<script>
-import { compileToFunctions } from "vue-template-compiler";
import CesiumMap from "../../../../utils/components/cesium-map.vue";
import InitMap from "../../../../utils/components/init-map.vue";
import ChooseModelDialog from './chooseModelDialog.vue';
@@ -742,6 +741,10 @@
}
</script>
<style scoped>
+::v-deep .el-dialog__header {
+ padding: 10px; /* 淇敼鍐呰竟璺� */
+ font-size: 18px; /* 淇敼瀛椾綋澶у皬 */
+}
.noScroll{
height: calc(100vh - 175px);
overflow: auto;
--
Gitblit v1.9.3