admin/zhgdlarge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev

Browse Source
This commit is contained in:
kun 2024-06-27 15:21:21 +08:00
commit f88685355c
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/views/sevenLargeScreen/safetyManagement/newEdgeProtection/index.vue
View File

@ -40,17 +40,17 @@
</div> </div>
<div class="content-right"> <div class="content-right">
<Card title="报警趋势(次)"> <Card title="报警趋势(次)">
<div id="edgeWeekTrend" ref="edgeWeekTrend" style="width: 100%; height: 100%"></div> <div class="select-right">
<el-select v-model="selectDay" style="width: 15%" @change="selectChange">
<el-option v-for="(item, index) in devList" :key="index" :label="item.devName" :value="item.devSn" />
</el-select>
</div>
<div id="edgeWeekTrend" ref="edgeWeekTrend" style="width: 100%; height: 90%"></div>
</Card> </Card>
</div> </div>
</div> </div>
<div class="content-bottom"> <div class="content-bottom">
<Card title="报警列表"> <Card title="报警列表">
<div class="select-right">
<el-select v-model="selectDay" style="width: 10%; margin-top: 10px; margin-right: 1%" @change="selectChange">
<el-option v-for="(item, index) in devList" :key="index" :label="item.devName" :value="item.devSn" />
</el-select>
</div>
<div class="list-content"> <div class="list-content">
<div class="tab-list"> <div class="tab-list">
<div>安装位置</div> <div>安装位置</div>
@ -485,22 +485,26 @@ onMounted(() => {
position: relative; position: relative;
height: 100%; height: 100%;
width: 72%; width: 72%;
.select-right {
display: flex;
justify-content: flex-end;
width: 100%;
height: 10%;
z-index: 9;
position: absolute;
top: 0;
right: 20px;
}
} }
} }
.content-bottom { .content-bottom {
width: 100%; width: 100%;
height: 50%; height: 50%;
.select-right {
display: flex;
justify-content: flex-end;
width: 100%;
height: 14%;
z-index: 9;
}
.list-content { .list-content {
height: 86%; height: 92%;
width: 100%; width: 100%;
// margin-top: 3%; // margin-top: 1%;
// background: url("@/assets/images/cardImg.png") no-repeat; // background: url("@/assets/images/cardImg.png") no-repeat;
// background-size: 100% 100%; // background-size: 100% 100%;
.tab-list { .tab-list {