9ab5dd1c by 任超

style:样式修改

1 parent 3ee88665
1 <!-- 1 <!--
2 功能:结果 2 * @Description:
3 作者:calliope 3 * @Autor: renchao
4 * @LastEditTime: 2023-03-13 11:09:01
4 --> 5 -->
5 <template> 6 <template>
6 <div class='result'> 7 <div class='result'>
8 <div class="result-con" style="margin-bottom: 15px;">
7 <p>响应xml</p> 9 <p>响应xml</p>
8 <el-input type="textarea" disabled :rows="6" class="resulttext" placeholder="响应xml" v-model="REPMSGXML"> 10 <el-input type="textarea" disabled :rows="6" class="resulttext" placeholder="响应xml" v-model="REPMSGXML">
9 </el-input> 11 </el-input>
12 </div>
13 <div class="result-con" style="margin-top: 15px;">
10 <p>错误信息</p> 14 <p>错误信息</p>
11 <el-input type="textarea" disabled :rows="6" class="resulttext" placeholder="错误信息" v-model="ERRORINFO"> 15 <el-input type="textarea" disabled :rows="6" class="resulttext" placeholder="错误信息" v-model="ERRORINFO">
12 </el-input> 16 </el-input>
13 </div> 17 </div>
18 </div>
14 </template> 19 </template>
15 <script> 20 <script>
16 import { getReceiveDataReportResult } from "@/api/dataReport.js"; 21 import { getReceiveDataReportResult } from "@/api/dataReport.js";
...@@ -40,22 +45,40 @@ export default { ...@@ -40,22 +45,40 @@ export default {
40 <style scoped lang='scss'> 45 <style scoped lang='scss'>
41 @import '~@/styles/public.scss'; 46 @import '~@/styles/public.scss';
42 47
48
43 .result { 49 .result {
44 padding: 15px; 50 padding: 15px;
45 height: 100%; 51 height: 100%;
46 52
47 p {
48 color: #ffffff;
49 line-height: 26px;
50 font-size: 18px;
51 }
52
53 /deep/.el-textarea__inner { 53 /deep/.el-textarea__inner {
54 min-height: 30vh !important; 54 height: 30vh !important;
55 background-color: #08346F !important;
56 color: #ffffff; 55 color: #ffffff;
57 border: none !important; 56 border: none !important;
57 color: #ffffff;
58 } 58 }
59 59
60 &-con {
61 background: #04275B;
62 border-radius: 2px;
63 padding: 10px;
64 box-sizing: border-box;
65
66 p {
67 color: #2997E8;
68 font-size: 14px;
69 position: relative;
70 padding-left: 10px;
71 }
72
73 p::before {
74 position: absolute;
75 content: '';
76 width: 3px;
77 height: 10px;
78 background-color: #2997E8;
79 left: 0;
80 top: 3px;
81 }
82 }
60 } 83 }
61 </style> 84 </style>
......
...@@ -341,20 +341,39 @@ export default { ...@@ -341,20 +341,39 @@ export default {
341 /deep/.el-dialog__body { 341 /deep/.el-dialog__body {
342 display: flex; 342 display: flex;
343 flex-direction: column; 343 flex-direction: column;
344 padding-bottom: 25px; 344 padding-bottom: 30px;
345 } 345 }
346 346
347 /deep/ .el-tabs { 347 /deep/ .el-tabs {
348 color: #CEF8FF; 348 color: #CEF8FF;
349 } 349 }
350 350
351 .d-center {
352 z-index: 1000;
353 }
354
351 .sjmx { 355 .sjmx {
356 display: flex;
357 flex-direction: column;
358 height: 100%;
359
352 /deep/.el-tabs__item { 360 /deep/.el-tabs__item {
353 height: 50px; 361 height: 50px;
354 padding-top: 6px; 362 padding-top: 6px;
355 } 363 }
356 } 364 }
357 365
366 .result {
367 flex: 1;
368 height: 100%;
369 }
370
371 .editDialogBox-con {
372 flex: 1;
373 height: 100%;
374 overflow-y: hidden;
375 }
376
358 /deep/.el-tabs__item { 377 /deep/.el-tabs__item {
359 color: #CEF8FF !important; 378 color: #CEF8FF !important;
360 379
...@@ -427,9 +446,8 @@ export default { ...@@ -427,9 +446,8 @@ export default {
427 overflow-y: auto; 446 overflow-y: auto;
428 overflow-x: hidden; 447 overflow-x: hidden;
429 padding-right: 1px; 448 padding-right: 1px;
430 margin-bottom: 10px;
431 border-top: none; 449 border-top: none;
432 height: 44vh; 450 height: 38vh !important;
433 } 451 }
434 452
435 /deep/.editDialogBox { 453 /deep/.editDialogBox {
...@@ -439,7 +457,7 @@ export default { ...@@ -439,7 +457,7 @@ export default {
439 457
440 .el-dialog__header { 458 .el-dialog__header {
441 display: flex; 459 display: flex;
442 margin-bottom: 15px; 460 margin-bottom: 10px;
443 } 461 }
444 462
445 .dialog_footer { 463 .dialog_footer {
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
61 } 61 }
62 62
63 .appMain { 63 .appMain {
64 min-width: 1290px; 64 // min-width: 1280px;
65 height: calc(100vh - 101px) !important; 65 height: calc(100vh - 101px) !important;
66 box-sizing: border-box; 66 box-sizing: border-box;
67 67
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
7 .dialog_title { 7 .dialog_title {
8 display: flex; 8 display: flex;
9 position: relative; 9 position: relative;
10 font-size: 24px; 10 font-size: 23px;
11 top: -11px; 11 top: -10px;
12 width: 38%; 12 width: 38%;
13 height: 40px; 13 height: 40px;
14 margin-left: 28px; 14 margin-left: 28px;
...@@ -68,8 +68,9 @@ ...@@ -68,8 +68,9 @@
68 } 68 }
69 69
70 .regularHeight { 70 .regularHeight {
71 height: 80vh;
72 display: flex; 71 display: flex;
72 flex: 1;
73 height: 100%;
73 flex-direction: column; 74 flex-direction: column;
74 75
75 .editDialogBox-con, 76 .editDialogBox-con,
...@@ -147,7 +148,6 @@ ...@@ -147,7 +148,6 @@
147 148
148 .el-dialog__header { 149 .el-dialog__header {
149 color: #FFFFFF; 150 color: #FFFFFF;
150 // background: #074487;
151 height: 46px !important; 151 height: 46px !important;
152 width: 97%; 152 width: 97%;
153 margin: 0 auto; 153 margin: 0 auto;
...@@ -157,6 +157,7 @@ ...@@ -157,6 +157,7 @@
157 .el-dialog__body { 157 .el-dialog__body {
158 padding-top: 0; 158 padding-top: 0;
159 padding-bottom: 0; 159 padding-bottom: 0;
160 height: 95vh;
160 } 161 }
161 162
162 .el-dialog__headerbtn { 163 .el-dialog__headerbtn {
......
...@@ -336,6 +336,15 @@ aside { ...@@ -336,6 +336,15 @@ aside {
336 color: $yellow; 336 color: $yellow;
337 } 337 }
338 338
339 // 操作按钮样式
340 .btnColor {
341 color: #8DEAF9;
342 }
343 .successColor {
344 color:#67C23A
345 }
346
347
339 // 通过 入库 样式 348 // 通过 入库 样式
340 .adopt, 349 .adopt,
341 .success { 350 .success {
...@@ -409,10 +418,9 @@ aside { ...@@ -409,10 +418,9 @@ aside {
409 background: #FF7962; 418 background: #FF7962;
410 color: #FF7962; 419 color: #FF7962;
411 } 420 }
421
412 // 引入字体 422 // 引入字体
413 @font-face { 423 @font-face {
414 font-family:AliBold; 424 font-family: AliBold;
415 src:url('../image/font/Alibaba_PuHuiTi_2.0_55_Regular_85_Bold.ttf') 425 src: url('../image/font/Alibaba_PuHuiTi_2.0_55_Regular_85_Bold.ttf')
416 } 426 }
...\ No newline at end of file ...\ No newline at end of file
417
418
......
...@@ -340,4 +340,5 @@ ...@@ -340,4 +340,5 @@
340 word-break: break-all; 340 word-break: break-all;
341 line-height: 20px; 341 line-height: 20px;
342 flex: 1; 342 flex: 1;
343
343 } 344 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
48 .from-clues { 48 .from-clues {
49 height: 100%; 49 height: 100%;
50 width: 100%; 50 width: 100%;
51 min-width: 1280px; 51 // min-width: 1280px;
52 box-sizing: border-box; 52 box-sizing: border-box;
53 overflow-x: hidden; 53 overflow-x: hidden;
54 padding: 2px; 54 padding: 2px;
...@@ -407,7 +407,7 @@ ...@@ -407,7 +407,7 @@
407 407
408 .el-dialog__header { 408 .el-dialog__header {
409 display: flex; 409 display: flex;
410 margin-bottom: 15px; 410 margin-bottom: 10px;
411 } 411 }
412 412
413 .el-dialog__footer { 413 .el-dialog__footer {
......
...@@ -336,7 +336,7 @@ ...@@ -336,7 +336,7 @@
336 } 336 }
337 337
338 .el-menu-item span { 338 .el-menu-item span {
339 white-space: normal; 339 white-space: nowrap !important;
340 word-break: break-all; 340 word-break: break-all;
341 line-height: 20px; 341 line-height: 20px;
342 flex: 1; 342 flex: 1;
......
...@@ -120,8 +120,8 @@ export default { ...@@ -120,8 +120,8 @@ export default {
120 return ( 120 return (
121 <div> 121 <div>
122 <el-button 122 <el-button
123 type="primary" 123 type="text"
124 size="mini" 124 class='btnColor'
125 onClick={() => { this.handleEdit(scope.row) }} 125 onClick={() => { this.handleEdit(scope.row) }}
126 > 126 >
127 详情 127 详情
......
...@@ -113,7 +113,8 @@ export default { ...@@ -113,7 +113,8 @@ export default {
113 return ( 113 return (
114 <div> 114 <div>
115 <el-button 115 <el-button
116 type="primary" 116 type="text"
117 class='btnColor'
117 size="mini" 118 size="mini"
118 onClick={() => { this.handleEdit(scope.row) }} 119 onClick={() => { this.handleEdit(scope.row) }}
119 > 120 >
......
...@@ -121,8 +121,8 @@ export default { ...@@ -121,8 +121,8 @@ export default {
121 return ( 121 return (
122 <div> 122 <div>
123 <el-button 123 <el-button
124 type="primary" 124 type="text"
125 size="mini" 125 class='btnColor'
126 onClick={() => { this.handleEdit(scope.row) }} 126 onClick={() => { this.handleEdit(scope.row) }}
127 > 127 >
128 详情 128 详情
......
...@@ -109,7 +109,8 @@ export default { ...@@ -109,7 +109,8 @@ export default {
109 return ( 109 return (
110 <div> 110 <div>
111 <el-button 111 <el-button
112 type="primary" 112 type="text"
113 class='btnColor'
113 onClick={() => { 114 onClick={() => {
114 this.handleEdit(scope.row); 115 this.handleEdit(scope.row);
115 }} 116 }}
......
...@@ -77,7 +77,8 @@ export default { ...@@ -77,7 +77,8 @@ export default {
77 return ( 77 return (
78 <div> 78 <div>
79 <el-button 79 <el-button
80 type="primary" 80 type="text"
81 class='btnColor'
81 onClick={() => { 82 onClick={() => {
82 this.handleEdit(scope.row); 83 this.handleEdit(scope.row);
83 }} 84 }}
......
...@@ -109,7 +109,8 @@ export default { ...@@ -109,7 +109,8 @@ export default {
109 return ( 109 return (
110 <div> 110 <div>
111 <el-button 111 <el-button
112 type="primary" 112 type="text"
113 class='btnColor'
113 onClick={() => { 114 onClick={() => {
114 this.handleEdit(scope.row); 115 this.handleEdit(scope.row);
115 }} 116 }}
......
...@@ -105,7 +105,8 @@ export default { ...@@ -105,7 +105,8 @@ export default {
105 return ( 105 return (
106 <div> 106 <div>
107 <el-button 107 <el-button
108 type="primary" 108 type="text"
109 class='btnColor'
109 onClick={() => { 110 onClick={() => {
110 this.handleEdit(scope.row); 111 this.handleEdit(scope.row);
111 }} 112 }}
......
...@@ -106,7 +106,8 @@ export default { ...@@ -106,7 +106,8 @@ export default {
106 return ( 106 return (
107 <div> 107 <div>
108 <el-button 108 <el-button
109 type="primary" 109 type="text"
110 class='btnColor'
110 onClick={() => { 111 onClick={() => {
111 this.handleEdit(scope.row); 112 this.handleEdit(scope.row);
112 }} 113 }}
......
...@@ -103,7 +103,8 @@ export default { ...@@ -103,7 +103,8 @@ export default {
103 return ( 103 return (
104 <div> 104 <div>
105 <el-button 105 <el-button
106 type="primary" 106 type="text"
107 class='btnColor'
107 onClick={() => { 108 onClick={() => {
108 this.handleEdit(scope.row); 109 this.handleEdit(scope.row);
109 }} 110 }}
......
...@@ -100,7 +100,8 @@ export default { ...@@ -100,7 +100,8 @@ export default {
100 return ( 100 return (
101 <div> 101 <div>
102 <el-button 102 <el-button
103 type="primary" 103 type="text"
104 class='btnColor'
104 onClick={() => { 105 onClick={() => {
105 this.handleEdit(scope.row); 106 this.handleEdit(scope.row);
106 }} 107 }}
......
...@@ -105,7 +105,8 @@ export default { ...@@ -105,7 +105,8 @@ export default {
105 return ( 105 return (
106 <div> 106 <div>
107 <el-button 107 <el-button
108 type="primary" 108 type="text"
109 class='btnColor'
109 onClick={() => { 110 onClick={() => {
110 this.handleEdit(scope.row); 111 this.handleEdit(scope.row);
111 }} 112 }}
......
...@@ -101,7 +101,8 @@ export default { ...@@ -101,7 +101,8 @@ export default {
101 return ( 101 return (
102 <div> 102 <div>
103 <el-button 103 <el-button
104 type="primary" 104 type="text"
105 class='btnColor'
105 onClick={() => { 106 onClick={() => {
106 this.handleEdit(scope.row); 107 this.handleEdit(scope.row);
107 }} 108 }}
......
...@@ -113,8 +113,8 @@ export default { ...@@ -113,8 +113,8 @@ export default {
113 return ( 113 return (
114 <div> 114 <div>
115 <el-button 115 <el-button
116 type="primary" 116 type="text"
117 size="mini" 117 class='btnColor'
118 onClick={() => { this.handleEdit(scope.row) }} 118 onClick={() => { this.handleEdit(scope.row) }}
119 > 119 >
120 详情 120 详情
......
...@@ -101,8 +101,8 @@ export default { ...@@ -101,8 +101,8 @@ export default {
101 return ( 101 return (
102 <div> 102 <div>
103 <el-button 103 <el-button
104 type="primary" 104 type="text"
105 size="mini" 105 class='btnColor'
106 onClick={() => { this.handleEdit(scope.row) }} 106 onClick={() => { this.handleEdit(scope.row) }}
107 > 107 >
108 详情 108 详情
......
...@@ -102,7 +102,8 @@ export default { ...@@ -102,7 +102,8 @@ export default {
102 return ( 102 return (
103 <div> 103 <div>
104 <el-button 104 <el-button
105 type="primary" 105 type="text"
106 class='btnColor'
106 onClick={() => { 107 onClick={() => {
107 this.handleEdit(scope.row); 108 this.handleEdit(scope.row);
108 }} 109 }}
......
...@@ -199,6 +199,8 @@ ...@@ -199,6 +199,8 @@
199 width: 60%; 199 width: 60%;
200 flex-direction: column; 200 flex-direction: column;
201 position: relative; 201 position: relative;
202 flex: 1;
203 height: 100%;
202 li { 204 li {
203 font-size: 0.1042rem; 205 font-size: 0.1042rem;
204 } 206 }
...@@ -222,6 +224,7 @@ ...@@ -222,6 +224,7 @@
222 .cardcontent-right { 224 .cardcontent-right {
223 flex: 1; 225 flex: 1;
224 width: 100%; 226 width: 100%;
227 height: 100%;
225 flex-direction: column; 228 flex-direction: column;
226 font-size: 0.0833rem; 229 font-size: 0.0833rem;
227 230
......
...@@ -56,7 +56,7 @@ class data extends filter { ...@@ -56,7 +56,7 @@ class data extends filter {
56 { 56 {
57 prop: "recflowid", 57 prop: "recflowid",
58 label: "业务流水号", 58 label: "业务流水号",
59 width: 95, 59 width: 100,
60 }, 60 },
61 { 61 {
62 prop: "estatenum", 62 prop: "estatenum",
...@@ -70,6 +70,7 @@ class data extends filter { ...@@ -70,6 +70,7 @@ class data extends filter {
70 }, 70 },
71 { 71 {
72 prop: "rectypeName", 72 prop: "rectypeName",
73 minWidth: 240,
73 label: "业务名称", 74 label: "业务名称",
74 render: (h, scope) => { 75 render: (h, scope) => {
75 return ( 76 return (
......
...@@ -193,7 +193,7 @@ export default { ...@@ -193,7 +193,7 @@ export default {
193 scope.row.receiveState == 2 ? 193 scope.row.receiveState == 2 ?
194 <el-button 194 <el-button
195 type="text" 195 type="text"
196 style="color:#67C23A" 196 class='successColor'
197 onClick={() => { 197 onClick={() => {
198 this.handleDetails(scope.row); 198 this.handleDetails(scope.row);
199 }} 199 }}
...@@ -203,6 +203,7 @@ export default { ...@@ -203,6 +203,7 @@ export default {
203 </el-button> : 203 </el-button> :
204 <el-button 204 <el-button
205 type="text" 205 type="text"
206 class='btnColor'
206 onClick={() => { 207 onClick={() => {
207 this.handleDetails(scope.row); 208 this.handleDetails(scope.row);
208 }} 209 }}
......
...@@ -166,13 +166,13 @@ ...@@ -166,13 +166,13 @@
166 </el-tabs> 166 </el-tabs>
167 <!-- 当日登薄详单 --> 167 <!-- 当日登薄详单 -->
168 <div class="from-clues-content" v-show="titleName2 == 'drdbxd'"> 168 <div class="from-clues-content" v-show="titleName2 == 'drdbxd'">
169 <lb-table :column="tableDBData.column" :pagination="false" :heightNumSetting="true" :heightNum="200" 169 <lb-table :column="tableDBData.column" :pagination="false" :heightNumSetting="true" :heightNum="180"
170 :data="tableDBData.data"> 170 :data="tableDBData.data">
171 </lb-table> 171 </lb-table>
172 </div> 172 </div>
173 <!-- 当日上报详单 --> 173 <!-- 当日上报详单 -->
174 <div class="from-clues-content" v-show="titleName2 == 'sbslxd'"> 174 <div class="from-clues-content" v-show="titleName2 == 'sbslxd'">
175 <lb-table :column="tableSBData.column" :pagination="false" :heightNumSetting="true" :heightNum="200" 175 <lb-table :column="tableSBData.column" :pagination="false" :heightNumSetting="true" :heightNum="180"
176 :data="tableSBData.data"> 176 :data="tableSBData.data">
177 </lb-table> 177 </lb-table>
178 </div> 178 </div>
...@@ -467,10 +467,25 @@ export default { ...@@ -467,10 +467,25 @@ export default {
467 margin: 0; 467 margin: 0;
468 } 468 }
469 469
470 /deep/.el-dialog {
471 display: flex;
472 flex-direction: column;
473 }
474
475 /deep/.el-dialog__body {
476 display: flex;
477 flex-direction: column;
478 padding-bottom: 30px;
479 height: 100%;
480 flex: 1;
481 position: relative;
482 }
483
470 .regularHeight { 484 .regularHeight {
471 height: 77vh;
472 display: flex; 485 display: flex;
473 flex-direction: column; 486 flex-direction: column;
487 flex: 1;
488 height: 100%;
474 489
475 .editDialogBox-con, 490 .editDialogBox-con,
476 .JsonEditor { 491 .JsonEditor {
...@@ -478,6 +493,12 @@ export default { ...@@ -478,6 +493,12 @@ export default {
478 } 493 }
479 } 494 }
480 495
496 .d-center {}
497
498 .dialog_title {
499 top: -13px
500 }
501
481 /deep/.el-tabs__item { 502 /deep/.el-tabs__item {
482 color: #CEF8FF !important; 503 color: #CEF8FF !important;
483 504
...@@ -516,6 +537,7 @@ export default { ...@@ -516,6 +537,7 @@ export default {
516 .editDialogBox-box { 537 .editDialogBox-box {
517 position: relative; 538 position: relative;
518 top: 10px; 539 top: 10px;
540 height: 100%;
519 } 541 }
520 542
521 .dialog-from { 543 .dialog-from {
...@@ -546,7 +568,7 @@ export default { ...@@ -546,7 +568,7 @@ export default {
546 } 568 }
547 569
548 &_title { 570 &_title {
549 font-size: 18px; 571 font-size: 14px;
550 color: #d7eaee; 572 color: #d7eaee;
551 margin: 3px 0; 573 margin: 3px 0;
552 } 574 }
......