mt-fe-group/11-mes-new
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lb #6

Merged
gtz217 merged 26 commits from lb into master 2022-11-10 15:52:33 +08:00
Conversation 0 Commits 26 Files Changed 47 +29 -13
2 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7bca6b14e4 - Show all commits

24
src/views/3DOverview/components/DianChart.vue
View File

@ -57,7 +57,7 @@ export default {
textStyle: { textStyle: {
color: '#fff9', color: '#fff9',
fontSize: 8 fontSize: 8
}, }
// data: ['ABC三相电压/v', 'ABC三相电流/a', '电缆温度'] // data: ['ABC三相电压/v', 'ABC三相电流/a', '电缆温度']
}, },
grid: { grid: {
@ -83,7 +83,7 @@ export default {
yAxis: [ yAxis: [
{ {
name: '电流/A', name: '电流/A',
nameTextStyle: { align: 'right', fontSize: 8 }, nameTextStyle: { align: 'right', fontSize: 9, color: '#fff9' },
type: 'value', type: 'value',
splitNumber: 4, splitNumber: 4,
onZero: true, onZero: true,
@ -93,10 +93,14 @@ export default {
axisLine: { axisLine: {
show: true, show: true,
lineStyle: { lineStyle: {
color: '#fff9', color: '#5982B2',
width: 1 width: 1
} }
}, },
axisLabel: {
color: '#fff9',
fontSize: 10
},
splitLine: { splitLine: {
show: false show: false
// lineStyle: { // lineStyle: {
@ -106,7 +110,7 @@ export default {
}, },
{ {
name: '电压/V', name: '电压/V',
nameTextStyle: { align: 'right', fontSize: 8 }, nameTextStyle: { align: 'right', fontSize: 9, color: '#fff9' },
type: 'value', type: 'value',
splitNumber: 4, splitNumber: 4,
axisTick: { show: false }, axisTick: { show: false },
@ -116,10 +120,14 @@ export default {
axisLine: { axisLine: {
show: true, show: true,
lineStyle: { lineStyle: {
color: '#fff9', color: '#5982B2',
width: 1 width: 1
} }
}, },
axisLabel: {
color: '#fff9',
fontSize: 10
},
splitLine: { splitLine: {
show: false show: false
// lineStyle: { // lineStyle: {
@ -129,7 +137,7 @@ export default {
}, },
{ {
name: '温度', name: '温度',
nameTextStyle: { align: 'left', color: '#fff9', fontSize: 8 }, nameTextStyle: { align: 'left', color: '#fff9', fontSize: 9 },
axisTick: { show: false }, axisTick: { show: false },
axisLine: { axisLine: {
show: false, show: false,
@ -144,6 +152,10 @@ export default {
lineStyle: { lineStyle: {
color: '#fff3' color: '#fff3'
} }
},
axisLabel: {
color: '#fff9',
fontSize: 10
} }
} }
], ],

18
src/views/3DOverview/components/LeftContentPublicConsume.vue
View File

@ -27,8 +27,8 @@
<div> <div>
<TechyBox class="water-consume"> <TechyBox class="water-consume">
<div class="header-part has-border"> <div class="header-part ">
<img src="./assets/consume/s.png" width="32" height="32" alt="water"> <img src="./assets/consume/s.png" width="32" height="32" alt="water" />
<span>水</span> <span>水</span>
</div> </div>
<div class="content-part"> <div class="content-part">
@ -62,8 +62,8 @@
<div> <div>
<TechyBox class="gas-consume"> <TechyBox class="gas-consume">
<div class="header-part has-border"> <div class="header-part ">
<img src="./assets/consume/gas.png" width="32" height="32" alt="qi"> <img src="./assets/consume/gas.png" width="32" height="32" alt="qi" />
<span>气</span> <span>气</span>
</div> </div>
<div class="content-part"> <div class="content-part">
@ -95,7 +95,7 @@
<div style="flex: 1;"> <div style="flex: 1;">
<TechyBox class="dian-consume"> <TechyBox class="dian-consume">
<div class="header-part"> <div class="header-part">
<img src="./assets/consume/d.png" width="32" height="32" alt="dian"> <img src="./assets/consume/d.png" width="32" height="32" alt="dian" />
<span>电</span> <span>电</span>
</div> </div>
<div class="content-part"> <div class="content-part">
@ -107,7 +107,7 @@
<div style="flex: 1;"> <div style="flex: 1;">
<TechyBox class="elec-consume"> <TechyBox class="elec-consume">
<div class="header-part"> <div class="header-part">
<img src="./assets/consume/fad.png" width="32" height="32" alt="fadian"> <img src="./assets/consume/fad.png" width="32" height="32" alt="fadian" />
<span>发电</span> <span>发电</span>
</div> </div>
<div class="content-part"> <div class="content-part">
@ -211,6 +211,7 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
width: 100%; width: 100%;
height: calc(100vmin / 1920 * 28);
} }
.row > .name, .row > .name,
@ -226,7 +227,10 @@ export default {
.diy-process-bar { .diy-process-bar {
margin: 0 8px; margin: 0 8px;
border-radius: 7px; border-radius: 7px;
height: 8px; height: calc(100vmin / 1920 * 14);
/* margin: 0 8px;
border-radius: 7px; */
/* height: 8px; */
flex: 1 1; flex: 1 1;
background-color: #fff3; background-color: #fff3;
overflow: hidden; overflow: hidden;