From d41d6b34af2485198ed01e1888db1571e4da1a6a Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 23 四月 2024 20:59:20 +0800
Subject: [PATCH] Merge branch 'refs/heads/2.7.0'
---
web_src/src/components/channelList.vue | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue
index 02e92e7..ef49205 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);
}
});
@@ -603,8 +607,8 @@
this.$message.warning("浣嶇疆淇℃伅鏍煎紡鏈夎锛屼緥锛�117.234,36.378");
return;
} else {
- row.longitude = parseFloat(segements[0]);
- row.latitude = parseFloat(segements[1]);
+ row.customLongitude = parseFloat(segements[0]);
+ row.custom_latitude = parseFloat(segements[1]);
if (!(row.longitude && row.latitude)) {
this.$message.warning("浣嶇疆淇℃伅鏍煎紡鏈夎锛屼緥锛�117.234,36.378");
return;
--
Gitblit v1.8.0