Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
c92e2db7 by 任超
Options

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

2 parents bc94ac01 4b2cbf53
Inline Side-by-side
Showing 4 changed files with 11 additions and 8 deletions
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
32 </el-form-item> 32 </el-form-item>
33 </el-col> 33 </el-col>
34 <el-col :span="4" class="btnColRight"> 34 <el-col :span="4" class="btnColRight">
35 <el-button type="primary" @click="handleSubmit">查询结果</el-button> 35 <btn nativeType="cx" @click="handleSubmit">查询结果</btn>
36 </el-col> 36 </el-col>
37 </el-row> 37 </el-row>
38 </el-form> 38 </el-form>
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
42 @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns" 42 @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
43 :data="tableData.data"> 43 :data="tableData.data">
44 </lb-table> 44 </lb-table>
45 <message-tips ref="msg" :message="message" /> 45 <message-tips ref="msg"/>
46 </div> 46 </div>
47 <!-- XML报文 --> 47 <!-- XML报文 -->
48 <xml-message ref="dialog" :xml="xml" /> 48 <xml-message ref="dialog" :xml="xml" />
...@@ -168,7 +168,7 @@ export default { ...@@ -168,7 +168,7 @@ export default {
168 } 168 }
169 } catch (error) { 169 } catch (error) {
170 this.message = error 170 this.message = error
171 this.$refs.msg.messageShow() 171 // this.$refs.msg.messageShow()
172 } 172 }
173 }, 173 },
174 handlDatadetails (index, row) { 174 handlDatadetails (index, row) {
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
13 13
14 <script> 14 <script>
15 import maps from "@/components/echart/map"; 15 import maps from "@/components/echart/map";
16 import brokenline from "@/components/echart/brokenline"; 16 import brokenline from "@/components/echart/Brokenline";
17 export default { 17 export default {
18 data () { 18 data () {
19 return {}; 19 return {};
......
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
2 <!-- 监控日志 --> 2 <!-- 监控日志 -->
3 <div class="jktjDetail from-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 <div class="from-clues-header">
6 <el-form ref="form" :model="form" label-width="80px">
6 <el-row> 7 <el-row>
7 <el-col :span="8"> 8 <el-col :span="8">
8 <el-date-picker v-model="valueTime" type="datetimerange" range-separator="至" 9 <el-date-picker v-model="valueTime" type="datetimerange" range-separator="至"
...@@ -29,11 +30,13 @@ ...@@ -29,11 +30,13 @@
29 </el-col> 30 </el-col>
30 </el-row> 31 </el-row>
31 </el-form> 32 </el-form>
33
32 <!-- 表格 --> 34 <!-- 表格 -->
33 <div class="form-clues-content echarts-box"> 35 <div class="form-clues-content echarts-box">
34 <div id="myChart" class="chart"></div> 36 <div id="myChart" class="chart"></div>
35 </div> 37 </div>
36 </div> 38 </div>
39 </div>
37 </template> 40 </template>
38 41
39 <script> 42 <script>
...@@ -158,7 +161,7 @@ export default { ...@@ -158,7 +161,7 @@ export default {
158 @import "~@/styles/public.scss"; 161 @import "~@/styles/public.scss";
159 162
160 .jktjDetail { 163 .jktjDetail {
161 background-color: #fff; 164 // background-color: #fff;
162 height: 100%; 165 height: 100%;
163 display: flex; 166 display: flex;
164 flex-direction: column; 167 flex-direction: column;
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
9 </el-form-item> 9 </el-form-item>
10 </el-col> 10 </el-col>
11 <el-col :span="18" class="btnColRight"> 11 <el-col :span="18" class="btnColRight">
12 <el-button type="primary" @click="handleSubmit">搜索</el-button> 12 <btn nativeType="cx" @click="handleSubmit">搜索</btn>
13 <el-button type="primary" @click="handleAdd">新增</el-button> 13 <btn nativeType="sb" @click="handleAdd">新增</btn>
14 </el-col> 14 </el-col>
15 </el-row> 15 </el-row>
16 </el-form> 16 </el-form>
......