举牌验收问题修复
parent
c8f6e5c757
commit
87b29c8e99
|
|
@ -33,7 +33,7 @@
|
|||
|
||||
<div class="data-row">
|
||||
<div class="data-label">工序部位:</div>
|
||||
<div class="data-content">{{ row.workingPosition }}</div>
|
||||
<div class="data-content">{{ row.workingPositionFull }}</div>
|
||||
</div>
|
||||
<div class="data-row">
|
||||
<div class="data-label">验收描述:</div>
|
||||
|
|
|
|||
|
|
@ -2,17 +2,9 @@
|
|||
<div class="project-checked main-page">
|
||||
<el-col :span="6" class="h100">
|
||||
<module-one-1-1 label="举牌验收数量统计" class="chart1-group">
|
||||
<project-overview-chart
|
||||
:htmlShow="true"
|
||||
:key="'ai1' + chart1Key"
|
||||
:sp="''"
|
||||
:fn="changeChart1"
|
||||
:maintitle="groupTotal"
|
||||
:legend-opt="groupLendOpt"
|
||||
:typedata="groupData"
|
||||
text="验收数"
|
||||
:height="chart1Height"
|
||||
></project-overview-chart>
|
||||
<project-overview-chart :htmlShow="true" :key="'ai1' + chart1Key" :sp="''" :fn="changeChart1"
|
||||
:maintitle="groupTotal" :legend-opt="groupLendOpt" :typedata="groupData" text="验收数"
|
||||
:height="chart1Height"></project-overview-chart>
|
||||
</module-one-1-1>
|
||||
<module-one-2-1 label="本周验收列表" class="week-group">
|
||||
<template v-if="weekData.length == 0">
|
||||
|
|
@ -25,30 +17,23 @@
|
|||
</template>
|
||||
<template v-else>
|
||||
<div class="week-list scroll" :key="weekKey">
|
||||
<div
|
||||
class="week-item"
|
||||
v-for="(it, index) in weekData"
|
||||
:key="index"
|
||||
@click="handleWeekItemClick(it, $event)"
|
||||
>
|
||||
<div class="week-item" v-for="(it, index) in weekData" :key="index"
|
||||
@click="handleWeekItemClick(it, $event)">
|
||||
<div class="item-left">
|
||||
<el-image
|
||||
:src="it.image"
|
||||
:preview-src-list="it.images"
|
||||
fit="contain"
|
||||
/>
|
||||
<el-image :src="it.image" :preview-src-list="it.images" fit="contain" />
|
||||
</div>
|
||||
<div class="item-right">
|
||||
<div class="item-right-row">
|
||||
<span
|
||||
:class="'check-state check-state-' + it.checkResultColor"
|
||||
>{{ it.checkResultName }}</span
|
||||
>
|
||||
<span :class="'check-state check-state-' + it.checkResultColor">{{ it.checkResultName }}</span>
|
||||
<span class="check-date">{{ it.checkingDate }}</span>
|
||||
</div>
|
||||
<div class="item-right-row">
|
||||
<div class="item-label">工序部位:</div>
|
||||
<div class="item-data">{{ it.workingPosition }}</div>
|
||||
<div class="item-data">
|
||||
<el-tooltip :content="it.workingPositionFull" placement="top">
|
||||
<span>{{ it.workingPositionFull }}</span>
|
||||
</el-tooltip>
|
||||
</div>
|
||||
</div>
|
||||
<div class="item-right-row">
|
||||
<div class="item-label">班组长:</div>
|
||||
|
|
@ -79,16 +64,10 @@
|
|||
<el-col :span="18" class="h100">
|
||||
<module-one-2-3 label="举牌验收列表" class="h66 list-group">
|
||||
<div class="head-title-tab" :key="chart1Key">
|
||||
<div
|
||||
:class="nav == 1 ? 'head-nav active' : 'head-nav'"
|
||||
@click="doNav(1)"
|
||||
>
|
||||
<div :class="nav == 1 ? 'head-nav active' : 'head-nav'" @click="doNav(1)">
|
||||
已验收({{ getCheckedCount(1) }})
|
||||
</div>
|
||||
<div
|
||||
:class="nav == 0 ? 'head-nav active' : 'head-nav'"
|
||||
@click="doNav(0)"
|
||||
>
|
||||
<div :class="nav == 0 ? 'head-nav active' : 'head-nav'" @click="doNav(0)">
|
||||
未验收({{ getCheckedCount(0) }})
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -103,30 +82,23 @@
|
|||
</template>
|
||||
<template v-else>
|
||||
<div class="list-data scroll" :key="listKey">
|
||||
<div
|
||||
class="week-item"
|
||||
v-for="(it, index) in listData"
|
||||
:key="index"
|
||||
@click="handleWeekItemClick(it, $event)"
|
||||
>
|
||||
<div class="week-item" v-for="(it, index) in listData" :key="index"
|
||||
@click="handleWeekItemClick(it, $event)">
|
||||
<div class="item-left">
|
||||
<el-image
|
||||
:src="it.image"
|
||||
:preview-src-list="it.images"
|
||||
fit="contain"
|
||||
/>
|
||||
<el-image :src="it.image" :preview-src-list="it.images" fit="contain" />
|
||||
</div>
|
||||
<div class="item-right">
|
||||
<div class="item-right-row">
|
||||
<span
|
||||
:class="'check-state check-state-' + it.checkResultColor"
|
||||
>{{ it.checkResultName }}</span
|
||||
>
|
||||
<span :class="'check-state check-state-' + it.checkResultColor">{{ it.checkResultName }}</span>
|
||||
<span class="check-date">{{ it.checkingDate }}</span>
|
||||
</div>
|
||||
<div class="item-right-row">
|
||||
<div class="item-label">工序部位:</div>
|
||||
<div class="item-data">{{ it.workingPosition }}</div>
|
||||
<div class="item-data">
|
||||
<el-tooltip :content="it.workingPositionFull" placement="top">
|
||||
<span>{{ it.workingPositionFull }}</span>
|
||||
</el-tooltip>
|
||||
</div>
|
||||
</div>
|
||||
<div class="item-right-row">
|
||||
<div class="item-label">班组长:</div>
|
||||
|
|
@ -151,15 +123,9 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<el-pagination
|
||||
layout="total,prev, pager, next"
|
||||
:hide-on-single-page="true"
|
||||
@current-change="handleCurrentChange"
|
||||
:total="total"
|
||||
:page-size="size"
|
||||
:current-page.sync="index"
|
||||
class="bg-pagination"
|
||||
></el-pagination>
|
||||
<el-pagination layout="total,prev, pager, next" :hide-on-single-page="true"
|
||||
@current-change="handleCurrentChange" :total="total" :page-size="size" :current-page.sync="index"
|
||||
class="bg-pagination"></el-pagination>
|
||||
</template>
|
||||
</module-one-2-3>
|
||||
<module-one-1-3 label="举牌验收技术员统计" class="h33 group-technician">
|
||||
|
|
@ -172,13 +138,8 @@
|
|||
</div>
|
||||
</template>
|
||||
<template v-else>
|
||||
<my-chart
|
||||
:key="chart2Key"
|
||||
id="project-safety-check-chart2"
|
||||
width="100%"
|
||||
height="100%"
|
||||
:render="renderChart2"
|
||||
></my-chart>
|
||||
<my-chart :key="chart2Key" id="project-safety-check-chart2" width="100%" height="100%"
|
||||
:render="renderChart2"></my-chart>
|
||||
</template>
|
||||
</module-one-1-3>
|
||||
</el-col>
|
||||
|
|
@ -294,7 +255,7 @@ export default {
|
|||
},
|
||||
getCheckedCount(n) {
|
||||
let obj = this.groupData.find(
|
||||
(item) => item.name == (n == 1 ? "已验收" : "未验收")
|
||||
(item) => item.name == (n == 1 ? "已验收" : "待验收")
|
||||
);
|
||||
return obj ? obj.value : 0;
|
||||
},
|
||||
|
|
@ -329,7 +290,7 @@ export default {
|
|||
pageSize: this.size,
|
||||
};
|
||||
this.$api.checked.listProjectChecked(param).then((res) => {
|
||||
this.total = res.total + 20;
|
||||
this.total = res.total;
|
||||
this.listData = this.mapData(res);
|
||||
this.listKey++;
|
||||
});
|
||||
|
|
@ -351,9 +312,6 @@ export default {
|
|||
if (item.imageUrls) {
|
||||
item.images = item.imageUrls.split(",");
|
||||
item.image = item.images[0];
|
||||
for (let i = 0; i < 6; i++) {
|
||||
item.images.push(item.images[0]);
|
||||
}
|
||||
} else {
|
||||
item.image = "";
|
||||
item.images = [];
|
||||
|
|
@ -374,7 +332,10 @@ export default {
|
|||
item.checkResultName = "验收不通过";
|
||||
item.checkResultColor = 2;
|
||||
}
|
||||
let task = this.$tryToJson(item.workingPosition, {})
|
||||
|
||||
item.workingPositionName = task.name;
|
||||
item.workingPositionFull = task.full;
|
||||
return item;
|
||||
});
|
||||
},
|
||||
|
|
@ -538,6 +499,7 @@ export default {
|
|||
}
|
||||
|
||||
.chart1-group {
|
||||
|
||||
.chart-gif,
|
||||
.chart-text {
|
||||
left: 51px !important;
|
||||
|
|
@ -641,6 +603,17 @@ export default {
|
|||
color: #32e1e4;
|
||||
}
|
||||
|
||||
.item-data {
|
||||
max-width: calc(100% - 80px);
|
||||
|
||||
.el-tooltip {
|
||||
white-space: nowrap;
|
||||
display: block;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
}
|
||||
|
||||
.check-state {
|
||||
display: inline-block;
|
||||
line-height: 20px;
|
||||
|
|
@ -669,9 +642,11 @@ export default {
|
|||
|
||||
@media (min-width: 1921px) and (max-width: 2560px) {
|
||||
.no-data {
|
||||
font-size: 16px;
|
||||
}
|
||||
font-size: 16px;
|
||||
}
|
||||
|
||||
.chart1-group {
|
||||
|
||||
.chart-gif,
|
||||
.chart-text {
|
||||
left: 59px !important;
|
||||
|
|
@ -719,7 +694,7 @@ export default {
|
|||
padding-left: 10px;
|
||||
|
||||
.item-right-row {
|
||||
line-height: 30px;
|
||||
line-height: 34px;
|
||||
|
||||
.check-state {
|
||||
line-height: 30px;
|
||||
|
|
@ -732,10 +707,12 @@ export default {
|
|||
}
|
||||
|
||||
@media (min-width: 2561px) {
|
||||
.no-data {
|
||||
font-size: 24px;
|
||||
}
|
||||
.no-data {
|
||||
font-size: 24px;
|
||||
}
|
||||
|
||||
.chart1-group {
|
||||
|
||||
.chart-gif,
|
||||
.chart-text {
|
||||
left: 79px !important;
|
||||
|
|
|
|||
Loading…
Reference in New Issue