Skip to content

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

bug修复

上级 dbdc9805
隐藏空白字符变更
内嵌 并排
正在显示 包含 39 行增加 和 280 行删除
src/assets/changeElementStyle.css
浏览文件 @ fd7377a9
......@@ -133,10 +133,19 @@
.content>>>.el-table__body tr.current-row > td{
background: #f5f8fd;
}
/*input搜索*/
/*.content .search>>>.el-input__prefix{*/
/* left: 154px;*/
/*}*/
/*.content .search>>>.el-input--prefix .el-input__inner{*/
/* padding-left: 15px;*/
/*}*/
/*input输入*/
input::-webkit-input-placeholder {
color: #999;
}
input::-ms-input-placeholder {
color: #999;
}
.el-input__inner{
border: 1px solid rgba(8,104,157,.3);
border-radius: 2px;
font-size: 18px;
color: #333;
height: 34px;
line-height: 34px;
width: 180px;
}
src/components/admittance/company/company.vue
浏览文件 @ fd7377a9
......@@ -11,7 +11,7 @@
</span>
<span class="searchVal">
<span>单位类别：</span>
<el-select v-model="classVal" @change="search" placeholder="请选择">
<el-select v-model="classVal" @change="search('search')" placeholder="请选择" clearable>
<el-option
v-for="item in companyClass"
:label="typeCompany(item)"
......@@ -19,7 +19,7 @@
</el-option>
</el-select>
</span>
<span class="button searchBtn" @click="search">搜索</span>
<span class="button searchBtn" @click="search('search')">搜索</span>
</p>
<div class="common-table">
<el-table
......@@ -112,7 +112,7 @@ export default {
newCompany
},
mounted() {
this.search('page')
this.search()
},
methods: {
// 单位搜索
......@@ -136,7 +136,7 @@ export default {
'测试机构': 7,
'开发商': 8
}
if (val !== 'page') { // 点击搜索按钮，不是点击分页跳转
if (val === 'search') { // 点击搜索按钮，不是点击分页跳转
this.currentPage = 1;
message.name = this.searchName;
message.type = change[this.classVal];
......@@ -146,7 +146,6 @@ export default {
pageSize: this.pageSize,
t: message
}
this.$server.postUnitSearchAccess(data).then(res => {
this.allData = res.data.data.rows;
this.totalLength = res.data.data.total;
......@@ -161,7 +160,7 @@ export default {
// 当前页数
handleCurrentChange(val) {
this.currentPage = val;
this.search('page')
this.search();
},
// 关闭弹框
reset(val) {
......@@ -169,7 +168,7 @@ export default {
this.components = '';
this.companyName = '';
if (val) {
this.unit()
this.search();
}
},
// 获取单位名称
......@@ -229,20 +228,6 @@ export default {
.company .content .change>img{
margin-right: 3px;
}
.company .content .common-table{
box-shadow: 4px 4px 5px rgba(72,119,230,0.1);
border: .5px solid transparent;
border-radius: 10px;
}
.company>>>.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;
}
.company .content .button{
display: inline-block;
width: 100px;
......@@ -270,40 +255,6 @@ export default {
.company .searchBtn{
margin-left: 30px;
}
/*表格样式*/
.company .content .common-table{
margin: 24px 70px 0 70px;
}
.company .content .common-table>>>.el-table th > .cell{
font-size: 18px;
color: #333;
font-weight: normal;
}
.company .content .common-table>>>.el-table th.is-leaf{
height: 70px;
}
.company .content .common-table>>>.el-table tr{
font-size: 18px;
cursor: pointer;
}
.company .content .common-table>>>.el-table{
color: #233b6e;
}
.company .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;
}
.company .content .common-table>>>.el-table--enable-row-hover .el-table__body tr:hover>td{
background-color: #f5f8fd;
}
.company .content .common-table>>>.el-table th.is-leaf, .el-table td {
border-bottom: 1px solid #d5e3ff;
}
.company .content .common-table>>>.el-table__body tr, .el-table__body td {
padding: 0;
height: 60px;
background: #f5f8fd;
}
.company .content .block{
text-align: right;
padding: 30px 70px 0 0;
......@@ -330,12 +281,4 @@ export default {
background-image: linear-gradient(to bottom, #7a9eeb,#274acf);
color: #fff;
}
.company .content .common-table {
box-shadow: rgba(72, 119, 230, 0.1) 4px 4px 5px;
border-width: 0.5px;
border-style: solid;
border-color: transparent;
border-image: initial;
border-radius: 10px;
}
</style>
src/components/admittance/company/newCompany.vue
浏览文件 @ fd7377a9
......@@ -123,15 +123,6 @@ export default {
display: inline-block;
line-height: 34px;
}
.newCompany>>>.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;
}
.newCompany .line{
margin: 25px 30px 0 30px;
height: 1px;
......
src/components/admittance/product/newProduct.vue
浏览文件 @ fd7377a9
......@@ -144,15 +144,6 @@ export default {
display: inline-block;
line-height: 34px;
}
.newCompany>>>.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;
}
.newCompany .line{
margin: 20px 30px 0 30px;
height: 1px;
......
src/components/admittance/product/product.vue
浏览文件 @ fd7377a9
......@@ -11,7 +11,7 @@
</span>
<span class="searchVal">
<span>产品类型：</span>
<el-select v-model="formValue" @change="search('search')" placeholder="请选择">
<el-select v-model="formValue" @change="search('search')" placeholder="请选择" clearable>
<el-option
v-for="item in formList"
:key="item.id"
......@@ -22,7 +22,7 @@
</span>
<span class="searchVal" style="margin-left: 6px">
<span>技术路线：</span>
<el-select v-model="techVal" @change="search('search')" placeholder="请选择">
<el-select v-model="techVal" @change="search('search')" placeholder="请选择" clearable>
<el-option
v-for="item in techList"
:key="item.id"
......@@ -197,7 +197,7 @@ export default {
// 当前页数
handleCurrentChange(val) {
this.currentPage = val;
this.search('page')
this.search()
},
// 关闭弹框
reset(val) {
......@@ -266,20 +266,6 @@ export default {
.product .content .change>img{
margin-right: 3px;
}
.product .content .common-table{
box-shadow: 4px 4px 5px rgba(72,119,230,0.1);
border: .5px solid transparent;
border-radius: 10px;
}
.product>>>.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;
}
.product .content .button{
display: inline-block;
width: 100px;
......@@ -304,37 +290,6 @@ export default {
/* position: absolute;*/
/* right: 180px;*/
/*}*/
.product .content .common-table{
margin: 24px 70px 0 70px;
}
.product .content .common-table>>>.el-table th > .cell{
font-size: 18px;
color: #333;
font-weight: normal;
}
.product .content .common-table>>>.el-table th.is-leaf{
height: 70px;
}
.product .content .common-table>>>.el-table tr{
font-size: 18px;
}
.product .content .common-table>>>.el-table{
color: #233b6e;
}
.product .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;
}
.product .content .common-table>>>.el-table--enable-row-hover .el-table__body tr:hover>td{
background-color: #f5f8fd;
}
.product .content .common-table>>>.el-table th.is-leaf, .el-table td {
border-bottom: 1px solid #d5e3ff;
}
.product .content .common-table>>>.el-table__body tr, .el-table__body td {
padding: 0;
height: 60px;
background: #f5f8fd;
}
.product .content .block{
text-align: right;
padding: 30px 70px 0 0;
......@@ -367,15 +322,6 @@ export default {
display: inline-block;
line-height: 34px;
}
.newCompany>>>.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;
}
.newCompany .line{
margin: 30px 30px 0 30px;
height: 1px;
......
src/components/basicInformation/company/company.vue
浏览文件 @ fd7377a9
......@@ -7,11 +7,11 @@
<p class="search">
<span class="searchVal">
<span>单位名称：</span>
<el-input v-model="searchName" size="medium" placeholder="请输入" @keyup-enter="search"></el-input>
<el-input v-model="searchName" size="medium" placeholder="请输入" @keyup-enter="search('search')"></el-input>
</span>
<span class="searchVal">
<span>单位类别：</span>
<el-select v-model="classVal" @change="search" placeholder="请选择">
<el-select v-model="classVal" @change="search('search')" placeholder="请选择" clearable>
<el-option
v-for="item in companyClass"
:label="typeCompany(item)"
......@@ -19,7 +19,7 @@
</el-option>
</el-select>
</span>
<span class="button searchBtn">搜索</span>
<span class="button searchBtn" @change="search('search')">搜索</span>
<span class="button add" v-if="authority" @click="addCompany"><img src="../../../assets/img/add.png"></span>
<span class="button import" v-if="authority" ><img src="../../../assets/img/import.png">
<el-upload
......@@ -129,7 +129,7 @@ export default {
newCompany
},
mounted() {
this.search('page')
this.search()
if (this.$store.getters.getSidebar.name === '国家名录') {
this.authority = false
}
......@@ -156,10 +156,9 @@ export default {
'测试机构': 7,
'开发商': 8
}
if (val !== 'page') { // 点击搜索按钮，不是点击分页跳转
if (val === 'search') { // 点击搜索按钮，不是点击分页跳转
this.currentPage = 1;
message.name = this.searchName;
console.log(this.classVal)
message.type = change[this.classVal];
}
let data = {
......@@ -167,7 +166,7 @@ export default {
pageSize: this.pageSize,
t: message
}
console.log(data)
this.$server.postUnitSearch(data).then(res => {
this.allData = res.data.data.rows;
this.totalLength = res.data.data.total;
......@@ -182,7 +181,7 @@ export default {
// 当前页数
handleCurrentChange(val) {
this.currentPage = val;
this.search('page')
this.search();
},
// 关闭弹框
reset(val) {
......@@ -190,7 +189,7 @@ export default {
this.components = '';
this.companyName = '';
if (val) {
this.unit()
this.search()
}
},
// 获取单位名称
......@@ -273,20 +272,6 @@ export default {
.company .content .change>img{
margin-right: 3px;
}
.company .content .common-table{
box-shadow: 4px 4px 5px rgba(72,119,230,0.1);
border: .5px solid transparent;
border-radius: 10px;
}
.company>>>.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;
}
.company .content .button{
display: inline-block;
width: 100px;
......@@ -322,39 +307,6 @@ export default {
.company .searchBtn{
margin-left: 30px;
}
/*表格样式*/
.company .content .common-table{
margin: 24px 70px 0 70px;
}
.company .content .common-table>>>.el-table th > .cell{
font-size: 18px;
color: #333;
font-weight: normal;
}
.company .content .common-table>>>.el-table th.is-leaf{
height: 70px;
}
.company .content .common-table>>>.el-table tr{
font-size: 18px;
}
.company .content .common-table>>>.el-table{
color: #233b6e;
}
.company .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;
}
.company .content .common-table>>>.el-table--enable-row-hover .el-table__body tr:hover>td{
background-color: #f5f8fd;
}
.company .content .common-table>>>.el-table th.is-leaf, .el-table td {
border-bottom: 1px solid #d5e3ff;
}
.company .content .common-table>>>.el-table__body tr, .el-table__body td {
padding: 0;
height: 60px;
background: #f5f8fd;
}
.company .content .block{
text-align: right;
padding: 30px 70px 0 0;
......@@ -381,12 +333,4 @@ export default {
background-image: linear-gradient(to bottom, #7a9eeb,#274acf);
color: #fff;
}
.company .content .common-table {
box-shadow: rgba(72, 119, 230, 0.1) 4px 4px 5px;
border-width: 0.5px;
border-style: solid;
border-color: transparent;
border-image: initial;
border-radius: 10px;
}
</style>
src/components/basicInformation/company/companyDetails.vue
浏览文件 @ fd7377a9
......@@ -84,7 +84,7 @@ export default {
// 相关人员跳转
personPage () {
console.log(this.data)
this.$router.push({name: 'person',params:{'value': this.data}});
this.$router.push({name: 'person',params:{'data': this.data}});
},
// 页面返回
backPath () {
......
src/components/basicInformation/company/newCompany.vue
浏览文件 @ fd7377a9
......@@ -123,15 +123,6 @@ export default {
display: inline-block;
line-height: 34px;
}
.newCompany>>>.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;
}
.newCompany .line{
margin: 25px 30px 0 30px;
height: 1px;
......
src/components/basicInformation/product/newProduct.vue
浏览文件 @ fd7377a9
......@@ -140,15 +140,6 @@ export default {
display: inline-block;
line-height: 34px;
}
.newCompany>>>.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;
}
.newCompany .line{
margin: 20px 30px 0 30px;
height: 1px;
......
src/components/basicInformation/product/product.vue
浏览文件 @ fd7377a9
......@@ -11,7 +11,7 @@
</span>
<span class="searchVal">
<span>产品类型：</span>
<el-select v-model="formValue" @change="search('search')" placeholder="请选择">
<el-select v-model="formValue" @change="search('search')" placeholder="请选择" clearable>
<el-option
v-for="item in formList"
:key="item.id"
......@@ -22,7 +22,7 @@
</span>
<span class="searchVal" style="margin-left: 6px">
<span>技术路线：</span>
<el-select v-model="techVal" @change="search('search')" placeholder="请选择">
<el-select v-model="techVal" @change="search('search')" placeholder="请选择" clearable>
<el-option
v-for="item in techList"
:key="item.id"
......@@ -69,8 +69,7 @@
align="center">
</el-table-column>
<el-table-column
:formatter="techIdChange"
prop="techId"
prop="tech.name"
label="技术路线"
align="center">
</el-table-column>
......@@ -207,7 +206,6 @@ export default {
pageSize: this.pageSize,
t: message
};
console.log(data)
this.$server.postProduceSearch(data).then(res => {
this.allData = res.data.data.rows;
this.totalLength = res.data.data.total;
......@@ -222,7 +220,7 @@ export default {
// 当前页数
handleCurrentChange(val) {
this.currentPage = val;
this.search('page')
this.search();
},
// 新建产品
addProduct() {
......@@ -312,16 +310,11 @@ export default {
.product .content .change>img{
margin-right: 3px;
}
.product .content .common-table{
box-shadow: 4px 4px 5px rgba(72,119,230,0.1);
border: .5px solid transparent;
border-radius: 10px;
}
.product>>>.el-input__inner{
border: 1px solid rgba(8,104,157,.3);
border-radius: 2px;
font-size: 18px;
color: #999;
color: #333;
height: 34px;
line-height: 34px;
width: 180px;
......@@ -352,37 +345,6 @@ export default {
right: 145px;
width: 50px;
}
.product .content .common-table{
margin: 24px 70px 0 70px;
}
.product .content .common-table>>>.el-table th > .cell{
font-size: 18px;
color: #333;
font-weight: normal;
}
.product .content .common-table>>>.el-table th.is-leaf{
height: 70px;
}
.product .content .common-table>>>.el-table tr{
font-size: 18px;
}
.product .content .common-table>>>.el-table{
color: #233b6e;
}
.product .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;
}
.product .content .common-table>>>.el-table--enable-row-hover .el-table__body tr:hover>td{
background-color: #f5f8fd;
}
.product .content .common-table>>>.el-table th.is-leaf, .el-table td {
border-bottom: 1px solid #d5e3ff;
}
.product .content .common-table>>>.el-table__body tr, .el-table__body td {
padding: 0;
height: 60px;
background: #f5f8fd;
}
.product .content .block{
text-align: right;
padding: 30px 70px 0 0;
......@@ -415,15 +377,6 @@ export default {
display: inline-block;
line-height: 34px;
}
.newCompany>>>.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;
}
.newCompany .line{
margin: 30px 30px 0 30px;
height: 1px;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论