diff --git a/src/views/em/mpoint.vue b/src/views/em/mpoint.vue index 4ead9a08..d9b2116c 100644 --- a/src/views/em/mpoint.vue +++ b/src/views/em/mpoint.vue @@ -84,6 +84,7 @@ placeholder="名称/代号" style="width: 200px" clearable + @keyup.enter="handleQuery" > 车间用水(t) - 回转窑 - 煤磨 + 回转窑 + 煤磨 压缩空气(m3) 车间用水(t) diff --git a/src/views/enm_report/reportDay.vue b/src/views/enm_report/reportDay.vue index dec49c2c..8fa6492e 100644 --- a/src/views/enm_report/reportDay.vue +++ b/src/views/enm_report/reportDay.vue @@ -286,9 +286,9 @@ }, getTableData(){ - for(let i=0;i<39;i++){ - this.tableDatas[i][3] = ''; - } + // for(let i=0;i<39;i++){ + // this.tableDatas[i][3] = ''; + // } this.getData(); }, handlePrint() { diff --git a/src/views/enm_rm/handover_form.vue b/src/views/enm_rm/handover_form.vue index 0efc5054..b7b33592 100644 --- a/src/views/enm_rm/handover_form.vue +++ b/src/views/enm_rm/handover_form.vue @@ -39,7 +39,7 @@ - + diff --git a/src/views/enm_rm/logDetail.vue b/src/views/enm_rm/logDetail.vue index bca4e089..4bc22536 100644 --- a/src/views/enm_rm/logDetail.vue +++ b/src/views/enm_rm/logDetail.vue @@ -113,9 +113,9 @@ - + { that.isSaveing = false; + }); } }); diff --git a/src/views/fac_cal/caltask.vue b/src/views/fac_cal/caltask.vue new file mode 100644 index 00000000..371934de --- /dev/null +++ b/src/views/fac_cal/caltask.vue @@ -0,0 +1,40 @@ + + \ No newline at end of file diff --git a/src/views/fac_cal/mpointstat.vue b/src/views/fac_cal/mpointstat.vue new file mode 100644 index 00000000..f06c0529 --- /dev/null +++ b/src/views/fac_cal/mpointstat.vue @@ -0,0 +1,234 @@ + + + + diff --git a/src/views/fac_cal/taskresult.vue b/src/views/fac_cal/taskresult.vue new file mode 100644 index 00000000..d63d2f62 --- /dev/null +++ b/src/views/fac_cal/taskresult.vue @@ -0,0 +1,75 @@ + + \ No newline at end of file diff --git a/src/views/fac_cal/xscript.vue b/src/views/fac_cal/xscript.vue new file mode 100644 index 00000000..80fc545e --- /dev/null +++ b/src/views/fac_cal/xscript.vue @@ -0,0 +1,224 @@ + + diff --git a/src/views/home/event.vue b/src/views/home/event.vue index 0a2bc3a7..62c3d8a2 100644 --- a/src/views/home/event.vue +++ b/src/views/home/event.vue @@ -17,9 +17,13 @@ - + + - +