Commit 1712c144 authored by 远方不远's avatar 远方不远
parents af93e5c5 e8c93352
...@@ -28,7 +28,6 @@ public class EnterpriseProjectApprovalProjectPageBody extends BasePage { ...@@ -28,7 +28,6 @@ public class EnterpriseProjectApprovalProjectPageBody extends BasePage {
/* /*
* 1金额倒序,2金额正序,3计划开工时间倒序,4计划开工时间正序,13计划完工时间倒序,14计划完工时间正序 * 1金额倒序,2金额正序,3计划开工时间倒序,4计划开工时间正序,13计划完工时间倒序,14计划完工时间正序
*/ */
@NotNull(message = "排序条件不能为空")
private Integer sort; private Integer sort;
} }
...@@ -32,7 +32,6 @@ public class EnterpriseProjectBidNoticePageBody extends BasePage { ...@@ -32,7 +32,6 @@ public class EnterpriseProjectBidNoticePageBody extends BasePage {
/* /*
* 1金额倒序,2金额正序,3时间倒序,4时间正序 * 1金额倒序,2金额正序,3时间倒序,4时间正序
*/ */
@NotNull(message = "排序条件不能为空")
private Integer sort; private Integer sort;
/** /**
......
...@@ -27,7 +27,6 @@ public class EnterpriseProjectBidPlanPageBody extends BasePage { ...@@ -27,7 +27,6 @@ public class EnterpriseProjectBidPlanPageBody extends BasePage {
/* /*
* 排序字段:1金额倒序,2金额正序,3发布时间倒序,4发布时间正序,15预计招标时间倒序,16预计招标时间正序 * 排序字段:1金额倒序,2金额正序,3发布时间倒序,4发布时间正序,15预计招标时间倒序,16预计招标时间正序
*/ */
@NotNull(message = "排序条件不能为空")
private Integer sort; private Integer sort;
......
...@@ -33,7 +33,6 @@ public class EnterpriseProjectLandTransactionPageBody extends BasePage { ...@@ -33,7 +33,6 @@ public class EnterpriseProjectLandTransactionPageBody extends BasePage {
/* /*
* 1金额倒序,2金额正序,3时间倒序,4时间正序,11面积倒序,12面积正序 * 1金额倒序,2金额正序,3时间倒序,4时间正序,11面积倒序,12面积正序
*/ */
@NotNull(message = "排序条件不能为空")
private Integer sort; private Integer sort;
} }
...@@ -27,7 +27,6 @@ public class EnterpriseProjectSpecialDebtProjectPageBody extends BasePage { ...@@ -27,7 +27,6 @@ public class EnterpriseProjectSpecialDebtProjectPageBody extends BasePage {
/* /*
* 排序字段:1总投资金额倒序,2总投资金额正序,17项目资本金倒序,18项目资本金正序,19专项债用作资本金倒序,20专项债用作资本金正序 * 排序字段:1总投资金额倒序,2总投资金额正序,17项目资本金倒序,18项目资本金正序,19专项债用作资本金倒序,20专项债用作资本金正序
*/ */
@NotNull(message = "排序条件不能为空")
private Integer sort; private Integer sort;
} }
...@@ -23,7 +23,6 @@ public class EnterpriseUipSearchBody extends BasePage { ...@@ -23,7 +23,6 @@ public class EnterpriseUipSearchBody extends BasePage {
/* /*
* 1供应商倒序,2供应商正序,3拟建项目倒序,4拟建项目正序,5招标公告倒序,6招标公告正序,7土地倒序,8土地正序 * 1供应商倒序,2供应商正序,3拟建项目倒序,4拟建项目正序,5招标公告倒序,6招标公告正序,7土地倒序,8土地正序
*/ */
@NotNull(message = "排序条件不能为空")
private Integer sort; private Integer sort;
/** /**
......
...@@ -72,4 +72,9 @@ public class UrbanInvestmentPlatformDto extends BasePage { ...@@ -72,4 +72,9 @@ public class UrbanInvestmentPlatformDto extends BasePage {
* 字段 desc asc * 字段 desc asc
*/ */
private String order; private String order;
/**
* 含下属区:1 本级:2
*/
private Integer type =1;
} }
...@@ -175,10 +175,11 @@ export function enterprise(param) { ...@@ -175,10 +175,11 @@ export function enterprise(param) {
} }
//城投平台-企业查询选项 //城投平台-企业查询选项
export function uipGroupData() { export function uipGroupData(param) {
return request({ return request({
url: '/enterprise/uipGroupData', url: '/enterprise/uipGroupData',
method: 'POST' method: 'POST',
data: param
}) })
} }
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<!-- 输入框 --> <!-- 输入框 -->
<template v-if="form.type==3"> <template v-if="form.type==3">
<div class="cooperate-name"> <div class="cooperate-name">
<el-input @focus="clickFocus('focus'+i)" @blur="clickFocus('focus'+i)" v-model="form.value" :placeholder="form.placeholder"></el-input> <el-input clearable @focus="clickFocus('focus'+i)" @blur="clickFocus('focus'+i)" v-model="form.value" :placeholder="form.placeholder"></el-input>
<span :id="'focus'+i" @click="changeSelect">搜索</span> <span :id="'focus'+i" @click="changeSelect">搜索</span>
</div> </div>
</template> </template>
......
...@@ -53,10 +53,10 @@ export default { ...@@ -53,10 +53,10 @@ export default {
{label: '行业分类', prop: 'industry', width: '100'}, {label: '行业分类', prop: 'industry', width: '100'},
{label: '供地方式', prop: 'supplyLandWay', width: '100'}, {label: '供地方式', prop: 'supplyLandWay', width: '100'},
{label: '土地坐落', prop: 'landAddr', minWidth: '130'}, {label: '土地坐落', prop: 'landAddr', minWidth: '130'},
{label: '成交金额(万元)', prop: 'transactionPrice', sortable: 'custom', descending: '3', ascending: '4', width: '140'}, {label: '成交金额(万元)', prop: 'transactionPrice', sortable: 'custom', descending: '1', ascending: '2', width: '140'},
{label: '总面积(㎡)', prop: 'acreage', sortable: 'custom', descending: '11', ascending: '12', width: '130'}, {label: '总面积(㎡)', prop: 'acreage', sortable: 'custom', descending: '11', ascending: '12', width: '130'},
{label: '批准单位', prop: 'authority', width: '130'}, {label: '批准单位', prop: 'authority', width: '130'},
{label: '签订日期', prop: 'contractSignTime', sortable: 'custom', descending: '1', ascending: '2', width: '130'} {label: '签订日期', prop: 'contractSignTime', sortable: 'custom', descending: '3', ascending: '4', width: '130'}
], ],
formData: [ formData: [
{ type: 4, fieldName: 'landUse', value: '', placeholder: '土地用途', options: []}, { type: 4, fieldName: 'landUse', value: '', placeholder: '土地用途', options: []},
......
...@@ -81,6 +81,7 @@ export default { ...@@ -81,6 +81,7 @@ export default {
this.tableLoading = false this.tableLoading = false
}) })
}, },
// 公告
noticesTypes(){ noticesTypes(){
noticesType({cid: this.queryParams.cid}).then(res => { noticesType({cid: this.queryParams.cid}).then(res => {
let data = res.data let data = res.data
...@@ -94,12 +95,13 @@ export default { ...@@ -94,12 +95,13 @@ export default {
} }
}) })
}, },
// 身份
noticesRoles(){ noticesRoles(){
noticesRole({cid: this.queryParams.cid}).then(res => { noticesRole({cid: this.queryParams.cid}).then(res => {
let data = res.data let data = res.data
if(data.length > 0){ if(data.length > 0){
for (var i=0;i<data.length;i++){ for (var i=0;i<data.length;i++){
this.formData[1].options.push({ this.formData[2].options.push({
name: data[i].role + '(' + data[i].count + ')', name: data[i].role + '(' + data[i].count + ')',
value: data[i].role, value: data[i].role,
}) })
...@@ -107,12 +109,13 @@ export default { ...@@ -107,12 +109,13 @@ export default {
} }
}) })
}, },
// 案由
noticesCaseReasons(){ noticesCaseReasons(){
noticesCaseReason({cid: this.queryParams.cid}).then(res => { noticesCaseReason({cid: this.queryParams.cid}).then(res => {
let data = res.data let data = res.data
if(data.length > 0){ if(data.length > 0){
for (var i=0;i<data.length;i++){ for (var i=0;i<data.length;i++){
this.formData[2].options.push({ this.formData[1].options.push({
name: data[i].caseReason + '(' + data[i].count + ')', name: data[i].caseReason + '(' + data[i].count + ')',
value: data[i].caseReason, value: data[i].caseReason,
}) })
......
...@@ -62,7 +62,7 @@ export default { ...@@ -62,7 +62,7 @@ export default {
{ type: 1, fieldName: 'causeAction', value: '', placeholder: '案由', options: []}, { type: 1, fieldName: 'causeAction', value: '', placeholder: '案由', options: []},
{ type: 1, fieldName: 'role', value: '', placeholder: '身份', options: []}, { type: 1, fieldName: 'role', value: '', placeholder: '身份', options: []},
{ type: 2, fieldName: 'time', value: '', placeholder: '',startTime: 'dateFrom',endTime: 'dateTo'}, { type: 2, fieldName: 'time', value: '', placeholder: '',startTime: 'dateFrom',endTime: 'dateTo'},
{ type: 3, fieldName: 'keys', value: '', placeholder: '搜索关键字'} { type: 3, fieldName: 'keys', value: '', placeholder: '请输入执行案号'}
], ],
//列表 //列表
tableLoading:false, tableLoading:false,
......
...@@ -65,7 +65,7 @@ export default { ...@@ -65,7 +65,7 @@ export default {
{ type: 1, fieldName: 'causeAction', value: '', placeholder: '案由', options: []}, { type: 1, fieldName: 'causeAction', value: '', placeholder: '案由', options: []},
{ type: 1, fieldName: 'pureRole', value: '', placeholder: '身份', options: []}, { type: 1, fieldName: 'pureRole', value: '', placeholder: '身份', options: []},
{ type: 2, fieldName: 'time', value: '', placeholder: '',startTime: 'dateFrom',endTime: 'dateTo'}, { type: 2, fieldName: 'time', value: '', placeholder: '',startTime: 'dateFrom',endTime: 'dateTo'},
{ type: 3, fieldName: 'keys', value: '', placeholder: '请输入关键词'}, { type: 3, fieldName: 'keys', value: '', placeholder: '请输入案号'},
], ],
//列表 //列表
tableLoading:false, tableLoading:false,
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
> >
<template slot="punishReason" slot-scope="scope"> <template slot="punishReason" slot-scope="scope">
<span :class="[isOverHiddenFlag(scope.data.width, showList, scope.index, 0, scope.row.punishReason)?'cell-span':'']" :style="{'-webkit-line-clamp': 5}"> <span :class="[isOverHiddenFlag(scope.data.width, showList, scope.index, 0, scope.row.punishReason)?'cell-span':'']" :style="{'-webkit-line-clamp': 5}">
{{ scope.row.punishReason }} <div v-html="scope.row.punishReason"></div>
<span v-if="isOverHiddenFlag(scope.data.width, showList, scope.index, 0, scope.row.punishReason)" @click="changeShowAll(scope.index, 0)">...<span style="color: #0081FF;">更多</span></span> <span v-if="isOverHiddenFlag(scope.data.width, showList, scope.index, 0, scope.row.punishReason)" @click="changeShowAll(scope.index, 0)">...<span style="color: #0081FF;">更多</span></span>
</span> </span>
</template> </template>
......
...@@ -17,8 +17,9 @@ ...@@ -17,8 +17,9 @@
:queryParams="queryParams" :queryParams="queryParams"
@handle-current-change="handleCurrentChange" @handle-current-change="handleCurrentChange"
> >
<template slot="projectName" slot-scope="data"> <template slot="projectName" slot-scope="scope">
<router-link to="" tag="a" class="a-link">{{ data.row.projectName }}</router-link> <router-link :to="`/radar/Land/details/${scope.row.id}`" tag="a" class="a-link" v-if="scope.row.id&&scope.row.projectName " v-html="scope.row.projectName"></router-link>
<div v-else v-html="scope.row.projectName || '--'"></div>
</template> </template>
</tables> </tables>
......
...@@ -97,8 +97,9 @@ ...@@ -97,8 +97,9 @@
@handle-current-change="handleCurrentChange" @handle-current-change="handleCurrentChange"
@sort-change="sortChange" @sort-change="sortChange"
> >
<template slot="companyName" slot-scope="data"> <template slot="companyName" slot-scope="scope">
<router-link to="" tag="a" class="a-link">{{ data.row.companyName }}</router-link> <router-link :to="`/enterprise/${encodeStr(scope.row.companyId)}`" tag="a" class="a-link" v-if="scope.row.companyId&&scope.row.companyName " v-html="scope.row.companyName"></router-link>
<div v-else v-html="scope.row.companyName || '--'"></div>
</template> </template>
</tables> </tables>
......
...@@ -21,7 +21,8 @@ export default { ...@@ -21,7 +21,8 @@ export default {
created() { created() {
if (this.$route.params.id) { // 获取companyId if (this.$route.params.id) { // 获取companyId
this.loading = true this.loading = true
this.src = `https://pre-plug.jiansheku.com/enterprise/${this.$route.params.id}?secretId=${this.secretId}` // this.src = `https://pre-plug.jiansheku.com/enterprise/${this.$route.params.id}?secretId=${this.secretId}`
this.src = `http://192.168.60.30:3300/enterprise/${this.$route.params.id}?secretId=${this.secretId}`
} }
}, },
mounted() { mounted() {
......
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
</el-form> </el-form>
</div> </div>
<div class="flex-box query-ability"> <div class="flex-box query-ability">
<span class="flex-box"><img src="@/assets/images/ability_vs.png">地区经济对比</span> <!--<span class="flex-box"><img src="@/assets/images/ability_vs.png">地区经济对比</span>-->
<span class="flex-box"><img src="@/assets/images/ability_excel.png">导出EXCEL</span> <span class="flex-box" @click="handleMessage"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
</div> </div>
</div> </div>
<div class="table-item"> <div class="table-item">
...@@ -289,10 +289,17 @@ export default { ...@@ -289,10 +289,17 @@ export default {
}, },
created() { created() {
this.dataRegion(); this.dataRegion();
console.log(this.dataQuery)
// this.getData(); // this.getData();
getYears({}).then(res => { getYears({}).then(res => {
this.yearOptions=res.data.reverse(); this.yearOptions=res.data.reverse();
this.queryParams.year = this.yearOptions[0].year; this.queryParams.year = this.yearOptions[0].year;
if(this.dataQuery.pId){
const params = { year: this.queryParams.year,type:3,provinceId:this.dataQuery.provinceId }
this.value1Flag=true
this.addressValue1=this.dataQuery.province
this.getData(params,1)
}
}) })
}, },
computed: { computed: {
...@@ -387,7 +394,7 @@ export default { ...@@ -387,7 +394,7 @@ export default {
this.value5Flag=true this.value5Flag=true
break; break;
} }
const params = { pageNum: this.pageIndex, pageSize: this.pageSize, year: this.queryParams.year,type:3 } const params = { year: this.queryParams.year,type:3 }
let code=[]; let code=[];
for (var i in this.regionData) { for (var i in this.regionData) {
code=this.regionData[i].path code=this.regionData[i].path
...@@ -517,6 +524,12 @@ export default { ...@@ -517,6 +524,12 @@ export default {
fontWeight: 'bold' fontWeight: 'bold'
} }
} }
},
handleMessage(){
this.$message({
message: '功能正在开发中',
type: 'warning'
});
} }
} }
} }
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
</el-form> </el-form>
</div> </div>
<div class="flex-box query-ability"> <div class="flex-box query-ability">
<span class="flex-box"><img src="@/assets/images/ability_excel.png">导出EXCEL</span> <span class="flex-box" @click="handleMessage"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
</div> </div>
</div> </div>
<div class="content"> <div class="content">
...@@ -129,7 +129,6 @@ export default { ...@@ -129,7 +129,6 @@ export default {
this.initChart() this.initChart()
}) })
}, },
initChart() { initChart() {
let myChart = echarts.init(document.getElementById("echarts")) let myChart = echarts.init(document.getElementById("echarts"))
let option ={ let option ={
...@@ -172,6 +171,12 @@ export default { ...@@ -172,6 +171,12 @@ export default {
} }
myChart.setOption(option); myChart.setOption(option);
}, },
handleMessage(){
this.$message({
message: '功能正在开发中',
type: 'warning'
});
}
} }
} }
......
...@@ -6,14 +6,14 @@ ...@@ -6,14 +6,14 @@
<span class="common-title">经济数据</span> <span class="common-title">经济数据</span>
<el-form ref="queryForm" :model="queryParams" :inline="true" size="small"> <el-form ref="queryForm" :model="queryParams" :inline="true" size="small">
<el-form-item prop="year"> <el-form-item prop="year">
<el-select v-model="queryParams.year" filterable class="form-content-width" placeholder="请选择年度" @change="getData"> <el-select v-model="queryParams.year" filterable class="form-content-width" placeholder="请选择" @change="getData">
<el-option v-for="(item, index) in yearOptions" :key="index" :label="item.year" :value="item.year" /> <el-option v-for="(item, index) in yearOptions" :key="index" :label="item.year" :value="item.year" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
<div class="flex-box query-ability"> <div class="flex-box query-ability">
<span class="flex-box"><img src="@/assets/images/ability_excel.png">导出EXCEL</span> <span class="flex-box" @click="handleMessage"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
</div> </div>
</div> </div>
<div class="table-item"> <div class="table-item">
...@@ -124,6 +124,12 @@ export default { ...@@ -124,6 +124,12 @@ export default {
this.pageIndex = 1; this.pageIndex = 1;
this.getData() this.getData()
}, },
handleMessage(){
this.$message({
message: '功能正在开发中',
type: 'warning'
});
}
} }
} }
</script> </script>
......
...@@ -77,8 +77,8 @@ ...@@ -77,8 +77,8 @@
<span class="common-title">主要指标</span> <span class="common-title">主要指标</span>
</div> </div>
<div class="flex-box query-ability"> <div class="flex-box query-ability">
<span class="flex-box"><img src="@/assets/images/ability_vs.png">地区经济对比</span> <span class="flex-box" @click="childMethod"><img src="@/assets/images/ability_vs.png">地区经济对比</span>
<span class="flex-box"><img src="@/assets/images/ability_excel.png">导出EXCEL</span> <span class="flex-box" @click="handleMessage"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
</div> </div>
</div> </div>
<div class="table-item"> <div class="table-item">
...@@ -638,6 +638,17 @@ export default { ...@@ -638,6 +638,17 @@ export default {
fontWeight: 'bold' fontWeight: 'bold'
} }
} }
},
handleMessage(){
this.$message({
message: '功能正在开发中',
type: 'warning'
});
},
childMethod() {
let data=this.dataQuery
data.pId=this.dataQuery.provinceId
this.$parent.handleClick('four',data);
} }
} }
} }
......
...@@ -44,15 +44,25 @@ export default { ...@@ -44,15 +44,25 @@ export default {
this.provinceId=res.data.currentProvince.id; this.provinceId=res.data.currentProvince.id;
if(!this.dataQuery.provinceId){ if(!this.dataQuery.provinceId){
this.dataQuery.provinceId=this.provinceId this.dataQuery.provinceId=this.provinceId
this.dataQuery.province=this.province
} }
}) })
console.log(this.dataQuery)
if(this.dataQuery.activeName){
this.activeName=this.dataQuery.activeName;
}
// let name = sessionStorage.getItem('currentTab') // let name = sessionStorage.getItem('currentTab')
// if (name != "undefined" && name){ // if (name != "undefined" && name){
// this.activeName = name; // this.activeName = name;
// } // }
}, },
methods: { methods: {
handleClick() { handleClick(key,item) {
console.log(item)
if(key === 'four'){
this.activeName='four'
}
// sessionStorage.setItem('currentTab', this.activeName) // sessionStorage.setItem('currentTab', this.activeName)
} }
} }
......
...@@ -155,7 +155,6 @@ export default { ...@@ -155,7 +155,6 @@ export default {
} }
}, },
created() { created() {
console.log(this.$route.params)
this.id=this.$route.params.id; this.id=this.$route.params.id;
this.getDetails() this.getDetails()
...@@ -171,7 +170,6 @@ export default { ...@@ -171,7 +170,6 @@ export default {
const params = { pageNum: this.pageIndex, pageSize: this.pageSize,specialBondUuid:'2e59fca0-21a6-47db-975d-5481e1c52f45_74'} const params = { pageNum: this.pageIndex, pageSize: this.pageSize,specialBondUuid:'2e59fca0-21a6-47db-975d-5481e1c52f45_74'}
// const params = { pageNum: this.pageIndex, pageSize: this.pageSize,specialBondUuid:this.details.specialBondUuid} // const params = { pageNum: this.pageIndex, pageSize: this.pageSize,specialBondUuid:this.details.specialBondUuid}
bondPage(params).then(res => { bondPage(params).then(res => {
console.log(res.data)
this.tableData=res.data.list; this.tableData=res.data.list;
this.tableDataTotal=res.data.totalCount; this.tableDataTotal=res.data.totalCount;
}) })
......
...@@ -139,7 +139,6 @@ export default { ...@@ -139,7 +139,6 @@ export default {
let arr=this.tableData.sort((old,New)=>{ let arr=this.tableData.sort((old,New)=>{
return New.value - old.value return New.value - old.value
}) })
console.log(arr)
let data=[] let data=[]
for(let i=0; i<10; i++){ for(let i=0; i<10; i++){
data.push(arr[i]) data.push(arr[i])
......
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
</el-form> </el-form>
</div> </div>
<div class="flex-box query-ability"> <div class="flex-box query-ability">
<router-link to="/macro/economies" tag="a" class="a-link"><span class="flex-box"><img src="@/assets/images/ability_vs.png">地区经济对比</span></router-link> <router-link to="/macro/economies?activeName=four" tag="a" class="a-link"><span class="flex-box"><img src="@/assets/images/ability_vs.png">地区经济对比</span></router-link>
<span class="flex-box"><img src="@/assets/images/ability_excel.png">导出EXCEL</span> <span class="flex-box" @click="handleMessage"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
</div> </div>
</div> </div>
<div class="table-item"> <div class="table-item">
...@@ -279,6 +279,12 @@ ...@@ -279,6 +279,12 @@
this.pageIndex = 1 this.pageIndex = 1
this.querySubmit() this.querySubmit()
}, },
handleMessage(){
this.$message({
message: '功能正在开发中',
type: 'warning'
});
}
} }
} }
</script> </script>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class="zb-content content1"> <div class="zb-content content1">
<div class="flex-box query-box"> <div class="flex-box query-box">
<div class="flex-box query-params"> <div class="flex-box query-params">
<span class="common-title">近五年全国招标数量</span> <span class="common-title">全国招标数量分析</span>
</div> </div>
</div> </div>
<div class="text">{{value}}全国项目招标数量达到{{totalCount}}万个,招标数量前五的地区分别是 <div class="text">{{value}}全国项目招标数量达到{{totalCount}}万个,招标数量前五的地区分别是
...@@ -80,10 +80,10 @@ ...@@ -80,10 +80,10 @@
<span class="common-title">全国招标项目概览</span> <span class="common-title">全国招标项目概览</span>
</div> </div>
</div> </div>
<div class="text">通过对近年全国招标数据进行分析,发现该企业主要集中在{{dataSort[0].label}}({{dataSort[0].count}}个)、{{dataSort[1].label}}({{dataSort[1].count}}个)进行招标。</div> <div class="text">通过对近{{year}}年全国招标数据进行分析,发现该企业主要集中在{{dataSort[0].label}}({{dataSort[0].count}}个)、{{dataSort[1].label}}({{dataSort[1].count}}个)进行招标。</div>
<div class="main1"> <div class="main1">
<div id="gl-echarts" style="height: 250px"></div> <div id="gl-echarts" style="height: 250px"></div>
<p class="tips"><i class="el-icon-info"></i>数据来源大司空建筑大数据平台,统计范围为近年全国公开的招标项目,未公开的不含在内</p> <p class="tips"><i class="el-icon-info"></i>数据来源大司空建筑大数据平台,统计范围为近{{year}}年全国公开的招标项目,未公开的不含在内</p>
</div> </div>
<div class="main2"> <div class="main2">
<div class="selectYear"> <div class="selectYear">
...@@ -119,7 +119,7 @@ export default { ...@@ -119,7 +119,7 @@ export default {
name: 'NationalEconomies', name: 'NationalEconomies',
data() { data() {
return { return {
year:'', year:'2023',
yearOptions: [ yearOptions: [
{ label: '近五年', value: '近五年' }, { label: '近五年', value: '近五年' },
{ label: '近三年', value: '近三年' }, { label: '近三年', value: '近三年' },
......
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
<span class="common-title">主要指标</span> <span class="common-title">主要指标</span>
</div> </div>
<div class="flex-box query-ability"> <div class="flex-box query-ability">
<span class="flex-box"><img src="@/assets/images/ability_excel.png">导出EXCEL</span> <span class="flex-box" @click="handleMessage"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
</div> </div>
</div> </div>
<div class="table-item"> <div class="table-item">
...@@ -288,7 +288,7 @@ export default { ...@@ -288,7 +288,7 @@ export default {
}, },
methods: { methods: {
getType(){ getType(){
uipGroupData().then(res => { uipGroupData({}).then(res => {
this.typeList=res.data; this.typeList=res.data;
}) })
}, },
...@@ -527,6 +527,12 @@ export default { ...@@ -527,6 +527,12 @@ export default {
this.pageIndex = 1; this.pageIndex = 1;
this.querySubmit() this.querySubmit()
}, },
handleMessage(){
this.$message({
message: '功能正在开发中',
type: 'warning'
});
}
}, },
} }
</script> </script>
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<img src="@/assets/images/project/empty.png"> <img src="@/assets/images/project/empty.png">
<div class="p1">暂无数据展示</div> <div class="p1">暂无数据展示</div>
<div class="p2">抱歉,你还未添加相关数据,快去添加吧</div> <div class="p2">抱歉,你还未添加相关数据,快去添加吧</div>
<div class="btn btn_primary h36 w102" @click="opennew">新增联系人</div> <div class="btn btn_primary h36 w102" @click="opennew">新增相关企业</div>
</div> </div>
</template> </template>
<el-table-column <el-table-column
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
<img src="@/assets/images/economies/icon.png"> <img src="@/assets/images/economies/icon.png">
<span>新建相关企业-{{types}}</span> <span>新建相关企业-{{types}}</span>
</div> </div>
<el-form class="popform i" label-width="85px" :rules="rules" ref="ruleForm" > <el-form class="popform i":model="queryParam" label-width="85px" :rules="rules" ref="ruleForm" >
<el-form-item label="企业名称:" prop="companyName" class="row"> <el-form-item label="企业名称:" prop="companyName" class="row">
<el-input type="text" v-model="queryParam.companyName" placeholder="请输入"></el-input> <el-input type="text" v-model="queryParam.companyName" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
...@@ -154,25 +154,7 @@ ...@@ -154,25 +154,7 @@
nowedit:-1,//当前正在编辑的文本 nowedit:-1,//当前正在编辑的文本
tipslit:[],//项目标签 tipslit:[],//项目标签
tipsvalue:"",//标签填写内容 tipsvalue:"",//标签填写内容
tableData: [ tableData: [],
{
date: '2016-05-02',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄'
}, {
date: '2016-05-04',
name: '王小虎',
address: '上海市普陀区金沙江路 1517 弄'
}, {
date: '2016-05-01',
name: '王小虎',
address: '上海市普陀区金沙江路 1519 弄'
}, {
date: '2016-05-03',
name: '王小虎',
address: '上海市普陀区金沙江路 1516 弄'
}
],
typelist:['对接深度:','合作阶段:','竞争力度:'], typelist:['对接深度:','合作阶段:','竞争力度:'],
typename:"", typename:"",
rules:{ rules:{
...@@ -224,6 +206,8 @@ ...@@ -224,6 +206,8 @@
}, },
addqy(){ addqy(){
addXGQY(this.queryParam).then(res=>{ addXGQY(this.queryParam).then(res=>{
this.hzhbVisible=false
this.dialogVisible=false
if(res.code == 200){ if(res.code == 200){
this.$message.success('添加成功!') this.$message.success('添加成功!')
this.getlist() this.getlist()
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
<el-tab-pane label="公司全部项目" name="second"></el-tab-pane> <el-tab-pane label="公司全部项目" name="second"></el-tab-pane>
<div class="searchInput"> <div class="searchInput">
<el-input type="text" placeholder="请输入项目或业主单位名称关键词进行搜索"></el-input> <el-input type="text" v-model="searchParam.projectName" placeholder="请输入项目或业主单位名称关键词进行搜索"></el-input>
<div class="btn">搜索</div> <div class="btn" @click="getList(1)">搜索</div>
</div> </div>
<div class="sellist"> <div class="sellist">
<div class="selli"> <div class="selli">
...@@ -283,6 +283,7 @@ export default { ...@@ -283,6 +283,7 @@ export default {
}else{ }else{
this.searchParam.userId = null this.searchParam.userId = null
} }
this.searchParam.ownerCompany = this.searchParam.projectName
getProjectlist(this.searchParam).then(result=>{ getProjectlist(this.searchParam).then(result=>{
if(result.code == 200){ if(result.code == 200){
this.datalist = result.rows this.datalist = result.rows
...@@ -315,6 +316,7 @@ export default { ...@@ -315,6 +316,7 @@ export default {
pageNum:1, pageNum:1,
pageSize:10, pageSize:10,
} }
this.getList(1)
}, },
//地区 //地区
async prvinceTree() { async prvinceTree() {
......
...@@ -144,7 +144,7 @@ public class EnterpriseService { ...@@ -144,7 +144,7 @@ public class EnterpriseService {
public R getUipId(String companyName) throws Exception { public R getUipId(String companyName) throws Exception {
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
params.put("companyName",companyName); params.put("companyName", companyName);
Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/getUipId", params); Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/getUipId", params);
return BeanUtil.toBean(map, R.class); return BeanUtil.toBean(map, R.class);
} }
...@@ -186,7 +186,7 @@ public class EnterpriseService { ...@@ -186,7 +186,7 @@ public class EnterpriseService {
} }
public R uipGroupData() throws Exception { public R uipGroupData() throws Exception {
Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/uipGroupData", null); Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/uipGroupData", new HashMap<>());
return BeanUtil.toBean(map, R.class); return BeanUtil.toBean(map, R.class);
} }
......
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