Skip to content

D
dsk-operate-sys-cscec
Commit 556594c8 authored by Administrator's avatar Administrator
Browse files
Options

Merge remote-tracking branch 'origin/dev20230707' into dev20230707

parents c987f63c f55ed098
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 29 deletions
dsk-operate-ui/src/views/macro/nationalEconomies/component/tdjy.vue
View file @ 556594c8
...@@ -30,9 +30,9 @@ ...@@ -30,9 +30,9 @@
<el-table-column label="序号" width="60"> <el-table-column label="序号" width="60">
<template slot-scope="scope">{{ scope.$index + 1 }}</template> <template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="type" label="供应方式" width="200" :formatter="formatStatus"/> <el-table-column prop="type" label="供应方式" :formatter="formatStatus"/>
<el-table-column prop="count" label="土地交易项目 (个)" align="right" :formatter="formatStatus" sortable width="160" /> <el-table-column prop="count" label="土地交易项目 (个)" align="right" :formatter="formatStatus" sortable/>
<el-table-column prop="rate" label="占比（%）" align="right" :formatter="formatStatus" width="160" /> <el-table-column prop="rate" label="占比（%）" align="right" :formatter="formatStatus" width="100"/>
</el-table> </el-table>
</div> </div>
</div> </div>
...@@ -69,9 +69,9 @@ ...@@ -69,9 +69,9 @@
<el-table-column label="序号" width="60"> <el-table-column label="序号" width="60">
<template slot-scope="scope">{{ scope.$index + 1 }}</template> <template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="type" label="供应方式" width="200" :formatter="formatStatus"/> <el-table-column prop="type" label="供应方式" :formatter="formatStatus"/>
<el-table-column prop="count" label="土地交易项目 (个)" align="right" :formatter="formatStatus" sortable width="160" /> <el-table-column prop="count" label="土地交易项目 (个)" align="right" :formatter="formatStatus" sortable/>
<el-table-column prop="rate" label="占比（%）" align="right" :formatter="formatStatus" width="160" /> <el-table-column prop="rate" label="占比（%）" align="right" :formatter="formatStatus" width="100"/>
</el-table> </el-table>
</div> </div>
</div> </div>
...@@ -111,9 +111,9 @@ ...@@ -111,9 +111,9 @@
<el-table-column label="序号" width="60"> <el-table-column label="序号" width="60">
<template slot-scope="scope">{{ scope.$index + 1 }}</template> <template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="province" label="地区" width="200" :formatter="formatStatus"/> <el-table-column prop="province" label="地区" :formatter="formatStatus"/>
<el-table-column prop="count" label="土地交易项目 (个)" align="right" :formatter="formatStatus" sortable width="160" /> <el-table-column prop="count" label="土地交易项目 (个)" align="right" :formatter="formatStatus" sortable/>
<el-table-column prop="rate" label="占比（%）" align="right" :formatter="formatStatus" width="160" /> <el-table-column prop="rate" label="占比（%）" align="right" :formatter="formatStatus" width="100"/>
</el-table> </el-table>
</div> </div>
</div> </div>
...@@ -147,9 +147,9 @@ ...@@ -147,9 +147,9 @@
<el-table-column label="序号" width="60"> <el-table-column label="序号" width="60">
<template slot-scope="scope">{{ scope.$index + 1 }}</template> <template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="type" label="年份" width="200" :formatter="formatStatus"/> <el-table-column prop="type" label="年份" :formatter="formatStatus"/>
<el-table-column prop="count" label="土地交易项目 (个)" align="right" :formatter="formatStatus" sortable width="160" /> <el-table-column prop="count" label="土地交易项目 (个)" align="right" :formatter="formatStatus" sortable/>
<el-table-column prop="rate" label="占比（%）" align="right" :formatter="formatStatus" width="160" /> <el-table-column prop="rate" label="占比（%）" align="right" :formatter="formatStatus" width="100"/>
</el-table> </el-table>
</div> </div>
</div> </div>
...@@ -788,9 +788,10 @@ export default { ...@@ -788,9 +788,10 @@ export default {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
.box-left{ .box-left{
width: 50%; width: 60%;
} }
.box-right{ .box-right{
width: 33%;
float: right; float: right;
::v-deep .el-table{ ::v-deep .el-table{
.sort-caret.ascending{ .sort-caret.ascending{
......
dsk-operate-ui/src/views/macro/nationalEconomies/component/zhaobiao.vue
View file @ 556594c8
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
<el-table-column label="序号" width="60"> <el-table-column label="序号" width="60">
<template slot-scope="scope">{{ scope.$index + 1 }}</template> <template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="type" label="年份" width="220" :formatter="formatStatus"/> <el-table-column prop="type" label="年份" :formatter="formatStatus"/>
<el-table-column prop="count" label="招标数量（个）" align="right" :formatter="formatStatus" sortable width="220" /> <el-table-column prop="count" label="招标数量（个）" align="right" :formatter="formatStatus" sortable/>
</el-table> </el-table>
</div> </div>
</div> </div>
...@@ -64,9 +64,9 @@ ...@@ -64,9 +64,9 @@
<el-table-column label="序号" width="60"> <el-table-column label="序号" width="60">
<template slot-scope="scope">{{ scope.$index + 1 }}</template> <template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="province" label="地区" width="120" :formatter="formatStatus"/> <el-table-column prop="province" label="地区" :formatter="formatStatus"/>
<el-table-column prop="count" label="招标数量 (个)" align="right" :formatter="formatStatus" sortable width="160" /> <el-table-column prop="count" label="招标数量 (个)" align="right" :formatter="formatStatus" sortable/>
<el-table-column prop="rate" label="占比（%）" align="right" :formatter="formatStatus" width="160" /> <el-table-column prop="rate" label="占比（%）" align="right" :formatter="formatStatus" width="100" />
</el-table> </el-table>
</div> </div>
</div> </div>
...@@ -103,9 +103,9 @@ ...@@ -103,9 +103,9 @@
<el-table-column label="序号" width="60"> <el-table-column label="序号" width="60">
<template slot-scope="scope">{{ scope.$index + 1 }}</template> <template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="label" label="时间" width="120" :formatter="formatStatus"/> <el-table-column prop="label" label="时间" :formatter="formatStatus"/>
<el-table-column prop="count" label="招标数量（个）" align="right" :formatter="formatStatus" sortable width="160" /> <el-table-column prop="count" label="招标数量（个）" align="right" :formatter="formatStatus" sortable/>
<el-table-column prop="rate" label="占比（%）" align="right" :formatter="formatStatus" width="160" /> <el-table-column prop="rate" label="占比（%）" align="right" :formatter="formatStatus" width="100" />
</el-table> </el-table>
</div> </div>
...@@ -679,9 +679,10 @@ ...@@ -679,9 +679,10 @@
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
.box-left{ .box-left{
width: 50%; width: 60%;
} }
.box-right{ .box-right{
width: 33%;
float: right; float: right;
::v-deep .el-table{ ::v-deep .el-table{
.sort-caret.ascending{ .sort-caret.ascending{
......
dsk-operate-ui/src/views/project/projectList/component/lxr.vue
View file @ 556594c8
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
prop="companyName" prop="companyName"
label="关联企业"> label="关联企业">
<template slot-scope="scope"> <template slot-scope="scope">
<router-link :to="scope.row.uipId?`/enterprise/${encodeStr(scope.row.uipId)}`:`/company/${encodeStr(scope.row.companyId)}`" tag="a" class="a-link" v-if="(scope.row.companyId||scope.row.uipId)&&scope.row.companyName" v-html="scope.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> <div v-else v-html="scope.row.companyName || '--'"></div>
</template> </template>
</el-table-column> </el-table-column>
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
</div> </div>
<el-form class="popform" :model="queryParam" ref="ruleForm" label-width="137px" :rules="rules" > <el-form class="popform" :model="queryParam" ref="ruleForm" label-width="137px" :rules="rules" >
<el-form-item label="联系人姓名：" class="row" prop="name"> <el-form-item label="联系人姓名：" class="row" prop="name">
<el-input type="text" v-model="queryParam.name" placeholder="请输入"></el-input> <el-input type="text" v-model="queryParam.name" :οnkeyup="queryParam.name=queryParam.name.replace(/^\s+|\s+$/g,'')" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="联系人性别：" class="row"> <el-form-item label="联系人性别：" class="row">
<el-radio-group v-model="queryParam.sex"> <el-radio-group v-model="queryParam.sex">
...@@ -192,7 +192,6 @@ ...@@ -192,7 +192,6 @@
import skeleton from './skeleton' import skeleton from './skeleton'
import {encodeStr} from "@/assets/js/common.js" import {encodeStr} from "@/assets/js/common.js"
export default { export default {
encodeStr,
components:{skeleton}, components:{skeleton},
name: 'lxr', name: 'lxr',
props: { props: {
...@@ -207,6 +206,7 @@ ...@@ -207,6 +206,7 @@
}, },
data(){ data(){
return{ return{
encodeStr,
isdel:false, isdel:false,
thistype:this.listtype, thistype:this.listtype,
rules:{ rules:{
...@@ -226,7 +226,9 @@ ...@@ -226,7 +226,9 @@
total:0, total:0,
projectname:this.$route.query.projectname, projectname:this.$route.query.projectname,
companyName:this.customname, companyName:this.customname,
queryParam:[], queryParam:{
name:'',
},
isDisableds:this.isDisabled, isDisableds:this.isDisabled,
isSkeleton:true, isSkeleton:true,
delid:null, delid:null,
...@@ -279,6 +281,7 @@ ...@@ -279,6 +281,7 @@
this.isSkeleton = false this.isSkeleton = false
this.tableData = result.code == 200?result.rows:[] this.tableData = result.code == 200?result.rows:[]
this.total = result.code == 200?result.total:0 this.total = result.code == 200?result.total:0
// console.log(this.tableData)
}) })
}, },
save(){ save(){
......
dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseService.java
View file @ 556594c8
...@@ -416,7 +416,7 @@ public class EnterpriseService { ...@@ -416,7 +416,7 @@ public class EnterpriseService {
result.put("companyId", MapUtil.getInt(BeanUtil.beanToMap(map.get("data")), "jskEid")); result.put("companyId", MapUtil.getInt(BeanUtil.beanToMap(map.get("data")), "jskEid"));
} }
if (!ObjectUtil.isEmpty(result.get("companyId"))) { if (!ObjectUtil.isEmpty(result.get("companyId"))) {
R res = this.getUipIdByCid(new ArrayList<>(MapUtils.getInteger(result, "companyId"))); R res = this.getUipIdByCid(Collections.singletonList(MapUtils.getInteger(result,"companyId")));
if (!ObjectUtils.isEmpty(res.getData())) { if (!ObjectUtils.isEmpty(res.getData())) {
List<Map<String, Object>> data = (List<Map<String, Object>>) res.getData(); List<Map<String, Object>> data = (List<Map<String, Object>>) res.getData();
result.put("uipId", MapUtil.getStr(BeanUtil.beanToMap(data.get((0))), "uipId")); result.put("uipId", MapUtil.getStr(BeanUtil.beanToMap(data.get((0))), "uipId"));
......
dsk-system/src/main/resources/mapper/business/BusinessInfoMapper.xml
View file @ 556594c8
...@@ -169,13 +169,13 @@ ...@@ -169,13 +169,13 @@
<select id="selectTotal" resultType="com.dsk.system.domain.business.vo.BusinessBrowseVo"> <select id="selectTotal" resultType="com.dsk.system.domain.business.vo.BusinessBrowseVo">
SELECT SELECT
count(DISTINCT c.id) contactsCount, count(DISTINCT ci.id) contactsCount,
count(DISTINCT f.id) followRecordCount, count(DISTINCT f.id) followRecordCount,
count(DISTINCT b.id) backlogCount, count(DISTINCT b.id) backlogCount,
count(DISTINCT r.id) relateCompanyCount count(DISTINCT r.id) relateCompanyCount
FROM FROM
business_info i business_info i
LEFT JOIN business_contacts c on c.business_id = i.id LEFT JOIN contact_info ci on ci.business_id = i.id
LEFT JOIN business_follow_record f on f.business_id = i.id LEFT JOIN business_follow_record f on f.business_id = i.id
LEFT JOIN business_backlog b on b.business_id = i.id LEFT JOIN business_backlog b on b.business_id = i.id
LEFT JOIN business_relate_company r on r.business_id = i.id LEFT JOIN business_relate_company r on r.business_id = i.id
......
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