diff --git a/src/App.vue b/src/App.vue
index 1bc2274ca..10e0788ac 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -80,8 +80,9 @@ export default {
},
created() {
this.project = getSessionStorage('project');
- if (this.project) {
- document.querySelector("link[rel*='icon']").href = loginInfo[this.project].linkIcon || ProjectIcon[this.project];
+ const linkIcon = loginInfo[this.project] ? loginInfo[this.project].linkIcon : (ProjectIcon[this.project] || '');
+ if (this.project && linkIcon) {
+ document.querySelector("link[rel*='icon']").href = linkIcon;
}
},
mounted() {
diff --git a/src/api/trainingPlatform.js b/src/api/trainingPlatform.js
index 842b033cc..906be28c8 100644
--- a/src/api/trainingPlatform.js
+++ b/src/api/trainingPlatform.js
@@ -146,3 +146,50 @@ export function updateMapFunctionSubset(data) {
data
});
}
+/** 根据模板生成地图功能 */
+export function generateMapFunctionByTemplate(data) {
+ return request({
+ url: `/api/mapFunction/generate/from/template`,
+ method: 'post',
+ data
+ });
+}
+/** 创建模板线路功能 */
+export function createTemplateMapFunction(data) {
+ return request({
+ url: `/api/mapFunction/template`,
+ method: 'post',
+ data
+ });
+}
+/** 修改模板线路功能 */
+export function updateTemplateMapFunction(data) {
+ return request({
+ url: `/api/mapFunction/template/${data.id}`,
+ method: 'put',
+ data
+ });
+}
+/** 删除模板线路功能 */
+export function deleteTemplateMapFunction(id) {
+ return request({
+ url: `/api/mapFunction/template/${id}`,
+ method: 'delete'
+ });
+}
+/** 查询模板线路功能列表 */
+export function queryTemplateMapFunctionList(params) {
+ return request({
+ url: `/api/mapFunction/template/list`,
+ method: 'get',
+ params
+ });
+}
+/** 分页查询模板线路功能列表 */
+export function queryTemplateMapFunPaged(params) {
+ return request({
+ url: `/api/mapFunction/template/paged`,
+ method: 'get',
+ params
+ });
+}
diff --git a/src/i18n/langs/en/login.js b/src/i18n/langs/en/login.js
index c241f5567..e082e8152 100644
--- a/src/i18n/langs/en/login.js
+++ b/src/i18n/langs/en/login.js
@@ -18,5 +18,7 @@ export default {
getLoginQrCode: 'Failed to get login qr code, please refresh and try again',
language: 'Language',
clickSwitchLanguage: 'Click switch language',
- accountName: 'Account name'
+ accountName: 'Account name',
+ registerAccount: 'Register account',
+ forgetPassword: 'Forget password?'
};
diff --git a/src/i18n/langs/zh/login.js b/src/i18n/langs/zh/login.js
index fc3fdbcd7..864a59201 100644
--- a/src/i18n/langs/zh/login.js
+++ b/src/i18n/langs/zh/login.js
@@ -18,5 +18,7 @@ export default {
getLoginQrCode: '获取登录二维码失败，请刷新重试',
language: '语言',
clickSwitchLanguage: '点击切换语言',
- accountName: '账户名'
+ accountName: '账户名',
+ registerAccount: '注册账号',
+ forgetPassword: '忘记密码？'
};
diff --git a/src/jmapNew/shape/graph/Station/index.js b/src/jmapNew/shape/graph/Station/index.js
index 17c0e364c..2035ad1ea 100644
--- a/src/jmapNew/shape/graph/Station/index.js
+++ b/src/jmapNew/shape/graph/Station/index.js
@@ -169,7 +169,7 @@ export default class Station extends Group {
return item.includes('lineCode=16');
});
const pic = store.state.map.picture;
- if ((queryCtc && model.createControlMode) || (pic == 'trafficTerminal' && queryCtcLineCode)) {
+ if ((queryCtc || (pic == 'trafficTerminal' && queryCtcLineCode)) && model.createControlMode) {
this.createCtcControlMode();
} else if (this.style.Station.StationControl.special) {
if (model.visible && model.createControlMode) { // model.createControlMode 控制模式
diff --git a/src/jmapNew/theme/components/utils/menuOperate.js b/src/jmapNew/theme/components/utils/menuOperate.js
index abfa281ed..a66ed6275 100644
--- a/src/jmapNew/theme/components/utils/menuOperate.js
+++ b/src/jmapNew/theme/components/utils/menuOperate.js
@@ -74,6 +74,16 @@ export const menuOperate = {
// 添加备用车 (大铁线路 车次号 非车组号)
operation: OperationEvent.Section.addSpareTrain.menu.operation,
cmdType: CMD.Section.CMD_TRAIN_LOAD_TRIP_NUMBER_TRAIN
+ },
+ defectiveShunting:{
+ // 分路不良
+ operation: OperationEvent.Section.defectiveShunting.menu.operation,
+ cmdType: CMD.Section.CMD_SECTION_DEFECTIVE_SHUNTING
+ },
+ cancelDefectiveShunting:{
+ // 取消分路不良
+ operation: OperationEvent.Section.cancelDefectiveShunting.menu.operation,
+ cmdType: CMD.Section.CMD_SECTION_DEFECTIVE_SHUNTING
}
},
Signal:{
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/childDialog/defectivePasswordBox.vue b/src/jmapNew/theme/datie_02/menus/dialog/childDialog/defectivePasswordBox.vue
index 7845e7a5b..03a1e195a 100644
--- a/src/jmapNew/theme/datie_02/menus/dialog/childDialog/defectivePasswordBox.vue
+++ b/src/jmapNew/theme/datie_02/menus/dialog/childDialog/defectivePasswordBox.vue
@@ -33,6 +33,7 @@
-
diff --git a/src/views/publish/publishMap/index.vue b/src/views/publish/publishMap/index.vue
index c8ea9f9f3..f17c6f5a3 100644
--- a/src/views/publish/publishMap/index.vue
+++ b/src/views/publish/publishMap/index.vue
@@ -66,7 +66,7 @@ export default {
queryForm: {
labelWidth: '80px',
reset: true,
- leftSpan: 17,
+ leftSpan: 15,
queryObject: {
name: {
type: 'text',
@@ -223,7 +223,8 @@ export default {
{ text: '地图排序', handler: this.mapSort },
{ text: '导出', handler: this.localExport, show: () => { return this.$store.state.user.roles.includes(superAdmin); }},
{ text: '导入', handler: this.localImport, fileType: 'file', show: () => { return this.$store.state.user.roles.includes(superAdmin); }},
- { text: '一键校验', handler: this.allCheck }
+ { text: '一键校验', handler: this.allCheck },
+ { text: '线路功能模板', handler: this.templateLineFunctionShow }
]
},
@@ -416,6 +417,9 @@ export default {
this.$message.error('一键校验地图数据失败：' + e.message);
});
},
+ templateLineFunctionShow() {
+ this.$router.push({path:'/systemManagement/lineDataManage/mapFunTem'});
+ },
localExport() {
this.$refs['localMap'].doShow();
},
diff --git a/src/views/publish/publishMap/mapFunctionTemplate/edit.vue b/src/views/publish/publishMap/mapFunctionTemplate/edit.vue
new file mode 100644
index 000000000..7d0ffc45a
--- /dev/null
+++ b/src/views/publish/publishMap/mapFunctionTemplate/edit.vue
@@ -0,0 +1,438 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/publish/publishMap/subsystem.vue b/src/views/publish/publishMap/subsystem.vue
index 64bcfe080..849a7de65 100644
--- a/src/views/publish/publishMap/subsystem.vue
+++ b/src/views/publish/publishMap/subsystem.vue
@@ -10,13 +10,19 @@
center
>
-
-
-
-
-
+
+
+
+
+
+