Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web

@@ -263,14 +263,23 @@ table td {
 .el-popper[x-placement^="bottom"] .popper__arrow {
 .el-popper[x-placement^="bottom"] .popper__arrow {
   display: none;
   display: none;
 }
 }
-
+// 时间选择框样式
 .el-date-picker {
 .el-date-picker {
   background-color: #031a46;
   background-color: #031a46;
-
-  .el-date-picker__header-label {
-    color: #A6CFD6;
+  .el-date-picker__header-label{
+  color:#A6CFD6;
+  }
+  .el-picker-panel__content{
+    background-color:#074487;
+    .disabled{
+      background-color:#074487;
+      .el-date-table td.disabled div{
+        background-color:#074487;
+      }
+    }
   }
   }
 
 
+
   .el-picker-panel__icon-btn {
   .el-picker-panel__icon-btn {
     color: #A6CFD6;
     color: #A6CFD6;
   }
   }
@@ -292,10 +301,7 @@ table td {
 
 
 }
 }
 
 
-.el-picker-panel__content {
-  background-color: #074487;
 
 
-}
 
 
 
 
 .el-menu--horizontal .el-menu .el-menu-item,
 .el-menu--horizontal .el-menu .el-menu-item,
@@ -315,4 +321,4 @@ table td {
   border: 1px solid #02D9FD;
   border: 1px solid #02D9FD;
   color: #FFFFFF !important;
   color: #FFFFFF !important;
   font-weight: 700;
   font-weight: 700;
-}
\ No newline at end of file
+}

@@ -145,7 +145,6 @@ export default {
 @import "~@/styles/public.scss";
 @import "~@/styles/public.scss";
 
 
 .jktjDetail {
 .jktjDetail {
-    background-color: #fff;
     height: 100%;
     height: 100%;
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;

 <template>
 <template>
     <!-- 监控日志 -->
     <!-- 监控日志 -->
-    <div class="jktjDetail from-clues">
+    <div class="jktjDetail form-clues">
         <!-- 头部搜索 -->
         <!-- 头部搜索 -->
-        <div class="from-clues-header">
-         <el-form ref="form" :model="form" label-width="80px">
+        <el-form ref="form" :model="form" :inline="true" class="from-clues-header" label-width="100px">
             <el-row>
             <el-row>
                 <el-col :span="8">
                 <el-col :span="8">
                     <el-date-picker v-model="valueTime" type="datetimerange" range-separator="至"
                     <el-date-picker v-model="valueTime" type="datetimerange" range-separator="至"
                         start-placeholder="开始日期" end-placeholder="结束日期">
                         start-placeholder="开始日期" end-placeholder="结束日期">
                     </el-date-picker>
                     </el-date-picker>
                 </el-col>
                 </el-col>
-                <!-- <el-col :span="6">
-                    <el-form-item label="开始时间">
-                        <el-date-picker type="date" :picker-options="pickerOptionsStart" clearable
-                            v-model="form.startTime" value-format="yyyy-MM-dd"></el-date-picker>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="结束时间">
-                        <el-date-picker clearable :picker-options="pickerOptionsEnd" v-model="form.endTime"
-                            value-format="yyyy-MM-dd">
-                        </el-date-picker>
-                    </el-form-item>
-                </el-col> -->
                 <!-- 按钮操作 -->
                 <!-- 按钮操作 -->
                 <el-col :span="12" class="btnColRight">
                 <el-col :span="12" class="btnColRight">
                     <el-button type="default" @click="resetForm"> 重置 </el-button>
                     <el-button type="default" @click="resetForm"> 重置 </el-button>
@@ -30,12 +16,10 @@
                 </el-col>
                 </el-col>
             </el-row>
             </el-row>
         </el-form>
         </el-form>
-
         <!-- 表格 -->
         <!-- 表格 -->
         <div class="form-clues-content echarts-box">
         <div class="form-clues-content echarts-box">
             <div id="myChart" class="chart"></div>
             <div id="myChart" class="chart"></div>
         </div>
         </div>
-         </div>
     </div>
     </div>
 </template>
 </template>
 
 
@@ -161,7 +145,6 @@ export default {
 @import "~@/styles/public.scss";
 @import "~@/styles/public.scss";
 
 
 .jktjDetail {
 .jktjDetail {
-    // background-color: #fff;
     height: 100%;
     height: 100%;
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
@@ -169,7 +152,7 @@ export default {
     .echarts-box {
     .echarts-box {
         display: flex;
         display: flex;
         justify-content: center;
         justify-content: center;
-        height: 100%;
+        height: 500px;
 
 
         .chart {
         .chart {
             width: 100%;
             width: 100%;