From 21de2bb71eef9c890909d3494abcf8fef767fa6f Mon Sep 17 00:00:00 2001
From: TreeWish <1131093754@qq.com>
Date: 星期二, 07 二月 2023 10:41:51 +0800
Subject: [PATCH] 合并冲突
---
src/views/datamanage/SpatialData.vue | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/views/datamanage/SpatialData.vue b/src/views/datamanage/SpatialData.vue
index 92a9dc0..09bee04 100644
--- a/src/views/datamanage/SpatialData.vue
+++ b/src/views/datamanage/SpatialData.vue
@@ -401,6 +401,12 @@
label: '涓氬姟鏁版嵁',
value: 'BS',
children: [],
+ }, {
+ id: 3,
+ tabDesc: '鍏冩暟鎹�',
+ label: '鍏冩暟鎹�',
+ value: 'MD',
+ children: [],
},
],
tableAttach: [],
@@ -776,7 +782,6 @@
var val;
if (this.formSql.type == "long" || this.formSql.type == "integer") {
-
val = parseInt(this.formSql.value);
} else if (this.formSql.type == 'double') {
--
Gitblit v1.9.3