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

 <template>
   <transition name="msgbox-fade" v-if="myShow">
     <div class="ls-mask" v-loading="loading">
-      <div class="ls-mask-window" :style="{ 'width': width }">
+      <div class="ls-mask-window dialogBox" :style="{ 'width': width }">
         <div class="ls-head">
           <div class="ls-title" :style="{ 'text-align': titleStyle }">
             <svg-icon v-if="iconClass != ''" :icon-class='iconClass' />
@@ -105,6 +105,9 @@ export default {
 }
 </script>
 <style scoped lang="scss" >
+@import "~@/styles/mixin.scss";
+@import "~@/styles/dialogBox.scss";
+
 .ls-mask {
   width: 100%;
   height: 100%;
@@ -138,7 +141,7 @@ export default {
 .ls-title {
   padding: 10px;
   color: #ffffff;
-  background: linear-gradient(90deg, #1D66DC 0%, #081B56 100%);
+  // background: linear-gradient(90deg, #1D66DC 0%, #081B56 100%);
   font-size: 16px;
 }
 

@@ -9,7 +9,7 @@
       <el-tab-pane label="数据模型" name="sjmx"></el-tab-pane>
       <el-tab-pane label="xml报文" name="xml"></el-tab-pane>
     </el-tabs>
-    <div v-if="titleName == 'sjmx'">
+    <div v-if="titleName == 'sjmx'" class="sjmx">
       <div class="dialog-from">
         <el-row>
           <el-col :span="6">
@@ -268,10 +268,19 @@ export default {
   color: #CEF8FF;
 }
 
+.sjmx {
+  /deep/.el-tabs__item {
+    height: 50px;
+    padding-top: 6px;
+  }
+}
+
 /deep/.el-tabs__item {
   color: #CEF8FF !important;
-  height: 50px;
-  padding-top: 7px;
+
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
   background: url("~@/image/tabitem.png") no-repeat;
   background-size: 100% 100%;
   border: none !important;
@@ -288,6 +297,7 @@ export default {
 }
 
 /deep/.el-tabs__nav {
+  display: flex;
   border: none !important;
 }
 
@@ -353,7 +363,7 @@ export default {
     margin: -3px 15px 15px 15px;
 
     .el-col {
-      line-height: 24px;
+      line-height: 18px;
       display: flex;
       align-items: center;
       margin-bottom: 3px;

@@ -47,9 +47,12 @@ export default {
   }
 }
 
-.app-main {
-  height: calc(100% -94px) !important;
-  // padding: 10px;
+.appMain {
+  height: calc(100vh - 94px) !important;
   box-sizing: border-box;
+
+  .app-main {
+    height: 100%;
+  }
 }
 </style>

 .dialogBox {
   overflow: hidden;
-  background: url("~@/image/dialogBg.png") no-repeat;
-  background-size: 100% 100%;
+  background: url("~@/image/dialogBg.png") no-repeat !important;
+  background-size: 100% 100% !important;
 
   .dialog_title {
     display: flex;
@@ -53,7 +53,7 @@
 }
 
 .el-dialog__body {
-  padding-top: 10px;
+  padding-top: 0;
   padding-bottom: 0;
 }
 

@@ -32,7 +32,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="4" class="btnColRight">
-            <el-button type="primary" @click="handleSubmit">查询结果</el-button>
+              <btn nativeType="cx" @click="handleSubmit">查询结果</btn>
           </el-col>
         </el-row>
       </el-form>
@@ -42,7 +42,7 @@
         @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
         :data="tableData.data">
       </lb-table>
-      <message-tips ref="msg" :message="message" />
+      <message-tips ref="msg"/>
     </div>
     <!-- XML报文 -->
     <xml-message ref="dialog" :xml="xml" />
@@ -168,7 +168,7 @@ export default {
         }
       } catch (error) {
         this.message = error
-        this.$refs.msg.messageShow()
+        // this.$refs.msg.messageShow()
       }
     },
     handlDatadetails (index, row) {
@@ -189,4 +189,4 @@ export default {
 </script>
 <style scoped lang="scss">
 @import "~@/styles/public.scss";
-</style>
\ No newline at end of file
+</style>

@@ -9,19 +9,6 @@
                         start-placeholder="开始日期" end-placeholder="结束日期">
                     </el-date-picker>
                 </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-button type="default" @click="resetForm"> 重置 </el-button>
@@ -155,6 +142,8 @@ export default {
 };
 </script>
 <style scoped lang="scss">
+@import "~@/styles/public.scss";
+
 .jktjDetail {
     background-color: #fff;
     height: 100%;
@@ -164,7 +153,7 @@ export default {
     .echarts-box {
         display: flex;
         justify-content: center;
-        height: 100%;
+        height: 500px;
 
         .chart {
             width: 100%;

 <template>
     <!-- 监控日志 -->
-    <div class="jktjDetail form-clues">
+    <div class="jktjDetail from-clues">
         <!-- 头部搜索 -->
-        <el-form ref="form" :model="form" :inline="true" class="from-clues-header" label-width="100px">
+        <div class="from-clues-header">
+         <el-form ref="form" :model="form" label-width="80px">
             <el-row>
                 <el-col :span="8">
                     <el-date-picker v-model="valueTime" type="datetimerange" range-separator="至"
@@ -29,10 +30,12 @@
                 </el-col>
             </el-row>
         </el-form>
+
         <!-- 表格 -->
         <div class="form-clues-content echarts-box">
             <div id="myChart" class="chart"></div>
         </div>
+         </div>
     </div>
 </template>
 
@@ -155,8 +158,10 @@ export default {
 };
 </script>
 <style scoped lang="scss">
+@import "~@/styles/public.scss";
+
 .jktjDetail {
-    background-color: #fff;
+    // background-color: #fff;
     height: 100%;
     display: flex;
     flex-direction: column;

@@ -9,8 +9,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="18" class="btnColRight">
-            <el-button type="primary" @click="handleSubmit">搜索</el-button>
-            <el-button type="primary" @click="handleAdd">新增</el-button>
+              <btn nativeType="cx" @click="handleSubmit">搜索</btn>
+              <btn nativeType="sb"  @click="handleAdd">新增</btn>
           </el-col>
         </el-row>
       </el-form>