Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
This commit is contained in:
commit
f88685355c
@ -40,17 +40,17 @@
|
||||
</div>
|
||||
<div class="content-right">
|
||||
<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>
|
||||
</div>
|
||||
</div>
|
||||
<div class="content-bottom">
|
||||
<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="tab-list">
|
||||
<div>安装位置</div>
|
||||
@ -485,22 +485,26 @@ onMounted(() => {
|
||||
position: relative;
|
||||
height: 100%;
|
||||
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 {
|
||||
width: 100%;
|
||||
height: 50%;
|
||||
.select-right {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
width: 100%;
|
||||
height: 14%;
|
||||
z-index: 9;
|
||||
}
|
||||
|
||||
.list-content {
|
||||
height: 86%;
|
||||
height: 92%;
|
||||
width: 100%;
|
||||
// margin-top: 3%;
|
||||
// margin-top: 1%;
|
||||
// background: url("@/assets/images/cardImg.png") no-repeat;
|
||||
// background-size: 100% 100%;
|
||||
.tab-list {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user