Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
d4622996 by 田浩浩
Options

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

2 parents 756ccd4c e8aca095
Inline Side-by-side
Showing 8 changed files with 45 additions and 35 deletions
1 <template> 1 <template>
2 <transition name="msgbox-fade" v-if="myShow"> 2 <transition name="msgbox-fade" v-if="myShow">
3 <div class="ls-mask" v-loading="loading"> 3 <div class="ls-mask" v-loading="loading">
4 <div class="ls-mask-window" :style="{ 'width': width }"> 4 <div class="ls-mask-window dialogBox" :style="{ 'width': width }">
5 <div class="ls-head"> 5 <div class="ls-head">
6 <div class="ls-title" :style="{ 'text-align': titleStyle }"> 6 <div class="ls-title" :style="{ 'text-align': titleStyle }">
7 <svg-icon v-if="iconClass != ''" :icon-class='iconClass' /> 7 <svg-icon v-if="iconClass != ''" :icon-class='iconClass' />
...@@ -105,6 +105,9 @@ export default { ...@@ -105,6 +105,9 @@ export default {
105 } 105 }
106 </script> 106 </script>
107 <style scoped lang="scss" > 107 <style scoped lang="scss" >
108 @import "~@/styles/mixin.scss";
109 @import "~@/styles/dialogBox.scss";
110
108 .ls-mask { 111 .ls-mask {
109 width: 100%; 112 width: 100%;
110 height: 100%; 113 height: 100%;
...@@ -138,7 +141,7 @@ export default { ...@@ -138,7 +141,7 @@ export default {
138 .ls-title { 141 .ls-title {
139 padding: 10px; 142 padding: 10px;
140 color: #ffffff; 143 color: #ffffff;
141 background: linear-gradient(90deg, #1D66DC 0%, #081B56 100%); 144 // background: linear-gradient(90deg, #1D66DC 0%, #081B56 100%);
142 font-size: 16px; 145 font-size: 16px;
143 } 146 }
144 147
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
9 <el-tab-pane label="数据模型" name="sjmx"></el-tab-pane> 9 <el-tab-pane label="数据模型" name="sjmx"></el-tab-pane>
10 <el-tab-pane label="xml报文" name="xml"></el-tab-pane> 10 <el-tab-pane label="xml报文" name="xml"></el-tab-pane>
11 </el-tabs> 11 </el-tabs>
12 <div v-if="titleName == 'sjmx'"> 12 <div v-if="titleName == 'sjmx'" class="sjmx">
13 <div class="dialog-from"> 13 <div class="dialog-from">
14 <el-row> 14 <el-row>
15 <el-col :span="6"> 15 <el-col :span="6">
...@@ -268,10 +268,19 @@ export default { ...@@ -268,10 +268,19 @@ export default {
268 color: #CEF8FF; 268 color: #CEF8FF;
269 } 269 }
270 270
271 .sjmx {
272 /deep/.el-tabs__item {
273 height: 50px;
274 padding-top: 6px;
275 }
276 }
277
271 /deep/.el-tabs__item { 278 /deep/.el-tabs__item {
272 color: #CEF8FF !important; 279 color: #CEF8FF !important;
273 height: 50px; 280
274 padding-top: 7px; 281 display: flex;
282 flex-direction: row;
283 justify-content: center;
275 background: url("~@/image/tabitem.png") no-repeat; 284 background: url("~@/image/tabitem.png") no-repeat;
276 background-size: 100% 100%; 285 background-size: 100% 100%;
277 border: none !important; 286 border: none !important;
...@@ -288,6 +297,7 @@ export default { ...@@ -288,6 +297,7 @@ export default {
288 } 297 }
289 298
290 /deep/.el-tabs__nav { 299 /deep/.el-tabs__nav {
300 display: flex;
291 border: none !important; 301 border: none !important;
292 } 302 }
293 303
...@@ -353,7 +363,7 @@ export default { ...@@ -353,7 +363,7 @@ export default {
353 margin: -3px 15px 15px 15px; 363 margin: -3px 15px 15px 15px;
354 364
355 .el-col { 365 .el-col {
356 line-height: 24px; 366 line-height: 18px;
357 display: flex; 367 display: flex;
358 align-items: center; 368 align-items: center;
359 margin-bottom: 3px; 369 margin-bottom: 3px;
......
...@@ -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>
......
1 .dialogBox { 1 .dialogBox {
2 overflow: hidden; 2 overflow: hidden;
3 background: url("~@/image/dialogBg.png") no-repeat; 3 background: url("~@/image/dialogBg.png") no-repeat !important;
4 background-size: 100% 100%; 4 background-size: 100% 100% !important;
5 5
6 .dialog_title { 6 .dialog_title {
7 display: flex; 7 display: flex;
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
53 } 53 }
54 54
55 .el-dialog__body { 55 .el-dialog__body {
56 padding-top: 10px; 56 padding-top: 0;
57 padding-bottom: 0; 57 padding-bottom: 0;
58 } 58 }
59 59
......
...@@ -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) {
...@@ -189,4 +189,4 @@ export default { ...@@ -189,4 +189,4 @@ export default {
189 </script> 189 </script>
190 <style scoped lang="scss"> 190 <style scoped lang="scss">
191 @import "~@/styles/public.scss"; 191 @import "~@/styles/public.scss";
192 </style>
...\ No newline at end of file ...\ No newline at end of file
192 </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 <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,10 +30,12 @@ ...@@ -29,10 +30,12 @@
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>
38 </div>
36 </div> 39 </div>
37 </template> 40 </template>
38 41
...@@ -155,8 +158,10 @@ export default { ...@@ -155,8 +158,10 @@ export default {
155 }; 158 };
156 </script> 159 </script>
157 <style scoped lang="scss"> 160 <style scoped lang="scss">
161 @import "~@/styles/public.scss";
162
158 .jktjDetail { 163 .jktjDetail {
159 background-color: #fff; 164 // background-color: #fff;
160 height: 100%; 165 height: 100%;
161 display: flex; 166 display: flex;
162 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>
......