Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
31f1976e by 杨威
Options

Merge remote-tracking branch 'origin/master' into master

2 parents 7eae6d9f efdcf9bc
Inline Side-by-side
Showing 14 changed files with 38 additions and 38 deletions
...@@ -111,7 +111,7 @@ ol, ul { list-style:none; } ...@@ -111,7 +111,7 @@ ol, ul { list-style:none; }
111 z-index: 999; 111 z-index: 999;
112 width: 100%; 112 width: 100%;
113 margin-bottom: 0; 113 margin-bottom: 0;
114 border-top: 1px solid #EAEDF5; 114 border-top: 1px solid #F4F9FF;
115 // >.is-top>.el-tabs__nav-scroll{ 115 // >.is-top>.el-tabs__nav-scroll{
116 // height: 50px; 116 // height: 50px;
117 // background-color: #ffffff; 117 // background-color: #ffffff;
......
...@@ -743,8 +743,8 @@ ...@@ -743,8 +743,8 @@
743 height: 100%; 743 height: 100%;
744 box-sizing: border-box; 744 box-sizing: border-box;
745 padding:20px; 745 padding:20px;
746 //background-color: #eaedf5; 746 //background-color: #F4F9FF;
747 background-color: #EAEDF5; 747 background-color: #F4F9FF;
748 .box{ 748 .box{
749 background-color: white; 749 background-color: white;
750 padding: 10px 0; 750 padding: 10px 0;
...@@ -873,7 +873,7 @@ ...@@ -873,7 +873,7 @@
873 } 873 }
874 } 874 }
875 /*.main { 875 /*.main {
876 background-color: #eaedf5; 876 background-color: #F4F9FF;
877 877
878 }*/ 878 }*/
879 </style> 879 </style>
......
...@@ -594,8 +594,8 @@ export default { ...@@ -594,8 +594,8 @@ export default {
594 } 594 }
595 595
596 .el-main { 596 .el-main {
597 //background-color: #eaedf5; 597 //background-color: #F4F9FF;
598 background-color: #E7EBF6; 598 background-color: #F4F9FF;
599 color: #333; 599 color: #333;
600 // text-align: center; 600 // text-align: center;
601 // line-height: 160px; 601 // line-height: 160px;
......
...@@ -196,8 +196,8 @@ ...@@ -196,8 +196,8 @@
196 /deep/.el-tab-pane{ 196 /deep/.el-tab-pane{
197 height: 100%; 197 height: 100%;
198 } 198 }
199 //background: #eaedf5; 199 //background: #F4F9FF;
200 background-color: #EAEDF5; 200 background-color: #F4F9FF;
201 padding: 0; 201 padding: 0;
202 } 202 }
203 /deep/ .el-tabs__item { 203 /deep/ .el-tabs__item {
...@@ -214,8 +214,8 @@ ...@@ -214,8 +214,8 @@
214 padding: 0 18px 0 0; 214 padding: 0 18px 0 0;
215 display: flex; 215 display: flex;
216 flex-direction: column; 216 flex-direction: column;
217 //background-color: #eaedf5; 217 //background-color: #F4F9FF;
218 background-color: #EAEDF5; 218 background-color: #F4F9FF;
219 .tips{ 219 .tips{
220 color: #9B9B9B; 220 color: #9B9B9B;
221 margin-left: 2px; 221 margin-left: 2px;
......
...@@ -79,8 +79,8 @@ ...@@ -79,8 +79,8 @@
79 /deep/.el-tab-pane{ 79 /deep/.el-tab-pane{
80 height: 100%; 80 height: 100%;
81 } 81 }
82 //background: #eaedf5; 82 //background: #F4F9FF;
83 background-color: #EAEDF5; 83 background-color: #F4F9FF;
84 padding: 0; 84 padding: 0;
85 } 85 }
86 /deep/ .el-tabs__item { 86 /deep/ .el-tabs__item {
...@@ -98,8 +98,8 @@ ...@@ -98,8 +98,8 @@
98 padding: 0 18px 0 0; 98 padding: 0 18px 0 0;
99 display: flex; 99 display: flex;
100 flex-direction: column; 100 flex-direction: column;
101 //background-color: #eaedf5; 101 //background-color: #F4F9FF;
102 background-color: #EAEDF5; 102 background-color: #F4F9FF;
103 .tips{ 103 .tips{
104 color: #9B9B9B; 104 color: #9B9B9B;
105 margin-left: 2px; 105 margin-left: 2px;
......
...@@ -70,8 +70,8 @@ ...@@ -70,8 +70,8 @@
70 /deep/.el-tab-pane{ 70 /deep/.el-tab-pane{
71 height: 100%; 71 height: 100%;
72 } 72 }
73 //background: #eaedf5; 73 //background: #F4F9FF;
74 background-color: #EAEDF5; 74 background-color: #F4F9FF;
75 padding: 0; 75 padding: 0;
76 } 76 }
77 /deep/ .el-tabs__item { 77 /deep/ .el-tabs__item {
......
...@@ -39,8 +39,8 @@ ...@@ -39,8 +39,8 @@
39 /deep/.el-tab-pane{ 39 /deep/.el-tab-pane{
40 height: 100%; 40 height: 100%;
41 } 41 }
42 //background: #eaedf5; 42 //background: #F4F9FF;
43 background-color: #EAEDF5; 43 background-color: #F4F9FF;
44 } 44 }
45 /deep/ .el-tabs__item { 45 /deep/ .el-tabs__item {
46 height: 48px; 46 height: 48px;
......
...@@ -170,8 +170,8 @@ ...@@ -170,8 +170,8 @@
170 /deep/.el-tab-pane{ 170 /deep/.el-tab-pane{
171 height: 100%; 171 height: 100%;
172 } 172 }
173 //background: #eaedf5; 173 //background: #F4F9FF;
174 background-color: #EAEDF5; 174 background-color: #F4F9FF;
175 padding: 0; 175 padding: 0;
176 } 176 }
177 /deep/ .el-tabs__item { 177 /deep/ .el-tabs__item {
...@@ -187,8 +187,8 @@ ...@@ -187,8 +187,8 @@
187 padding: 0 18px; 187 padding: 0 18px;
188 display: flex; 188 display: flex;
189 flex-direction: column; 189 flex-direction: column;
190 //background-color: #eaedf5; 190 //background-color: #F4F9FF;
191 background-color: #EAEDF5; 191 background-color: #F4F9FF;
192 .tips{ 192 .tips{
193 color: #9B9B9B; 193 color: #9B9B9B;
194 margin-left: 2px; 194 margin-left: 2px;
......
...@@ -77,8 +77,8 @@ export default { ...@@ -77,8 +77,8 @@ export default {
77 /deep/.el-tab-pane{ 77 /deep/.el-tab-pane{
78 height: calc(100% - 40px); 78 height: calc(100% - 40px);
79 } 79 }
80 //background: #eaedf5; 80 //background: #F4F9FF;
81 background-color: #EAEDF5; 81 background-color: #F4F9FF;
82 padding: 0; 82 padding: 0;
83 } 83 }
84 /deep/ .el-tabs__item { 84 /deep/ .el-tabs__item {
......
...@@ -250,8 +250,8 @@ ...@@ -250,8 +250,8 @@
250 /deep/.el-tab-pane{ 250 /deep/.el-tab-pane{
251 height: 100%; 251 height: 100%;
252 } 252 }
253 //background: #eaedf5; 253 //background: #F4F9FF;
254 background-color: #EAEDF5; 254 background-color: #F4F9FF;
255 padding: 0; 255 padding: 0;
256 } 256 }
257 /deep/ .el-tabs__item { 257 /deep/ .el-tabs__item {
...@@ -267,8 +267,8 @@ ...@@ -267,8 +267,8 @@
267 padding: 0 18px; 267 padding: 0 18px;
268 display: flex; 268 display: flex;
269 flex-direction: column; 269 flex-direction: column;
270 //background-color: #eaedf5; 270 //background-color: #F4F9FF;
271 background-color: #E7EBF6; 271 background-color: #F4F9FF;
272 .tips{ 272 .tips{
273 color: #9B9B9B; 273 color: #9B9B9B;
274 margin-left: 2px; 274 margin-left: 2px;
......
...@@ -200,8 +200,8 @@ ...@@ -200,8 +200,8 @@
200 /deep/.el-tab-pane{ 200 /deep/.el-tab-pane{
201 height: 100%; 201 height: 100%;
202 } 202 }
203 //background: #eaedf5; 203 //background: #F4F9FF;
204 background-color: #EAEDF5; 204 background-color: #F4F9FF;
205 padding: 0; 205 padding: 0;
206 } 206 }
207 /deep/ .el-tabs__item { 207 /deep/ .el-tabs__item {
...@@ -217,8 +217,8 @@ ...@@ -217,8 +217,8 @@
217 padding: 0 18px 0 0; 217 padding: 0 18px 0 0;
218 display: flex; 218 display: flex;
219 flex-direction: column; 219 flex-direction: column;
220 //background-color: #eaedf5; 220 //background-color: #F4F9FF;
221 background-color: #EAEDF5; 221 background-color: #F4F9FF;
222 .tips{ 222 .tips{
223 color: #9B9B9B; 223 color: #9B9B9B;
224 margin-left: 2px; 224 margin-left: 2px;
......
...@@ -110,8 +110,8 @@ export default { ...@@ -110,8 +110,8 @@ export default {
110 /deep/.el-tab-pane{ 110 /deep/.el-tab-pane{
111 height: 100%; 111 height: 100%;
112 } 112 }
113 //background: #eaedf5; 113 //background: #F4F9FF;
114 background-color: #EAEDF5; 114 background-color: #F4F9FF;
115 padding: 0; 115 padding: 0;
116 } 116 }
117 /deep/ .el-tabs__item { 117 /deep/ .el-tabs__item {
......
...@@ -97,8 +97,8 @@ export default { ...@@ -97,8 +97,8 @@ export default {
97 /deep/.el-tab-pane{ 97 /deep/.el-tab-pane{
98 height: 100%; 98 height: 100%;
99 } 99 }
100 //background: #eaedf5; 100 //background: #F4F9FF;
101 background-color: #EAEDF5; 101 background-color: #F4F9FF;
102 padding: 0; 102 padding: 0;
103 } 103 }
104 /deep/ .el-tabs__item { 104 /deep/ .el-tabs__item {
......
...@@ -858,8 +858,8 @@ export default { ...@@ -858,8 +858,8 @@ export default {
858 <style scoped lang="less"> 858 <style scoped lang="less">
859 .edit { 859 .edit {
860 height: 100%; 860 height: 100%;
861 //background-color: #eaedf5; 861 //background-color: #F4F9FF;
862 background-color: #EAEDF5; 862 background-color: #F4F9FF;
863 .tab-header { 863 .tab-header {
864 border: 1px solid #dedede; 864 border: 1px solid #dedede;
865 box-sizing: border-box; 865 box-sizing: border-box;
......