diff --git a/src/views/sponeScreen/Echarts/tslyqk_constituent_3d.vue b/src/views/sponeScreen/Echarts/tslyqk_constituent_3d.vue index b42eaa8..184534b 100644 --- a/src/views/sponeScreen/Echarts/tslyqk_constituent_3d.vue +++ b/src/views/sponeScreen/Echarts/tslyqk_constituent_3d.vue @@ -260,15 +260,14 @@ legend: { orient: 'vertical', icon: 'circle', - right: '5%', - top: '20%', + right: '3%', + y: 'center', show: true, - itemGap: 10, + itemGap: 5, textStyle: { color: '#A1E2FF', fontSize: 13, }, - // icon:'diamond', data: legendData, formatter: params => { return params; @@ -293,7 +292,7 @@ // zoomSensitivity: 100, // panSensitivity: 100, }, - top: '0%', + top: '-10%', left: 'left', width: '60%', show: false, @@ -369,23 +368,11 @@ width: 100%; height: 150px; position: relative; - // background: red; + top: 30px; .echarts3D { height: 100%; height: 150px; position: relative; - // z-index: 310; - // background: red; } - // .bg-nopx { - // position: absolute; - // left: 50%; - // top: 50%; - // transform: translate(calc(-50% - 86px), calc(-50% + 24px)); - // width: 240px; - // height: 151px; - // // background: url('@/assets/newImgs/UrbanCharacteristics/pie_bottom.png') no-repeat; - // background-size: 100% 100%; - // } } diff --git a/src/views/sponeScreen/Echarts/tslyqk_constituent_3d.vue b/src/views/sponeScreen/Echarts/tslyqk_constituent_3d.vue index b42eaa8..184534b 100644 --- a/src/views/sponeScreen/Echarts/tslyqk_constituent_3d.vue +++ b/src/views/sponeScreen/Echarts/tslyqk_constituent_3d.vue @@ -260,15 +260,14 @@ legend: { orient: 'vertical', icon: 'circle', - right: '5%', - top: '20%', + right: '3%', + y: 'center', show: true, - itemGap: 10, + itemGap: 5, textStyle: { color: '#A1E2FF', fontSize: 13, }, - // icon:'diamond', data: legendData, formatter: params => { return params; @@ -293,7 +292,7 @@ // zoomSensitivity: 100, // panSensitivity: 100, }, - top: '0%', + top: '-10%', left: 'left', width: '60%', show: false, @@ -369,23 +368,11 @@ width: 100%; height: 150px; position: relative; - // background: red; + top: 30px; .echarts3D { height: 100%; height: 150px; position: relative; - // z-index: 310; - // background: red; } - // .bg-nopx { - // position: absolute; - // left: 50%; - // top: 50%; - // transform: translate(calc(-50% - 86px), calc(-50% + 24px)); - // width: 240px; - // height: 151px; - // // background: url('@/assets/newImgs/UrbanCharacteristics/pie_bottom.png') no-repeat; - // background-size: 100% 100%; - // } } diff --git a/src/views/sponeScreen/cityGK/PhysicalGeography.vue b/src/views/sponeScreen/cityGK/PhysicalGeography.vue index dd91261..e49e058 100644 --- a/src/views/sponeScreen/cityGK/PhysicalGeography.vue +++ b/src/views/sponeScreen/cityGK/PhysicalGeography.vue @@ -377,11 +377,11 @@ } } .ListBox3 { - margin-top: 20px; + margin-top: 40px; height: 235px; // background: red; } .Lowerleft { - margin-top: 15px; + margin-top: 10px; } diff --git a/src/views/sponeScreen/Echarts/tslyqk_constituent_3d.vue b/src/views/sponeScreen/Echarts/tslyqk_constituent_3d.vue index b42eaa8..184534b 100644 --- a/src/views/sponeScreen/Echarts/tslyqk_constituent_3d.vue +++ b/src/views/sponeScreen/Echarts/tslyqk_constituent_3d.vue @@ -260,15 +260,14 @@ legend: { orient: 'vertical', icon: 'circle', - right: '5%', - top: '20%', + right: '3%', + y: 'center', show: true, - itemGap: 10, + itemGap: 5, textStyle: { color: '#A1E2FF', fontSize: 13, }, - // icon:'diamond', data: legendData, formatter: params => { return params; @@ -293,7 +292,7 @@ // zoomSensitivity: 100, // panSensitivity: 100, }, - top: '0%', + top: '-10%', left: 'left', width: '60%', show: false, @@ -369,23 +368,11 @@ width: 100%; height: 150px; position: relative; - // background: red; + top: 30px; .echarts3D { height: 100%; height: 150px; position: relative; - // z-index: 310; - // background: red; } - // .bg-nopx { - // position: absolute; - // left: 50%; - // top: 50%; - // transform: translate(calc(-50% - 86px), calc(-50% + 24px)); - // width: 240px; - // height: 151px; - // // background: url('@/assets/newImgs/UrbanCharacteristics/pie_bottom.png') no-repeat; - // background-size: 100% 100%; - // } } diff --git a/src/views/sponeScreen/cityGK/PhysicalGeography.vue b/src/views/sponeScreen/cityGK/PhysicalGeography.vue index dd91261..e49e058 100644 --- a/src/views/sponeScreen/cityGK/PhysicalGeography.vue +++ b/src/views/sponeScreen/cityGK/PhysicalGeography.vue @@ -377,11 +377,11 @@ } } .ListBox3 { - margin-top: 20px; + margin-top: 40px; height: 235px; // background: red; } .Lowerleft { - margin-top: 15px; + margin-top: 10px; } diff --git a/src/views/sponeScreen/cityGK/rainfall.vue b/src/views/sponeScreen/cityGK/rainfall.vue index f17aee4..88d699f 100644 --- a/src/views/sponeScreen/cityGK/rainfall.vue +++ b/src/views/sponeScreen/cityGK/rainfall.vue @@ -159,7 +159,7 @@ color: #ffffff; } .box-body { - height: calc(100vh - 740px); + height: calc(100vh - 760px); padding-left: 5px; position: relative; overflow: auto; diff --git a/src/views/sponeScreen/Echarts/tslyqk_constituent_3d.vue b/src/views/sponeScreen/Echarts/tslyqk_constituent_3d.vue index b42eaa8..184534b 100644 --- a/src/views/sponeScreen/Echarts/tslyqk_constituent_3d.vue +++ b/src/views/sponeScreen/Echarts/tslyqk_constituent_3d.vue @@ -260,15 +260,14 @@ legend: { orient: 'vertical', icon: 'circle', - right: '5%', - top: '20%', + right: '3%', + y: 'center', show: true, - itemGap: 10, + itemGap: 5, textStyle: { color: '#A1E2FF', fontSize: 13, }, - // icon:'diamond', data: legendData, formatter: params => { return params; @@ -293,7 +292,7 @@ // zoomSensitivity: 100, // panSensitivity: 100, }, - top: '0%', + top: '-10%', left: 'left', width: '60%', show: false, @@ -369,23 +368,11 @@ width: 100%; height: 150px; position: relative; - // background: red; + top: 30px; .echarts3D { height: 100%; height: 150px; position: relative; - // z-index: 310; - // background: red; } - // .bg-nopx { - // position: absolute; - // left: 50%; - // top: 50%; - // transform: translate(calc(-50% - 86px), calc(-50% + 24px)); - // width: 240px; - // height: 151px; - // // background: url('@/assets/newImgs/UrbanCharacteristics/pie_bottom.png') no-repeat; - // background-size: 100% 100%; - // } } diff --git a/src/views/sponeScreen/cityGK/PhysicalGeography.vue b/src/views/sponeScreen/cityGK/PhysicalGeography.vue index dd91261..e49e058 100644 --- a/src/views/sponeScreen/cityGK/PhysicalGeography.vue +++ b/src/views/sponeScreen/cityGK/PhysicalGeography.vue @@ -377,11 +377,11 @@ } } .ListBox3 { - margin-top: 20px; + margin-top: 40px; height: 235px; // background: red; } .Lowerleft { - margin-top: 15px; + margin-top: 10px; } diff --git a/src/views/sponeScreen/cityGK/rainfall.vue b/src/views/sponeScreen/cityGK/rainfall.vue index f17aee4..88d699f 100644 --- a/src/views/sponeScreen/cityGK/rainfall.vue +++ b/src/views/sponeScreen/cityGK/rainfall.vue @@ -159,7 +159,7 @@ color: #ffffff; } .box-body { - height: calc(100vh - 740px); + height: calc(100vh - 760px); padding-left: 5px; position: relative; overflow: auto; diff --git a/vite.config.js b/vite.config.js index d814042..ea36ec6 100644 --- a/vite.config.js +++ b/vite.config.js @@ -6,9 +6,9 @@ const Timestamp = new Date().getTime(); //随机时间戳 -const targetUrl = 'http://192.168.16.254:7200'; //孙逢时 +// const targetUrl = 'http://192.168.16.254:7200'; //孙逢时 // const targetUrl = 'http://192.168.20.52:7300'; //杨辉 -// const targetUrl = 'https://server2.wh-nf.cn:8082/prod-api'; //线上 +const targetUrl = 'https://server2.wh-nf.cn:8082/prod-api'; //线上 // https://vitejs.dev/config/ export default defineConfig(({ mode, command }) => {