From 90a1c03bd43b0f45319b4224d18ec1c85e6a21b1 Mon Sep 17 00:00:00 2001 From: Yuan Date: Mon, 24 Oct 2022 18:13:43 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=80=83=E8=AF=95=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/newMap/display/exam/examPanel.vue | 44 +++++++++++---------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/src/views/newMap/display/exam/examPanel.vue b/src/views/newMap/display/exam/examPanel.vue index 64d52cbe8..ad437ab25 100644 --- a/src/views/newMap/display/exam/examPanel.vue +++ b/src/views/newMap/display/exam/examPanel.vue @@ -4,7 +4,7 @@
满分: {{ composition.fullScore }}
考试时间: {{ composition.validDuration }}分钟
-
+
理论题
Date: Mon, 24 Oct 2022 18:20:45 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=BC=94=E7=BB=83?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../display/memberManage/membersManage.vue | 21 +++++++++++++++++++ .../newMap/display/terminals/terminalMenu.vue | 1 + 2 files changed, 22 insertions(+) diff --git a/src/views/newMap/display/memberManage/membersManage.vue b/src/views/newMap/display/memberManage/membersManage.vue index 3cebea056..eb626bc9a 100644 --- a/src/views/newMap/display/memberManage/membersManage.vue +++ b/src/views/newMap/display/memberManage/membersManage.vue @@ -174,6 +174,7 @@ export default { this.simulationUserList = val; }, '$store.state.training.memberList': function (val) { + debugger; if (val && val.length) { this.memberData = this.$store.state.training.memberData; const dispatcherList = []; @@ -354,6 +355,11 @@ export default { }); } this.$refs.tree && this.$refs.tree.filter(this.queryMember); + }, + '$store.state.socket.simulationRoleList':function(list) { + if (list && list.length) { // 人员变化监控 + this.checkRoleChange(list); + } } }, mounted() { @@ -412,10 +418,25 @@ export default { driverNoShow = false; } return (data.labelName.indexOf(value) !== -1 || flag) && driverNoShow; + }, + checkRoleChange(list) { + list.forEach(each => { + const item = each.body; + if (item.messageType === 'PLAY_CHANGE' && item.userId == this.userId) { + const userRole = item.type || 'AUDIENCE'; + // this.userRole = item.type || 'AUDIENCE'; + this.$store.dispatch('training/setRoleDeviceCode', item.deviceCode); + this.$store.dispatch('training/setUserRole', userRole); + this.$store.dispatch('training/setRoles', userRole); + // this.deviceCode = item.deviceCode; + // this.setSimulationPrdType(this.centralizedStationMap[item.deviceCode]); + } + }); } // handlerMemberOnOff(data) { // this.$store.dispatch('training/updateMemberAndUser', { simulationUserList: data, userId: this.userId }); // } + } }; diff --git a/src/views/newMap/display/terminals/terminalMenu.vue b/src/views/newMap/display/terminals/terminalMenu.vue index eaaa87cd7..3c53f3fb6 100644 --- a/src/views/newMap/display/terminals/terminalMenu.vue +++ b/src/views/newMap/display/terminals/terminalMenu.vue @@ -163,6 +163,7 @@ export default { } else { currentType = 'subway'; } + this.terminalList = []; [...this.commonTerminal, ...this.terminalMap[currentType]].forEach(item => { if (item.roleList.includes(this.roles)) { this.terminalList.push(item); From f4a53f64046f35c79ebde0e1433d5f12515aa6ab Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Tue, 25 Oct 2022 11:01:28 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../competitionManage/bankList/index.vue | 10 +++++----- .../competitionManage/bankList/preImport.vue | 2 +- .../bankList/question-form.vue | 4 ++-- static/theoryTemplate/理论试题导入模板.xlsx | Bin 12316 -> 12345 bytes 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/views/competitionManage/bankList/index.vue b/src/views/competitionManage/bankList/index.vue index ea695eb14..4234e49c0 100644 --- a/src/views/competitionManage/bankList/index.vue +++ b/src/views/competitionManage/bankList/index.vue @@ -49,7 +49,7 @@ export default { }, labels: { type: 'select', - label: '标 签', + label: '分 类', config: { multiple: true, data: [] @@ -68,7 +68,7 @@ export default { type: 'html' }, { - title: '标 签', + title: '分 类', prop: 'tags', type: 'tagMore', width: '200', @@ -274,7 +274,7 @@ export default { const objHeader = { questionTypeIndex: '题型（必填）', topicIndex: '题干（必填）', - tagsIndex: '标签', + tagsIndex: '分类', option1Index: '选项A（必填）', option2Index: '选项B（必填）', option3Index: '选项C', @@ -448,8 +448,8 @@ export default { exportTemplate() { const wb = XLSX.utils.book_new(); const data1 = [{A: '理论试题导入模板', B: '', C:'', D:'', E:'', F: '', G: '', H: '', I: '', J: '', K: ''}]; - const data2 = [{A: '说明：1、本表表头（第一行到第三行）内容不能修改删除;\n 2、支持批量导入的题型：单选题，多选题，判断题，题型不能自定义，只能按照表格提供的进行录入;\n 3、【判断题】在选项A中可填写√ 或正确，选项B中填写× 或错误，答案填写A或B\n 4、【标签】多个标签项使用空格隔开', B: '', C:'', D:'', E:'', F: '', G: '', H: '', I: '', J: '', K: ''}]; - const data3 = [{A: '序号', B: '题干（必填）', C:'题型（必填）', D:'选项A（必填）', E:'选项B（必填）', F: '选项C', G: '选项D', H: '选项E', I: '选项F', J: '正确答案（必填）', K: '标签'}]; + const data2 = [{A: '说明：1、本表表头（第一行到第三行）内容不能修改删除;\n 2、支持批量导入的题型：单选题，多选题，判断题，题型不能自定义，只能按照表格提供的进行录入;\n 3、【判断题】在选项A中可填写√ 或正确，选项B中填写× 或错误，答案填写A或B\n 4、【分类】多个分类项使用空格隔开', B: '', C:'', D:'', E:'', F: '', G: '', H: '', I: '', J: '', K: ''}]; + const data3 = [{A: '序号', B: '题干（必填）', C:'题型（必填）', D:'选项A（必填）', E:'选项B（必填）', F: '选项C', G: '选项D', H: '选项E', I: '选项F', J: '正确答案（必填）', K: '分类'}]; const data = [...data1, ...data2, ...data3]; const mapType = { select: '单选题', diff --git a/src/views/competitionManage/bankList/preImport.vue b/src/views/competitionManage/bankList/preImport.vue index 9fa3e78f0..1a1370b65 100644 --- a/src/views/competitionManage/bankList/preImport.vue +++ b/src/views/competitionManage/bankList/preImport.vue @@ -18,7 +18,7 @@
- + diff --git a/src/views/competitionManage/bankList/question-form.vue b/src/views/competitionManage/bankList/question-form.vue index 31b9e2408..50097e4e3 100644 --- a/src/views/competitionManage/bankList/question-form.vue +++ b/src/views/competitionManage/bankList/question-form.vue @@ -11,8 +11,8 @@ - - + + diff --git a/static/theoryTemplate/理论试题导入模板.xlsx b/static/theoryTemplate/理论试题导入模板.xlsx index 242cf9c627342e6ea37ec6c37cd2e6c5b3ca0f3b..0c7c4c827ecf6d486222e3f7c510bf6b2df295cd 100644 GIT binary patch delta 7283 zcmai3WmHu0x23z0?(US9F6op;MM@En?zkc;4MQ`ufJn+HFf;;EN~c33-5?<_@CMQM z-ui!dZ$8Z2b@$o(>~rqEA7=f)R#2;&cw}Iy@u!wBG7^$B3K9}A5)zWFi;bSUi>rr# zjf=Y-zpt}XT#~+SC*!^F1??+B{C&P*Nzr$9Z?j~eU0qahE@*pV)&*$8uWp{0H%S!{ z%6^eNYg(VT;5#kplWoVG`$0YOCLgcDDYXtpEmN8PTeM&Cp7Gm~&w53uXrC6>pQm~P zT6OgFf!pm5@tHJPX)-)Te{^q9epT3OkJ4j})Lt$*QSJKm%VH-ikkq1`jVXOv{+@<% zNPyKIJ2Q2XhK}0VUN&+*YXk<~G^HRP=k=-T0sEDiASZ`T(Mm^g=GTT&C$_e(z7|4% zVeiK#o)9M0e%-@?t!p<*(W$zHRJ5*3Be)22my!9ZYG|XRE4sGf(!xz@vXU^nOcWNk zX3MlmZPAf*Q;UTFv4FbSTFTE~*4i3k+4mKn@C16sodlv}ef%vKwc5-vSWU^N8}$&0 z!TqLL{00rOgaScE|J9oh3j}4Nu>&qPJ;dQ>$VUuV{I$_4#-e%Ater~gMVL;MeiDuZ zUTnllNBuu1Uf8GG)%FT2B-$-H2dAN)KYiDv!Mg99YZEIj=GEBrp-I;SbP>_W@if?y z-<%=(#QsT@4$OVrxjuTLqB*;oUIzwTtgKQLc{>_voA`{WK)H2bdC}UJ0|4ad&DPIi z%eDn+a+Qf_V&m+wQyU{0Iv=U*8JmybSMmL&)?^lY11Ik0-3(KNIp4<`Gv;UVR||{g z_VOX%K@;Z$*XC<5uYw{g^kg?z{YmuIP1hh(Jr4GdF?z*O~3^sfmT-{+Lnyy&&gkS&OjG;W|;@_JK z6sne;ajz%k{tyICPfssOFa18^bRre=1Ea6T@DXTT+lYUtbmCKxw>3dv(;hfy_WKGy z`?kgQ^7SWpDlI_jIUCP6x!&Y=SXD3(B+1R>@C>I5gyI_=1 zy6YBD4sQ*Fa<3647=g9+)h@ZVDlEH*4%;eMrE@mC9VOu#pp&K0BEg+fCAb6ekcU&= z%zQIOedey}_Vxx5kiJ!9=lTm88c-c-bF;g+G_nElAbb+pv)W3)K##vnE$6aEf;&S& z|Fk*Y9EU%(J`K4QwPL{uv;9pv=Yowna=I?m8*68K_45G@$tqpzqL8p%(57KelY>4Ii-d z&Bir>y5``DLtQOMrQD!RqCMU3L=#qWwjf~$r4(Ojy)}cdP zb8#u4u9>(l9!uO5RUS+16t5f=ZE&rN%_I}zEA-k6Z4w$bOzE0b9P2hZ=?i9T+^37C zcHDxeixzeOH@9h<;T<=>X`AVt!_%6c_cJS7H9ZY8D;G79w&AX*jkcJp=DYm%i$N__+E&tHQji`nY7G(c54Cr#we5h zykIY8VdK*+o>$wvlKXu%U zTSJAoJ?g?Ftk%sW6y67GYc5Mjbn10((eLY{S#Cja_fMPlI0Wi;b)NL<<`P!yKkg-% z0{nuS?JZnKUVJ0>G;{fe(OOw=w^9{x+46^vHN(_aDLzTyw=&yp)SBDmN?VsF&#o@x zoM6zey8nx~$5EPA(`8DguX@fopsfr$?r;-AgJb2-qWIV$LXAPFop!XeagB9LfZOEcUn722X5`@@ zyvr32=AC>s_`C7bNIJYqhS(qgG!pnJ80RJ2F*1KCeUh*G6EPm!%np@uv?$g zd2Aybn*cXjtF{KTBMv{d^< zqn0nchKo{t?YYJR-_#I!rTM!fZ}po!41-D>gvD9fS~ZNtkdU zysO{+c(MBo&{jRXywwMGT=FJd82&<#i(Q*LLqW!EK|9rbg0iPT{m@o@!d=%>GdKal zO3^tg0;`cb^=aSo`D=*4^bgc|KD~fkzJQGILdkIX!0O~d`*l|AGU3O&shG+anEpbx zCl9*rY{oTrAO>bS_KCXdLXg>}gwW@_#zNTI0TSSJLcqhjW$Z`&&K8t959<1(Zhdxq zTY^{u-N#G6use4AG+g@YZO??iJ%yU`dj7IA=7wzUrtHD-w2CPncxl==Z9C;g-~>QC&FC~KXm+IrLn_nw%k4I;A&+|`YvxAnPIw$@IloTs;p6Y$^%IHj-WD+BaZ;Z7nAg-wGrX;6Uka_Mp;Mq*D41Fdb{l=HS;)_bu zddUiHmxm6Na!r_SjWJ)7bCcvvqh*hzS`H0bCyQE+;XIpaT{~AnmnML9BoKeT{#@!O22QFTQz!L&qhH zZ4?hO5QCL@X!HVMjKT;8N?(|Pun;{4?K`j*7N-Zo(YU0YouXCdpR)deFr@p4Z5gbm zWMYTdSFO;#8{`rvMH#e=l*E!E?H}yoq>^Au$?e`R?s!`I7~#}Q2Rn->?AFy5*g%Ad z^8260Yz~TgS=)k`Ar6WTS(M_a1O~YPJKB3_{BsrQQY~$)M|T53vnUmmcuMnN*yg1D zlUT8tc+7WVuv^(oOF5g&xE}eL%3U(v~yOp%0@Vb!nj;W zQDzYfk6KTGVu!q{>ZC<$!d`u49fl7k(U=d*7oR$;=$+Hq%m#?A?sliK7{(}pP;sv} z#Nj~egvPsf$<4jq2Uo2SXLNF{x@t&(5z18_#k4xukqDpdUR5cbTuZJ93k`#*?h$ez=MdO^dH{kaY1+g4<72PBMGKZOP+72z8nf z{}1O+&;C|#RY@=j!Mao~*&!G>`{qk?5PH{2nkTTH=gyTN=8~(%UD<7X7L*NFoDrdk zH2ku37n(ng?m~0tozdsPKPvFQxO?6ga1qgY3?1w{)Ytg@KKO2)|HWQoq}BN=j>z+v zOGVkC*dpUU1|k@DjS-mPe>VOP>i);FLqN<`gY%zNFT{3kr@c+h-Iy7nt`h$?j);2O zOvzW+>(IZ8HA_Og27f2|f2seJrT?3fd+QHCJZTT2p*z!vG)EftFQvHN24PtePJnn; zsN$&qX8ZZ-zq$Vw$oY^F@!X|RJR0OBEpIQur~&kxk+_Hm#Ct4C5vFva-#!IN*Bs3L zC6vEuK?sH*T0A58vV;QMUEj9*zpvo3fAkRxX|R%_50UFc|0j69V2W~!F8qn5Pe48` zKhfSa*U-m;Q+Yc~Jd;mu}}8LVLwD)qg@_+*nymeE0I;nD7-=SR+` z^SmYHXQ#Hg-)(-oxA^;4wepK)Z-&Y}5RVvJdzn{9N*K zhgF7p$4@8~vJiM<2^hCs9`4_qZwdgHn{qc7y9shv0he3Va##C#H*r}$lAAkU!Jb)= zxN;{Pw=!Kf`=`27gvSlvRNNSRsvUJx%`RDrt|C7K*0Qzml%I$30(*La8fL_K6yw?n z^o;@oFE5p52Oc^$i3nXw0H&$i%Y$ij_a}i_+1-~UE?+;rC0UP)(|wyPdO|ED|NPAK zGvo#}kse}1tcr==i7v)?1Inl50LbpE)2>%O$QJ-#D&O*5@4;0;)W0p4Yuy*;I>Lne`Zg zc?EtU=!1WE~@ZNMxC_WpP_4Ge|F~%SfbY8qo7~qZcG!ip>#A;(Y zhnQ*05535=g519jHdSALv64H1t7;BoI14R#b!0((xk^LVU^Xf`X)&<>nzR1X)F+;& zP430MngKbMfD0;cxs~uW_yD-TxXkBk4b~jPCFYr}rrJ*@hVLIg++ntbnAw8ugYl_` z;5o!$g_cceyjqg{TCoqN?pvQ_c^6#A`QF^$!r~dc3e%Q8E@H(nt|jvK2`Jw_3kTsZ z+qpjvaQv0#4Ld~wFb?%#XIBN}NU`k$Y+Lu6)@#T?V^7+lJm`HxGg?w1=a~$H1;v+L3$U2l^EI9wusPAisMnRuN^;qNF`Gw?Y8_W z7jtD%B3W#jVW&o9{)9wH>N8CT@92qitMBWPq`8@S>S={Vyi0Q6sv>+!JONX%e5cbo zV#AU#rL2-L;?%7#|5*!VNAKAzLDF)5`15qZdP2+ER<2j0M013I_a)tWZwQ-C>fk(% z+K!3}xbvfGilq#Vse(%M1a+Kh%cIJvZG4Dj;YCHR9IwGtryO3PvDeVcT|1lY=;60H3R82$Yfo~ay>R5SH7CMXOK4WvQmO7`oLLKxIct| zOLqf~AzRjPMfW6?w(dx?kcFt<`QEOGaSpd)I`iWxl2$AOVCIO>IjBYPx)z&31kJA8 zalomw*9}Mr19kh`kP`-*{KZnSk4!Ogq}~o(oU24!A<>$sO&x-;e6!&K{}w zJ~UU42YDJ~G^`|?$viJ+kNUVsMOU}IQ8M;ri<=Cu2`1Fbpl)7v4lY(x*yIiQl9)X4 zoQvGcAvxY!$xEM(xZ7Ha`3<_4@;!w%UfA z_9t3QdM`2+lit}#c($vJdrR+QPzkq=t#&5OypDArSNTk%SEV?3qV9(U4f{TOkc=<0 zgR5MvY&%MgrHamSLd*S~9#kPN9 zsZmpzND`dS{zwywGM4$NV%@+u(@5+wj{Z6li4&hCzB7qsju4}|j8O);hMs&H3zxR} zme)+PP9b+K2WKKn0P_n)I;!*|6zFKbR10W?gBEDzACk8vQi>$%g}4#ZC%S3Y5Hic- zK19JT)1bdH5maR&*0=1?<6;eC$0pgcl|pAaj@MlCJ2+(nWyBh!Yuny?ij<_%;b@oh zO1~kM@hH_eB8i1*-Zsf3n|SzHdAF0`@v($$&BdTHof9|@!>Y=e!tBq`(Z{S))_4b~P*ZI*ltj-RkV z#)D^`!jjV&ieETJ=q|ag#st-^OY7*_VUw_DII!{gehiaiO)wt8JjYST-0>}8I0gop zg=;!dHo~?B)BH!oKVg#0MaMWD_rF#GHd@h372k_l)tSp*9uCvbddBBVgcv$Z@}?jL?TV-WAi9iK=n@!p!&Ieyw8S>$bLghd;zIXg3skB*MBf&d_)*SV z#`gzk%DWqT@EY!W^y~QoU$9&uGA|?bg_;xiD`&6@Y?wVS$p181`+D_2_j<^T?P z8dQP&D0529pE!14M}N+S3jG9dmp(ufm<|(6FeIHy;HNHZ)?zB^Xi9l%2e{Z+Fz^z{+Q){C2HIvSgSr zhGry5{at=hwQ7_{SxLW!{Xik9q4Vs`>;vE+@PcNK*j$|BeTr=0@1Aw5xy^-zxUOO& zr8iM&lRc|Bfk%fko9pX@x=(@Dv(p(o6DlbUh|bN))G^3MLX%30vF^(!4`;L;O4~ki zL16h0qeFBs{j$M{br25Dp;o>XZ&EW%CkP2@?)%cfu*464zl?!XgLZ zBtv=_LL5qb=zFI71V3=P-Q(`*Asfc9Kuep(iC`iYXUQqYMQUFQc>}zt5|?nP1;w@~ zl=rVh;QPf?u-IVgH1U7Qevq0Qi%pggX2}M^XVQ z4SrLCSvPPs17)zc~GPxHw#Eu5o?e$mdv;3T~KsNfp3`Rh0~aDO)i51i=hI z=zUWxt|+7lm!hqFS4YlfVdyXny>0U?O9L{f4KJjjf|LlOk!>A(!WdyMD~ip5ZXwW5 z#wj|vdNZ_>;_X$6BX?q;ur)ADN<)yUUa(D zx&Tze!VI{K>QT0eAIgb{9uB4ky@*A@)jGrdg_)=?o~+Nl8$0jCJ#4RKZ~WC*3?da9 z75Y_$WjES#C$AxQ>@>P<(PB{cTZog7%+N9T%&$$S2vQ9h_{JkEVDGLNn*)xj!4u&9 zIZE|R=&LLs2JABpL>XwPm8N;1FxV^{Fh8Ja3j%n!qe)PG(1pJ8tB>}x#FJ8_ojYlO zdn*r61O?oGJ88VJ2~Hw4ISSnO=TH zi(FDV9i{s3JZzj-0S-9WlOoVxJ%d!FxlXZy(hd}ge4 zt~3CeI+#y#5osx6spq*=^;_gT&;Kdv1UN33BqTjn=|Va`l!(r*f2+X3cdm-b4NAyrHdOE|)T z9h?tWB_lNylR|jdC%9JFhE%0k76EZ@QUW2Yeh}MNUBQ%BeZJ?LzP`B;>f7oz)dL}) zK&|*PM_Y8$+F1>>GTKCP)NG_B`WN7Q}MXpR;erbWMxf9(isx6h9ZJH)9b zix8!VHP=sK`Ok+YoiqfxvWWK@$3{M6u{^ByI-e0d*CQ}z2~Wh)Z_&YQ3S1INQX7QV z3)5bSt=u3%Ua>c!BZq;wdF7FJK#sikQHVG}`Mk+!w?}*+F}@yT3D7m47|K&F&=W3N z9z9KDlzT}3k#)o&pcgvQpSy^c00|k15%Jvs3gYLW`SVW^2MH;~2nh-Q7DRmR@OV%g jzZ63Jf?o{zDM&~_9ytc&F7V{<`PYPi0tPMbZS{Wv=14{) delta 7254 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 Date: Tue, 25 Oct 2022 15:18:22 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/newMap/display/memberManage/membersManage.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/views/newMap/display/memberManage/membersManage.vue b/src/views/newMap/display/memberManage/membersManage.vue index eb626bc9a..ba8ac8a41 100644 --- a/src/views/newMap/display/memberManage/membersManage.vue +++ b/src/views/newMap/display/memberManage/membersManage.vue @@ -174,7 +174,6 @@ export default { this.simulationUserList = val; }, '$store.state.training.memberList': function (val) { - debugger; if (val && val.length) { this.memberData = this.$store.state.training.memberData; const dispatcherList = []; @@ -361,6 +360,11 @@ export default { this.checkRoleChange(list); } } + // '$store.state.socket.simulationRoleList':function(val) { + // if (val && val.length) { + // this.handlerMemberOnOff(val); + // } + // } }, mounted() { }, @@ -430,6 +434,7 @@ export default { this.$store.dispatch('training/setRoles', userRole); // this.deviceCode = item.deviceCode; // this.setSimulationPrdType(this.centralizedStationMap[item.deviceCode]); + this.$store.dispatch('training/updateMemberAndUser', { simulationUserList: [item], userId: this.userId }); } }); } From 7dee28ea8e34b9aea5a76566f503cf34c6cd2571 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Tue, 25 Oct 2022 17:23:44 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StationStand/safeStand/ESolidStand.js | 19 ++++++++++++------- src/jmapNew/shape/graph/Train/EMouse.js | 8 +++++--- src/jmapNew/shape/graph/Train/index.js | 10 ++++++---- src/store/modules/map.js | 7 +++++++ src/views/newMap/display/terminals/index.vue | 1 + src/views/newMap/jlmapNew/index.vue | 7 ++++--- 6 files changed, 35 insertions(+), 17 deletions(-) diff --git a/src/jmapNew/shape/graph/StationStand/safeStand/ESolidStand.js b/src/jmapNew/shape/graph/StationStand/safeStand/ESolidStand.js index 5d5c00eab..a3a46fe53 100644 --- a/src/jmapNew/shape/graph/StationStand/safeStand/ESolidStand.js +++ b/src/jmapNew/shape/graph/StationStand/safeStand/ESolidStand.js @@ -1,3 +1,4 @@ +import store from '@/store/index'; import Group from 'zrender/src/container/Group'; import Rect from 'zrender/src/graphic/shape/Rect'; import Text from 'zrender/src/graphic/Text'; @@ -52,17 +53,19 @@ class ESolidStand extends Group { this.holdTrain.hide(); } - const path = window.location.href; - const search = window.location.search; - if (path.includes('/display/demon') && search.includes('project=bjd')) { + // const path = window.location.href; + // const search = window.location.search; + // if (path.includes('/display/demon') && search.includes('project=bjd')) { + if (store.state.map.picture == 'largePassengerView') { // 文字描述 + const modelNum = model.num ? model.num : 0; this.arrowText = new Text({ zlevel: this.model.zlevel, z: this.model.z + 10, style: { x: computedPosition.x + 35, y: computedPosition.y - 20, - text: `${'站台人数: ' + model.num ? model.num : 0}`, + text: '站台人数: ' + modelNum, textFill: '#000', textAlign: 'left', textFont: 12 + 'px consolas', @@ -70,6 +73,7 @@ class ESolidStand extends Group { textBackgroundColor: style.tipBackgroundColor } }); + console.log('站台人数: ', modelNum); this.add(this.arrowText); this.arrowText.hide(); this.on('mouseover', () => { @@ -124,9 +128,10 @@ class ESolidStand extends Group { setState(model) { const style = this.model.style; - const path = window.location.href; - const search = window.location.search; - if (!(path.includes('/display/demon') && search.includes('project=bjd'))) { + // const path = window.location.href; + // const search = window.location.search; + // if (!(path.includes('/display/demon') && search.includes('project=bjd'))) { + if (store.state.map.picture != 'largePassengerView') { // 列车跳停 model.assignSkip && this.setColor(style.StationStand.solidStand.designatedJumpStopColor); // 全部跳停 diff --git a/src/jmapNew/shape/graph/Train/EMouse.js b/src/jmapNew/shape/graph/Train/EMouse.js index 8439eef81..a7c52d6a4 100644 --- a/src/jmapNew/shape/graph/Train/EMouse.js +++ b/src/jmapNew/shape/graph/Train/EMouse.js @@ -106,7 +106,8 @@ class EMouse extends Group { const path = window.location.href; const search = window.location.search; const stationNames = new Map(store.state.map.map.stationList.map(s=>[s.code, s.name])); - if (!(path.includes('/display/demon') && search.includes('project=bjd'))) { + // if (!(path.includes('/display/demon') && search.includes('project=bjd'))) { + if (store.state.map.picture != 'largePassengerView') { if (LangStorage.getLang() == 'en') { text = ` The planned train: ${trainType} \n Table No.: ${this.device.model.serviceNumber} \n Train Trip No.: ${this.device.model.tripNumber}\n Destination: ${this.device.model.destinationCode ? this.device.model.destinationCode : ''}\n Train No.: ${this.device.model.groupNumber}\n Early or late: ${destinationText}\n Direction: ${direction ? 'up' : 'down'}\n Crew No.: \n Start Station: \n Terminal Station: \n Occupied Track: ${this.device.model.sectionModel ? (this.device.model.sectionModel.parentName ? this.device.model.sectionModel.parentName : this.device.model.sectionModel.name) : ''}\n Current Station: \n Train-ground communication: normal \n Operation Speed level: 4 \n Detained: ${this.device.model.hold ? 'Detained' : 'Normal'}\n \n 跳停状态: ${this.device.model.jump ? 'Skip to continue moving' : 'Normal'}Stationary: ${!this.device.model.stop ? 'No' : 'Yes'}\n Blocked: No \n Speed: ${this.device.model.speed || 0} km/h \n Authorized Distance: ${this.device.model.maLen || 0} m`; } else { @@ -117,7 +118,7 @@ class EMouse extends Group { } } } else { - text = `${'车内人数: ' + this.device.model.num}`; + text = `${'车内人数: ' + this.device.model.num || 0}`; } const trainTip = this.device.style.Train.common.trainTip; @@ -138,7 +139,8 @@ class EMouse extends Group { } }); - if (path.includes('/display/demon') && search.includes('project=bjd')) { + // if (path.includes('/display/demon') && search.includes('project=bjd')) { + if (store.state.map.picture == 'largePassengerView') { this.arrowText.setStyle('textFont', 12 + 'px consolas'); this.arrowText.setStyle('y', this.device.model.point.y + 15); this.arrowText.setStyle('x', this.device.model.point.x + 55); diff --git a/src/jmapNew/shape/graph/Train/index.js b/src/jmapNew/shape/graph/Train/index.js index b0a9da366..8559cb3c4 100644 --- a/src/jmapNew/shape/graph/Train/index.js +++ b/src/jmapNew/shape/graph/Train/index.js @@ -389,9 +389,10 @@ export default class Train extends Group { // this.setDriveMode(model.driveMode); // } this.setRunStatus(model.stop, flag); - const path = window.location.href; - const search = window.location.search; - if (!(path.includes('/display/demon') && search.includes('project=bjd'))) { + // const path = window.location.href; + // const search = window.location.search; + // if (!(path.includes('/display/demon') && search.includes('project=bjd'))) { + if (store.state.map.picture != 'largePassengerView') { if (this.style.Train.common.trainHeadColorChangeMode) { this.setDriveMode(model.driveMode + model.runLevel); } else { @@ -414,7 +415,8 @@ export default class Train extends Group { if (style.Section.trainPosition.display) { this.updateSection(object); } - if (path.includes('/display/demon') && search.includes('project=bjd')) { + // if (path.includes('/display/demon') && search.includes('project=bjd')) { + if (store.state.map.picture == 'largePassengerView') { this.handlePassagerColor(model.num); } if (style.Train.trainBody.trainBodyFaultFlashColor) { diff --git a/src/store/modules/map.js b/src/store/modules/map.js index f7f820fdc..eb6ffc3a9 100644 --- a/src/store/modules/map.js +++ b/src/store/modules/map.js @@ -257,6 +257,7 @@ const map = { clearButtonCount: 0, // 清除操作按钮计数器 stationControlMap: {}, // 站控显示的map { 当前车站：显示车站列表 } pictureDeviceMap: {}, // 画面设备修正map + picture:'', // 当前的客户端 domConfig: null, // 仿真配置 initClient: '' // 仿真初始客户端 }, @@ -1151,6 +1152,9 @@ const map = { }, setPictureDeviceMap: (state, pictureDeviceMap) => { state.pictureDeviceMap = pictureDeviceMap; + }, + setPicture: (state, picture) => { + state.picture = picture; } }, @@ -1430,6 +1434,9 @@ const map = { }, setPictureDeviceMap: ({ commit }, pictureDeviceMap) => { commit('setPictureDeviceMap', pictureDeviceMap); + }, + setPicture: ({ commit }, picture) => { + commit('setPicture', picture); } } }; diff --git a/src/views/newMap/display/terminals/index.vue b/src/views/newMap/display/terminals/index.vue index 095cf0370..03363d2a8 100644 --- a/src/views/newMap/display/terminals/index.vue +++ b/src/views/newMap/display/terminals/index.vue @@ -165,6 +165,7 @@ export default { }, pictureChange(val) { this.picture = val; + this.$store.dispatch('map/setPicture', val); if (val === 'ibp') { this.$nextTick(() => { this.$refs.ibpPlate.show(this.roleDeviceCode, ''); }); } else if (val === 'drivingPlan') { diff --git a/src/views/newMap/jlmapNew/index.vue b/src/views/newMap/jlmapNew/index.vue index b0aaa48d4..2b00cde1b 100644 --- a/src/views/newMap/jlmapNew/index.vue +++ b/src/views/newMap/jlmapNew/index.vue @@ -393,9 +393,10 @@ export default { }, // 点击选择事件 onSelected(em) { - const path = window.location.href; - const search = window.location.search; - if (path.includes('/display/demon') && search.includes('project=bjd')) { + // const path = window.location.href; + // const search = window.location.search; + // if (path.includes('/display/demon') && search.includes('project=bjd')) { + if (this.$store.state.map.picture == 'largePassengerView') { if (em.deviceType == 'StationStand') { runPassenger(this.$route.query.group, em.deviceCode).then(netdata => { if (netdata.data) {