From 68ce9382090846dc3a03a057a18a7d09f30e45e5 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 17 十月 2025 17:39:03 +0800
Subject: [PATCH] test
---
pages/map/scene.vue | 46 ++++++++++++++++++++++++++++++++++------------
1 files changed, 34 insertions(+), 12 deletions(-)
diff --git a/pages/map/scene.vue b/pages/map/scene.vue
index aa7af12..c787b5d 100644
--- a/pages/map/scene.vue
+++ b/pages/map/scene.vue
@@ -44,7 +44,7 @@
<view class="tip">鍦烘櫙鏋勫缓涓�/view>
<view>
<!-- 璇锋搷浣滄惉杩愯溅鎵弿鍦板浘瑕嗙洊鐨勫尯鍩�-->
- {{mapServerPhase=== 1 ?"鍦烘櫙鏋勫缓鏈嶅姟锛氭湭鍚姩":mapServerPhase===2 ?"鍦烘櫙鏋勫缓鏈嶅姟锛氬惎鍔ㄤ腑":mapServerPhase===3 ?"鍦烘櫙鏋勫缓涓�:mapServerPhase}}
+ {{mapCreatePhase}}
</view>
<view class="text-button-group">
@@ -55,7 +55,7 @@
<view class="tip"> 鈥渰{sceneName}}鈥漿{opType == "extend"?"鍦烘櫙鎵╁睍缁撴潫"+"":"鍦烘櫙鏋勫缓缁撴潫"}}</view>
<!-- <view> 宸叉垚鍔熸瀯寤衡�{{sceneName}}鈥�/view> -->
<view class="loading-view">
- 鏋勫浘鐘舵�锛歿{mapServerPhase===5?"淇濆瓨鎴愬姛":mapServerPhase===4?"淇濆瓨涓�:mapServerPhase===6?"淇濆瓨澶辫触":mapServerPhase}}
+ {{mapCreatePhase}}
<view v-if="mapServerPhase === 4" class="auto-circle"></view>
</view>
<view class="text-button-group">
@@ -125,7 +125,22 @@
}
},
computed: {
-
+ mapCreatePhase() {
+ if (this.mapServerPhase == 1) {
+ return "鍦烘櫙鏋勫缓鏈嶅姟锛氭湭鍚姩"
+ } else if (this.mapServerPhase == 2) {
+ return "鍦烘櫙鏋勫缓鏈嶅姟锛氬惎鍔ㄤ腑"
+ } else if (this.mapServerPhase == 3) {
+ return "鍦烘櫙鏋勫缓涓�
+ } else if (this.mapServerPhase == 4) {
+ return "鍦烘櫙鏋勫浘淇濆瓨涓�
+ } else if (this.mapServerPhase == 5) {
+ return "鍦烘櫙鏋勫浘淇濆瓨鎴愬姛"
+ } else if (this.mapServerPhase == 6) {
+ return "鍦烘櫙鏋勫浘淇濆瓨澶辫触"
+ } else
+ return this.mapServerPhase
+ }
},
watch: {
@@ -265,12 +280,12 @@
const res = await getMapServerPhase(this.ip)
this.mapServerPhase = res || 1
- if (this.mapServerPhase === 3) {
- return
- }
- if (this.mapServerPhase === 5 || this.mapServerPhase === 6) {
- this.saveMapIsOk = true
- return
+ if(this.opSceneType === "finish")
+ {
+ if (this.mapServerPhase === 5 || this.mapServerPhase === 6) {
+ this.saveMapIsOk = true
+ return
+ }
}
setTimeout(this.checkMapServerPhase, 1000);
} catch (ex) {
@@ -451,8 +466,8 @@
})
this.saveMapIsOk = false
await stopMap(this.ip, this.sceneName)
- this.mapServerPhase = 4
- this.checkMapServerPhase();
+ //this.mapServerPhase = 4
+ //this.checkMapServerPhase();
// if (this.opType == "extend") {
// this.opSceneType = ""
// const eventChannel = this.getOpenerEventChannel();
@@ -552,7 +567,11 @@
filedata: mapData
}
})
-
+ listCtrData.push({
+ method: "point_trajectory",
+ param: data.base_map.trajectoryPoints ||
+ [] //[ [[2,2],[6,2],[10,2],[14,2],[18,2],[2,6],[2,10],[2,14],[2,18],]
+ })
}
@@ -560,6 +579,8 @@
method: "point_cloud",
param: data.point_cloud
})
+
+
if (data.robot_pose) {
listCtrData.push({
method: "agv_laser",
@@ -586,6 +607,7 @@
})
}
}
+
}
// console.log("ctxDataStr",listCtrData.length)
this.ctxDataStr = JSON.stringify(listCtrData)
--
Gitblit v1.9.1