From 2af5f043b60c1f7ac38ecccc8f5bf44743134325 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 12 十二月 2025 18:08:00 +0800
Subject: [PATCH] test
---
pages/teaching/index.vue | 107 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 67 insertions(+), 40 deletions(-)
diff --git a/pages/teaching/index.vue b/pages/teaching/index.vue
index 2b171f9..6cae10d 100644
--- a/pages/teaching/index.vue
+++ b/pages/teaching/index.vue
@@ -150,7 +150,9 @@
<script>
import {
showToast,
- showModal
+ showModal,
+ showError,
+ showInfo
} from "@/comm/utils.js"
import {
Button
@@ -181,7 +183,12 @@
} else if (this.mapOperationType == "public_teaching" || this.mapOperationType == "station_teaching") {
if (this.teachingStatus) {
- showModal("宸茶褰曠殑璺緞灏嗕細琚垹闄ゃ�", "鏄惁瑕侀�鍑虹ず鏁欙紵").then((res) => {
+ showModal({
+ title: `${this.translate('ask_exit_teaching')}`,
+ content: `${this.translate('recorded_path_will_be_deleted')}`,
+ confirmText: this.translate('yes'),
+ cancelText: this.translate('no'),
+ }).then((res) => {
if (res) {
this.mapOperationType = ""
}
@@ -284,7 +291,7 @@
} catch (ex) {
- this.showError(ex)
+ showError(ex, this.translate('error'))
}
},
async loadAgvState() {
@@ -292,7 +299,7 @@
const info = await getAgvState(this.ip)
return info
} catch (ex) {
- this.showError(ex)
+ showError(ex, this.translate('error'))
return {}
}
},
@@ -301,7 +308,7 @@
const info = await stations(this.ip)
return info.station_list || []
} catch (ex) {
- this.showError(ex)
+ showError(ex, this.translate('error'))
return []
}
},
@@ -367,7 +374,7 @@
}
} catch (ex) {
- this.showError(ex)
+ showError(ex, this.translate('error'))
}
},
@@ -379,21 +386,14 @@
this.calibratioStationType = "end"
this.$refs.refPopupCalibration.open()
} else {
- this.teachingModeCur.teaching_flag = 0
- await teachingModeFlag(this.ip, this.teachingModeCur)
- this.teachingMode = await getTeachingMode(this.ip)
-
- this.teachingStatus = "end"
+ this.askTeachingBiDirection(this.teachingModeCur)
}
} else {
- this.teachingModeCur.teaching_flag = 0
- await teachingModeFlag(this.ip, this.teachingModeCur)
- this.teachingMode = await getTeachingMode(this.ip)
- this.teachingStatus = "end"
+ this.askTeachingBiDirection(this.teachingModeCur)
}
} catch (ex) {
- this.showError(ex)
+ showError(ex, this.translate('error'))
}
},
@@ -412,7 +412,7 @@
}
} catch (ex) {
- this.showError(ex)
+ showError(ex, this.translate('error'))
}
},
async clickTeachingStart() {
@@ -427,7 +427,12 @@
const curIndex = stationTeaching.findIndex((a) => a.src_dst == srcDst)
if (curIndex > -1) {
- showModal("璇ョ珯鐐归棿宸叉湁绀烘暀璺緞锛岄噸鏂拌褰曚細瑕嗙洊涔嬪墠鐨勮矾寰勩�", "鏄惁瑕侀噸鏂拌褰曪紵").then(async (res) => {
+ showModal({
+ title: "鏄惁瑕侀噸鏂拌褰曪紵",
+ content: "璇ョ珯鐐归棿宸叉湁绀烘暀璺緞锛岄噸鏂拌褰曚細瑕嗙洊涔嬪墠鐨勮矾寰勩�",
+ confirmText: this.translate('yes'),
+ cancelText: this.translate('no'),
+ }).then(async (res) => {
if (res) {
try {
_this.teachingStatus = "teaching"
@@ -440,7 +445,7 @@
stationTeaching.splice(curIndex, 1)
_this.teachingStart("Stations")
} catch (ex) {
- this.showError(ex)
+ showError(ex, this.translate('error'))
}
} else {
@@ -459,7 +464,7 @@
}
} catch (ex) {
- this.showError(ex)
+ showError(ex, this.translate('error'))
}
},
clickTeachingEnd() {
@@ -472,7 +477,12 @@
},
clickTeachingReset() {
const _this = this
- showModal("宸茶褰曠殑璺緞灏嗕細琚垹闄ゃ�", "鏄惁瑕侀噸鏂拌褰曪紵").then(async (res) => {
+ showModal({
+ title: `${this.translate('ask_exit_teaching')}`,
+ content: `${this.translate('recorded_path_will_be_deleted')}`,
+ confirmText: this.translate('yes'),
+ cancelText: this.translate('no'),
+ }).then(async (res) => {
if (res) {
try {
await delTeachingMode(_this.ip, [_this.teachingModeCur])
@@ -480,7 +490,7 @@
_this.teachingMode = await getTeachingMode(_this.ip)
} catch (ex) {
- this.showError(ex)
+ showError(ex, this.translate('error'))
}
} else {
_this.teachingStatus = "save"
@@ -492,7 +502,7 @@
this.teachingStatus = "save"
try {} catch (ex) {
- this.showError(ex)
+ showError(ex, this.translate('error'))
}
},
@@ -639,14 +649,12 @@
list[curIndex].y = infoAgv.y
}
- this.teachingStatus = "end"
- this.teachingModeCur.teaching_flag = 0
- await teachingModeFlag(this.ip, this.teachingModeCur)
- this.teachingMode = await getTeachingMode(this.ip)
+ this.askTeachingBiDirection(this.teachingModeCur)
+
}
} catch (ex) {
- this.showError(ex)
+ showError(ex, this.translate('error'))
}
},
async clickNoCalibration() {
@@ -667,28 +675,47 @@
} else if (this.calibratioStationType == "end") {
- this.teachingModeCur.teaching_flag = 0
- await teachingModeFlag(this.ip, this.teachingModeCur)
- this.teachingMode = await getTeachingMode(this.ip)
+ this.askTeachingBiDirection(this.teachingModeCur)
}
} catch (ex) {
- this.showError(ex)
+ showError(ex, this.translate('error'))
+ }
+ },
+ askTeachingBiDirection(teachingMode) {
+ showModal({
+ title: "绀烘暀缁撴潫",
+ content: "鏄惁灏嗗綋鍓嶇ず鏁欒矾绾胯缃负鍙屽悜?",
+ confirmText: this.translate('yes'),
+ cancelText: this.translate('no'),
+ }).then((res) => {
+ if (res) {
+ teachingMode.bidirection = "1"
+ } else {
+ teachingMode.bidirection = "0"
+ }
+ teachingMode.teaching_flag = 0
+ this.finishTeaching(teachingMode)
+ })
+
+ },
+ async finishTeaching(teachingMode) {
+ try {
+ await teachingModeFlag(this.ip, teachingMode)
+ this.teachingMode = await getTeachingMode(this.ip)
+ this.teachingStatus = "end"
+ } catch (ex) {
+ showError(ex, this.translate('error'))
}
},
clickBackTeaching() {
this.$refs.refPopupCalibration.close()
this.teachingStatus = ""
},
- showError(ex) {
- let exStr = JSON.stringify(ex)
- if (exStr == "{}")
- exStr = ex
- let tip = typeof ex.msg == "string" ? ex.msg : exStr
- showModal(tip, "閿欒", false)
+ translate(t) {
+ if (typeof this.$t == "function") return this.$t(`page.${t}`)
+ else return t;
},
-
-
}
}
</script>
--
Gitblit v1.9.1