From 27418dc041ea81e695e7a5a452d3e8e78a09f62f Mon Sep 17 00:00:00 2001 From: joylink_zhaoerwei Date: Mon, 27 May 2024 18:06:53 +0800 Subject: [PATCH] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 1b0ddc2740ceac746bbc3d25a2d476b16c993fb2 Author: joylink_zhaoerwei Date: Mon May 27 17:39:39 2024 +0800 Squashed commit of the following: commit cef55a4c6b213bc3b205ca6ac1af3c4349bcf5f4 Author: joylink_zhaoerwei Date: Mon May 27 17:09:01 2024 +0800 三维url调整 commit 869c86b94d312545cbf08a85ac549699aa84ef1a Author: joylink_zhaoerwei Date: Mon May 27 16:57:01 2024 +0800 更改三维地址 commit dc2165733e17e470228defe3aa7f5e183a4f04b2 Author: joylink_zhaoerwei Date: Mon May 27 16:33:48 2024 +0800 场景添加三维场景，实训中可根据url打开三维场景（待测试） commit 7d774db362186c9a89682a125992306476bbaa02 Merge: b66515eba 0c5bba7c0 Author: joylink_fanyuhong <18706759286@163.com> Date: Tue May 21 16:48:35 2024 +0800 Merge remote-tracking branch 'origin/develop' into local-test commit 0c5bba7c0f0df1c04a91bac286c9a913deb98227 Author: joylink_fanyuhong <18706759286@163.com> Date: Tue May 21 16:47:37 2024 +0800 传输信号机调整 commit ef9165faa4d09042f1a45e088918e46be44ff77d Author: joylink_fanyuhong <18706759286@163.com> Date: Thu May 16 15:43:56 2024 +0800 third commit ae74123f18850e56e80a8aac2c0567596a1bcf8e Author: joylink_fanyuhong <18706759286@163.com> Date: Wed May 8 09:17:37 2024 +0800 成都工学院第三方登录调整 commit b1baeaabcd9449515a0884ce74b210ff2fd24dc4 Author: joylink_fanyuhong <18706759286@163.com> Date: Tue May 7 15:46:29 2024 +0800 成都工业学院第三方登录调整 commit b66515ebadc2e2ff1776d92b1f522922e7d1cd37 Merge: 5cf57c4d2 91a8410dc Author: joylink_fanyuhong <18706759286@163.com> Date: Wed Apr 24 11:01:32 2024 +0800 Merge remote-tracking branch 'origin/develop' into local-test commit 91a8410dc251852442386204d9ef33061761f24b Author: joylink_fanyuhong <18706759286@163.com> Date: Wed Apr 24 10:58:02 2024 +0800 道岔名称背景颜色更换透明色 commit 5cf57c4d2f757afe7a86000234e7fc181e20971d Merge: 5ca4f2be8 c97def5fc Author: joylink_fanyuhong <18706759286@163.com> Date: Mon Apr 22 17:16:40 2024 +0800 Merge remote-tracking branch 'origin/develop' into local-test commit 5ca4f2be8d4ad6e5151510dcf83fc89487319fd2 Merge: 66a376298 31376bc22 Author: joylink_fanyuhong <18706759286@163.com> Date: Mon Apr 22 16:10:23 2024 +0800 Merge remote-tracking branch 'origin/develop' into local-test commit 66a3762987deefd5bde89cf6af89dff82ddd7b9a Merge: 9dab09e4d 5be2cea1c Author: joylink_fanyuhong <18706759286@163.com> Date: Mon Apr 22 15:53:54 2024 +0800 Merge remote-tracking branch 'origin/develop' into local-test commit 9dab09e4d0b607f97fe8be34a6e60c7d65144f90 Merge: b8f90509e dda44c870 Author: joylink_fanyuhong <18706759286@163.com> Date: Mon Apr 22 09:33:42 2024 +0800 Merge remote-tracking branch 'origin/develop' into local-test commit b8f90509eba59880dcf393b31fb1275aaecfe07a Merge: 26d9cc892 5548806ea Author: joylink_fanyuhong <18706759286@163.com> Date: Sun Apr 21 17:51:33 2024 +0800 Merge remote-tracking branch 'origin/develop' into local-test commit 26d9cc892fb2d6774f7e848b4be7bc27011a1f0e Merge: ce8d3f453 3fc31777a Author: joylink_fanyuhong <18706759286@163.com> Date: Fri Apr 19 22:27:07 2024 +0800 Merge remote-tracking branch 'origin/develop' into local-test commit ce8d3f4531d4c2ab8da0637dd750a716423cd75b Author: fan Date: Fri Apr 19 22:25:43 2024 +0800 iscs退出仿真调整&iscs绘制地图调整 commit 98662ec1776a424ef1005436d33ae7a9d7cd272d Author: fan Date: Fri Apr 19 18:25:09 2024 +0800 实时广播问题调整&注释iscs信号系统&stationNav换成车站名称&iscs点击修改mode --- src/api/management/user.js | 8 ++ src/jmapNew/config/skinCode/fuzhou_01.js | 7 ++ src/jmapNew/config/skinCode/xian_02.js | 7 ++ src/jmapNew/shape/graph/Signal/index.js | 4 +- src/jmapNew/shape/graph/Switch/index.js | 10 +- src/permission.js | 2 +- src/router/index.js | 6 + src/views/contest/contestDetail.vue | 15 ++- .../contestSceneManage/ContestSceneManage.vue | 20 +++- .../contestSceneManage/addThree.vue | 108 ++++++++++++++++++ src/views/thirdLogin/cgyLogin.vue | 94 +++++++++++++++ 11 files changed, 270 insertions(+), 11 deletions(-) create mode 100644 src/views/contestDataManage/contestSceneManage/addThree.vue create mode 100644 src/views/thirdLogin/cgyLogin.vue diff --git a/src/api/management/user.js b/src/api/management/user.js index ce58557c0..f3d338776 100644 --- a/src/api/management/user.js +++ b/src/api/management/user.js @@ -323,3 +323,11 @@ export function isExistEmail(params) { }); } +// 成工院第三方登录 +export function cgyThirdLogin(data) { + return request({ + url: '/api/login/cgy/third', + method: 'post', + data + }); +} diff --git a/src/jmapNew/config/skinCode/fuzhou_01.js b/src/jmapNew/config/skinCode/fuzhou_01.js index eabf2a4fb..798f6cf4c 100644 --- a/src/jmapNew/config/skinCode/fuzhou_01.js +++ b/src/jmapNew/config/skinCode/fuzhou_01.js @@ -189,6 +189,13 @@ class SkinCode extends defaultStyle { }, lowButton:{ display: false // 现地 信号机按钮 + }, + transmission: { // 传输信号机 + fillColor: '#f00', + fillColorVirtual: '#f00', + sideLength: 20, + textColor: '#fff', + strokeColor: '#00FFFF' } }; diff --git a/src/jmapNew/config/skinCode/xian_02.js b/src/jmapNew/config/skinCode/xian_02.js index a4494c1c9..df720dc60 100644 --- a/src/jmapNew/config/skinCode/xian_02.js +++ b/src/jmapNew/config/skinCode/xian_02.js @@ -233,6 +233,13 @@ class SkinCode extends defaultStyle { fontSize: 12, distance: 20, defaultText: 'E' + }, + transmission: { // 传输信号机 + fillColor: '#f00', + fillColorVirtual: '#f00', + sideLength: 20, + textColor: '#fff', + strokeColor: '#00FFFF' } }; diff --git a/src/jmapNew/shape/graph/Signal/index.js b/src/jmapNew/shape/graph/Signal/index.js index a56432bbd..c9d2972a7 100644 --- a/src/jmapNew/shape/graph/Signal/index.js +++ b/src/jmapNew/shape/graph/Signal/index.js @@ -931,8 +931,8 @@ class Signal extends Group { // 隐藏自动信号和自动进路 setAutoClose() { if (this.style.Signal.auto.autoRouteType != 'text') { - this.sigAuto.hide(); - this.sigAuto.setColor(this.style.backgroundColor); + this.sigAuto && this.sigAuto.hide(); + this.sigAuto && this.sigAuto.setColor(this.style.backgroundColor); } else { this.sigName.setColor(this.style.Signal.text.defaultColor); } diff --git a/src/jmapNew/shape/graph/Switch/index.js b/src/jmapNew/shape/graph/Switch/index.js index 727fec8f4..93ee21274 100644 --- a/src/jmapNew/shape/graph/Switch/index.js +++ b/src/jmapNew/shape/graph/Switch/index.js @@ -326,9 +326,9 @@ export default class Switch extends Group { } this.name.getTextRect().animateStyle(true) - .when(0, { textFill: this.style.backgroundColor }) + .when(0, { textFill: this.style.transparentColor }) .when(1000, { textFill: this.style.Switch.text.borderColor }) - .when(2000, { textFill: this.style.backgroundColor }) + .when(2000, { textFill: this.style.transparentColor }) .start(); } @@ -354,7 +354,7 @@ export default class Switch extends Group { this.lockCircle && this.lockCircle.hide(); // 圆形包围框 this.lockArc && this.lockArc.hide(); // 圆形单锁框 this.name.getNameText().stopAnimation(false); - this.name.getTextRect().setStyle({ fill: this.style.backgroundColor }); + this.name.getTextRect().setStyle({ fill: this.style.transparentColor }); this.shapeModelC && this.shapeModelC.hide(); // 形状 C this.shapeModelA && this.shapeModelA.hide(); // 形状 A this.shapeModelB && this.shapeModelB.hide(); // 形状 B @@ -626,7 +626,7 @@ export default class Switch extends Group { } if (this.style.Switch.core.specialCircle) { - this.name.getTextRect().setStyle({ fill: this.style.backgroundColor }); + this.name.getTextRect().setStyle({ fill: this.style.transparentColor }); this.setTextColor(this.style.Switch.text.guideMasterLockColor); } else { this.setTextColor(this.style.Switch.text.monolockLocationColor); @@ -911,7 +911,7 @@ export default class Switch extends Group { this.setHasTextBorder(1, this.style.Switch.text.fpLockBorderColor); } if (this.style.Switch.core.specialCircle) { - this.name.getTextRect().setStyle({ fill: this.style.backgroundColor }); + this.name.getTextRect().setStyle({ fill: this.style.transparentColor }); this.setTextColor(this.style.Switch.text.fpLockColor); } } diff --git a/src/permission.js b/src/permission.js index ab779ede4..503736fb5 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ import { getFrontProjectConfigByLogin} from '@/api/projectConfig'; import localStore from 'storejs'; import { handlerUrl } from '@/utils/baseUrl'; -const whiteList = ['/login', '/design/login', '/loginNew', '/gzzbxy/relay', '/authorization', '/AUSline', '/AUStool', '/demo', '/thirdLogin']; // 不重定向白名单 +const whiteList = ['/login', '/design/login', '/loginNew', '/gzzbxy/relay', '/authorization', '/AUSline', '/AUStool', '/demo', '/thirdLogin', '/cgyLogin']; // 不重定向白名单 // 登录路径判断获取 function getRouteInfo(to) { diff --git a/src/router/index.js b/src/router/index.js index f24a40d53..71c357bef 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -220,6 +220,7 @@ const UserRulesManage = () => import('@/views/userRulesManage/index'); const AuthorityTransfer = () => import('@/views/authorityTransfer/index'); const CreateDistribute = () => import('@/views/authorityTransfer/create/index'); const ThirdJumpSim = () => import('@/views/newMap/display/thirdJump'); +const CgyLogin = () => import('@/views/thirdLogin/cgyLogin'); const TmsPage = () => import('@/views/jlmap3d/drive/sceneview/tmsPage'); const ContestSubjectManage = () => import('@/views/contestDataManage/contestSubjectManage/ContestSubjectManage'); @@ -430,6 +431,11 @@ export const constantRoutes = [ component: ThirdJumpSim, hidden: true }, + { + path: '/cgyLogin', + component: CgyLogin, + hidden: true + }, { path: '/404', component: Errpr404, diff --git a/src/views/contest/contestDetail.vue b/src/views/contest/contestDetail.vue index b353db0cf..f3e8b190e 100644 --- a/src/views/contest/contestDetail.vue +++ b/src/views/contest/contestDetail.vue @@ -44,7 +44,8 @@
评分表 - 开始任务 + 开始任务 + 开始任务 播放视频 下一任务
@@ -58,6 +59,7 @@ + diff --git a/src/views/thirdLogin/cgyLogin.vue b/src/views/thirdLogin/cgyLogin.vue new file mode 100644 index 000000000..69f83fdf6 --- /dev/null +++ b/src/views/thirdLogin/cgyLogin.vue @@ -0,0 +1,94 @@ + + +