Skip to content

D
dsk-cr20g
Commit 6335038a authored by danfuman's avatar danfuman
Browse files
Options

修改

parent 7d81f128
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1045 additions and 861 deletions
dsk-operate-ui/src/assets/styles/index.scss
View file @ 6335038a
...@@ -345,7 +345,10 @@ ul, li { ...@@ -345,7 +345,10 @@ ul, li {
} }
} }
.is-scrolling-left+.el-table__fixed,.is-scrolling-middle+.el-table__fixed,.is-scrolling-right+.el-table__fixed{ .is-scrolling-left+.el-table__fixed,.is-scrolling-middle+.el-table__fixed,.is-scrolling-right+.el-table__fixed{
box-shadow:none; //box-shadow:none;
//-webkit-box-shadow: 2px 0px 1px -2px #C3CBD5;
box-shadow: 2px 0 8px -7px #202020;
border-right: 1px solid #C3CBD5;
height: auto !important; height: auto !important;
bottom: 16px !important; bottom: 16px !important;
} }
......
dsk-operate-ui/src/views/custom/overview/index.vue
View file @ 6335038a
...@@ -601,7 +601,7 @@ ...@@ -601,7 +601,7 @@
padding: 16px; padding: 16px;
background: #ffffff; background: #ffffff;
height: 152px; height: 152px;
margin-bottom: 22px; margin-bottom: 12px;
.item{ .item{
display: flex; display: flex;
.icons{ .icons{
...@@ -680,6 +680,9 @@ ...@@ -680,6 +680,9 @@
.el-input-group__append{ .el-input-group__append{
background: #F5F5F5; background: #F5F5F5;
color: #0081FF; color: #0081FF;
padding: 0;
width: 70px;
text-align: center;
} }
.el-input__inner:focus{ .el-input__inner:focus{
border-color: #3181fa; border-color: #3181fa;
......
dsk-operate-ui/src/views/detail/groupAccount/component/members.vue
View file @ 6335038a
...@@ -395,9 +395,6 @@ ...@@ -395,9 +395,6 @@
provinceIds.length>0?params.provinceIds = provinceIds:'' provinceIds.length>0?params.provinceIds = provinceIds:''
cityIds.length>0?params.cityIds = cityIds:'' cityIds.length>0?params.cityIds = cityIds:''
districtIds.length>0?params.districtIds = districtIds:'' districtIds.length>0?params.districtIds = districtIds:''
// provinceIds.length>0?this.queryParams.provinceIds = provinceIds:''
// cityIds.length>0?this.queryParams.cityIds = cityIds:''
// districtIds.length>0?this.queryParams.districtIds = districtIds:''
} }
return params return params
}, },
...@@ -450,8 +447,8 @@ ...@@ -450,8 +447,8 @@
.search-box { .search-box {
display: inline-block; display: inline-block;
border-radius: 4px; border-radius: 4px;
border: 1px solid #D9D9D9; /*border: 1px solid #D9D9D9;*/
width: 82px; width: 70px;
/*cursor: pointer;*/ /*cursor: pointer;*/
position: relative; position: relative;
.search-box-t { .search-box-t {
...@@ -461,7 +458,7 @@ ...@@ -461,7 +458,7 @@
color: #999999; color: #999999;
margin-right: 8px; margin-right: 8px;
text-align: center; text-align: center;
width: 82px; width: 70px;
display: inline-block; display: inline-block;
cursor: pointer; cursor: pointer;
i { i {
...@@ -479,7 +476,7 @@ ...@@ -479,7 +476,7 @@
background: #ffffff; background: #ffffff;
box-shadow: 0px 4px 10px 0px rgba(0,0,0,0.1); box-shadow: 0px 4px 10px 0px rgba(0,0,0,0.1);
border-radius: 4px; border-radius: 4px;
width: 640px; width: 500px;
//height: 337px; //height: 337px;
padding: 16px; padding: 16px;
position: absolute; position: absolute;
...@@ -501,7 +498,7 @@ ...@@ -501,7 +498,7 @@
} }
.item_ckquery{ .item_ckquery{
position: relative; position: relative;
width: 520px; width: 400px;
/*float: left;*/ /*float: left;*/
/*flex: 1;*/ /*flex: 1;*/
span{ span{
......
dsk-operate-ui/src/views/detail/groupAccount/component/performance.vue
View file @ 6335038a
...@@ -139,7 +139,8 @@ ...@@ -139,7 +139,8 @@
{ type: 4, fieldName: 'boundTypes', value: '', placeholder: '业绩类型', options: [],width:150}, { type: 4, fieldName: 'boundTypes', value: '', placeholder: '业绩类型', options: [],width:150},
{ type: 4, fieldName: 'projectTypes', value: '', placeholder: '项目类型', options: [],width:150}, { type: 4, fieldName: 'projectTypes', value: '', placeholder: '项目类型', options: [],width:150},
{ type: 1, fieldName: 'cgbl', value: '', placeholder: '持股比例', options: [],width:100}, { type: 1, fieldName: 'cgbl', value: '', placeholder: '持股比例', options: [],width:100},
{ type: 3, fieldName: 'searchValue', value: '', placeholder: '搜索中标成员名称/项目名称'}, // { type: 3, fieldName: 'searchValue', value: '', placeholder: '搜索中标成员名称/项目名称'},
{ type: 3, fieldName: 'searchValue', value: '', placeholder: '查询'},
], ],
tableData:[], tableData:[],
tableDataTotal:0, tableDataTotal:0,
......
dsk-operate-ui/src/views/detail/groupAccount/component/zbxmfx.vue 0 → 100644
View file @ 6335038a
<template>
<div class="performance">
<div>招标项目分析</div>
</div>
</template>
<script>
export default {
name: 'qualifications',
props: ['customerId','combineName'],
mixins: [],
components:{},
data(){
return{
}
},
created() {
},
methods: {
}
}
</script>
<style lang="scss" scoped>
.performance{
background: #ffffff;
border-radius: 4px;
padding: 16px;
height: calc(100% - 64px);
.headForm{
margin-bottom: 14px;
.common-title{
margin-right: 24px;
}
::v-deep .el-input__inner{
border: 1px solid #D9D9D9;
height: 34px;
line-height: 34px;
padding-right: 27px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
border-radius: 4px;
}
::v-deep .el-form-item{
margin-right: 8px !important;
}
::v-deep .el-input--medium .el-input__icon{
line-height: 34px;
}
::v-deep .el-cascader{
height: 34px;
line-height: 34px;
width: 190px;
.el-input{
input{
height: 34px !important;
}
}
.el-cascader__tags{
flex-wrap: inherit;
margin-top: 1px;
.el-tag{
max-width: 100px;
}
}
.el-input__suffix{
top: 1px;
}
}
.cooperate-name {
display: flex;
border-radius: 2px;
border: 1px solid #D9D9D9;
line-height: 34px;
height: 34px;
span {
width: 80px;
height: 32px;
line-height: 32px;
font-size: 14px;
background: #F5F5F5;
text-align: center;
color: #0081FF;
border: 1px solid #EFEFEF;
border-left: 0;
cursor: pointer;
}
&.span-ba{
/*border: 1px solid #0081FF;*/
span{
color: #ffffff;
background: #0081FF;
border: 1px solid #0081FF;
}
}
::v-deep .el-input{
flex: 1;
}
::v-deep .el-input__inner {
border: 0;
line-height: 32px;
height: 32px;
position: absolute;
top: 0;
padding-right: 22px;
font-size: 12px;
padding-left: 8px;
}
}
.headForm-from {
display: flex;
.from-item{
margin-right: 8px;
&:last-child{
margin-right: 0;
}
.fromTime{
::v-deep .el-range-input{
width: 100%;
}
::v-deep .el-range-separator, ::v-deep .el-range__close-icon{
line-height: 24px;
width: 20px;
}
}
.fromTime-icon {
display: none;
}
.el-select{
.el-input__suffix{
right: 10px;
}
}
}
::v-deep .form-content-width{
width: 170px;
}
::v-deep .selectTag{
.el-select__tags{
.el-tag{
&:first-child{
width: 70px;
}
}
}
}
::v-deep .el-select__tags{
.el-tag{
&:first-child{
//width: 100%;
}
}
}
}
.ability-total{
font-size: 12px;
color: #3D3D3D;
position: relative;
&:before{
content: '';
display: inline-block;
width: 2px;
height: 2px;
background: rgba(35,35,35,0.4);
margin-right: 4px;
}
}
.ability-excel{
font-size: 14px;
color: rgba(35,35,35,0.8);
margin-left: 16px;
cursor: pointer;
&:hover{
color: #0081FF;
}
img{
width: 18px;
height: 18px;
margin-right: 4px;
}
}
}
::v-deep .el-table{
.has-gutter{
tr{
th:nth-last-child(2){
border-right:0;
}
td:nth-last-child(2){
border-right:0;
}
}
}
.el-table__cell.gutter{
background: #F0F3FA;
}
}
.custom-time-select{
width: 150px;
}
}
.dialogExport{
::v-deep .el-dialog{
.el-dialog__header{
height: 48px;
line-height: 48px;
padding: 0 16px;
border-bottom: 1px solid #E1E1E1;
font-weight: bold;
color: #1D2129;
font-size: 16px;
.tip-img{
width: 18px;
height: 18px;
margin-right: 7px;
margin-bottom: -3px;
}
.el-dialog__headerbtn{
font-size: 20px;
font-weight: bold;
top: 15px;
.el-dialog__close{
color:#999999;
}
}
}
.el-dialog__body{
padding: 16px;
.input{
margin-top: 16px;
.el-input{
width: 160px;
border-radius: 2px;
height: 32px;
.el-input__inner{
height: 32px;
line-height: 32px;
}
}
.el-input-group__append{
padding: 0 14px;
}
p{
color: #FF3C3C;
font-size: 12px;
margin-left: 12px;
display: inline-block;
i{
font-size: 14px;
margin-right: 4px;
}
}
}
.content{
text-align: center;
margin-top: 36px;
.success{
width: 64px;
height: 64px;
margin-bottom: 16px;
}
p{
padding: 0;
margin: 0;
}
.p1{
color: #232323;
font-size: 16px;
margin-bottom: 8px;
}
.p2{
color: rgba(35,35,35,0.4);
font-size: 14px;
span{
color:#0081FF;
cursor: pointer;
}
}
}
}
.el-dialog__footer{
text-align: center;
padding-bottom: 24px;
}
}
}
</style>
dsk-operate-ui/src/views/detail/groupAccount/index.vue
View file @ 6335038a
...@@ -115,6 +115,9 @@ ...@@ -115,6 +115,9 @@
top:0; top:0;
z-index: 9; z-index: 9;
} }
#groupBox{
height: 100%;
}
} }
.part-header{ .part-header{
font-size: 16px; font-size: 16px;
......
dsk-operate-ui/src/views/detail/party-a/component/CustomMoneySelect.vue
View file @ 6335038a
...@@ -229,7 +229,11 @@ export default { ...@@ -229,7 +229,11 @@ export default {
width: 120px; width: 120px;
height: 34px; height: 34px;
position: relative; position: relative;
.el-input__inner{
width: 100px !important;
}
.rote { .rote {
background: #F4F6F9;
.el-input__inner{ .el-input__inner{
background: #F4F6F9; background: #F4F6F9;
} }
......
dsk-operate-ui/src/views/detail/party-a/component/HeadForm.vue
View file @ 6335038a
<template> <template>
<div> <div>
<div class="headForm"> <div class="headForm">
<div class="flex-box query-box" style="margin-bottom: 12px;"> <div class="flex-box query-box" v-if="title" style="margin-bottom: 12px;">
<div class="flex-box query-params"> <div class="flex-box query-params">
<span class="common-title" v-if="title">{{ title }}</span> <span class="common-title" v-if="title">{{ title }}</span>
</div> </div>
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</template> </template>
<div v-else class="flex-box"> <div v-else class="flex-box">
<span class="flex-box ability-total" v-if="isTotal">共{{ total }}条</span> <span class="flex-box ability-total" v-if="isTotal">共{{ total }}条</span>
<span class="flex-box ability-excel" v-hasPermi="['combine:info:export:win:bid']" v-if="isExcel" @click="clickEXCEL"><img src="@/assets/images/ability_excel.png">导出EXCEL</span> <span class="flex-box ability-excel" v-hasPermi="['combine:info:export:win:bid','combine:info:export:bid']" v-if="isExcel" @click="clickEXCEL"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
<span class="flex-box ability-excel" v-else @click="clickEXCEL"><img src="@/assets/images/ability_excel.png">导出EXCEL</span> <span class="flex-box ability-excel" v-else @click="clickEXCEL"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
</div> </div>
</div> </div>
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
multiple multiple
collapse-tags collapse-tags
clearable clearable
:style="form.width?'width:'+form.width+'px':'max-width: 170px'" :style="form.width?'width:'+form.width+'px':'max-width: 150px'"
:placeholder="form.placeholder" :placeholder="form.placeholder"
@change="changeSelect"> @change="changeSelect">
<el-option v-for="(item, index) in form.options" :key="index" :label="item.name" :value="item.value"/> <el-option v-for="(item, index) in form.options" :key="index" :label="item.name" :value="item.value"/>
...@@ -102,118 +102,16 @@ ...@@ -102,118 +102,16 @@
<template v-if="form.type==0"> <template v-if="form.type==0">
<slot name="slot"></slot> <slot name="slot"></slot>
</template> </template>
</div> </div>
</div> </div>
</div> </div>
<div v-if="!title" class="flex-box">
<span class="flex-box ability-total" v-if="isTotal">共{{ total }}条</span>
<span class="flex-box ability-excel" v-hasPermi="['combine:info:export:win:bid','combine:info:export:bid']" v-if="isExcel" @click="clickEXCEL"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
<span class="flex-box ability-excel" v-else @click="clickEXCEL"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
</div>
</div> </div>
</div> </div>
<!--<div class="headForm" v-else>-->
<!--<div class="flex-box query-box">-->
<!--<div class="flex-box query-params">-->
<!--<span class="common-title" v-if="title">{{ title }}</span>-->
<!--<div class="headForm-from">-->
<!--<div class="from-item" :key="i" v-for="(form, i) in formData">-->
<!--&lt;!&ndash; 单选 &ndash;&gt;-->
<!--<template v-if="form.type==1">-->
<!--<el-select-->
<!--v-model="form.value"-->
<!--clearable-->
<!--class="form-content-width"-->
<!--:style="form.width?'width:'+form.width+'px':'max-width: 110px'"-->
<!--:placeholder="form.placeholder"-->
<!--@change="changeSelect">-->
<!--<el-option v-for="(item, index) in form.options" :key="index" :label="item.name" :value="item.value" :disabled="item.disabled"/>-->
<!--</el-select>-->
<!--</template>-->
<!--&lt;!&ndash; 年月日 &ndash;&gt;-->
<!--<template v-if="form.type==2">-->
<!--<el-date-picker-->
<!--@change="changeSelect"-->
<!--class="fromTime"-->
<!--style="width: 210px"-->
<!--v-model="form.value"-->
<!--type="daterange"-->
<!--prefix-icon="fromTime-icon"-->
<!--value-format="yyyy-MM-dd"-->
<!--range-separator="至"-->
<!--start-placeholder="开始日期"-->
<!--end-placeholder="结束日期">-->
<!--</el-date-picker>-->
<!--</template>-->
<!--&lt;!&ndash; 输入框 &ndash;&gt;-->
<!--<template v-if="form.type==3">-->
<!--<div class="cooperate-name" :id="'focus'+i">-->
<!--<el-input clearable @clear="changeSelect" @focus="clickFocus('focus'+i)" @blur="clickFocus('focus'+i)" v-model="form.value" :placeholder="form.placeholder" :style="form.width?'width:'+form.width+'px':'width:180px'"></el-input>-->
<!--<span @click="changeSelect">搜索</span>-->
<!--</div>-->
<!--</template>-->
<!--&lt;!&ndash; 多选 &ndash;&gt;-->
<!--<template v-if="form.type==4">-->
<!--<el-select-->
<!--class="form-content-width"-->
<!--:class="form.value.length > 1 ? 'selectTag' : ''"-->
<!--v-model="form.value"-->
<!--multiple-->
<!--collapse-tags-->
<!--clearable-->
<!--:style="form.width?'width:'+form.width+'px':'max-width: 170px'"-->
<!--:placeholder="form.placeholder"-->
<!--@change="changeSelect">-->
<!--<el-option v-for="(item, index) in form.options" :key="index" :label="item.name" :value="item.value"/>-->
<!--</el-select>-->
<!--</template>-->
<!--&lt;!&ndash; 时间、自定义 &ndash;&gt;-->
<!--<template v-else-if="form.type==5">-->
<!--<custom-time-select-->
<!--:timeList="form.timeList"-->
<!--v-model="form.value"-->
<!--:placeholder="form.placeholder"-->
<!--:dateFrom="form.dateFrom ? form.dateFrom : ''"-->
<!--:dateTo="form.dateTo ? form.dateTo : ''"-->
<!--@handle-search="changeSelect" />-->
<!--</template>-->
<!--&lt;!&ndash; 金额 &ndash;&gt;-->
<!--<template v-else-if="form.type==6">-->
<!--<custom-money-select-->
<!--:moneyList="form.moneyList"-->
<!--v-model="form.value"-->
<!--:placeholder="form.placeholder"-->
<!--@handle-search="changeSelect" />-->
<!--</template>-->
<!--&lt;!&ndash; 地区选择 &ndash;&gt;-->
<!--<template v-else-if="form.type==7">-->
<!--<el-cascader-->
<!--ref="cascader"-->
<!--:options="form.options"-->
<!--:props="form.props"-->
<!--v-model="form.value"-->
<!--@change="changeSelect"-->
<!--:placeholder="form.placeholder"-->
<!--collapse-tags-->
<!--clearable></el-cascader>-->
<!--</template>-->
<!--&lt;!&ndash; 自定义 &ndash;&gt;-->
<!--<template v-if="form.type==0">-->
<!--<slot name="slot"></slot>-->
<!--</template>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<template v-if="slots">-->
<!--<slot name="slot"></slot>-->
<!--</template>-->
<!--<div v-else class="flex-box">-->
<!--<span class="flex-box ability-total" v-if="isTotal">共{{ total }}条</span>-->
<!--<span class="flex-box ability-excel" v-hasPermi="['combine:info:export:win:bid']" v-if="isExcel && title ==='集团业绩'" @click="clickEXCEL"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>-->
<!--<span class="flex-box ability-excel" v-else @click="clickEXCEL"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
</div> </div>
</template> </template>
...@@ -300,14 +198,15 @@ export default { ...@@ -300,14 +198,15 @@ export default {
margin-right: 24px; margin-right: 24px;
} }
::v-deep .el-input__inner{ ::v-deep .el-input__inner{
border: 1px solid #D9D9D9; border: 0;
height: 32px; height: 32px;
line-height: 32px; line-height: 32px;
padding-right: 27px; /*padding-right: 27px;*/
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
border-radius: 4px; border-radius: 4px;
padding: 0 8px;
} }
::v-deep .el-form-item{ ::v-deep .el-form-item{
margin-right: 8px !important; margin-right: 8px !important;
...@@ -318,7 +217,14 @@ export default { ...@@ -318,7 +217,14 @@ export default {
::v-deep .el-cascader{ ::v-deep .el-cascader{
height: 34px; height: 34px;
line-height: 34px; line-height: 34px;
width: 190px; width: 150px;
.is-focus{
.el-input{
input{
background: #F4F6F9;
}
}
}
.el-input{ .el-input{
input{ input{
height: 34px !important; height: 34px !important;
...@@ -328,7 +234,10 @@ export default { ...@@ -328,7 +234,10 @@ export default {
flex-wrap: inherit; flex-wrap: inherit;
margin-top: 1px; margin-top: 1px;
.el-tag{ .el-tag{
max-width: 100px; max-width: 70px;
}
.el-tag:nth-child(2){
padding: 0 3px;
} }
} }
.el-input__suffix{ .el-input__suffix{
...@@ -386,6 +295,7 @@ export default { ...@@ -386,6 +295,7 @@ export default {
position: absolute; position: absolute;
top: 0; top: 0;
padding-left: 36px; padding-left: 36px;
padding-right: 25px;
} }
} }
.fromTime{ .fromTime{
...@@ -407,7 +317,7 @@ export default { ...@@ -407,7 +317,7 @@ export default {
} }
} }
::v-deep .form-content-width{ ::v-deep .form-content-width{
width: 170px; width: 150px;
.el_input{ .el_input{
background: #fff; background: #fff;
} }
......
dsk-operate-ui/src/views/detail/party-a/opport/announcement.vue
View file @ 6335038a
...@@ -56,7 +56,7 @@ export default { ...@@ -56,7 +56,7 @@ export default {
}, },
defaultSort: {prop: 'issueTime', order: 'descending'}, defaultSort: {prop: 'issueTime', order: 'descending'},
forData: [ forData: [
{label: '项目名称', prop: 'projectName', minWidth: '300', slot: true}, {label: '项目名称', prop: 'projectName', minWidth: '300', slot: true, fixed: true},
{label: '发布日期', prop: 'issueTime', sortable: 'custom', descending: '3', ascending: '4', width: '120'}, {label: '发布日期', prop: 'issueTime', sortable: 'custom', descending: '3', ascending: '4', width: '120'},
{label: '预算金额（万元）', prop: 'projectAmount', sortable: 'custom', descending: '1', ascending: '2', width: '140'}, {label: '预算金额（万元）', prop: 'projectAmount', sortable: 'custom', descending: '1', ascending: '2', width: '140'},
{label: '项目地区', prop: 'province', width: '120', slot: true}, {label: '项目地区', prop: 'province', width: '120', slot: true},
......
dsk-operate-ui/src/views/index.vue
View file @ 6335038a
...@@ -71,8 +71,16 @@ ...@@ -71,8 +71,16 @@
<router-link :to="`/groupAccount/${scope.row.combineId}?name=${scope.row.combineName}`" tag="a" class="a-link">{{scope.row.combineName}}</router-link> <router-link :to="`/groupAccount/${scope.row.combineId}?name=${scope.row.combineName}`" tag="a" class="a-link">{{scope.row.combineName}}</router-link>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="count" label="中标数量（个）" align="right" sortable width="150"/> <el-table-column prop="count" label="中标数量" align="right" sortable width="150">
<el-table-column prop="money" label="中标金额（万元)" align="right" :sort-method="(a,b)=>{return a.money - b.money}" sortable/> <template slot-scope="scope">
{{scope.row.count}}个
</template>
</el-table-column>
<el-table-column prop="money" label="中标金额" align="right" :sort-method="(a,b)=>{return a.money - b.money}" sortable>
<template slot-scope="scope">
{{scope.row.money}}万元
</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
</el-col> </el-col>
...@@ -140,8 +148,16 @@ ...@@ -140,8 +148,16 @@
<span style="cursor: pointer;" class="a-link companyName" @click="getUipIdByCid(scope.row.companyId)">{{scope.row.companyName}}</span> <span style="cursor: pointer;" class="a-link companyName" @click="getUipIdByCid(scope.row.companyId)">{{scope.row.companyName}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="count" label="中标数量（个）" align="right" sortable width="150"/> <el-table-column prop="count" label="中标数量" align="right" sortable width="150">
<el-table-column prop="money" label="中标金额（万元)" align="right" :sort-method="(a,b)=>{return a.money - b.money}" sortable/> <template slot-scope="scope">
{{scope.row.count}}个
</template>
</el-table-column>
<el-table-column prop="money" label="中标金额" align="right" :sort-method="(a,b)=>{return a.money - b.money}" sortable>
<template slot-scope="scope">
{{scope.row.money}}万元
</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
</el-col> </el-col>
......
dsk-operate-ui/src/views/macro/economies/component/industrialStructure.vue
View file @ 6335038a
...@@ -32,17 +32,17 @@ ...@@ -32,17 +32,17 @@
show-summary show-summary
@sort-change="sortChange" @sort-change="sortChange"
> >
<el-table-column label="序号" width="60" align="left"> <el-table-column label="序号" width="55" align="left">
<template slot-scope="scope">{{ scope.$index + 2 }}</template> <template slot-scope="scope">{{ scope.$index + 2 }}</template>
</el-table-column> </el-table-column>
<el-table-column label="产业类型" prop="projectType"></el-table-column> <el-table-column label="产业类型" prop="projectType"></el-table-column>
<el-table-column :label="oneYear"> <el-table-column :label="oneYear">
<el-table-column prop="money" label="金额（亿元）" sortable="custom" :formatter="formatStatus"></el-table-column> <el-table-column prop="money" label="金额（亿元）" sortable="custom" :formatter="formatStatus" min-width="115"></el-table-column>
<el-table-column prop="rate" label="占比（%）" :sort-method="(a,b)=>{return a.rate - b.rate}" sortable> </el-table-column> <el-table-column prop="rate" label="占比（%）" :sort-method="(a,b)=>{return a.rate - b.rate}" sortable min-width="100"> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column :label="twoYear"> <el-table-column :label="twoYear">
<el-table-column prop="lastMoney" label="金额（亿元）" sortable="custom" :formatter="formatStatus"> </el-table-column> <el-table-column prop="lastMoney" label="金额（亿元）" sortable="custom" :formatter="formatStatus" min-width="115"> </el-table-column>
<el-table-column prop="lastRate" label="占比（%）" :sort-method="(a,b)=>{return a.lastRate - b.lastRate}" sortable> </el-table-column> <el-table-column prop="lastRate" label="占比（%）" :sort-method="(a,b)=>{return a.lastRate - b.lastRate}" sortable min-width="100"> </el-table-column>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
...@@ -393,7 +393,7 @@ export default { ...@@ -393,7 +393,7 @@ export default {
th:nth-child(4){ th:nth-child(4){
border-right:0; border-right:0;
.cell{ .cell{
padding-right: 24px !important; /*padding-right: 24px !important;*/
} }
} }
td:nth-child(6){ td:nth-child(6){
......
dsk-operate-ui/src/views/macro/nationalEconomies/component/tdjy.vue
View file @ 6335038a
...@@ -31,10 +31,10 @@ ...@@ -31,10 +31,10 @@
<template slot-scope="scope">{{ scope.$index + 1 }}</template> <template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="type" label="供应方式" :formatter="formatStatus"/> <el-table-column prop="type" label="供应方式" :formatter="formatStatus"/>
<el-table-column prop="count" label="土地交易项目" align="right" :formatter="formatStatus" sortable> <el-table-column prop="count" label="土地交易项目" align="right" :formatter="formatStatus" sortable min-width="120">
<template slot-scope="scope">{{ scope.row.count }}个</template> <template slot-scope="scope">{{ scope.row.count }}个</template>
</el-table-column> </el-table-column>
<el-table-column prop="rate" label="占比" align="right" :formatter="formatStatus" width="90"> <el-table-column prop="rate" label="占比" align="right" :formatter="formatStatus" width="80">
<template slot-scope="scope">{{ scope.row.rate }}%</template> <template slot-scope="scope">{{ scope.row.rate }}%</template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -74,10 +74,10 @@ ...@@ -74,10 +74,10 @@
<template slot-scope="scope">{{ scope.$index + 1 }}</template> <template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="type" label="供应方式" :formatter="formatStatus"/> <el-table-column prop="type" label="供应方式" :formatter="formatStatus"/>
<el-table-column prop="count" label="土地交易项目" align="right" :formatter="formatStatus" sortable> <el-table-column prop="count" label="土地交易项目" align="right" :formatter="formatStatus" sortable min-width="120">
<template slot-scope="scope">{{ scope.row.count }}个</template> <template slot-scope="scope">{{ scope.row.count }}个</template>
</el-table-column> </el-table-column>
<el-table-column prop="rate" label="占比" align="right" :formatter="formatStatus" width="90"> <el-table-column prop="rate" label="占比" align="right" :formatter="formatStatus" width="80">
<template slot-scope="scope">{{ scope.row.rate }}%</template> <template slot-scope="scope">{{ scope.row.rate }}%</template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -120,10 +120,10 @@ ...@@ -120,10 +120,10 @@
<template slot-scope="scope">{{ scope.$index + 1 }}</template> <template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="province" label="地区" :formatter="formatStatus"/> <el-table-column prop="province" label="地区" :formatter="formatStatus"/>
<el-table-column prop="count" label="土地交易项目" align="right" :formatter="formatStatus" sortable> <el-table-column prop="count" label="土地交易项目" align="right" :formatter="formatStatus" sortable min-width="120">
<template slot-scope="scope">{{ scope.row.count }}个</template> <template slot-scope="scope">{{ scope.row.count }}个</template>
</el-table-column> </el-table-column>
<el-table-column prop="rate" label="占比" align="right" :formatter="formatStatus" width="90"> <el-table-column prop="rate" label="占比" align="right" :formatter="formatStatus" width="80">
<template slot-scope="scope">{{ scope.row.rate }}%</template> <template slot-scope="scope">{{ scope.row.rate }}%</template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -159,10 +159,10 @@ ...@@ -159,10 +159,10 @@
<template slot-scope="scope">{{ scope.$index + 1 }}</template> <template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="type" label="年份" :formatter="formatStatus"/> <el-table-column prop="type" label="年份" :formatter="formatStatus"/>
<el-table-column prop="count" label="土地交易项目" align="right" :formatter="formatStatus" sortable> <el-table-column prop="count" label="土地交易项目" align="right" :formatter="formatStatus" sortable min-width="120">
<template slot-scope="scope">{{ scope.row.count }}个</template> <template slot-scope="scope">{{ scope.row.count }}个</template>
</el-table-column> </el-table-column>
<el-table-column prop="rate" label="占比" align="right" :formatter="formatStatus" width="90"> <el-table-column prop="rate" label="占比" align="right" :formatter="formatStatus" width="80">
<template slot-scope="scope">{{ scope.row.rate }}%</template> <template slot-scope="scope">{{ scope.row.rate }}%</template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment