Merge pull request '邓洁 : 修改首屏弹窗样式' (#133) from dengjie into dev

Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/133
This commit is contained in:
odjbin
2023-12-15 04:58:59 +00:00
5 changed files with 42 additions and 35 deletions

View File

@@ -252,12 +252,12 @@ html, body, #app, .el-container, .el-aside, .el-main {
display: flex; display: flex;
#container { #container {
flex: 1; flex: 1;
height: 650px; height: 1160px;
//width: 1300px; //width: 1300px;
} }
#containerEle { #containerEle {
flex: 1; flex: 1;
height: 1160px; height: 1060px;
//width: 2180px; //width: 2180px;
} }
} }
@@ -267,19 +267,19 @@ html, body, #app, .el-container, .el-aside, .el-main {
position: relative; position: relative;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
height: 1400px; height: 1300px;
border: 2px solid #0F82AF; border: 2px solid #0F82AF;
background: rgba(6, 34, 71, 0.78); background: rgba(6, 34, 71, 0.78);
border-radius: 20px; border-radius: 20px;
padding: 47px 30px; padding: 47px 30px;
box-sizing: border-box; box-sizing: border-box;
margin: 548px auto 0 auto; margin: 520px auto 0 auto;
.el-dialog__header { .el-dialog__header {
padding: 0 0 25px 0; padding: 0 0 28px 0;
//display: none; //display: none;
.el-dialog__title { .el-dialog__title {
font-size: 32px; font-size: 50px;
font-weight: bold; font-weight: bold;
color: #D6F1FA; color: #D6F1FA;
} }

View File

@@ -5,10 +5,13 @@
<gas-info-item v-for="item in badGasList" :key="item.equipmentId" :gasInfo="item" @click="handleOpenChart"/> <gas-info-item v-for="item in badGasList" :key="item.equipmentId" :gasInfo="item" @click="handleOpenChart"/>
</div> </div>
<div class="digital-tunnel"> <div class="digital-tunnel">
<el-dialog v-model="isVisited" title="有害气体监控数据" width="1365px" :modal="false"> <el-dialog v-model="isVisited" title="有害气体监控数据" width="2400px" :modal="false">
<div class="left-top-icon"></div> <div class="left-top-icon"></div>
<div class="right-top-icon"></div> <div class="right-top-icon"></div>
<div class="chat-dialog">
<div id="container"></div> <div id="container"></div>
<div style="width: 1px;"></div>
</div>
<div class="time-select"> <div class="time-select">
<time-range-btn <time-range-btn
:buttonList="timeList" :buttonList="timeList"
@@ -109,7 +112,7 @@ const initChart = () => {
left: 0, left: 0,
textStyle: { textStyle: {
color: '#FFFFFF', color: '#FFFFFF',
fontSize: 28 fontSize: 40
}, },
// itemWidth: 20, // itemWidth: 20,
// itemHeight: 20 // itemHeight: 20
@@ -133,7 +136,7 @@ const initChart = () => {
data: ['00:00', '01:00', '02:00', '03:00', '04:00', '05:00', '06:00', '07:00', '08:00', '09:00', '10:00', '11:00', '12:00', '13:00', '14:00', '15:00', '16:00', '17:00', '18:00', '19:00', '20:00', '21:00', '22:00', '23:00', '24:00'], data: ['00:00', '01:00', '02:00', '03:00', '04:00', '05:00', '06:00', '07:00', '08:00', '09:00', '10:00', '11:00', '12:00', '13:00', '14:00', '15:00', '16:00', '17:00', '18:00', '19:00', '20:00', '21:00', '22:00', '23:00', '24:00'],
axisLabel: { axisLabel: {
textStyle: { textStyle: {
fontSize: 24, fontSize: 45,
color: '#D6F1FA' color: '#D6F1FA'
}, },
}, },
@@ -143,7 +146,7 @@ const initChart = () => {
type: 'value', type: 'value',
axisLabel: { axisLabel: {
textStyle: { textStyle: {
fontSize: 24, fontSize: 45,
color: '#D6F1FA' color: '#D6F1FA'
}, },
}, },

View File

@@ -82,7 +82,7 @@ watch(() => props.list, (now) => {
handleOnMounted() handleOnMounted()
}, {deep: true}); }, {deep: true});
onMounted(async () => { onMounted(() => {
setTimeout(() => { setTimeout(() => {
nextTick(() => { nextTick(() => {
handleOnMounted() handleOnMounted()
@@ -304,6 +304,7 @@ input[type="number"] {
//clip-path: polygon(0% 0%, 40% 0%, 48% 15%, 100% 15%, 100% 100%, 0% 100%); //clip-path: polygon(0% 0%, 40% 0%, 48% 15%, 100% 15%, 100% 100%, 0% 100%);
color: #2fb0df; color: #2fb0df;
box-sizing: border-box; box-sizing: border-box;
.title { .title {
width: 40%; width: 40%;
text-align: left; text-align: left;

View File

@@ -5,10 +5,13 @@
<wind-pressure-item v-for="(item,index) in wpList" :key="item.equipmentId" :wp="item" :index="index+1" @click="handleOpenChart(index+1)"/> <wind-pressure-item v-for="(item,index) in wpList" :key="item.equipmentId" :wp="item" :index="index+1" @click="handleOpenChart(index+1)"/>
</div> </div>
<div class="digital-tunnel"> <div class="digital-tunnel">
<el-dialog v-model="isVisited" :title="windSort+'号风压监控数据'" width="1365px" :modal="false"> <el-dialog v-model="isVisited" :title="windSort+'号风压监控数据'" width="2400px" :modal="false">
<div class="left-top-icon"></div> <div class="left-top-icon"></div>
<div class="right-top-icon"></div> <div class="right-top-icon"></div>
<div class="chat-dialog">
<div id="container"></div> <div id="container"></div>
<div style="width: 1px;"></div>
</div>
<div class="time-select"> <div class="time-select">
<time-range-btn <time-range-btn
:buttonList="timeList" :buttonList="timeList"
@@ -96,7 +99,7 @@ const initChart = () => {
left: 0, left: 0,
textStyle: { textStyle: {
color: '#FFFFFF', color: '#FFFFFF',
fontSize: 28 fontSize: 40
}, },
// itemWidth: 20, // itemWidth: 20,
// itemHeight: 20 // itemHeight: 20
@@ -120,7 +123,7 @@ const initChart = () => {
data: ['00:00', '01:00', '02:00', '03:00', '04:00', '05:00', '06:00','07:00', '08:00', '09:00', '10:00', '11:00', '12:00', '13:00', '14:00', '15:00', '16:00', '17:00', '18:00','19:00', '20:00', '21:00', '22:00', '23:00','24:00'], data: ['00:00', '01:00', '02:00', '03:00', '04:00', '05:00', '06:00','07:00', '08:00', '09:00', '10:00', '11:00', '12:00', '13:00', '14:00', '15:00', '16:00', '17:00', '18:00','19:00', '20:00', '21:00', '22:00', '23:00','24:00'],
axisLabel: { axisLabel: {
textStyle: { textStyle: {
fontSize: 24, fontSize: 45,
color: '#D6F1FA' color: '#D6F1FA'
}, },
}, },
@@ -130,7 +133,7 @@ const initChart = () => {
type: 'value', type: 'value',
axisLabel: { axisLabel: {
textStyle: { textStyle: {
fontSize: 24, fontSize: 45,
color: '#D6F1FA' color: '#D6F1FA'
}, },
}, },

View File

@@ -47,16 +47,16 @@ watchEffect(() => {
<style scoped lang="scss"> <style scoped lang="scss">
.time-range-group { .time-range-group {
width: 204px; //width: 254px;
height: 68px; //height: 78px;
border: 2px solid #0F82AF; border: 2px solid #0F82AF;
border-radius: 10px; border-radius: 10px;
background: #062247; background: #062247;
display: flex; display: flex;
font-size: 28px; font-size: 40px;
.time-range-button { .time-range-button {
cursor: pointer; cursor: pointer;
padding: 15px 20px; padding: 18px 24px;
box-sizing: border-box; box-sizing: border-box;
color: #FFFFFF; color: #FFFFFF;
&.time-range-button-active { &.time-range-button-active {