gj_mes
/
gj-erp-kban-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

Browse Source
main
biubiubiu 7 months ago
parent 0c792d4b9d
commit d62266bdd9
2 changed files with 47 additions and 139 deletions
Show Stats Download Patch File Download Diff File

162
src/components/AmphiPosition/index.vue
Unescape View File

@ -184,12 +184,12 @@ export default {
zyjhzx({
nf: this.formData.nf,
}).then((res) => {
let dataX = [];
let dataDayX = [];
let legendData = [];
let seriesData = [{}, {}, {}, {}, {}, {}];
let dataY = [];
let dateData = [];
let dataX = []; // 当月所有日期
let dataDayX = []; //x轴
let legendData = ["一区", "二区", "三区", "四区", "五区", "六区"]; //设置所有作业区
let dataY = []; //所有作业区，设置30日数据起始值0
let seriesData = [];
let dateData = []; //设置30天--0
let zyqList = res.data.reduce((prev, current) => {
const key = current.zyq;
if (!prev[key]) {
@ -199,8 +199,7 @@ export default {
return prev;
}, {});
// 获取所有作业区
legendData = Object.keys(zyqList);
// 获取当月所有日期
dataX = this.getAllDatesOfCurrentMonth();
dataX.forEach((item, index) => {
@ -214,126 +213,35 @@ export default {
// 循环数据
legendData.forEach((item, index) => {
if (item == "一区") {
let Y = JSON.parse(JSON.stringify(dataY));
for (let i = 0; i < Y.length; i++) {
let arry1 = Y[i];
let Y = JSON.parse(JSON.stringify(dataY));
seriesData[index] = [];
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);
if (arry2) {
arry1.data = arry2.sl;
}
seriesData[index] = Y;
} else {
seriesData[index] = [];
}
seriesData[0].data = Y;
} else if (item == "二区") {
let Y = JSON.parse(JSON.stringify(dataY));
for (let i = 0; i < Y.length; i++) {
let arry1 = Y[i];
let arry2 = zyqList[item].find((item) => item.day === arry1.day);
if (arry2) {
arry1.data = arry2.sl;
}
}
seriesData[1].data = Y;
} else if (item == "三区") {
let Y = JSON.parse(JSON.stringify(dataY));
for (let i = 0; i < Y.length; i++) {
let arry1 = Y[i];
let arry2 = zyqList[item].find((item) => item.day === arry1.day);
if (arry2) {
arry1.data = arry2.sl;
}
}
seriesData[2].data = Y;
} else if (item == "四区") {
let Y = JSON.parse(JSON.stringify(dataY));
for (let i = 0; i < Y.length; i++) {
let arry1 = Y[i];
let arry2 = zyqList[item].find((item) => item.day === arry1.day);
if (arry2) {
arry1.data = arry2.sl;
}
}
seriesData[3].data = Y;
} else if (item == "五区") {
let Y = JSON.parse(JSON.stringify(dataY));
for (let i = 0; i < Y.length; i++) {
let arry1 = Y[i];
let arry2 = zyqList[item].find((item) => item.day === arry1.day);
if (arry2) {
arry1.data = arry2.sl;
}
}
seriesData[4].data = Y;
} else if (item == "六区") {
let Y = JSON.parse(JSON.stringify(dataY));
for (let i = 0; i < Y.length; i++) {
let arry1 = Y[i];
let arry2 = zyqList[item].find((item) => item.day === arry1.day);
if (arry2) {
arry1.data = arry2.sl;
}
}
seriesData[5].data = Y;
}
});
var oneArr = [];
var twoArr = [];
var threeArr = [];
var fourArr = [];
var fiveArr = [];
var sixArr = [];
if (seriesData[0] && seriesData[0].data) {
seriesData[0].data.forEach((item) => {
oneArr.push(item.data);
});
} else {
oneArr = dateData;
}
if (seriesData[1] && seriesData[1].data) {
seriesData[1].data.forEach((item) => {
twoArr.push(item.data);
});
} else {
twoArr = dateData;
}
if (seriesData[2] && seriesData[2].data) {
seriesData[2].data.forEach((item) => {
threeArr.push(item.data);
});
} else {
threeArr = dateData;
}
if (seriesData[3] && seriesData[3].data) {
seriesData[3].data.forEach((item) => {
fourArr.push(item.data);
});
} else {
fourArr = dateData;
}
if (seriesData[4] && seriesData[4].data) {
seriesData[4].data.forEach((item) => {
fiveArr.push(item.data);
});
} else {
fiveArr = dateData;
}
if (seriesData[5] && seriesData[5].data) {
seriesData[5].data.forEach((item) => {
sixArr.push(item.data);
});
} else {
sixArr = dateData;
}
let Arr = [];
seriesData.forEach((item, index) => {
Arr[index] = [];
if (item && item.length > 0) {
item.forEach((em) => {
Arr[index].push(em.data ? em.data : 0);
});
} else {
Arr[index] = dateData;
}
});
// 折线图
this.TableLine(
dataDayX,
oneArr,
twoArr,
threeArr,
fourArr,
fiveArr,
sixArr
);
this.TableLine(dataDayX, Arr);
});
},
today_zyjhzx() {
@ -711,7 +619,7 @@ export default {
myChart.resize();
});
},
TableLine(dataX, oneArr, twoArr, threeArr, fourArr, fiveArr, sixArr) {
TableLine(dataX, Arr) {
var myChart = this.$echarts.init(document.getElementById("TableLine"));
var option = {
@ -774,32 +682,32 @@ export default {
{
name: "一区",
type: "line",
data: oneArr,
data: Arr[0],
},
{
name: "二区",
type: "line",
data: twoArr,
data: Arr[1],
},
{
name: "三区",
type: "line",
data: threeArr,
data: Arr[2],
},
{
name: "四区",
type: "line",
data: fourArr,
data: Arr[3],
},
{
name: "五区",
type: "line",
data: fiveArr,
data: Arr[4],
},
{
name: "六区",
type: "line",
data: sixArr,
data: Arr[5],
},
],
};

24
src/components/RealTimeMonitor/index.vue
Unescape View File

@ -560,13 +560,13 @@ export default {
// 8.作业区未完成与完成量对比饼图
zxqwcqk() {
zxqwcqk().then((res) => {
let oneValue = [0, 0];
let secondValue = [0, 0];
let threeValue = [0, 0];
let fourValue = [0, 0];
let fiveValue = [0, 0];
let sixValue = [0, 0];
res.data.forEach((item) => {
let oneValue = [0, 0];
let secondValue = [0, 0];
let threeValue = [0, 0];
let fourValue = [0, 0];
let fiveValue = [0, 0];
let sixValue = [0, 0];
if (item.zyq == "一区") {
} else if (item.zyq == "二区") {
oneValue = [item.wcl, item.wc];
@ -579,13 +579,13 @@ export default {
} else if (item.zyq == "六区") {
sixValue = [item.wcl, item.wc];
}
this.FinishOnePie(oneValue[0], oneValue[1]);
this.FinishSecondPie(secondValue[0], secondValue[1]);
this.FinishThreePie(threeValue[0], threeValue[1]);
this.FinishFourPie(fourValue[0], fourValue[1]);
this.FinishFivePie(fiveValue[0], fiveValue[1]);
this.FinishSixPie(sixValue[0], sixValue[1]);
});
this.FinishOnePie(oneValue[0], oneValue[1]);
this.FinishSecondPie(secondValue[0], secondValue[1]);
this.FinishThreePie(threeValue[0], threeValue[1]);
this.FinishFourPie(fourValue[0], fourValue[1]);
this.FinishFivePie(fiveValue[0], fiveValue[1]);
this.FinishSixPie(sixValue[0], sixValue[1]);
});
},
AttendancePieChart() {

Write Preview
Loading…
Cancel
Save