From e4fb05c1bf44f4fb11c2e0b1081bbb5e865e865c Mon Sep 17 00:00:00 2001 From: fan Date: Wed, 15 Jun 2022 09:18:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E9=93=81ctc=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/ctc_icon/camera.png | Bin 0 -> 2358 bytes src/assets/ctc_icon/link.png | Bin 0 -> 960 bytes src/assets/ctc_icon/panel.png | Bin 0 -> 1013 bytes src/assets/ctc_icon/setting.png | Bin 0 -> 1236 bytes src/assets/ctc_icon/shutdown.png | Bin 0 -> 1414 bytes src/assets/ctc_icon/t3.png | Bin 0 -> 953 bytes src/assets/ctc_icon/train.png | Bin 0 -> 1284 bytes src/jmapNew/theme/datie_02/menus/index.vue | 223 ++- .../theme/datie_02/menus/menuButtonCtc.vue | 1541 ++++++++--------- .../theme/datie_02/menus/menuPanel.vue | 302 ++++ .../theme/datie_02/menus/menuSection.vue | 1 - src/views/login/register.vue | 12 +- src/views/newMap/displayCity/lineBoard.vue | 752 ++++---- src/views/newMap/displayNew/menuSchema.vue | 111 +- 14 files changed, 1616 insertions(+), 1326 deletions(-) create mode 100644 src/assets/ctc_icon/camera.png create mode 100644 src/assets/ctc_icon/link.png create mode 100644 src/assets/ctc_icon/panel.png create mode 100644 src/assets/ctc_icon/setting.png create mode 100644 src/assets/ctc_icon/shutdown.png create mode 100644 src/assets/ctc_icon/t3.png create mode 100644 src/assets/ctc_icon/train.png create mode 100644 src/jmapNew/theme/datie_02/menus/menuPanel.vue diff --git a/src/assets/ctc_icon/camera.png b/src/assets/ctc_icon/camera.png new file mode 100644 index 0000000000000000000000000000000000000000..a9a52f3343dc3cf15005cc6a05f78fd25a744086 GIT binary patch literal 2358 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 literal 0 HcmV?d00001 diff --git a/src/assets/ctc_icon/link.png b/src/assets/ctc_icon/link.png new file mode 100644 index 0000000000000000000000000000000000000000..9b772658f5c0e5c20a5e5f7e77b88827a8f70f64 GIT binary patch literal 960 zcmV;x13&zUP)Px&dPzhXlnUOp#{ z0)`DKHthVrC8;*17`t<0ndk=u8YNDR=3??GPu>-18P`_YA)FxrDi~|L$OYz2LzS^t z>A19EfF5~anD7~lhp?$9Q5F5<6`y{dmjT%f?;zkRzzzA3relgRkmY9JE0{YIm9bl1 z@AEX!Y==*9io0@%Yyj`TcmwA5ep(0>v<^)50M`Q$om>puOGx^@g-k4HKrywiz-+q^ zQ9l@6zeVfy2=$G7Wv7tmP2VHcLQS$kfN&mw?7)s0l0J8xWdi0kAe-7t0vfYK1UeO$ zq8ADgRcvgtsa<2B-GPr9lD^lC&((lzY8MGOIn$FV))JvutXM(C;1rImg=Kx2)j<0b zp=fU|*Bk?~8CD1!p8+yoPE^K@7bC(iCim-AAqpD@>A_nkuZscgF#+2%K`#tR-|Sb2 zAH0%OZ-D5?6bI3uAx7KgH6WXNwh@FUnc!bwZZjnPsUHD;u{&9<6D)cTV8xUNn_J^m zv7y3D-Osh)#CXEO%w7-ICGUjaej6)Suf%m*@D-G-!hxEg3S!y^pdl6lx+NP2e= z0{n6)rg|En&Z!E3p2el;R`&{6+6OS|+)CvX(ZrEz(Xx&bIOJDc8qc7~Kcd|;-`*ly z+Ad=BPj?1B8lt{_J_F-mR8NtL_NoN+jk*bxO|_dq$AS>=5OO6h>8_lu9A0f({4HbP zry=Ugd>K$o?Gk{QJ`BjnKfUebEW|)wEfnEM<(Or)16&o1c$$#JiR%M2FzH(Hd|RmW z7jdb7MwjA7rm(hwY>Y6Y#&aV}2gv3U8zs!}eSoJYQLj;A+Q1ST=4|yaQgk!Bu=5(` zGF4dgaavBQhluEQRy?Qj9H+B@#XQg`Nv#(I=TWk-15MV%A{{Byo8-)_1E9DgW!6MV zAL?h@sf4dpvL;IUVk>t(DaotFV1~BfSv+s%f`4VOjAaAC=Cg3Nas>*{S+Iz51%l0I i;cVp!6rQtS5q|;o+1x+~FUoTO0000Px&uSrBfRA@u(nMr69Q5eVn6O%Mc%{JCjYOOT1xPWojo1mZU>ajt{)A6YG<&Kftt^N-EOyW95=68LY+?M%VKL6Eg`$zeg(jZYKa%t zr6}sY!{OLhNJBw@-rn9WrBeCncS8-!f|>VcGPLS65-DYNnp*!8shEl=Gtcu|2L=Y7 z{LQIkfbGEmHckJ)`{wz0u&4uq@KZZp!=h(!YiJopy)v!;jAfytucV7z7c3 z10FXz<8g#kDqOX8quo3s0tn;ro5grMx)|2YKJg=r5$9^erkaRA5CLdq7%ZKMiWvxM zG@`JL)*#x=F;V<%8Fg>*AR5#oFh&y*FE}9rKuk>uj!FVJ+jnw9B$0MCsgnw%n0$)8anrJ+{>#RS3uinov(+fr6Wd|7chJ=%f(511t!<3Cy z=6iV~nn)p@Okk&VLDsPB0Oy{1#Kk%d8th+@iJCA3fMH)mGJ%5P@HWiijLm``gSr*~ z!Wj02B>}Kp8qY$UIQP<8y0QT72$L1L#E>~!NF6-SBPeWEbFO6aZOdLlQpM)ai$+37 zGI8jejYVD5B*0|Q553+1g+ehWf6W0*_`bkoDO@rYFQGeQli4-%yO2AQ%KnyOS&U7` zVb&G@Z?LURhgFu`oU&&?N*hh{JjP>bOfZ>FQ*4}HP1g!Qrj0Ue8m?&;Ms@Le52rG4 z6$dC3O`$~wgnFl2<_dc4b)i@+f|+mx29x=p#0$n{-vjvyzX$zLsWnhH$$O|3BCRNZ z-#ZQq-TKc_|J^~^0s5c&pa2D)OTxY~C;rBVFdq40Xwyo28#$3+MctRzFR1KU=1`sIiRaqg(E$=bImNkI$HW(crnFPE(1RIN6-t~ zyC>yN}-U})Jv_GB6dfQ_mzIdR0ci7T{f;+iHB6C j!$t;V28{Uhy3fEbtN(LPh@c3U00000NkvXXu0mjfl@-_j literal 0 HcmV?d00001 diff --git a/src/assets/ctc_icon/setting.png b/src/assets/ctc_icon/setting.png new file mode 100644 index 0000000000000000000000000000000000000000..c430b609afc9684b36805bf5bfd7609eac604a77 GIT binary patch literal 1236 zcmV;_1S|WAP)Px(j!8s8RA@u(SzTxxRTTctG!?9+;7e5$MM3KC%x-N#5ut)MCYjCNi3HIHwNx#x zApW!!pOWH(0i&2y#GfEhAB?GXXOp{WTF?|MEt*I&TapKhQfTqPhdyW}#$@l2jcwfQ zX0mr?Hn9uc$Jy`u&iU@S_s+R@2sQqr8qXh>4gB8~j8uW`2fd9~kV+AZyA{#zAoX1~ z8T-V~RCDI!HF;LMiEt-@&oI-d6jo1^K?r4_wSRK`^xAw1P$>}IRFc5gYp+BqU2pwX z{M>fO8v)}@0A>k(gqXSq9n%eCB#?o2W@BvNWD3kF0Jr-FBpL;)x21@E*)lwJ-QUwQ zyFfrZ*5;Z`7NMUZMWdld0FdwY0fs8i}XNC2Gj*k8m%6Oe%ys9G_6~o~DSrL0tM@Qd)>kR-%=!izg&=D!jdL11t1C0mA zA2tl*h>l>@FobrQwDwift7yPZkGEHPi&hE}`hUV+R`hMwF@N;aC^OL5KY6WDH~TaU zqaNT}0bCzA0m7e9JjDj(h}$YIk8cARBVhw5g@&OPYj`=no$=bh(C&3g zwG^uzLr%Q+;`2onNVpRn40hR_05tM zC_J>?+;M>K3u}V0lC1>wW`((na}!{d0drcm zZ1zfHE!$2fzRKOkbzC@wJrlMf5qLi_p)H%V`j*qEcpfN_n=-jpV(yQSOfV|ZUr_l5 z>BNs#B5E0!UmI!f3u6~kNVwtN5jshfW2i$4^K~8WC29aYQdrMc z)xhdrEz$~HY^~zmCm75l5ek+aGX6Vf4qV{0Vps+f1INApO z-AV)95zR2@3nFX=bLnR#pWNsiIKO{IK5$%&*qHGiA;ud7Z1J6!MDNb3eAloOKV85i zTyHl6Z!J5bMDM|<>z0W-PU(z%QMH1=|HCHI-cBa$0kCP2g3l)+J3X--L>&O)i|~X# z7}PBj=7}(w1e!vn0UCx*ZCEpN{uPk1m59$m;n<)P``j;)#NgOEo?ElGfCsBlCOVN7 yvBO~!k6eK$L95A)RDo(H5?1T7fv_W2E#5zi`qV&N7-84|0000Px)KuJVFRA@u(m~DtuWfaH%=gz&)?5d@rerRp(tS`HBXZ=vxQW+!)^&to?dLzp+ zqQXG3A__9oUWhEiY6Y+(;b)0>vqre9Jtg;4(yj=QoR4sB(D)8SOVwloy+_2`+EdaF0y0_v+cd5t z(DMN9xu|m>B;>NT;}|TbTM@uE#YO^N_D&*bx5S)*ALlEnoKqNJPa~VBFyvsrv(?(>#ju@+n=tFNg#~oQLDfRoXT_|A+2SB7) zLd@64(wScy0g#O9i*u~0K5$3ca-`{BLZxnqHGsnau62#{Y{;D7+n;U(!10#m zNLJ6Ol6J>$mLrS(S-uBKcA*gQqPA28cm@ZSA*S&n?DK>&N0P+W0lek7jGeB=v| zoZWnNE|e?QJOO9V=`z~+JI;Qc%w%2sS<<9OG$C)QRKC8SRk}@M6@zvTOIudX ziuJ;KN2!^?Zf$C%eEvkKqdepOjWe%wu%#x{VS8V14nC9!n&=b9tG@F`w> zLiv1{FXlB?I`Xa{Fj^r^0SCDAtxVY(a*BopDD#Ty22@ z0Ti}Y(|C(OYs)ya!MwehGP|P=)J?YP=$ebEQ!>U%P{E&Pt1M3a#&YC}s*cJ%X#6JG zrtvs|-mPGBju`5}{h6lmG0Nzt&!GP=WjhVcGuX(^WYF9^V+8@r8JJqu4`Z{Hmd^zV zUfBfBfa_3Qu+%%Xbax6WSjmonBLKe{b2927A9#!yKzUZRo0Z}j0@P`J>97kdJH)V$ zfvvibTSn7MqXKZ{FPzx?7*O~CTzmut;UK~HTsiY!Dx#Dxpe_)jp0~ZYdG2 z0Z}U$tw7;VjUEtsz}y3(u243#ukBR-$)G{{+0~SRu?V169}@tzu3)Y6FZ&Gq53Ifz UPx=@z82|tP07*qoM6N<$f&itag#Z8m literal 0 HcmV?d00001 diff --git a/src/assets/ctc_icon/t3.png b/src/assets/ctc_icon/t3.png new file mode 100644 index 0000000000000000000000000000000000000000..59343058a0ad8e4dc24d40a678060f52e180ff96 GIT binary patch literal 953 zcmV;q14jIbP)Px&b4f%&RA@u(nN4UDQ4q)fv)OElrGlU+#cX@9?#6o23R(nh!J>$Q#ScUe9@Im% z9z5v9gNk}p5&S^KlOS3V!J;CF1;K)}y)}upLbGWrs3#HaZsLx-wTUs^)~eeiTe6qZ zyxlkRd;ghvv-=1>zsTqQqYO}N1!u1UJ=K^~DJ#b%US`;ou7pHG#QHPo|p7 z0EJwAVXLfwTjm#1g|Y%}3d9!6P18|9u1NRQ4dQd=-hm~Un>Is@AZ`Rxw;VFNbI0B0 z^jv|ss@w*!cRBzB^lOH-T-+P03AGdRaRA|*XGa;hF;$p)4iHm=mk4xZIshO%)Du=~ zOjS-1a5DQ0bC*-wvlm^{4YREv3gjCR;Y5=3!rAz2yE!tP?#jI)E0XXr$SZ>N!CgW&a zRbl{i3AA;oVRn`zz-0Lntqrb`Z0Z){6(m>JCceJ+4ZxeQvJHf@;$?}5+O>pvxg?W# zLeBiGNC%yE9e78~=iOpI8)7rvjsB?$O#<+%qyl|pbDK7tdhH7ZoTOHR4FI(eVLcd| z0Qy9PeOkhN?3*0OsX|WyYy|K|H!R(E0J*y~vAs@9reEel6n!ImtA@5Paif;7PPoN* zG_35F2zSJo4LZ8aFfW!AKs+4$0HOsTx~eD4LlZ(oRqg|DUe=lHwUI*a5_BU%q{YQK$DFD&5*}%Q**FENs06K`M znSn^gS%S1dGsd15Jc)&a-+_K%ShlHd$*?(??}P(Ed;p9+3|g2s-oa#Fh$PZZOHptD zVNf_I{<^ipzlFnmRB?se017k&z@y)7>Wz$;Z`~Zvmf4x!iKjB|#n_A|u@_F36>zD| zPx(zDYzuRA@u(SzBlvWfcC-WVa@wv_ids+SJT87DZDK5|Y{26hTZ(cec8U_CdtU zgNlf^dU-Gfkt$Wuf)CY)fLf&0>}+eiqN&MjO(CTUN^JJuCN)Yy3n~&@-RvBhZ8n{q zZf5@OZc>6fFM*x!eCK@U{FgH)ghl?)B99;cF98GHhn5EeHC@D5!=M`gZmLWL>01JS z&4h!Q>1=<;p2lOcywVjIjEege#Am(Gu zP`mv2d!A%lB=LB7=Z?I1ol=Y`%m>ED=VR8 z8(UWP&i37n?^k=FvQt?C0TEzvh4w)8B9pAZf?i}pk+EhF)y>tf7mL}9h&z~gi9+;Q zTU`Csjae`OW>oZn5j}Zi%YAN|y7&UXjWagmT9c|$4_QtT3nCz?ry3X}9FBj}4D}+f zRWcGwFFldrKb#n5t0kORwSU0{*bYryj5{WEdo@G#y{S!I`~~2=e854X#^!j#*!&2H zitoX=I#157k%}2fcS7MPGyhUU%81_(DknOUx(}d7L0n6~J8eeD9u&+z!?zy3b~bnFZ6Rs0&Jt9XevfbJ7t0?6=S#S4ErQ4%%^+Lo$(&X8<>&w zT_ApM?f_>R_fi$ucFcg?_~aj^jas5%haaW%lwqjr$OTF;vxR{N{7B1rPr!C76MQ<{ zzv6cp9%%tKnW+nVW_h=hn1Q1N9FlS7#1L>X1FPM3OjdU|zRL4|0xljo*XH`vMkw^I z3oUAuK)cuc-itjM70)r_1sCQpDayLGzAKN&L?%^%eX+?p&ir%0oiU3!)}9D`klXBf zYORdJJSN}#nR@zdfbT7|{(UE$K?&0!6F19l8xSyk9 z?+Mt{W~eU@=%e*PEcpuHm9sd)4_aKk#*f!mz+fzOp^_nY&)%sS>L)Wx=d|0?&uRWW z<5ZUIB{(}yISG(z4t)jKOvy<4L5uhq0wx*g4IAoqXOKnu7a0w`nxWp~1e&_I8NeF= ujWVoPWj>Om1js~lwlGxzXDjo0zyASQHbzf(@GyY@0000
-
-
- - - - - - - - - - - - - - - - - - -
-
-
调度命令
-
-
阶段计划
-
阶段记事
-
{{ dateString1 + ' ' + time }}
-
同步站机通信中断
-
与中心通信正常
-
-
- - - - - - - - - - - - - - - - - - -
-
提示信息窗
-
{{ '操控A:主机' + ' ' + dateString + ' ' + time }}
-
+
+
+ + + + + + + + + + + + + + + + + + +
+
+
调度命令
+
+
阶段计划
+
阶段记事
+
{{ dateString1 + ' ' + time }}
+
同步站机通信中断
+
与中心通信正常
+
+
+
+
提示信息窗
+
{{ '操控A:主机' + ' ' + dateString + ' ' + time }}
+
- + @@ -66,7 +48,8 @@ - + +
@@ -88,6 +71,7 @@ import PassiveTimeout from './passiveDialog/timeout'; import { timeFormat } from '@/utils/date'; import { prefixIntrger } from '@/utils/date'; import BottomTable from './bottomTable'; +import MenuPanel from './menuPanel'; import CtcBarIcon1 from '@/assets/ctc_icon/pic1.png'; import CtcBarIcon2 from '@/assets/ctc_icon/pic2.png'; import CtcBarIcon3 from '@/assets/ctc_icon/pic3.png'; @@ -121,9 +105,10 @@ export default { PassiveAlarm, PassiveContorl, PassiveTimeout, - MenuButtonCtc, + MenuButtonCtc, RunplanPane, - BottomTable + BottomTable, + MenuPanel }, props: { selected: { @@ -133,49 +118,49 @@ export default { } } }, - data() { + data() { return { alarmMessages: [ { id: 1, message: '这是告警信息一' }, - { id: 2, message: '这是告警信息二' }, - { id: 3, message: '这是告警信息三' }, - { id: 4, message: '这是告警信息四' }, - { id: 5, message: '这是告警信息五' }, - { id: 6, message: '这是告警信息六' }, - { id: 7, message: '这是告警信息七' }, - ], - warningMessages: [ - { id: 1, message: '这是预警信息一' }, - { id: 2, message: '这是预警信息二' }, - { id: 3, message: '这是预警信息三' }, - { id: 4, message: '这是预警信息四' }, - { id: 5, message: '这是预警信息五' }, - { id: 6, message: '这是预警信息六' }, - { id: 7, message: '这是预警信息七' }, - ], - time: '00:00:00', - dateString: '', - dateString1: '', - ctcBarIcon1: CtcBarIcon1, - ctcBarIcon2: CtcBarIcon2, - ctcBarIcon3: CtcBarIcon3, - ctcBarIcon4: CtcBarIcon4, - ctcBarIcon5: CtcBarIcon5, - ctcBarIcon6: CtcBarIcon6, - ctcBarIcon7: CtcBarIcon7, - ctcBarIcon8: CtcBarIcon8, - ctcBarIcon9: CtcBarIcon9, - ctcBarIcon10: CtcBarIcon10, - ctcBarIcon11: CtcBarIcon11, - ctcBarIcon12: CtcBarIcon12, - ctcBarIcon13: CtcBarIcon13, - ctcBarIcon14: CtcBarIcon14, - ctcBarIcon15: CtcBarIcon15, - ctcBarIcon16: CtcBarIcon16, - ctcBarIcon17: CtcBarIcon17, - ctcBarIcon18: CtcBarIcon18, - } - }, + { id: 2, message: '这是告警信息二' }, + { id: 3, message: '这是告警信息三' }, + { id: 4, message: '这是告警信息四' }, + { id: 5, message: '这是告警信息五' }, + { id: 6, message: '这是告警信息六' }, + { id: 7, message: '这是告警信息七' } + ], + warningMessages: [ + { id: 1, message: '这是预警信息一' }, + { id: 2, message: '这是预警信息二' }, + { id: 3, message: '这是预警信息三' }, + { id: 4, message: '这是预警信息四' }, + { id: 5, message: '这是预警信息五' }, + { id: 6, message: '这是预警信息六' }, + { id: 7, message: '这是预警信息七' } + ], + time: '00:00:00', + dateString: '', + dateString1: '', + ctcBarIcon1: CtcBarIcon1, + ctcBarIcon2: CtcBarIcon2, + ctcBarIcon3: CtcBarIcon3, + ctcBarIcon4: CtcBarIcon4, + ctcBarIcon5: CtcBarIcon5, + ctcBarIcon6: CtcBarIcon6, + ctcBarIcon7: CtcBarIcon7, + ctcBarIcon8: CtcBarIcon8, + ctcBarIcon9: CtcBarIcon9, + ctcBarIcon10: CtcBarIcon10, + ctcBarIcon11: CtcBarIcon11, + ctcBarIcon12: CtcBarIcon12, + ctcBarIcon13: CtcBarIcon13, + ctcBarIcon14: CtcBarIcon14, + ctcBarIcon15: CtcBarIcon15, + ctcBarIcon16: CtcBarIcon16, + ctcBarIcon17: CtcBarIcon17, + ctcBarIcon18: CtcBarIcon18 + }; + }, computed: { ...mapGetters('config', [ 'width' @@ -183,19 +168,19 @@ export default { isShowBar() { return this.$store.state.training.prdType && this.$store.state.training.prdType !== '07'; }, - isCtc() { - return this.$route.query.ctc - } + isCtc() { + return this.$route.query.ctc; + } }, watch: { isShowBar(val) { val && this.$store.dispatch('config/updateMenuBar'); }, - '$store.state.socket.simulationTimeSync': function (time) { // 仿真时间更新 - this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${timeFormat(time)}`)); - const date = new Date(+new Date(`${new Date().toLocaleDateString()} ${timeFormat(time)}`)); - this.initDate(date); - } + '$store.state.socket.simulationTimeSync': function (time) { // 仿真时间更新 + this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${timeFormat(time)}`)); + const date = new Date(+new Date(`${new Date().toLocaleDateString()} ${timeFormat(time)}`)); + this.initDate(date); + } }, mounted() { this.$nextTick(() => { @@ -217,21 +202,21 @@ export default { beforeDestroy() { window.onclick = function (e) {}; }, - methods: { - initDate(date) { - this.time = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}:${prefixIntrger(date.getSeconds(), 2)}`; - const years = date.getFullYear() + ''; - let months = date.getMonth() + 1 + ''; - let dates = date.getDate() + ''; - if (months.length < 2) { months = '0' + months; } - if (dates.length < 2) { dates = '0' + dates; } - this.dateString = years + months + dates; - this.dateString1 = years + '年' + months + '月' + dates + '日'; - }, - handleRunplan(){ - this.$refs.runplanPane.doShow() + methods: { + initDate(date) { + this.time = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}:${prefixIntrger(date.getSeconds(), 2)}`; + const years = date.getFullYear() + ''; + let months = date.getMonth() + 1 + ''; + let dates = date.getDate() + ''; + if (months.length < 2) { months = '0' + months; } + if (dates.length < 2) { dates = '0' + dates; } + this.dateString = years + months + dates; + this.dateString1 = years + '年' + months + '月' + dates + '日'; + }, + handleRunplan() { + this.$refs.runplanPane.doShow(); } - } + } }; diff --git a/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue b/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue index d21221462..1a4688ae3 100644 --- a/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue +++ b/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue @@ -1,780 +1,777 @@ + diff --git a/src/jmapNew/theme/datie_02/menus/menuSection.vue b/src/jmapNew/theme/datie_02/menus/menuSection.vue index 2f91ede3f..a547d0ebe 100644 --- a/src/jmapNew/theme/datie_02/menus/menuSection.vue +++ b/src/jmapNew/theme/datie_02/menus/menuSection.vue @@ -24,7 +24,6 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate'; -// import LoadSpareTrain from '@/jmapNew/theme/components/menus/dialog/loadSpareTrain'; import AddSpareTrain from './dialog/addSpareTrain'; import DrawSelect from './dialog/drawSelect'; diff --git a/src/views/login/register.vue b/src/views/login/register.vue index a96dc2548..c47c3c35a 100644 --- a/src/views/login/register.vue +++ b/src/views/login/register.vue @@ -10,18 +10,18 @@ top="25vh" > - - - - + + + +