6b568ffa by 任超

style:样式修改

1 parent 9589a727
...@@ -47,9 +47,12 @@ export default { ...@@ -47,9 +47,12 @@ export default {
47 } 47 }
48 } 48 }
49 49
50 .app-main { 50 .appMain {
51 height: calc(100% -94px) !important; 51 height: calc(100vh - 94px) !important;
52 // padding: 10px;
53 box-sizing: border-box; 52 box-sizing: border-box;
53
54 .app-main {
55 height: 100%;
56 }
54 } 57 }
55 </style> 58 </style>
......
...@@ -9,19 +9,6 @@ ...@@ -9,19 +9,6 @@
9 start-placeholder="开始日期" end-placeholder="结束日期"> 9 start-placeholder="开始日期" end-placeholder="结束日期">
10 </el-date-picker> 10 </el-date-picker>
11 </el-col> 11 </el-col>
12 <!-- <el-col :span="6">
13 <el-form-item label="开始时间">
14 <el-date-picker type="date" :picker-options="pickerOptionsStart" clearable
15 v-model="form.startTime" value-format="yyyy-MM-dd"></el-date-picker>
16 </el-form-item>
17 </el-col>
18 <el-col :span="6">
19 <el-form-item label="结束时间">
20 <el-date-picker clearable :picker-options="pickerOptionsEnd" v-model="form.endTime"
21 value-format="yyyy-MM-dd">
22 </el-date-picker>
23 </el-form-item>
24 </el-col> -->
25 <!-- 按钮操作 --> 12 <!-- 按钮操作 -->
26 <el-col :span="12" class="btnColRight"> 13 <el-col :span="12" class="btnColRight">
27 <el-button type="default" @click="resetForm"> 重置 </el-button> 14 <el-button type="default" @click="resetForm"> 重置 </el-button>
...@@ -155,6 +142,8 @@ export default { ...@@ -155,6 +142,8 @@ export default {
155 }; 142 };
156 </script> 143 </script>
157 <style scoped lang="scss"> 144 <style scoped lang="scss">
145 @import "~@/styles/public.scss";
146
158 .jktjDetail { 147 .jktjDetail {
159 background-color: #fff; 148 background-color: #fff;
160 height: 100%; 149 height: 100%;
...@@ -164,7 +153,7 @@ export default { ...@@ -164,7 +153,7 @@ export default {
164 .echarts-box { 153 .echarts-box {
165 display: flex; 154 display: flex;
166 justify-content: center; 155 justify-content: center;
167 height: 100%; 156 height: 500px;
168 157
169 .chart { 158 .chart {
170 width: 100%; 159 width: 100%;
......
1 <template> 1 <template>
2 <!-- 监控日志 --> 2 <!-- 监控日志 -->
3 <div class="jktjDetail form-clues"> 3 <div class="jktjDetail from-clues">
4 <!-- 头部搜索 --> 4 <!-- 头部搜索 -->
5 <el-form ref="form" :model="form" :inline="true" class="from-clues-header" label-width="100px"> 5 <el-form ref="form" :model="form" :inline="true" class="from-clues-header" label-width="100px">
6 <el-row> 6 <el-row>
...@@ -155,6 +155,8 @@ export default { ...@@ -155,6 +155,8 @@ export default {
155 }; 155 };
156 </script> 156 </script>
157 <style scoped lang="scss"> 157 <style scoped lang="scss">
158 @import "~@/styles/public.scss";
159
158 .jktjDetail { 160 .jktjDetail {
159 background-color: #fff; 161 background-color: #fff;
160 height: 100%; 162 height: 100%;
......