From 4639ebc6cf0e1c96f6f823a4ac7e98bcd761dbf6 Mon Sep 17 00:00:00 2001 From: hyh123a Date: Fri, 22 Apr 2022 20:38:41 +0800 Subject: [PATCH] modify the i18 --- myems-web/package.json | 1 - .../components/MyEMS/AuxiliarySystem/1.svg | 20 ------- .../MyEMS/AuxiliarySystem/SvgSystem.js | 50 ++++-------------- .../MyEMS/AuxiliarySystem/meter.png | Bin 3448 -> 0 bytes myems-web/src/i18n.js | 3 ++ 5 files changed, 14 insertions(+), 60 deletions(-) delete mode 100644 myems-web/src/components/MyEMS/AuxiliarySystem/1.svg delete mode 100644 myems-web/src/components/MyEMS/AuxiliarySystem/meter.png diff --git a/myems-web/package.json b/myems-web/package.json index 1e668cab..ff9db428 100644 --- a/myems-web/package.json +++ b/myems-web/package.json @@ -56,7 +56,6 @@ "react-es6-progressbar.js": "^1.1.0", "react-flatpickr": "^3.10.6", "react-hook-form": "^4.10.2", - "react-html-parser": "^2.0.2", "react-i18next": "^11.7.0", "react-image-lightbox": "^5.1.1", "react-image-video-lightbox": "^3.0.0", diff --git a/myems-web/src/components/MyEMS/AuxiliarySystem/1.svg b/myems-web/src/components/MyEMS/AuxiliarySystem/1.svg deleted file mode 100644 index 456f9488..00000000 --- a/myems-web/src/components/MyEMS/AuxiliarySystem/1.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - Ａ - - FFF2 - - - \ No newline at end of file diff --git a/myems-web/src/components/MyEMS/AuxiliarySystem/SvgSystem.js b/myems-web/src/components/MyEMS/AuxiliarySystem/SvgSystem.js index 30c9f172..30b4a71c 100644 --- a/myems-web/src/components/MyEMS/AuxiliarySystem/SvgSystem.js +++ b/myems-web/src/components/MyEMS/AuxiliarySystem/SvgSystem.js @@ -20,11 +20,8 @@ import RealtimeChart from './RealtimeChart'; import { getCookieValue, createCookie } from '../../../helpers/utils'; import withRedirect from '../../../hoc/withRedirect'; import { withTranslation } from 'react-i18next'; -import uuid from 'uuid/v1'; import { toast } from 'react-toastify'; import { APIBaseURL } from '../../../config'; -import ButtonIcon from '../../common/ButtonIcon'; -import ReactHtmlParser from 'react-html-parser'; const SvgSystem = ({ setRedirect, setRedirectUrl, t }) => { useEffect(() => { @@ -45,21 +42,18 @@ const SvgSystem = ({ setRedirect, setRedirectUrl, t }) => { createCookie('token', token, 1000 * 60 * 60 * 8); } }); - let table = createRef(); + // Svg List const [svgSystemList, setSvgSystemList] = useState([]); - // Svg Content - const [svgSystemContent, setSvgSystemContent] = useState(undefined); - const [svgSystemContentDict, setSvgSystemContentDict] = useState(undefined); - // Query Parameters const [selectedSvgSystemID, setSelectedSvgSystemID] = useState(undefined); - //Results - const [images, setImages] = useState([]); - const [spinnerHidden, setSpinnerHidden] = useState(false); + // Results + const [svgSystemContent, setSvgSystemContent] = useState(undefined); + const [svgSystemContentDict, setSvgSystemContentDict] = useState(undefined); + // Init: Get svgs and set the first svg useEffect(() => { let isResponseOK = false; fetch(APIBaseURL + '/svgs', { @@ -81,7 +75,6 @@ const SvgSystem = ({ setRedirect, setRedirectUrl, t }) => { .then(json => { console.log(json); if (isResponseOK) { - console.log('svgs', json); setSvgSystemList(json); setSelectedSvgSystemID(json[0].id); getSvgContent(json[0].id); @@ -96,12 +89,11 @@ const SvgSystem = ({ setRedirect, setRedirectUrl, t }) => { const labelClasses = 'ls text-uppercase text-600 font-weight-semi-bold mb-0'; - let onSvgSystemChange = event => { + const onSvgSystemChange = event => { setSelectedSvgSystemID(event.target.value); - console.log('onSvgSystemChange ID', event.target.value); + console.log('You Change the Svg ID', event.target.value); // Get Svg Content getSvgContent(event.target.value); - }; const getSvgContent = svgId => { @@ -125,9 +117,8 @@ const SvgSystem = ({ setRedirect, setRedirectUrl, t }) => { .then(json => { console.log(json); if (isResponseOK) { - console.log('getSvgContent', json.content); setSvgSystemContent(json.content); - setSvgSystemContentDict({__html: json.content}); + setSvgSystemContentDict({ __html: json.content }); } else { toast.error(json.description); } @@ -156,13 +147,6 @@ const SvgSystem = ({ setRedirect, setRedirectUrl, t }) => { console.log('svgSystemContentDict', svgSystemContentDict); }, [svgSystemContentDict]); - const showData = (e) =>{ - console.log("showData", e); - } - - function test() { - console.log("Hello World") - } return (
@@ -199,21 +183,9 @@ const SvgSystem = ({ setRedirect, setRedirectUrl, t }) => { - - -
- - - - {t('Data Show')} - - - - - - - - + +
+ ); }; diff --git a/myems-web/src/components/MyEMS/AuxiliarySystem/meter.png b/myems-web/src/components/MyEMS/AuxiliarySystem/meter.png deleted file mode 100644 index c0d6f7b6fb94a5008367e937d3d8982d758987b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3448 zcmZ8kdpuL`A76ACrlev>Zgcq-a<|E?xvt!qOCrOtZ-(42tGEGXZy`J-&^Ll-rbDs10yg%>v`=mP9SqTeD3W7i&VU)GG6EM31 z<0AMVaQ=EKi~&shBakQ;FmMpS{&#_UiAW3gNaxUi$QVpG78Do~ipQ!&_=RJ!ArV2L zkw5s`jDeuje}l}zv6x6)Xo#!}4vz)7L}6t$;Ig)ua9J%4EiGA1gn_ocfv&!+nX^kB z)@};~g1kqWpLdC+e!G0#291T@{J0wTS^m~x3uD3eO2T0Z|749)>y$buyN+b-3-e(N zil=VlZw0Gr_IuaL#@72)?#%)XLn)Y%`UAa|PhFLSqFl`h>+N4=JD3|SKWa>VokAoM zCKC>Snh#Cb`xM@v@OU+$U?Z+zwPj#i1N4MbD?LmQ((s%-9slHA6KJ*_q1-lYzq7NW z1BY9inVIeX59(JRyW*RcmR5vikuytiub~QEY(hH0`5l4|vSGA%pS`{@74v>_(nd{9 z?HB88n}eI1_$I-a&y*UmYV1Ky)wFD`b`B5MDk&=)0Ya^KV>M+_ywOY=O(-o`Ph3yW z8U~V-mM%Hl_9x4DbMBZy)Ys#}!ory%9WAb4OjhX8Uj{gkbrviOJHDi^r$-hP6yy$B z$&}dU=>glB-lq3H*cCG ziA1c#Kj_f(MJ#-xKCP)aQc_al-V&<`L)}tkH9nAp>9N~jDEC$Z;_ylMf9>t(!}=Gf z{#JKSAYU!47Sd>f0s;bqI>HQ9j@^8uEgD^1T>PZ5aeY*IR0DFE8Gj;AKQ!80JCFnQ z8;p|9FxiF2$H)6XyQuerrRYd7ST1blwLqmioiD9O73`Y|PAf7cV~a~miz+H`c5fT* zxp!(TZ}Dn6zeSrlX2&V72B_)jiRtR1A&SP4q$=fOfVQXB+x^eXhAcifi~+-Bpm z&u%=o9gA{tbIar1&IhLgPlYeQZ~TE@R?qQktx#nJMD%XlyL!bzx5qDBjt_>J%z#AP`KOS^lfo zPmSH%*^t&fMBSu z1Oky&S3gXn86YcZv~r*|9ms^7an-cYEg%lO-rUGc$8J*05h>8>r8@X6tfVT4`yil)u-N`dyhh4Dmb}tD~cn zOX)*cd3i~@priaP|4F+gbK|!h%(tw8?&akbFp)8JAC}5sFjSP47rHV)Xg4?e*i+RU zrh*m8eQ8G_!w}ii)6>Wj%dUC)RG~hh?4|5;A9(W2jIY!2H?U`IZ3V5rXVUY$rw0d3 z^Yin~Bfq_g@+vDTlD86b1LH;$G;>C;XM~`sNs0>y6Tu1FU^^#J+ z`<%K*3X6+h7h#x8W_DiQ#fJ|cmd^JwY}9koPoFtcL8GPl`ue`(4NwtgZZ+PzJr7~2 z(LX-opAkVpLq!&aeG`j+*crxKZ(U7X$=J$E4ZRG7UPSlR8fJjfjireOq0Y|E`2b&y z=)sAJv=7hR%+P3{@(hL+D5)#{(Tfeq{pyKGN$*9y`Z7zGvKYW9X?>r;@AVasR+TPaPjZY#2>K4kdcr zqWzAr)Zq9y;xl${Z-dQ-IypHZA7hD{L6ke%f&K6@I%sfYgujU+O-9_uO8jV9C6!zO z)I!b>{$VGrNLE+(1Yi-IOT7i^*@vYX*HU&aLa-n7Z*=4=T-vJ3@ES|r8GJC;QBX? zKBlYz;DFKFZ=l+?oe={@hib;o;asD`93d7GE@%rszo)CO`TiT@S%im&Td!Xji@Mwr zJ2dkkIwr;s028K<4~@>u$w_(q_%TX%<9&s*9A2;5>!nzt>8tT?KV$)!jN}ehW=Lpu z)yA#P3#5;J?o2UL`n5Nrr=})cRaLdTNf3MVvbi|`|8JyMH;_g%rO46Oe6LLQ{@e!4 zf``Bvl&JCU?^yxkAWO?TYOR`n5Fjsr%6DhTG(mi9ZTpD2dd~;3{{HN&{|tF9oBGp) z2i~!t4`@OBEXP<3n}qcxx_OV`sUy4T7zMd!Z_d>Oq`X(mRjkBmaCBVbz z=zV~b0dCR)T& z0Q{=w2#t@A|JBY)N|%3F<#)0OAK-{p&Yraj4z7$NT~)8wai5iyliLSS7EpQ8@q}DK zl53g}C8fXLE}KmD?a5Lk9eak8bggtx{P{B+Fav!RWKuUZ`xAe4=H&ErMsM#0e=Jr` zOKX^n3?yoro14qZ%ku#|SzcXz7{Q#fdxsjbmS-d#+Bf(nUA&^OFwyR@A?j}v#4){R zsK@+>Ng@G!lfQ#s%fe9ds4Nu&1Il;ihIcQE_4Lml!X;*WLtG!h?F&`gSJ_NsvyZnn z3}|I}Rn@%-4yU4~CS!MtclKwjVZd4+mm8Fpp8hl`X@4`X`lX7IQNC;SWt4gj3wEuw z=VV5lV)SVnrBS4Oh=FQ(TKDX=GnsISkQb6uO@blEcq0ElcKKZd(*w# diff --git a/myems-web/src/i18n.js b/myems-web/src/i18n.js index bdcca5aa..bc44a1aa 100644 --- a/myems-web/src/i18n.js +++ b/myems-web/src/i18n.js @@ -46,6 +46,7 @@ const resources = { 'Tenant Bill': 'Tenant Bill', 'Energy Flow Diagram': 'Energy Flow Diagram', 'Distribution System':'Distribution System', + 'Svg System': 'Flat Data Show System', 'Fault Statistics': 'Fault Statistics', 'Space Faults Data': 'Space Faults', 'Equipment Faults Data': 'Equipment Faults', @@ -845,6 +846,7 @@ const resources = { 'Tenant Bill': 'Mieter Rechnung', 'Energy Flow Diagram': 'Energieflussdiagramm', 'Distribution System': 'Vertriebssystem', + 'Svg System': 'Flache Datenanzeige', 'Fault Statistics': 'Fehlerstatistik', 'Space Faults Data': 'Platz Fehler', 'Equipment Faults Data': 'Ausrüstung Fehler', @@ -1655,6 +1657,7 @@ const resources = { 'Tenant Bill': '租户账单', 'Energy Flow Diagram': '能流图', 'Distribution System': '配电系统', + 'Svg System': '平面数据展示系统', 'Fault Statistics': '故障统计分析', 'Space Faults Data': '空间故障分析', 'Equipment Faults Data': '设备故障分析',