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

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

@@ -13,7 +13,7 @@
 
 
 <script>
 <script>
 import maps from "@/components/echart/map";
 import maps from "@/components/echart/map";
-import brokenline from "@/components/echart/brokenline";
+import brokenline from "@/components/echart/Brokenline";
 export default {
 export default {
   data () {
   data () {
     return {};
     return {};

@@ -2,7 +2,8 @@
     <!-- 监控日志 -->
     <!-- 监控日志 -->
     <div class="jktjDetail from-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-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="至"
@@ -29,10 +30,12 @@
                 </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>
 
 
@@ -158,7 +161,7 @@ export default {
 @import "~@/styles/public.scss";
 @import "~@/styles/public.scss";
 
 
 .jktjDetail {
 .jktjDetail {
-    background-color: #fff;
+    // background-color: #fff;
     height: 100%;
     height: 100%;
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;

@@ -9,8 +9,8 @@
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="18" class="btnColRight">
           <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-col>
         </el-row>
         </el-row>
       </el-form>
       </el-form>