Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
6ea2c27b by xiaomiao
Options

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

2 parents 3a39fb9a aac942ab
Inline Side-by-side
Showing 1 changed file with 54 additions and 9 deletions
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
40 .xxTable { 40 .xxTable {
41 //border-spacing: 1px; 41 //border-spacing: 1px;
42 width: 100%; 42 width: 100%;
43 border-collapse: collapse;
43 // table-layout: fixed; 44 // table-layout: fixed;
44 45
45 tr { 46 tr {
...@@ -59,12 +60,34 @@ ...@@ -59,12 +60,34 @@
59 top: 0px; 60 top: 0px;
60 z-index: 3; 61 z-index: 3;
61 margin-top: -2px; 62 margin-top: -2px;
63 &:after{
64 content: "";
65 display: inline-block;
66 width: 100%;
67 height: 2px;
68 background-color: rgb(227, 226, 226);
69 position: absolute;
70 bottom: -1px;
71 left: 0;
72 z-index: 3;
73 }
62 } 74 }
63 75
64 tr:nth-child(2) { 76 tr:nth-child(2) {
65 position: sticky; 77 position: sticky;
66 top: 40px; 78 top: 40px;
67 z-index: 3; 79 z-index: 3;
80 &:after{
81 content: "";
82 display: inline-block;
83 width: 100%;
84 height: 2px;
85 background-color: rgb(227, 226, 226);
86 position: absolute;
87 bottom: -1px;
88 left: 0;
89 z-index: 3;
90 }
68 } 91 }
69 92
70 tr:nth-child(3) { 93 tr:nth-child(3) {
...@@ -79,6 +102,28 @@ ...@@ -79,6 +102,28 @@
79 left: 0; 102 left: 0;
80 z-index: 2; 103 z-index: 2;
81 margin-left: -2px; 104 margin-left: -2px;
105 &:before{
106 content: "";
107 display: inline-block;
108 width: 2px;
109 height: 43px;
110 background-color: #e3e2e2;
111 position: absolute;
112 top: 0;
113 left: -2px;
114 z-index: 3;
115 }
116 &:after{
117 content: "";
118 display: inline-block;
119 width: 2px;
120 height: 43px;
121 background-color: #e3e2e2;
122 position: absolute;
123 top: 0;
124 right: -2px;
125 z-index: 3;
126 }
82 } 127 }
83 128
84 th.linshi, 129 th.linshi,
...@@ -166,27 +211,27 @@ ...@@ -166,27 +211,27 @@
166 211
167 212
168 tr { 213 tr {
169 display: flex; 214 // display: flex;
170 } 215 }
171 216
172 tr td { 217 tr td {
173 border: 1px solid rgb(227, 226, 226); 218 border: 2px solid rgb(227, 226, 226);
174 text-align: center; 219 text-align: center;
175 height: 40px; 220 height: 40px;
176 font-size: 13px; 221 font-size: 13px;
177 width: 140px; 222 width: 140px;
178 flex: 1; 223 // flex: 1;
179 width: 100%; 224 width: 100%;
180 display: flex; 225 // display: flex;
181 align-items: center; 226 // align-items: center;
182 justify-content: center; 227 // justify-content: center;
183 min-width: 360px; 228 min-width: 340px;
184 z-index: 1; 229 z-index: 1;
185 } 230 }
186 td:first-child{ 231 td:first-child{
187 flex: inherit !important; 232 flex: inherit !important;
188 width: 200px !important; 233 // width: 200px !important;
189 min-width: auto !important; 234 min-width: 180px !important;
190 } 235 }
191 >tr:nth-child(odd) td { 236 >tr:nth-child(odd) td {
192 background: #f2f2f2; 237 background: #f2f2f2;
......