Skip to content

bdc / bdcjg-web

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

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

2 parents 2e73402e 6ffaf546
Inline Side-by-side
Showing 4 changed files with 44 additions and 46 deletions
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
12 12
13 //input 13 //input
14 .el-input__inner { 14 .el-input__inner {
15 color: #FFFFFF!important; 15 color: #FFFFFF !important;
16 padding: 0 7px !important; 16 padding: 0 7px !important;
17 } 17 }
18 18
...@@ -257,27 +257,42 @@ table td { ...@@ -257,27 +257,42 @@ table td {
257 } 257 }
258 258
259 .el-popper[x-placement^="bottom"] .popper__arrow::after { 259 .el-popper[x-placement^="bottom"] .popper__arrow::after {
260 display: none; 260 display: none;
261 } 261 }
262 262
263 .el-popper[x-placement^="bottom"] .popper__arrow { 263 .el-popper[x-placement^="bottom"] .popper__arrow {
264 display: none; 264 display: none;
265 } 265 }
266 .el-date-picker{ 266 // 时间选择框样式
267 .el-date-picker {
267 background-color: #031a46; 268 background-color: #031a46;
268 .el-date-picker__header-label{ 269 .el-date-picker__header-label{
269 color: #A6CFD6; 270 color:#A6CFD6;
271 }
272 .el-picker-panel__content{
273 background-color:#074487;
274 .disabled{
275 background-color:#074487;
276 .el-date-table td.disabled div{
277 background-color:#074487;
278 }
279 }
270 } 280 }
271 .el-picker-panel__icon-btn{ 281
282
283 .el-picker-panel__icon-btn {
272 color: #A6CFD6; 284 color: #A6CFD6;
273 } 285 }
274 .el-date-table th{ 286
287 .el-date-table th {
275 color: #02D9FD; 288 color: #02D9FD;
276 } 289 }
277 .el-date-table td span{ 290
291 .el-date-table td span {
278 color: #A6CFD6; 292 color: #A6CFD6;
279 } 293 }
280 .el-date-table td.current:not(.disabled) span{ 294
295 .el-date-table td.current:not(.disabled) span {
281 background-color: #074487; 296 background-color: #074487;
282 // border:1px solid saddlebrown; 297 // border:1px solid saddlebrown;
283 box-shadow: inset 0 0 7px #02D9FD; 298 box-shadow: inset 0 0 7px #02D9FD;
...@@ -285,10 +300,8 @@ display: none; ...@@ -285,10 +300,8 @@ display: none;
285 } 300 }
286 301
287 } 302 }
288 .el-picker-panel__content{
289 background-color:#074487;
290 303
291 } 304
292 305
293 306
294 .el-menu--horizontal .el-menu .el-menu-item, 307 .el-menu--horizontal .el-menu .el-menu-item,
...@@ -302,6 +315,7 @@ display: none; ...@@ -302,6 +315,7 @@ display: none;
302 315
303 .el-menu--horizontal .el-menu--popup .el-menu-item:not(.is-disabled):hover, 316 .el-menu--horizontal .el-menu--popup .el-menu-item:not(.is-disabled):hover,
304 .el-select-dropdown__item:hover, 317 .el-select-dropdown__item:hover,
318 .el-select-dropdown__item.selected,
305 .el-menu--horizontal .el-menu--popup .el-menu-item:not(.is-disabled):focus { 319 .el-menu--horizontal .el-menu--popup .el-menu-item:not(.is-disabled):focus {
306 background: #074487; 320 background: #074487;
307 border: 1px solid #02D9FD; 321 border: 1px solid #02D9FD;
......
...@@ -145,7 +145,6 @@ export default { ...@@ -145,7 +145,6 @@ export default {
145 @import "~@/styles/public.scss"; 145 @import "~@/styles/public.scss";
146 146
147 .jktjDetail { 147 .jktjDetail {
148 background-color: #fff;
149 height: 100%; 148 height: 100%;
150 display: flex; 149 display: flex;
151 flex-direction: column; 150 flex-direction: column;
......
1 <template> 1 <template>
2 <!-- 监控日志 --> 2 <!-- 监控日志 -->
3 <div class="jktjDetail from-clues"> 3 <div class="jktjDetail form-clues">
4 <!-- 头部搜索 --> 4 <!-- 头部搜索 -->
5 <div class="from-clues-header"> 5 <el-form ref="form" :model="form" :inline="true" class="from-clues-header" label-width="100px">
6 <el-form ref="form" :model="form" label-width="80px">
7 <el-row> 6 <el-row>
8 <el-col :span="8"> 7 <el-col :span="8">
9 <el-date-picker v-model="valueTime" type="datetimerange" range-separator="至" 8 <el-date-picker v-model="valueTime" type="datetimerange" range-separator="至"
10 start-placeholder="开始日期" end-placeholder="结束日期"> 9 start-placeholder="开始日期" end-placeholder="结束日期">
11 </el-date-picker> 10 </el-date-picker>
12 </el-col> 11 </el-col>
13 <!-- <el-col :span="6">
14 <el-form-item label="开始时间">
15 <el-date-picker type="date" :picker-options="pickerOptionsStart" clearable
16 v-model="form.startTime" value-format="yyyy-MM-dd"></el-date-picker>
17 </el-form-item>
18 </el-col>
19 <el-col :span="6">
20 <el-form-item label="结束时间">
21 <el-date-picker clearable :picker-options="pickerOptionsEnd" v-model="form.endTime"
22 value-format="yyyy-MM-dd">
23 </el-date-picker>
24 </el-form-item>
25 </el-col> -->
26 <!-- 按钮操作 --> 12 <!-- 按钮操作 -->
27 <el-col :span="12" class="btnColRight"> 13 <el-col :span="12" class="btnColRight">
28 <el-button type="default" @click="resetForm"> 重置 </el-button> 14 <el-button type="default" @click="resetForm"> 重置 </el-button>
...@@ -30,13 +16,11 @@ ...@@ -30,13 +16,11 @@
30 </el-col> 16 </el-col>
31 </el-row> 17 </el-row>
32 </el-form> 18 </el-form>
33
34 <!-- 表格 --> 19 <!-- 表格 -->
35 <div class="form-clues-content echarts-box"> 20 <div class="form-clues-content echarts-box">
36 <div id="myChart" class="chart"></div> 21 <div id="myChart" class="chart"></div>
37 </div> 22 </div>
38 </div> 23 </div>
39 </div>
40 </template> 24 </template>
41 25
42 <script> 26 <script>
...@@ -161,7 +145,6 @@ export default { ...@@ -161,7 +145,6 @@ export default {
161 @import "~@/styles/public.scss"; 145 @import "~@/styles/public.scss";
162 146
163 .jktjDetail { 147 .jktjDetail {
164 // background-color: #fff;
165 height: 100%; 148 height: 100%;
166 display: flex; 149 display: flex;
167 flex-direction: column; 150 flex-direction: column;
...@@ -169,7 +152,7 @@ export default { ...@@ -169,7 +152,7 @@ export default {
169 .echarts-box { 152 .echarts-box {
170 display: flex; 153 display: flex;
171 justify-content: center; 154 justify-content: center;
172 height: 100%; 155 height: 500px;
173 156
174 .chart { 157 .chart {
175 width: 100%; 158 width: 100%;
......
...@@ -87,6 +87,8 @@ ...@@ -87,6 +87,8 @@
87 :data="tableData.data"> 87 :data="tableData.data">
88 </lb-table> 88 </lb-table>
89 </div> 89 </div>
90 <!-- 编辑 -->
91 <dataDetails ref="editLog" />
90 </div> 92 </div>
91 </template> 93 </template>
92 94
...@@ -97,10 +99,16 @@ import data from "./data"; ...@@ -97,10 +99,16 @@ import data from "./data";
97 // 引入table混入方法 99 // 引入table混入方法
98 import tableMixin from "@/mixins/tableMixin.js"; 100 import tableMixin from "@/mixins/tableMixin.js";
99 import { getReceiveDataReportPage } from "@/api/sbbwcx.js"; 101 import { getReceiveDataReportPage } from "@/api/sbbwcx.js";
102 // 引入详情弹框
103 import dataDetails from "@/components/dataDetails/edit-dialog";
100 export default { 104 export default {
101 name: "jsbwcx", 105 name: "jsbwcx",
102 mixins: [tableMixin], 106 mixins: [tableMixin],
103 data() { 107 // 注册组件
108 components: {
109 dataDetails,
110 },
111 data () {
104 return { 112 return {
105 // 开始结束日期限制 113 // 开始结束日期限制
106 pickerOptionsStart: { 114 pickerOptionsStart: {
...@@ -194,7 +202,7 @@ export default { ...@@ -194,7 +202,7 @@ export default {
194 }, 202 },
195 methods: { 203 methods: {
196 // 初始化数据 204 // 初始化数据
197 queryClick() { 205 queryClick () {
198 getReceiveDataReportPage({ ...this.form, ...this.pageData }).then((res) => { 206 getReceiveDataReportPage({ ...this.form, ...this.pageData }).then((res) => {
199 if (res.code === 200) { 207 if (res.code === 200) {
200 let { total, records } = res.result; 208 let { total, records } = res.result;
...@@ -204,23 +212,17 @@ export default { ...@@ -204,23 +212,17 @@ export default {
204 }); 212 });
205 }, 213 },
206 // 重置 214 // 重置
207 resetForm() { 215 resetForm () {
208 this.$refs.ruleForm.resetFields(); 216 this.$refs.ruleForm.resetFields();
209 }, 217 },
210 featchData() { 218 featchData () {
211 this.queryClick(); 219 this.queryClick();
212 }, 220 },
213 // 详情 221 // 详情
214 handleEdit() { 222 handleEdit (row) {
215 this.$popupDialog( 223 this.$refs.editLog.isShow(row);
216 "业务报文", 224 }
217 "components/JsonEditor/index", 225 }
218 {},
219 "50%",
220 "320px"
221 );
222 },
223 },
224 }; 226 };
225 </script> 227 </script>
226 <style scoped lang="scss"> 228 <style scoped lang="scss">
......