Skip to content

D
dsk-cr20g
Commit 19359b8c authored by 远方不远's avatar 远方不远
Browse files
Options

hy

parent b77ffd8b
Show whitespace changes
Inline Side-by-side
Showing with 154 additions and 58 deletions
dsk-operate-ui/src/assets/styles/public.css
View file @ 19359b8c
......@@ -158,11 +158,11 @@ select {
}
.el-popper[x-placement^=top] {
margin-bottom: 12px;
margin-bottom: 4px;
}
.el-popper[x-placement^=bottom] {
margin-top: 12px;
margin-top: 4px;
}
.el-select-dropdown .popper__arrow {
......@@ -390,12 +390,13 @@ select {
height: 0px;
opacity: 1;
border-bottom: 1px solid #EFEFEF;
margin: 16px 0px;
margin-top: 20px;
margin-bottom: 24px;
}
.content_item .search-new {
width: 100%;
padding-bottom: 16px;
padding-bottom: 24px;
}
.content_item .search-new span:last-child {
......@@ -433,6 +434,7 @@ select {
border-color: #0081FF;
}
.toolbar-right-download {
padding: 6px 18px;
margin: 0px;
......@@ -1181,6 +1183,6 @@ select {
font-weight: 400;
color: #999999;
line-height: 18px;
margin-bottom: 24px;
padding-bottom: 48px;
text-align: center;
}
\ No newline at end of file
dsk-operate-ui/src/views/enterpriseData/components/Owner/index.vue
View file @ 19359b8c
......@@ -689,7 +689,7 @@ export default {
if(val.length>0){
this.checkuipExecutive=false;
}else if(val.length==0){
this.checkuipExecutive==true;
this.checkuipExecutive=true;
}
this.search();
......
dsk-operate-ui/src/views/enterpriseData/components/SearchEnterprise/index.vue
View file @ 19359b8c
......@@ -5,13 +5,13 @@
<div class="content_item">
<div class="content_right item_ckquery_list">
<el-input class="ename_input" placeholder="请输入关键字，如企业名称、统一社会信用代码等" v-model="ename" @input="projectNamebtn('ename',ename,'关键字:')">
<div slot="append" class="btn-search" @click="submitbtn">搜索</div>
<div slot="append" class="btn-search" @click="search">搜索</div>
</el-input>
<template v-if="ename">
<!-- <template v-if="ename">
<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>
</template>
</template> -->
</div>
</div>
<div class="content_item">
......@@ -243,7 +243,7 @@
<div class="select-popper">
<el-dropdown trigger="click" ref="establishPopper" placement='bottom-start'>
<div class=" "
<div class="el-dropdown-link"
:class="(establishText!='不限'&&establishText!='自定义')||(establishText=='自定义'&&startTimetext.length>0)?'select-active':''">
成立年限{{(establishText!='不限'&&establishText!='自定义')||(establishText=='自定义'&&startTimetext.length>0)?('1项'):''}}
<i class="el-icon-caret-bottom"></i>
......@@ -417,7 +417,7 @@
<div class="content_item content_item_nopadding ">
<div class="search-new" >
<span @click="submitbtn()">查询</span>
<span @click="search()">查询</span>
<span @click="reset()">重置</span>
</div>
......@@ -441,7 +441,7 @@
</el-popover>
<div class="toolbar-right-search">
<el-input placeholder="请输入企业名称关键词" class="toolbar-right_input" v-model="resultEname">
<div slot="append" class="result-search" @click="submitbtn()">过滤企业</div>
<div slot="append" class="result-search" @click="search()">过滤企业</div>
</el-input>
</div>
</div>
......@@ -1418,7 +1418,7 @@
});
this.getRegionWebList();
this.getaddressList();
this.submitbtn();
this.search();
},
mounted() {
......@@ -2608,6 +2608,7 @@
this.getaddressList();
this.getRegionWebList();
this.search();
},
reloadPage() {
......@@ -2642,8 +2643,7 @@
}
},
// submitbtn
submitbtn(page, limit,exportFlag){
search(page, limit,exportFlag){
// return false;
if (!page) {
this.page = 1;
......
dsk-operate-ui/src/views/radar/BidRecord/details.vue
View file @ 19359b8c
......@@ -45,7 +45,7 @@
:data="tableData"
element-loading-text="Loading"
border
fit
highlight-current-row
>
<el-table-column label="序号" width="80">
......@@ -56,7 +56,7 @@
<el-table-column label="项目名称" >
<template slot-scope="scope">
<router-link v-if="scope.row.companyId" :to="'/company/' + encodeStr(scope.row.companyId) + '/?index=true'" tag="a" class="list-titel-a blue" v-html="scope.row.name"></router-link>
<router-link v-if="scope.row.id" :to="'/company/' + encodeStr(scope.row.id) + '/?index=true'" tag="a" class="list-titel-a blue" v-html="scope.row.name"></router-link>
</template>
</el-table-column>
......@@ -376,6 +376,11 @@
.main5 {
.table-item {
margin-top: 22px;
.blue {
color: #0081FF !important;
cursor: pointer;
}
}
.pagination {
padding: 14px;
......
dsk-operate-ui/src/views/radar/Land/details.vue
View file @ 19359b8c
......@@ -19,12 +19,12 @@
<p class="list-content-text">
<span>成交金额：</span>
<span v-if="textList.transactionPrice">{{textList.transactionPrice}}万元</span>
<span>--</span>
<span v-else>--</span>
</p>
<p class="list-content-text">
<span>总面积：</span>
<span v-if="textList.transactionPrice">{{textList.transactionPrice}}平方米</span>
<span>--</span>
<span v-else>--</span>
</p>
<p class="list-content-text">
<span>合同签订：</span>
......@@ -134,7 +134,7 @@
<p>
<label class="label">地块名称</label>
<span>{{textList.landName||"--"}}</span>
<label class="label">建筑面积</label>
<label class="label">建筑面积(平方米)</label>
<span>{{textList.buildArea||"--"}}</span>
</p>
<p>
......
dsk-operate-ui/src/views/radar/bxprozbgg/details.vue
View file @ 19359b8c
......@@ -37,19 +37,24 @@
<div class="common-title-list">
<p>
<img src="@/assets/images/bxpro/pdf.png" alt="">
<span>竞争对手</span>
<span v-if="textList.marketAnalysis" @click="download(textList.marketAnalysis,'项目简析')">竞争对手</span>
<span v-else class="spanset">竞争对手</span>
</p>
<p>
<img src="@/assets/images/bxpro/pdf.png" alt="">
<span>项目简析</span>
<span v-if="textList.projectCharacteristics" @click="download(textList.projectCharacteristics,'项目简析')">项目简析</span>
<span v-else class="spanset">项目简析</span>
</p>
<p>
<img src="@/assets/images/bxpro/pdf.png" alt="">
<span>成本分析</span>
<span v-if="textList.costAnalysis" @click="download(textList.costAnalysis,'成本分析')">成本分析</span>
<span v-else class="spanset">成本分析</span>
</p>
<p>
<img src="@/assets/images/bxpro/pdf.png" alt="">
<span>招标文件</span>
<span v-if="textList.fileUrl&&textList.fileUrl.length>0" @click="download(textList.fileUrl[0],'招标文件')">招标文件</span>
<span v-else class="spanset">招标文件</span>
</p>
</div>
......@@ -215,7 +220,6 @@
}
},
created() {
console.log(this.$route.params)
this.id = this.$route.params.id;
this.bidNoticeProDetail();
},
......@@ -224,12 +228,36 @@
api.bidNoticeProDetail({
id: this.id
}).then(res => {
// console.log(res);
this.textList = res.data;
if(this.textList.eligibleEnterprisesUrl){
let tempUrl = this.textList.eligibleEnterprisesUrl.replace('http://', 'https://')
this.textList.eligibleEnterprisesUrl = tempUrl
}
if(this.textList.fileUrl&&this.textList.fileUrl.length>0){
this.textList.fileUrl=this.textList.fileUrl.substr(2,this.textList.fileUrl.length-4);
this.textList.fileUrl=this.textList.fileUrl.split(',');
this.textList.fileUrl = this.textList.fileUrl.map(item=>{
let it = item.replace('http://', 'https://')
return it
})
}
}).catch(error => {
});
},
download(url,name){
console.log(url);
const a = document.createElement('a');
a.style.display = 'none';
a.download = name;
a.href = url;
a.target="_blank";
document.body.appendChild(a);
a.click();
document.body.removeChild(a);
}
}
}
......@@ -466,6 +494,10 @@
width: 14px;
margin-right: 4px;
}
.spanset{
color: #23232366;
cursor: text;
}
}
p:hover{
color: #0081FF;
......
dsk-operate-ui/src/views/radar/components/Establishment/index.vue
View file @ 19359b8c
......@@ -211,7 +211,8 @@
<div class="list-content">
<p class="list-content-text" v-if="item.companyName">
<span>项目业主：</span>
<router-link :to="`/company/${encodeStr(item.companyId)}/`" tag="a" class="list-titel-a blue" v-html="item.companyName" ></router-link>
<span><router-link :to="`/company/${encodeStr(item.companyId)}/`" tag="a" class="list-titel-a blue" v-html="item.companyName" ></router-link></span>
</p>
<p class="list-content-text"v-if="item.money">
......
dsk-operate-ui/src/views/radar/components/Land/index.vue
View file @ 19359b8c
......@@ -236,45 +236,44 @@
<router-link :to="'/radar/Land/details/'+ item.id" tag="a" class="list-titel-a" v-html="item.projectName"></router-link>
</p>
<div class="list-content">
<p class="list-content-text">
<div class="list-content" v-if="item.companyName||item.transactionPrice||item.acreage||item.acreage">
<p class="list-content-text" v-if="item.companyName">
<span>受让人：</span>
<span v-if="item.companyName">
<span >
<router-link :to="'/company/' + encodeStr(item.companyId) + '/?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">
<p class="list-content-text" v-if="item.transactionPrice">
<span>成交金额：</span>
<span>{{item.transactionPrice||'--'}}万元</span>
</p>
<p class="list-content-text">
<p class="list-content-text" v-if="item.acreage">
<span>总面积：</span>
<span>{{item.acreage||'--'}}㎡</span>
</p>
<p class="list-content-text">
<p class="list-content-text" v-if="item.contractSignTime">
<span>合同签订：</span>
<span>{{item.contractSignTime||'--'}}</span>
</p>
</div>
<div class="list-content">
<p class="list-content-text">
<div class="list-content" v-if="item.landUse||item.industry||item.supplyLandWay">
<p class="list-content-text" v-if="item.landUse">
<span>土地用途：</span>
<span >{{item.landUse||'--'}}</span>
</p>
<p class="list-content-text">
<p class="list-content-text" v-if="item.industry">
<span>行业分类：</span>
<span >{{item.industry||'--'}}</span>
</p>
<p class="list-content-text">
<p class="list-content-text" v-if="item.supplyLandWay">
<span>供应方式：</span>
<span >{{item.supplyLandWay||'--'}}</span>
</p>
</div>
<div class="list-content list-addree">
<div class="list-content list-addree" v-if="item.province||item.city||item.area||item.landAddr">
<img src="@/assets/images/addree.png" alt="">
<p class="list-content-text">
<p class="list-content-text" v-if="item.province||item.city||item.area">
<span>行政区划：</span>
<span >
{{item.province}}
......@@ -286,10 +285,9 @@
</template>
</span>
</p>
<p class="list-content-text">
<p class="list-content-text" v-if="item.landAddr">
<span>土地坐落：</span>
<span v-if="item.landAddr" v-html="item.landAddr"></span>
<span v-else>--</span>
<span v-html="item.landAddr"></span>
</p>
</div>
</li>
......
dsk-operate-ui/src/views/radar/components/bxprozbgg/index.vue
View file @ 19359b8c
......@@ -373,11 +373,44 @@
</el-table-column>
<el-table-column prop="zj" label="项目金额" width="161" >
<template slot-scope="scope">
{{ scope.row.projectAmount||'--'}}
<ul class="bxpro_list_money">
<template v-if="scope.row.projectInvestmentAmount ||
scope.row.projectContractAmount ||
scope.row.projectSafeAmount ||
scope.row.projectSurveyAmount ||
scope.row.projectDesignAmount">
<li v-if="scope.row.projectInvestmentAmount">
<span >
<span >投资额：{{ scope.row.projectInvestmentAmount }}万元</span>
</span>
</li>
<li v-if="scope.row.projectContractAmount">
<span >
<span >控制价：{{ scope.row.projectContractAmount }}万元</span>
</span>
</li>
<li v-if="scope.row.projectSafeAmount">
<span >
<span >建安费：{{ scope.row.projectSafeAmount }}万元</span>
</span>
</li>
<li v-if="scope.row.projectSurveyAmount">
<span >
<span >勘察费：{{ scope.row.projectSurveyAmount }}万元</span>
</span>
</li>
<li v-if="scope.row.projectDesignAmount">
<span >
<span >设计费：{{ scope.row.projectDesignAmount }}万元</span>
</span>
</li>
</template>
<li v-else>--</li>
</ul>
</template>
</el-table-column>
<el-table-column prop="zj" label="债券保证金（万元）" width="146" >
<el-table-column prop="zj" label="投标保证金（万元）" width="146" >
<template slot-scope="scope">
{{ scope.row.projectEnsureAmount||'--'}}
</template>
......@@ -1962,6 +1995,16 @@
.list-titel-a{
color:#0081FF;
}
.bxpro_list_money{
li{
margin-bottom: 8px;
line-height: 18px;
display: flex;
&:last-child{
margin-bottom: 0;
}
}
}
}
.bottomlist-content{
......
dsk-operate-ui/src/views/radar/components/debtProject/index.vue
View file @ 19359b8c
<template>
<div>
<div class="content">
<div class="content_item">
<div class="content_item content_item_padding0">
<div class="label">项目名称</div>
<div class="content_right">
<el-input class="ename_input"
......@@ -13,7 +13,7 @@
</template>
</div>
</div>
<div class="content_item">
<div class="content_item ">
<div class="label">项目主体</div>
<div class="content_right">
<div class="item_ckquery_list" >
......@@ -21,7 +21,7 @@
<el-input ref="inp"
v-model="projectEntity" autocomplete="off" type="text"
class="register_count_ipt" placeholder="请输入企业名称">
<el-dropdown trigger="click" slot="prepend" style="cursor:pointer;"
<el-dropdown trigger="click" slot="prepend" placement="bottom-start" style="cursor:pointer;"
@command="changeCommand">
<span class="el-dropdown-link">
{{chargeDepartment.value}}<i class="el-icon-caret-bottom"></i>
......@@ -35,7 +35,7 @@
</div>
</div>
</div>
<div class="content_item">
<div class="content_item content_item16">
<div class="label">项目地区</div>
<div class="content_right">
<div class="select-popper">
......@@ -51,7 +51,7 @@
</div>
</div>
</div>
<div class="content_item">
<div class="content_item content_item16">
<div class="label">项目类型</div>
<div class="content_right">
<!-- <div class="content-projecttype">
......@@ -178,16 +178,16 @@
projectName:'',
nameTypeList: [{
key: 'like',
status: false,
status: true ,
value: '模糊搜索',
},
{
key: 'match',
status: true,
status: false,
value: '精准匹配',
},
],
nameType: 'match',
nameType: 'like',
projectEntity:'',
countTypelist: [{
key: '1',
......@@ -550,10 +550,11 @@
<style lang="scss" scoped>
.content{
padding: 0px 16px;
padding-top: 16px;
border-radius: 4px 4px 4px 4px;
background: #FFFFFF;
.content_item{
padding-top: 12px;
padding-top: 20px;
display: flex;
align-items: center;
.label{
......@@ -577,6 +578,7 @@
}
.item_ckquery_list .el-input__icon {
position: relative;
top: 1px;
......@@ -593,6 +595,10 @@
}
::v-deep .el-input-group__prepend{
padding: 0 8px;
background-color:#F3F4F5;
border-radius:2px;
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
.content-projecttype{
display: flex;
......@@ -626,8 +632,12 @@
.content_item_padding0{
padding: 0;
}
.content_item18{
padding-top: 16px;
}
}
.bottomlist{
width: 100%;
background-color: #FFFFFF;
......@@ -679,7 +689,8 @@
}
}
.content-label{
margin-top: 7px;
margin-top: 5px;
margin-bottom: 5px;
.list-label{
background: #F3F3FF;
color: #8491E8;
......@@ -703,7 +714,7 @@
display: flex;
justify-content: start;
align-items: center;
margin-right: 27px;
margin-right: 32px;
font-size: 14px;
span:first-child{
......
dsk-operate-ui/src/views/radar/index.vue
View file @ 19359b8c
......@@ -9,9 +9,10 @@
<p>{{itme.value}}</p>
</div>
</div>
<p class="solid"></p>
</div>
</div>
<p class="solid"></p>
</div>
<!-- 企业专项债 -->
<debtProject v-if="personnelHerf=='debtProject'" />
......@@ -168,8 +169,11 @@
top: -1px;
margin-right: 6px;
}
.app-container .content{
position: relative;
}
.app-container .combined-title .title-right .solid {
.app-container .solid {
width: 100%;
height: 1px;
background-color: #EEEEEE;
......
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