Skip to content

D
dsk-cr20g
Commit fd46e7a0 authored by tianhongyang's avatar tianhongyang
Browse files
Options

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

parents 1f3405ca 35426d39
Show whitespace changes
Inline Side-by-side
Showing with 108 additions and 16 deletions
dsk-module/dsk-biz-api/src/main/java/com/dsk/search/service/BusinessOpportunityRadarService.java
View file @ fd46e7a0
......@@ -204,8 +204,8 @@ public class BusinessOpportunityRadarService {
vo.setId(i + 1);
vo.setBuildingProjectType(MapUtil.getStr(list.get(i),"buildingProjectType"));
if (null!=list.get(i).get("projectName")){
if (null!=list.get(i).get("project_level")){
vo.setProjectName(MapUtil.getStr(list.get(i),"project_level").concat("-")+StringUtils.removeRed(MapUtil.getStr(list.get(i),"projectName")));
if (null!=list.get(i).get("projectLevel")){
vo.setProjectName(MapUtil.getStr(list.get(i),"projectLevel").concat("-")+StringUtils.removeRed(MapUtil.getStr(list.get(i),"projectName")));
}else {
vo.setProjectName(StringUtils.removeRed(MapUtil.getStr(list.get(i),"projectName")));
}
......
dsk-operate-ui/src/views/detail/groupAccount/component/qualifications.vue
View file @ fd46e7a0
......@@ -12,7 +12,16 @@
<!--certificateList-->
<div class="item_ckquery" :style="height?'height:'+height+'':'height: 60px'">
<template v-for="(item,index) in certificateList">
<span :class="{'color_text':queryParams.qualificationType === item.qualificationType}" @click="changeType(item.qualificationType)">{{item.qualificationName}}（{{item.companyCount}}）</span>
<el-tooltip popper-class="certificateTips" placement="bottom" effect="light" :disabled="isShowTooltip" :key="index">
<span class="span" @mouseover="onMouseOver('isOverflow'+index)" :class="{'color_text':queryParams.qualificationType === item.qualificationType}">
<span :ref="`isOverflow`+index" @click="changeType(item.qualificationType)">
{{item.qualificationName}}（{{item.companyCount}}）
</span>
</span>
<span slot="content" :class="{'color_text':queryParams.qualificationType === item.qualificationType}">
{{item.qualificationName}}（{{item.companyCount}}）
</span>
</el-tooltip>
</template>
</div>
<el-divider v-if="certificateList.length > 10 && !height" @click="moreClick()">更多<span></span></el-divider>
......@@ -77,13 +86,20 @@
title:'',
rowData:'',
certificateList:[],
height:''
height:'',
isShowTooltip: false
}
},
created() {
this.getCertificateList()
},
methods: {
onMouseOver (str) { // 内容超出，显示文字提示内容
const tag = this.$refs[str]
const parentWidth = tag[0].parentNode.offsetWidth // 获取元素父级可视宽度
const contentWidth = tag[0].offsetWidth // 获取元素可视宽度
this.isShowTooltip = contentWidth <= parentWidth
},
handleQuery(params){
this.isSkeleton = true
let data = params ? params : this.queryParams;
......@@ -129,7 +145,22 @@
}
}
</script>
<style lang="scss">
.certificateTips.is-light{
/*padding: 12px;*/
/*width: 318px;*/
/*box-sizing: border-box;*/
/*font-size: 14px;*/
/*line-height: 20px;*/
color: #333333;
border-color: rgba(0, 0, 0, 0.08);
box-shadow: 0px 0px 0px 0px rgba(0, 0, 0, 0.08);
.popper__arrow {
border-bottom-color: rgba(0, 0, 0, 0.08) !important;
border-top-color: rgba(0, 0, 0, 0.08) !important;
}
}
</style>
<style lang="scss" scoped>
.qualifications{
background: #ffffff;
......@@ -145,16 +176,25 @@
position: relative;
margin-bottom: 10px;
overflow: hidden;
span{
.span{
color: #232323;
padding: 3px 10px;
margin-bottom: 4px;
height: 25px;
line-height: 25px;
display: inline-block;
font-size: 14px;
cursor: pointer;
width: 20%;
width: 19%;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
span{
padding: 0 10px;
/*display: inline-block;*/
/*padding-right: 20px;*/
}
}
span:hover{
.span:hover{
background: #F3F4F5;
border-radius: 4px;
color:#0081FF;
......
dsk-operate-ui/src/views/detail/groupAccount/component/zbxmfx.vue
View file @ fd46e7a0
......@@ -218,7 +218,7 @@
<div class="content">
<head-form
title="历史发包项目金额TOP10"
:form-data="formData"
:form-data="formData1"
:query-params="queryParams1"
@handle-search="handleSearch1"
:slots="true"
......@@ -283,17 +283,20 @@
return{
queryParams: {
combineId: this.customerId,
year:'2023年'
},
queryParams1: {
combineId: this.customerId,
year:'2023年'
},
formData: [
{ type: 4, fieldName: 'type', value: '', placeholder: '项目类型', options: [],width:150, uid: this.getUid()},
{ type: 1, fieldName: 'cgbl', value: '', placeholder: '持股比例', options: [],width:110, uid: this.getUid()},
{ type: 1, fieldName: 'year', value: '2023年', placeholder: '年份', options: [],width:100, uid: this.getUid()},
],
formData1: [
{ type: 4, fieldName: 'type', value: '', placeholder: '项目类型', options: [],width:150, uid: this.getUid()},
{ type: 1, fieldName: 'cgbl', value: '', placeholder: '持股比例', options: [],width:110, uid: this.getUid()},
{ type: 1, fieldName: 'year', value: '2023年', placeholder: '年份', options: [],width:100, uid: this.getUid()},
],
cgblList: [
{name:'100%',value:'100%'},
{name:'50%以上',value:'50%以上'},
......@@ -321,6 +324,7 @@
},
created() {
this.formData[1].options=this.cgblList;
this.formData1[1].options=this.cgblList;
this.yearsData()
//项目类型
getDictType('project_type_new').then(result=>{
......@@ -331,6 +335,10 @@
name: data[i].dictLabel,
value: data[i].dictValue,
})
this.formData1[0].options.push({
name: data[i].dictLabel,
value: data[i].dictValue,
})
}
}
})
......@@ -356,6 +364,7 @@
}
this.yearOptions=Years.reverse()
this.formData[2].options=Years
this.formData1[2].options=Years
},
handleQuery(params){
// this.isSkeleton = true
......@@ -457,6 +466,7 @@
})
},
getPeojectTop(params){
console.log(params)
let data = params || this.queryParams1;
if(data.cgbl){
if(data.cgbl === '100%'){
......@@ -490,8 +500,39 @@
}
})
},
formParams1(){
let condtion = {}
let reqData = {}
this.formData1&&this.formData1.forEach(item => {
if(item.value || (item.value && item.value.length) || item.value===0) {
if(item.fieldName == 'time') {
condtion[item.startTime] = item.value[0];
condtion[item.endTime] = item.value[1];
return
}
if(item.fieldName == 'money') {
condtion[item.startMoney] = item.value[0];
condtion[item.endMoney] = item.value[1];
return
}
condtion[item.fieldName] = item.value
}
})
Object.keys(condtion).forEach(key => {
if(condtion[key] || condtion[key]===0) {
if(Array.isArray(condtion[key]) && condtion[key].length == 0){
delete condtion[key]
}
reqData[key] = condtion[key]
}
})
if(this.queryParams1 && Object.keys(this.queryParams1)) {
reqData = Object.assign(reqData, this.queryParams1)
}
return reqData
},
handleSearch1(){
let params = this.formParams()
let params = this.formParams1()
this.getPeojectTop(params)
},
changeSelect1(){
......
dsk-operate-ui/src/views/detail/party-b/index.vue
View file @ fd46e7a0
......@@ -21,7 +21,8 @@
iframeHight: window.innerHeight, // iframe高度-当前页控制
navigation: {isFixed: true, fixedHeight: 56, totalHeight: 68}, // iframe之外页面顶部对象，ifFixed:是否浮动；fixedHeight：浮动对象高度；totalHeight：顶部整体高度
src: '', //iframe嵌套页面地址
domain: 'https://plug.jiansheku.com', // 插件地址
domain: 'https://plug.jiansheku.com', // 线上-插件地址
// domain: 'https://pre-plug.jiansheku.com', // 测试-插件地址
// domain: 'http://192.168.60.104:3400',
// domain: 'http://192.168.60.30:3300',
ak: 'aec7b3ff2y2q8x6t49a7e2c463ce21912', // 需要携带的sdkId
......@@ -31,6 +32,11 @@
}
},
created() {
if(window.location.host === 'http://szh.jiansheku.com' || window.location.host === 'szh.jiansheku.com'){
this.domain='https://plug.jiansheku.com'
}else {
this.domain='https://pre-plug.jiansheku.com'
}
this.gettokens()
},
mounted() {
......
dsk-operate-ui/src/views/market/index.vue
View file @ fd46e7a0
......@@ -22,8 +22,8 @@ export default {
iframeHight: window.innerHeight, // iframe高度-当前页控制
navigation: { isFixed: true, fixedHeight: 56, totalHeight: 68 }, // iframe之外页面顶部对象，ifFixed:是否浮动；fixedHeight：浮动对象高度；totalHeight：顶部整体高度
src: '', //iframe嵌套页面地址
// domain: 'https://plug.jiansheku.com', // 插件地址
domain: 'https://pre-plug.jiansheku.com', // 插件地址测试
domain: 'https://plug.jiansheku.com', // 插件地址
// domain: 'https://pre-plug.jiansheku.com', // 插件地址测试
// domain: 'http://192.168.60.104:3400',
ak: 'aec7b3ff2y2q8x6t49a7e2c463ce21912', // 需要携带的sdkId
timelongs: 7200,//刷新token时间
......@@ -31,6 +31,11 @@ export default {
};
},
created() {
if(window.location.host === 'http://szh.jiansheku.com' || window.location.host === 'szh.jiansheku.com'){
this.domain='https://plug.jiansheku.com'
}else {
this.domain='https://pre-plug.jiansheku.com'
}
this.gettokens();
},
mounted() {
......
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