From 64bad7878049e961464e304429e2b153c9882e35 Mon Sep 17 00:00:00 2001 From: shijing Date: Sun, 4 Feb 2024 09:03:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=83=8C=E6=99=AF=E5=9B=BE=E7=89=87=E4=B8=A2?= =?UTF-8?q?=E5=A4=B1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 12 ++--- .../enp_blue/{监控设备.svg => eq_c.svg} | 0 .../enp_blue/{生产设备.svg => eq_s.svg} | 0 .../enp_blue/{监测设备.svg => eq_v.svg} | 0 .../enp_blue/{治理设备.svg => eq_z.svg} | 0 .../{环境质量检测.svg => hjzljc.svg} | 0 .../{序号边框.svg => index_bg.svg} | 0 .../{小标题.png => little_title.png} | Bin public/img/enp_blue/常规.png | Bin 1091 -> 0 bytes public/img/enp_blue/数据边框.svg | 6 --- public/img/enp_blue/环状背景.svg | 15 ------ public/img/enp_blue/直观.png | Bin 1235 -> 0 bytes public/img/enp_blue/秒计时.png | Bin 239 -> 0 bytes src/views/bigScreen/enpComponents/cems.vue | 6 +-- .../bigScreen/enpComponents/orgwryList.vue | 20 ++++++-- src/views/bigScreen/index_enp_blue.vue | 48 +++++++++++------- 16 files changed, 54 insertions(+), 53 deletions(-) rename public/img/enp_blue/{监控设备.svg => eq_c.svg} (100%) rename public/img/enp_blue/{生产设备.svg => eq_s.svg} (100%) rename public/img/enp_blue/{监测设备.svg => eq_v.svg} (100%) rename public/img/enp_blue/{治理设备.svg => eq_z.svg} (100%) rename public/img/enp_blue/{环境质量检测.svg => hjzljc.svg} (100%) rename public/img/enp_blue/{序号边框.svg => index_bg.svg} (100%) rename public/img/enp_blue/{小标题.png => little_title.png} (100%) delete mode 100644 public/img/enp_blue/常规.png delete mode 100644 public/img/enp_blue/数据边框.svg delete mode 100644 public/img/enp_blue/环状背景.svg delete mode 100644 public/img/enp_blue/直观.png delete mode 100644 public/img/enp_blue/秒计时.png 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 90d86b3d7188807133b6970660ea50e39f8b2047..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1091 zcmV-J1ibr+P)u=AL`m^vO>4C6w*oC#MFr%I7}56#1RPz33>%-oH!sMj+~GX7fy%?Bo1&H z2ZV&gb*cnH71pF>lZ(J{=7QMs!dv*rJgtcB+Fm?KEL?)zW06K z`<~6Y7nfYvg;D+LH;4h$^3th5=8!;K9(*s52oEs_cjFuQ6=ICoTOc72HTF$FP)}r~ ziA5bA5{NJY2ugtn`sqGN)~Rf<_MaUX0Y*XqDdCr4g8?Akm1JV4jJTL){yf_)&_m53S%fvAxXKyYG4zyl&c=;d^3 z_RSLOuA05|9~#o3mkSss>6No}sj#Sv`hvc#THwQq#ANx6Q&4jqpS#C<~dAB8<=H`w!vW zFHM{-KnR2)fMq17Or@D+P%Khhm*ZTv!%$|_pg{6+P-^n2B1s>8rz~WrbAmRXN7?Vh zHY{fRZuleL`nd%m5!wgr_3zgJ-|gJxp#OUrbr;Ml^0zO(f0?!aGVJD08z}cX@vMVZ zgdq^h2k6yvbv#SjNquMK(>vyR>X|cTw)tZ#(D6oI5i-*XFRR3rWS$fkHJ4W&n8Sx6 z&}*D;aZ1rI&Qqn=OZU>jGe-(CWXezAItg~Jbx{WMYS(Y$m7#0$P#yRo(*fvS{@{|| zi8ilF+Vi@(^4ULwI=JItZ(cCKJA|X}l^wcCY3=j6=jbZiUN`yl5yc}RaNfMLx2|kK z2!tZQXP;J5vuEbOZu=`omzVv1`VK0N$@IT-^75ZZ)puWfbzxb2WZ?CeWefScl!-@4+rl}XG4X6?&= z{ri*&BIKUULI{Mi0PcU%)o)k#UU#jAKc#46xxv~Me@;7Ij-VUM&0u7Ov12)2c`9vI zKdEBzLYvD?%pVSp{>{q1{U9l5qDK4)41PEfH#{2OO2qwhn_IGfg)U&7!cYJJ002ov JPDHLkV1i)D`^o?S 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 e37e77077bcda5d8b6c895db0d69ca3e3998f35c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1235 zcmV;^1T6cBP)p#c(HIG}CP zE+8>+098x_E|VrfQ8}Q|34z86>BgW z-`DT=`@P?LG4axkMg!eq_+tJNY6FJ$h6eOD0Rq~^@U?&t8)|ci;JKMG)W%S#NhpFK zPzzBSD>1nd+TMlQUO>|>WaQ<9D|*mRhY$vz&WKZ=<)m3;5-b6_@mWa~MYW-#CP}*} z?uno?vSk8*iA6;?mZ@Z*&65NP-<1uDIoapwjXG>B!T?)<&O?5O=f%6&gp)wjM%|)n zV%64SSr9)Ka0J14XoFjzO~Nt(lcFN(?V?vWHHzR{B|1+ zPj|i4`Bc~$czOpDM=b(7h&wbtez(V+jyT9w{v36Z^zjszY^CvlB`yS;(WyRn|3p=- zK%doC1b2hlD3-=Rnk9L($!wR?Tg{yYH8SRMoAk^tYZ3d2*mPVe(cR}k7@{OGJKBv>2$?W|Hc5Td=v1g6XBx9{cR zg0}2s%_T+(wfX&>G{0Xv`o>s_-oe=D-RGstFb~}A%zfVOL!+fkzt_%WMdhCxi!K*Q z-``>9K>#ud)_DMo&x-Y$af~3;1_;pmumTs0vT%CP)5X~d^7ARF7-vcB+Xx-3EHqwG ztD|$WVEkMuuiOvmymLjkv6H9RJzhIMl9vU2++zrCvtX^jk(4W3QR@F$k!lxR>KQF? zk94z++>d8wiJXo4Iot_W)eECHu7i@Bf6O4T^F+e@*}bTL8W7{tM| z2_^_t;45iY@XcQ;IT$;dc7-{LpiWFI7M}ZI;SXd2ECKrhcD~O;t~$I!5U-tgG_{<0 zh!-v`TzjjZkAZ;K`?&B}Nfrh>{@xEDL%FpW`S7|}M6DDssBJ=zN1dLCc5MO%+%AYy z9LXN<=fhu3OAB{vndVT`(fQ~|Y5eMF 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 @@
- -
+ +
水泥有限公司
-