fix:20260702光子科技开发测新修改

This commit is contained in:
shijing 2026-07-03 14:58:48 +08:00
parent 32c8494f54
commit 5f47ef62c6
2 changed files with 19 additions and 12 deletions

View File

@ -132,7 +132,7 @@
id="dashbordProcess" id="dashbordProcess"
> >
<span class="percentage-value" style="font-size: 16px" <span class="percentage-value" style="font-size: 16px"
>{{ dialogData.percentage }}%</span >{{ dialogData.percentage }}</span
> >
</el-progress> </el-progress>
<span>完成进度</span> <span>完成进度</span>
@ -216,7 +216,7 @@
id="dashbordProcess" id="dashbordProcess"
> >
<span class="percentage-value" style="font-size: 16px" <span class="percentage-value" style="font-size: 16px"
>{{ currentData.percentage }}%</span >{{ currentData.percentage }}</span
> >
</el-progress> </el-progress>
<p style="text-align: center">完成进度</p> <p style="text-align: center">完成进度</p>
@ -444,23 +444,23 @@ export default {
yesterday: "", yesterday: "",
dept6Obj: { dept6Obj: {
deptName: "光学精密加工车间", deptName: "光学精密加工车间",
percentage: 100, percentage: "100%",
count_bang: 0, count_bang: 0,
count_guan: 0, count_guan: 0,
}, },
dept7Obj: { dept7Obj: {
deptName: "光纤预制棒生产车间", deptName: "光纤预制棒生产车间",
percentage: 100, percentage: "100%",
count_bang: 0, count_bang: 0,
}, },
dept8Obj: { dept8Obj: {
deptName: "玻璃配合料制备车间", deptName: "玻璃配合料制备车间",
percentage: 100, percentage: "100%",
count: 0, count: 0,
}, },
dept10Obj: { dept10Obj: {
deptName: "光纤预制管生产车间", deptName: "光纤预制管生产车间",
percentage: 100, percentage: "100%",
count_guan: 0, count_guan: 0,
}, },
isUnmounted: false, isUnmounted: false,
@ -994,12 +994,19 @@ export default {
that.$API.bi.dataset.exec.req("materialCount", obj).then((res) => { that.$API.bi.dataset.exec.req("materialCount", obj).then((res) => {
let data = []; let data = [];
let list = res.data2.ds0; let list = res.data2.ds0;
let names = [];
if (list.length > 0) { if (list.length > 0) {
list.forEach((item) => { list.forEach((item) => {
let indexes = names.indexOf(item.material_name);
if(indexes === -1){
names.push(item.material_name);
let arr = []; let arr = [];
arr[0] = item.material_name ; arr[0] = item.material_name ;
arr[1] = item.count; arr[1] = item.count;
data.push(arr); data.push(arr);
}else{
data[indexes][1] = data[indexes][1] + item.count;
}
}); });
} }
that.taskBoard.data = data; that.taskBoard.data = data;

View File

@ -183,7 +183,7 @@
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="dept_name" prop="dept_name"
label="完成车间" label="所在车间"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="count" prop="count"
@ -351,7 +351,7 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="dept_name" prop="dept_name"
label="完成车间" label="所在车间"
/> />
<el-table-column <el-table-column
prop="count" prop="count"