Skip to content

G
gassafety
Commit 24c9fda2 authored by yaqizhang's avatar yaqizhang
Browse files
Options

Merge branch 'master' of http://111.61.77.35:9999/gengdidi/gassafety into master

parents 7dd1a234 b756d3da
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 5 deletions
gassafety-web/src/views/videoMonitoring/video/index.vue
View file @ 24c9fda2
<template> <template>
<div class="app-container"> <div class="app-container">
<el-row :gutter="5" type="flex" justify="space-around"> <el-row :gutter="5" type="flex" justify="space-around">
<el-col :xs="12" :sm="12" :md="6" :lg="4" :xl="4"> <el-col :lg="4" :xl="4">
<div class="topBar">
<el-tree id="videoTree" <el-tree id="videoTree"
:data="treeData" :data="treeData"
:props="treeProps" :props="treeProps"
...@@ -22,10 +21,9 @@ ...@@ -22,10 +21,9 @@
</span> </span>
</template>--> </template>-->
</el-tree> </el-tree>
</div>
</el-col> </el-col>
<el-col :xs="12" :sm="12" :md="18" :lg="20" :xl="20"> <el-col :lg="20" :xl="20">
<el-row class="row"> <el-row class="row">
<div class="box" :class="[flag == 1 ? 'boxred' : 'boxblack']"> <div class="box" :class="[flag == 1 ? 'boxred' : 'boxblack']">
<div id="newplay1" style="width:100%; height:100%;" @click="chooseWindow(1)"> <div id="newplay1" style="width:100%; height:100%;" @click="chooseWindow(1)">
...@@ -86,7 +84,7 @@ ...@@ -86,7 +84,7 @@
.novideo{ .novideo{
/*padding: 147px 0px 147px 0px; /*padding: 147px 0px 147px 0px;
display: block;*/ display: block;*/
line-height: calc((100vh - 114px)/2); line-height: calc((100vh - 130px)/2);
color: white; color: white;
} }
/* .nodeImg1{ /* .nodeImg1{
......
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