diff --git a/src/views/projectAdmin/jlw/laborManage/leftCenter.vue b/src/views/projectAdmin/jlw/laborManage/leftCenter.vue index 15aab928..f2ad9680 100644 --- a/src/views/projectAdmin/jlw/laborManage/leftCenter.vue +++ b/src/views/projectAdmin/jlw/laborManage/leftCenter.vue @@ -14,7 +14,7 @@
-
{{ statisticsCount.educationPersonNum }}
+
{{ totalPerson}}
{{ "在场总人数" }}
@@ -42,7 +42,7 @@
-
{{ statisticsCount.workercount.totalPerson }}
+
{{ totalEducationPerson }}
{{ "培训总人数" }}
@@ -53,6 +53,7 @@ diff --git a/src/views/projectAdmin/jlw/planProgress/centerTop.vue b/src/views/projectAdmin/jlw/planProgress/centerTop.vue index 291f953c..55cabfbe 100644 --- a/src/views/projectAdmin/jlw/planProgress/centerTop.vue +++ b/src/views/projectAdmin/jlw/planProgress/centerTop.vue @@ -25,11 +25,7 @@ {{ date }}
-
+
{{ day.num }}
@@ -38,70 +34,33 @@
-
+
{{ p.pName }}
{{ p.startTime }}
{{ p.endTime }}
-
+
-
+
-
+
-
+
{{ child.pName }}
{{ child.startTime }}
{{ child.endTime }}
-
+
-
+
-
+
@@ -394,26 +353,31 @@ export default { justify-content: space-between; width: 100%; height: 60px; + .left-content { display: flex; width: 40%; height: 100%; + .item { display: flex; align-items: center; width: calc(100% / 4); + .color-block { margin-right: 10px; width: 15px; height: 15px; border-radius: 2px; } + .label { color: #fff; font-size: 13px; } } } + .right-content { font-size: 13px; line-height: 60px; @@ -422,15 +386,18 @@ export default { .gantt-chart { height: calc(100% - 60px); + .table { position: relative; height: 100%; overflow-x: auto; + &::-webkit-scrollbar { width: 10px; height: 8px; cursor: pointer; } + &::-webkit-scrollbar-thumb { border-radius: 10px; background-color: skyblue; @@ -438,46 +405,61 @@ export default { .thead { border-bottom: 1px solid #234d5f; + .row { display: flex; + .td { flex-shrink: 0; box-sizing: border-box; height: 42px; line-height: 42px; background-color: #163549; + .date { line-height: 21px; border-left: 1px solid #234d5f; + .month { border-bottom: 1px solid #234d5f; } + .days { display: flex; + .day { flex: 1; } } } + &:nth-child(1) { padding-left: 40px; width: 200px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; } + &:not(:nth-child(1)) { width: 100px; text-align: center; } + &:nth-child(n + 4) { width: 400px; } } } } + .tbody { border-left: 1px solid #234d5f; + .row-groups { position: relative; height: 42px; + &::before { content: ''; position: absolute; @@ -491,20 +473,25 @@ export default { border-left: 4px solid #5be1f4; z-index: 99; } + &.open { height: unset; + &::before { border-left-color: transparent; border-top-color: #5be1f4; } } - > .row .td:first-child { + + >.row .td:first-child { user-select: none; cursor: pointer; } + .row { position: relative; display: flex; + .td { flex-shrink: 0; box-sizing: border-box; @@ -513,31 +500,38 @@ export default { background-color: #0a1b2f; border-right: 1px solid #234d5f; border-bottom: 1px solid #234d5f; + .grids { height: 100%; display: flex; + .grid { position: relative; flex: 1; height: 100%; + &:not(:last-child) { border-right: 1px solid #234d5f; } } } + &:nth-child(1) { padding-left: 40px; width: 200px; } + &:not(:nth-child(1)) { width: 100px; font-size: 14px; text-align: center; } + &:nth-child(n + 4) { width: 400px; } } + .progress { flex-shrink: 0; position: absolute; @@ -547,6 +541,7 @@ export default { background: #557dee; } } + .children { .td { height: 38px; @@ -556,6 +551,7 @@ export default { } } } + .tooltips { position: absolute; box-sizing: border-box; @@ -566,6 +562,7 @@ export default { color: #fff; border-radius: 8px; background-color: #50a6b3; + .status { display: inline-block; margin-bottom: 6px; diff --git a/src/views/projectAdmin/jlw/qualityManage/leftCenter.vue b/src/views/projectAdmin/jlw/qualityManage/leftCenter.vue index 270cb817..b92594b1 100644 --- a/src/views/projectAdmin/jlw/qualityManage/leftCenter.vue +++ b/src/views/projectAdmin/jlw/qualityManage/leftCenter.vue @@ -35,7 +35,7 @@ export default { startAngle: 90, radius: ['58%', '54%'], color: ['#0B1B35', '#244D8F'], - data: [30, 40, 30, 40], + data: [], hoverAnimation:false, }, { @@ -54,9 +54,10 @@ export default { //获取数据 getData() { let data = { - projectSn: this.projectSn + projectSn: this.$store.state.projectSn } selectQualityStatisticsApi(data).then(res => { + console.log('问题占比数据',res); const data = res.result || {} this.total = data.total this.series[1].data = [