tzjy-code
/
DataRoom
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

style: 修复右侧配置面板头部标题被遮挡的情况

Browse Source
main
wu.jian2 1 year ago
parent 5018c34e8c 61a05687af
commit 05c62d7bc4
12 changed files with 94 additions and 92 deletions
Show Stats Download Patch File Download Diff File

2
DataRoom/dataroom-core/pom.xml
Unescape Escape View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.gccloud</groupId> <groupId>com.gccloud</groupId>
<artifactId>dataroom</artifactId> <artifactId>dataroom</artifactId>
<version>2.0.1.2023111401.Alpha</version> <version>2.0.1.2023112201.Alpha</version>
</parent> </parent>
<artifactId>dataroom-core</artifactId> <artifactId>dataroom-core</artifactId>

64
DataRoom/dataroom-core/src/main/resources/chart/mock/flyMap-country.json
Unescape Escape View File

@ -3,50 +3,50 @@
"data": [ "data": [
{ {
"from": "青海", "from": "青海",
"lat1": 95.2402, "lng1": 95.2402,
"lat2": 115.4004, "lng2": 115.4004,
"lng1": 35.4199, "lat1": 35.4199,
"lng2": 39.4688, "lat2": 39.4688,
"to": "河北", "to": "河北",
"type": "move_in", "type": "move_in",
"value": 90 "value": 90
}, },
{ {
"from": "安徽省", "from": "安徽省",
"lat1": 117.2461, "lng1": 117.2461,
"lat2": 115.4004, "lng2": 115.4004,
"lng1": 32.0361, "lat1": 32.0361,
"lng2": 39.4688, "lat2": 39.4688,
"to": "河北省", "to": "河北省",
"type": "move_in", "type": "move_in",
"value": 10 "value": 10
}, },
{ {
"from": "新疆", "from": "新疆",
"lat1": 87.9688, "lng1": 87.9688,
"lat2": 115.4004, "lng2": 115.4004,
"lng1": 39.7467, "lat1": 39.7467,
"lng2": 39.4688, "lat2": 39.4688,
"to": "河北", "to": "河北",
"type": "move_in", "type": "move_in",
"value": 10 "value": 10
}, },
{ {
"from": "云南", "from": "云南",
"lat1": 101.8652, "lng1": 101.8652,
"lat2": 115.4004, "lng2": 115.4004,
"lng1": 25.1807, "lat1": 25.1807,
"lng2": 39.4688, "lat2": 39.4688,
"to": "河北", "to": "河北",
"type": "move_in", "type": "move_in",
"value": 10 "value": 10
}, },
{ {
"from": "黑龙江", "from": "黑龙江",
"lat1": 128.1445, "lng1": 128.1445,
"lat2": 115.4004, "lng2": 115.4004,
"lng1": 48.5156, "lat1": 48.5156,
"lng2": 39.4688, "lat2": 39.4688,
"to": "河北", "to": "河北",
"type": "move_in", "type": "move_in",
"value": 10 "value": 10
@ -61,36 +61,36 @@
"alias": "from", "alias": "from",
"remark": "起点" "remark": "起点"
}, },
"lat1": { "lng1": {
"type": "double", "type": "double",
"tableName": "", "tableName": "",
"originalColumn": "lat1", "originalColumn": "lng1",
"aggregate": "", "aggregate": "",
"alias": "lat1", "alias": "lng1",
"remark": "起点纬度" "remark": "起点纬度"
}, },
"lat2": { "lng2": {
"type": "double", "type": "double",
"tableName": "", "tableName": "",
"originalColumn": "lat2", "originalColumn": "lng2",
"aggregate": "", "aggregate": "",
"alias": "lat2", "alias": "lng2",
"remark": "终点纬度" "remark": "终点纬度"
}, },
"lng1": { "lat1": {
"type": "double", "type": "double",
"tableName": "", "tableName": "",
"originalColumn": "lng1", "originalColumn": "lat1",
"aggregate": "", "aggregate": "",
"alias": "lng1", "alias": "lat1",
"remark": "起点经度" "remark": "起点经度"
}, },
"lng2": { "lat2": {
"type": "double", "type": "double",
"tableName": "", "tableName": "",
"originalColumn": "lng2", "originalColumn": "lat2",
"aggregate": "", "aggregate": "",
"alias": "lng2", "alias": "lat2",
"remark": "终点经度" "remark": "终点经度"
}, },
"to": { "to": {

96
DataRoom/dataroom-core/src/main/resources/chart/mock/flyMap.json
Unescape Escape View File

@ -3,90 +3,90 @@
"data": [ "data": [
{ {
"from": "青海", "from": "青海",
"lat1": 95.2402, "lng1": 95.2402,
"lat2": 115.4004, "lng2": 115.4004,
"lng1": 35.4199, "lat1": 35.4199,
"lng2": 39.4688, "lat2": 39.4688,
"to": "河北", "to": "河北",
"type": "move_in", "type": "move_in",
"value": 90 "value": 90
}, },
{ {
"from": "安徽省", "from": "安徽省",
"lat1": 117.2461, "lng1": 117.2461,
"lat2": 115.4004, "lng2": 115.4004,
"lng1": 32.0361, "lat1": 32.0361,
"lng2": 39.4688, "lat2": 39.4688,
"to": "河北省", "to": "河北省",
"type": "move_in", "type": "move_in",
"value": 10 "value": 10
}, },
{ {
"from": "新疆", "from": "新疆",
"lat1": 87.9688, "lng1": 87.9688,
"lat2": 115.4004, "lng2": 115.4004,
"lng1": 39.7467, "lat1": 39.7467,
"lng2": 39.4688, "lat2": 39.4688,
"to": "河北", "to": "河北",
"type": "move_in", "type": "move_in",
"value": 10 "value": 10
}, },
{ {
"from": "云南", "from": "云南",
"lat1": 101.8652, "lng1": 101.8652,
"lat2": 115.4004, "lng2": 115.4004,
"lng1": 25.1807, "lat1": 25.1807,
"lng2": 39.4688, "lat2": 39.4688,
"to": "河北", "to": "河北",
"type": "move_in", "type": "move_in",
"value": 10 "value": 10
}, },
{ {
"from": "黑龙江", "from": "黑龙江",
"lat1": 128.1445, "lng1": 128.1445,
"lat2": 115.4004, "lng2": 115.4004,
"lng1": 48.5156, "lat1": 48.5156,
"lng2": 39.4688, "lat2": 39.4688,
"to": "河北", "to": "河北",
"type": "move_in", "type": "move_in",
"value": 10 "value": 10
}, },
{ {
"from": "加拿大", "from": "加拿大",
"lat1": -95.7129, "lng1": -95.7129,
"lat2": 29.80475, "lng2": 29.80475,
"lng1": 56.1304, "lat1": 56.1304,
"lng2": 50.0577, "lat2": 50.0577,
"to": "乌克兰", "to": "乌克兰",
"type": "move_in", "type": "move_in",
"value": 10 "value": 10
}, },
{ {
"from": "中非", "from": "中非",
"lat1": 20.6796, "lng1": 20.6796,
"lng1": 6.3646, "lat1": 6.3646,
"lat2": 29.80475, "lng2": 29.80475,
"lng2": 50.0577, "lat2": 50.0577,
"to": "乌克兰", "to": "乌克兰",
"type": "move_in", "type": "move_in",
"value": 10 "value": 10
}, },
{ {
"from": "巴西", "from": "巴西",
"lat1": -53.6453, "lng1": -53.6453,
"lng1": -10.8921, "lat1": -10.8921,
"lat2": 29.80475, "lng2": 29.80475,
"lng2": 50.0577, "lat2": 50.0577,
"to": "乌克兰", "to": "乌克兰",
"type": "move_in", "type": "move_in",
"value": 10 "value": 10
}, },
{ {
"from": "俄罗斯", "from": "俄罗斯",
"lat1": 85.7325, "lng1": 85.7325,
"lng1": 67.4894, "lat1": 67.4894,
"lat2": 29.80475, "lng2": 29.80475,
"lng2": 50.0577, "lat2": 50.0577,
"to": "乌克兰", "to": "乌克兰",
"type": "move_in", "type": "move_in",
"value": 10 "value": 10
@ -101,36 +101,36 @@
"alias": "from", "alias": "from",
"remark": "起点" "remark": "起点"
}, },
"lat1": { "lng1": {
"type": "double", "type": "double",
"tableName": "", "tableName": "",
"originalColumn": "lat1", "originalColumn": "lng1",
"aggregate": "", "aggregate": "",
"alias": "lat1", "alias": "lng1",
"remark": "起点纬度" "remark": "起点纬度"
}, },
"lat2": { "lng2": {
"type": "double", "type": "double",
"tableName": "", "tableName": "",
"originalColumn": "lat2", "originalColumn": "lng2",
"aggregate": "", "aggregate": "",
"alias": "lat2", "alias": "lng2",
"remark": "终点纬度" "remark": "终点纬度"
}, },
"lng1": { "lat1": {
"type": "double", "type": "double",
"tableName": "", "tableName": "",
"originalColumn": "lng1", "originalColumn": "lat1",
"aggregate": "", "aggregate": "",
"alias": "lng1", "alias": "lat1",
"remark": "起点经度" "remark": "起点经度"
}, },
"lng2": { "lat2": {
"type": "double", "type": "double",
"tableName": "", "tableName": "",
"originalColumn": "lng2", "originalColumn": "lat2",
"aggregate": "", "aggregate": "",
"alias": "lng2", "alias": "lat2",
"remark": "终点经度" "remark": "终点经度"
}, },
"to": { "to": {

2
DataRoom/dataroom-server/pom.xml
Unescape Escape View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.gccloud</groupId> <groupId>com.gccloud</groupId>
<artifactId>dataroom</artifactId> <artifactId>dataroom</artifactId>
<version>2.0.1.2023111401.Alpha</version> <version>2.0.1.2023112201.Alpha</version>
</parent> </parent>
<artifactId>dataroom-server</artifactId> <artifactId>dataroom-server</artifactId>

2
DataRoom/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<groupId>com.gccloud</groupId> <groupId>com.gccloud</groupId>
<artifactId>dataroom</artifactId> <artifactId>dataroom</artifactId>
<version>2.0.1.2023111401.Alpha</version> <version>2.0.1.2023112201.Alpha</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>dataroom</name> <name>dataroom</name>

6
data-room-ui/packages/BasicComponents/FlyMap/index.vue
Unescape Escape View File

@ -138,11 +138,11 @@ export default {
this.config.option.data.forEach(val => { 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 let mapData = hasMapId ? JSON.parse(res.data.geoJson) : res

2
data-room-ui/packages/BasicComponents/FlyMap/setting.vue
Unescape Escape View File

@ -478,7 +478,7 @@ export default {
if (!levelConst.includes(this.config.customize.level)) { if (!levelConst.includes(this.config.customize.level)) {
this.config.customize.level = this.oldLevelMap[this.config.customize.level] || '0' 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 this.mapTree = res
}) })
}, },

2
data-room-ui/packages/BasicComponents/Map/index.vue
Unescape Escape View File

@ -189,7 +189,7 @@ export default {
calculable: config.customize.visual, calculable: config.customize.visual,
min: config.customize.range[0], min: config.customize.range[0],
max: config.customize.range[1], max: config.customize.range[1],
seriesIndex: [0], seriesIndex: config.customize.scatter ? -1 : 0,
inRange: { inRange: {
color: config.customize.rangeColor color: config.customize.rangeColor
} }

2
data-room-ui/packages/BasicComponents/Map/setting.vue
Unescape Escape View File

@ -513,7 +513,7 @@ export default {
if (!levelConst.includes(this.config.customize.level)) { if (!levelConst.includes(this.config.customize.level)) {
this.config.customize.level = this.oldLevelMap[this.config.customize.level] || '0' 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 this.mapTree = res
}) })
}, },

3
data-room-ui/packages/BasicComponents/Numbers/index.vue
Unescape Escape View File

@ -14,10 +14,11 @@
<script> <script>
import commonMixins from 'data-room-ui/js/mixins/commonMixins' import commonMixins from 'data-room-ui/js/mixins/commonMixins'
import paramsMixins from 'data-room-ui/js/mixins/paramsMixins' import paramsMixins from 'data-room-ui/js/mixins/paramsMixins'
import linkageMixins from 'data-room-ui/js/mixins/linkageMixins'
export default { export default {
name: 'Texts', name: 'Texts',
components: {}, components: {},
mixins: [paramsMixins, commonMixins], mixins: [paramsMixins, commonMixins, linkageMixins],
props: { props: {
// 卡片的属性 // 卡片的属性
config: { config: {

3
data-room-ui/packages/BasicComponents/Texts/index.vue
Unescape Escape View File

@ -14,10 +14,11 @@
<script> <script>
import commonMixins from 'data-room-ui/js/mixins/commonMixins' import commonMixins from 'data-room-ui/js/mixins/commonMixins'
import paramsMixins from 'data-room-ui/js/mixins/paramsMixins' import paramsMixins from 'data-room-ui/js/mixins/paramsMixins'
import linkageMixins from 'data-room-ui/js/mixins/linkageMixins'
export default { export default {
name: 'Texts', name: 'Texts',
components: {}, components: {},
mixins: [paramsMixins, commonMixins], mixins: [paramsMixins, commonMixins, linkageMixins],
props: { props: {
// 卡片的属性 // 卡片的属性
config: { config: {

2
data-room-ui/packages/BigScreenDesign/PageDesignTop.vue
Unescape Escape View File

@ -373,7 +373,7 @@ export default {
backManagement () { backManagement () {
const data = { componentsManagementType: 'component' } const data = { componentsManagementType: 'component' }
this.$router.app.$options.globalData = data // 将数据存储在全局变量中 this.$router.app.$options.globalData = data // 将数据存储在全局变量中
this.$router.push({ path: this.pageInfo.type === 'component' ? (window.BS_CONFIG?.routers?.componentUrl || '/big-screen-components') : (window.BS_CONFIG?.routers?.pageManagementUrl || '/home') }) this.$router.push({ path: this.pageInfo.type === 'component' ? (window.BS_CONFIG?.routers?.componentUrl || '/big-screen-components') : (window.BS_CONFIG?.routers?.pageListUrl || '/big-screen-list') })
}, },
undo (isUndo) { undo (isUndo) {
this.undoTimeLine(isUndo) this.undoTimeLine(isUndo)

Write Preview
Loading…
Cancel
Save