Commit 09206da7 authored by danfuman's avatar danfuman

修改

parent bbe71844
......@@ -253,7 +253,7 @@ ul, li {
}
.query-params {
.form-content-width {
width: 160px;
//width: 160px;
}
.el-form{
&.el-form--inline .el-form-item{
......
......@@ -10,7 +10,7 @@
.el-cascader,
.el-select {
max-width: unset !important;
width: 64px;
//width: 64px;
padding: 0px 8px;
transition: width 0.3s;
box-sizing: border-box;
......
......@@ -88,8 +88,8 @@
{ type: 7, fieldName: 'province', value: '',props: {multiple: true,value: 'id',expandTrigger: 'hover'}, placeholder: '项目地区', options:[], uid: this.getUid()},
{ type: 5, fieldName: 'time', value: '', placeholder: '中标时间', startTime: 'startBidTime', endTime: 'endBidTime',timeList:[],dateTo:this.formatDate(new Date()) , uid: this.getUid()},
{ type: 6, fieldName: 'money', value: '', placeholder: '中标金额', startMoney: 'minAmount', endMoney: 'maxAmount',moneyList:[], uid: this.getUid() },
{ type: 4, fieldName: 'boundTypes', value: '', placeholder: '业绩类型', options: [],width:150, uid: this.getUid()},
{ type: 4, fieldName: 'projectTypes', value: '', placeholder: '项目类型', options: [],width:150, uid: this.getUid()},
{ type: 4, fieldName: 'boundTypes', value: '', placeholder: '业绩类型', options: [], uid: this.getUid()},
{ type: 4, fieldName: 'projectTypes', value: '', placeholder: '项目类型', options: [], uid: this.getUid()},
{ type: 1, fieldName: 'cgbl', value: '', placeholder: '持股比例', options: [],width:100, uid: this.getUid()},
// { type: 3, fieldName: 'searchValue', value: '', placeholder: '搜索中标成员名称/项目名称'},
{ type: 3, fieldName: 'searchValue', value: '', placeholder: '输入关键词查询', uid: this.getUid()},
......
......@@ -226,7 +226,8 @@ export default {
<style lang="scss">
.custom-money-select {
width: 120px;
/*width: 120px;*/
width: auto;
height: 34px;
position: relative;
.el-input__inner{
......
......@@ -238,7 +238,8 @@ export default {
<style lang="scss">
.custom-time-select {
width: 120px;
/*width: 120px;*/
width: auto;
height: 34px;
.rote {
......
......@@ -5,14 +5,6 @@
<div class="flex-box query-params">
<span class="common-title" v-if="title">{{ title }}</span>
</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','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 class="flex-box query-box" v-if="formData.length > 0">
<div class="flex-box query-params">
......@@ -105,7 +97,10 @@
</div>
</div>
</div>
<div v-if="!title" class="flex-box">
<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','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>
......
<template>
<div class="head-form-new" v-if="title === '集团业绩'">
<div class="common-title" v-if="title">{{ title }}</div>
<div class="flex-box query-box" style="margin-bottom: 12px;">
<div class="flex-box query-params">
</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 class="flex-box query-box">
<div class="flex-box query-params">
<div class="headForm-from">
<div class="from-item" :key="i" v-for="(form, i) in formData">
<!-- 单选 -->
<template v-if="form.type==1">
<el-select v-model="form.value" clearable class="form-content-width same-select-com" :class="[`select-adaptive-${form.uid}`]"
:style="form.width?'width:'+form.width+'px':'max-width: 110px'" :placeholder="form.placeholder" @change="iptAdaptive(form.uid)">
<el-option v-for="(item, index) in form.options" :key="index" :label="item.name" :value="item.value" :disabled="item.disabled" />
</el-select>
</template>
<!-- 年月日 -->
<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>
<!-- 输入框 -->
<template v-if="form.type==3">
<!-- 未点击前的输入框样式 -->
<div class="normal-search-container" @click="showSearchBox = true" v-if="!showSearchBox">
<img src="@/assets/images/enterprise/enterprise-search-icon.svg" alt="">
<span>搜索</span>
</div>
<!-- 输入框展开后样式 -->
<transition @enter="onEnter" appear mode="out-in">
<div class="cooperate-name enterprise-search-container" :id="'focus'+i" v-if="showSearchBox">
<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>
</transition>
</template>
<!-- 多选 -->
<template v-if="form.type==4">
<el-select class="form-content-width"
:class="form.value.length > 1 ? ['selectTag',`select-adaptive-${form.uid}`] : [`select-adaptive-${form.uid}`]" v-model="form.value"
multiple collapse-tags clearable :style="form.width?'width:'+form.width+'px':'max-width: 170px'" :placeholder="form.placeholder"
@change="iptAdaptive(form.uid,true)">
<el-option v-for="(item, index) in form.options" :key="index" :label="item.name" :value="item.value" />
</el-select>
</template>
<!-- 时间、自定义 -->
<template v-else-if="form.type==5">
<custom-time-select :class="[`select-adaptive-${form.uid}`,'custom-select']" :timeList="form.timeList" v-model="form.value"
:placeholder="form.placeholder" :dateFrom="form.dateFrom ? form.dateFrom : ''" :dateTo="form.dateTo ? form.dateTo : ''"
@handle-search="iptAdaptive(form.uid)" />
</template>
<!-- 金额 -->
<template v-else-if="form.type==6">
<custom-money-select :class="[`select-adaptive-${form.uid}`,'custom-select']" :moneyList="form.moneyList" v-model="form.value"
:placeholder="form.placeholder" @handle-search="iptAdaptive(form.uid)" />
</template>
<!-- 地区选择 -->
<template v-else-if="form.type==7">
<el-cascader :class="[`select-adaptive-${form.uid}`]" ref="cascader" :options="form.options" :props="form.props" v-model="form.value"
@change="iptAdaptive(form.uid,true)" :placeholder="form.placeholder" collapse-tags clearable></el-cascader>
</template>
<!-- 自定义 -->
<template v-if="form.type==0">
<slot name="slot"></slot>
</template>
</div>
</div>
</div>
</div>
</div>
<div class="head-form-new" v-else>
<div class="head-form-new">
<div class="common-title" v-if="title">{{ title }}</div>
<div class="flex-box query-box">
<div class="flex-box query-params">
......@@ -158,7 +73,7 @@
</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
<span class="flex-box ability-excel" v-hasPermi="['combine:info:export:win:bid','combine:info:export: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>
......@@ -391,7 +306,8 @@ export default {
::v-deep .el-cascader {
height: 34px;
line-height: 34px;
width: 190px;
/*width: 190px;*/
width: auto;
.el-input {
input {
height: 34px !important;
......@@ -502,7 +418,8 @@ export default {
}
}
::v-deep .form-content-width {
width: 170px;
/*width: 170px;*/
/*width: auto;*/
}
::v-deep .selectTag {
.el-select__tags {
......
......@@ -2,7 +2,7 @@
<div class="regionalEconomy">
<div class="flex-box query-box">
<div class="flex-box query-params">
<span class="common-title">指标</span>
<!--<span class="common-title">指标</span>-->
<el-form ref="queryForm" :model="queryParams" :inline="true" size="small">
<el-form-item prop="year">
<el-select v-model="queryParams.year" filterable class="form-content-width" placeholder="请选择">
......@@ -649,16 +649,21 @@ export default {
margin-top: 12px;
border-radius: 4px;
.el-form{
margin-left: 20px;
/*margin-left: 20px;*/
.el-form-item{
margin: 0 !important;
.form-content-width{
width: 110px;
}
::v-deep .el-input{
.el-input__inner{
border: 0;
}
}
}
}
.table-item{
margin-top: 22px;
margin-top: 16px;
position: relative;
::v-deep .el-table{
.el-table__body{
......
......@@ -2,10 +2,10 @@
<div class="regionalEconomy">
<div class="flex-box query-box">
<div class="flex-box query-params">
<span class="common-title">主要指标</span>
<!--<span class="common-title">主要指标</span>-->
<el-form ref="queryForm" :model="queryParams" :inline="true" size="small">
<el-form-item prop="year">
<el-select v-model="queryParams.year" filterable class="form-content-width" placeholder="请选择年度" @change="getGroupCount">
<el-select v-model="queryParams.year" filterable class="form-content-width" placeholder="请选择" @change="getGroupCount">
<el-option v-for="(item, index) in yearOptions" :key="index" :label="item.year" :value="item.year" />
</el-select>
</el-form-item>
......@@ -344,16 +344,21 @@ export default {
margin-top: 12px;
border-radius: 4px;
.el-form{
margin-left: 24px;
/*margin-left: 24px;*/
.el-form-item{
margin: 0 !important;
.form-content-width{
width: 100px;
}
::v-deep .el-input{
.el-input__inner{
border: 0;
}
}
}
}
.content{
margin-top: 22px;
margin-top: 16px;
display: flex;
justify-content: space-between;
.content-left{
......
......@@ -193,12 +193,17 @@ export default {
<style lang="scss" scoped>
.regionalEconomy{
.el-form{
margin-left: 24px;
/*margin-left: 24px;*/
.el-form-item{
margin: 0 !important;
.form-content-width{
width: 100px;
}
::v-deep .el-input{
.el-input__inner{
border: 0;
}
}
}
}
.content{
......@@ -209,7 +214,7 @@ export default {
border-radius: 4px;
}
.table-item{
margin-top: 22px;
margin-top: 16px;
::v-deep .el-table{
overflow:visible;
.el-table__header-wrapper{
......
......@@ -3,7 +3,7 @@
<skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
<div v-if="state && !isSkeleton">
<div class="content content1">
<div class="common-title">经济数据</div>
<!--<div class="common-title">经济数据</div>-->
<div class="content-box">
<div class="item">
<div class="item-title"><i style="background: #4E8EFF;"></i>{{recentlyYear.year}}年GDP</div>
......
......@@ -36,10 +36,11 @@
</div>
</div>
<div v-if="!isSkeleton" class="content">
<div class="common-title flex-box">
<div class="flex-box">项目明细</div>
<div class="flex-box query-box">
<div class="flex-box query-ability">
<span class="total">{{tableDataTotal}}</span>
</div>
<div class="flex-box query-ability">
<span class="flex-box">{{tableDataTotal}}</span>
<span class="flex-box" @click="handleMessage"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
</div>
</div>
......@@ -433,6 +434,14 @@ export default {
color: #3D3D3D;
font-size: 12px;
}
/*.total:before {*/
/*content: "";*/
/*display: inline-block;*/
/*width: 2px;*/
/*height: 2px;*/
/*background: rgba(35, 35, 35, 0.4);*/
/*margin-right: 4px;*/
/*}*/
}
.content{
background: #ffffff;
......
......@@ -3,7 +3,7 @@
<div class="content">
<div class="flex-box query-box">
<div class="flex-box query-params">
<span class="common-title">全国经济大全</span>
<!--<span class="common-title">全国经济大全</span>-->
<el-form ref="queryForm" :model="queryParams" :inline="true" size="small">
<el-form-item prop="year">
<el-select v-model="queryParams.year" filterable class="form-content-width same-select-com" placeholder="请选择" :class="[`select-adaptive-${inputID1}`]" @change="handleSearch" :popper-append-to-body='false'>
......@@ -455,7 +455,7 @@
}
.query-params{
.el-form{
margin-left: 24px;
/*margin-left: 24px;*/
}
::v-deep .el-form{
.el-form-item--small.el-form-item{
......
......@@ -772,11 +772,22 @@ export default {
margin-right: 24px;
}
::v-deep .form-content-width{
width: 150px;
width: 135px;
.el-select__input{
width: 10px !important;
max-width: 10px !important;
margin-left:0;
border: 0;
}
.el-input{
.el-input__inner{
border: 0;
}
}
.is-focus{
.el-input__inner{
background: #F4F6F9;
}
}
}
::v-deep .el-cascader{
......
......@@ -659,19 +659,29 @@
margin-right: 24px;
}
::v-deep .form-content-width{
width: 150px;
width: 145px;
.el-select__input{
width: 10px !important;
max-width: 10px !important;
margin-left:0;
}
.el-input{
.el-input__inner{
border: 0;
}
}
.is-focus{
.el-input__inner{
background: #F4F6F9;
}
}
}
::v-deep .el-cascader{
width: 220px;
.el-cascader__tags{
flex-wrap: inherit;
.el-tag{
max-width: 130px;
max-width: 70px;
}
}
}
......
......@@ -1193,19 +1193,29 @@
margin-right: 24px;
}
::v-deep .form-content-width{
width: 150px;
width: 145px;
.el-select__input{
width: 10px !important;
max-width: 10px !important;
margin-left:0;
}
.el-input{
.el-input__inner{
border: 0;
}
}
.is-focus{
.el-input__inner{
background: #F4F6F9;
}
}
}
::v-deep .el-cascader{
width: 220px;
.el-cascader__tags{
flex-wrap: inherit;
.el-tag{
max-width: 130px;
max-width: 70px;
}
}
}
......
......@@ -136,11 +136,12 @@
</div>
<div class="content" id="content">
<div class="flex-box query-box">
<div class="flex-box query-params">
<span class="common-title">城投平台列表</span>
</div>
<div class="flex-box query-ability">
<!--<span class="common-title">城投平台列表</span>-->
<span class="total">共{{tableDataTotal}}条</span>
</div>
<div class="flex-box query-ability">
<!--<span class="total">共{{tableDataTotal}}条</span>-->
<span class="flex-box" @click="handleMessage"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
</div>
</div>
......
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