diff --git a/src/jmapNew/config/deviceStyle.js b/src/jmapNew/config/deviceStyle.js
index 2bbb9a821..4cd3bdd4b 100644
--- a/src/jmapNew/config/deviceStyle.js
+++ b/src/jmapNew/config/deviceStyle.js
@@ -14,7 +14,8 @@ const mapDeviceStyle = {
'13': 'race_01', // 2020国赛线路
'14':'nanjing_02', // 南京二号线
'15': 'datie_01', // 大铁线路一
- '16': 'datie_02' // 大铁线路二
+ '16': 'datie_02', // 大铁线路二
+ '17':'datie_tky' // 铁科院大铁线路
};
export function selectLineCode(code) {
diff --git a/src/jmapNew/config/skinCode/datie_tky.js b/src/jmapNew/config/skinCode/datie_tky.js
new file mode 100644
index 000000000..ef93bc9e5
--- /dev/null
+++ b/src/jmapNew/config/skinCode/datie_tky.js
@@ -0,0 +1,148 @@
+import defaultStyle from '../defaultStyle';
+import deviceType from '../../constant/deviceType';
+class SkinCode extends defaultStyle {
+ constructor() {
+ super();
+ this.fontFamily = '宋体';
+ this[deviceType.Section] = {
+ elemnetType:['name', 'line', 'separator', 'badShunt', 'derailer'],
+ name: {
+ z: 10,
+ position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
+ distance: 10, // 文字离区段距离
+ fontSize: 12, // 字体大小
+ fontWeight: 'normal', // 字体粗细
+ fontColor: 'rgb(192,192,192)', // 字体颜色 (银白)
+ textAlign: 'center', // 水平对齐方式
+ textPosition: 'inside', // 文字位置
+ textVerticalAlign: 'middle', // 文字垂直对齐方式
+ approachColor: '#FFFFFF'
+ },
+ logicText: {
+ z: 10,
+ position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
+ distance: 12, // 文字离区段距离
+ fontSize: 11, // 字体大小
+ fontWeight: 'normal', // 字体粗细
+ fontColor: '#FFFFFF', // 字体颜色
+ textAlign: 'center', // 水平对齐方式
+ textPosition: 'inside', // 文字位置
+ textVerticalAlign: 'middle' // 文字垂直对齐方式
+ },
+ line: {
+ z: 0,
+ width: 3, // 区段宽度
+ beyondWidth: 0, // 区段宽超出宽度
+ invadeColor: '#FF0000', // 区段侵入颜色 (红色)
+ spareColor: 'rgb(85,120,182)', // 区段空闲颜色 (浅蓝)
+
+ communicationOccupiedColor: '#FF0000', // 区段通信车占用颜色 (红色)
+ unCommunicationOccupiedColor: '#FF0000', // 区段非通讯车占用颜色 (红色)
+
+ routeLockColor: '#FFFFFF', // 区段进路锁定颜色 (白色)
+ faultLockColor: '#006400', // 区段故障锁定颜色
+
+ undefinedColor: '#0071C1', // 区段未定义颜色
+ blockColor: '#00FF00', // 区段封锁颜色
+ atcExcisionColor: '#A0522D', // 区段atc切除颜色
+ atsExcisionColor: '#A0522D', // 区段ats切除颜色
+ timeReleaseColor: '#3F3F3F', // 区段延时释放颜色
+
+ protectiveLockColor: '#FFFF00', // 区段保护锁闭
+
+ protectiveTimeReleaseColor: '#0071C1', // 区段保护延时解锁
+ logicalColor: '#FFFF00', // 逻辑区段颜色 (未用)
+ logicalTextColor: '#C0C0C0', // 逻辑区段名称颜色 (未用)
+ invalidColor: '#B18E38' // 区段ARB故障颜色
+ }
+ };
+
+ this[deviceType.Signal] = {
+ distance: 10
+
+ };
+
+ this[deviceType.Psd] = {
+ elemnetType:['safetyDoorNormal'],
+ safetyDoorNormal: { // 屏蔽门
+ z:0,
+ height: 3, // 站台屏蔽门高度
+ distance: 8, // 站台和屏蔽门之间的距离
+ defaultColor: '#00FF00', // 屏蔽门默认颜色
+ splitDoorColor: '#C00808' // 屏蔽门切除颜色
+ },
+ text: {
+ fontSize: 11, // 字体大小
+ fontWeight: 'normal', // 字体粗细
+ distance: 5 // 灯跟文字距离
+ }
+ };
+
+ this[deviceType.StationStand] = {
+ // 站台元素 站台
+ elemnetType:['lineStand'],
+ // 站台
+ lineStand:{
+ // 层级
+ z:0,
+ spareColor: '#02cc3d', // 站台空闲颜色
+ lineWidth:2 // 线宽
+ // jumpStopColor: '#808080', // 站台跳停颜色
+ // designatedJumpStopColor: '#808080', // 站台指定列车跳停颜色
+ // headFontSize: 10, // 站台首端字体大小
+ // stopColor: '#FFF000' // 站台列车停站颜色
+ },
+ common: { // 通用属性
+ textFontSize: 10, // 站台默认字体大小
+ functionButtonShow: '03' // 功能灯按钮显示条件(prdType)
+ },
+ text: {
+ fontSize: 11, // 字体大小
+ fontWeight: 'normal', // 字体粗细
+ distance: 5 // 灯跟文字距离
+ }
+ };
+
+ this[deviceType.Station] = {
+ // 车站元素 车站名称
+ elemnetType:['stationText'],
+ stationText:{
+ z:0,
+ fontWeight:'normal', // 字体粗细
+ textPadding:[0, 0], // 字体边距
+ borderColor:'', // 字体边框颜色
+ textBorderWidth:0 // 字体边框宽度
+ },
+
+ text: {
+ fontSize: 11, // 字体大小
+ fontWeight: 'normal', // 字体粗细
+ distance: 5 // 灯跟文字距离
+ }
+ };
+
+ this[deviceType.Switch] = {
+ text: {
+ show: true, // 道岔名称显示
+ position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
+ offset: {x: 5, y: -10}, // 道岔名称与区段距离
+ fontSize: 11, // 字体大小
+ fontColor: '#fff', // 道岔名称颜色
+ fontWeight: 'normal', // 字体粗细
+ borderColor: '#FE0000', // 道岔边框颜色
+ lossColor: '#C00808', // 道岔失去颜色
+ locateColor: '#00FF00', // 道岔定位颜色
+ inversionColor: '#FFFF00', // 道岔反位颜色
+ monolockLocationColor: '#00FF00', // 道岔单锁'定位'颜色 (绿色)
+ monolockInversionColor: '#FFFF00', // 道岔单锁'反位'颜色 (黄色)
+ faultFlashing: false // 故障闪烁
+ }
+ };
+
+ this[deviceType.Train] = {
+ };
+
+ }
+}
+
+export default new SkinCode();
diff --git a/src/jmapNew/theme/datie_tky/operationConfig.js b/src/jmapNew/theme/datie_tky/operationConfig.js
new file mode 100644
index 000000000..88287eb76
--- /dev/null
+++ b/src/jmapNew/theme/datie_tky/operationConfig.js
@@ -0,0 +1,5 @@
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+export default {
+ list: [
+ ]
+};
diff --git a/src/jmapNew/theme/factory.js b/src/jmapNew/theme/factory.js
index 2135ca150..4d777321c 100644
--- a/src/jmapNew/theme/factory.js
+++ b/src/jmapNew/theme/factory.js
@@ -51,7 +51,8 @@ class Theme {
'13': 'race_01',
'14': 'nanjing_02', // 南京二号线
'15': 'datie_01',
- '16': 'datie_02'
+ '16': 'datie_02',
+ '17': 'datie_tky'
};
this._runplan = {
@@ -71,7 +72,8 @@ class Theme {
'13': 'race_01',
'14': 'nanjing_02', // 南京二号线
'15': 'datie_01',
- '16': 'datie_02'
+ '16': 'datie_02',
+ '17': 'datie_tky'
};
this._localShowMode = { // 现地显示模式
@@ -90,7 +92,8 @@ class Theme {
'13':'all',
'14':'ecStation',
'15':'all',
- '16':'ecStation'
+ '16':'ecStation',
+ '17': 'all'
};
}
diff --git a/src/scripts/ProjectConfig.js b/src/scripts/ProjectConfig.js
index d039dbced..5c8b9942e 100644
--- a/src/scripts/ProjectConfig.js
+++ b/src/scripts/ProjectConfig.js
@@ -730,6 +730,8 @@ export const ProjectIcon = {
designjxgm: FaviconRichor,
richorygy: FaviconRichor,
designrichorygy: FaviconRichor,
+ richorhhcj: FaviconRichor,
+ designrichorhhcj: FaviconRichor,
say: FaviconSay,
designsay: FaviconSay,
unittecsty: FaviconUnittec,
@@ -778,6 +780,8 @@ export const ProjectCode = {
designjxgm: 'JXGM',
richorygy: 'RICHOR_YGY',
designrichorygy: 'RICHOR_YGY',
+ richorhhcj: 'RICHOR_HHCJ',
+ designrichorhhcj: 'RICHOR_HHCJ',
hls: 'DEFAULT',
designhls: 'DEFAULT',
say: 'SAY',
@@ -791,35 +795,37 @@ export const ThirdLoginList = ['richor', 'designrichor', 'richorygy', 'designric
/** 底部栏仅展示公司信息不展示备案号 */
export const BottomColumnOnlyConInfo = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls',
'designhls', 'hyd', 'designhyd', 'cgy', 'designcgy', 'richor', 'richorlesson3d', 'richorjoint', 'designrichorjoint', 'nologo', 'designnologo', 'richorygy',
- 'designrichorygy', 'unittecsty', 'designunittecsty'];
+ 'designrichorygy', 'unittecsty', 'designunittecsty', 'richorhhcj', 'designrichorhhcj'];
/** 实训设计平台通过项目code获取地图列表的项目 */
export const GetMapListByProjectList = ['xty', 'designxty', 'gzb', 'designgzb', 'xadt', 'designxadt', 'heb', 'designheb', 'designdrts', 'drts', 'wjls',
'nty', 'designnty', 'sdy', 'designsdy', 'ntyc', 'designntyc', 'ntyl', 'designntyl', 'designbjd', 'cgy', 'designcgy', 'zzww', 'zzwwtest', 'richor',
'richorlesson3d', 'richorjoint', 'designrichorjoint', 'nologo', 'designnologo', 'srsandbox', 'designsrsandbox', 'designhlsdrts', 'hlsdrts', 'jxgm', 'designjxgm',
- 'richorygy', 'designrichorygy', 'say', 'designsay', 'unittecsty', 'designunittecsty'];
+ 'richorygy', 'designrichorygy', 'say', 'designsay', 'unittecsty', 'designunittecsty', 'richorhhcj', 'designrichorhhcj'];
/** 案例展示隐藏的项目 */
export const CaseHideProjectList = ['heb', 'designheb', 'cgy', 'designcgy'];
/** 登录页右下角版本开发基于不展示 */
export const VersionBaseNoShow = ['heb', 'designheb', 'hls', 'designhls', 'drts', 'wjls', 'hyd', 'designhyd', 'cgy', 'designcgy', 'xadt',
- 'designxadt', 'nologo', 'designnologo', 'srsandbox', 'designsrsandbox', 'designhlsdrts', 'hlsdrts', 'jxgm', 'designjxgm', 'xzexam', 'richorygy', 'designrichorygy'];
+ 'designxadt', 'nologo', 'designnologo', 'srsandbox', 'designsrsandbox', 'designhlsdrts', 'hlsdrts', 'jxgm', 'designjxgm', 'xzexam', 'richorygy', 'designrichorygy',
+ 'richorhhcj', 'designrichorhhcj'];
/** 登录页右下角主体不展示 */
export const MainBodyNoShow = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls',
'designhls', 'hyd', 'designhyd', 'cgy', 'designcgy', 'xadt', 'designxadt', 'richor', 'richorlesson3d', 'richorjoint', 'nologo', 'designnologo',
- 'srsandbox', 'designsrsandbox', 'designhlsdrts', 'hlsdrts', 'jxgm', 'designjxgm', 'xzexam', 'richorygy', 'designrichorygy', 'unittecsty', 'designunittecsty'];
+ 'srsandbox', 'designsrsandbox', 'designhlsdrts', 'hlsdrts', 'jxgm', 'designjxgm', 'xzexam', 'richorygy', 'designrichorygy', 'unittecsty', 'designunittecsty',
+ 'richorhhcj', 'designrichorhhcj'];
/** 登录页项目 title 登录输入框上方 大字体 加粗居中 */
export const ProjectLoginStyleList = ['gzb', 'designgzb', 'xty', 'designxty', 'xadt', 'designxadt', 'tky', 'designtky', 'jyd', 'designjyd', 'bxkc', 'designbxkc',
'crsc', 'designcrsc', 'hls', 'designhls', 'drts', 'wjls', 'hyd', 'designhyd', 'nty', 'designnty', 'bjd', 'designbjd', 'sdy', 'designsdy', 'ntyc', 'designntyc',
'ntyl', 'designntyl', 'cgy', 'designcgy', 'zzww', 'zzwwtest', 'srsandbox', 'designsrsandbox', 'designhlsdrts', 'hlsdrts', 'jxgm', 'designjxgm', 'xzexam',
- 'richorygy', 'designrichorygy', 'say', 'designsay', 'unittecsty', 'designunittecsty'];
+ 'richorygy', 'designrichorygy', 'say', 'designsay', 'unittecsty', 'designunittecsty', 'richorhhcj', 'designrichorhhcj'];
/** 登录页 登录输入框无二维码 */
export const NoQrcodeList = ['heb', 'designheb', 'cgy', 'designcgy', 'ntyl', 'designntyl'];
/** 综合演练 无二维码 */
export const NoSimulationQrCodeList = ['heb', 'bjd'];
export const RegisterCodeList = ['cgy', 'designcgy'];
/** 展示中航锐创联系我们 */
-export const RichorContectUsList = ['richor', 'richorygy'];
+export const RichorContectUsList = ['richor', 'richorygy', 'richorhhcj', 'designrichorhhcj'];
/** 帮助中不展示版权(福州 佛山) */
-export const NoCopyrightList = ['richor', 'richorygy'];
+export const NoCopyrightList = ['richor', 'richorygy', 'richorhhcj', 'designrichorhhcj'];
/** 导航栏快速切换平台 */
export const goOtherPlatformMenu = {
login: '/design/login',
@@ -867,7 +873,9 @@ export const goOtherPlatformMenu = {
say: '/design/login?project=say',
designsay: '/login?project=say',
unittecsty: '/design/login?project=unittecsty',
- designunittecsty: '/login?project=unittecsty'
+ designunittecsty: '/login?project=unittecsty',
+ richorhhcj: '/design/login?project=richorhhcj',
+ designrichorhhcj: '/login?project=richorhhcj'
};
export const ProjectList = [
{value:'xty', label:'西铁院'},
@@ -893,7 +901,8 @@ export const ProjectList = [
{value: 'jxgm', label: '江西工贸' },
{value: 'richor_ygy', label: '扬州工业'},
{value: 'say', label: '苏安院'},
- {value: 'unittec_sty', label: '众合-陕铁院'}
+ {value: 'unittec_sty', label: '众合-陕铁院'},
+ {value: 'richor_hhcj', label: '红河财经'}
];
/** 本地项目打包 */
export const localPackageProject = {
diff --git a/src/views/bigTrainRunplanManage/addRunplan.vue b/src/views/bigTrainRunplanManage/addRunplan.vue
index 6ecb487f7..21754963d 100644
--- a/src/views/bigTrainRunplanManage/addRunplan.vue
+++ b/src/views/bigTrainRunplanManage/addRunplan.vue
@@ -94,19 +94,14 @@
确定
-
diff --git a/src/views/bigTrainRunplanManage/trainFixedPath.vue b/src/views/bigTrainRunplanManage/trainFixedPath.vue
index 8cbb64706..883bb6071 100644
--- a/src/views/bigTrainRunplanManage/trainFixedPath.vue
+++ b/src/views/bigTrainRunplanManage/trainFixedPath.vue
@@ -407,7 +407,7 @@ export default {
data.arriveTime = this.coverTime(data.arriveTime);
data.departTime = this.coverTime(data.departTime);
return data.stationCode == this.currentStationCode;
-
+
});
// stationCode 车站编码
// trackSectionCode 运行计划的默认股道
diff --git a/src/views/system/deviceManage/index.vue b/src/views/system/deviceManage/index.vue
index fa6324d63..177d0ec5b 100644
--- a/src/views/system/deviceManage/index.vue
+++ b/src/views/system/deviceManage/index.vue
@@ -47,6 +47,7 @@ export default {
{label: '上饶沙盘', value: 'SR_SANDBOX'},
{label: '江西工贸', value: 'JXGM'},
{label: '扬州工业', value: 'RICHOR_YGY'},
+ {label: '红河财经', value: 'RICHOR_HHCJ'},
{label: '苏安院', value: 'SAY'},
{label: '众合-陕铁院', value: 'UNITTEC_STY'}
],
@@ -60,7 +61,8 @@ export default {
designjxgm: 'JXGM',
designygy: 'RICHOR_YGY',
designsay: 'SAY',
- designunittecsty: 'UNITTEC_STY'
+ designunittecsty: 'UNITTEC_STY',
+ designrichorhhcj: 'RICHOR_HHCJ'
},
queryForm: {
labelWidth: '120px',