diff --git a/src/api/model/enm.js b/src/api/model/enm.js
index 44ef9bae..fcf04fbf 100644
--- a/src/api/model/enm.js
+++ b/src/api/model/enm.js
@@ -143,6 +143,14 @@ export default {
data);
}
},
+ groupValues: {
+ name: "测点统计记录",
+ req: async function(data){
+ return await http.get(
+ `${config.API_URL}/enm/mpointstat/group_values/`,
+ data);
+ }
+ },
statCreate: {
name: "添加测点统计记录",
req: async function(data){
diff --git a/src/config/route.js b/src/config/route.js
index da955d42..17979f73 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -975,16 +975,16 @@ const routes = [
},
component: "enm_energy/value",
},
- // {
- // name: "electric",
- // path: "/enm_energy/electric",
- // meta: {
- // title: "全厂电量统计",
- // // icon: "el-icon-grid",
- // perms: ["enm_energy_electric"],
- // },
- // component: "enm_energy/electric",
- // },
+ {
+ name: "electric_peak",
+ path: "/enm_energy/electric_peak",
+ meta: {
+ title: "峰谷平",
+ // icon: "el-icon-grid",
+ perms: ["enm_energy_electric"],
+ },
+ component: "enm_energy/electric_peak",
+ },
{
name: "electricHour",
path: "/enm_energy/electricHour",
@@ -2825,6 +2825,26 @@ const routes = [
},
component: "fac_cal/mpointstat",
},
+ {
+ path: "/fac_cal/enstat",
+ meta: {
+ title: "工段计算",
+ // icon: "el-icon-postcard",
+ type: "menu",
+ perms: ["mpointstat"],
+ },
+ component: "fac_cal/enstat",
+ },
+ {
+ path: "/fac_cal/mpointstat_group",
+ meta: {
+ title: "计算聚合",
+ // icon: "el-icon-postcard",
+ type: "menu",
+ perms: ["mpointstat"],
+ },
+ component: "fac_cal/mpointstat_group",
+ },
{
name: "formula",
path: "/enm_base/formula",
diff --git a/src/views/bigScreen/index_enm.vue b/src/views/bigScreen/index_enm.vue
index 5ad0c141..9d5ad591 100644
--- a/src/views/bigScreen/index_enm.vue
+++ b/src/views/bigScreen/index_enm.vue
@@ -98,7 +98,7 @@
>
{{ percentage }}t{{ percentage }}t/h
{{ item.name }}
@@ -434,9 +434,6 @@ export default {
窑头: "煤磨",
水泥配料库: "水泥磨",
水泥储存及散装库: "水泥包装",
- // 煤粉制备_primitive0: "煤磨",
- // 水泥磨房_primitive1: "水泥磨",
- // 水泥储存及散装库: "水泥包装",
},
totalData: {
shuliao: 0,
@@ -444,12 +441,10 @@ export default {
out_cement: 0,
},
rateData: [
- { name: "电石渣", value: 0 },
{ name: "原料磨", value: 0 },
{ name: "煤磨", value: 0 },
{ name: "烧成", value: 0 },
{ name: "水泥磨", value: 0 },
- { name: "水泥包装", value: 0 },
],
elecData: [
{ name: "电石渣", value: 0 },
@@ -1088,25 +1083,18 @@ export default {
let seriesData = [];
let data = response;
data.forEach((item) => {
- if (item.mgroup_name == "电石渣") {
+ if (item.mgroup_name == "原料磨") {
that.rateData[0].value = item.production_hour
;
- } else if (item.mgroup_name == "原料磨") {
+ } else if (item.mgroup_name == "煤磨") {
that.rateData[1].value = item.production_hour
;
- } else if (item.mgroup_name == "煤磨") {
+ } else if (item.mgroup_name == "回转窑") {
that.rateData[2].value = item.production_hour
;
- } else if (item.mgroup_name == "回转窑") {
- that.rateData[3].value = item.production_hour
- ;
} else if (item.mgroup_name == "水泥磨") {
- that.rateData[4].value = item.production_hour
- ;
- } else if (item.mgroup_name == "水泥包装") {
- that.rateData[5].value = item.production_hour
- ;
- }
+ that.rateData[3].value = item.production_hour
+ };
});
});
},
@@ -2164,7 +2152,7 @@ export default {
padding-top: 1vh;
}
.item_circle {
- width: 33%;
+ width: 49%;
text-align: center;
}
@keyframes rotate {
diff --git a/src/views/enm_energy/electric_peak.vue b/src/views/enm_energy/electric_peak.vue
new file mode 100644
index 00000000..abc5302f
--- /dev/null
+++ b/src/views/enm_energy/electric_peak.vue
@@ -0,0 +1,259 @@
+
+
+
+
+
+
+
+
+
+ 主要用能设备(100KW以上) |
+ {{ header }} |
+
+
+
+
+ {{ cell }} |
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/enm_energy/water.vue b/src/views/enm_energy/water.vue
index 9927bf50..3ea6980a 100644
--- a/src/views/enm_energy/water.vue
+++ b/src/views/enm_energy/water.vue
@@ -17,6 +17,19 @@
:value="item.id"
>
+
+
+
+
+
+
+
+
+
@@ -193,6 +228,7 @@ export default {
day: "",
year: "",
month: "",
+ daterange:[],
search_date: "",
query:{
type:0,
@@ -200,6 +236,8 @@ export default {
year:'',
month:'',
yearStart:'',
+ start_time:'',
+ end_time:'',
},
mgroupObj: {},
indexList: [],
@@ -209,9 +247,11 @@ export default {
{id:0,name:'日统计'},
{id:1,name:'月统计'},
{id:2,name:'年统计'},
+ {id:3,name:'时间段'},
],
tableDatas2: [],
tableDatas_day:[],
+ tableDatas_range:[],
tableDatas_month:[],
months: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
hours: [
@@ -329,6 +369,7 @@ export default {
xAxisData: [],
xAxisData_day: [],
xAxisData_month: [],
+ xTtimeRange: [],
};
},
mounted() {
@@ -376,6 +417,21 @@ export default {
}
}
},
+ changeDate(){
+ let obj = {};
+ obj.type = "hour";
+ obj.start_time = this.daterange[0];
+ obj.end_time = this.daterange[1];
+ obj.mpoint__in = "3631858394648182784,3631858982832218112,3631858687335112704";
+ obj.page = 0;
+ this.$API.enm.mpoint.groupValues.req(obj).then((res) => {
+ //处理res数组中的 total_val 字段 保留两位
+ res.forEach(item => {
+ item.total_val = Number(item.total_val).toFixed(2);
+ });
+ this.tableDatas_range = res;
+ });
+ },
dateChange() {
let that = this;
that.tableDatas = [];
@@ -399,6 +455,8 @@ export default {
}else if (that.query.type==2){
that.year = that.query.year;
that.dataLoop_month();
+ }else if(that.query.type==3){//时间段
+ that.xTtimeRange.push("总计")
}
let nowDate = new Date();
that.timeStamp = nowDate.getTime();
@@ -679,6 +737,16 @@ export default {
that.option.series[0].data = lineData;
this.itemVisible = true;
},
+ handleCellClick_range(row, column, cell, event) {
+ let that = this;
+ let index = that.tableDatas_range.indexOf(row);
+ // that.tableName = `${row.nickname}-电量范围统计`
+ //获取图数据
+ // let lineData = that.tableDatas[index].slice(2, 3);
+ // that.option.xAxis.data = that.xAxisData_month;
+ // that.option.series[0].data = lineData;
+ this.itemVisible = true;
+ },
exportExcel() {
this.exportLoading = true;
this.$XLSX("#hourBaseTable", this.tableName);
diff --git a/src/views/enm_rm/logDetail.vue b/src/views/enm_rm/logDetail.vue
index 36c2f992..9b747733 100644
--- a/src/views/enm_rm/logDetail.vue
+++ b/src/views/enm_rm/logDetail.vue
@@ -233,7 +233,7 @@
size="small"
@click="mpointStat_del(scope.row)"
type="danger"
- v-auth="'mpointstat.delete'"
+ v-auth="'mpointstat.delete_write'"
>删除
diff --git a/src/views/fac_cal/enstat.vue b/src/views/fac_cal/enstat.vue
new file mode 100644
index 00000000..7644dc46
--- /dev/null
+++ b/src/views/fac_cal/enstat.vue
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/fac_cal/mpointstat.vue b/src/views/fac_cal/mpointstat.vue
index a3210527..076efdce 100644
--- a/src/views/fac_cal/mpointstat.vue
+++ b/src/views/fac_cal/mpointstat.vue
@@ -30,7 +30,9 @@
+ style="width: 100%"
+ format="YYYY-MM-DD HH"
+ popper-class="tpc"/>
+
+
diff --git a/src/views/fac_cal/mpointstat_group.vue b/src/views/fac_cal/mpointstat_group.vue
new file mode 100644
index 00000000..4972d636
--- /dev/null
+++ b/src/views/fac_cal/mpointstat_group.vue
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file