Skip to content

D
dsk-cr20g
Commit 36fcd023 authored by yht15023815643's avatar yht15023815643
Browse files
Options

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

parents fffae033 cdc88c94
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 47 deletions
dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/JskCombineInfoService.java
View file @ 36fcd023
......@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson2.JSONObject;
import com.dsk.common.constant.CacheConstants;
import com.dsk.common.core.domain.AjaxResult;
import com.dsk.common.core.domain.R;
......@@ -99,12 +100,12 @@ public class JskCombineInfoService {
}
public AjaxResult centralEnterprse() {
Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/centralEnterprse", null);
Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/centralEnterprse", new JSONObject());
return BeanUtil.toBean(map, AjaxResult.class);
}
public AjaxResult centralEnterprseChild() {
Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/centralEnterprse/child", null);
Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/centralEnterprse/child", new JSONObject());
return BeanUtil.toBean(map, AjaxResult.class);
}
......@@ -124,7 +125,7 @@ public class JskCombineInfoService {
}
public AjaxResult centralEnterprseSocial() {
Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/centralEnterprse/social", null);
Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/centralEnterprse/social", new JSONObject());
return BeanUtil.toBean(map, AjaxResult.class);
}
......
dsk-operate-ui/src/views/custom/historicalCustomers/index.vue
View file @ 36fcd023
......@@ -18,7 +18,7 @@
</div>
</div>
<skeleton v-if="isSkeleton"></skeleton>
<el-table v-if="!isSkeleton&&tableData.total > 0" class="fixed-table" v-horizontal-scroll="tableData.total > 10 ? 'hover' : '1'" max-height="640"
<el-table v-if="!isSkeleton&&tableData.total > 0" class="fixed-table" v-horizontal-scroll="tableData.total > 10 ? 'hover' : 'false'" max-height="640"
:data="tableData.rows"
stripe border
style="width: 100%">
......
dsk-operate-ui/src/views/index.vue
View file @ 36fcd023
......@@ -24,7 +24,7 @@
<div class="flex-box query-box">
<div class="flex-box query-params">
<span class="common-title">集团中标统计</span>
<div class="tips">注：数据来源大司空建筑大数据平台，统计范围为全国公开的施工内土地交易项目，未公开的不含在内</div>
<div class="tips">注：数据来源大司空建筑大数据平台，统计范围为全国公开的施工类项目，未公开的不含在内。</div>
</div>
<div class="flex-box">
<div class="search">
......@@ -86,7 +86,7 @@
<div class="flex-box query-box">
<div class="flex-box query-params">
<span class="common-title">大项目中标排行榜</span>
<div class="tips">注：数据来源大司空建筑大数据平台，统计范围为全国公开的施工内土地交易项目，未公开的不含在内</div>
<div class="tips">注：数据来源大司空建筑大数据平台，统计范围为全国公开的施工类项目，未公开的不含在内。</div>
</div>
<div class="flex-box">
<div class="search">
......@@ -981,7 +981,7 @@ export default {
initChart1(list){
let data=[]
let arr=list.sort(function(a, b) {
return b.count - a.count;
return b.money - a.money;
});
if(arr.length > 10){
for(var i=0;i<10;i++){
......
dsk-operate-ui/src/views/macro/economies/component/localEconomy.vue
View file @ 36fcd023
......@@ -22,7 +22,7 @@
v-loading="tableLoading"
:data="tableData"
border
v-horizontal-scroll="'hover'"
v-horizontal-scroll="tableData.total > 15 ? 'hover' : 'false'"
highlight-current-row
@sort-change="sortChange"
:default-sort = "{prop: 'gdp', order: 'descending'}"
......
dsk-operate-ui/src/views/macro/economies/component/regionalEconomy.vue
View file @ 36fcd023
......@@ -392,7 +392,8 @@ export default {
},
grid: {
top:20,
// right:15,
left:5,
right:60,
bottom:5,
},
series: [
......@@ -408,7 +409,7 @@ export default {
show: this.valData[1] ? true : false,
position: 'top',
textStyle: {
padding: [0, 0, 0, -12]
padding: [0, 0, 0, 55]
}
},
//设置折线颜色和粗细
......@@ -432,7 +433,7 @@ export default {
},
]),
},
}
},
]
}
myChart.setOption(option);
......@@ -460,6 +461,8 @@ export default {
},
grid: {
top:20,
left:5,
right:60,
bottom:5,
},
series: [
......@@ -475,7 +478,7 @@ export default {
show: this.valData1[1] ? true : false,
position: 'top',
textStyle: {
padding: [0, 0, 0, -35]
padding: [0, 0, 0, 15]
}
},
itemStyle:{
......@@ -527,6 +530,8 @@ export default {
},
grid: {
top:20,
left:5,
right:60,
bottom:5,
},
series: [
......@@ -542,7 +547,7 @@ export default {
show: this.valData2[1] ? true : false,
position: 'top',
textStyle: {
padding: [0, 0, 0, -16]
padding: [0, 0, 0, 35]
}
},
//设置折线颜色和粗细
......@@ -594,6 +599,8 @@ export default {
},
grid: {
top:20,
left:5,
right:60,
bottom:5,
},
series: [
......@@ -609,7 +616,7 @@ export default {
show: this.valData3[1] ? true : false,
position: 'top',
textStyle: {
padding: [0, 0, 0, -16]
padding: [0, 0, 0, 35]
}
},
//设置折线颜色和粗细
......@@ -661,7 +668,8 @@ export default {
},
grid: {
top:20,
// left:5,
left:5,
right:60,
bottom:5,
},
series: [
......@@ -677,7 +685,7 @@ export default {
show: this.valData4[1] ? true : false,
position: 'top',
textStyle: {
padding: [0, 0, 0, -14]
padding: [0, 0, 0, 40]
}
},
//设置折线颜色和粗细
......
dsk-operate-ui/src/views/macro/nationalEconomies/component/BI.vue
View file @ 36fcd023
......@@ -40,7 +40,7 @@
.el-tabs__header{
margin: 0;
position: sticky;
top: 104px;
top: 102px;
z-index: 999;
background: #fff;
.el-tabs__item{
......
dsk-operate-ui/src/views/macro/nationalEconomies/component/qgjjdq.vue
View file @ 36fcd023
......@@ -422,13 +422,13 @@
overflow:visible;
.el-table__header-wrapper{
position: sticky;
top:104px;
top:102px;
z-index: 9;
}
.el-table__fixed-header-wrapper{
position: sticky;
z-index: 9;
top: 104px;
top: 102px;
}
.el-table__fixed{
overflow-x: clip;
......
dsk-operate-ui/src/views/macro/nationalEconomies/component/tdjy.vue
View file @ 36fcd023
......@@ -706,7 +706,7 @@ export default {
return;
}
if (index === 3) {
sums[index] = '100';
sums[index] = '100%';
return;
}
const values = data.map(item => Number(item[column.property]));
......@@ -719,8 +719,8 @@ export default {
}
}, 0);
if (index === 1) {
sums[index] = Number(sums[index]).toFixed(0);
if (index === 2) {
sums[index] = Number(sums[index]).toFixed(0)+'个';
return;
}
});
......
dsk-operate-ui/src/views/macro/nationalEconomies/component/zhaobiao.vue
View file @ 36fcd023
......@@ -593,7 +593,7 @@
return;
}
if (index === 3) {
sums[index] = '100';
sums[index] = '100%';
return;
}
const values = data.map(item => Number(item[column.property]));
......@@ -606,8 +606,8 @@
}
}, 0);
if (index === 1) {
sums[index] = Number(sums[index]).toFixed(0);
if (index === 2) {
sums[index] = Number(sums[index]).toFixed(0)+'个';
return;
}
});
......
dsk-operate-ui/src/views/macro/nationalEconomies/component/zhongbiao.vue
View file @ 36fcd023
......@@ -30,16 +30,16 @@
<template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column>
<el-table-column prop="type" label="项目类型" :formatter="formatStatus" width="100"/>
<el-table-column prop="count" label="中标数量" align="right" :formatter="formatStatus" sortable width="130">
<el-table-column prop="count" label="中标数量" align="right" :formatter="formatStatus" sortable width="110">
<template slot-scope="scope">{{ scope.row.count }}个</template>
</el-table-column>
<el-table-column prop="countRate" label="数量占比" align="right" :formatter="formatStatus" sortable width="140">
<el-table-column prop="countRate" label="数量占比" align="right" :formatter="formatStatus" sortable width="110">
<template slot-scope="scope">{{ scope.row.countRate }}%</template>
</el-table-column>
<el-table-column prop="money" label="中标总金额" align="right" :formatter="formatStatus" sortable width="190">
<el-table-column prop="money" label="中标总金额" align="right" :formatter="formatStatus" sortable min-width="180">
<template slot-scope="scope">{{ scope.row.money }}万元</template>
</el-table-column>
<el-table-column prop="moneyRate" label="金额占比" align="right" :formatter="formatStatus" sortable width="120">
<el-table-column prop="moneyRate" label="金额占比" align="right" :formatter="formatStatus" sortable width="110">
<template slot-scope="scope">{{ scope.row.moneyRate }}%</template>
</el-table-column>
</el-table>
......@@ -78,16 +78,16 @@
<template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column>
<el-table-column prop="province" label="地区" :formatter="formatStatus" width="100"/>
<el-table-column prop="count" label="中标数量" align="right" :formatter="formatStatus" sortable width="130">
<el-table-column prop="count" label="中标数量" align="right" :formatter="formatStatus" sortable width="110">
<template slot-scope="scope">{{ scope.row.count }}个</template>
</el-table-column>
<el-table-column prop="countRate" label="数量占比" align="right" :formatter="formatStatus" sortable width="140">
<el-table-column prop="countRate" label="数量占比" align="right" :formatter="formatStatus" sortable width="110">
<template slot-scope="scope">{{ scope.row.countRate }}%</template>
</el-table-column>
<el-table-column prop="sumMoney" label="中标总金额" align="right" :formatter="formatStatus" sortable width="190">
<el-table-column prop="sumMoney" label="中标总金额" align="right" :formatter="formatStatus" sortable min-width="180">
<template slot-scope="scope">{{ scope.row.sumMoney }}万元</template>
</el-table-column>
<el-table-column prop="moneyRate" label="金额占比" align="right" :formatter="formatStatus" sortable width="120">
<el-table-column prop="moneyRate" label="金额占比" align="right" :formatter="formatStatus" sortable width="110">
<template slot-scope="scope">{{ scope.row.moneyRate }}%</template>
</el-table-column>
</el-table>
......@@ -312,17 +312,16 @@
this.dataRegion()
this.yearsData()
this.getCountBidByType()
this.getCountBidGroupByProvince()
this.getRangeBidMoney()
this.getRangeBidFiveYears()
this.getLowerRateByYear()
this.getLowerRangeTenderType()
setTimeout(() => {
}, 1000);
},
mounted() {
this.getCountBidGroupByProvince()
this.getRangeBidMoney()
this.getRangeBidFiveYears()
this.getLowerRateByYear()
this.getLowerRangeTenderType()
},
beforeDestroy(){
......@@ -1088,8 +1087,12 @@
}
}, 0);
if (index === 2) {
sums[index] = sums[index]+'个';
return;
}
if (index === 4) {
sums[index] = Number(sums[index]).toFixed(2);
sums[index] = Number(sums[index]).toFixed(2)+'万元';
return;
}
});
......@@ -1120,7 +1123,7 @@
}, 0);
if (index === 2) {
sums[index] = (Number(sums[index])/length).toFixed(2);
sums[index] = (Number(sums[index])/length).toFixed(2)+'%';
return;
}
});
......@@ -1151,7 +1154,7 @@
}, 0);
if (index === 2||index === 3||index === 4) {
sums[index] = (Number(sums[index])/length).toFixed(2);
sums[index] = (Number(sums[index])/length).toFixed(2)+'%';
return;
}
});
......
dsk-operate-ui/src/views/macro/nationalEconomies/index.vue
View file @ 36fcd023
......@@ -81,7 +81,7 @@ export default {
border-radius: 4px;
color: #232323;
position: sticky;
top: 56px;
top: 54px;
z-index: 999;
::v-deep .el-tabs{
height: 48px;
......
dsk-operate-ui/src/views/project/projectList/component/addProject.vue
View file @ 36fcd023
......@@ -14,7 +14,7 @@
<el-form class="popform j" :model="queryParam" :rules="rules" ref="ruleForm" label-width="130px">
<el-form-item label="项目名称：" class="row" prop="projectName">
<el-input type="text" placeholder="请输入" v-model="queryParam.projectName" @input="getProject(1)" :οnkeyup="queryParam.projectName=queryParam.projectName.replace(/^\s+|\s+$/g,'')"></el-input>
<div class="resultlist infinite-list" v-infinite-scroll="load1" v-if="proList.length>0" id="box1">
<div class="resultlist infinite-list" v-infinite-scroll="load1" v-if="proList.length>0" id="box1" style="overflow:auto">
<div class="infinite-list-item" v-for="(item,index) in proList" @click="selProject(item)"><span v-html="item.projectName" :key="projectpage"></span></div>
</div>
</el-form-item>
......@@ -204,8 +204,9 @@
this.proList = result.data
} else {
let arr2 = result.data
arr2.unshift(2, 0);
Array.prototype.splice.apply(this.proList, arr2);
// arr2.unshift(2, 0);
// Array.prototype.splice.apply(this.proList, arr2);
this.proList = [...this.proList,...arr2]
}
this.projectpage += 1
}else{
......
dsk-operate-ui/src/views/system/user/profile/index.vue
View file @ 36fcd023
......@@ -139,7 +139,6 @@ export default {
this.tableData = []
this.tableDataTotal = 0
}
this.tableDataTotal = 0
this.isSkeleton = false
})
},
......
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