Skip to content

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

合并分支 'zax' 到 'master'

样式调整 查看合并请求 !30
上级 b4b76c41 332ea9bb
隐藏空白字符变更
内嵌 并排
正在显示 包含 56 行增加 和 68 行删除
src/components/admittance/company/company.vue
浏览文件 @ f066af75
......@@ -9,7 +9,7 @@
<span>单位名称：</span>
<el-input v-model="searchName" size="medium" @keyup-enter="search('search')" placeholder="请输入"></el-input>
</span>
<span class="searchVal">
<span class="searchVal searchInput">
<span>单位类别：</span>
<el-select v-model="classVal" @change="search('search')" placeholder="请选择" clearable>
<el-option
......@@ -90,21 +90,15 @@ export default {
{type: '2'},
{type: '3'},
{type: '4'},
{type: '5'},
{type: '6'},
{type: '7'},
{type: '8'}
{type: '5'}
],
allData: [],
typeVal: { // 单位类别
'1': 'AK中心',
'2': '实施系统管理员',
'3': '监理方',
'4': '集成商',
'5': '建设方',
'6': '专家',
'7': '测试机构',
'8': '开发商'
'1': '集成商',
'2': '开发商',
'3': '监理商',
'4': '产品商',
'5': '其他'
}
}
},
......@@ -127,14 +121,11 @@ export default {
type: ''
};
let change = {
'AK中心': 1,
'实施系统管理员': 2,
'监理方': 3,
'集成商': 4,
'建设方': 5,
'专家': 6,
'测试机构': 7,
'开发商': 8
'集成商': 1,
'开发商': 2,
'监理商': 3,
'产品商': 4,
'其他': 5
}
if (val === 'search') { // 点击搜索按钮，不是点击分页跳转
this.currentPage = 1;
......@@ -281,4 +272,7 @@ export default {
background-image: linear-gradient(to bottom, #7a9eeb,#274acf);
color: #fff;
}
.company .content .searchInput{
margin-left: 25px;
}
</style>
src/components/admittance/company/newCompany.vue
浏览文件 @ f066af75
......@@ -9,17 +9,14 @@
<span>单位名称：</span>
<el-input v-model="name" size="medium" placeholder="请输入"></el-input>
</span>
<span class="addVal" style="width: 450px;">
<span class="addVal">
<span>单位类别：</span>
<el-radio-group v-model="type" size="small" style="padding-top: 11px;width: 100%;text-align: left">
<el-radio label="1">AK中心 </el-radio>
<el-radio label="3">监理方</el-radio>
<el-radio label="6">专家</el-radio>
<el-radio label="7">测试机构 </el-radio>
<el-radio label="4">集成商</el-radio>
<el-radio label="5">建设方</el-radio>
<el-radio label="8">开发商 </el-radio>
<el-radio label="2">实施系统管理员</el-radio>
<el-radio label="1">集成商 </el-radio>
<el-radio label="2">开发商</el-radio>
<el-radio label="3">监理商</el-radio>
<el-radio label="4">产品商 </el-radio>
<el-radio label="5">其他</el-radio>
</el-radio-group>
</span>
<span class="addVal" style="margin-top: 4px">
......@@ -131,10 +128,10 @@ export default {
.newCompany .buttonClick{
display: flex;
justify-content: space-evenly;
margin-top: 13px;
margin-top: 8px;
}
.newCompany .company-content>>>.el-radio{
margin-right: 22px;
margin-right: 30px;
margin-bottom: 11px;
width: 49px;
}
......
src/components/admittance/product/product.vue
浏览文件 @ f066af75
......@@ -9,7 +9,7 @@
<span>产品名称：</span>
<el-input v-model="name" size="medium" placeholder="请输入" @keyup-enter="search('search')"></el-input>
</span>
<span class="searchVal">
<span class="searchVal searchInput">
<span>产品类型：</span>
<el-select v-model="formValue" @change="search('search')" placeholder="请选择" clearable>
<el-option
......@@ -20,7 +20,7 @@
</el-option>
</el-select>
</span>
<span class="searchVal" style="margin-left: 6px">
<span class="searchVal" style="margin-left: 31px">
<span>技术路线：</span>
<el-select v-model="techVal" @change="search('search')" placeholder="请选择" clearable>
<el-option
......@@ -339,4 +339,7 @@ export default {
.newCompany .company-content>>>.el-input__inner{
width: 290px;
}
.searchInput{
margin-left: 25px;
}
</style>
src/components/basicInformation/company/company.vue
浏览文件 @ f066af75
......@@ -9,7 +9,7 @@
<span>单位名称：</span>
<el-input v-model="searchName" size="medium" placeholder="请输入" @keyup-enter="search('search')"></el-input>
</span>
<span class="searchVal">
<span class="searchVal searchInput">
<span>单位类别：</span>
<el-select v-model="classVal" @change="search('search')" placeholder="请选择" clearable>
<el-option
......@@ -106,21 +106,15 @@ export default {
{type: '2'},
{type: '3'},
{type: '4'},
{type: '5'},
{type: '6'},
{type: '7'},
{type: '8'}
{type: '5'}
],
allData: [],
typeVal: { // 单位类别
'1': 'AK中心',
'2': '实施系统管理员',
'3': '监理方',
'4': '集成商',
'5': '建设方',
'6': '专家',
'7': '测试机构',
'8': '开发商'
'1': '集成商',
'2': '开发商',
'3': '监理商',
'4': '产品商',
'5': '其他'
},
authority: true
}
......@@ -147,14 +141,11 @@ export default {
type: ''
};
let change = {
'AK中心': 1,
'实施系统管理员': 2,
'监理方': 3,
'集成商': 4,
'建设方': 5,
'专家': 6,
'测试机构': 7,
'开发商': 8
'集成商': 1,
'开发商': 2,
'监理商': 3,
'产品商': 4,
'其他': 5
}
if (val === 'search') { // 点击搜索按钮，不是点击分页跳转
this.currentPage = 1;
......@@ -333,4 +324,7 @@ export default {
background-image: linear-gradient(to bottom, #7a9eeb,#274acf);
color: #fff;
}
.company .content .searchInput{
margin-left: 25px;
}
</style>
src/components/basicInformation/company/newCompany.vue
浏览文件 @ f066af75
......@@ -9,17 +9,14 @@
<span>单位名称：</span>
<el-input v-model="name" size="medium" placeholder="请输入"></el-input>
</span>
<span class="addVal" style="width: 450px;">
<span class="addVal">
<span>单位类别：</span>
<el-radio-group v-model="type" size="small" style="padding-top: 11px;width: 100%;text-align: left">
<el-radio label="1">AK中心 </el-radio>
<el-radio label="3">监理方</el-radio>
<el-radio label="6">专家</el-radio>
<el-radio label="7">测试机构 </el-radio>
<el-radio label="4">集成商</el-radio>
<el-radio label="5">建设方</el-radio>
<el-radio label="8">开发商 </el-radio>
<el-radio label="2">实施系统管理员</el-radio>
<el-radio label="1">集成商 </el-radio>
<el-radio label="2">开发商</el-radio>
<el-radio label="3">监理商</el-radio>
<el-radio label="4">产品商 </el-radio>
<el-radio label="5">其他</el-radio>
</el-radio-group>
</span>
<span class="addVal" style="margin-top: 4px">
......@@ -131,10 +128,10 @@ export default {
.newCompany .buttonClick{
display: flex;
justify-content: space-evenly;
margin-top: 13px;
margin-top: 8px;
}
.newCompany .company-content>>>.el-radio{
margin-right: 22px;
margin-right: 30px;
margin-bottom: 11px;
width: 49px;
}
......
src/components/basicInformation/product/product.vue
浏览文件 @ f066af75
......@@ -9,7 +9,7 @@
<span>产品名称：</span>
<el-input v-model="name" size="medium" placeholder="请输入" @keyup-enter="search('search')"></el-input>
</span>
<span class="searchVal">
<span class="searchVal searchInput">
<span>产品类型：</span>
<el-select v-model="formValue" @change="search('search')" placeholder="请选择" clearable>
<el-option
......@@ -20,7 +20,7 @@
</el-option>
</el-select>
</span>
<span class="searchVal" style="margin-left: 6px">
<span class="searchVal" style="margin-left: 31px">
<span>技术路线：</span>
<el-select v-model="techVal" @change="search('search')" placeholder="请选择" clearable>
<el-option
......@@ -393,4 +393,7 @@ export default {
.newCompany .company-content>>>.el-input__inner{
width: 290px;
}
.searchInput{
margin-left: 25px;
}
</style>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论