Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
e5afeaf9 by 任超
Options

style:区县接入样式修改

1 parent 714ee923
Inline Side-by-side
Showing 7 changed files with 87 additions and 101 deletions
...@@ -106,11 +106,8 @@ html { ...@@ -106,11 +106,8 @@ html {
106 padding: 0px !important; 106 padding: 0px !important;
107 } 107 }
108 108
109 .padding-content {
110 padding: 4px 0;
111 }
112
113 a:focus, 109 a:focus,
110 div:focus,
114 a:active { 111 a:active {
115 outline: none; 112 outline: none;
116 } 113 }
...@@ -127,20 +124,20 @@ ul li { ...@@ -127,20 +124,20 @@ ul li {
127 list-style: none; 124 list-style: none;
128 } 125 }
129 126
130 div:focus {
131 outline: none;
132 }
133
134 .fr { 127 .fr {
135 float: right; 128 float: right;
136 } 129 }
137 130
138 .mt15 { 131 .fl {
132 float: left;
133 }
134
135 .mt-15 {
139 margin-top: 15px; 136 margin-top: 15px;
140 } 137 }
141 138
142 .fl { 139 .mb-5 {
143 float: left; 140 margin-bottom: 5px;
144 } 141 }
145 142
146 .pr-5 { 143 .pr-5 {
...@@ -155,7 +152,7 @@ div:focus { ...@@ -155,7 +152,7 @@ div:focus {
155 margin-top: 10px; 152 margin-top: 10px;
156 } 153 }
157 154
158 //flex 155 //flex 公共样式
159 .d-flex { 156 .d-flex {
160 display: flex; 157 display: flex;
161 } 158 }
...@@ -171,9 +168,6 @@ div:focus { ...@@ -171,9 +168,6 @@ div:focus {
171 justify-content: center; 168 justify-content: center;
172 } 169 }
173 170
174 .bg-color-blue {
175 background-color: #1a5cd7;
176 }
177 171
178 .jc-between { 172 .jc-between {
179 justify-content: space-between; 173 justify-content: space-between;
...@@ -192,13 +186,6 @@ div:focus { ...@@ -192,13 +186,6 @@ div:focus {
192 font-size: 24px; 186 font-size: 24px;
193 } 187 }
194 188
195 .inlineBlock {
196 display: block;
197 }
198
199 .marginbtm5 {
200 margin-bottom: 5px !important;
201 }
202 189
203 .clearfix { 190 .clearfix {
204 &:after { 191 &:after {
...@@ -235,23 +222,6 @@ aside { ...@@ -235,23 +222,6 @@ aside {
235 } 222 }
236 223
237 //main-container全局样式 224 //main-container全局样式
238 .app-container {
239 padding: 20px;
240 }
241
242 .components-container {
243 margin: 30px 50px;
244 position: relative;
245 }
246
247 .pagination-container {
248 margin-top: 30px;
249 }
250
251 .text-center {
252 text-align: center
253 }
254
255 .width100 { 225 .width100 {
256 width: 100% !important; 226 width: 100% !important;
257 } 227 }
...@@ -366,14 +336,15 @@ aside { ...@@ -366,14 +336,15 @@ aside {
366 color: $yellow; 336 color: $yellow;
367 } 337 }
368 338
369 // 通过 入库 339 // 通过 入库 样式
370 .adopt { 340 .adopt,
341 .success {
371 color: #00FAA8; 342 color: #00FAA8;
372 position: relative; 343 position: relative;
373 } 344 }
374 345
375 .warehousing { 346 .warehousing {
376 color: #FF9933; 347 color: #FFCA57;
377 position: relative; 348 position: relative;
378 } 349 }
379 350
...@@ -382,39 +353,54 @@ aside { ...@@ -382,39 +353,54 @@ aside {
382 position: absolute; 353 position: absolute;
383 content: ''; 354 content: '';
384 display: block; 355 display: block;
385 width: 10px; 356 width: 8px;
386 height: 10px; 357 height: 8px;
387 left: -15px; 358 left: -15px;
388 top: 3px; 359 top: 5px;
389 background: #00FAA8; 360 background: #00FAA8;
390 border-radius: 50%; 361 border-radius: 50%;
391 border: 2px solid rgba(0, 0, 0, 0.6); 362 border: 2px solid rgba(0, 0, 0, 0.2);
392 } 363 }
393 364
394 .warehousing::before { 365 .warehousing::before {
395 position: absolute; 366 position: absolute;
396 content: ''; 367 content: '';
397 display: block; 368 display: block;
398 width: 10px; 369 width: 8px;
399 height: 10px; 370 height: 8px;
400 left: -15px; 371 left: -15px;
401 top: 3px; 372 top: 4px;
402 background: #FF9933; 373 background: #FF9933;
403 border-radius: 50%; 374 border-radius: 50%;
404 border: 2px solid rgba(0, 0, 0, 0.6); 375 border: 2px solid rgba(0, 0, 0, 0.2);
405 } 376 }
406 377
407 //错误日志样式 后期超优化 378 // 成功 失败
408 .item-cwnr { 379 .success::before {
409 white-space: pre-wrap; 380 position: absolute;
410 display: -webkit-box; 381 content: '√';
411 overflow: hidden; 382 display: block;
412 text-overflow: ellipsis; 383 width: 0;
413 overflow-wrap: break-word; 384 height: 8px;
414 -webkit-line-clamp: 3; 385 left: -10px;
415 -webkit-box-orient: vertical; 386 top: 1px;
387 background: #00FAA8;
388 color: #00FAA8;
389 }
390
391 .fail {
392 color: #FF7962;
393 position: relative;
416 } 394 }
417 395
418 .item-cwnr img { 396 .fail::before {
419 height: 30px; 397 position: absolute;
398 content: '!';
399 display: block;
400 width: 0;
401 height: 8px;
402 left: -10px;
403 top: 1px;
404 background: #FF7962;
405 color: #FF7962;
420 } 406 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 <!-- 头部搜索 --> 4 <!-- 头部搜索 -->
5 <div class="from-clues-header"> 5 <div class="from-clues-header">
6 <el-form ref="ruleForm" :model="form" label-width="100px"> 6 <el-form ref="ruleForm" :model="form" label-width="100px">
7 <el-row class="marginbtm5"> 7 <el-row class="mb-5">
8 <el-col :span="6"> 8 <el-col :span="6">
9 <el-form-item label="行政区" prop="pcode"> 9 <el-form-item label="行政区" prop="pcode">
10 <el-select v-model="form.pcode" class="width100" clearable placeholder="行政区"> 10 <el-select v-model="form.pcode" class="width100" clearable placeholder="行政区">
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
21 </div> 21 </div>
22 </div> 22 </div>
23 </div> 23 </div>
24 <div class="card mt15"> 24 <div class="card mt-15">
25 <div class="cardhead">省厅汇交</div> 25 <div class="cardhead">省厅汇交</div>
26 <div class="cardcontent"> 26 <div class="cardcontent">
27 <ul class="cardcontent-left d-center"> 27 <ul class="cardcontent-left d-center">
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
42 </div> 42 </div>
43 </div> 43 </div>
44 </div> 44 </div>
45 <div class="card1 mt15"> 45 <div class="card1 mt-15">
46 <div class="cardhead">各区县数据上报统计</div> 46 <div class="cardhead">各区县数据上报统计</div>
47 <columnar /> 47 <columnar />
48 </div> 48 </div>
......
...@@ -3,9 +3,41 @@ class data extends filter { ...@@ -3,9 +3,41 @@ class data extends filter {
3 constructor() { 3 constructor() {
4 super() 4 super()
5 } 5 }
6 columns() { 6 columns () {
7 return [ 7 return [
8 { 8 {
9 prop: 'jcjg',
10 label: '检查结果',
11 width: 100,
12 render: (h, scope) => {
13 return (
14 <div>
15 {
16 scope.row.receiveState
17 ? <span class='adopt'>通过</span>
18 : <span class='warehousing'>不通过</span>
19 }
20 </div>
21 )
22 }
23 },
24 {
25 prop: 'rkjg',
26 label: '入库结果',
27 width: 100,
28 render: (h, scope) => {
29 return (
30 <div>
31 {
32 scope.row.storageState
33 ? <span class='success'>成功</span>
34 : <span class='fail'>失败</span>
35 }
36 </div>
37 )
38 }
39 },
40 {
9 prop: "areacode", 41 prop: "areacode",
10 label: "行政区代码", 42 label: "行政区代码",
11 width: 100, 43 width: 100,
...@@ -43,39 +75,7 @@ class data extends filter { ...@@ -43,39 +75,7 @@ class data extends filter {
43 { 75 {
44 prop: "createdate", 76 prop: "createdate",
45 label: "接收时间", 77 label: "接收时间",
46 }, 78 }
47 {
48 prop: 'jcjg',
49 label: '检查结果',
50 width: 100,
51 render: (h, scope) => {
52 return (
53 <div>
54 {
55 scope.row.receiveState
56 ? <span class='adopt'>通过</span>
57 : <span>通过1</span>
58 }
59 </div>
60 )
61 }
62 },
63 {
64 prop: 'rkjg',
65 label: '入库结果',
66 width: 100,
67 render: (h, scope) => {
68 return (
69 <div>
70 {
71 scope.row.storageState
72 ? <span class='warehousing'>入库</span>
73 : <span>入库1</span>
74 }
75 </div>
76 )
77 }
78 },
79 ] 79 ]
80 } 80 }
81 } 81 }
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 <!-- 头部搜索 --> 4 <!-- 头部搜索 -->
5 <div class="from-clues-header"> 5 <div class="from-clues-header">
6 <el-form ref="ruleForm" :model="form" label-width="100px"> 6 <el-form ref="ruleForm" :model="form" label-width="100px">
7 <el-row class="marginbtm5"> 7 <el-row class="mb-5">
8 <el-col :span="6"> 8 <el-col :span="6">
9 <el-form-item label="行政区" prop="pcode"> 9 <el-form-item label="行政区" prop="pcode">
10 <el-select v-model="form.pcode" class="width100" clearable placeholder="行政区"> 10 <el-select v-model="form.pcode" class="width100" clearable placeholder="行政区">
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 <!-- 头部搜索 --> 4 <!-- 头部搜索 -->
5 <div class="from-clues-header"> 5 <div class="from-clues-header">
6 <el-form ref="ruleForm" :model="form" label-width="55px"> 6 <el-form ref="ruleForm" :model="form" label-width="55px">
7 <el-row class="marginbtm5"> 7 <el-row class="mb-5">
8 <el-col :span="6"> 8 <el-col :span="6">
9 <el-form-item label="行政区" prop="pcode"> 9 <el-form-item label="行政区" prop="pcode">
10 <el-select v-model="form.pcode" class="width100" clearable placeholder="行政区"> 10 <el-select v-model="form.pcode" class="width100" clearable placeholder="行政区">
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 <!-- 头部搜索 --> 4 <!-- 头部搜索 -->
5 <div class="from-clues-header"> 5 <div class="from-clues-header">
6 <el-form ref="ruleForm" :model="form" label-width="100px"> 6 <el-form ref="ruleForm" :model="form" label-width="100px">
7 <el-row class="marginbtm5"> 7 <el-row class="mb-5">
8 <el-col :span="6"> 8 <el-col :span="6">
9 <el-form-item label="行政区" prop="pcode"> 9 <el-form-item label="行政区" prop="pcode">
10 <el-select v-model="form.pcode" class="width100" clearable placeholder="行政区"> 10 <el-select v-model="form.pcode" class="width100" clearable placeholder="行政区">
......