diff --git a/DataRoom/dataroom-core/pom.xml b/DataRoom/dataroom-core/pom.xml
index df9db37c..3fdccdce 100644
--- a/DataRoom/dataroom-core/pom.xml
+++ b/DataRoom/dataroom-core/pom.xml
@@ -6,7 +6,7 @@
com.gccloud
dataroom
- 2.0.1.2023111401.Alpha
+ 2.0.1.2023112201.Alpha
dataroom-core
diff --git a/DataRoom/dataroom-core/src/main/resources/chart/mock/flyMap-country.json b/DataRoom/dataroom-core/src/main/resources/chart/mock/flyMap-country.json
index b8aa705b..a5af565b 100644
--- a/DataRoom/dataroom-core/src/main/resources/chart/mock/flyMap-country.json
+++ b/DataRoom/dataroom-core/src/main/resources/chart/mock/flyMap-country.json
@@ -3,50 +3,50 @@
"data": [
{
"from": "青海",
- "lat1": 95.2402,
- "lat2": 115.4004,
- "lng1": 35.4199,
- "lng2": 39.4688,
+ "lng1": 95.2402,
+ "lng2": 115.4004,
+ "lat1": 35.4199,
+ "lat2": 39.4688,
"to": "河北",
"type": "move_in",
"value": 90
},
{
"from": "安徽省",
- "lat1": 117.2461,
- "lat2": 115.4004,
- "lng1": 32.0361,
- "lng2": 39.4688,
+ "lng1": 117.2461,
+ "lng2": 115.4004,
+ "lat1": 32.0361,
+ "lat2": 39.4688,
"to": "河北省",
"type": "move_in",
"value": 10
},
{
"from": "新疆",
- "lat1": 87.9688,
- "lat2": 115.4004,
- "lng1": 39.7467,
- "lng2": 39.4688,
+ "lng1": 87.9688,
+ "lng2": 115.4004,
+ "lat1": 39.7467,
+ "lat2": 39.4688,
"to": "河北",
"type": "move_in",
"value": 10
},
{
"from": "云南",
- "lat1": 101.8652,
- "lat2": 115.4004,
- "lng1": 25.1807,
- "lng2": 39.4688,
+ "lng1": 101.8652,
+ "lng2": 115.4004,
+ "lat1": 25.1807,
+ "lat2": 39.4688,
"to": "河北",
"type": "move_in",
"value": 10
},
{
"from": "黑龙江",
- "lat1": 128.1445,
- "lat2": 115.4004,
- "lng1": 48.5156,
- "lng2": 39.4688,
+ "lng1": 128.1445,
+ "lng2": 115.4004,
+ "lat1": 48.5156,
+ "lat2": 39.4688,
"to": "河北",
"type": "move_in",
"value": 10
@@ -61,36 +61,36 @@
"alias": "from",
"remark": "起点"
},
- "lat1": {
+ "lng1": {
"type": "double",
"tableName": "",
- "originalColumn": "lat1",
+ "originalColumn": "lng1",
"aggregate": "",
- "alias": "lat1",
+ "alias": "lng1",
"remark": "起点纬度"
},
- "lat2": {
+ "lng2": {
"type": "double",
"tableName": "",
- "originalColumn": "lat2",
+ "originalColumn": "lng2",
"aggregate": "",
- "alias": "lat2",
+ "alias": "lng2",
"remark": "终点纬度"
},
- "lng1": {
+ "lat1": {
"type": "double",
"tableName": "",
- "originalColumn": "lng1",
+ "originalColumn": "lat1",
"aggregate": "",
- "alias": "lng1",
+ "alias": "lat1",
"remark": "起点经度"
},
- "lng2": {
+ "lat2": {
"type": "double",
"tableName": "",
- "originalColumn": "lng2",
+ "originalColumn": "lat2",
"aggregate": "",
- "alias": "lng2",
+ "alias": "lat2",
"remark": "终点经度"
},
"to": {
diff --git a/DataRoom/dataroom-core/src/main/resources/chart/mock/flyMap.json b/DataRoom/dataroom-core/src/main/resources/chart/mock/flyMap.json
index 9519289a..7e1102a5 100644
--- a/DataRoom/dataroom-core/src/main/resources/chart/mock/flyMap.json
+++ b/DataRoom/dataroom-core/src/main/resources/chart/mock/flyMap.json
@@ -3,90 +3,90 @@
"data": [
{
"from": "青海",
- "lat1": 95.2402,
- "lat2": 115.4004,
- "lng1": 35.4199,
- "lng2": 39.4688,
+ "lng1": 95.2402,
+ "lng2": 115.4004,
+ "lat1": 35.4199,
+ "lat2": 39.4688,
"to": "河北",
"type": "move_in",
"value": 90
},
{
"from": "安徽省",
- "lat1": 117.2461,
- "lat2": 115.4004,
- "lng1": 32.0361,
- "lng2": 39.4688,
+ "lng1": 117.2461,
+ "lng2": 115.4004,
+ "lat1": 32.0361,
+ "lat2": 39.4688,
"to": "河北省",
"type": "move_in",
"value": 10
},
{
"from": "新疆",
- "lat1": 87.9688,
- "lat2": 115.4004,
- "lng1": 39.7467,
- "lng2": 39.4688,
+ "lng1": 87.9688,
+ "lng2": 115.4004,
+ "lat1": 39.7467,
+ "lat2": 39.4688,
"to": "河北",
"type": "move_in",
"value": 10
},
{
"from": "云南",
- "lat1": 101.8652,
- "lat2": 115.4004,
- "lng1": 25.1807,
- "lng2": 39.4688,
+ "lng1": 101.8652,
+ "lng2": 115.4004,
+ "lat1": 25.1807,
+ "lat2": 39.4688,
"to": "河北",
"type": "move_in",
"value": 10
},
{
"from": "黑龙江",
- "lat1": 128.1445,
- "lat2": 115.4004,
- "lng1": 48.5156,
- "lng2": 39.4688,
+ "lng1": 128.1445,
+ "lng2": 115.4004,
+ "lat1": 48.5156,
+ "lat2": 39.4688,
"to": "河北",
"type": "move_in",
"value": 10
},
{
"from": "加拿大",
- "lat1": -95.7129,
- "lat2": 29.80475,
- "lng1": 56.1304,
- "lng2": 50.0577,
+ "lng1": -95.7129,
+ "lng2": 29.80475,
+ "lat1": 56.1304,
+ "lat2": 50.0577,
"to": "乌克兰",
"type": "move_in",
"value": 10
},
{
"from": "中非",
- "lat1": 20.6796,
- "lng1": 6.3646,
- "lat2": 29.80475,
- "lng2": 50.0577,
+ "lng1": 20.6796,
+ "lat1": 6.3646,
+ "lng2": 29.80475,
+ "lat2": 50.0577,
"to": "乌克兰",
"type": "move_in",
"value": 10
},
{
"from": "巴西",
- "lat1": -53.6453,
- "lng1": -10.8921,
- "lat2": 29.80475,
- "lng2": 50.0577,
+ "lng1": -53.6453,
+ "lat1": -10.8921,
+ "lng2": 29.80475,
+ "lat2": 50.0577,
"to": "乌克兰",
"type": "move_in",
"value": 10
},
{
"from": "俄罗斯",
- "lat1": 85.7325,
- "lng1": 67.4894,
- "lat2": 29.80475,
- "lng2": 50.0577,
+ "lng1": 85.7325,
+ "lat1": 67.4894,
+ "lng2": 29.80475,
+ "lat2": 50.0577,
"to": "乌克兰",
"type": "move_in",
"value": 10
@@ -101,36 +101,36 @@
"alias": "from",
"remark": "起点"
},
- "lat1": {
+ "lng1": {
"type": "double",
"tableName": "",
- "originalColumn": "lat1",
+ "originalColumn": "lng1",
"aggregate": "",
- "alias": "lat1",
+ "alias": "lng1",
"remark": "起点纬度"
},
- "lat2": {
+ "lng2": {
"type": "double",
"tableName": "",
- "originalColumn": "lat2",
+ "originalColumn": "lng2",
"aggregate": "",
- "alias": "lat2",
+ "alias": "lng2",
"remark": "终点纬度"
},
- "lng1": {
+ "lat1": {
"type": "double",
"tableName": "",
- "originalColumn": "lng1",
+ "originalColumn": "lat1",
"aggregate": "",
- "alias": "lng1",
+ "alias": "lat1",
"remark": "起点经度"
},
- "lng2": {
+ "lat2": {
"type": "double",
"tableName": "",
- "originalColumn": "lng2",
+ "originalColumn": "lat2",
"aggregate": "",
- "alias": "lng2",
+ "alias": "lat2",
"remark": "终点经度"
},
"to": {
diff --git a/DataRoom/dataroom-server/pom.xml b/DataRoom/dataroom-server/pom.xml
index 776a9571..6de0a237 100644
--- a/DataRoom/dataroom-server/pom.xml
+++ b/DataRoom/dataroom-server/pom.xml
@@ -6,7 +6,7 @@
com.gccloud
dataroom
- 2.0.1.2023111401.Alpha
+ 2.0.1.2023112201.Alpha
dataroom-server
diff --git a/DataRoom/pom.xml b/DataRoom/pom.xml
index cee2df2b..f2060b0e 100644
--- a/DataRoom/pom.xml
+++ b/DataRoom/pom.xml
@@ -5,7 +5,7 @@
com.gccloud
dataroom
- 2.0.1.2023111401.Alpha
+ 2.0.1.2023112201.Alpha
pom
dataroom
diff --git a/data-room-ui/packages/BasicComponents/FlyMap/index.vue b/data-room-ui/packages/BasicComponents/FlyMap/index.vue
index c68e3d84..a0bb4abb 100644
--- a/data-room-ui/packages/BasicComponents/FlyMap/index.vue
+++ b/data-room-ui/packages/BasicComponents/FlyMap/index.vue
@@ -138,11 +138,11 @@ export default {
this.config.option.data.forEach(val => {
// 飞线
- lines_coord.push({value: val[value], msg: {...val}, coords: [[val[fromLat], val[fromLng]], [val[toLat], val[toLng]]]})
+ lines_coord.push({value: val[value], msg: {...val}, coords: [[val[fromLng], val[fromLat]], [val[toLng], val[toLat]]]})
// 起点散点
- fromCoord.push({name: val[fromName], value: [val[fromLat], val[fromLng], val[value]], msg: {...val}})
+ fromCoord.push({name: val[fromName], value: [val[fromLng], val[fromLat], val[value]], msg: {...val}})
// 终点散点
- coord.push({name: val[toName], value: [val[toLat], val[toLng], val[value]], msg: {...val}})
+ coord.push({name: val[toName], value: [val[toLng], val[toLat], val[value]], msg: {...val}})
})
}
let mapData = hasMapId ? JSON.parse(res.data.geoJson) : res
diff --git a/data-room-ui/packages/BasicComponents/FlyMap/setting.vue b/data-room-ui/packages/BasicComponents/FlyMap/setting.vue
index cf63e847..d4f8b206 100644
--- a/data-room-ui/packages/BasicComponents/FlyMap/setting.vue
+++ b/data-room-ui/packages/BasicComponents/FlyMap/setting.vue
@@ -478,7 +478,7 @@ export default {
if (!levelConst.includes(this.config.customize.level)) {
this.config.customize.level = this.oldLevelMap[this.config.customize.level] || '0'
}
- this.$dataRoomAxios.get(`${window.BS_CONFIG?.httpConfigs?.baseURL}/bigScreen/map/tree/${this.config.customize.level}`).then((res) => {
+ this.$dataRoomAxios.get(`/bigScreen/map/tree/${this.config.customize.level}`).then((res) => {
this.mapTree = res
})
},
diff --git a/data-room-ui/packages/BasicComponents/Map/index.vue b/data-room-ui/packages/BasicComponents/Map/index.vue
index a03b398e..ef972266 100644
--- a/data-room-ui/packages/BasicComponents/Map/index.vue
+++ b/data-room-ui/packages/BasicComponents/Map/index.vue
@@ -189,7 +189,7 @@ export default {
calculable: config.customize.visual,
min: config.customize.range[0],
max: config.customize.range[1],
- seriesIndex: [0],
+ seriesIndex: config.customize.scatter ? -1 : 0,
inRange: {
color: config.customize.rangeColor
}
diff --git a/data-room-ui/packages/BasicComponents/Map/setting.vue b/data-room-ui/packages/BasicComponents/Map/setting.vue
index 1623ee52..b7cb832d 100644
--- a/data-room-ui/packages/BasicComponents/Map/setting.vue
+++ b/data-room-ui/packages/BasicComponents/Map/setting.vue
@@ -513,7 +513,7 @@ export default {
if (!levelConst.includes(this.config.customize.level)) {
this.config.customize.level = this.oldLevelMap[this.config.customize.level] || '0'
}
- this.$dataRoomAxios.get(`${window.BS_CONFIG?.httpConfigs?.baseURL}/bigScreen/map/tree/${this.config.customize.level}`).then((res) => {
+ this.$dataRoomAxios.get(`/bigScreen/map/tree/${this.config.customize.level}`).then((res) => {
this.mapTree = res
})
},
diff --git a/data-room-ui/packages/BasicComponents/Numbers/index.vue b/data-room-ui/packages/BasicComponents/Numbers/index.vue
index 1cbfcecc..023562e7 100644
--- a/data-room-ui/packages/BasicComponents/Numbers/index.vue
+++ b/data-room-ui/packages/BasicComponents/Numbers/index.vue
@@ -14,10 +14,11 @@