Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
6920a538 by 田浩浩
Options

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

2 parents ffc9918e 0c4daae8
Expand all
Inline Side-by-side
Showing 7 changed files with 58 additions and 145 deletions
...@@ -109,7 +109,7 @@ export default { ...@@ -109,7 +109,7 @@ export default {
109 </script> 109 </script>
110 <style rel="stylesheet/scss" lang="scss" > 110 <style rel="stylesheet/scss" lang="scss" >
111 @import "~@/styles/mixin.scss"; 111 @import "~@/styles/mixin.scss";
112 @import "./dialogBox.scss"; 112 @import "~@/styles/dialogBox.scss";
113 </style> 113 </style>
114 <style rel="stylesheet/scss" scoped lang="scss" > 114 <style rel="stylesheet/scss" scoped lang="scss" >
115 /deep/.is-fullscreen { 115 /deep/.is-fullscreen {
......
1 .dialogBox {
2 border-radius: 8px;
3 overflow: hidden;
4 background: #FFFFFF;
5 box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.10);
6
7 .dialog_title {
8 display: flex;
9 position: relative;
10 top: -2px;
11
12 b {
13 @include flex-center;
14 flex: 1;
15 width: 100%;
16 }
17 }
18
19 .dialog_full {
20 position: absolute;
21 top: 0;
22 right: 30px;
23 }
24
25 .el-dialog__body {
26 max-height: 88vh;
27 overflow-x: hidden;
28 overflow-y: hidden;
29 }
30
31 .dialog_footer {
32 margin-top: 8px;
33 @include flex-center;
34 }
35
36
37 }
38
39 .dialog_title {
40 @include flex;
41 justify-content: space-between;
42 width: 100%;
43 }
44
45 .el-dialog__header {
46 margin-bottom: 10px;
47 color: #4A4A4A;
48 background-color: #FCFDFD;
49 border-bottom: 1px solid #E4EBF4;
50 }
51
52 .el-dialog__body {
53 padding-top: 10px;
54 padding-bottom: 0;
55 }
56
57 .el-dialog__headerbtn .el-dialog__close {
58 color: #6B7A99 !important;
59 position: relative;
60 top: -2px;
61 }
62
63
64 .el-form-item {
65 @include flex;
66 width: 100%;
67 }
68
69 .el-dialog__wrapper {
70 width: 100%;
71 height: 100%;
72 overflow: hidden;
73 }
74
75 .contentCenter {
76 position: absolute;
77 top: 50%;
78 left: 50%;
79 transform: translate(calc(-50% + 85px), -50%);
80 }
81
82 .mainCenter {
83 position: absolute;
84 top: 50%;
85 left: 50%;
86 transform: translate(-50%, -50%);
87 }
...\ No newline at end of file ...\ No newline at end of file
...@@ -109,7 +109,7 @@ export default { ...@@ -109,7 +109,7 @@ export default {
109 </script> 109 </script>
110 <style rel="stylesheet/scss" lang="scss" > 110 <style rel="stylesheet/scss" lang="scss" >
111 @import "~@/styles/mixin.scss"; 111 @import "~@/styles/mixin.scss";
112 @import "./dialogBox.scss"; 112 @import "~@/styles/dialogBox.scss";
113 </style> 113 </style>
114 <style rel="stylesheet/scss" scoped lang="scss" > 114 <style rel="stylesheet/scss" scoped lang="scss" >
115 /deep/.is-fullscreen { 115 /deep/.is-fullscreen {
......
1 .dialogBox { 1 .dialogBox {
2 border-radius: 8px; 2 border-radius: 8px;
3 overflow: hidden; 3 overflow: hidden;
4 background: #FFFFFF; 4 background: #FFFFFF;
5 box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.10); 5 box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.10);
6
7 .dialog_title {
8 display: flex;
9 position: relative;
10 top: -2px;
11
12 b {
13 @include flex-center;
14 flex: 1;
15 width: 100%;
16 }
17 }
18 6
19 .dialog_full { 7 .dialog_title {
20 position: absolute; 8 display: flex;
21 top: 0; 9 position: relative;
22 right: 30px; 10 top: -2px;
23 }
24 11
25 .el-dialog__body { 12 b {
26 max-height: 88vh; 13 @include flex-center;
27 overflow-x: hidden; 14 flex: 1;
28 overflow-y: hidden; 15 width: 100%;
29 } 16 }
17 }
30 18
31 .dialog_footer { 19 .dialog_full {
32 margin-top: 8px; 20 position: absolute;
33 @include flex-center; 21 top: 0;
34 } 22 right: 30px;
23 }
24
25 .el-dialog__body {
26 max-height: 88vh;
27 overflow-x: hidden;
28 overflow-y: hidden;
29 }
30
31 .dialog_footer {
32 margin-top: 8px;
33 @include flex-center;
34 }
35 35
36 36
37 } 37 }
38 38
39 .dialog_title { 39 .dialog_title {
40 @include flex; 40 @include flex;
41 justify-content: space-between; 41 justify-content: space-between;
42 width: 100%; 42 width: 100%;
43 } 43 }
44 44
45 .el-dialog__header { 45 .el-dialog__header {
46 margin-bottom: 10px; 46 margin-bottom: 10px;
47 color: #4A4A4A; 47 color: #4A4A4A;
48 background-color: #FCFDFD; 48 background-color: #FCFDFD;
49 border-bottom: 1px solid #E4EBF4; 49 border-bottom: 1px solid #E4EBF4;
50 } 50 }
51 51
52 .el-dialog__body { 52 .el-dialog__body {
53 padding-top: 10px; 53 padding-top: 10px;
54 padding-bottom: 0; 54 padding-bottom: 0;
55 } 55 }
56 56
57 .el-dialog__headerbtn .el-dialog__close { 57 .el-dialog__headerbtn .el-dialog__close {
58 color: #6B7A99 !important; 58 color: #6B7A99 !important;
59 position: relative; 59 position: relative;
60 top: -2px; 60 top: -2px;
61 } 61 }
62 62
63 63
64 .el-form-item { 64 .el-form-item {
65 @include flex; 65 @include flex;
66 width: 100%; 66 width: 100%;
67 } 67 }
68 68
69 .el-dialog__wrapper { 69 .el-dialog__wrapper {
70 width: 100%; 70 width: 100%;
71 height: 100%; 71 height: 100%;
72 overflow: hidden; 72 overflow: hidden;
73 } 73 }
74 74
75 .contentCenter { 75 .contentCenter {
76 position: absolute; 76 position: absolute;
77 top: 50%; 77 top: 50%;
78 left: 50%; 78 left: 50%;
79 transform: translate(calc(-50% + 85px), -50%); 79 transform: translate(calc(-50% + 85px), -50%);
80 } 80 }
81 81
82 .mainCenter { 82 .mainCenter {
83 position: absolute; 83 position: absolute;
84 top: 50%; 84 top: 50%;
85 left: 50%; 85 left: 50%;
86 transform: translate(-50%, -50%); 86 transform: translate(-50%, -50%);
87 } 87 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
93 <i class="el-icon-s-unfold pointer"></i> 93 <i class="el-icon-s-unfold pointer"></i>
94 </div> 94 </div>
95 <ul> 95 <ul>
96 <li v-for="(item, index) in doneList" :key="index" class="flexst dynamicInfo"> 96 <li v-for="(item, index) in doneList.slice(0, 10)" :key="index" class="flexst dynamicInfo">
97 <p class="right15">{{ item.dealTime.substring(0, 10) }}</p> 97 <p class="right15">{{ item.dealTime.substring(0, 10) }}</p>
98 <p class="list-title">{{ item.dealBusiness }} ({{ item.dealStep + '环节' }})</p> 98 <p class="list-title">{{ item.dealBusiness }} ({{ item.dealStep + '环节' }})</p>
99 </li> 99 </li>
......
...@@ -243,7 +243,7 @@ export default { ...@@ -243,7 +243,7 @@ export default {
243 } 243 }
244 } 244 }
245 </script> 245 </script>
246 <style lang='scss'> 246 <style lang='scss' scoped>
247 .djqxsd { 247 .djqxsd {
248 .repeat { 248 .repeat {
249 .el-input__inner { 249 .el-input__inner {
......