From 92d9b4c574f92e77df5826ed6e7b4fb1f83a276b Mon Sep 17 00:00:00 2001 From: Rain_ <904416525@qq.com> Date: Fri, 28 Feb 2025 17:01:30 +0800 Subject: [PATCH] =?UTF-8?q?flx:=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../homeOverview/leftCenter.vue | 41 +++++++++++++++---- .../schedulePlan/rightBottom.vue | 6 ++- .../qualityControl/schedulePlan/rightTop.vue | 32 +++++++++------ 3 files changed, 55 insertions(+), 24 deletions(-) diff --git a/src/views/sevenLargeScreen/comprehensiveManage/homeOverview/leftCenter.vue b/src/views/sevenLargeScreen/comprehensiveManage/homeOverview/leftCenter.vue index 585f0e4..7f2c6f3 100644 --- a/src/views/sevenLargeScreen/comprehensiveManage/homeOverview/leftCenter.vue +++ b/src/views/sevenLargeScreen/comprehensiveManage/homeOverview/leftCenter.vue @@ -6,7 +6,9 @@
-
项目建设方项目管理组织机构
+
+
项目建设方项目管理组织机构
+
项目主任组
@@ -25,7 +27,9 @@
-
监理单位
+
+
监理单位
+
{{ item.titleName }} @@ -33,7 +37,9 @@
-
工程建设主体
+
+
工程建设主体
+
@@ -677,6 +683,10 @@ onMounted(() => { font-size: 15px; display: flex; align-items: center; + justify-content: center; + > div:first-child { + width: 60%; + } } .projectOrganization_box1_right { @@ -690,8 +700,9 @@ onMounted(() => { align-items: center; margin-top: 4px; > div:first-child { - left: 36%; + left: 45%; position: absolute; + transform: translateX(-50%); } // > div:last-child { // position: absolute; @@ -707,6 +718,7 @@ onMounted(() => { align-items: center; justify-content: space-between; width: 100%; + font-size: 14px; > div { color: white; display: flex; @@ -723,10 +735,11 @@ onMounted(() => { display: flex; align-items: center; justify-content: space-between; - width: 97%; + width: 99%; + font-size: 14px; > div { color: white; - width: 54px; + width: 20%; text-align: center; } } @@ -747,6 +760,10 @@ onMounted(() => { font-size: 14px; height: 100%; align-items: center; + justify-content: center; + > div:first-child { + width: 60%; + } } .projectOrganization_box2_footer { width: 91%; @@ -754,13 +771,14 @@ onMounted(() => { height: 30px; display: flex; align-items: center; - justify-content: flex-start; + justify-content: space-between; margin-top: 16px; > div { color: white; - width: 70px; + width: 20%; text-align: center; cursor: pointer; + font-size: 14px; } } } @@ -779,6 +797,10 @@ onMounted(() => { font-size: 14px; height: 100%; align-items: center; + justify-content: center; + > div:first-child { + width: 60%; + } } .projectOrganization_box3_main { width: 88%; @@ -800,9 +822,10 @@ onMounted(() => { justify-content: space-between; margin-top: 6px; width: 96%; + font-size: 14px; > div { color: white; - width: 44px; + width: 11%; text-align: center; } } diff --git a/src/views/sevenLargeScreen/qualityControl/schedulePlan/rightBottom.vue b/src/views/sevenLargeScreen/qualityControl/schedulePlan/rightBottom.vue index f3c8595..4e94cf2 100644 --- a/src/views/sevenLargeScreen/qualityControl/schedulePlan/rightBottom.vue +++ b/src/views/sevenLargeScreen/qualityControl/schedulePlan/rightBottom.vue @@ -538,8 +538,10 @@ onMounted(async () => { height: 100%; position: relative; .chart { - width: 920px; - height: 228px; + // width: 920px; + // height: 228px; + width: 100%; + height: 100%; } .not-data { width: 20%; diff --git a/src/views/sevenLargeScreen/qualityControl/schedulePlan/rightTop.vue b/src/views/sevenLargeScreen/qualityControl/schedulePlan/rightTop.vue index cce7b55..59ab074 100644 --- a/src/views/sevenLargeScreen/qualityControl/schedulePlan/rightTop.vue +++ b/src/views/sevenLargeScreen/qualityControl/schedulePlan/rightTop.vue @@ -331,19 +331,25 @@ const getProjectMilestonePlanRecordList = async () => { }); if (res.code == 200) { console.log(res, "获取项目里程碑计划记录列表"); - const timeDiff = dayjs(res.result.end).diff(dayjs(res.result.begin), "year"); - if (res.result.begin) { - pageInfo.yearList = [dayjs(res.result.begin).format("YYYY")]; - if (timeDiff > 0) { - for (let i = 0; i < timeDiff; i++) { - const year = dayjs(res.result.begin).format("YYYY"); - pageInfo.yearList.push(Number(year) + (i + 1)); - } - } else if (dayjs(res.result.begin).format("YYYY") != dayjs(res.result.end).format("YYYY")) { - pageInfo.yearList.push(dayjs(res.result.end).format("YYYY")); - } - } - pageInfo.monthList = [res.result.begin, res.result.end]; + const timeEnd = dayjs(res.result.end).add(1, 'month').format('YYYY-MM-DD HH:mm:ss'); + const timeBegin = dayjs(res.result.begin).subtract(1, 'month').format('YYYY-MM-DD HH:mm:ss'); + const timeDiff = dayjs(timeEnd).diff(dayjs(timeBegin), 'year'); + console.log(timeBegin, timeEnd, '获取项目里程碑计划记录列表'); + if (timeBegin) { + pageInfo.yearList = [dayjs(timeBegin).format('YYYY')]; + if (timeDiff > 0) { + for (let i = 0; i < timeDiff; i++) { + const year = dayjs(timeBegin).format('YYYY'); + pageInfo.yearList.push(Number(year) + (i + 1)); + } + if (timeDiff == 1) { + pageInfo.yearList.push(dayjs(timeEnd).format('YYYY')); + } + } else if (dayjs(timeBegin).format('YYYY') != dayjs(timeEnd).format('YYYY')) { + pageInfo.yearList.push(dayjs(timeEnd).format('YYYY')); + } + } + pageInfo.monthList = [timeBegin, timeEnd]; console.log(pageInfo.yearList, timeDiff); pageInfo.projectItemList = res.result.list.reduce((pre: any[], cur: any) => { // console.log(cur, cur.children);