Skip to content

D
dsk-cr20g
Commit 9124a0ec authored by lixiaolei's avatar lixiaolei
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 27a06ad7 594254a0
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 42 deletions
dsk-operate-ui/src/assets/styles/public.css
View file @ 9124a0ec
......@@ -270,6 +270,9 @@ select {
cursor: pointer;
position: relative;
}
.select-popper .select-active{
color: #0381fa;
}
.content_item .select-popper:hover .select-caret {
color: #0074E5;
......
dsk-operate-ui/src/views/radar/components/Bidding/index.vue
View file @ 9124a0ec
......@@ -185,11 +185,11 @@
</p>
<p class="list-content-text">
<span>预计招标时间：</span>
<span>{{item.issueTimestamp||'--'}}</span>
<span>{{item.planTenderDateStart||'--'}}</span>
</p>
<p class="list-content-text">
<span>来源网站：</span>
<span >{{item.issueTimestamp||'--'}}</span>
<span >{{item.sourceName||'--'}}</span>
</p>
......
dsk-operate-ui/src/views/radar/components/Establishment/index.vue
View file @ 9124a0ec
......@@ -1057,8 +1057,6 @@
reset() {
Object.assign(this.$data, this.$options.data.call(this)); //重置data
this.init();
this.$emit("reset");
this.token = getCookie("tokenNew");
},
init() {
this.search();
......
dsk-operate-ui/src/views/radar/components/Land/index.vue
View file @ 9124a0ec
......@@ -234,15 +234,19 @@
<div class="list-content">
<p class="list-content-text">
<span>受让人：</span>
<router-link :to="'/company/' + encodeStr(item.id) + '/?index=true'" tag="a" class="list-titel-a blue" v-html="item.companyName"></router-link>
<span v-if="item.companyName">
<router-link :to="'/company/' + encodeStr(item.id) + '/?index=true'" tag="a" class="list-titel-a blue" v-html="item.companyName"></router-link>
</span>
<span v-else>--</span>
</p>
<p class="list-content-text">
<span>成交金额：</span>
<span>{{item.transactionPrice||'--'}}</span>
<span>{{item.transactionPrice||'--'}}万元</span>
</p>
<p class="list-content-text">
<span>总面积：</span>
<span>{{item.acreage||'--'}}</span>
<span>{{item.acreage||'--'}}㎡</span>
</p>
<p class="list-content-text">
<span>合同签订：</span>
......@@ -254,6 +258,10 @@
<span>土地用途：</span>
<span >{{item.landUse||'--'}}</span>
</p>
<p class="list-content-text">
<span>行业分类：</span>
<span >{{item.industry||'--'}}</span>
</p>
<p class="list-content-text">
<span>供应方式：</span>
<span >{{item.supplyLandWay||'--'}}</span>
......@@ -275,7 +283,8 @@
</p>
<p class="list-content-text">
<span>土地坐落：</span>
<span >{{item.landAddr||'--'}}</span>
<span v-if="item.landAddr" v-html="item.landAddr"></span>
<span v-else>--</span>
</p>
</div>
</li>
......@@ -562,7 +571,7 @@
searchDic(){
api.searchDic().then(res=>{
this.landMarketIndustryList = res.landMarketIndustry;
this.landUseOptions = res.data.landUse
this.landUseOptions = res.landUse
}).catch(error=>{
});
......
dsk-operate-ui/src/views/radar/components/bxprozbgg/index.vue
View file @ 9124a0ec
......@@ -63,7 +63,7 @@
工程类型{{jskBidNewsDto.projectType.length? jskBidNewsDto.projectType.length + "项": ""}}
<i class="el-icon-caret-bottom"></i>
</span>
<el-select v-model="jskBidNewsDto.projectType" class="select-multiple" multipleplaceholder="请选择">
<el-select v-model="jskBidNewsDto.projectType" class="select-multiple" multiple placeholder="请选择">
<el-option v-for="(item, i) in projectTypeList" :key="i":label="item" :value="item">
</el-option>
</el-select>
......@@ -283,7 +283,7 @@
<div class="label">人员要求</div>
<div class="content_right">
<el-input class="ename_input"
placeholder="请输入关键词句，如：建筑工程" v-model="jskBidNewsDto.personLimit" ></el-input>
placeholder="请输入关键词句，如：一级建造师" v-model="jskBidNewsDto.personLimit" ></el-input>
<span class="land_content_wrap_label_tipspan">
<el-tooltip popper-class="explain_tooltip" content="根据输入的关键词全称进行匹配"
placement="bottom" effect="light">
......@@ -882,7 +882,8 @@
created() {
this.searchDic();
this.clickProvince(0,1);
this.bxproggSearch();
this.search();
this.changeDown(false)
},
mounted() {
},
......@@ -1002,7 +1003,7 @@
}
this.fieldText = this.fieldOptions[index].value;
this.fieldOptions[index].status = true;
this.bxproggSearch();
this.search();
},
//项目级别
addressListfn() {
......@@ -1431,12 +1432,12 @@
handleCurrentChange(e){
this.page = e;
this.jump1();
this.bxproggSearch(e, this.limit);
this.search(e, this.limit);
},
handleSizeChange(e){
this.limit = e;
this.jump1();
this.bxproggSearch(this.page, e);
this.search(this.page, e);
},
jump1() {
// 用 class="d_jump" 添加锚点
......@@ -1489,10 +1490,10 @@
},
lowerRateClick() {
this.bxproggSearch();
this.search();
},
bxproggSearch(page, limit,exportFlag){
search(page, limit,exportFlag){
// return false;
if (!page) {
this.page = 1;
......@@ -1504,6 +1505,7 @@
this.reloadPage();
}
var data = JSON.parse(JSON.stringify(this.jskBidNewsDto));
console.log(data);
if(this.projectTerritoryId.length >0){
for (var i=0;i<this.projectTerritoryId.length;i++){
......@@ -1561,8 +1563,17 @@
reset(){
Object.assign(this.$data, this.$options.data.call(this)); //重置data
// this.clickProvince(0,1);
this.bxproggSearch();
this.search();
},
changeDown(isHeight){
if(isHeight){
this.isHeight = false
this.maxHeight = 'auto'
}else{
this.isHeight = true
this.maxHeight = '36px'
}
},
provinceChange(e){
let obj=''
......
dsk-operate-ui/src/views/radar/components/debtProject/index.vue
View file @ 9124a0ec
......@@ -7,8 +7,8 @@
<el-input class="ename_input"
placeholder="请输入项目名称关键字" v-model="projectName" ></el-input>
<template v-if="projectName">
<span v-for=" (item,k) in enameQueryTypeList" :key="k" style="margin-right: 24px;">
<el-radio v-model="enameQueryType" :label="item.key">{{item.value}}</el-radio>
<span v-for=" (item,k) in nameTypeList" :key="k" style="margin-right: 24px;">
<el-radio v-model="nameType" :label="item.key">{{item.value}}</el-radio>
</span>
</template>
</div>
......@@ -66,7 +66,7 @@
项目类型{{projectType.length? projectType.length + "项": ""}}
<i class="el-icon-caret-bottom"></i>
</span>
<el-select v-model="projectType" class="select-multiple" multipleplaceholder="请选择">
<el-select v-model="projectType" class="select-multiple" multiple placeholder="请选择">
<el-option v-for="(item, i) in specialBondProjectType" :key="i":label="item" :value="item">
</el-option>
</el-select>
......@@ -108,7 +108,7 @@
</div>
<div class="list-content">
<p class="list-content-text" v-if="item.projectType">
<p class="list-content-text" v-if="item.projectType&&item.projectType!='空白'">
<span>项目类型：</span>
<span>{{item.projectType}}</span>
</p>
......@@ -116,27 +116,27 @@
<span>项目总投资(亿)：</span>
<span>{{item.projectTotalInvestment}}</span>
</p>
<p class="list-content-text" v-if="item.specialCapital">
<p class="list-content-text" v-if="item.projectCapital">
<span>项目资本金(亿)：</span>
<span>{{item.projectCapital}}</span>
</p>
<p class="list-content-text">
<p class="list-content-text" v-if="item.specialBondCapital">
<span>专项债金额(亿)：</span>
<span>{{item.specialCapital}}</span>
<span>{{item.specialBondCapital}}</span>
</p>
</div>
<div class="list-content">
<p class="list-content-text" v-if="item.specialCapital">
<p class="list-content-text" v-if="item.projectEntity">
<span>项目主体：</span>
<span >{{item.projectEntity}}</span>
<span v-html="item.projectEntity"></span>
</p>
<p class="list-content-text" v-if="item.chargeDepartment">
<span>主管部门：</span>
<span >{{item.chargeDepartment}}</span>
<span v-html="item.chargeDepartment"></span>
</p>
<p class="list-content-text" v-if="item.piu">
<span>实施单位：</span>
<span >{{item.piu}}</span>
<span v-html="item.piu"></span>
</p>
</div>
</li>
......@@ -171,20 +171,18 @@
return {
encodeStr,
projectName:'',
enameQueryTypeList: [{
key: 'and',
nameTypeList: [{
key: 'like',
status: false,
value: '模糊搜索',
keyid: 'businessScope'
},
{
key: 'or',
key: 'match',
status: true,
value: '精准匹配',
keyid: 'businessScope'
},
],
enameQueryType: 'or',
nameType: 'match',
projectEntity:'',
countTypelist: [{
key: '1',
......@@ -201,7 +199,7 @@
],
chargeDepartment: {
key: '3',
value: '实施单位'
value: '项目主体'
},
addressList: [],
addressType: [],
......@@ -213,7 +211,7 @@
specialBondProjectType: [
],
projectTypeText: ['不限'],
projectType:['不限'],
projectType:[],
arrList:[],
pageFlag:true,
......@@ -226,11 +224,14 @@
}
},
created() {
this.addressListfn();
this.searchDic();
this.search();
this.init();
},
methods: {
init(){
this.addressListfn();
this.searchDic();
this.search();
},
searchDic(){
api.searchDic().then(res=>{
this.specialBondProjectType=res.specialBondProjectType;
......@@ -444,7 +445,7 @@
if(this.projectName){
params.specialBondProjectDto['projectName']=this.projectName;
params.specialBondProjectDto['enameQueryType']=this.enameQueryType;
params.specialBondProjectDto['nameType']=this.nameType;
}
if(this.projectEntity){
......@@ -534,7 +535,8 @@
return this.hasValue;
},
reset(){
Object.assign(this.$data, this.$options.data.call(this)); //重置data
this.init();
}
}
}
......
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