From b1baeaabcd9449515a0884ce74b210ff2fd24dc4 Mon Sep 17 00:00:00 2001 From: joylink_fanyuhong <18706759286@163.com> Date: Tue, 7 May 2024 15:46:29 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=88=90=E9=83=BD=E5=B7=A5=E4=B8=9A?= =?UTF-8?q?=E5=AD=A6=E9=99=A2=E7=AC=AC=E4=B8=89=E6=96=B9=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/management/user.js | 8 +++ src/permission.js | 2 +- src/router/index.js | 6 ++ src/views/thirdLogin/cgyLogin.vue | 102 ++++++++++++++++++++++++++++++ 4 files changed, 117 insertions(+), 1 deletion(-) 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/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/thirdLogin/cgyLogin.vue b/src/views/thirdLogin/cgyLogin.vue new file mode 100644 index 000000000..4a2f940a9 --- /dev/null +++ b/src/views/thirdLogin/cgyLogin.vue @@ -0,0 +1,102 @@ + + + From ae74123f18850e56e80a8aac2c0567596a1bcf8e Mon Sep 17 00:00:00 2001 From: joylink_fanyuhong <18706759286@163.com> Date: Wed, 8 May 2024 09:17:37 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=88=90=E9=83=BD=E5=B7=A5=E5=AD=A6?= =?UTF-8?q?=E9=99=A2=E7=AC=AC=E4=B8=89=E6=96=B9=E7=99=BB=E5=BD=95=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/thirdLogin/cgyLogin.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/thirdLogin/cgyLogin.vue b/src/views/thirdLogin/cgyLogin.vue index 4a2f940a9..d4a39ff87 100644 --- a/src/views/thirdLogin/cgyLogin.vue +++ b/src/views/thirdLogin/cgyLogin.vue @@ -29,7 +29,7 @@ export default { const sessionId = this.$route.query.sessionId; const timeStamp = this.$route.query.timeStamp; const account = this.$route.query.account; - const name = this.$route.query.account; + const name = this.$route.query.name; const parentAccount = this.$route.query.parentAccount; const functionId = this.$route.query.functionId; if (appId && account && name) { From ef9165faa4d09042f1a45e088918e46be44ff77d Mon Sep 17 00:00:00 2001 From: joylink_fanyuhong <18706759286@163.com> Date: Thu, 16 May 2024 15:43:56 +0800 Subject: [PATCH 3/4] third --- src/views/thirdLogin/cgyLogin.vue | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/src/views/thirdLogin/cgyLogin.vue b/src/views/thirdLogin/cgyLogin.vue index d4a39ff87..69f83fdf6 100644 --- a/src/views/thirdLogin/cgyLogin.vue +++ b/src/views/thirdLogin/cgyLogin.vue @@ -10,6 +10,8 @@ import { cgyThirdLogin } from '@/api/management/user'; import { setToken } from '@/utils/auth'; import { createSimulation } from '@/api/simulation'; import { launchFullscreen } from '@/utils/screen'; +import { getMapFunctioById } from '@/api/trainingPlatform'; +import { getPublishMapInfo } from '@/api/jmap/map'; export default { name:'CgyLogin', @@ -58,26 +60,16 @@ export default { } }, methods:{ - enterSimulation() { + async enterSimulation() { const query = { - third: true + third: true, + query: 'cgy' }; - if (this.$route.query.type === 'loc') { - query.lineCode = '02'; - query.mapId = '124'; - query.simType = 'METRO'; - query.project = 'cgy'; - } else if (this.$route.query.type === 'datie') { - query.lineCode = '16'; - query.mapId = '157'; - query.simType = 'RAILWAY'; - query.project = 'cgy'; - } else if (this.$route.query.type === 'drts') { - query.lineCode = '13'; - query.mapId = '78'; - query.simType = 'METRO'; - query.project = 'cgy'; - } + const resp = await getMapFunctioById(this.$route.query.systemId); + query.mapId = resp.data.mapId; + query.simType = resp.data.simType; + const resp1 = await getPublishMapInfo(resp.data.mapId); + query.lineCode = resp1.data.lineCode; createSimulation(this.$route.query.systemId).then(resp => { query.group = resp.data; this.$router.replace({ path: `/display/demon`, query: query }); From 0c5bba7c0f0df1c04a91bac286c9a913deb98227 Mon Sep 17 00:00:00 2001 From: joylink_fanyuhong <18706759286@163.com> Date: Tue, 21 May 2024 16:47:37 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=A0=E8=BE=93=E4=BF=A1=E5=8F=B7?= =?UTF-8?q?=E6=9C=BA=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/config/skinCode/fuzhou_01.js | 7 +++++++ src/jmapNew/config/skinCode/xian_02.js | 7 +++++++ src/jmapNew/shape/graph/Signal/index.js | 4 ++-- 3 files changed, 16 insertions(+), 2 deletions(-) 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); }