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/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..69f83fdf6
--- /dev/null
+++ b/src/views/thirdLogin/cgyLogin.vue
@@ -0,0 +1,94 @@
+
+
+
+
+