zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web

This commit is contained in:
shijing 2025-02-27 16:03:20 +08:00
parent 9cbdd25bac b4daca4664
commit 36987f5b2a
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/bigScreen/index_enm.vue
View File

@ -1299,7 +1299,7 @@ export default {
}; };
} }
// 第一个API查询 煤磨总产量 月数据 // 第一个API查询 煤磨总产量 月数据
let query1 = generateQuery("3626253029718056960"); let query1 = generateQuery("3626253231757619200");
this.$API.enm.enstat.req(query1).then((response) => { this.$API.enm.enstat.req(query1).then((response) => {
response.forEach((item) => { response.forEach((item) => {
if (item.qua_data.length > 0) { if (item.qua_data.length > 0) {

8
src/views/fac_cal/mpointstat.vue
View File

@ -107,7 +107,6 @@
<el-button <el-button
link link
size="small" size="small"
v-if="scope.row.type == 'year_s' || scope.row.type == 'month_s' || scope.row.type == 'day_s'|| scope.row.type == 'month'|| scope.row.type == 'day'"
@click="handle_edit(scope.row)" @click="handle_edit(scope.row)"
type="primary" type="primary"
>校正</el-button >校正</el-button
@ -239,7 +238,6 @@ export default {
{ label: "班天", value: "day_s" }, { label: "班天", value: "day_s" },
{ label: "班月", value: "month_s" }, { label: "班月", value: "month_s" },
{ label: "班时", value: "hour_s"}, { label: "班时", value: "hour_s"},
{ label: "小时", value: "hour"},
{ label: "天", value: "day" }, { label: "天", value: "day" },
{ label: "月", value: "month"}, { label: "月", value: "month"},
], ],
@ -261,9 +259,9 @@ export default {
} }
let option = { ...that.chartOption }; let option = { ...that.chartOption };
// 获取 x 轴的数据，如果query.type为小时，则显示小时，如果为天则显示天，如果为月则显示月 // 获取 x 轴的数据，如果query.type为小时，则显示小时，如果为天则显示天，如果为月则显示月
if (that.query.type == "hour") { if (that.query.type == "hour_s") {
option.title.text = "小时统计"; option.title.text = "班时统计";
option.xAxis.data = tableData.reverse().map((item) => item.year + "-" + item.month + "-" + item.day + " " + item.hour); option.xAxis.data = tableData.reverse().map((item) => item.year_s + "-" + item.month + "-" + item.day + " " + item.hour);
}else if (that.query.type == "day") { }else if (that.query.type == "day") {
option.title.text = "天统计"; option.title.text = "天统计";
option.xAxis.data = tableData.reverse().map((item, index) => item.year + "-" + item.month + "-" + item.day); option.xAxis.data = tableData.reverse().map((item, index) => item.year + "-" + item.month + "-" + item.day);