From 595fd831e44f7e2eed247ef4714e963c441529a3 Mon Sep 17 00:00:00 2001
From: Iwan Lebron <105045937+iwanlebron@users.noreply.github.com>
Date: 星期三, 31 七月 2024 18:52:17 +0800
Subject: [PATCH] Merge pull request #3 from iwanlebron/iwanlebron-patch-3
---
web_src/src/components/channelList.vue | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue
index 02e92e7..ff1d784 100755
--- a/web_src/src/components/channelList.vue
+++ b/web_src/src/components/channelList.vue
@@ -326,7 +326,9 @@
e.ptzType = e.ptzType + "";
that.$set(e, "edit", false);
that.$set(e, "location", "");
- if (e.longitude && e.latitude) {
+ if (e.customLongitude && e.customLatitude) {
+ that.$set(e, "location", e.customLongitude + "," + e.customLatitude);
+ }else if (e.longitude && e.latitude) {
that.$set(e, "location", e.longitude + "," + e.latitude);
}
});
@@ -481,7 +483,9 @@
e.ptzType = e.ptzType + "";
this.$set(e, "edit", false);
this.$set(e, "location", "");
- if (e.longitude && e.latitude) {
+ if (e.customLongitude && e.customLatitude) {
+ this.$set(e, "location", e.customLongitude + "," + e.customLatitude);
+ }else if (e.longitude && e.latitude) {
this.$set(e, "location", e.longitude + "," + e.latitude);
}
});
@@ -600,12 +604,13 @@
if (row.location) {
const segements = row.location.split(",");
if (segements.length !== 2) {
+ console.log(1)
this.$message.warning("浣嶇疆淇℃伅鏍煎紡鏈夎锛屼緥锛�117.234,36.378");
return;
} else {
- row.longitude = parseFloat(segements[0]);
- row.latitude = parseFloat(segements[1]);
- if (!(row.longitude && row.latitude)) {
+ row.customLongitude = parseFloat(segements[0]);
+ row.customLatitude = parseFloat(segements[1]);
+ if (!(row.customLongitude && row.customLatitude)) {
this.$message.warning("浣嶇疆淇℃伅鏍煎紡鏈夎锛屼緥锛�117.234,36.378");
return;
}
--
Gitblit v1.8.0