Skip to content

D
dsk-cr20g
Commit 72e53319 authored by huangjie's avatar huangjie
Browse files
Options

Merge branch 'master' of http://192.168.60.201/root/dsk-operate-sys

parents 13f737d6 0f42c188
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1286 additions and 1342 deletions
dsk-admin/src/main/java/com/dsk/web/controller/search/controller/CompanySearchController.java
View file @ 72e53319
...@@ -42,6 +42,8 @@ public class CompanySearchController { ...@@ -42,6 +42,8 @@ public class CompanySearchController {
*/ */
@PostMapping("/page") @PostMapping("/page")
public AjaxResult page(@RequestBody ComposeQueryDto compose) { public AjaxResult page(@RequestBody ComposeQueryDto compose) {
compose.getPage().setPage(compose.getPageNum());
compose.getPage().setLimit(compose.getPageSize());
return opportunityRadarService.enterprisePage(compose); return opportunityRadarService.enterprisePage(compose);
} }
} }
dsk-common/src/main/java/com/dsk/common/dtos/ComposeQueryDto.java
View file @ 72e53319
package com.dsk.common.dtos; package com.dsk.common.dtos;
import com.dsk.common.core.domain.model.BasePage;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
...@@ -10,7 +11,7 @@ import java.util.List; ...@@ -10,7 +11,7 @@ import java.util.List;
* *
*/ */
@Data @Data
public class ComposeQueryDto { public class ComposeQueryDto extends BasePage {
String region; String region;
......
dsk-operate-ui/src/api/radar/radar.js
View file @ 72e53319
import request from '@/utils/request' import request from '@/utils/request'
// 导入客户列表 // 导入客户列表
let importData= function importData(param) { let importData = function importData(param) {
return request({ return request({
url: '/customer/importData', url: '/customer/importData',
method: 'POST', method: 'POST',
...@@ -8,7 +8,7 @@ let importData= function importData(param) { ...@@ -8,7 +8,7 @@ let importData= function importData(param) {
}) })
} }
// 查询条件字段 // 查询条件字段
let searchDic= function searchDic(param) { let searchDic = function searchDic(param) {
return request({ return request({
url: 'https://files.jiansheku.com/file/json/common/searchDic.json', url: 'https://files.jiansheku.com/file/json/common/searchDic.json',
method: 'get', method: 'get',
...@@ -16,7 +16,7 @@ let searchDic= function searchDic(param) { ...@@ -16,7 +16,7 @@ let searchDic= function searchDic(param) {
}) })
} }
// 专项债项目查询 // 专项债项目查询
let bondProjectPage= function bondProjectPage(param) { let bondProjectPage = function bondProjectPage(param) {
return request({ return request({
url: '/radar/bondProjectPage', url: '/radar/bondProjectPage',
method: 'post', method: 'post',
...@@ -24,7 +24,7 @@ let bondProjectPage= function bondProjectPage(param) { ...@@ -24,7 +24,7 @@ let bondProjectPage= function bondProjectPage(param) {
}) })
} }
// 专项债项目详情查询 // 专项债项目详情查询
let specialDebtProjectDetail= function specialDebtProjectDetail(param) { let specialDebtProjectDetail = function specialDebtProjectDetail(param) {
return request({ return request({
url: '/enterpriseProject/specialDebtProjectDetail', url: '/enterpriseProject/specialDebtProjectDetail',
method: 'post', method: 'post',
...@@ -32,14 +32,123 @@ let specialDebtProjectDetail= function specialDebtProjectDetail(param) { ...@@ -32,14 +32,123 @@ let specialDebtProjectDetail= function specialDebtProjectDetail(param) {
}) })
} }
// 专项债项目详情查询 // 专项债项目详情查询
let specialDebtPage= function specialDebtPage(param) { let specialDebtPage = function specialDebtPage(param) {
return request({ return request({
url: '/enterpriseProject/specialDebtPage', url: '/enterpriseProject/specialDebtPage',
method: 'post', method: 'post',
data: param data: param
}) })
} }
// 土地交易查询
let landMarketPage = function landMarketPage(param) {
return request({
url: '/radar/landMarketPage',
method: 'post',
data: param
})
}
// 土地交易详情查询
let landDetail = function landDetail(param) {
return request({
url: '/enterpriseProject/landDetail',
method: 'post',
data: param
})
}
// 拟建查询
let establishmentPage = function establishmentPage(param) {
return request({
url: '/radar/establishmentPage',
method: 'post',
data: param
})
}
// 拟建详情查询
let approvalInfoDetail = function approvalInfoDetail(param) {
return request({
url: '/enterpriseProject/approvalInfoDetail',
method: 'post',
data: param
})
}
// 拟建详情立项审批列表查询
let approvalExaminePage = function approvalExaminePage(param) {
return request({
url: '/enterpriseProject/approvalExaminePage',
method: 'post',
data: param
})
}
// 拟建详情民间推介列表查询
let approvalMarketingPage = function approvalMarketingPage(param) {
return request({
url: '/enterpriseProject/approvalMarketingPage',
method: 'post',
data: param
})
}
// 招标计划查询
let jskBidPlanPage = function jskBidPlanPage(param) {
return request({
url: '/radar/jskBidPlanPage',
method: 'post',
data: param
})
}
// 招标计划资金来源下拉
let getCapitalSourceSelect = function getCapitalSourceSelect(param) {
return request({
url: '/radar/jskBidPlan/getCapitalSourceSelect',
method: 'post',
data: param
})
}
// 招标计划详情
let bidPlanDetail = function bidPlanDetail(param) {
return request({
url: '/enterpriseProject/bidPlanDetail',
method: 'post',
data: param
})
}
// 标讯pro
let jskBidNewsPage = function jskBidNewsPage(param) {
return request({
url: '/radar/jskBidNewsPage',
method: 'post',
data: param
})
}
// 标讯pro详情
export default {importData,searchDic,bondProjectPage,specialDebtProjectDetail,specialDebtPage} let bidNoticeProDetail = function bidNoticeProDetail(param) {
\ No newline at end of file return request({
url: '/enterpriseProject/bidNoticeProDetail',
method: 'post',
data: param
})
}
export default {
importData,
searchDic,
bondProjectPage,
specialDebtProjectDetail,
specialDebtPage,
landMarketPage,
landDetail,
establishmentPage,
approvalInfoDetail,
approvalExaminePage,
approvalMarketingPage,
jskBidPlanPage,
getCapitalSourceSelect,
bidPlanDetail,
jskBidNewsPage,
bidNoticeProDetail
}
\ No newline at end of file
dsk-operate-ui/src/assets/styles/public.css
View file @ 72e53319
...@@ -182,6 +182,9 @@ select { ...@@ -182,6 +182,9 @@ select {
cursor: pointer; cursor: pointer;
margin-right: 24px; margin-right: 24px;
} }
.select-popper .color_text{
color: #0381fa;
}
.select-popper .select-popper-img { .select-popper .select-popper-img {
width: 24px; width: 24px;
...@@ -303,6 +306,14 @@ select { ...@@ -303,6 +306,14 @@ select {
.el-dropdown-land { .el-dropdown-land {
margin-right: 24px; margin-right: 24px;
} }
.el-dropdown-land .color_text{
color: #1890ff;
background-color: #FFFFFF;
}
.el-dropdown-menu .color_text{
color: #1890ff;
background-color: #FFFFFF;
}
.el-dropdown-land .el-icon-caret-bottom { .el-dropdown-land .el-icon-caret-bottom {
color: #333333; color: #333333;
......
dsk-operate-ui/src/views/detail/party-a/component/HeadForm.vue
View file @ 72e53319
...@@ -171,9 +171,10 @@ export default { ...@@ -171,9 +171,10 @@ export default {
margin-right: 19px; margin-right: 19px;
} }
::v-deep .el-input__inner{ ::v-deep .el-input__inner{
border: 1px solid #EFEFEF; border: 1px solid #D9D9D9;
height: 32px; height: 32px;
line-height: 32px; line-height: 32px;
padding-right: 27px;
} }
::v-deep .el-form-item{ ::v-deep .el-form-item{
margin-right: 8px !important; margin-right: 8px !important;
...@@ -227,9 +228,10 @@ export default { ...@@ -227,9 +228,10 @@ export default {
flex: 1; flex: 1;
} }
::v-deep .el-input__inner { ::v-deep .el-input__inner {
border-right: 0;
border-radius: 2px 0 2px 0; border-radius: 2px 0 2px 0;
width: 180px; width: 180px;
border: 1px solid #D9D9D9;
border-right: 0;
} }
} }
.fromTime{ .fromTime{
...@@ -260,7 +262,7 @@ export default { ...@@ -260,7 +262,7 @@ export default {
::v-deep .el-select__tags{ ::v-deep .el-select__tags{
.el-tag{ .el-tag{
&:first-child{ &:first-child{
width: 100%; //width: 100%;
} }
} }
} }
......
dsk-operate-ui/src/views/radar/Bidding/details.vue
View file @ 72e53319
...@@ -3,52 +3,51 @@ ...@@ -3,52 +3,51 @@
<div class="bottomlist"> <div class="bottomlist">
<ul class="bottomlist-content"> <ul class="bottomlist-content">
<li class="bottomlist-list" > <li class="bottomlist-list" >
<p class="list-titel"> <p class="list-titel" v-html="textList.projectName">
绿色节能型压缩机基础件、汽车零配件新建项目 (芜湖旭日机械制造有限公司) <!-- <div v-else-if="item.projectName" ></div> -->
<!-- <div v-else-if="item.projectName" v-html="item.projectName"></div> -->
</p> </p>
<div class="content-label"> <div class="content-label">
<span class="list-label">市政工程</span> <span class="list-label list-label-zb" v-if="textList.province||textList.city||textList.district">
</div> {{textList.province}}
<template v-if="textList.city">
-{{textList.city}}
</template>
<template v-if="textList.district">
-{{textList.district}}
</template>
</span>
<span class="list-label list-label-lx" v-if="textList.objectType">{{textList.objectType}}</span>
<span class="list-label list-label-lx" v-if="textList.buildingProjectType">{{textList.buildingProjectType}}</span>
</div>
<div class="list-content"> <div class="list-content">
<p class="list-content-text"> <p class="list-content-text">
<span>招采单位：</span> <span>招采单位：</span>
<span class="blue">江西合胜合招标咨询有限公司</span> <span>{{textList.Name||'--'}}万元</span>
</p> </p>
<p class="list-content-text">
<span>代理单位：</span>
<span class="blue">江西合胜合招标咨询有限公司</span>
</p>
</div>
<div class="list-content">
<p class="list-content-text"> <p class="list-content-text">
<span>预算金款：</span> <span>预算金款：</span>
<span>123,456,78万元</span> <span>{{textList.planTenderAmount||'--'}}万元</span>
</p> </p>
<p class="list-content-text"> <p class="list-content-text">
<span>联系方式：</span> <span>资金来源：</span>
<span >招采单位 张工 123456789</span> <span >{{textList.projecetCapitalSource||'--'}}</span>
</p> </p>
</div> </div>
<div class="list-content"> <div class="list-content">
<p class="list-content-text"> <p class="list-content-text">
<span>发布时间：</span> <span>发布时间：</span>
<span >今日</span> <span >{{textList.issueTime||'--'}}</span>
</p>
<p class="list-content-text">
<span>报名截止日期：</span>
<span >2022-04-21</span>
</p> </p>
<p class="list-content-text"> <p class="list-content-text">
<span>开标时间：</span> <span>预计招标时间：</span>
<span >2022-04-21</span> <span >{{textList.planTenderDateStart||'--'}}</span>
</p> </p>
<p class="list-content-text"> <p class="list-content-text">
<span>来源网站：</span> <span>来源网站：</span>
<span >赤峰市阿鲁科尔沁旗人民政府</span> <span >{{textList.sourceName||'--'}}</span>
</p> </p>
</div> </div>
...@@ -62,9 +61,11 @@ ...@@ -62,9 +61,11 @@
<div class="list-content-img" @mouseenter="showimg=false" @mouseleave="showimg=true"> <div class="list-content-img" @mouseenter="showimg=false" @mouseleave="showimg=true">
<img v-if="showimg" src="@/assets/images/bxpro/original1.png"> <img v-if="showimg" src="@/assets/images/bxpro/original1.png">
<img v-else src="@/assets/images/bxpro/original.png"> <img v-else src="@/assets/images/bxpro/original.png">
<span>原文链接</span> <span>
<a :href="textList.url">原文链接</a>
</span>
</div> </div>
<div class="main3-box"> <div class="main3-box" v-html="textList.content">
...@@ -76,6 +77,7 @@ ...@@ -76,6 +77,7 @@
</template> </template>
<script> <script>
import api from '@/api/radar/radar.js';
import "@/assets/styles/public.css"; import "@/assets/styles/public.css";
export default { export default {
...@@ -83,21 +85,25 @@ ...@@ -83,21 +85,25 @@
data() { data() {
return { return {
id: '', id: '',
tableData: [{ textList: {},
id: 0,
name: '20重庆债14(2005938)',
time: '2020-09-18',
gm: '285.24',
zj: '否',
}],
showimg:true showimg:true
} }
}, },
created() { created() {
console.log(this.$route.params) this.id = this.$route.params.id;
this.id = this.$route.params.id this.bidPlanDetail();
}, },
methods: { methods: {
bidPlanDetail() {
api.bidPlanDetail({
id: this.id
}).then(res => {
// console.log(res);
this.textList = res.data;
}).catch(error => {
});
},
} }
} }
...@@ -186,11 +192,21 @@ ...@@ -186,11 +192,21 @@
padding: 3px 7px; padding: 3px 7px;
font-size: 12px; font-size: 12px;
}
.list-label {
background: #F3F3FF;
color: #8491E8;
border-radius: 1px 1px 1px 1px;
padding: 3px 7px;
font-size: 12px;
margin-right: 12px;
font-weight: 400;
} }
.list-label-zb{ .list-label-zb{
font-weight: 400; font-weight: 400;
color: #5A88F9; color: #8491E8;
background: #E7EDFC; background: #F3F3FF;
} }
.list-label-lx{ .list-label-lx{
font-weight: 400; font-weight: 400;
......
dsk-operate-ui/src/views/radar/Establishment/details.vue
View file @ 72e53319
...@@ -4,25 +4,36 @@ ...@@ -4,25 +4,36 @@
<ul class="bottomlist-content"> <ul class="bottomlist-content">
<li class="bottomlist-list" > <li class="bottomlist-list" >
<p class="list-titel"> <p class="list-titel">
绿色节能型压缩机基础件、汽车零配件新建项目 (芜湖旭日机械制造有限公司) {{textList.projectName}}
<!-- <div v-else-if="item.projectName" v-html="item.projectName"></div> --> <!-- <div v-else-if="item.projectName" v-html="item.projectName"></div> -->
</p> </p>
<div class="content-label"> <div class="content-label">
<span class="list-label">市政工程</span> <span class="list-label list-label-lx" v-if="textList.projectCategories">{{textList.projectCategories}}</span>
<span class="list-label list-label-zb" v-if="textList.province||textList.city||textList.district">
{{textList.province}}
<template v-if="textList.city">
-{{textList.city}}
</template>
<template v-if="textList.district">
-{{textList.district}}
</template>
</span>
</div> </div>
<div class="list-content"> <div class="list-content">
<p class="list-content-text"> <p class="list-content-text" v-if="textList.examineStatus">
<span>办件结果：</span> <span>办件结果：</span>
<span >芜湖旭日机械制造有限公司</span> <span >{{textList.examineStatus}}</span>
</p> </p>
<p class="list-content-text"> <p class="list-content-text"v-if="textList.money">
<span>总投资：</span> <span>总投资：</span>
<span>芜湖旭日</span> <span>{{textList.money}}万</span>
</p> </p>
<p class="list-content-text"> <p class="list-content-text"v-if="textList.handleTime">
<span>审批日期：</span> <span>审批日期：</span>
<span>12345.62万</span> <span>{{textList.handleTime}}</span>
</p> </p>
</div> </div>
...@@ -37,43 +48,51 @@ ...@@ -37,43 +48,51 @@
<div class="main3-box"> <div class="main3-box">
<p> <p>
<label class="label">项目法人</label> <label class="label">项目法人</label>
<span>序号</span> <span>{{textList.companyName||'--'}}</span>
<label class="label">总投资（万元）</label> <label class="label">总投资（万元）</label>
<span>序号</span> <span>{{textList.money||'--'}}</span>
</p> </p>
<p> <p>
<label class="label">项目类型</label> <label class="label">项目类型</label>
<span class="span-one">序号</span> <span class="span-one">{{textList.projectCategories||'--'}}</span>
</p> </p>
<p> <p>
<label class="label">项目属地</label> <label class="label">项目属地</label>
<span>序号</span> <span>
{{textList.province}}
<template v-if="textList.city">
-{{textList.city}}
</template>
<template v-if="textList.district">
-{{textList.district}}
</template>
</span>
<label class="label">审批类型</label> <label class="label">审批类型</label>
<span>序号</span> <span>{{textList.projectType||'--'}}</span>
</p> </p>
<p> <p>
<label class="label">建设规模</label> <label class="label">建设规模</label>
<span>序号</span> <span>{{textList.buildScale||'--'}}</span>
</p> </p>
<p> <p>
<label class="label">计划开工日期</label> <label class="label">计划开工日期</label>
<span>序号</span> <span>{{textList.planStartTime||'--'}}</span>
<label class="label">计划完成日期</label> <label class="label">计划完成日期</label>
<span>序号</span> <span>{{textList.planEndTime||'--'}}</span>
</p> </p>
<p> <p>
<label class="label">项目联系方式</label> <label class="label">项目联系方式</label>
<span>序号</span> <span>{{textList.money||'--'}}</span>
<label class="label">行业分类</label> <label class="label">行业分类</label>
<span>序号</span> <span>{{textList.projectIndustry||'--'}}</span>
</p> </p>
<p> <p>
<label class="label">项目详情地址</label> <label class="label">项目详情地址</label>
<span>序号</span> <span>{{textList.buildAddre||'--'}}</span>
<label class="label">项目代码</label> <label class="label">项目代码</label>
<span>序号</span> <span>{{textList.projectCode||'--'}}</span>
</p> </p>
...@@ -84,7 +103,7 @@ ...@@ -84,7 +103,7 @@
<div class="common-title">立项审批</div> <div class="common-title">立项审批</div>
<div class="table-item"> <div class="table-item">
<el-table <el-table
:data="tableData" :data="tableData1"
element-loading-text="Loading" element-loading-text="Loading"
border border
fit fit
...@@ -92,33 +111,39 @@ ...@@ -92,33 +111,39 @@
> >
<el-table-column label="审批事项" width="270"> <el-table-column label="审批事项" width="270">
<template slot-scope="scope"> <template slot-scope="scope">
企业投资项目备案 {{ scope.row.examineContent||'--'}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审批结果" width="187" > <el-table-column label="审批结果" width="187" >
<template slot-scope="scope"> <template slot-scope="scope">
通过 {{ scope.row.examineStatus||'--'}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审批部门" > <el-table-column label="审批部门" >
<template slot-scope="scope"> <template slot-scope="scope">
老河口市发展和改革局 {{ scope.row.examineOffice||'--'}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审批问号" width="328" > <el-table-column label="审批文号" width="328" >
<template slot-scope="scope"> <template slot-scope="scope">
-- {{ scope.row.licenseNum||'--'}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="zj" label="审批日期" width="240" > <el-table-column prop="zj" label="审批日期" width="240" >
<template slot-scope="scope"> <template slot-scope="scope">
2022-08-28 {{ scope.row.handleTime||'--'}}
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="pagination clearfix" v-show="total1>10">
<el-pagination background :page-size="pageSize1" :current-page="pageNum1"
@current-change="handleCurrentChange1" layout="prev, pager, next" :total="total1">
</el-pagination>
</div>
</div> </div>
</div> </div>
...@@ -126,41 +151,51 @@ ...@@ -126,41 +151,51 @@
<div class="common-title">立项推介</div> <div class="common-title">立项推介</div>
<div class="table-item"> <div class="table-item">
<el-table <el-table
:data="tableData" :data="tableData2"
element-loading-text="Loading" element-loading-text="Loading"
border border
fit fit
highlight-current-row highlight-current-row
> >
<el-table-column label="立项推介" > <el-table-column label="民间资本名称" >
<template slot-scope="scope"> <template slot-scope="scope">
- {{ scope.row.companyName||'--'}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="引入资本规模（万元）" width="232" > <el-table-column label="引入资本规模（万元）" width="232" >
<template slot-scope="scope"> <template slot-scope="scope">
-- {{ scope.row.introduceMoney||'--'}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="引入资本时间" width="243" > <el-table-column label="引入资本时间" width="243" >
<template slot-scope="scope"> <template slot-scope="scope">
2019-12-24 {{ scope.row.introduceMoneyTime||'--'}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="推介时间" width="243" > <el-table-column label="推介时间" width="243" >
<template slot-scope="scope"> <template slot-scope="scope">
2019-12-24 {{ scope.row.recommendTime||'--'}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="zj" label="是否完成推介" width="243" > <el-table-column prop="zj" label="是否完成推介" width="243" >
<template slot-scope="scope"> <template slot-scope="scope">
否 <template v-if="scope.row.isRecommend!=''&&scope.row.isRecommend!=null">
{{ scope.row.isRecommend?'是':'否'}}
</template>
<template v-else>
--
</template>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="pagination clearfix" v-show="total2>10">`
<el-pagination background :page-size="pageSize2" :current-page="pageNum2"
@current-change="handleCurrentChange2" layout="prev, pager, next" :total="total2">
</el-pagination>
</div>
</div> </div>
</div> </div>
...@@ -169,27 +204,92 @@ ...@@ -169,27 +204,92 @@
</template> </template>
<script> <script>
import "@/assets/styles/public.css"; import api from '@/api/radar/radar.js';
export default { export default {
name: 'EstablishmentDetails', name: 'EstablishmentDetails',
data() { data() {
return { return {
id: '', id: '',
tableData: [{ textList: {},
id: 0, pageNum1:1,
name: '20重庆债14(2005938)', pageSize1:10,
time: '2020-09-18', tableData1:[],
gm: '285.24', total1:0,
zj: '否',
}] pageNum2:1,
pageSize2:10,
tableData2:[],
total2:0,
} }
}, },
created() { created() {
console.log(this.$route.params) this.id = this.$route.params.id;
this.id = this.$route.params.id this.approvalInfoDetail();
this.approvalExaminePage();
this.approvalMarketingPage();
}, },
methods: { methods: {
approvalInfoDetail() {
api.approvalInfoDetail({
id: this.id
}).then(res => {
// console.log(res);
this.textList = res.data;
}).catch(error => {
});
},
handleCurrentChange1(pageNum1) {
this.pageNum1 = pageNum1;
this.search(pageNum1, this.pageSize1);
},
approvalExaminePage(pageNum1, pageSize1) {
if (!pageNum1) {
this.pageNum1 = 1;
}
if (!pageSize1) {
this.pageSize1 = 20;
}
var data = {
id: this.id,
pageNum: this.pageNum1,
pageSize: this.pageSize1
}
api.approvalExaminePage(data).then(res => {
// console.log(res);
this.tableData1 = res.rows;
}).catch(error => {
});
},
handleCurrentChange2(pageNum2) {
this.pageNum2 = pageNum2;
this.search(pageNum2, this.pageSize2);
},
approvalMarketingPage(pageNum2, pageSize2) {
if (!pageNum2) {
this.pageNum2 = 1;
}
if (!pageSize2) {
this.pageSize2 = 20;
}
var data = {
id: this.id,
pageNum: this.pageNum2,
pageSize: this.pageSize2
}
api.approvalMarketingPage(data).then(res => {
// console.log(res);
this.tableData2 = res.rows;
}).catch(error => {
});
}
} }
} }
...@@ -268,17 +368,28 @@ ...@@ -268,17 +368,28 @@
} }
.content-label { .content-label {
margin-top: 7px; margin-top: 12px;
margin-bottom: 8px;
.list-label { .list-label {
background: #F3F3FF; background: #F3F3FF;
color: #8491E8; color: #8491E8;
border-radius: 1px 1px 1px 1px; border-radius: 1px 1px 1px 1px;
padding: 3px 7px; padding: 3px 7px;
font-size: 12px; font-size: 12px;
margin-right: 12px;
} }
.list-label-zb{
font-weight: 400;
color: #8491E8;
background: #F3F3FF;
}
.list-label-lx{
font-weight: 400;
color: #41A1FD;
background: #E4F3FD;
}
} }
...@@ -552,6 +663,14 @@ ...@@ -552,6 +663,14 @@
.main5 { .main5 {
.table-item { .table-item {
margin-top: 22px; margin-top: 22px;
.pagination {
padding: 14px;
.el-pagination {
float: right;
}
}
} }
} }
} }
......
dsk-operate-ui/src/views/radar/Land/details.vue
View file @ 72e53319
...@@ -4,35 +4,35 @@ ...@@ -4,35 +4,35 @@
<ul class="bottomlist-content"> <ul class="bottomlist-content">
<li class="bottomlist-list"> <li class="bottomlist-list">
<p class="list-titel"> <p class="list-titel">
绿色节能型压缩机基础件、汽车零配件新建项目 (芜湖旭日机械制造有限公司) {{textList.projectName}}
</p> </p>
<div class="list-content"> <div class="list-content">
<p class="list-content-text"> <p class="list-content-text">
<span>受让人：</span> <span>受让人：</span>
<span class="blue">芜湖旭日机械制造有限公司</span> <span class="blue">{{textList.company||"--"}}</span>
</p> </p>
<p class="list-content-text"> <p class="list-content-text">
<span>成交金额：</span> <span>成交金额：</span>
<span>12345.62万元</span> <span>{{textList.transactionPrice||"--"}}</span>
</p> </p>
<p class="list-content-text"> <p class="list-content-text">
<span>总面积：</span> <span>总面积：</span>
<span>12345.62万</span> <span>{{textList.acreage||"--"}}</span>
</p> </p>
<p class="list-content-text"> <p class="list-content-text">
<span>合同签订：</span> <span>合同签订：</span>
<span>2014-05-12</span> <span>{{textList.contractSignTime||"--"}}</span>
</p> </p>
</div> </div>
<div class="list-content"> <div class="list-content">
<p class="list-content-text"> <p class="list-content-text">
<span>土地用途：</span> <span>土地用途：</span>
<span>城镇村道路用地</span> <span>{{textList.landUse||"--"}}</span>
</p> </p>
<p class="list-content-text"> <p class="list-content-text">
<span>供应方式：</span> <span>供应方式：</span>
<span>挂牌出让</span> <span>{{textList.supplyLandWay||"--"}}</span>
</p> </p>
</div> </div>
...@@ -46,71 +46,79 @@ ...@@ -46,71 +46,79 @@
<div class="main3-box"> <div class="main3-box">
<p> <p>
<label class="label">行政区</label> <label class="label">行政区</label>
<span>1.36倍</span> <span>
{{textList.province}}
<template v-if="textList.city">
-{{textList.city}}
</template>
<template v-if="textList.area">
-{{textList.area}}
</template>
</span>
<label class="label">电子监督号</label> <label class="label">电子监督号</label>
<span>1.36倍</span> <span>{{textList.electronicNumber||"--"}}</span>
</p> </p>
<p> <p>
<label class="label">项目名称</label> <label class="label">项目名称</label>
<span class="span-one">1.36倍</span> <span class="span-one">{{textList.projectName||"--"}}</span>
</p> </p>
<p> <p>
<label class="label">项目位置</label> <label class="label">项目位置</label>
<span class="span-one">1.36倍</span> <span class="span-one">{{textList.landAddr||"--"}}</span>
</p> </p>
<p> <p>
<label class="label">面积</label> <label class="label">面积</label>
<span>1.36倍</span> <span>{{textList.buildArea||"--"}}</span>
<label class="label">土地来源</label> <label class="label">土地来源</label>
<span>1.36倍</span> <span>{{textList.landSource||"--"}}</span>
</p> </p>
<p> <p>
<label class="label">土地用途</label> <label class="label">土地用途</label>
<span>1.36倍</span> <span>{{textList.landUse||"--"}}</span>
<label class="label">供地方式</label> <label class="label">供地方式</label>
<span>1.36倍</span> <span>{{textList.supplyLandWay||"--"}}</span>
</p> </p>
<p> <p>
<label class="label">土地使用年限</label> <label class="label">土地使用年限</label>
<span>1.36倍</span> <span>{{textList.landUseYear||"--"}}</span>
<label class="label">行业分类</label> <label class="label">行业分类</label>
<span>1.36倍</span> <span>{{textList.industry||"--"}}</span>
</p> </p>
<p> <p>
<label class="label">土地级别</label> <label class="label">土地级别</label>
<span>1.36倍</span> <span>{{textList.landLevel||"--"}}</span>
<label class="label">成交价格（万元）</label> <label class="label">成交价格（万元）</label>
<span>1.36倍</span> <span>{{textList.transactionPrice||"--"}}</span>
</p> </p>
<p> <p>
<label class="label">土地使用权人</label> <label class="label">土地使用权人</label>
<span class="span-one">1.36倍</span> <span class="span-one">{{textList.landUseCompany||"--"}}</span>
</p> </p>
<p> <p>
<label class="label">约定容积率</label> <label class="label">约定容积率</label>
<span>1.36倍</span> <span>{{textList.volumeRate||"--"}}</span>
<label class="label">批准单位</label> <label class="label">批准单位</label>
<span>1.36倍</span> <span>{{textList.authority||"--"}}</span>
</p> </p>
<p> <p>
<label class="label">约定交地日起</label> <label class="label">约定交地日起</label>
<span>1.36倍</span> <span>{{textList.conventionLandTime||"--"}}</span>
<label class="label">合同签订日期</label> <label class="label">合同签订日期</label>
<span>1.36倍</span> <span>{{textList.contractSignTime||"--"}}</span>
</p> </p>
<p> <p>
<label class="label">约定开工时间</label> <label class="label">约定开工时间</label>
<span>1.36倍</span> <span>{{textList.conventionBeginTime||"--"}}</span>
<label class="label">约定竣工时间</label> <label class="label">约定竣工时间</label>
<span>1.36倍</span> <span>{{textList.conventionEndTime||"--"}}</span>
</p> </p>
<p> <p>
<label class="label">实际开工时间</label> <label class="label">实际开工时间</label>
<span>1.36倍</span> <span>{{textList.realBeginTime||"--"}}</span>
<label class="label">实际峻工时间</label> <label class="label">实际峻工时间</label>
<span>1.36倍</span> <span>{{textList.realEndTime||"--"}}</span>
</p> </p>
</div> </div>
</div> </div>
...@@ -119,21 +127,21 @@ ...@@ -119,21 +127,21 @@
<div class="main3-box"> <div class="main3-box">
<p> <p>
<label class="label">地块名称</label> <label class="label">地块名称</label>
<span>1.36倍</span> <span>{{textList.landName||"--"}}</span>
<label class="label">建筑面积</label> <label class="label">建筑面积</label>
<span>1.36倍</span> <span>{{textList.buildArea||"--"}}</span>
</p> </p>
<p> <p>
<label class="label">容积率</label> <label class="label">容积率</label>
<span>1.36倍</span> <span>{{textList.volumeRate||"--"}}</span>
<label class="label">绿化率</label> <label class="label">绿化率</label>
<span>1.36倍</span> <span>{{textList.greeningRate||"--"}}</span>
</p> </p>
<p> <p>
<label class="label">建筑密度</label> <label class="label">建筑密度</label>
<span>1.36倍</span> <span>{{textList.buildingDensity||"--"}}</span>
<label class="label">建筑限高</label> <label class="label">建筑限高</label>
<span>1.36倍</span> <span>{{textList.buildingHeight||"--"}}</span>
</p> </p>
</div> </div>
</div> </div>
...@@ -142,39 +150,39 @@ ...@@ -142,39 +150,39 @@
<div class="main3-box"> <div class="main3-box">
<p> <p>
<label class="label">招拍挂起始时间</label> <label class="label">招拍挂起始时间</label>
<span>1.36倍</span> <span>{{textList.projectName||"--"}}</span>
<label class="label">招拍挂截止时间</label> <label class="label">招拍挂截止时间</label>
<span>1.36倍</span> <span>{{textList.projectName||"--"}}</span>
</p> </p>
<p> <p>
<label class="label">报名起始时间</label> <label class="label">报名起始时间</label>
<span>1.36倍</span> <span>{{textList.auctionBeginTime||"--"}}</span>
<label class="label">报名截止日期</label> <label class="label">报名截止日期</label>
<span>1.36倍</span> <span>{{textList.auctionEndTime||"--"}}</span>
</p> </p>
<p> <p>
<label class="label">起始价</label> <label class="label">起始价</label>
<span>1.36倍</span> <span>{{textList.moneyBegin||"--"}}</span>
<label class="label">竞买保证金</label> <label class="label">竞买保证金</label>
<span>1.36倍</span> <span>{{textList.bondmoney||"--"}}</span>
</p> </p>
<p> <p>
<label class="label">加价幅度</label> <label class="label">加价幅度</label>
<span>1.36倍</span> <span>{{textList.addMoneyRange||"--"}}</span>
<label class="label">投资强度</label> <label class="label">投资强度</label>
<span>1.36倍</span> <span>{{textList.investmentIntensity||"--"}}</span>
</p> </p>
<p> <p>
<label class="label">成交价</label> <label class="label">成交价</label>
<span>1.36倍</span> <span>{{textList.transactionPrice||"--"}}</span>
<label class="label">受让人</label> <label class="label">受让人</label>
<span>1.36倍</span> <span>{{textList.company||"--"}}</span>
</p> </p>
<p> <p>
<label class="label">成交公示日期</label> <label class="label">成交公示日期</label>
<span>1.36倍</span> <span>{{textList.transactionPublicityTime||"--"}}</span>
<label class="label">合同编号</label> <label class="label">合同编号</label>
<span>1.36倍</span> <span>{{textList.contractNum||"--"}}</span>
</p> </p>
</div> </div>
</div> </div>
...@@ -183,27 +191,34 @@ ...@@ -183,27 +191,34 @@
</template> </template>
<script> <script>
import "@/assets/styles/public.css"; import api from '@/api/radar/radar.js';
export default { export default {
name: 'LandDetails', name: 'LandDetails',
data() { data() {
return { return {
id: '', id: '',
tableData: [{ textList: {}
id: 0,
name: '20重庆债14(2005938)',
time: '2020-09-18',
gm: '285.24',
zj: '否',
}]
} }
}, },
created() { created() {
console.log(this.$route.params) this.id = this.$route.params.id;
this.id = this.$route.params.id this.landDetail();
}, },
methods: { methods: {
landDetail() {
api.landDetail({
id: this.id
}).then(res => {
// console.log(res);
this.textList = res.data;
console.log(this.textList);
}).catch(error => {
});
},
} }
} }
......
dsk-operate-ui/src/views/radar/bxprozbgg/details.vue
View file @ 72e53319
...@@ -4,24 +4,26 @@ ...@@ -4,24 +4,26 @@
<ul class="bottomlist-content"> <ul class="bottomlist-content">
<li class="bottomlist-list"> <li class="bottomlist-list">
<p class="list-titel"> <p class="list-titel">
绿色节能型压缩机基础件、汽车零配件新建项目 (芜湖旭日机械制造有限公司) {{textList.projectName}}
</p> </p>
<div class="list-content"> <div class="list-content">
<p class="list-content-text"> <p class="list-content-text">
<span>发布日期：</span> <span>发布日期：</span>
<span>2014-05-12</span> <span>{{textList.pubdate||'--'}}</span>
</p> </p>
<p class="list-content-text"> <p class="list-content-text">
<span>开标时间：</span> <span>开标时间：</span>
<span class='text-red'>2014-05-12 9:00</span> <span class='text-red'>{{textList.endTimeDate||'--'}}</span>
</p> </p>
</div> </div>
<div class="list-content-img" @mouseenter="showimg=false" @mouseleave="showimg=true"> <div class="list-content-img" @mouseenter="showimg=false" @mouseleave="showimg=true">
<img v-if="showimg" src="@/assets/images/bxpro/original1.png"> <img v-if="showimg" src="@/assets/images/bxpro/original1.png">
<img v-else src="@/assets/images/bxpro/original.png"> <img v-else src="@/assets/images/bxpro/original.png">
<span>原文链接</span> <span>
<a :href="textList.url">原文链接</a>
</span>
</div> </div>
</li> </li>
...@@ -59,80 +61,93 @@ ...@@ -59,80 +61,93 @@
<div class="main3-box"> <div class="main3-box">
<p> <p>
<label class="label">工程类型</label> <label class="label">工程类型</label>
<span>1.36倍</span> <span>{{textList.projectType||'--'}}</span>
<label class="label">工程类别</label> <label class="label">工程类别</label>
<span>1.36倍</span> <span>{{textList.projectPurposes||'--'}}</span>
</p> </p>
<p> <p>
<label class="label">项目投资额(万元)</label> <label class="label">项目投资额(万元)</label>
<span >1.36倍</span> <span >{{textList.projectInvestmentAmount||'--'}}</span>
<label class="label">招标控制价/合同 估算价(万元)</label> <label class="label">招标控制价/合同 估算价(万元)</label>
<span>1.36倍</span> <span>{{textList.projectContractAmount||'--'}}</span>
</p> </p>
<p> <p>
<label class="label">建安费暂估(万元)</label> <label class="label">建安费暂估(万元)</label>
<span >1.36倍</span> <span >{{textList.projectSafeAmount||'--'}}</span>
<label class="label">勘察费暂估(万元)</label> <label class="label">勘察费暂估(万元)</label>
<span>1.36倍</span> <span>{{textList.projectSurveyAmount||'--'}}</span>
</p> </p>
<p> <p>
<label class="label">设计费暂估(万元)</label> <label class="label">设计费暂估(万元)</label>
<span>1.36倍</span> <span>{{textList.projectDesignAmount||'--'}}</span>
<label class="label">投标保证金(万元)</label> <label class="label">投标保证金(万元)</label>
<span>1.36倍</span> <span>{{textList.projectEnsureAmount||'--'}}</span>
</p> </p>
<p> <p>
<label class="label">计划工期</label> <label class="label">计划工期</label>
<span>1.36倍</span> <span>{{textList.projectDuration||'--'}}</span>
<label class="label">项目属地</label> <label class="label">项目属地</label>
<span>1.36倍</span> <span>
{{textList.province}}
<template v-if="textList.city">
-{{textList.city}}
</template>
<template v-if="textList.area">
-{{textList.area}}
</template>
</span>
</p> </p>
<p> <p>
<label class="label">发布时间</label> <label class="label">发布时间</label>
<span>1.36倍</span> <span>{{textList.pubdate||'--'}}</span>
<label class="label">开标时间</label> <label class="label">开标时间</label>
<span class="color1">1.36倍</span> <span class="color1">{{textList.endTimeDate||'--'}}</span>
</p> </p>
<p> <p>
<label class="label">评标办法</label> <label class="label">评标办法</label>
<span>1.36倍</span> <span>{{textList.bidAssessmentWay||'--'}}</span>
<label class="label">项目级别</label> <label class="label">项目级别</label>
<span>1.36倍</span> <span>{{textList.projectLevel||'--'}}</span>
</p> </p>
<p> <p>
<label class="label">建设规模</label> <label class="label">建设规模</label>
<span class="span-one">1.36倍</span> <span class="span-one">{{textList.bulidRange||'--'}}</span>
</p> </p>
<p> <p>
<label class="label">招标范围</label> <label class="label">招标范围</label>
<span class="span-one">1.36倍</span> <span class="span-one">{{textList.bidRange||'--'}}</span>
</p> </p>
<p> <p>
<label class="label">保证金缴纳方式</label> <label class="label">保证金缴纳方式</label>
<span>1.36倍</span> <span>{{textList.projectEnsureAmountPayType||'--'}}</span>
<label class="label">开标地点</label> <label class="label">开标地点</label>
<span>1.36倍</span> <span>{{textList.projectOpenAddr||'--'}}</span>
</p> </p>
<p> <p>
<label class="label">建设地点</label> <label class="label">建设地点</label>
<span>1.36倍</span> <span>{{textList.projectAddr||'--'}}</span>
<label class="label">资金来源</label> <label class="label">资金来源</label>
<span>1.36倍</span> <span>{{textList.capitalSource||'--'}}</span>
</p> </p>
<p> <p>
<label class="label">评标委员会</label> <label class="label">评标委员会</label>
<span class="span-one">1.36倍</span> <span class="span-one">
<template v-if="textList.bidMettingHasProjectUnit=0">未知</template>
<template v-else-if="textList.bidMettingHasProjectUnit=1">无</template>
<template v-else-if="textList.bidMettingHasProjectUnit=2">有</template>
<template v-else>--</template>
</span>
</p> </p>
<p> <p>
<label class="label">履约保证金 (形式 及金额)</label> <label class="label">履约保证金 (形式 及金额)</label>
<span class="span-one">1.36倍</span> <span class="span-one">{{textList.prformanceWayAndMoney||'--'}}</span>
</p> </p>
</div> </div>
</div> </div>
...@@ -141,15 +156,15 @@ ...@@ -141,15 +156,15 @@
<div class="main3-box"> <div class="main3-box">
<p> <p>
<label class="label">资质要求</label> <label class="label">资质要求</label>
<span class="span-one">1.36倍</span> <span class="span-one">{{textList.qualiLimit||'--'}}</span>
</p> </p>
<p> <p>
<label class="label">业绩要求</label> <label class="label">业绩要求</label>
<span class="span-one">1.36倍</span> <span class="span-one">{{textList.projectLimit||'--'}}</span>
</p> </p>
<p> <p>
<label class="label">项目负责人要求</label> <label class="label">项目负责人要求</label>
<span class="span-one">1.36倍</span> <span class="span-one">{{textList.personLimit||'--'}}</span>
</p> </p>
</div> </div>
</div> </div>
...@@ -158,21 +173,21 @@ ...@@ -158,21 +173,21 @@
<div class="main3-box"> <div class="main3-box">
<p> <p>
<label class="label">招标人</label> <label class="label">招标人</label>
<span class="color2">1.36倍</span> <span class="color2">{{textList.tenderee||'--'}}</span>
<label class="label">代理机构</label> <label class="label">代理机构</label>
<span class="color2">1.36倍</span> <span class="color2">{{textList.agency||'--'}}</span>
</p> </p>
<p> <p>
<label class="label">招标人联系方式</label> <label class="label">招标人联系方式</label>
<span>1.36倍</span> <span>{{textList.tendereeTel||'--'}}</span>
<label class="label">招标人联系地址</label> <label class="label">招标人联系地址</label>
<span>1.36倍</span> <span>{{textList.tendereeAddress||'--'}}</span>
</p> </p>
<p> <p>
<label class="label">代理机构联系方式</label> <label class="label">代理机构联系方式</label>
<span>1.36倍</span> <span>{{textList.agencyTel||'--'}}</span>
<label class="label">代理机构联系地址</label> <label class="label">代理机构联系地址</label>
<span>1.36倍</span> <span>{{textList.agencyAddress||'--'}}</span>
</p> </p>
</div> </div>
...@@ -183,27 +198,33 @@ ...@@ -183,27 +198,33 @@
<script> <script>
import "@/assets/styles/public.css"; import "@/assets/styles/public.css";
import api from '@/api/radar/radar.js';
export default { export default {
name: 'bxprozbggDetails', name: 'bxprozbggDetails',
data() { data() {
return { return {
id: '', id: '',
tableData: [{ textList: {},
id: 0,
name: '20重庆债14(2005938)',
time: '2020-09-18',
gm: '285.24',
zj: '否',
}],
showimg:true, showimg:true,
} }
}, },
created() { created() {
console.log(this.$route.params) console.log(this.$route.params)
this.id = this.$route.params.id this.id = this.$route.params.id;
this.bidNoticeProDetail();
}, },
methods: { methods: {
bidNoticeProDetail() {
api.bidNoticeProDetail({
id: this.id
}).then(res => {
// console.log(res);
this.textList = res.data;
}).catch(error => {
});
},
} }
} }
......
dsk-operate-ui/src/views/radar/components/Land/index.vue
View file @ 72e53319
...@@ -224,49 +224,58 @@ ...@@ -224,49 +224,58 @@
</div> </div>
</div> </div>
<ul class="bottomlist-content">
<li class="bottomlist-list"> <ul class="bottomlist-content" v-if="tableData.length>0">
<li class="bottomlist-list" v-for="item in tableData">
<p class="list-titel"> <p class="list-titel">
<router-link :to="'/radar/Land/details/'+ 1" tag="a" class="list-titel-a">绿色节能型压缩机基础件、汽车零配件新建项目 (芜湖旭日机械制造有限公司)</router-link> <router-link :to="'/radar/Land/details/'+ item.id" tag="a" class="list-titel-a" v-html="item.projectName"></router-link>
</p> </p>
<div class="list-content"> <div class="list-content">
<p class="list-content-text"> <p class="list-content-text">
<span>受让人：</span> <span>受让人：</span>
<span class="blue">芜湖旭日机械制造有限公司</span> <span class="blue">{{item.companyName||'--'}}</span>
</p> </p>
<p class="list-content-text"> <p class="list-content-text">
<span>成交金额：</span> <span>成交金额：</span>
<span>12345.62万元</span> <span>{{item.transactionPrice||'--'}}</span>
</p> </p>
<p class="list-content-text"> <p class="list-content-text">
<span>总面积：</span> <span>总面积：</span>
<span>12345.62万</span> <span>{{item.acreage||'--'}}</span>
</p> </p>
<p class="list-content-text"> <p class="list-content-text">
<span>合同签订：</span> <span>合同签订：</span>
<span>2014-05-12</span> <span>{{item.contractSignTime||'--'}}</span>
</p> </p>
</div> </div>
<div class="list-content"> <div class="list-content">
<p class="list-content-text"> <p class="list-content-text">
<span>土地用途：</span> <span>土地用途：</span>
<span >城镇村道路用地</span> <span >{{item.landUse||'--'}}</span>
</p> </p>
<p class="list-content-text"> <p class="list-content-text">
<span>供应方式：</span> <span>供应方式：</span>
<span >挂牌出让</span> <span >{{item.supplyLandWay||'--'}}</span>
</p> </p>
</div> </div>
<div class="list-content list-addree"> <div class="list-content list-addree">
<img src="@/assets/images/addree.png" alt=""> <img src="@/assets/images/addree.png" alt="">
<p class="list-content-text"> <p class="list-content-text">
<span>土地用途：</span> <span>行政区划：</span>
<span >城镇村道路用地</span> <span >
{{item.province}}
<template v-if="item.city">
-{{item.city}}
</template>
<template v-if="item.area">
-{{item.area}}
</template>
</span>
</p> </p>
<p class="list-content-text"> <p class="list-content-text">
<span>土地坐落：</span> <span>土地坐落：</span>
<span >锡山区云林街道春雷路东南、许巷路西</span> <span >{{item.landAddr||'--'}}</span>
</p> </p>
</div> </div>
</li> </li>
...@@ -288,11 +297,14 @@ ...@@ -288,11 +297,14 @@
</template> </template>
<script> <script>
import {encodeStr} from "@/assets/js/common.js"
import api from '@/api/radar/radar.js';
import jsk_data from '../../../../../public/jsk.json'; import jsk_data from '../../../../../public/jsk.json';
export default { export default {
name: 'Land', name: 'Land',
data() { data() {
return { return {
encodeStr,
conditionTitles: { conditionTitles: {
keyword: "关键词:", keyword: "关键词:",
landAddr: "土地坐落:", landAddr: "土地坐落:",
...@@ -544,45 +556,18 @@ ...@@ -544,45 +556,18 @@
}, },
}, },
mounted() { mounted() {
if (this.$route.query.keyword) { this.init();
var obj = JSON.parse(JSON.stringify(this.landMarketDto));
obj.keyword = this.$route.query.keyword;
this.landMarketDto = obj;
}
this.addressListfn();
// this.$axios.get('https://files.jiansheku.com/file/json/common/searchDic.json').then(res => {
// if (res && res.status == 200) {
// this.landMarketIndustryList = res.data.landMarketIndustry;
// this.landUseOptions = res.data.landUse
// }
// }).catch(error => {
// });
// if (this.landUseOptions.length == 0 || this.landMarketIndustryList.length == 0) {
// this.$axios.post("/nationzj/project/recently/typeList", {
// timeout: "49999",
// headers: {
// "Content-Type": "application/json;charset=UTF-8",
// },
// })
// .then((res) => {
// if (res.data.code == 200) {
// this.landUseOptions = res.data.data.landUseList;
// this.landMarketIndustryList = res.data.data.landMarketIndustryList;
// }
// })
// .catch((err) => {});
// }
}, },
methods: { methods: {
searchDic(){
api.searchDic().then(res=>{
this.landMarketIndustryList = res.landMarketIndustry;
this.landUseOptions = res.data.landUse
}).catch(error=>{
});
},
refresh(value) { refresh(value) {
if (value) { if (value) {
this.$router.go(0) this.$router.go(0)
...@@ -613,7 +598,15 @@ ...@@ -613,7 +598,15 @@
}, },
landMarketDto: data, landMarketDto: data,
}; };
this.$emit("search", params) api.landMarketPage(params).then(res=>{
if (res.code==200) {
this.tableData=res.data.list;
this.total=res.data.total;
}
}).catch(error=>{
});
}, },
//关闭支付弹窗 //关闭支付弹窗
...@@ -918,30 +911,7 @@ ...@@ -918,30 +911,7 @@
init() { init() {
this.search(); this.search();
this.addressListfn(); this.addressListfn();
this.$axios.get('https://files.jiansheku.com/file/json/common/searchDic.json').then(res => { this.searchDic();
if (res && res.status == 200) {
this.landMarketIndustryList = res.data.landMarketIndustry;
this.landUseOptions = res.data.landUse
}
}).catch(error => {
});
if (this.landUseOptions.length == 0 || this.landMarketIndustryList.length == 0) {
this.$axios.post("/nationzj/project/recently/typeList", {
timeout: "49999",
headers: {
"Content-Type": "application/json;charset=UTF-8",
},
})
.then((res) => {
if (res.data.code == 200) {
this.landUseOptions = res.data.data.landUseList;
this.landMarketIndustryList = res.data.data.landMarketIndustryList;
}
})
.catch((err) => {});
}
}, },
}, },
}; };
......
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