diff --git a/.env.development b/.env.development index 807d02f0..e6ab5abd 100644 --- a/.env.development +++ b/.env.development @@ -16,10 +16,10 @@ VUE_APP_PJ = 'gx' # VUE_APP_API_BASEURL = http://127.0.0.1:2226/api #测试环境 -VUE_APP_API_BASEURL = http://49.232.14.174:2226/api -# VUE_APP_API_BASEURL = http://127.0.0.1:2226/api -VUE_APP_BASEURL = http://49.232.14.174:2226 -# VUE_APP_BASEURL = http://127.0.0.1:2226 +# VUE_APP_API_BASEURL = http://49.232.14.174:2226/api +VUE_APP_API_BASEURL = http://127.0.0.1:2226/api +# VUE_APP_BASEURL = http://49.232.14.174:2226 +VUE_APP_BASEURL = http://127.0.0.1:2226 # #光子 # VUE_APP_API_BASEURL = http://49.232.14.174:2250/api diff --git a/.env.production b/.env.production index bc6bbf1e..37c90e3f 100644 --- a/.env.production +++ b/.env.production @@ -16,8 +16,12 @@ VUE_APP_TITLE = '' # VUE_APP_API_BASEURL = http://192.168.10.5:2250/api # VUE_APP_BASEURL = http://192.168.10.5:2250 #托克逊 -VUE_APP_API_BASEURL = http://49.232.14.174:2226/api -VUE_APP_BASEURL = http://49.232.14.174:2226 +# VUE_APP_API_BASEURL = http://49.232.14.174:2226/api +# VUE_APP_BASEURL = http://49.232.14.174:2226 +VUE_APP_API_BASEURL = http://127.0.0.1:2226/api +# VUE_APP_BASEURL = http://49.232.14.174:2226 +VUE_APP_BASEURL = http://127.0.0.1:2226 + # VUE_APP_API_BASEURL = http://1.203.161.103:2800/api # VUE_APP_BASEURL = http://1.203.161.103:2800 diff --git a/src/views/enm_coal/power.vue b/src/views/enm_coal/power.vue index 2cfa1b47..0e42a5fb 100644 --- a/src/views/enm_coal/power.vue +++ b/src/views/enm_coal/power.vue @@ -514,9 +514,9 @@ export default { let that = this; let obj = {}; obj.type = "hour_s"; - obj.year_s = year; - obj.month_s = month; - obj.day_s = days; + obj.year = year; + obj.month = month; + obj.day = days; obj.mgroup__name = "煤磨"; obj.mpoint__material__code__in = "elec,elec_0"; obj.mpoint__ep_monitored__isnull = 0; diff --git a/src/views/enm_coal/report.vue b/src/views/enm_coal/report.vue index 8d7294b7..7a37da7b 100644 --- a/src/views/enm_coal/report.vue +++ b/src/views/enm_coal/report.vue @@ -668,9 +668,9 @@ export default { let that = this; let query = {}; query.page = 0; - query.year_s = year; - query.month_s = month; - query.day_s = days; + query.year = year; + query.month = month; + query.day = days; query.type = "hour_s"; query.mgroup = that.query.mgroup; this.$API.enm.enstat.req(query).then((response) => { diff --git a/src/views/enm_coalbase/power.vue b/src/views/enm_coalbase/power.vue index e3459391..9dff4487 100644 --- a/src/views/enm_coalbase/power.vue +++ b/src/views/enm_coalbase/power.vue @@ -466,9 +466,9 @@ export default { let that = this; let obj = {}; obj.type = "hour_s"; - obj.year_s = year; - obj.month_s = month; - obj.day_s = days; + obj.year = year; + obj.month = month; + obj.day = days; obj.mgroup__name = "煤磨"; obj.mpoint__material__code__in = "elec,elec_0"; obj.mpoint__ep_monitored__isnull = 0; diff --git a/src/views/enm_coalbase/report.vue b/src/views/enm_coalbase/report.vue index 48651ce3..b14251a4 100644 --- a/src/views/enm_coalbase/report.vue +++ b/src/views/enm_coalbase/report.vue @@ -523,9 +523,9 @@ export default { //上小时 let params4 = {}; params4.page = 0; - params4.year_s = year_h; - params4.month_s = month_h; - params4.day_s = days_h; + params4.year = year_h; + params4.month = month_h; + params4.day = days_h; params4.hour = hours_h; params4.type = "hour_s"; params4.mgroup = that.query.mgroup; @@ -691,9 +691,9 @@ export default { let that = this; let query = {}; query.page = 0; - query.year_s = year; - query.month_s = month; - query.day_s = days; + query.year = year; + query.month = month; + query.day = days; query.type = "hour_s"; query.mgroup = that.query.mgroup; this.$API.enm.enstat.req(query).then((response) => { diff --git a/src/views/enm_kiln/power.vue b/src/views/enm_kiln/power.vue index da6ada11..93e4f780 100644 --- a/src/views/enm_kiln/power.vue +++ b/src/views/enm_kiln/power.vue @@ -631,9 +631,9 @@ export default { let that = this; let obj = {}; obj.type = "hour_s"; - obj.year_s = year; - obj.month_s = month; - obj.day_s = days; + obj.year = year; + obj.month = month; + obj.day = days; obj.mgroup__name = "回转窑"; obj.mpoint__material__code__in = "elec,elec_0"; obj.mpoint__ep_monitored__isnull = 0; diff --git a/src/views/enm_kiln/report.vue b/src/views/enm_kiln/report.vue index 9f928f85..d45f3055 100644 --- a/src/views/enm_kiln/report.vue +++ b/src/views/enm_kiln/report.vue @@ -932,9 +932,9 @@ export default { let that = this; let query = {}; query.page = 0; - query.year_s = year; - query.month_s = month; - query.day_s = days; + query.year = year; + query.month = month; + query.day = days; query.type = "hour_s"; query.mgroup = that.query.mgroup; this.$API.enm.enstat.req(query).then((response) => { diff --git a/src/views/enm_kilnbase/power.vue b/src/views/enm_kilnbase/power.vue index f41ac3c4..4dcbe760 100644 --- a/src/views/enm_kilnbase/power.vue +++ b/src/views/enm_kilnbase/power.vue @@ -464,9 +464,9 @@ export default { let that = this; let obj = {}; obj.type = "hour_s"; - obj.year_s = year; - obj.month_s = month; - obj.day_s = days; + obj.year = year; + obj.month = month; + obj.day = days; obj.mgroup__name = "回转窑"; obj.mpoint__material__code__in = "elec,elec_0"; obj.mpoint__ep_monitored__isnull = 0; diff --git a/src/views/enm_kilnbase/report.vue b/src/views/enm_kilnbase/report.vue index 325e56d9..26a2f0cb 100644 --- a/src/views/enm_kilnbase/report.vue +++ b/src/views/enm_kilnbase/report.vue @@ -683,9 +683,9 @@ export default { //上小时 let params4 = {}; params4.page = 0; - params4.year_s = year_h; - params4.month_s = month_h; - params4.day_s = days_h; + params4.year = year_h; + params4.month = month_h; + params4.day = days_h; params4.hour = hours_h; params4.type = "hour_s"; params4.mgroup = that.query.mgroup; @@ -903,9 +903,9 @@ export default { let that = this; let query = {}; query.page = 0; - query.year_s = year; - query.month_s = month; - query.day_s = days; + query.year = year; + query.month = month; + query.day = days; query.type = "hour_s"; query.mgroup = that.query.mgroup; this.$API.enm.enstat.req(query).then((response) => { diff --git a/src/views/enm_mill/power.vue b/src/views/enm_mill/power.vue index 0e8299dc..ebe2e42d 100644 --- a/src/views/enm_mill/power.vue +++ b/src/views/enm_mill/power.vue @@ -586,9 +586,9 @@ export default { let that = this; let obj = {}; obj.type = "hour_s"; - obj.year_s = year; - obj.month_s = month; - obj.day_s = days; + obj.year = year; + obj.month = month; + obj.day = days; obj.mgroup__name = "水泥磨"; obj.mpoint__material__code__in = "elec,elec_0"; obj.mpoint__ep_monitored__isnull = 0; diff --git a/src/views/enm_mill/report.vue b/src/views/enm_mill/report.vue index c4a9651b..a49aba20 100644 --- a/src/views/enm_mill/report.vue +++ b/src/views/enm_mill/report.vue @@ -843,9 +843,9 @@ export default { let that = this; let query = {}; query.page = 0; - query.year_s = year; - query.month_s = month; - query.day_s = days; + query.year = year; + query.month = month; + query.day = days; query.type = "hour_s"; query.mgroup = that.query.mgroup; this.$API.enm.enstat.req(query).then((response) => { diff --git a/src/views/enm_rm/power.vue b/src/views/enm_rm/power.vue index 5d480fff..b17ee554 100644 --- a/src/views/enm_rm/power.vue +++ b/src/views/enm_rm/power.vue @@ -565,9 +565,9 @@ export default { let that = this; let obj = {}; obj.type = "hour_s"; - obj.year_s = year; - obj.month_s = month; - obj.day_s = days; + obj.year = year; + obj.month = month; + obj.day = days; obj.mgroup__name = "原料磨"; obj.mpoint__material__code__in = "elec,elec_0"; obj.mpoint__ep_monitored__isnull = 0; diff --git a/src/views/enm_rm/report.vue b/src/views/enm_rm/report.vue index 4c3051f6..86f3f4ce 100644 --- a/src/views/enm_rm/report.vue +++ b/src/views/enm_rm/report.vue @@ -1040,9 +1040,9 @@ export default { let that = this; let query = {}; query.page = 0; - query.year_s = year; - query.month_s = month; - query.day_s = days; + query.year = year; + query.month = month; + query.day = days; query.type = "hour_s"; query.mgroup = that.query.mgroup; this.$API.enm.enstat.req(query).then((response) => { diff --git a/src/views/enm_rmbase/power.vue b/src/views/enm_rmbase/power.vue index 90bf3def..7ccfd086 100644 --- a/src/views/enm_rmbase/power.vue +++ b/src/views/enm_rmbase/power.vue @@ -454,9 +454,9 @@ export default { let that = this; let obj = {}; obj.type = "hour_s"; - obj.year_s = year; - obj.month_s = month; - obj.day_s = days; + obj.year = year; + obj.month = month; + obj.day = days; obj.mgroup__name = "原料磨"; obj.mpoint__material__code__in = "elec,elec_0"; obj.mpoint__ep_monitored__isnull = 0; diff --git a/src/views/enm_rmbase/report.vue b/src/views/enm_rmbase/report.vue index b1c23d11..d4a588fa 100644 --- a/src/views/enm_rmbase/report.vue +++ b/src/views/enm_rmbase/report.vue @@ -643,9 +643,9 @@ export default { //上小时 let params4 = {}; params4.page = 0; - params4.year_s = year_h; - params4.month_s = month_h; - params4.day_s = days_h; + params4.year = year_h; + params4.month = month_h; + params4.day = days_h; params4.hour = hours_h; params4.type = "hour_s"; params4.mgroup = this.query.mgroup;