diff --git a/src/views/goverment/huizhou/assessmentManagement/rankList/index.scss b/src/views/goverment/huizhou/assessmentManagement/rankList/index.scss
index f7543bc..d4c26d0 100644
--- a/src/views/goverment/huizhou/assessmentManagement/rankList/index.scss
+++ b/src/views/goverment/huizhou/assessmentManagement/rankList/index.scss
@@ -3,10 +3,12 @@
align-items: center;
}
@mixin td {
- width: 20%;
- text-overflow: ellipsis;
- white-space: nowrap;
+ width: 25%;
+ display: -webkit-box;
+ -webkit-line-clamp: 2;
+ -webkit-box-orient: vertical;
overflow: hidden;
+ text-overflow: ellipsis;
text-align: center;
color: #90a1c4;
}
@@ -20,7 +22,8 @@
// margin-left: 21px;
// }
.rank-content {
- width: 538px;
+ // width: 538px;
+ width: 100%;
.content-title {
width: 100%;
height: 36px;
@@ -49,6 +52,15 @@
background: linear-gradient(90deg, rgba(50, 98, 179, 0.2) 0%, rgba(50, 98, 179, 0) 47%, rgba(50, 98, 179, 0.2) 100%);
}
}
+ .left {
+ width: 20%;
+ }
+ .center {
+ width: 39%;
+ }
+ .right {
+ width: 39%;
+ }
.left,
.center,
.right {
@@ -74,7 +86,7 @@
font-family: OPPOSans-Bold;
font-weight: Bold;
color: #ffffff;
- font-size: 20px;
+ font-size: 18px;
background: url("@/assets/images/hzImg/assessmentImg/numSum.png") no-repeat center center;
background-size: 100% 100%;
text-indent: 10px;
@@ -115,7 +127,7 @@
background-size: 100% 100%;
.td {
@include td;
- font-size: 22px;
+ font-size: 18px;
}
.td:last-child {
display: flex;
@@ -125,7 +137,9 @@
}
}
.table-body:nth-child(2n) {
- height: 35px;
+ // height: 35px;
+ // line-height: 35px;
+ min-height: 35px;
line-height: 35px;
@include flex;
background: url("@/assets/images/hzImg/assessmentImg/tableBg-light.png") no-repeat center;
@@ -133,11 +147,13 @@
margin-top: 12px;
.td {
@include td;
- font-size: 22px;
+ font-size: 18px;
}
}
.table-body:nth-child(2n - 1) {
- height: 35px;
+ // height: 35px;
+ // line-height: 35px;
+ min-height: 35px;
line-height: 35px;
@include flex;
background: url("@/assets/images/hzImg/assessmentImg/tableBg-dark.png") no-repeat center;
@@ -145,7 +161,7 @@
margin-top: 12px;
.td {
@include td;
- font-size: 22px;
+ font-size: 18px;
}
}
}
diff --git a/src/views/goverment/huizhou/assessmentManagement/rankList/index.vue b/src/views/goverment/huizhou/assessmentManagement/rankList/index.vue
index f5b8521..0f8c254 100644
--- a/src/views/goverment/huizhou/assessmentManagement/rankList/index.vue
+++ b/src/views/goverment/huizhou/assessmentManagement/rankList/index.vue
@@ -46,22 +46,22 @@
@@ -89,21 +89,21 @@
diff --git a/src/views/goverment/huizhou/enterpriseList/index.vue b/src/views/goverment/huizhou/enterpriseList/index.vue
index 6ceb672..f57c670 100644
--- a/src/views/goverment/huizhou/enterpriseList/index.vue
+++ b/src/views/goverment/huizhou/enterpriseList/index.vue
@@ -300,7 +300,7 @@ const columns: ColumnProps[] = [
{ prop: "legalPerson", label: "法人代表" },
{ prop: "legalPersonTel", label: "法人代表手机" },
{ prop: "createTime", label: "登记时间" },
- { prop: "state", label: "审核状态" },
+ // { prop: "state", label: "审核状态" },
{ prop: "operation", label: "操作", fixed: "right", width: 180 }
];
diff --git a/src/views/goverment/huizhou/progressManagement/investmentPayment/components/transformInfo1.vue b/src/views/goverment/huizhou/progressManagement/investmentPayment/components/transformInfo1.vue
index 88d4763..eba59d3 100644
--- a/src/views/goverment/huizhou/progressManagement/investmentPayment/components/transformInfo1.vue
+++ b/src/views/goverment/huizhou/progressManagement/investmentPayment/components/transformInfo1.vue
@@ -31,7 +31,7 @@
-
+
@@ -88,7 +88,7 @@
-
+
查看详情
@@ -384,7 +384,7 @@ onMounted(() => {
.overview {
// background-color: #fff;
-
+ height: 100%;
:deep(.el-dialog) {
position: relative;
background-color: rgba(9, 64, 95, 0.85);
@@ -417,14 +417,16 @@ onMounted(() => {
}
.detail-table {
- height: 411px;
+ height: 100%;
margin: 0 20px;
+ display: flex;
+ flex-direction: column;
.button-title {
@include flex;
}
.table {
- height: 310px;
+ height: 85%;
margin-top: 20px;
:deep(.el-table) {
@@ -487,4 +489,19 @@ onMounted(() => {
width: 0;
}
}
+:deep() {
+ .table .el-table th.el-table-fixed-column--right,
+ .table-main .el-table th.el-table-fixed-column--right {
+ background-color: var(--el-table-row-hover-bg-color) !important;
+ }
+ .table .el-table td.el-table-fixed-column--right,
+ .table-main .el-table td.el-table-fixed-column--right {
+ background-color: var(--el-table-row-hover-bg-color) !important;
+ }
+}
+.add-edit-box {
+ :deep(.center-content) {
+ height: 90%;
+ }
+}
diff --git a/src/views/goverment/huizhou/progressManagement/investmentPayment/components/transformInfo2.vue b/src/views/goverment/huizhou/progressManagement/investmentPayment/components/transformInfo2.vue
index 4a364a5..fb11fca 100644
--- a/src/views/goverment/huizhou/progressManagement/investmentPayment/components/transformInfo2.vue
+++ b/src/views/goverment/huizhou/progressManagement/investmentPayment/components/transformInfo2.vue
@@ -344,8 +344,10 @@ onMounted(() => {
}
.detail-table {
- height: 411px;
+ height: 100%;
margin: 0 20px;
+ display: flex;
+ flex-direction: column;
.button-title {
@include flex;
> span {
@@ -355,7 +357,7 @@ onMounted(() => {
}
.table {
- height: 310px;
+ height: 90%;
margin-top: 20px;
:deep(.el-table) {
@@ -372,7 +374,8 @@ onMounted(() => {
}
}
.sub-table {
- height: 391px;
+ height: 96%;
+ margin: 0 20px;
.button-optoion {
margin-bottom: 20px;
}
diff --git a/src/views/goverment/huizhou/progressManagement/investmentPayment/index.scss b/src/views/goverment/huizhou/progressManagement/investmentPayment/index.scss
index a4a946d..6847b12 100644
--- a/src/views/goverment/huizhou/progressManagement/investmentPayment/index.scss
+++ b/src/views/goverment/huizhou/progressManagement/investmentPayment/index.scss
@@ -139,6 +139,11 @@
color: #a8abb2;
}
}
+.add-edit-box {
+ :deep(.center-content) {
+ height: 90%;
+ }
+}
// :deep(.el-dialog__body) {
// padding: 0 0 0 0 !important;
// background-color: pink;
diff --git a/src/views/goverment/huizhou/progressManagement/investmentPayment/index.vue b/src/views/goverment/huizhou/progressManagement/investmentPayment/index.vue
index 945ccbd..9af7f1c 100644
--- a/src/views/goverment/huizhou/progressManagement/investmentPayment/index.vue
+++ b/src/views/goverment/huizhou/progressManagement/investmentPayment/index.vue
@@ -102,7 +102,7 @@
-
+
查看投资支付
diff --git a/src/views/goverment/huizhou/progressManagement/planFinishSituation/components/transformInfo1.vue b/src/views/goverment/huizhou/progressManagement/planFinishSituation/components/transformInfo1.vue
index 8ed74f4..47e649b 100644
--- a/src/views/goverment/huizhou/progressManagement/planFinishSituation/components/transformInfo1.vue
+++ b/src/views/goverment/huizhou/progressManagement/planFinishSituation/components/transformInfo1.vue
@@ -66,7 +66,7 @@
-
+
新增
@@ -83,7 +83,7 @@
-
+
@@ -768,7 +768,7 @@ onMounted(() => {
.overview {
// background-color: #fff;
-
+ height: 100%;
:deep(.el-dialog) {
position: relative;
background-color: rgba(9, 64, 95, 0.85);
@@ -801,14 +801,16 @@ onMounted(() => {
}
.detail-table {
- height: 411px;
+ height: 100%;
margin: 0 20px;
+ display: flex;
+ flex-direction: column;
.button-title {
@include flex;
}
.table {
- height: 310px;
+ height: 100%;
margin-top: 20px;
:deep(.el-table) {
@@ -825,10 +827,16 @@ onMounted(() => {
}
}
.sub-table {
- height: 391px;
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ margin: 0 20px;
.button-optoion {
margin-bottom: 20px;
}
+ .el-table {
+ margin-bottom: 20px;
+ }
}
.test :deep(.el-input__wrapper) {
@@ -889,4 +897,19 @@ onMounted(() => {
width: 230px !important;
}
}
+.add-edit-box {
+ :deep(.center-content) {
+ height: 90%;
+ }
+}
+:deep() {
+ .el-table th.el-table-fixed-column--right,
+ .table-main .el-table th.el-table-fixed-column--right {
+ background-color: var(--el-table-row-hover-bg-color) !important;
+ }
+ .el-table td.el-table-fixed-column--right,
+ .table-main .el-table td.el-table-fixed-column--right {
+ background-color: var(--el-table-row-hover-bg-color) !important;
+ }
+}
diff --git a/src/views/goverment/huizhou/progressManagement/planFinishSituation/index.scss b/src/views/goverment/huizhou/progressManagement/planFinishSituation/index.scss
index 6b63b9d..8a8ebe1 100644
--- a/src/views/goverment/huizhou/progressManagement/planFinishSituation/index.scss
+++ b/src/views/goverment/huizhou/progressManagement/planFinishSituation/index.scss
@@ -133,6 +133,11 @@
color: #a8abb2;
}
}
+.add-edit-box {
+ :deep(.center-content) {
+ height: 90%;
+ }
+}
// :deep(.el-dialog__body) {
// padding: 0 0 0 0 !important;
// background-color: pink;
diff --git a/src/views/goverment/huizhou/progressManagement/planFinishSituation/index.vue b/src/views/goverment/huizhou/progressManagement/planFinishSituation/index.vue
index 18f2302..acf2779 100644
--- a/src/views/goverment/huizhou/progressManagement/planFinishSituation/index.vue
+++ b/src/views/goverment/huizhou/progressManagement/planFinishSituation/index.vue
@@ -88,7 +88,7 @@
-
+
查看详情
diff --git a/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.vue b/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.vue
index 2d8d862..4ef4911 100644
--- a/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.vue
+++ b/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.vue
@@ -4,6 +4,7 @@
v-model="active"
:tabs="['项目名称', '工程名称']"
:records="records"
+ :activeIndex="modelActive"
@change-page="onCurChange"
@search="onSearchInput"
:pageable="pages"
@@ -102,6 +103,7 @@ import { ColumnProps } from "@/components/ProTable/interface";
import { parentItemGovermentList, payGovermentAdd } from "@/api/modules/huizhou";
import { useRoute, useRouter } from "vue-router";
import { sendIframeMessage } from "@/utils/util";
+const modelActive = ref(0);
const leftMenuIndex = ref(0);
const route = useRoute();
const pages = ref({
@@ -401,8 +403,8 @@ watch(
onMounted(async () => {
await getEngPage();
onSearch(records.value[0]);
- searchSn.value = (records.value as any[])[0].projectSn;
- searchName.value = (records.value as any[])[0].projectName;
+ searchSn.value = (records.value as any[])[0].engineeringSn;
+ searchName.value = (records.value as any[])[0].engineeringName;
console.log(store.path);
await sendIframeMessage({ obj: { path: route.path } }, 2, undefined);
});