update 公用工程消耗

This commit is contained in:
lb 2022-11-23 14:03:56 +08:00
parent 97ee3a9a4c
commit 779a771bb5
11 changed files with 68 additions and 85 deletions

View File

@ -15,19 +15,7 @@ export default {
props: {
id: {
type: String,
default: 'default-dian-id'
},
title: {
type: String,
default: 'default-title'
},
xData: {
type: Array,
default: () => []
},
seriesData: {
type: Array,
default: () => []
default: 'default-dian-line-chart'
}
},
data() {
@ -69,29 +57,35 @@ export default {
option: {
color: colors,
legend: {
top: 4,
right: 50,
top: 16,
right: 64,
itemWidth: 8,
itemHeight: 8,
textStyle: {
color: '#fff9',
fontSize: 8
fontSize: 12
}
// data: ['ABC/v', 'ABC/a', '']
},
grid: {
top: 32,
top: 48,
left: 64,
bottom: 28
bottom: 36
},
tooltip: {
show: true,
trigger: 'axis',
axisPointer: {
type: 'line',
axis: 'x'
axis: 'x',
lineStyle: {
color: '#41888F90',
shadowColor: '#41888F',
shadowBlur: 10,
width: 2
}
},
extraCssText: 'width: 152px !important; height: 100px !important;'
extraCssText: 'position: absolute !important; top: 0, left: 0; width: 152px !important; height: 100px !important;'
},
xAxis: [
{
@ -99,7 +93,8 @@ export default {
data: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
axisTick: { show: false },
axisLabel: {
color: '#fff9'
color: '#fff9',
fontSize: 14
},
axisLine: {
lineStyle: {
@ -110,13 +105,13 @@ export default {
],
yAxis: [
{
name: '电流/A',
nameTextStyle: { align: 'right', fontSize: 9, color: '#fff9' },
name: '电流/A ',
nameTextStyle: { align: 'right', fontSize: 12, color: '#fff9' },
type: 'value',
splitNumber: 3,
splitNumber: 4,
onZero: true,
position: 'left',
offset: 40,
offset: 32,
axisTick: { show: false },
axisLine: {
show: true,
@ -127,7 +122,7 @@ export default {
},
axisLabel: {
color: '#fff9',
fontSize: 10
fontSize: 12
},
splitLine: {
show: true,
@ -138,10 +133,10 @@ export default {
}
},
{
name: '电压/V',
nameTextStyle: { align: 'right', fontSize: 9, color: '#fff9' },
name: ' 电压/V ',
nameTextStyle: { align: 'right', fontSize: 12, color: '#fff9' },
type: 'value',
splitNumber: 3,
splitNumber: 4,
axisTick: { show: false },
onZero: true,
position: 'left',
@ -155,7 +150,7 @@ export default {
},
axisLabel: {
color: '#fff9',
fontSize: 10
fontSize: 12
},
splitLine: {
show: true,
@ -166,8 +161,8 @@ export default {
}
},
{
name: '温度',
nameTextStyle: { align: 'left', color: '#fff9', fontSize: 9 },
name: ' 温度',
nameTextStyle: { align: 'left', color: '#fff9', fontSize: 12 },
axisTick: { show: false },
axisLine: {
show: false,
@ -177,7 +172,7 @@ export default {
}
},
type: 'value',
splitNumber: 3,
splitNumber: 4,
splitLine: {
show: true,
lineStyle: {
@ -187,7 +182,7 @@ export default {
},
axisLabel: {
color: '#fff9',
fontSize: 10
fontSize: 12
}
}
],
@ -251,7 +246,9 @@ export default {
if (this.chart) this.chart.dispose()
this.chart = null
},
methods: {}
methods: {
initOption(legendSize, labelSize, axisLabelSize, splitLineNumber) {}
}
}
</script>
<style scoped>

View File

@ -1,5 +1,5 @@
<template>
<div :id="id" ref="techy-line-chart" class="techy-chart" />
<div id="techy-line-chart" ref="techy-line-chart" class="techy-chart" />
</template>
<script>
@ -13,22 +13,7 @@ export default {
inject: ['resizeStatus'],
/** End Fn.1 */
props: {
id: {
type: String,
default: 'default-fadian-id'
},
title: {
type: String,
default: 'default-title'
},
xData: {
type: Array,
default: () => []
},
seriesData: {
type: Array,
default: () => []
}
},
data() {
return {
@ -46,20 +31,20 @@ export default {
color: ['#E02094', '#F0D63C', '#1A99FF'],
grid: {
top: '30%',
left: 0,
left: '120%',
right: '5%',
bottom: 0,
containLabel: true
},
tooltip: {
show: true,
trigger: 'axis',
axisPointer: {
type: 'line',
axis: 'x'
},
extraCssText: 'width: 152px !important; height: 100px !important;'
},
// tooltip: {
// show: true,
// trigger: 'axis',
// axisPointer: {
// type: 'line',
// axis: 'x'
// },
// extraCssText: 'position: absolute; width: 152px !important; height: 100px !important;'
// },
xAxis: {
type: 'category',
boundaryGap: false,
@ -71,7 +56,7 @@ export default {
show: false
},
axisLabel: {
fontSize: 8,
fontSize: 10,
color: '#fffa'
},
axisLine: {
@ -92,7 +77,7 @@ export default {
show: false
},
axisLabel: {
fontSize: 8,
fontSize: 10,
color: '#fffa'
// formatter: '{value} %'
},

View File

@ -100,7 +100,7 @@ export default {
}
.left-content-equipment-check {
height: calc(100% - 32px);
height: calc(100% - calc(32px * var(--beilv)));
display: flex;
gap: calc(100vmin / 1920 * 36);
overflow: hidden;

View File

@ -27,7 +27,7 @@ export default {
.left-content-monitoring {
flex: 1;
width: 100%;
height: calc(100% - 32px);
height: calc(100% - calc(32px * var(--beilv)));
display: flex;
gap: calc(100vw / 1920 * 16);
}

View File

@ -18,19 +18,13 @@ const ProcessCircle = {
methods: {},
render: function(h) {
return h('el-progress', {
class: {
'lb-progress-bar': true
},
props: {
type: 'circle',
percentage: this.injectData.finished,
width: 14,
'stroke-width': 2,
color: '#47FF27',
'define-back-color': '#6e6e6e' //
},
style: {
color: 'blue'
'define-back-color': '#ffffff' // , element ui
}
})
}
@ -97,4 +91,8 @@ export default {
left: calc(-2px * var(--beilv));
color: #ffffffb3 !important;
}
.left-content-order >>> .el-progress-circle__track {
stroke: #283851;
}
</style>

View File

@ -73,8 +73,8 @@
<img src="./assets/consume/d.png" width="32" height="32" alt="dian" />
<span></span>
</div>
<div style="height: 100%; flex: 1;">
<DianChart />
<div style="height: 100%; flex: 1; overflow: hidden">
<DianChart id="dian" key="dian" />
</div>
</TechyBox>
</div>
@ -85,9 +85,9 @@
<img src="./assets/consume/fad.png" width="32" height="32" alt="fadian" />
<span>发电</span>
</div>
<div style="height: 100%; flex: 1; ">
<div style="height: 100%; flex: 1; overflow: hidden">
<!-- <FadianChart /> -->
<DianChart />
<DianChart id="fa-dian" key="fa-dian" />
</div>
</TechyBox>
</div>
@ -116,7 +116,7 @@ export default {
.public-consume__inner {
overflow: hidden;
overflow-y: auto;
height: calc(100% - 32px);
height: calc(100% - calc(32px * var(--beilv)));
width: 100%;
display: flex;
flex-direction: column;
@ -161,7 +161,7 @@ export default {
flex-direction: column;
font-size: calc(12px * var(--beilv));
color: #fff9;
height: 10px;
height: calc(48px * var(--beilv));
flex: 1 1;
gap: calc(4px * var(--beilv));
}

View File

@ -114,7 +114,7 @@ export default {
}
.right-content-alert {
height: calc(100% - 32px);
height: calc(100% - calc(32px * var(--beilv)));
display: flex;
gap: calc(100vw / 1920 * 16);
overflow: hidden;

View File

@ -301,7 +301,8 @@ export default {
this.configs.title.textStyle.fontSize = titleSize
this.configs.title.subtextStyle.fontSize = subtitleSize
this.configs.legend.top = '24%'
this.configs.legend.top = '26%'
this.configs.legend.left = fs8
this.configs.legend.itemGap = fs8
this.configs.legend.itemWidth = fs8

View File

@ -47,7 +47,7 @@ export default {
<style scoped>
.right-content-quality-analysis {
height: calc(100% - 32px);
height: calc(100% - calc(32px * var(--beilv)));
overflow: hidden;
overflow-y: auto; /** 右边会有多的padding给滑道 */
display: grid;

View File

@ -251,6 +251,7 @@ export default {
},
watch: {
shouldResize(val, oldVal) {
console.log('should resize')
setTimeout(() => {
this.chart.resize()
}, 250)

View File

@ -1,9 +1,9 @@
<template>
<div id="v3d-outter" ref="v3d-outter">
<div id="V3DData" style="position: fixed; top: 0; left: 0; display: hidden;" rel=""></div>
<!-- <div id="V3DData" style="position: fixed; top: 0; left: 0; display: hidden;" rel=""></div>
<V3DApp @3d-loaded="handle3DLoaded" @click.native="handle3DClick" />
<div v-if="showPage" id="v3d-main-content">
<!-- <div v-if="true" id="v3d-main-content"> -->
<div v-if="showPage" id="v3d-main-content"> -->
<div v-if="true" id="v3d-main-content">
<techy-header :head-title="'合肥新能源数字工厂总览'" @toggle-full-screen="toggleFullScreen" />
<section id="techy-body-part">
@ -204,6 +204,7 @@ export default {
}
#v3d-outter *::-webkit-scrollbar-button {
display: none;
width: calc(8px * var(--beilv));
height: calc(8px * var(--beilv));
background: #5bc4bf9f;