Skip to content

9
912project
提交 f3ec1475 authored 作者: zax's avatar zax
浏览文件
操作

合并分支 'zax' 到 'master'

单位管理和产品管理分页样式修改 查看合并请求 !18
上级 e0015a46 ef8b0ab3
隐藏空白字符变更
内嵌 并排
正在显示 包含 23 行增加 和 353 行删除
src/components/admittance/company/company.css deleted 100644 → 0
浏览文件 @ e0015a46
.role{
background: #ebf0f8;
width: 100%;
}
.role .content{
margin: 40px;
height: 841px;
background: #fff;
overflow: hidden;
}
.role .content .title{
padding: 30px 0 0 60px;
font-size: 20px;
color: #233b6e;
}
.role .content .search{
position: relative;
margin-top: 36px;
padding: 0px 70px 0px 70px;
display: flex;
}
.role .content .searchVal{
width: 280px;
display: flex;
font-size: 18px;
color: #4663a6;
}
.role .content .searchVal>span{
width: 140px;
display: inline-block;
line-height: 34px;
}
.role .content .change{
color: #4877e6;
cursor: pointer;
}
.role .content .change>img{
margin-right: 3px;
}
.role .content .common-table{
box-shadow: 4px 4px 5px rgba(72,119,230,0.1);
border: .5px solid transparent;
border-radius: 10px;
}
.role>>>.el-input__inner{
border: 1px solid rgba(8,104,157,.3);
border-radius: 2px;
font-size: 18px;
color: #999;
height: 34px;
line-height: 34px;
width: 180px;
}
.role .content .button{
display: inline-block;
width: 100px;
height: 34px;
line-height: 34px;
text-align: center;
background: #4877e6;
cursor: pointer;
margin-left: 35px;
border-radius: 2px;
color: #fff;
font-size: 18px;
}
.role .content .button:hover{
background: rgba(72,119,230,.6);
}
.role .content .import{
position: absolute;
right: 70px;
}
.add{
position: absolute;
right: 220px;
}
.role .content .common-table{
margin: 24px 70px 0 70px;
}
.role .content .common-table>>>.el-table th > .cell{
font-size: 18px;
color: #333;
font-weight: normal;
}
.role .content .common-table>>>.el-table th.is-leaf{
height: 70px;
}
.role .content .common-table>>>.el-table tr{
font-size: 18px;
}
.role .content .common-table>>>.el-table{
color: #233b6e;
}
.role .content .common-table>>>.el-table--striped .el-table__body tr.el-table__row--striped.el-table__row--striped.el-table__row--striped td {
background-color: #fff;
}
.role .content .common-table>>>.el-table--enable-row-hover .el-table__body tr:hover>td{
background-color: #f5f8fd;
}
.role .content .common-table>>>.el-table th.is-leaf, .el-table td {
border-bottom: 1px solid #d5e3ff;
}
.role .content .common-table>>>.el-table__body tr, .el-table__body td {
padding: 0;
height: 60px;
background: #f5f8fd;
}
.role .content .block{
text-align: right;
padding: 30px 70px 0 0;
}
.role .content>>>.el-pagination.is-background .el-pager li{
background-image: linear-gradient(to bottom, #c5d5f7,#7a95e6);
color: #fff;
}
.role .content>>>.el-pagination.is-background .el-pager li:not(.disabled).active{
background-image: linear-gradient(to bottom, #7a9eeb,#274acf);
color: #fff;
}
.role .content>>>.el-table td{
border-bottom: 1px solid #d5e3ff;
}
.role .content>>>.btn-prev,.role .content>>>.btn-next{
background: #c5d5f7;
background-image: linear-gradient(to bottom, #c5d5f7,#7a95e6);
color: #fff;
}
.role .content>>>.btn-prev:disabled,.dynamicList .content>>>.btn-next:disabled{
color: #C0C4CC;
}
.role .content>>>.el-table__body tr.current-row > td{
background: #f5f8fd;
}
\ No newline at end of file
src/components/admittance/company/company.vue
浏览文件 @ f3ec1475
...@@ -96,7 +96,6 @@ ...@@ -96,7 +96,6 @@
<script> <script>
import newCompany from './newCompany'; import newCompany from './newCompany';
import './company.css'
export default { export default {
data () { data () {
return { return {
...@@ -346,36 +345,12 @@ export default { ...@@ -346,36 +345,12 @@ export default {
text-align: right; text-align: right;
padding: 30px 70px 0 0; padding: 30px 70px 0 0;
} }
.company .content>>>.el-pagination.is-background .el-pager li{
background-image: linear-gradient(to bottom, #c5d5f7,#7a95e6);
color: #fff;
}
.company .content>>>.el-pagination.is-background .el-pager li:not(.disabled).active{
background-image: linear-gradient(to bottom, #7a9eeb,#274acf);
color: #fff;
}
.company .content>>>.el-table td{ .company .content>>>.el-table td{
border-bottom: 1px solid #d5e3ff; border-bottom: 1px solid #d5e3ff;
} }
.company .content>>>.btn-prev,.role .content>>>.btn-next{
background: #c5d5f7;
background-image: linear-gradient(to bottom, #c5d5f7,#7a95e6);
color: #fff;
}
.company .content>>>.btn-prev:disabled,.dynamicList .content>>>.btn-next:disabled{
color: #C0C4CC;
}
.company .content>>>.el-table__body tr.current-row > td{ .company .content>>>.el-table__body tr.current-row > td{
background: #f5f8fd; background: #f5f8fd;
} }
.company .content>>>.el-pagination.is-background .el-pager li{
background-image: linear-gradient(to bottom, #c5d5f7,#7a95e6);
color: #fff;
}
.company .content>>>.el-pagination.is-background .el-pager li:not(.disabled).active{
background-image: linear-gradient(to bottom, #7a9eeb,#274acf);
color: #fff;
}
.company .content .common-table { .company .content .common-table {
box-shadow: rgba(72, 119, 230, 0.1) 4px 4px 5px; box-shadow: rgba(72, 119, 230, 0.1) 4px 4px 5px;
border-width: 0.5px; border-width: 0.5px;
......
src/components/admittance/product/product.vue
浏览文件 @ f3ec1475
...@@ -110,9 +110,8 @@ ...@@ -110,9 +110,8 @@
</template> </template>
<script> <script>
import '../../basicInformation/company/company.css';
import newProduct from './newProduct'; import newProduct from './newProduct';
import technology from "./technology"; import technology from './technology';
export default { export default {
name: 'product', name: 'product',
data() { data() {
...@@ -146,9 +145,9 @@ export default { ...@@ -146,9 +145,9 @@ export default {
}, },
methods: { methods: {
init() { init() {
this.$server.getProduceFindAccess().then(res => { // this.$server.getProduceFindAccess().then(res => {
this.allData = res.data.data // this.allData = res.data.data
}) // })
this.$server.getTechFindAll().then(res => { // 请求技术路线 this.$server.getTechFindAll().then(res => { // 请求技术路线
this.techList = res.data.data this.techList = res.data.data
}) })
...@@ -369,25 +368,9 @@ export default { ...@@ -369,25 +368,9 @@ export default {
text-align: right; text-align: right;
padding: 30px 70px 0 0; padding: 30px 70px 0 0;
} }
.product .content>>>.el-pagination.is-background .el-pager li{
background-image: linear-gradient(to bottom, #c5d5f7,#7a95e6);
color: #fff;
}
.product .content>>>.el-pagination.is-background .el-pager li:not(.disabled).active{
background-image: linear-gradient(to bottom, #7a9eeb,#274acf);
color: #fff;
}
.product .content>>>.el-table td{ .product .content>>>.el-table td{
border-bottom: 1px solid #d5e3ff; border-bottom: 1px solid #d5e3ff;
} }
.product .content>>>.btn-prev,.product .content>>>.btn-next{
background: #c5d5f7;
background-image: linear-gradient(to bottom, #c5d5f7,#7a95e6);
color: #fff;
}
.product .content>>>.btn-prev:disabled,.dynamicList .content>>>.btn-next:disabled{
color: #C0C4CC;
}
.product .content>>>.el-table__body tr.current-row > td{ .product .content>>>.el-table__body tr.current-row > td{
background: #f5f8fd; background: #f5f8fd;
} }
......
src/components/basicInformation/company/company.css deleted 100644 → 0
浏览文件 @ e0015a46
.role{
background: #ebf0f8;
width: 100%;
}
.role .content{
margin: 40px;
height: 841px;
background: #fff;
overflow: hidden;
}
.role .content .title{
padding: 30px 0 0 60px;
font-size: 20px;
color: #233b6e;
}
.role .content .search{
position: relative;
margin-top: 36px;
padding: 0px 70px 0px 70px;
display: flex;
}
.role .content .searchVal{
width: 280px;
display: flex;
font-size: 18px;
color: #4663a6;
}
.role .content .searchVal>span{
width: 140px;
display: inline-block;
line-height: 34px;
}
.role .content .change{
color: #4877e6;
cursor: pointer;
}
.role .content .change>img{
margin-right: 3px;
}
.role .content .common-table{
box-shadow: 4px 4px 5px rgba(72,119,230,0.1);
border: .5px solid transparent;
border-radius: 10px;
}
.role>>>.el-input__inner{
border: 1px solid rgba(8,104,157,.3);
border-radius: 2px;
font-size: 18px;
color: #999;
height: 34px;
line-height: 34px;
width: 180px;
}
.role .content .button{
display: inline-block;
width: 100px;
height: 34px;
line-height: 34px;
text-align: center;
background: #4877e6;
cursor: pointer;
margin-left: 35px;
border-radius: 2px;
color: #fff;
font-size: 18px;
}
.role .content .button:hover{
background: rgba(72,119,230,.6);
}
.role .content .import{
position: absolute;
right: 70px;
}
.add{
position: absolute;
right: 220px;
}
.role .content .common-table{
margin: 24px 70px 0 70px;
}
.role .content .common-table>>>.el-table th > .cell{
font-size: 18px;
color: #333;
font-weight: normal;
}
.role .content .common-table>>>.el-table th.is-leaf{
height: 70px;
}
.role .content .common-table>>>.el-table tr{
font-size: 18px;
}
.role .content .common-table>>>.el-table{
color: #233b6e;
}
.role .content .common-table>>>.el-table--striped .el-table__body tr.el-table__row--striped.el-table__row--striped.el-table__row--striped td {
background-color: #fff;
}
.role .content .common-table>>>.el-table--enable-row-hover .el-table__body tr:hover>td{
background-color: #f5f8fd;
}
.role .content .common-table>>>.el-table th.is-leaf, .el-table td {
border-bottom: 1px solid #d5e3ff;
}
.role .content .common-table>>>.el-table__body tr, .el-table__body td {
padding: 0;
height: 60px;
background: #f5f8fd;
}
.role .content .block{
text-align: right;
padding: 30px 70px 0 0;
}
.role .content>>>.el-pagination.is-background .el-pager li{
background-image: linear-gradient(to bottom, #c5d5f7,#7a95e6);
color: #fff;
}
.role .content>>>.el-pagination.is-background .el-pager li:not(.disabled).active{
background-image: linear-gradient(to bottom, #7a9eeb,#274acf);
color: #fff;
}
.role .content>>>.el-table td{
border-bottom: 1px solid #d5e3ff;
}
.role .content>>>.btn-prev,.role .content>>>.btn-next{
background: #c5d5f7;
background-image: linear-gradient(to bottom, #c5d5f7,#7a95e6);
color: #fff;
}
.role .content>>>.btn-prev:disabled,.dynamicList .content>>>.btn-next:disabled{
color: #C0C4CC;
}
.role .content>>>.el-table__body tr.current-row > td{
background: #f5f8fd;
}
\ No newline at end of file
src/components/basicInformation/company/company.vue
浏览文件 @ f3ec1475
...@@ -96,7 +96,6 @@ ...@@ -96,7 +96,6 @@
<script> <script>
import newCompany from './newCompany'; import newCompany from './newCompany';
import './company.css'
export default { export default {
data () { data () {
return { return {
...@@ -345,25 +344,17 @@ export default { ...@@ -345,25 +344,17 @@ export default {
text-align: right; text-align: right;
padding: 30px 70px 0 0; padding: 30px 70px 0 0;
} }
.company .content>>>.el-pagination.is-background .el-pager li{
background-image: linear-gradient(to bottom, #c5d5f7,#7a95e6);
color: #fff;
}
.company .content>>>.el-pagination.is-background .el-pager li:not(.disabled).active{
background-image: linear-gradient(to bottom, #7a9eeb,#274acf);
color: #fff;
}
.company .content>>>.el-table td{ .company .content>>>.el-table td{
border-bottom: 1px solid #d5e3ff; border-bottom: 1px solid #d5e3ff;
} }
.company .content>>>.btn-prev,.role .content>>>.btn-next{ /*.company .content>>>.btn-prev,.role .content>>>.btn-next{*/
background: #c5d5f7; /* background: #c5d5f7;*/
background-image: linear-gradient(to bottom, #c5d5f7,#7a95e6); /* background-image: linear-gradient(to bottom, #c5d5f7,#7a95e6);*/
color: #fff; /* color: #fff;*/
} /*}*/
.company .content>>>.btn-prev:disabled,.dynamicList .content>>>.btn-next:disabled{ /*.company .content>>>.btn-prev:disabled,.dynamicList .content>>>.btn-next:disabled{*/
color: #C0C4CC; /* color: #C0C4CC;*/
} /*}*/
.company .content>>>.el-table__body tr.current-row > td{ .company .content>>>.el-table__body tr.current-row > td{
background: #f5f8fd; background: #f5f8fd;
} }
......
src/components/basicInformation/product/product.vue
浏览文件 @ f3ec1475
...@@ -110,7 +110,6 @@ ...@@ -110,7 +110,6 @@
</template> </template>
<script> <script>
import '../../basicInformation/company/company.css';
import newProduct from './newProduct'; import newProduct from './newProduct';
import technology from "./technology"; import technology from "./technology";
export default { export default {
...@@ -146,9 +145,9 @@ export default { ...@@ -146,9 +145,9 @@ export default {
}, },
methods: { methods: {
init() { init() {
this.$server.getProduceFindAll().then(res => { // this.$server.getProduceFindAll().then(res => {
this.allData = res.data.data // this.allData = res.data.data
}) // })
this.$server.getTechFindAll().then(res => { // 请求技术路线 this.$server.getTechFindAll().then(res => { // 请求技术路线
this.techList = res.data.data this.techList = res.data.data
}) })
...@@ -365,25 +364,17 @@ export default { ...@@ -365,25 +364,17 @@ export default {
text-align: right; text-align: right;
padding: 30px 70px 0 0; padding: 30px 70px 0 0;
} }
.product .content>>>.el-pagination.is-background .el-pager li{
background-image: linear-gradient(to bottom, #c5d5f7,#7a95e6);
color: #fff;
}
.product .content>>>.el-pagination.is-background .el-pager li:not(.disabled).active{
background-image: linear-gradient(to bottom, #7a9eeb,#274acf);
color: #fff;
}
.product .content>>>.el-table td{ .product .content>>>.el-table td{
border-bottom: 1px solid #d5e3ff; border-bottom: 1px solid #d5e3ff;
} }
.product .content>>>.btn-prev,.product .content>>>.btn-next{ /*.product .content>>>.btn-prev,.product .content>>>.btn-next{*/
background: #c5d5f7; /* background: #c5d5f7;*/
background-image: linear-gradient(to bottom, #c5d5f7,#7a95e6); /* background-image: linear-gradient(to bottom, #c5d5f7,#7a95e6);*/
color: #fff; /* color: #fff;*/
} /*}*/
.product .content>>>.btn-prev:disabled,.dynamicList .content>>>.btn-next:disabled{ /*.product .content>>>.btn-prev:disabled,.dynamicList .content>>>.btn-next:disabled{*/
color: #C0C4CC; /* color: #C0C4CC;*/
} /*}*/
.product .content>>>.el-table__body tr.current-row > td{ .product .content>>>.el-table__body tr.current-row > td{
background: #f5f8fd; background: #f5f8fd;
} }
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论