Skip to content

D
dsk-cr20g
Commit c670976f authored by danfuman's avatar danfuman
Browse files
Options

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

parents d93c0b22 18aff0f3
Show whitespace changes
Inline Side-by-side
Showing with 154 additions and 51 deletions
dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/bo/EnterpriseProjectImportantListDto.java
View file @ c670976f
...@@ -7,6 +7,7 @@ import lombok.NoArgsConstructor; ...@@ -7,6 +7,7 @@ import lombok.NoArgsConstructor;
import lombok.ToString; import lombok.ToString;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.util.List;
@Data @Data
@ToString @ToString
...@@ -20,6 +21,6 @@ public class EnterpriseProjectImportantListDto extends BasePage { ...@@ -20,6 +21,6 @@ public class EnterpriseProjectImportantListDto extends BasePage {
private String projectLevel; private String projectLevel;
private String projectType; private List<String> projectType;
} }
dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/EnterpriseService.java
View file @ c670976f
...@@ -131,6 +131,7 @@ public class EnterpriseService { ...@@ -131,6 +131,7 @@ public class EnterpriseService {
performance.put("specialDebt", MapUtils.getInteger(projectStatisticMapData, "specialDebt", 0)); performance.put("specialDebt", MapUtils.getInteger(projectStatisticMapData, "specialDebt", 0));
performance.put("bidPlan", MapUtils.getInteger(projectStatisticMapData, "bidPlan", 0)); performance.put("bidPlan", MapUtils.getInteger(projectStatisticMapData, "bidPlan", 0));
business.put("historySend", MapUtils.getInteger(projectStatisticMapData, "historySend", 0)); business.put("historySend", MapUtils.getInteger(projectStatisticMapData, "historySend", 0));
business.put("importantBusiness", MapUtils.getInteger(projectStatisticMapData, "importantBusiness", 0));
statisticMapData.put("performance", performance); statisticMapData.put("performance", performance);
statisticMapData.put("business", business); statisticMapData.put("business", business);
......
dsk-operate-ui/src/assets/styles/index.scss
View file @ c670976f
...@@ -631,7 +631,7 @@ ul, li { ...@@ -631,7 +631,7 @@ ul, li {
line-height: 32px; line-height: 32px;
} }
&:hover{ &:hover{
color: #fff; color: #006AD1;
border-color: #006AD1; border-color: #006AD1;
} }
} }
......
dsk-operate-ui/src/assets/styles/search-common.scss
View file @ c670976f
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
.el-select { .el-select {
max-width: unset !important; max-width: unset !important;
//width: 64px; //width: 64px;
padding: 0px 8px; padding: 0px 16px;
transition: width 0.3s; transition: width 0.3s;
box-sizing: border-box; box-sizing: border-box;
...@@ -33,19 +33,20 @@ ...@@ -33,19 +33,20 @@
.el-input { .el-input {
display: flex; display: flex;
align-items: center; align-items: center;
& > input { .el-input__inner {
padding: 0px; padding: 0px;
border: none; border: none;
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
box-sizing: border-box; box-sizing: border-box;
&::placeholder { &::placeholder {
color: rgba(35, 35, 35, 0.8); color: rgba(35, 35, 35, 0.8) !important;
font-size: 14px; font-size: 14px !important;
} }
} }
& > .el-input__suffix { & > .el-input__suffix {
margin-left: 8px;
position: unset; position: unset;
.el-input__suffix-inner { .el-input__suffix-inner {
i { i {
...@@ -57,12 +58,35 @@ ...@@ -57,12 +58,35 @@
} }
} }
} }
// hover状态
&:hover {
background: #f4f6f9;
border-radius: 4px;
.el-input {
.el-input__inner {
background: #f4f6f9;
&::placeholder {
color: #232323 !important;
}
}
.el-input__suffix {
.el-input__suffix-inner {
i {
color: #232323;
}
}
}
}
}
} }
// 自定义事件选择 金额选择 // 自定义事件选择 金额选择
.custom-select { .custom-select {
height: 32px; height: 32px;
transition: width 0.3s; transition: width 0.3s;
cursor: pointer;
padding: 0px 16px;
.block { .block {
& > .el-input { & > .el-input {
display: flex; display: flex;
...@@ -73,12 +97,14 @@ ...@@ -73,12 +97,14 @@
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
box-sizing: border-box; box-sizing: border-box;
cursor: pointer;
&::placeholder { &::placeholder {
color: rgba(35, 35, 35, 0.8); color: rgba(35, 35, 35, 0.8) !important;
font-size: 14px; font-size: 14px !important;
} }
} }
& > .el-input__suffix { & > .el-input__suffix {
margin-left: 8px;
position: unset; position: unset;
width: auto; width: auto;
.el-input__suffix-inner { .el-input__suffix-inner {
...@@ -93,6 +119,38 @@ ...@@ -93,6 +119,38 @@
} }
} }
} }
.options-block {
.option {
&:hover {
color: #0381fa;
}
}
}
// hover状态
&:hover {
background: #f4f6f9;
border-radius: 4px;
.block {
& > .el-input {
.el-input__inner {
background: #f4f6f9;
&::placeholder {
color: #232323 !important;
}
}
& > .el-input__suffix {
.el-input__suffix-inner {
span,
i {
color: #232323;
}
}
}
}
}
}
} }
// 时间选择器 // 时间选择器
......
dsk-operate-ui/src/views/detail/party-a/component/HeadFormNew.vue
View file @ c670976f
...@@ -73,8 +73,8 @@ ...@@ -73,8 +73,8 @@
</template> </template>
<div v-else class="flex-box"> <div v-else class="flex-box">
<span class="flex-box ability-total" v-if="isTotal">共有{{ total }}条</span> <span class="flex-box ability-total" v-if="isTotal">共有{{ total }}条</span>
<span class="flex-box ability-excel" v-hasPermi="['combine:info:export:win:bid','combine:info:export:bid']" v-if="isExcel && title ==='集团业绩'" @click="clickEXCEL"><img <span class="flex-box ability-excel" v-hasPermi="['combine:info:export:win:bid','combine:info:export:bid']" v-if="isExcel && title ==='集团业绩'"
src="@/assets/images/ability_excel.png">导出EXCEL</span> @click="clickEXCEL"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
<span class="flex-box ability-excel" v-else @click="clickEXCEL"><img src="@/assets/images/ability_excel.png">导出EXCEL</span> <span class="flex-box ability-excel" v-else @click="clickEXCEL"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
</div> </div>
</div> </div>
...@@ -145,11 +145,11 @@ export default { ...@@ -145,11 +145,11 @@ export default {
textContainer.style.setProperty("display", "inline-block"); textContainer.style.setProperty("display", "inline-block");
textContainer.style.setProperty("font-size", "14px"); textContainer.style.setProperty("font-size", "14px");
const hasPadding = (parseInt(realStyles.paddingLeft) || parseInt(realStyles.paddingRight)) ? true : false; const hasPadding = (parseInt(realStyles.paddingLeft) || parseInt(realStyles.paddingRight)) ? true : false;
hasPadding ? textContainer.style.setProperty("padding", "0px 8px") : null; hasPadding ? textContainer.style.setProperty("padding", realStyles.paddingRight) : null;
textContainer.style.setProperty("box-sizing", "border-box"); textContainer.style.setProperty("box-sizing", "border-box");
textContainer.textContent = text; textContainer.textContent = text;
document.body.append(textContainer); document.body.append(textContainer);
// 加上按钮宽度 以及间距 // 加上按钮宽度 以及按钮左外边距
let containerWidth = textContainer.offsetWidth + 12 + 8; let containerWidth = textContainer.offsetWidth + 12 + 8;
textContainer.remove(); textContainer.remove();
dom.style.setProperty("width", `${containerWidth}px`); dom.style.setProperty("width", `${containerWidth}px`);
...@@ -210,7 +210,7 @@ export default { ...@@ -210,7 +210,7 @@ export default {
textContainer.style.setProperty("visibility", "hidden"); textContainer.style.setProperty("visibility", "hidden");
textContainer.style.setProperty("display", "inline-block"); textContainer.style.setProperty("display", "inline-block");
textContainer.style.setProperty("font-size", "14px"); textContainer.style.setProperty("font-size", "14px");
textContainer.style.setProperty("padding", "0px 8px"); textContainer.style.setProperty("padding", "0px 16px");
textContainer.style.setProperty("box-sizing", "border-box"); textContainer.style.setProperty("box-sizing", "border-box");
textContainer.textContent = iptChild.getAttribute("placeholder"); textContainer.textContent = iptChild.getAttribute("placeholder");
document.body.append(textContainer); document.body.append(textContainer);
...@@ -239,7 +239,7 @@ export default { ...@@ -239,7 +239,7 @@ export default {
textContainer.style.setProperty("display", "inline-block"); textContainer.style.setProperty("display", "inline-block");
textContainer.style.setProperty("font-size", "14px"); textContainer.style.setProperty("font-size", "14px");
const hasPadding = (parseInt(realStyles.paddingLeft) || parseInt(realStyles.paddingRight)) ? true : false; const hasPadding = (parseInt(realStyles.paddingLeft) || parseInt(realStyles.paddingRight)) ? true : false;
hasPadding ? textContainer.style.setProperty("padding", "0px 8px") : null; hasPadding ? textContainer.style.setProperty("padding", realStyles.padding) : null;
textContainer.style.setProperty("box-sizing", "border-box"); textContainer.style.setProperty("box-sizing", "border-box");
textContainer.textContent = iptChild.value ? iptChild.value : iptChild.getAttribute("placeholder"); textContainer.textContent = iptChild.value ? iptChild.value : iptChild.getAttribute("placeholder");
document.body.append(textContainer); document.body.append(textContainer);
...@@ -408,7 +408,6 @@ export default { ...@@ -408,7 +408,6 @@ export default {
} }
& > span { & > span {
color: #232323;
color: rgba(35, 35, 35, 0.8); color: rgba(35, 35, 35, 0.8);
font-weight: 400; font-weight: 400;
margin-left: 8px; margin-left: 8px;
......
dsk-operate-ui/src/views/detail/party-a/component/Sidebar.vue
View file @ c670976f
...@@ -237,40 +237,45 @@ export default { ...@@ -237,40 +237,45 @@ export default {
this.sideRoute[0].children[5].disabled = true; this.sideRoute[0].children[5].disabled = true;
} }
break; break;
case 'landInfo': case 'importantBusiness':
if (arr[i][j] < 1) { if (arr[i][j] < 1) {
this.sideRoute[2].children[0].disabled = true; this.sideRoute[2].children[0].disabled = true;
}
break;
case 'landInfo':
if (arr[i][j] < 1) {
this.sideRoute[2].children[1].disabled = true;
this.sideRoute[4].children[1].disabled = true; this.sideRoute[4].children[1].disabled = true;
} }
break; break;
case 'busProposedProjectV1': case 'busProposedProjectV1':
if (arr[i][j] < 1) { if (arr[i][j] < 1) {
this.sideRoute[2].children[1].disabled = true; this.sideRoute[2].children[2].disabled = true;
} }
break; break;
case 'specialDebt': case 'specialDebt':
if (arr[i][j] < 1) { if (arr[i][j] < 1) {
this.sideRoute[2].children[2].disabled = true; this.sideRoute[2].children[3].disabled = true;
} }
break; break;
case 'bidPlan': case 'bidPlan':
if (arr[i][j] < 1) { if (arr[i][j] < 1) {
this.sideRoute[2].children[3].disabled = true; this.sideRoute[2].children[4].disabled = true;
} }
break; break;
case 'biddingAnnouncement': case 'biddingAnnouncement':
if (arr[i][j] < 1) { if (arr[i][j] < 1) {
this.sideRoute[2].children[4].disabled = true; this.sideRoute[2].children[5].disabled = true;
} }
break; break;
case 'proBiddingAnnouncement': case 'proBiddingAnnouncement':
if (arr[i][j] < 1) { if (arr[i][j] < 1) {
this.sideRoute[2].children[5].disabled = true; this.sideRoute[2].children[6].disabled = true;
} }
break; break;
case 'adminLicensing': case 'adminLicensing':
if (arr[i][j] < 1) { if (arr[i][j] < 1) {
this.sideRoute[2].children[6].disabled = true; this.sideRoute[2].children[7].disabled = true;
} }
break; break;
case 'customer': case 'customer':
...@@ -336,6 +341,7 @@ export default { ...@@ -336,6 +341,7 @@ export default {
this.sideRoute[5].children[6].disabled = true; this.sideRoute[5].children[6].disabled = true;
} }
break; break;
default: default:
break; break;
} }
......
dsk-operate-ui/src/views/detail/party-a/opport/MajorProject.vue
View file @ c670976f
...@@ -16,6 +16,10 @@ ...@@ -16,6 +16,10 @@
{{scope.row.totalInvestment ? `${scope.row.totalInvestment}万元` : "--"}} {{scope.row.totalInvestment ? `${scope.row.totalInvestment}万元` : "--"}}
</div> </div>
</template> </template>
<!-- 项目年度 -->
<template slot="year" slot-scope="scope">
{{scope.row.year ? `${scope.row.year}年` : "--"}}
</template>
</tables> </tables>
</div> </div>
...@@ -42,11 +46,11 @@ export default { ...@@ -42,11 +46,11 @@ export default {
}, },
forData: [ forData: [
{ label: '项目名称', prop: 'projectName', minWidth: '450', slot: true }, { label: '项目名称', prop: 'projectName', minWidth: '450', slot: true },
{ label: '项目地区', prop: 'projectAddress', width: '127' }, { label: '项目地区', prop: 'projectAddress', minWidth: '127' },
{ label: '项目等级', prop: 'projectLevel', width: '90' }, { label: '项目等级', prop: 'projectLevel', minWidth: '90' },
{ label: '项目投资金额', prop: 'totalInvestment', width: '120', slot: true }, { label: '项目投资金额', prop: 'totalInvestment', minWidth: '120', slot: true },
{ label: '项目类型', prop: 'projectType', width: '120' }, { label: '项目类型', prop: 'projectType', minWidth: '120' },
{ label: '项目年度', prop: 'year', width: '90' }, { label: '项目年度', prop: 'year', minWidth: '90', slot: true },
], ],
formData: [ formData: [
{ type: 1, fieldName: 'projectLevel', value: '', placeholder: '项目级别', options: [], uid: this.getUid() }, { type: 1, fieldName: 'projectLevel', value: '', placeholder: '项目级别', options: [], uid: this.getUid() },
......
dsk-operate-ui/src/views/enterpriseData/components/Owner/index.vue
View file @ c670976f
...@@ -1193,6 +1193,8 @@ export default { ...@@ -1193,6 +1193,8 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
cursor: pointer; cursor: pointer;
opacity: 0;
transition: opacity 0.3s;
.renling-img-true { .renling-img-true {
width: 16px; width: 16px;
height: 16px; height: 16px;
...@@ -1228,6 +1230,23 @@ export default { ...@@ -1228,6 +1230,23 @@ export default {
} }
} }
} }
.el-table {
th,
td {
.cell {
font-size: 12px;
}
}
.hover-row {
.cell {
.renling-btn {
opacity: 1;
}
}
}
}
} }
.table-item1 { .table-item1 {
::v-deep .el-table__body-wrapper { ::v-deep .el-table__body-wrapper {
......
dsk-operate-ui/src/views/enterpriseData/components/searchTheOwner/index.vue
View file @ c670976f
...@@ -37,9 +37,9 @@ ...@@ -37,9 +37,9 @@
<div class="content_right"> <div class="content_right">
<div class="checkbox"> <div class="checkbox">
<div class="checkbox-content"> <div class="checkbox-content">
<!-- <div class="checkbox-content-qx"> <div class="checkbox-content-qx">
<el-checkbox v-model="checkOwnerLabel" @change="allOwnerLabelBtn">全部</el-checkbox> <el-checkbox v-model="checkOwnerLabel" @change="allOwnerLabelBtn">不限</el-checkbox>
</div> --> </div>
<el-checkbox-group v-model="currentOwnerLabels" @change="OwnerLabelChange"> <el-checkbox-group v-model="currentOwnerLabels" @change="OwnerLabelChange">
<el-checkbox v-for="item of ownerLabels" :label="item.dictValue" :key="item.dictCode">{{item.dictLabel}}</el-checkbox> <el-checkbox v-for="item of ownerLabels" :label="item.dictValue" :key="item.dictCode">{{item.dictLabel}}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
<div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0"> <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
<el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}" v-horizontal-scroll="'hover'" <el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}" v-horizontal-scroll="'hover'"
class="table-item1 fixed-table" border highlight-current-row :header-row-class-name="setHeaderRow" :cell-class-name="setCellClass" class="table-item1 fixed-table" border highlight-current-row :header-row-class-name="setHeaderRow" :cell-class-name="setCellClass"
:header-cell-class-name="setCellClass" @sort-change="sortChange"> :row-class-name="setRowClass" :header-cell-class-name="setCellClass" @sort-change="sortChange">
<el-table-column type="index" label="序号" fixed width="60" :resizable="false"> <el-table-column type="index" label="序号" fixed width="60" :resizable="false">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -310,7 +310,7 @@ export default { ...@@ -310,7 +310,7 @@ export default {
// 当前选中的业主标签 // 当前选中的业主标签
currentOwnerLabels: [], currentOwnerLabels: [],
// 业主全选状态 // 业主全选状态
checkOwnerLabel: false, checkOwnerLabel: true,
// 选中两个及两个以上业主标签 添加选中条件 or任意均可 and同时具备 // 选中两个及两个以上业主标签 添加选中条件 or任意均可 and同时具备
tagCodeQueryType: "or", tagCodeQueryType: "or",
pageFlag: true, pageFlag: true,
...@@ -332,11 +332,11 @@ export default { ...@@ -332,11 +332,11 @@ export default {
// value: "按土地交易签订日期从近到远", // value: "按土地交易签订日期从近到远",
// status: false, // status: false,
// }, // },
{ // {
key: "approval_project_count", // key: "approval_project_count",
value: "按拟建项目审批时间从近到远", // value: "按拟建项目审批时间从近到远",
status: false, // status: false,
}, // },
{ {
key: "important_project_count", key: "important_project_count",
value: "按重点项目清单从多到少", value: "按重点项目清单从多到少",
...@@ -356,10 +356,18 @@ export default { ...@@ -356,10 +356,18 @@ export default {
dialogVisible1: false, dialogVisible1: false,
tableData: [], tableData: [],
total: 0, total: 0,
oldPageNum: 1,
pageNum: 1, pageNum: 1,
pageSize: 20 pageSize: 20
}; };
}, },
watch: {
"pageNum": {
handler(newValue, oldValue) {
this.oldPageNum = oldValue;
}
}
},
computed: { computed: {
// 仅搜索企业名 // 仅搜索企业名
onlySearchEname() { onlySearchEname() {
...@@ -500,6 +508,9 @@ export default { ...@@ -500,6 +508,9 @@ export default {
return "enterprise-name-column"; return "enterprise-name-column";
} }
}, },
setRowClass({ row, rowIndex }) {
return "enterprise-name-row";
},
addColumnClass(row, column, cell, event) { addColumnClass(row, column, cell, event) {
const { target } = event; const { target } = event;
if (column.label == "公司名称") return this.showClaim = true; if (column.label == "公司名称") return this.showClaim = true;
...@@ -630,8 +641,9 @@ export default { ...@@ -630,8 +641,9 @@ export default {
}, },
handleCurrentChange(pageNum) { handleCurrentChange(pageNum) {
if (pageNum > 500) { if (pageNum > 500) {
pageNum = 1; this.pageNum = this.oldPageNum;
this.$message.warning("对不起最多只能访问500页"); this.$message.warning("对不起最多只能访问500页");
return;
} }
this.pageNum = pageNum; this.pageNum = pageNum;
this.search(this.pageNum, this.pageSize); this.search(this.pageNum, this.pageSize);
...@@ -1099,14 +1111,6 @@ export default { ...@@ -1099,14 +1111,6 @@ export default {
font-size: 14px; font-size: 14px;
} }
} }
.el-table {
th,
td {
.cell {
font-size: 12px;
}
}
}
padding: 0px 16px; padding: 0px 16px;
.list-titel-a { .list-titel-a {
color: #0081ff; color: #0081ff;
...@@ -1195,14 +1199,25 @@ export default { ...@@ -1195,14 +1199,25 @@ export default {
} }
} }
.enterprise-name-column { .el-table {
&:hover { th,
td {
.cell {
font-size: 12px;
}
}
.enterprise-name-row {
&.hover-row {
.cell {
.renling-btn { .renling-btn {
opacity: 1; opacity: 1;
} }
} }
} }
} }
}
}
.table-item1 { .table-item1 {
::v-deep .el-table__body-wrapper { ::v-deep .el-table__body-wrapper {
color: #232323; color: #232323;
......
dsk-operate-ui/src/views/radar/components/MajorProject/index.vue
View file @ c670976f
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
<router-link :to="'/radar/MajorProject/details/'+ item.md5" tag="a" class="list-titel-a"> <router-link :to="'/radar/MajorProject/details/'+ item.md5" tag="a" class="list-titel-a">
<div class="project-name-of-level"> <div class="project-name-of-level">
<span v-if="item.projectLevel" class="project-of-level" :class="[getBackGround(item.projectLevel)]">{{item.projectLevel}}</span> <span v-if="item.projectLevel" class="project-of-level" :class="[getBackGround(item.projectLevel)]">{{item.projectLevel}}</span>
<span class="project-of-name">{{item.projectName}}</span> <span class="project-of-name" v-html="item.projectName"></span>
</div> </div>
</router-link> </router-link>
</p> </p>
......
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