diff --git a/.env.production b/.env.production index 99b4cf20..044b8b92 100644 --- a/.env.production +++ b/.env.production @@ -4,19 +4,19 @@ NODE_ENV = production # 标题 # VUE_APP_TITLE = '曲阳金隅安全智能管控平台' # VUE_APP_TITLE = '托克逊能源管理平台' -VUE_APP_TITLE = '中建材光子科技有限公司' -# VUE_APP_TITLE = '超低排放系统' +# VUE_APP_TITLE = '中建材光子科技有限公司' +VUE_APP_TITLE = '超低排放系统' # 接口地址 # VUE_APP_API_BASEURL = http://222.222.144.147:6013/api # VUE_APP_BASEURL = http://222.222.144.147:6013 #光子 -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://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://1.203.161.103:2800/api # VUE_APP_BASEURL = http://1.203.161.103:2800 \ No newline at end of file diff --git a/public/img/enp_blue/监控设备.svg b/public/img/enp_blue/eq_c.svg similarity index 100% rename from public/img/enp_blue/监控设备.svg rename to public/img/enp_blue/eq_c.svg diff --git a/public/img/enp_blue/生产设备.svg b/public/img/enp_blue/eq_s.svg similarity index 100% rename from public/img/enp_blue/生产设备.svg rename to public/img/enp_blue/eq_s.svg diff --git a/public/img/enp_blue/监测设备.svg b/public/img/enp_blue/eq_v.svg similarity index 100% rename from public/img/enp_blue/监测设备.svg rename to public/img/enp_blue/eq_v.svg diff --git a/public/img/enp_blue/治理设备.svg b/public/img/enp_blue/eq_z.svg similarity index 100% rename from public/img/enp_blue/治理设备.svg rename to public/img/enp_blue/eq_z.svg diff --git a/public/img/enp_blue/环境质量检测.svg b/public/img/enp_blue/hjzljc.svg similarity index 100% rename from public/img/enp_blue/环境质量检测.svg rename to public/img/enp_blue/hjzljc.svg diff --git a/public/img/enp_blue/序号边框.svg b/public/img/enp_blue/index_bg.svg similarity index 100% rename from public/img/enp_blue/序号边框.svg rename to public/img/enp_blue/index_bg.svg diff --git a/public/img/enp_blue/小标题.png b/public/img/enp_blue/little_title.png similarity index 100% rename from public/img/enp_blue/小标题.png rename to public/img/enp_blue/little_title.png diff --git a/public/img/enp_blue/常规.png b/public/img/enp_blue/常规.png deleted file mode 100644 index 90d86b3d..00000000 Binary files a/public/img/enp_blue/常规.png and /dev/null differ diff --git a/public/img/enp_blue/数据边框.svg b/public/img/enp_blue/数据边框.svg deleted file mode 100644 index 5e8bda12..00000000 --- a/public/img/enp_blue/数据边框.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/public/img/enp_blue/环状背景.svg b/public/img/enp_blue/环状背景.svg deleted file mode 100644 index f2461284..00000000 --- a/public/img/enp_blue/环状背景.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/public/img/enp_blue/直观.png b/public/img/enp_blue/直观.png deleted file mode 100644 index e37e7707..00000000 Binary files a/public/img/enp_blue/直观.png and /dev/null differ diff --git a/public/img/enp_blue/秒计时.png b/public/img/enp_blue/秒计时.png deleted file mode 100644 index fd4cafd9..00000000 Binary files a/public/img/enp_blue/秒计时.png and /dev/null differ diff --git a/src/views/bigScreen/enpComponents/cems.vue b/src/views/bigScreen/enpComponents/cems.vue index 36b080f4..81799288 100644 --- a/src/views/bigScreen/enpComponents/cems.vue +++ b/src/views/bigScreen/enpComponents/cems.vue @@ -5,9 +5,9 @@ CEMS监测清单 -
- +
+ diff --git a/src/views/bigScreen/enpComponents/orgwryList.vue b/src/views/bigScreen/enpComponents/orgwryList.vue index 287c5645..5efa2692 100644 --- a/src/views/bigScreen/enpComponents/orgwryList.vue +++ b/src/views/bigScreen/enpComponents/orgwryList.vue @@ -283,6 +283,8 @@ export default { color: '#fff' } }, + legend: { + }, tooltip: { trigger: 'axis' }, @@ -308,7 +310,7 @@ export default { }, xAxis: { type: 'category' }, yAxis: {}, - series: [{ type: 'line' }, { type: 'line' }, { type: 'line' }, { type: 'line' }, { type: 'line' }, { type: 'line' }] + series: [{ type: 'line' }] }, eqs: {}, eqc: {}, @@ -425,9 +427,19 @@ export default { newOption.title.text = that.eqc.name; newOption.series = series; myChart.setOption(newOption); - myChart2.setOption(newOption); - echarts.connect([myChart, myChart2]) - }).then(() => { myChart.hideLoading() }) + // myChart2.setOption(newOption); + // echarts.connect([myChart, myChart2]) + }).then(() => { + that.$API.bi.dataset.exec.req('eq_status', params).then(res2 => { + let newOption2 = Object.assign({}, this.basicOption); + newOption2.dataset.source = res2.data.ds0; + newOption2.dataZoom.startValue = that.biquery.start_time; + newOption2.title.text = that.eqc.name; + myChart2.setOption(newOption2); + echarts.connect([myChart, myChart2]) + }).then(() => { myChart.hideLoading() }) + myChart.hideLoading() + }) }, } } diff --git a/src/views/bigScreen/index_enp_blue.vue b/src/views/bigScreen/index_enp_blue.vue index 85c18221..f42a5920 100644 --- a/src/views/bigScreen/index_enp_blue.vue +++ b/src/views/bigScreen/index_enp_blue.vue @@ -2,17 +2,17 @@
- -
+ +
水泥有限公司
-