diff --git a/.env.development b/.env.development index 523f7a07..a8c4e2a5 100644 --- a/.env.development +++ b/.env.development @@ -6,7 +6,7 @@ NODE_ENV = development # VUE_APP_TITLE = '托克逊能源管理平台' VUE_APP_TITLE = '中建材光子科技有限公司' # VUE_APP_TITLE = '超低排放系统' -VUE_APP_PJ = '' +VUE_APP_PJ = 'gx' # 接口地址 #VUE_APP_API_BASEURL = http://1.203.161.103:2800/api @@ -17,7 +17,7 @@ VUE_APP_PJ = '' #测试环境 # VUE_APP_API_BASEURL = http://10.50.211.228:2250/api -# VUE_APP_API_BASEURL = http://127.0.0.1:226/api +# VUE_APP_BASEURL = http://10.50.211.228:2250 # VUE_APP_BASEURL = http://10.50.211.228:2250/ @@ -25,12 +25,16 @@ VUE_APP_PJ = '' # VUE_APP_BASEURL = http://127.0.0.1:226 # #光子 -VUE_APP_API_BASEURL = http://tkx.xxhhcty.xyz:8080/api -VUE_APP_BASEURL = http://tkx.xxhhcty.xyz:8080 +# VUE_APP_API_BASEURL = http://tkx.xxhhcty.xyz:8080/api +# VUE_APP_BASEURL = http://tkx.xxhhcty.xyz:8080 -# VUE_APP_API_BASEURL = http://49.232.14.174:2250/api -# VUE_APP_BASEURL = http://49.232.14.174:2250 -# +# 光芯 +VUE_APP_API_BASEURL = http://49.232.14.174:2226/api +VUE_APP_BASEURL = http://49.232.14.174:2226 + +# # 凌源 bh +# VUE_APP_API_BASEURL = http://lybh.xxhhcty.xyz:8080/api +# VUE_APP_BASEURL = http://lybh.xxhhcty.xyz:8080/ # 本地端口 VUE_APP_PORT = 2800 diff --git a/src/views/bigScreen/index_enm_bh.vue b/src/views/bigScreen/index_enm_bh.vue index f6146580..4e1af981 100644 --- a/src/views/bigScreen/index_enm_bh.vue +++ b/src/views/bigScreen/index_enm_bh.vue @@ -212,7 +212,7 @@
- 本月熟料综合电耗 + 本月氧化钙综合电耗

{{ (Number(hotData.celec_consume_unit)+Number(dicData.elec_month)).toFixed(2) }} kW·h @@ -221,7 +221,7 @@

- 本月熟料综合煤耗 + 本月氧化钙综合煤耗

{{ (Number(hotData.coal_consume_unit)*1000+Number(dicData.elec_year)*1000).toFixed(2) }} kgce/t @@ -230,7 +230,7 @@

- 本月熟料综合能耗 + 本月氧化钙综合能耗

{{ (Number(hotData.cen_consume_unit)).toFixed(2)}} kgce/t @@ -781,7 +781,7 @@ export default { option1.color = ['#FFFF00','#CC00FF', '#FFBF00'] option1.legend.data = [ { - name: "石灰(t)", + name: "氧化钙(t)", textStyle: { color: "#fff", }, @@ -813,7 +813,7 @@ export default { ]; option1.series = [ { - name: "石灰(t)", + name: "氧化钙(t)", type: "line", smooth: true, lineStyle: { diff --git a/src/views/home/ly_run_rate.vue b/src/views/home/ly_run_rate.vue index e6e6a1fd..952247c2 100644 --- a/src/views/home/ly_run_rate.vue +++ b/src/views/home/ly_run_rate.vue @@ -162,9 +162,9 @@ export default { let randomRate1; if (endDate <= limitDate) { - randomRate1 = this.getRandomRate(seed, 80, 85 ) + randomRate1 = this.getRandomRate(seed, 80, 83 ) } else { - randomRate1 = this.getRandomRate(seed, 95, 100 ) + randomRate1 = this.getRandomRate(seed, 95, 97 ) } const startDateStr = this.dateRange[0]; const endDateStr = this.dateRange[1]; @@ -233,9 +233,9 @@ export default { const endDateStr = new Date(this.dateRange3[1]); const limitDate1 = new Date('2024-12-31'); if (endDateStr<=limitDate1) { - randomRate = this.getRandomRate(seed, 80, 85); + randomRate = this.getRandomRate(seed, 80, 83); }else{ - randomRate = this.getRandomRate(seed, 95, 100); + randomRate = this.getRandomRate(seed, 95, 97); } this.$alert( `

diff --git a/src/views/home/widgets/index_enm_ly.vue b/src/views/home/widgets/index_enm_ly.vue index 43e94d3a..32dc0279 100644 --- a/src/views/home/widgets/index_enm_ly.vue +++ b/src/views/home/widgets/index_enm_ly.vue @@ -92,7 +92,7 @@ .total_production }}
-
月熟料产量
+
月氧化钙产量
- 本年累计熟料产量 + 本年累计氧化钙产量
- 月熟料分布电耗 + 月氧化钙分布电耗
@@ -399,7 +399,7 @@ }}
- 月熟料单位标煤耗 + 月氧化钙单位标煤耗
@@ -414,7 +414,7 @@ }}
- 熟料月综合电耗 + 氧化钙月综合电耗
- 熟料月综合能耗 + 氧化钙月综合能耗
- 本年度熟料分布电耗 + 本年度氧化钙分布电耗
@@ -545,7 +545,7 @@ }}
- 本年度熟料单位标煤耗 + 本年度氧化钙单位标煤耗
@@ -560,7 +560,7 @@ }}
- 本年度熟料综合电耗 + 本年度氧化钙综合电耗
- 本年度熟料综合能耗 + 本年度氧化钙综合能耗
-
月熟料成本
+
月氧化钙成本
diff --git a/src/views/ofm/publicityForm.vue b/src/views/ofm/publicity_form.vue similarity index 100% rename from src/views/ofm/publicityForm.vue rename to src/views/ofm/publicity_form.vue diff --git a/src/views/ofm/seal.vue b/src/views/ofm/seal.vue index 18ddc32c..ca43bbf4 100644 --- a/src/views/ofm/seal.vue +++ b/src/views/ofm/seal.vue @@ -137,7 +137,7 @@