lb #12

Merged
gtz217 merged 27 commits from lb into master 2022-11-18 17:04:51 +08:00
7 changed files with 11 additions and 7 deletions
Showing only changes of commit 2d3d0d4a3a - Show all commits

View File

@ -25,6 +25,7 @@ export default {
<style scoped> <style scoped>
.left-content-monitoring { .left-content-monitoring {
flex: 1;
width: 100%; width: 100%;
height: calc(100% - 32px); height: calc(100% - 32px);
display: flex; display: flex;

View File

@ -1,5 +1,5 @@
<template> <template>
<div style="height: calc(100% - 36px); width: 100%;"> <div style="height: calc(100% - 36px); width: 100%; position: relative;">
<div :id="id" ref="techy-line-chart" class="techy-chart" /> <div :id="id" ref="techy-line-chart" class="techy-chart" />
</div> </div>
</template> </template>
@ -35,15 +35,15 @@ export default {
option: { option: {
color: ['#59CBE8', '#E93CAC', '#FF7345', '#9452FF', '#6A6E87', '#52FFF1'], color: ['#59CBE8', '#E93CAC', '#FF7345', '#9452FF', '#6A6E87', '#52FFF1'],
grid: { grid: {
top: '20%', top: '45%',
left: 0, left: 0,
right: 12, right: 12,
bottom: 0, bottom: '5%',
containLabel: true containLabel: true
}, },
legend: { legend: {
width: '72%', width: '72%',
top: 0, top: '20%',
right: 12, right: 12,
itemWidth: 12, itemWidth: 12,
itemHeight: 8, itemHeight: 8,
@ -268,7 +268,10 @@ export default {
</script> </script>
<style scoped> <style scoped>
.techy-chart { .techy-chart {
height: 100%; /* background: #cccc; */
position: absolute;
top: -36%;
height: 150%;
width: 100%; width: 100%;
} }

View File

@ -55,6 +55,7 @@ export default {
grid-auto-rows: min-content; grid-auto-rows: min-content;
gap: calc(4px * var(--beilv)) calc(6px * var(--beilv)); gap: calc(4px * var(--beilv)) calc(6px * var(--beilv));
justify-content: end; justify-content: end;
align-content: center;
} }
.analysis-item { .analysis-item {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 99 KiB

After

Width:  |  Height:  |  Size: 256 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 MiB

After

Width:  |  Height:  |  Size: 285 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 491 KiB

View File

@ -43,7 +43,6 @@
</div> </div>
</div> </div>
<div class="techy-body-part__right"> <div class="techy-body-part__right">
<div class="realtime"> <div class="realtime">
<techy-container title="实时产量和能耗" icon="折角的菜单图标"> <techy-container title="实时产量和能耗" icon="折角的菜单图标">
@ -73,7 +72,7 @@
</techy-container> </techy-container>
</div> </div>
<div class="ft-monitor" style="flex: 1;"> <div class="ft-monitor" style="flex: 1;">
<techy-container title="现场实时监控" icon="安全帽图标"> <techy-container title="现场实时监控" icon="安全帽图标" style="display: flex; flex-direction: column;">
<LeftContentMonitor /> <LeftContentMonitor />
</techy-container> </techy-container>
</div> </div>