Commit b42290b2 authored by 张伯涛's avatar 张伯涛

修改

parent d662d803
...@@ -10,27 +10,6 @@ ...@@ -10,27 +10,6 @@
</div> </div>
</div> </div>
<div class="monitorViewBody"> <div class="monitorViewBody">
<el-form style="width: 50%" :inline="true" ref="searchForm" label-width="auto" :model="searchForm">
<el-form-item label="设备标题:">
<el-select
style="width: 50%"
v-model="searchForm.title"
>
<el-option value="名称" label="名称" />
<el-option value="ip地址" label="ip地址" />
</el-select>
</el-form-item>
<el-form-item label="状态:">
<el-select
style="width: 50%"
v-model="searchForm.type"
>
<el-option value="故障" label="故障" />
<el-option value="危险" label="危险" />
<el-option value="正常" label="正常" />
</el-select>
</el-form-item>
</el-form>
<el-tabs v-model="activeName" @tab-click="handleClick"> <el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="设备视图" name="first"> <el-tab-pane label="设备视图" name="first">
<div v-for="(item,index) in equipmentList" :key="index" class="bigIcon"> <div v-for="(item,index) in equipmentList" :key="index" class="bigIcon">
...@@ -69,6 +48,29 @@ ...@@ -69,6 +48,29 @@
<el-table-column label="最后更新时间" prop="value6" show-overflow-tooltip /> <el-table-column label="最后更新时间" prop="value6" show-overflow-tooltip />
</el-table> </el-table>
</el-tab-pane> </el-tab-pane>
<el-tab-pane name="searchBtn">
<span slot="label">
<el-form ref="searchForm" :inline="true" label-width="auto" :model="searchForm">
<el-form-item label="设备标题:">
<el-select
v-model="searchForm.title"
>
<el-option value="名称" label="名称" />
<el-option value="ip地址" label="ip地址" />
</el-select>
</el-form-item>
<el-form-item label="状态:">
<el-select
v-model="searchForm.type"
>
<el-option value="故障" label="故障" />
<el-option value="危险" label="危险" />
<el-option value="正常" label="正常" />
</el-select>
</el-form-item>
</el-form>
</span>
</el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
<el-dialog class="addGroup" width="50%" title="添加页面" :visible.sync="addDialog"> <el-dialog class="addGroup" width="50%" title="添加页面" :visible.sync="addDialog">
...@@ -200,6 +202,9 @@ export default { ...@@ -200,6 +202,9 @@ export default {
<style lang="scss"> <style lang="scss">
.monitorView{ .monitorView{
.el-form-item__label-wrap{
line-height: 10px!important;
}
.monitorViewBody{ .monitorViewBody{
padding: 15px 30px; padding: 15px 30px;
.bigIcon{ .bigIcon{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment