1.修复看板问题

main
董哲奇 3 months ago
parent 3575ceddf6
commit b51a4abd15

@ -19,6 +19,7 @@
<div class="border-inner">
<!-- 表格 -->
<div class="left-top-box">
<div class="desc-title" style="margin-top: 2%">垮位汇总表</div>
<table class="table-sum">
<tr>
<td class="radius">月度计划总张数</td>
@ -41,7 +42,6 @@
<td>{{ item.wc }}</td>
</tr>
</table>
<div class="desc-title" style="margin-top: 2%">垮位汇总表</div>
</div>
<!-- 切割饼图 -->
<div class="left-center-box">
@ -144,6 +144,7 @@ export default {
let zyq4 = 0;
//
this.loaderPie(res.data.zs - res.data.sl, res.data.sl);
var bgData = [res.data.zs,0, 0, 0, ];
res.data.detail.forEach((item) => {
if (item.kw == "一垮") {
wcOneValue += item.wc;
@ -164,17 +165,20 @@ export default {
}
// =================
if (item.zyq == "一区") {
zyq1 += item.sl;
zyq1 += item.wc;
} else if (item.zyq == "二区") {
zyq2 += item.sl;
zyq2 += item.wc;
bgData[1]+=item.sl;
} else if (item.zyq == "三区") {
zyq3 += item.sl;
zyq3 += item.wc;
bgData[2]+=item.sl;
} else if (item.zyq == "四区") {
zyq4 += item.sl;
zyq4 += item.wc;
bgData[3]+=item.sl;
}
});
let zyqDataY = [zyq1, zyq2, zyq3, zyq4];
var bgData = [res.data.zs, res.data.zs, res.data.zs, res.data.zs];
let zyqDataY = [res.data.sl, zyq2, zyq3, zyq4];
this.$nextTick(() => {
this.loaderBar(zyqDataY, bgData);
});
@ -203,7 +207,7 @@ export default {
dataX = this.getAllDatesOfCurrentMonth();
dataX.forEach((item, index) => {
dataDayX.push(item.slice(-2) + "日");
dataDayX.push(item + "日");
dataY.push({
day: item,
data: 0,
@ -218,7 +222,7 @@ export default {
for (let i = 0; i < Y.length; i++) {
let arry1 = Y[i];
if (zyqList[item]) {
let arry2 = zyqList[item].find((item) => item.day === arry1.day);
let arry2 = zyqList[item].find((item) => (item.day+'') === arry1.day);
if (arry2) {
arry1.data = arry2.sl;
}
@ -597,7 +601,7 @@ export default {
},
barWidth: 40,
itemStyle: {
color: "#2e7cff",
color: "#1afffd",
},
data: bgData, //
z: 0,
@ -607,7 +611,7 @@ export default {
type: "bar",
barWidth: 40,
itemStyle: {
color: "#1afffd",
color: "#2e7cff",
},
data: zyqDataY, // ()
z: 1,
@ -735,7 +739,7 @@ export default {
i <= lastDayOfMonth;
i.setDate(i.getDate() + 1)
) {
dates.push(this.$moment(new Date(i)).format("yyyy/MM/DD"));
dates.push(this.$moment(new Date(i)).format("DD"));
}
return dates;

@ -30,13 +30,7 @@
:data="tableList"
:class-option="classOption"
class="warp-box"
:class="
tableList.length == 1
? 'warp-box-1'
: tableList.length == 2
? 'warp-box-2'
: ''
"
:style="{height:tableList.length*2+'rem'}"
>
<el-row
class="row-border"
@ -50,7 +44,7 @@
}}</el-col>
<el-col :span="4" class="col-right-border">批次数量</el-col>
<el-col :span="5" class="col-right-border"
>{{ item.pcsl }} </el-col
>{{ item.pcsl }}</el-col
>
<el-col :span="3" class="col-right-border">重量</el-col>
<el-col :span="5" class="col-right-border-text"
@ -159,7 +153,6 @@ export default {
res.data.xq=res.data.xq?parseInt(res.data.xq).toFixed(0):'0'
this.xqzlSum=res.data.xq
this.rowObj = res.data;
this.TableBar(dataX, dataXqzlY, dataJhzlY);
this.$nextTick(() => {
const elementHeight = this.$refs.refHeight;
elementHeight.forEach((li, index) => {

@ -6,7 +6,6 @@
<el-form ref="form" :model="formData" label-width="90px">
<el-form-item label="请选择年份" size="mini">
<el-select v-model="formData.year" placeholder="">
<el-option label="2024" :value="2024"></el-option>
<el-option label="2025" :value="2025"></el-option>
</el-select>
</el-form-item>
@ -55,7 +54,7 @@ export default {
data() {
return {
formData: {
year: 2024,
year: 2025,
},
xbjhList: [],
ydjhList: [],

@ -588,8 +588,9 @@ export default {
let sixValue = [0, 0];
res.data.forEach((item) => {
if (item.zyq == "一区") {
} else if (item.zyq == "二区") {
oneValue = [item.wcl, item.wc];
} else if (item.zyq == "二区") {
secondValue = [item.wcl, item.wc];
} else if (item.zyq == "三区") {
threeValue = [item.wcl, item.wc];
} else if (item.zyq == "四区") {

Loading…
Cancel
Save