-
-
-
+
+
-
+
diff --git a/src/views/components/filterCity/index.vue b/src/views/components/filterCity/index.vue
index 31fa093f8..28abc0fc8 100644
--- a/src/views/components/filterCity/index.vue
+++ b/src/views/components/filterCity/index.vue
@@ -6,7 +6,7 @@
:size="size"
popper-class="cascader"
:options="filterOptions"
- placeholder="请选择城市和线路"
+ :placeholder="$t('global.chooseCityAndRoute')"
@change="filterSelectChange"
/>
@@ -46,7 +46,8 @@ export default {
}
},
queryFunction: {
- type: Function
+ type: Function,
+ required: true
}
},
data() {
diff --git a/src/views/components/font/index.vue b/src/views/components/font/index.vue
index 19ff82a64..7211f8b8c 100644
--- a/src/views/components/font/index.vue
+++ b/src/views/components/font/index.vue
@@ -1,73 +1,73 @@
-
+
+ 语言
+
退出
+
-
- 添加记录
+ {{$t('orderAuthor.addRecords')}}
-
+
{{ computedName(PermissionTypeList, scope.row.permissionType) }}
-
+
- 删除
+ {{$t('global.delete')}}
@@ -36,9 +36,9 @@
- 打包
- 获取二维码
- 返回
+ {{$t('orderAuthor.packaging')}}
+ {{$t('orderAuthor.obtainQrCode')}}
+ {{$t('global.return')}}
{
if (index === 0) {
- sums[index] = '总数';
+ sums[index] = this.$t('orderAuthor.totalNumber');
return;
}
@@ -174,14 +174,14 @@ export default {
permissionDistributePackage(dis).then(resp => {
this.urlInfo = {
url: resp.data,
- title: '权限分发二维码'
+ title: this.$t('orderAuthor.permissionToDistributeQRCode')
};
this.qrCodeShow();
}).catch(() => {
- this.$messageBox('权限分发打包失败');
+ this.$messageBox(this.$t('orderAuthor.packagingFailed'));
});
} else {
- this.$messageBox('请选择打包记录');
+ this.$messageBox(this.$t('orderAuthor.selectPackagingRecord'));
}
},
qrCodeShow() {
From 45417f0072e7e6fde169291887d9468314ca2d87 Mon Sep 17 00:00:00 2001
From: ival <610568032@qq.com>
Date: Tue, 13 Aug 2019 18:14:19 +0800
Subject: [PATCH 012/172] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/PopMenu/index.vue | 1 +
.../map/mapdraft/mapmanage/operateMenu.vue | 95 +++++----
src/views/map/runplan/manage/list.vue | 8 +-
src/views/mapsystem/plugin/src/poptip.vue | 181 +++++++++---------
src/views/mapsystem/plugin/src/tip.vue | 40 ++--
5 files changed, 161 insertions(+), 164 deletions(-)
diff --git a/src/components/PopMenu/index.vue b/src/components/PopMenu/index.vue
index 11ff9d66b..b6cc9acb8 100644
--- a/src/components/PopMenu/index.vue
+++ b/src/components/PopMenu/index.vue
@@ -221,6 +221,7 @@ export default {
width: 100%;
border-radius: unset;
border: 1px solid transparent;
+ color: #000;
}
.dsp-block:hover {
diff --git a/src/views/map/mapdraft/mapmanage/operateMenu.vue b/src/views/map/mapdraft/mapmanage/operateMenu.vue
index f22a1781d..9693acbdd 100644
--- a/src/views/map/mapdraft/mapmanage/operateMenu.vue
+++ b/src/views/map/mapdraft/mapmanage/operateMenu.vue
@@ -42,7 +42,6 @@ export default {
},
data() {
return {
- menuShow: false,
menuMap: [
{
label: this.$t('map.updateObj'),
@@ -89,24 +88,24 @@ export default {
handler: this.jlmap3d
}
],
- menuNormal:[],
- menu: []
+ menuNormal: [],
+ menu: []
};
},
- computed: {
- ...mapGetters('map', [
- 'stationList'
- ]),
- },
+ computed: {
+ ...mapGetters('map', [
+ 'stationList'
+ ])
+ },
watch: {
'$store.state.menuOperation.menuCount': function (val) {
if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Map)) {
- this.menu = [ ...this.menuMap]
+ this.menu = [...this.menuMap];
this.doShow(this.$store.state.menuOperation.menuPosition);
- } else if(this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Cancel)){
- this.initCancelMenu();
- this.doShow(this.$store.state.menuOperation.menuPosition);
- }else {
+ } else if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Cancel)) {
+ this.initCancelMenu();
+ this.doShow(this.$store.state.menuOperation.menuPosition);
+ } else {
this.doClose();
}
}
@@ -126,13 +125,11 @@ export default {
if (this.$refs && this.$refs.popMenu) {
this.$refs.popMenu.resetShowPosition(point);
}
- this.menuShow = true;
},
doClose() {
if (this.$refs && this.$refs.popMenu) {
this.$refs.popMenu.close();
}
- this.menuShow = false;
},
updateObj() {
this.doClose();
@@ -200,43 +197,43 @@ export default {
refresh() {
this.$emit('refresh');
},
- initCancelMenu() {
- this.menuNormal = [];
- this.stationList.forEach(station => {
- if (station.code === station.concentrateStationCode) {
- let node = {
- label: station.name,
- children: []
- };
+ initCancelMenu() {
+ this.menuNormal = [];
+ this.stationList.forEach(station => {
+ if (station.code === station.concentrateStationCode) {
+ const node = {
+ label: station.name,
+ children: []
+ };
- this.stationList.forEach(elem => {
- if (elem.visible) {
- let next = elem;
- while (next.code != next.concentrateStationCode || !next.concentrateStationCode) {
- next = this.$store.getters['map/getDeviceByCode'](next.concentrateStationCode);
- }
+ this.stationList.forEach(elem => {
+ if (elem.visible) {
+ let next = elem;
+ while (next.code != next.concentrateStationCode || !next.concentrateStationCode) {
+ next = this.$store.getters['map/getDeviceByCode'](next.concentrateStationCode);
+ }
- if (station.code == next.code) {
- node.children.push({
- code: elem.code,
- label: elem.name,
- handler: this.mapLocation,
- });
- }
- }
- });
+ if (station.code == next.code) {
+ node.children.push({
+ code: elem.code,
+ label: elem.name,
+ handler: this.mapLocation
+ });
+ }
+ }
+ });
- this.menuNormal.push(node);
- }
- });
- this.menu = [ ...this.menuNormal ]
- },
- mapLocation(item) {
- if (item) {
- this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: item.code });
- this.doClose();
- }
- },
+ this.menuNormal.push(node);
+ }
+ });
+ this.menu = [...this.menuNormal];
+ },
+ mapLocation(item) {
+ if (item) {
+ this.doClose();
+ this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: item.code });
+ }
+ }
}
};
diff --git a/src/views/map/runplan/manage/list.vue b/src/views/map/runplan/manage/list.vue
index e2a14b813..aabb95840 100644
--- a/src/views/map/runplan/manage/list.vue
+++ b/src/views/map/runplan/manage/list.vue
@@ -18,11 +18,11 @@
>
-
+
+
+
- {{ node.label }}
+
diff --git a/src/views/mapsystem/plugin/src/poptip.vue b/src/views/mapsystem/plugin/src/poptip.vue
index 55aba007f..56808d623 100644
--- a/src/views/mapsystem/plugin/src/poptip.vue
+++ b/src/views/mapsystem/plugin/src/poptip.vue
@@ -1,101 +1,100 @@
-
{{ $t('orderAuthor.packaging') }}
{{ $t('orderAuthor.obtainQrCode') }}
- {{ $t('global.return') }}
+ {{ $t('global.back') }}
{ return this.$store.state.user.roles.indexOf(superAdmin) < 0; },
buttons: [
{
From 28c6e05c412a08bb6339414c3d43d0e1cf78b0a9 Mon Sep 17 00:00:00 2001
From: ival <610568032@qq.com>
Date: Tue, 20 Aug 2019 09:55:49 +0800
Subject: [PATCH 097/172] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96?=
=?UTF-8?q?=E5=88=97=E8=BD=A6=E6=95=B0=E6=8D=AE=E6=B2=A1=E6=9C=89=E5=88=B7?=
=?UTF-8?q?=E6=96=B0=EF=BC=8C=E5=AF=BC=E8=87=B4=E5=8A=A0=E8=BD=BD=E7=9A=84?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/i18n/langs/en/global.js | 4 +-
src/i18n/langs/zh/global.js | 4 +-
.../menus/menuDialog/viewTrainId.vue | 349 +++++++++---------
.../menus/menuDialog/viewTrainId.vue | 326 ++++++++--------
.../menus/menuDialog/viewTrainId.vue | 326 ++++++++--------
.../menus/menuDialog/viewTrainId.vue | 2 +-
src/store/modules/training.js | 2 +-
src/utils/baseUrl.js | 4 +-
src/views/jlmap/index.vue | 1 +
src/views/jointTraining/chartView.vue | 2 +-
10 files changed, 517 insertions(+), 503 deletions(-)
diff --git a/src/i18n/langs/en/global.js b/src/i18n/langs/en/global.js
index a9c48b43b..5f7dc44cc 100644
--- a/src/i18n/langs/en/global.js
+++ b/src/i18n/langs/en/global.js
@@ -75,8 +75,8 @@ export default {
synthesisTrainingTitle: 'Synthesis Training Fast Entrance',
pleaseChooseRoom: 'You did not choose a room',
inviteJoinRoom: 'Invite you to join the synthesis training!',
- trainingHasStart: "(name)'s room has begun",
- trainingNotStart: "(name)'s room hasn't started yet",
+ trainingHasStart: "{name}'s room has begun",
+ trainingNotStart: "{name}'s room hasn't started yet",
inputRoomNumber: 'Please enter the room number.',
chooseRoom: 'Choose Room',
month: 'month'
diff --git a/src/i18n/langs/zh/global.js b/src/i18n/langs/zh/global.js
index bf10e77db..a54e0ebcf 100644
--- a/src/i18n/langs/zh/global.js
+++ b/src/i18n/langs/zh/global.js
@@ -76,8 +76,8 @@ export default {
synthesisTrainingTitle: '综合演练快速入口',
pleaseChooseRoom: '您没有选择房间',
inviteJoinRoom: '邀请你加入综合演练！',
- trainingHasStart: '{{name}}的房间已开始',
- trainingNotStart: '{{name}}的房间未开始',
+ trainingHasStart: '{name}的房间已开始',
+ trainingNotStart: '{name}的房间未开始',
inputRoomNumber: '请输入房间号',
chooseRoom: '选择房间',
month: '月'
diff --git a/src/jmap/theme/batong_01/menus/menuDialog/viewTrainId.vue b/src/jmap/theme/batong_01/menus/menuDialog/viewTrainId.vue
index 96fdd3fa4..5ef35ef0f 100644
--- a/src/jmap/theme/batong_01/menus/menuDialog/viewTrainId.vue
+++ b/src/jmap/theme/batong_01/menus/menuDialog/viewTrainId.vue
@@ -1,183 +1,188 @@
-
-
-
- 确定
-
-
- 取 消
-
+
+
+
+ 确定
+
+
+ 取 消
+
+
+
\ No newline at end of file
+ this.$store.dispatch('map/updateMapDevices', updatList);
+ }
+ },
+ trainNameFormatBy(mode) {
+ switch (mode.toString()) {
+ case '1': return 'serverNo:trainNo'; // 表号+车次号
+ case '2': return 'serverNo:trainNumber'; // 表号+车组号
+ case '3': return 'targetCode:trainNo'; // 目的地号+车次号
+ case '4': return 'targetCode:trainNumber'; // 目的地号+车组号
+ case '5': return 'targetCode:serverNo:trainNo'; // 目的地号+表号+车次号
+ case '6': return 'targetCode:serverNo:trainNumber'; // 目的地号+表号+车组号
+ }
+ return ''; // 无格式类型
+ }
+ }
+};
+
diff --git a/src/jmap/theme/beijing_01/menus/menuDialog/viewTrainId.vue b/src/jmap/theme/beijing_01/menus/menuDialog/viewTrainId.vue
index b3318c33b..4cbeb6cb4 100644
--- a/src/jmap/theme/beijing_01/menus/menuDialog/viewTrainId.vue
+++ b/src/jmap/theme/beijing_01/menus/menuDialog/viewTrainId.vue
@@ -1,77 +1,84 @@
-
-
-
- 确定
-
-
- 取 消
-
+
+
+
+ 确定
+
+
+ 取 消
+
+
+
\ No newline at end of file
+ this.$store.dispatch('map/updateMapDevices', updatList);
+ }
+ },
+ trainNameFormatBy(mode) {
+ switch (mode.toString()) {
+ case '1': return 'serviceNumber:tripNumber'; // 表号+车次号
+ case '2': return 'serviceNumber:groupNumber'; // 表号+车组号
+ case '3': return 'targetCode:tripNumber'; // 目的地号+车次号
+ case '4': return 'targetCode:groupNumber'; // 目的地号+车组号
+ case '5': return 'targetCode:serviceNumber:tripNumber'; // 目的地号+表号+车次号
+ case '6': return 'targetCode:serviceNumber:groupNumber'; // 目的地号+表号+车组号
+ }
+ return ''; // 无格式类型
+ }
+ }
+};
+
diff --git a/src/jmap/theme/chengdu_03/menus/menuDialog/viewTrainId.vue b/src/jmap/theme/chengdu_03/menus/menuDialog/viewTrainId.vue
index 888ba8d38..d3cde99aa 100644
--- a/src/jmap/theme/chengdu_03/menus/menuDialog/viewTrainId.vue
+++ b/src/jmap/theme/chengdu_03/menus/menuDialog/viewTrainId.vue
@@ -1,77 +1,84 @@
-
-
-
- 确定
-
-
- 取 消
-
+
+
+
+ 确定
+
+
+ 取 消
+
+
+
\ No newline at end of file
+ this.$store.dispatch('map/updateMapDevices', updatList);
+ }
+ },
+ trainNameFormatBy(mode) {
+ switch (mode.toString()) {
+ case '1': return 'serviceNumber:tripNumber'; // 表号+车次号
+ case '2': return 'serviceNumber:groupNumber'; // 表号+车组号
+ case '3': return 'targetCode:tripNumber'; // 目的地号+车次号
+ case '4': return 'targetCode:groupNumber'; // 目的地号+车组号
+ case '5': return 'targetCode:serviceNumber:tripNumber'; // 目的地号+表号+车次号
+ case '6': return 'targetCode:serviceNumber:groupNumber'; // 目的地号+表号+车组号
+ }
+ return ''; // 无格式类型
+ }
+ }
+};
+
diff --git a/src/jmap/theme/fuzhou_01/menus/menuDialog/viewTrainId.vue b/src/jmap/theme/fuzhou_01/menus/menuDialog/viewTrainId.vue
index ea4dd99f4..a40e6f049 100644
--- a/src/jmap/theme/fuzhou_01/menus/menuDialog/viewTrainId.vue
+++ b/src/jmap/theme/fuzhou_01/menus/menuDialog/viewTrainId.vue
@@ -166,7 +166,7 @@ export default {
},
setTrainDispaly() {
const updatlist = [];
- const trainList = this.$store.getters['training/viewTrainList'];
+ const trainList = this.$store.getters['training/viewTrainList']();
if (trainList && trainList.length > 0) {
const nameFormat = this.trainNameFormatBy(this.planMode);
const nameFontSize = this.fontSize;
diff --git a/src/store/modules/training.js b/src/store/modules/training.js
index 3f089b514..573bccfeb 100644
--- a/src/store/modules/training.js
+++ b/src/store/modules/training.js
@@ -78,7 +78,7 @@ const training = {
return state.roles;
},
// 视图中的列车列表
- viewTrainList: (state) => {
+ viewTrainList: (state) => () =>{
const trainList = [];
const mapDevice = Vue.prototype.$jlmap.mapDevice;
Object.values(mapDevice).forEach(device => {
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 4050e7e22..2e575c51e 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -3,9 +3,9 @@ export function getBaseUrl() {
let BASE_API;
if (process.env.NODE_ENV === 'development') {
// BASE_API = 'https://joylink.club/jlcloud';
- // BASE_API = 'https://test.joylink.club/jlcloud';
+ BASE_API = 'https://test.joylink.club/jlcloud';
// BASE_API = 'http://192.168.3.5:9000'; // 袁琪
- BASE_API = 'http://192.168.3.6:9000'; // 旭强
+ // BASE_API = 'http://192.168.3.6:9000'; // 旭强
// BASE_API = 'http://192.168.3.4:9000' // 琰培
} else {
BASE_API = process.env.VUE_APP_BASE_API;
diff --git a/src/views/jlmap/index.vue b/src/views/jlmap/index.vue
index a03ae0f20..fae4fa351 100644
--- a/src/views/jlmap/index.vue
+++ b/src/views/jlmap/index.vue
@@ -116,6 +116,7 @@ export default {
EventBus.$off('refresh');
EventBus.$off('viewLoading');
EventBus.$off('viewProgressAt');
+ this.$store.dispatch('map/mapClear');
if (this.$jlmap) {
this.$jlmap.dispose();
}
diff --git a/src/views/jointTraining/chartView.vue b/src/views/jointTraining/chartView.vue
index 913def256..7609cc58f 100644
--- a/src/views/jointTraining/chartView.vue
+++ b/src/views/jointTraining/chartView.vue
@@ -297,7 +297,7 @@ export default {
},
// 更新列车列表
updateTrainList() {
- const list = this.$store.getters['training/viewTrainList'];
+ const list = this.$store.getters['training/viewTrainList']();
if (this.treeData[4].children.length != list.length) {
this.treeData[4].children = [];
if (list && list.length) {
From c718ea2f4135801faa1dcb609e7bf2278bd53d50 Mon Sep 17 00:00:00 2001
From: ival <610568032@qq.com>
Date: Tue, 20 Aug 2019 10:23:59 +0800
Subject: [PATCH 098/172] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=BC=E5=90=88?=
=?UTF-8?q?=E6=BC=94=E7=BB=83=E5=8A=A0=E5=85=A5=E6=88=BF=E9=97=B4=E6=9C=AA?=
=?UTF-8?q?=E5=8A=A0=E8=BD=BD=E5=9C=B0=E5=9B=BE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/display/index.vue | 54 +++++++++++++++++--------------
src/views/jointTraining/index.vue | 16 +++++----
2 files changed, 40 insertions(+), 30 deletions(-)
diff --git a/src/views/display/index.vue b/src/views/display/index.vue
index 03d401224..76819dbe0 100644
--- a/src/views/display/index.vue
+++ b/src/views/display/index.vue
@@ -146,6 +146,18 @@ export default {
...mapGetters('config', [
'canvasId'
]),
+ trainingId() {
+ return this.$route.query.trainingId;
+ },
+ skinCode() {
+ return this.$route.query.skinCode;
+ },
+ mapId() {
+ return this.$route.query.mapId;
+ },
+ prdType() {
+ return this.$route.query.prdType;
+ },
isLesson() {
return this.mode === 'teach' || this.mode === 'record' || this.mode === 'manage';
},
@@ -168,10 +180,7 @@ export default {
return this.mode === 'plan';
},
isDrive() {
- return this.$route.query.prdType == '04';
- },
- trainingId() {
- return this.$route.query.trainingId;
+ return this.prdType == '04';
}
},
watch: {
@@ -199,7 +208,9 @@ export default {
});
},
$route() {
- this.initLoadData();
+ this.$nextTick(() => {
+ this.initLoadData();
+ });
}
},
async created() {
@@ -315,7 +326,7 @@ export default {
async loadSimulationInfo() {
const resp = await getSimulationInfo(this.group);
if (resp && resp.code == 200) {
- this.$store.dispatch('scriptRecord/updateSimulationPause',resp.data.pause);
+ this.$store.dispatch('scriptRecord/updateSimulationPause', resp.data.pause);
this.questId = Number(resp.data.questId) || 0;
}
},
@@ -381,9 +392,8 @@ export default {
this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
this.$store.dispatch('training/setPrdType', '');
- const skinCode = this.$route.query.skinCode;
- if (parseInt(skinCode)) {
- await this.loadMapData(skinCode);
+ if (parseInt(this.skinCode)) {
+ await this.loadMapData(this.skinCode);
} else {
this.endViewLoading();
@@ -393,11 +403,10 @@ export default {
async initLoadDemonData() {
this.$store.dispatch('training/end', TrainingMode.NORMAL);
this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
- this.$store.dispatch('training/setPrdType', this.prdTypeMap[this.$route.query.prdType]);
+ this.$store.dispatch('training/setPrdType', this.prdTypeMap[this.prdType]);
- const skinCode = this.$route.query.skinCode;
- if (parseInt(skinCode)) {
- await this.loadMapData(skinCode);
+ if (parseInt(this.skinCode)) {
+ await this.loadMapData(this.skinCode);
} else {
this.endViewLoading();
@@ -409,9 +418,8 @@ export default {
this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
this.$store.dispatch('training/setPrdType', '01');
- const skinCode = this.$route.query.skinCode;
- if (parseInt(skinCode)) {
- await this.loadMapData(skinCode);
+ if (parseInt(this.skinCode)) {
+ await this.loadMapData(this.skinCode);
} else {
this.endViewLoading();
@@ -423,9 +431,8 @@ export default {
this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
this.switchMode('01');
- const mapId = this.$route.query.mapId;
- if (parseInt(mapId)) {
- await this.loadMapDataById(mapId);
+ if (parseInt(this.mapId)) {
+ await this.loadMapDataById(this.mapId);
} else {
this.endViewLoading();
}
@@ -436,9 +443,8 @@ export default {
this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
this.$store.dispatch('training/setPrdType', '01');
- const skinCode = this.$route.query.skinCode;
- if (parseInt(skinCode)) {
- await this.loadMapData(skinCode);
+ if (parseInt(this.skinCode)) {
+ await this.loadMapData(this.skinCode);
} else {
this.endViewLoading();
@@ -531,11 +537,11 @@ export default {
if (this.isDrive) {
this.panelShow = false;
this.drivingShow = true;
- this.$refs.Jl3dDrive.show(this.$route.query.skinCode);
+ this.$refs.Jl3dDrive.show(this.skinCode);
} else {
this.panelShow = false;
this.simulationShow = true;
- this.$refs.Jl3dSimulation.show(this.$route.query.skinCode);
+ this.$refs.Jl3dSimulation.show(this.skinCode);
}
},
showpanel() {
diff --git a/src/views/jointTraining/index.vue b/src/views/jointTraining/index.vue
index 78b59f78b..eee930af4 100644
--- a/src/views/jointTraining/index.vue
+++ b/src/views/jointTraining/index.vue
@@ -89,7 +89,10 @@ export default {
]),
...mapGetters('config', [
'canvasId'
- ])
+ ]),
+ skinCode() {
+ return this.$route.query.skinCode;
+ }
},
watch: {
'$store.state.config.menuBarLoadedCount': function (val) {
@@ -123,7 +126,9 @@ export default {
}
},
$route() {
- this.initLoadData();
+ this.$nextTick(() => {
+ this.initLoadData();
+ });
}
},
async created() {
@@ -268,8 +273,7 @@ export default {
this.$store.dispatch('training/end', TrainingMode.NORMAL);
this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
- const skinCode = this.$route.query.skinCode;
- if (skinCode) {
+ if (this.skinCode) {
// 01 现地 02 行调 '' 观众
const resp = await this.getUserRole();
if (resp && resp.code == 200) {
@@ -285,7 +289,7 @@ export default {
case 'Repair': this.$store.dispatch('training/setPrdType', ''); this.$store.dispatch('training/setRoles', 'Repair'); break;
}
}
- await this.getTrainDetail(skinCode);
+ await this.getTrainDetail(this.skinCode);
} else {
this.endViewLoading();
}
@@ -318,7 +322,7 @@ export default {
hidepanel() {
this.panelShow = false;
this.drivingShow = true;
- this.$refs.Jl3dDrive.show(this.$route.query.skinCode);
+ this.$refs.Jl3dDrive.show(this.skinCode);
},
messageInfo(message, type) {
From adc68280608600723d2be11fe1701187c4f8d96e Mon Sep 17 00:00:00 2001
From: ival <610568032@qq.com>
Date: Tue, 20 Aug 2019 10:34:41 +0800
Subject: [PATCH 099/172] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=B3=E8=BD=AC?=
=?UTF-8?q?=E8=B7=AF=E7=94=B1=E5=90=8E=EF=BC=8C=E9=A1=B5=E9=9D=A2=E4=B8=8D?=
=?UTF-8?q?=E5=8A=A0=E8=BD=BD=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/map/mapdraft/mapedit/index.vue | 4 +++-
.../mapedit/mapoperate/ImageControl.vue | 6 ++++--
.../mapdraft/mapedit/mapoperate/counter.vue | 6 ++++--
.../mapedit/mapoperate/delayunlock.vue | 6 ++++--
.../mapdraft/mapedit/mapoperate/lcControl.vue | 6 ++++--
.../mapedit/mapoperate/limitControl.vue | 6 ++++--
.../map/mapdraft/mapedit/mapoperate/line.vue | 6 ++++--
.../mapdraft/mapedit/mapoperate/signal.vue | 6 ++++--
.../mapdraft/mapedit/mapoperate/station.vue | 6 ++++--
.../mapedit/mapoperate/stationcontrol.vue | 6 ++++--
.../mapedit/mapoperate/stationstand.vue | 6 ++++--
.../mapdraft/mapedit/mapoperate/switch.vue | 6 ++++--
.../map/mapdraft/mapedit/mapoperate/text.vue | 6 ++++--
.../mapdraft/mapedit/mapoperate/train.bak.vue | 6 ++++--
.../mapedit/mapoperate/trainwindow.vue | 6 ++++--
src/views/map/runplan/chart.vue | 20 ++++++++++---------
src/views/planMonitor/editTool/schedule.vue | 4 +++-
17 files changed, 73 insertions(+), 39 deletions(-)
diff --git a/src/views/map/mapdraft/mapedit/index.vue b/src/views/map/mapdraft/mapedit/index.vue
index 0a2b9e1bd..c925f9300 100644
--- a/src/views/map/mapdraft/mapedit/index.vue
+++ b/src/views/map/mapdraft/mapedit/index.vue
@@ -89,7 +89,9 @@ export default {
this.initAutoSaveTask();
},
$route() {
- this.loadInitPage();
+ this.$$nextTick(() => {
+ this.loadInitPage();
+ });
}
},
mounted() {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/ImageControl.vue b/src/views/map/mapdraft/mapedit/mapoperate/ImageControl.vue
index edee0f19e..318ef4799 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/ImageControl.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/ImageControl.vue
@@ -169,8 +169,10 @@ export default {
this.deviceSelect(val);
},
$route() {
- this.$refs.form.resetFields();
- this.activeName = 'first';
+ this.$nextTick(() => {
+ this.$refs.form.resetFields();
+ this.activeName = 'first';
+ });
}
},
mounted() {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/counter.vue b/src/views/map/mapdraft/mapedit/mapoperate/counter.vue
index 268c71146..a31509711 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/counter.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/counter.vue
@@ -162,8 +162,10 @@ export default {
this.deviceSelect(val);
},
$route() {
- this.$refs.form.resetFields();
- this.activeName = 'first';
+ this.$nextTick(() => {
+ this.$refs.form.resetFields();
+ this.activeName = 'first';
+ });
}
},
mounted() {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/delayunlock.vue b/src/views/map/mapdraft/mapedit/mapoperate/delayunlock.vue
index b93545609..ea2ddb263 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/delayunlock.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/delayunlock.vue
@@ -144,8 +144,10 @@ export default {
this.deviceSelect(val);
},
$route() {
- this.$refs.form.resetFields();
- this.activeName = 'first';
+ this.$nextTick(() => {
+ this.$refs.form.resetFields();
+ this.activeName = 'first';
+ });
}
},
mounted() {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/lcControl.vue b/src/views/map/mapdraft/mapedit/mapoperate/lcControl.vue
index 0f92dfacd..048176fa8 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/lcControl.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/lcControl.vue
@@ -153,8 +153,10 @@ export default {
this.deviceSelect(val);
},
$route() {
- this.$refs.form.resetFields();
- this.activeName = 'first';
+ this.$nextTick(() => {
+ this.$refs.form.resetFields();
+ this.activeName = 'first';
+ });
}
},
mounted() {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/limitControl.vue b/src/views/map/mapdraft/mapedit/mapoperate/limitControl.vue
index 747756481..79c3a825f 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/limitControl.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/limitControl.vue
@@ -144,8 +144,10 @@ export default {
this.deviceSelect(val);
},
$route() {
- this.$refs.form.resetFields();
- this.activeName = 'first';
+ this.$nextTick(() => {
+ this.$refs.form.resetFields();
+ this.activeName = 'first';
+ });
}
},
mounted() {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/line.vue b/src/views/map/mapdraft/mapedit/mapoperate/line.vue
index ea97de1c7..33ad86e75 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/line.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/line.vue
@@ -177,8 +177,10 @@ export default {
this.deviceSelect(val);
},
$route() {
- this.$refs.form.resetFields();
- this.activeName = 'first';
+ this.$nextTick(() => {
+ this.$refs.form.resetFields();
+ this.activeName = 'first';
+ });
}
},
mounted() {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/signal.vue b/src/views/map/mapdraft/mapedit/mapoperate/signal.vue
index 45bb4f2c4..488009e30 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/signal.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/signal.vue
@@ -286,8 +286,10 @@ export default {
this.deviceSelect(val);
},
$route() {
- this.$refs.dataform.resetFields();
- this.activeName = 'first';
+ this.$nextTick(() => {
+ this.$refs.dataform.resetFields();
+ this.activeName = 'first';
+ });
}
},
mounted() {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/station.vue b/src/views/map/mapdraft/mapedit/mapoperate/station.vue
index cf57db6e4..a94353c4a 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/station.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/station.vue
@@ -173,8 +173,10 @@ export default {
this.deviceSelect(val);
},
$route() {
- this.$refs.dataform.resetFields();
- this.activeName = 'first';
+ this.$nextTick(() => {
+ this.$refs.dataform.resetFields();
+ this.activeName = 'first';
+ });
}
},
methods: {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue b/src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue
index 1f44b4a5f..e65e05f06 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue
@@ -157,8 +157,10 @@ export default {
this.deviceSelect(val);
},
$route() {
- this.$refs.dataform.resetFields();
- this.activeName = 'first';
+ this.$nextTick(() => {
+ this.$refs.dataform.resetFields();
+ this.activeName = 'first';
+ });
}
},
mounted() {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue b/src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue
index 25533df4f..a37a6b576 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue
@@ -209,8 +209,10 @@ export default {
this.deviceSelect(val);
},
$route() {
- this.$refs.dataform.resetFields();
- this.activeName = 'first';
+ this.$nextTick(() => {
+ this.$refs.dataform.resetFields();
+ this.activeName = 'first';
+ });
}
},
mounted() {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/switch.vue b/src/views/map/mapdraft/mapedit/mapoperate/switch.vue
index c984f34fb..533752f6d 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/switch.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/switch.vue
@@ -172,8 +172,10 @@ export default {
this.deviceSelect(val);
},
$route() {
- this.$refs.dataform.resetFields();
- this.activeName = 'first';
+ this.$nextTick(() => {
+ this.$refs.dataform.resetFields();
+ this.activeName = 'first';
+ });
}
},
mounted() {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/text.vue b/src/views/map/mapdraft/mapedit/mapoperate/text.vue
index a7a0a05eb..82b584cc0 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/text.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/text.vue
@@ -142,8 +142,10 @@ export default {
this.deviceSelect(val);
},
$route() {
- this.$refs.form.resetFields();
- this.activeName = 'first';
+ this.$nextTick(() => {
+ this.$refs.form.resetFields();
+ this.activeName = 'first';
+ });
}
},
methods: {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/train.bak.vue b/src/views/map/mapdraft/mapedit/mapoperate/train.bak.vue
index 5fe4a4860..6a80f4714 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/train.bak.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/train.bak.vue
@@ -178,8 +178,10 @@ export default {
this.deviceSelect(val);
},
$route() {
- this.$refs.form.resetFields();
- this.activeName = 'first';
+ this.$nextTick(() => {
+ this.$refs.form.resetFields();
+ this.activeName = 'first';
+ });
}
},
methods: {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/trainwindow.vue b/src/views/map/mapdraft/mapedit/mapoperate/trainwindow.vue
index 421f99f35..f8e0b9257 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/trainwindow.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/trainwindow.vue
@@ -155,8 +155,10 @@ export default {
this.deviceSelect(val);
},
$route() {
- this.$refs.form.resetFields();
- this.activeName = 'first';
+ this.$nextTick(() => {
+ this.$refs.form.resetFields();
+ this.activeName = 'first';
+ });
}
},
methods: {
diff --git a/src/views/map/runplan/chart.vue b/src/views/map/runplan/chart.vue
index b384b2f56..0c9ff5650 100644
--- a/src/views/map/runplan/chart.vue
+++ b/src/views/map/runplan/chart.vue
@@ -3,7 +3,7 @@
- {{$t('global.return')}}
+ {{ $t('global.return') }}
@@ -136,14 +136,6 @@ export default {
kmRangeCoordMap: {}
};
},
- watch: {
- '$store.state.runPlan.planSizeCount': function () {
- this.reSize({ width: this.$store.state.runPlan.width, height: this.$store.state.runPlan.height });
- },
- $route() {
- this.loadChartPage(this.$route.query);
- }
- },
computed: {
...mapGetters('runPlan', [
'stations'
@@ -158,6 +150,16 @@ export default {
return this.$route.params.mode;
}
},
+ watch: {
+ '$store.state.runPlan.planSizeCount': function () {
+ this.reSize({ width: this.$store.state.runPlan.width, height: this.$store.state.runPlan.height });
+ },
+ $route() {
+ this.$nextTick(() => {
+ this.loadChartPage(this.$route.query);
+ });
+ }
+ },
mounted() {
this.loadChartPage(this.$route.query);
},
diff --git a/src/views/planMonitor/editTool/schedule.vue b/src/views/planMonitor/editTool/schedule.vue
index 3a92d54fc..e7ee3c042 100644
--- a/src/views/planMonitor/editTool/schedule.vue
+++ b/src/views/planMonitor/editTool/schedule.vue
@@ -248,7 +248,9 @@ export default {
this.loadChartPage();
},
$route() {
- this.loadChartPage();
+ this.$nextTick(() => {
+ this.loadChartPage();
+ });
}
},
mounted() {
From 74fea0b56ea9a66bf7a4880f34efa70ddea0223f Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Tue, 20 Aug 2019 11:17:08 +0800
Subject: [PATCH 100/172] =?UTF-8?q?desc:=20=E8=B0=83=E6=95=B4=E5=9C=B0?=
=?UTF-8?q?=E5=9B=BE=E7=BB=98=E5=88=B6=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/i18n/langs/en/tip.js | 128 ++++----
src/views/display/demon/chartView.vue | 2 +-
src/views/map/mapdraft/mapedit/configMap.vue | 57 +++-
.../mapdraft/mapedit/dataRelation/index.vue | 8 +-
.../dataRelation/routeoperate/detail.vue | 6 +-
.../dataRelation/routeoperate/route.vue | 6 +-
src/views/map/mapdraft/mapedit/index.vue | 23 +-
.../mapedit/mapoperate/ImageControl.vue | 30 +-
.../mapedit/mapoperate/config/list.vue | 14 +-
.../mapdraft/mapedit/mapoperate/counter.vue | 29 +-
.../mapedit/mapoperate/delayunlock.vue | 29 +-
.../map/mapdraft/mapedit/mapoperate/index.vue | 17 +-
.../mapdraft/mapedit/mapoperate/lcControl.vue | 30 +-
.../mapedit/mapoperate/limitControl.vue | 30 +-
.../map/mapdraft/mapedit/mapoperate/line.vue | 18 +-
.../map/mapdraft/mapedit/mapoperate/link.vue | 34 +-
.../mapdraft/mapedit/mapoperate/section.vue | 53 +++-
.../mapdraft/mapedit/mapoperate/signal.vue | 35 ++-
.../mapdraft/mapedit/mapoperate/station.vue | 33 +-
.../mapedit/mapoperate/stationcontrol.vue | 31 +-
.../mapedit/mapoperate/stationstand.vue | 37 ++-
.../mapdraft/mapedit/mapoperate/switch.vue | 32 +-
.../map/mapdraft/mapedit/mapoperate/text.vue | 30 +-
.../mapdraft/mapedit/mapoperate/train.bak.vue | 297 ------------------
.../mapedit/mapoperate/train/index.vue | 60 +---
.../mapedit/mapoperate/trainmodel.bak.vue | 186 -----------
.../mapedit/mapoperate/trainwindow.vue | 29 +-
.../mapdraft/mapedit/mapoperate/zcControl.vue | 32 +-
28 files changed, 536 insertions(+), 780 deletions(-)
delete mode 100644 src/views/map/mapdraft/mapedit/mapoperate/train.bak.vue
delete mode 100644 src/views/map/mapdraft/mapedit/mapoperate/trainmodel.bak.vue
diff --git a/src/i18n/langs/en/tip.js b/src/i18n/langs/en/tip.js
index 42700b811..a327dbedc 100644
--- a/src/i18n/langs/en/tip.js
+++ b/src/i18n/langs/en/tip.js
@@ -1,79 +1,79 @@
export default {
- confirm: '确 定',
- cancel: '取 消',
- creatingSuccessful: '创建成功！',
- creatingFailed: '创建失败',
- confirmDeletion: '是否确认删除？',
- confirmBatchGeneration: '是否确认批量生成？',
- hint: '提示',
- cancelledDelete: '已取消删除',
- cancelGeneration: '已取消批量生成',
+ confirm: 'confirm',
+ cancel: 'cancel',
+ creatingSuccessful: 'Created successfully!',
+ creatingFailed: 'Create a failure',
+ confirmDeletion: 'Confirm deletion?',
+ confirmBatchGeneration: 'Is batch generation confirmed?',
+ hint: 'hint',
+ cancelledDelete: 'Cancelled delete',
+ cancelGeneration: 'Batch generation has been cancelled',
- updateSuccessfully: '更新成功',
- saveSuccessfully: '保存成功',
- saveFailed: '保存失败',
- updateFailed: '更新失败',
- successfullyDelete: '删除成功',
- failDelete: '删除失败',
- operationAbnormal: '操作异常',
- createSuccess: '创建成功',
+ updateSuccessfully: 'The update is successful',
+ saveSuccessfully: 'Save success',
+ saveFailed: 'Save failed',
+ updateFailed: 'Update failed',
+ successfullyDelete: 'Delete the success',
+ failDelete: 'Delete failed',
+ operationAbnormal: 'Abnormal operation',
+ createSuccess: 'Creating a successful',
- cannotCoincide: '起始坐标和结束坐标不能重合',
- cannotMerged: '存在非物理区段，不能合并',
- linkCannotMerged: '不在同一Link上的物理区段不能合并',
+ cannotCoincide: 'The starting and ending coordinates cannot coincide',
+ cannotMerged: 'Non-physical extents exist and cannot be merged',
+ linkCannotMerged: 'Physical extents that are not on the same Link cannot be merged',
- selectedSectionEmpty: '选择的区段为空',
- selectedStationEmpty: '选择的车站为空',
+ selectedSectionEmpty: 'The selected section is empty',
+ selectedStationEmpty: 'The selected station is empty',
- selectMap: '请先选择地图',
- selectTrainType: '请选择查看的列车模型',
+ selectMap: 'Please select the map first',
+ selectTrainType: 'Please select the train model to view',
- stationFont: '车站字体',
- kilometerFont: '公里标字体',
- meter: '米',
- angle: '度',
+ stationFont: 'The font',
+ kilometerFont: 'Kilometer mark font',
+ meter: 'meter',
+ angle: 'angle',
- operationSuccessfully: '操作成功',
- operationFailed: '操作失败',
- setupSuccessfully: '设置成功',
- setupFailed: '设置失败',
- recoveryPrivilegesSuccessful: '回收权限成功',
- recoveryPrivilegesFailed: '回收权限失败',
- unpackingSuccessful: '解包成功',
- unpackingFailed: '解包失败',
- pleaseEnterNameQuery: '请输入名称查询',
- routeSameID: '相同ID的数据已存在',
+ operationSuccessfully: 'Operation is successful',
+ operationFailed: 'The operation failure',
+ setupSuccessfully: 'Set up the success',
+ setupFailed: 'Setup failed',
+ recoveryPrivilegesSuccessful: 'Successful recovery authority',
+ recoveryPrivilegesFailed: 'Recovery authority failed',
+ unpackingSuccessful: 'Unpack the success',
+ unpackingFailed: 'Unpack the failure',
+ pleaseEnterNameQuery: 'Please enter name query',
+ routeSameID: 'Data with the same ID already exists',
- skinDeleteSuccessfully: '删除皮肤成功',
- skinDeleteFailed: '删除皮肤失败',
- publishedOperationalGraphSuccessfully: '发布运行图成功',
- publishedOperationalGraphFailed: '发布运行图失败',
- deleteOperationGraphFailed: '删除运行图失败',
- importOperationGraphSuccessfully: '导入运行图成功!',
- importOperationGraphFailed: '导入运行图失败!',
- parsingOperationGraphFailed: '解析运行图失败!',
- productCreationSuccessfully: '创建产品成功',
- productCreationFailed: '创建产品失败',
- updateProductSuccessfully: '更新产品成功',
- updateProductFailed: '更新产品失败',
- deleteProductSuccessfully: '删除产品成功',
- deleteProductFailed: '删除产品失败',
- cannotDeleteProduct: '产品已被使用无法删除',
- pathCreationSuccessful: '创建交路成功！',
- createRoutingFailed: '创建交路失败',
- pathUpdataSuccessful: '更新交路成功！',
- pathUpdataFailed: '更新交路失败',
+ skinDeleteSuccessfully: 'Skin removed successfully',
+ skinDeleteFailed: 'Failed to remove skin',
+ publishedOperationalGraphSuccessfully: 'Published operational diagram successfully',
+ publishedOperationalGraphFailed: 'Failed to publish operation diagram',
+ deleteOperationGraphFailed: 'Failed to delete operation diagram',
+ importOperationGraphSuccessfully: 'The operation diagram was successfully imported!',
+ importOperationGraphFailed: 'Failed to import operation diagram!',
+ parsingOperationGraphFailed: 'Failed to parse the operational diagram!',
+ productCreationSuccessfully: 'Product creation success',
+ productCreationFailed: 'Failed to create product',
+ updateProductSuccessfully: 'Product update is successful.',
+ updateProductFailed: 'Product update failed',
+ deleteProductSuccessfully: 'Product deleted successfully',
+ deleteProductFailed: 'Product deletion failed',
+ cannotDeleteProduct: 'The product has been used and cannot be deleted',
+ pathCreationSuccessful: 'Create road successfully!',
+ createRoutingFailed: 'Failed to create junction',
+ pathUpdataSuccessful: 'Road update successful!',
+ pathUpdataFailed: 'Update traffic failed',
- failedLoadMap: '加载地图数据失败',
- sectionPointsDeficiency: '区段坐标缺失',
+ failedLoadMap: 'Failed to load map data',
+ sectionPointsDeficiency: 'Segment coordinates missing',
- dataValidationFailed: '数据校验不通过',
- dataValidationSuccess: '数据校验通过！',
+ dataValidationFailed: 'Data validation failed',
+ dataValidationSuccess: 'Data verified!',
- requestFailed: '请求失败',
+ requestFailed: 'The request failed',
- dataQuestion: '有问题数据',
- dataList: '数据列表',
+ dataQuestion: 'Data in question',
+ dataList: 'Data list',
updateProductTip: 'Will this operation modify the commodity status?',
deleteProductTip: 'This operation will delete the item. Do you want to continue?',
diff --git a/src/views/display/demon/chartView.vue b/src/views/display/demon/chartView.vue
index bb5908139..660f72e74 100644
--- a/src/views/display/demon/chartView.vue
+++ b/src/views/display/demon/chartView.vue
@@ -267,7 +267,7 @@ export default {
group: this.group,
conversationId: this.conversationId
};
- const res = await postDataBd(param).catch(error => {
+ await postDataBd(param).catch(error => {
this.sending = false;
const message = JSON.parse(error.message);
if (message.err_no == 3301) {
diff --git a/src/views/map/mapdraft/mapedit/configMap.vue b/src/views/map/mapdraft/mapedit/configMap.vue
index a609125fc..0f377d721 100644
--- a/src/views/map/mapdraft/mapedit/configMap.vue
+++ b/src/views/map/mapdraft/mapedit/configMap.vue
@@ -7,8 +7,8 @@
-
-
-
-
-
-
-
-
-
-
+
+
\ No newline at end of file
+ }
+ }
+};
+
diff --git a/src/views/components/limits/index.vue b/src/views/components/limits/index.vue
index c306f82ce..685b667d4 100644
--- a/src/views/components/limits/index.vue
+++ b/src/views/components/limits/index.vue
@@ -1,117 +1,124 @@
-
-
+
+
\ No newline at end of file
+ } else {
+ this.numberMessage = '';
+ }
+ },
+ doShow(data) {
+ this.dialogVisible = true;
+ if (data) {
+ this.formModel.lessonId = data.id;
+ this.formModel.lessonName = data.name;
+ this.prdCode = data.prdCode;
+ this.mapId = data.mapId;
+ this.PermissionType = data.PermissionType;
+ this.setTotalMax();
+ }
+ },
+ handleSure() {
+ this.$refs.dataform.validateForm(() => {
+ const model = {
+ // lessonId: this.formModel.lessonId,
+ startTime: `${this.formModel.date[0]} 00:00:00`,
+ endTime: `${this.formModel.date[1]} 23:59:59`,
+ amount: this.formModel.total,
+ permissionType: this.PermissionType,
+ operator: OperatorModel.TRANSFER
+ // mapId: this.mapId,
+ // mapProductCode: this.prdCode,
+ };
+ if (this.PermissionType == PermissionType.LESSON || this.PermissionType == PermissionType.EXAM) {
+ model['lessonId'] = this.formModel.lessonId;
+ model['mapId'] = this.mapId;
+ model['mapProductCode'] = this.prdCode;
+ } else if (this.PermissionType == PermissionType.SIMULATION) {
+ model['mapId'] = this.mapId;
+ model['mapProductCode'] = this.prdCode;
+ }
+ giveLessons(model).then(response => {
+ const url = response.data;
+ this.$emit('QrCodeShow', {
+ url: url,
+ title: this.$t('global.transferQrcode')
+ });
+ this.dialogVisible = false;
+ this.$emit('initLoadPage');
+ this.handleClose();
+ }).catch(() => {
+ this.$messageBox(this.$t('error.getTransferQrcodeFailed'));
+ });
+ });
+ },
+ close() {
+ this.dialogVisible = false;
+ this.handleClose();
+ },
+ handleClose(done) {
+ this.maxTotal = 0;
+ this.formModel = {
+ lessonId: '',
+ lessonName: '',
+ total: 0,
+ startTime: '',
+ endTime: ''
+ };
+ this.$refs.dataform.resetForm();
+ if (done) {
+ done();
+ } else {
+ this.dialogVisible = false;
+ }
+ }
+ }
+};
+
diff --git a/src/views/components/pay/commit.vue b/src/views/components/pay/commit.vue
index c8056a0cd..73faf0c9e 100644
--- a/src/views/components/pay/commit.vue
+++ b/src/views/components/pay/commit.vue
@@ -1,192 +1,197 @@
-
- 提交订单
-
- 返回
-
+
+ 提交订单
+
+ 返回
+
\ No newline at end of file
+ this.saleModel.name = val.lessonName;
+ } else if (this.$route.query.permissionType == PermissionType.SCREEN) {
+ this.saleModel.name = val.name;
+ } else {
+ this.saleModel.name = val.prdName;
+ }
+ }
+ }
+ },
+ methods: {
+ // 选择自定义时长，修改页面控件状态
+ chooseEvent(label) {
+ this.disabled = label !== '自定义';
+ this.chooseList.forEach(elem => {
+ if (label === elem.label) {
+ this.saleModel.months = elem.value;
+ }
+ });
+ },
+ // 提交订单
+ commit() {
+ this.$refs.make.validate((valid) => {
+ if (valid) {
+ const model = {
+ goodsId: this.saleModel.goodsId,
+ price: this.saleModel.price,
+ monthAmount: this.saleModel.months,
+ amount: this.saleModel.total,
+ permissionType: this.$route.query.permissionType
+ };
+ commitOrder(model).then(response => {
+ this.$emit('commit', response.data);
+ }).catch(() => {
+ this.$messageBox('提交订单失败');
+ });
+ }
+ });
+ },
+ back() {
+ history.go(-1);
+ }
+ }
+};
+
diff --git a/src/views/components/pay/confirm.vue b/src/views/components/pay/confirm.vue
index 10911a614..d5cafe9e7 100644
--- a/src/views/components/pay/confirm.vue
+++ b/src/views/components/pay/confirm.vue
@@ -1,288 +1,301 @@
-
-
+
+
-
+
\ No newline at end of file
+import img_pay_fail from '@/assets/pay_images/PayFail.png';
+import img_pay_success from '@/assets/pay_images/PaySuccess.png';
+export default {
+ name: 'FinishDraft',
+ props: {
+ finishStatus: {
+ type: String,
+ required: true
+ }
+ },
+ data() {
+ return {
+ count: 0,
+ maxTime: 5,
+ timer: null,
+ images: {
+ img_pay_fail,
+ img_pay_success
+ }
+ };
+ },
+ beforeDestroy() {
+ this.destroy();
+ },
+ methods: {
+ // 设置计时器，maxTime后返回
+ createCountTimer() {
+ const that = this;
+ // 如果计时器已存在，则先注销
+ this.destroy();
+ // 重新创建定时器
+ if (this.timer == null) {
+ this.count = this.maxTime;
+ this.timer = setInterval(() => {
+ (that.count-- <= 0) && that.finish();
+ }, 1000);
+ }
+ },
+ // 返回到课程首页
+ finish() {
+ this.$emit('finish');
+ },
+ // 注销计时器
+ destroy() {
+ clearInterval(this.timer);
+ this.timer = null;
+ }
+ }
+};
+
diff --git a/src/views/components/pay/index.vue b/src/views/components/pay/index.vue
index 1583c6fba..8bc5ed109 100644
--- a/src/views/components/pay/index.vue
+++ b/src/views/components/pay/index.vue
@@ -4,18 +4,33 @@
收银台
-
- {{text}}
-
+
+
+
+
+
+
\ No newline at end of file
+
diff --git a/src/views/components/limits/distribute.vue b/src/views/components/limits/distribute.vue
index 191b494ea..57679145c 100644
--- a/src/views/components/limits/distribute.vue
+++ b/src/views/components/limits/distribute.vue
@@ -1,203 +1,203 @@
- +
+ {{ text }}
+
-
-
-
- {{$ConstSelect.translate(scope.row.forever,
- 'Whether')}}
-
-
-
-
-
- {{computedName(scope.row.canDistribute, 'PermissionUseList')}}
-
-
-
-
+
+
+
+
+ {{ $ConstSelect.translate(scope.row.forever,
+ 'Whether') }}
+
+
+
+
+
+ {{ computedName(scope.row.canDistribute, 'PermissionUseList') }}
+
+
+
+
\ No newline at end of file
+
diff --git a/src/views/components/limits/transfer.vue b/src/views/components/limits/transfer.vue
index 649709662..238fa0a61 100644
--- a/src/views/components/limits/transfer.vue
+++ b/src/views/components/limits/transfer.vue
@@ -1,209 +1,209 @@
-
-
-
-
- {{ saleModel.name }}
-
-
- {{systemName}}权限
-
-
- {{ saleModel.price.toFixed(2) }}
- 元/月
-
-
-
-
-
-
-
-
-
- 月
-
-
-
-
- {{ parseInt(sumPrice) }}
- . {{ (sumPrice -
- parseInt(sumPrice)).toFixed(2).toString().replace('.0', '').replace(' ', '') }}
-
-
-
-
-
-
+
+
+
+ {{ saleModel.name }}
+
+
+ {{ systemName }}权限
+
+
+ {{ saleModel.price.toFixed(2) }}
+ 元/月
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseInt(sumPrice) }}
+ . {{ (sumPrice -
+ parseInt(sumPrice)).toFixed(2).toString().replace('.0', '').replace(' ', '') }}
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+ 取消
+
+
\ No newline at end of file
+
diff --git a/src/views/components/pay/finish.vue b/src/views/components/pay/finish.vue
index 4f77df7ef..60fada4d6 100644
--- a/src/views/components/pay/finish.vue
+++ b/src/views/components/pay/finish.vue
@@ -1,78 +1,81 @@
-
-
-
-
-
-
-
-
- {{nameTitle}}: - - {{ saleModel.name }} - -
-权限类型: - - {{systemName}} - -
-{{priceTitle}}: - - ￥{{ saleModel.price.toFixed(2) }} - 元/月 - -
-权限数量: - - {{ saleModel.amount }}个 - -
-购买时长: - - {{ saleModel.monthAmount }}月 - -
-订单编码: - - {{ saleModel.orderCode }} - -
-创建时间: - - {{ saleModel.createTime }} - -
-应付金额: - ￥ - {{ parseInt(saleModel.sumPrice) }} - .{{ (saleModel.sumPrice - - parseInt(saleModel.sumPrice)).toFixed(2).toString().replace('0.', - '')}} - - -
-
+
+
-
-
-
-
-
-
-
- 取消
-
-
+
+
+
+
+
+
+
+
+ {{ nameTitle }}: + + {{ saleModel.name }} + +
+权限类型: + + {{ systemName }} + +
+{{ priceTitle }}: + + ￥{{ saleModel.price.toFixed(2) }} + 元/月 + +
+权限数量: + + {{ saleModel.amount }}个 + +
+购买时长: + + {{ saleModel.monthAmount }}月 + +
+订单编码: + + {{ saleModel.orderCode }} + +
+创建时间: + + {{ saleModel.createTime }} + +
+应付金额: + ￥ + {{ parseInt(saleModel.sumPrice) }} + .{{ (saleModel.sumPrice - + parseInt(saleModel.sumPrice)).toFixed(2).toString().replace('0.', + '') }} + + +
+
- ![]()
-
-
-
- ![]()
-
-
- -
-
- 你将购买的商品为虚拟内容服务，购买后不支持退货、转让、退换，请斟酌确认。 -
- 购买后可在“权限详情”区查看和使用相关服务。 -
+ ![]()
+
+
+
+ ![]()
+
+
+ -
+
- 你将购买的商品为虚拟内容服务，购买后不支持退货、转让、退换，请斟酌确认。 +
- 购买后可在“权限详情”区查看和使用相关服务。 +
-
-
-
+
+
@@ -23,103 +38,103 @@
\ No newline at end of file
+ getCommodityDetailByParams(data).then(response => {
+ this.active = 0;
+ this.orderData = response.data;
+ }).catch(() => {
+ this.$messageBox('获取课程信息失败');
+ });
+ },
+ // 提交订单后处理
+ commit(data) {
+ this.active = 1;
+ this.order = data;
+ },
+ // 确认支付后处理
+ confirm(data) {
+ this.active = 2;
+ this.finishStatus = data;
+ this.$refs.finish.createCountTimer();
+ },
+ // 完成跳转处理
+ finish(data) {
+ this.active = 0;
+ const type = this.$route.query.permissionType;
+ if (type === PermissionType.LESSON) {
+ this.$router.replace({ path: `${UrlConfig.teach.detail}/${this.$route.params.lessonId}` });
+ } else if (type === PermissionType.EXAM) {
+ this.$router.replace({ path: `${UrlConfig.exam.course}/${this.orderData.lessonId}` });
+ } else if (type === PermissionType.SCREEN) {
+ this.$router.replace({ path: `${UrlConfig.dp.detail}/${this.$route.params.lessonId}` });
+ } else if (type === PermissionType.SIMULATION) {
+ this.$router.replace({ path: `${UrlConfig.demonstration.detail}/${this.$route.params.lessonId}` });
+ } else {
+ this.$router.replace({ path: `/` });
+ }
+ }
+ }
+};
+
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 32d939bf3..cab55b9df 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -5,7 +5,7 @@
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/switch.vue b/src/views/map/mapdraft/mapedit/mapoperate/switch.vue
index c54ba62ed..7668e2d29 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/switch.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/switch.vue
@@ -142,7 +142,8 @@ export default {
]
};
// 清空表单验证提示信息
- this.$nextTick(function () {
+ this.$nextTick(() => {
+ this.$refs.dataform &&
this.$refs.dataform.clearValidate();
});
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/zcControl.vue b/src/views/map/mapdraft/mapedit/mapoperate/zcControl.vue
index a372ed602..d7015f04f 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/zcControl.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/zcControl.vue
@@ -135,12 +135,15 @@ export default {
}
},
watch: {
- selected: function (val, oldVal) {
+ selected(val, oldVal) {
this.deviceSelect(val);
},
$route() {
- this.$refs.dataform.resetFields();
- this.activeName = 'first';
+ this.$nextTick(() => {
+ this.$refs.dataform &&
+ this.$refs.dataform.resetFields();
+ this.activeName = 'first';
+ });
}
},
mounted() {
diff --git a/src/views/map/mapdraft/mapedit/pathoperate/detail.vue b/src/views/map/mapdraft/mapedit/pathoperate/detail.vue
index b2377987b..dba31838e 100644
--- a/src/views/map/mapdraft/mapedit/pathoperate/detail.vue
+++ b/src/views/map/mapdraft/mapedit/pathoperate/detail.vue
@@ -23,7 +23,9 @@ export default {
props: {
mapInfo: {
type: Object,
- required: true
+ default() {
+ return null;
+ }
}
},
data() {
diff --git a/src/views/map/mapdraft/mapedit/pathoperate/index.vue b/src/views/map/mapdraft/mapedit/pathoperate/index.vue
index 9a1e122fe..94ccb1b20 100644
--- a/src/views/map/mapdraft/mapedit/pathoperate/index.vue
+++ b/src/views/map/mapdraft/mapedit/pathoperate/index.vue
@@ -40,12 +40,14 @@ export default {
props: {
mapInfo: {
type: Object,
- required: true
+ default() {
+ return null;
+ }
},
selected: {
type: Object,
- default: function() {
- return {};
+ default() {
+ return null;
}
},
cardHeight: {
diff --git a/src/views/map/mapdraft/mapedit/pathoperate/pathAccess.vue b/src/views/map/mapdraft/mapedit/pathoperate/pathAccess.vue
index f866e04c4..3e8155c8d 100644
--- a/src/views/map/mapdraft/mapedit/pathoperate/pathAccess.vue
+++ b/src/views/map/mapdraft/mapedit/pathoperate/pathAccess.vue
@@ -22,7 +22,9 @@ export default {
props: {
mapInfo: {
type: Object,
- required: true
+ default() {
+ return null;
+ }
}
},
data() {
diff --git a/src/views/map/mapdraft/mapedit/pathoperate/route.vue b/src/views/map/mapdraft/mapedit/pathoperate/route.vue
index b591e0594..fb6d47ccd 100644
--- a/src/views/map/mapdraft/mapedit/pathoperate/route.vue
+++ b/src/views/map/mapdraft/mapedit/pathoperate/route.vue
@@ -120,15 +120,21 @@ export default {
props: {
selected: {
type: Object,
- required: true
+ default() {
+ return null;
+ }
},
mapInfo: {
type: Object,
- required: true
+ default() {
+ return null;
+ }
},
routeData: {
type: Object,
- required: true
+ default() {
+ return null;
+ }
},
cardHeight: {
type: Number || String,
diff --git a/src/views/map/mapdraft/mapedit/routeoperate/detail.vue b/src/views/map/mapdraft/mapedit/routeoperate/detail.vue
index b35cc6d61..fa8a7bde4 100644
--- a/src/views/map/mapdraft/mapedit/routeoperate/detail.vue
+++ b/src/views/map/mapdraft/mapedit/routeoperate/detail.vue
@@ -32,7 +32,9 @@ export default {
props: {
mapInfo: {
type: Object,
- required: true
+ default() {
+ return null;
+ }
}
},
data() {
diff --git a/src/views/map/mapdraft/mapedit/routeoperate/index.vue b/src/views/map/mapdraft/mapedit/routeoperate/index.vue
index eeead37b8..9e93d5865 100644
--- a/src/views/map/mapdraft/mapedit/routeoperate/index.vue
+++ b/src/views/map/mapdraft/mapedit/routeoperate/index.vue
@@ -43,11 +43,15 @@ export default {
props: {
mapInfo: {
type: Object,
- required: true
+ default() {
+ return null;
+ }
},
selected: {
type: Object,
- required: true
+ default() {
+ return null;
+ }
},
cardHeight: {
type: Number || String,
diff --git a/src/views/map/mapdraft/mapedit/routeoperate/preview.vue b/src/views/map/mapdraft/mapedit/routeoperate/preview.vue
index 2511d369c..0e5c4729d 100644
--- a/src/views/map/mapdraft/mapedit/routeoperate/preview.vue
+++ b/src/views/map/mapdraft/mapedit/routeoperate/preview.vue
@@ -35,7 +35,9 @@ export default {
props: {
mapInfo: {
type: Object,
- required: true
+ default() {
+ return null;
+ }
}
},
data() {
diff --git a/src/views/map/mapdraft/mapedit/routeoperate/route.vue b/src/views/map/mapdraft/mapedit/routeoperate/route.vue
index eb19a6a68..13d12ce52 100644
--- a/src/views/map/mapdraft/mapedit/routeoperate/route.vue
+++ b/src/views/map/mapdraft/mapedit/routeoperate/route.vue
@@ -341,15 +341,21 @@ export default {
props: {
selected: {
type: Object,
- required: true
+ default() {
+ return null;
+ }
},
mapInfo: {
type: Object,
- required: true
+ default() {
+ return null;
+ }
},
routeData: {
type: Object,
- required: true
+ default() {
+ return null;
+ }
},
cardHeight: {
type: Number || String,
@@ -417,18 +423,21 @@ export default {
'stationStandList'
]),
routeName: {
- // get() {
- // if (this.isSave) {
- // let beg = ''; let end = '';
- // if (this.signalList) {
- // this.signalList.forEach(elem => {
- // if (elem.code === this.addModel.startSignalCode) beg = elem.name;
- // if (elem.code === this.addModel.endSignalCode) end = elem.name;
- // });
- // }
- // return this.addModel.name = beg + '-' + end;
- // }
- // }
+ get() {
+ var name = '';
+ if (this.isSave) {
+ let beg = ''; let end = '';
+ if (this.signalList) {
+ this.signalList.forEach(elem => {
+ if (elem.code === this.addModel.startSignalCode) beg = elem.name;
+ if (elem.code === this.addModel.endSignalCode) end = elem.name;
+ });
+ }
+ name = beg + '-' + end;
+ }
+ return name;
+ }
+
},
rules() {
const baseRules = {
diff --git a/src/views/map/mapdraft/mapedit/routingoperate/detail.vue b/src/views/map/mapdraft/mapedit/routingoperate/detail.vue
index ee3cc5ef1..7e4e490e4 100644
--- a/src/views/map/mapdraft/mapedit/routingoperate/detail.vue
+++ b/src/views/map/mapdraft/mapedit/routingoperate/detail.vue
@@ -26,7 +26,9 @@ export default {
props: {
mapInfo: {
type: Object,
- required: true
+ default() {
+ return null;
+ }
}
},
data() {
diff --git a/src/views/map/mapdraft/mapedit/routingoperate/index.vue b/src/views/map/mapdraft/mapedit/routingoperate/index.vue
index d4b9b4cfa..090815636 100644
--- a/src/views/map/mapdraft/mapedit/routingoperate/index.vue
+++ b/src/views/map/mapdraft/mapedit/routingoperate/index.vue
@@ -42,11 +42,15 @@ export default {
props: {
mapInfo: {
type: Object,
- required: true
+ default() {
+ return null;
+ }
},
selected: {
type: Object,
- required: true
+ default() {
+ return null;
+ }
},
cardHeight: {
type: Number || String,
diff --git a/src/views/map/mapdraft/mapedit/routingoperate/preview.vue b/src/views/map/mapdraft/mapedit/routingoperate/preview.vue
index 2511d369c..0e5c4729d 100644
--- a/src/views/map/mapdraft/mapedit/routingoperate/preview.vue
+++ b/src/views/map/mapdraft/mapedit/routingoperate/preview.vue
@@ -35,7 +35,9 @@ export default {
props: {
mapInfo: {
type: Object,
- required: true
+ default() {
+ return null;
+ }
}
},
data() {
diff --git a/src/views/map/mapdraft/mapedit/routingoperate/route.vue b/src/views/map/mapdraft/mapedit/routingoperate/route.vue
index 7fc953c6c..4e8ff0874 100644
--- a/src/views/map/mapdraft/mapedit/routingoperate/route.vue
+++ b/src/views/map/mapdraft/mapedit/routingoperate/route.vue
@@ -160,15 +160,21 @@ export default {
props: {
selected: {
type: Object,
- required: true
+ default() {
+ return null;
+ }
},
mapInfo: {
type: Object,
- required: true
+ default() {
+ return null;
+ }
},
routeData: {
type: Object,
- required: true
+ default() {
+ return null;
+ }
},
cardHeight: {
type: Number || String,
diff --git a/src/views/map/mapdraft/mapedit/switchoperate/detail.vue b/src/views/map/mapdraft/mapedit/switchoperate/detail.vue
index eeab06ac1..83d58bafe 100644
--- a/src/views/map/mapdraft/mapedit/switchoperate/detail.vue
+++ b/src/views/map/mapdraft/mapedit/switchoperate/detail.vue
@@ -21,7 +21,9 @@ export default {
props: {
mapInfo: {
type: Object,
- required: true
+ default() {
+ return null;
+ }
}
},
data() {
diff --git a/src/views/map/mapdraft/mapedit/switchoperate/index.vue b/src/views/map/mapdraft/mapedit/switchoperate/index.vue
index 790494e49..0d226963b 100644
--- a/src/views/map/mapdraft/mapedit/switchoperate/index.vue
+++ b/src/views/map/mapdraft/mapedit/switchoperate/index.vue
@@ -40,11 +40,15 @@ export default {
props: {
mapInfo: {
type: Object,
- required: true
+ default() {
+ return null;
+ }
},
selected: {
type: Object,
- required: true
+ default() {
+ return null;
+ }
},
cardHeight: {
type: Number || String,
diff --git a/src/views/map/mapdraft/mapedit/switchoperate/route.vue b/src/views/map/mapdraft/mapedit/switchoperate/route.vue
index 68e556ec7..93cb851c2 100644
--- a/src/views/map/mapdraft/mapedit/switchoperate/route.vue
+++ b/src/views/map/mapdraft/mapedit/switchoperate/route.vue
@@ -47,15 +47,21 @@ export default {
props: {
selected: {
type: Object,
- required: true
+ default() {
+ return null;
+ }
},
mapInfo: {
type: Object,
- required: true
+ default() {
+ return null;
+ }
},
routeData: {
type: Object,
- required: true
+ default() {
+ return null;
+ }
},
cardHeight: {
type: Number || String,
From db109f2a9e3b76d6679b807fabef4a1dcfe2665e Mon Sep 17 00:00:00 2001
From: ival <610568032@qq.com>
Date: Tue, 13 Aug 2019 16:59:38 +0800
Subject: [PATCH 008/172] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9C=B0=E5=9B=BE?=
=?UTF-8?q?=E8=BF=9B=E8=B7=AF=E7=9B=B8=E5=85=B3=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/jmap/mapdraft.js | 102 +----
src/jlmap3d/main/loaders/FBXLoader2.js | 12 +-
.../menusPlan/chooseTemplatePlan.vue | 11 -
.../beijing_01/menusPlan/createTodayPlan.vue | 11 -
.../menusPlan/chooseTemplatePlan.vue | 11 -
.../chengdu_03/menusPlan/createTodayPlan.vue | 11 -
.../menusPlan/chooseTemplatePlan.vue | 11 -
src/scripts/GlobalPlugin.js | 12 +
src/scripts/translate.js | 6 +-
src/views/display/demon/addQuest.vue | 351 +++++++++--------
.../lessoncategory/edit/chapter/list.vue | 11 -
src/views/lesson/trainingmanage/index.vue | 25 +-
.../mapedit/automaticoperate/detail.vue | 13 +-
.../mapedit/mapoperate/trainmodel.vue | 26 +-
.../mapdraft/mapedit/pathoperate/detail.vue | 13 +-
.../{pathAccess.vue => pathRoute.vue} | 23 +-
.../mapdraft/mapedit/pathoperate/route.vue | 15 +-
.../mapdraft/mapedit/routeoperate/detail.vue | 99 ++---
.../mapdraft/mapedit/routeoperate/preview.vue | 2 +-
.../mapdraft/mapedit/routeoperate/related.vue | 36 +-
.../mapdraft/mapedit/routeoperate/route.vue | 77 ++--
.../mapedit/routingoperate/detail.vue | 13 +-
.../mapedit/routingoperate/preview.vue | 4 -
.../mapdraft/mapedit/routingoperate/route.vue | 5 +
.../mapdraft/mapedit/switchoperate/detail.vue | 17 +-
.../mapdraft/mapedit/switchoperate/route.vue | 25 +-
src/views/map/skinStyle/draft.vue | 365 ++++++++----------
src/views/map/skinStyle/index.vue | 255 ++++++------
src/views/orderauthor/author/draft.vue | 10 -
.../orderauthor/permission/draft/ruleForm.vue | 10 -
src/views/package/index.vue | 16 +-
src/views/publish/examRule/index.vue | 21 -
src/views/publish/productStatus/index.vue | 12 -
src/views/publish/publishLesson/index.vue | 11 -
src/views/publish/publishMap/index.vue | 11 -
.../runPlanCommon/chooseTemplatePlan.vue | 11 -
src/views/publish/runPlanCommon/index.vue | 11 -
src/views/publish/runPlanEveryDay/index.vue | 11 -
src/views/publish/runPlanTemplate/index.vue | 11 -
src/views/publish/simulationScript/index.vue | 12 -
src/views/replay/index.vue | 252 ++++++------
41 files changed, 782 insertions(+), 1179 deletions(-)
rename src/views/map/mapdraft/mapedit/pathoperate/{pathAccess.vue => pathRoute.vue} (83%)
diff --git a/src/api/jmap/mapdraft.js b/src/api/jmap/mapdraft.js
index 5c783b4dd..afd3b8add 100644
--- a/src/api/jmap/mapdraft.js
+++ b/src/api/jmap/mapdraft.js
@@ -98,124 +98,52 @@ export function postBuildMapImport(data) {
});
}
-/** 获取延续保护道岔数据列表*/
-export function listOverlapSwitch(mapId, routeCode) {
- return request({
- url: `/api/mapBuild/${mapId}/${routeCode}/overlapSwitch`,
- method: 'get'
- });
-}
-
-/** 获取自动触发区段数据列表*/
-export function listTriggerSection(mapId, routeCode) {
- return request({
- url: `/api/mapBuild/${mapId}/${routeCode}/triggerSection`,
- method: 'get'
- });
-}
-
-/** 获取延续保护区段数据列表*/
-export function listOverlapSection(mapId, routeCode) {
- return request({
- url: `/api/mapBuild/${mapId}/${routeCode}/overlapSection`,
- method: 'get'
- });
-}
-
-/** 获取物理区段数据列表*/
-export function listPhysicsSection(mapId, routeCode) {
- return request({
- url: `/api/mapBuild/${mapId}/${routeCode}/physicsSection`,
- method: 'get'
- });
-}
-
-/** 获取屏蔽门数据列表*/
-export function listStationStand(mapId, routeCode) {
- return request({
- url: `/api/mapBuild/${mapId}/${routeCode}/stationStand`,
- method: 'get'
- });
-}
-
-/** 获取道岔段数据列表*/
-export function listSwitch(mapId, routeCode) {
- return request({
- url: `/api/mapBuild/${mapId}/${routeCode}/switch`,
- method: 'get'
- });
-}
-
-/** 获取敌对进路数据列表*/
-export function listAgainstRoute(mapId, routeCode) {
- return request({
- url: `/api/mapBuild/${mapId}/${routeCode}/againstRoute`,
- method: 'get'
- });
-}
-/** 查询进路侧防道岔*/
-export function listFlankProtectionSwitch(mapId, routeCode) {
- return request({
- url: `/api/mapBuild/${mapId}/${routeCode}/flankProtection`,
- method: 'get'
- });
-}
-
/** 查询进路列表*/
-export function listRouteAccess(mapId, params) {
+export function listRouteRoute(mapId, params) {
return request({
- url: `/api/mapBuild/${mapId}/access`,
+ url: `/api/mapBuild/${mapId}/route`,
method: 'get',
params: params
});
}
/** 查询进路地图列表*/
-export function listRouteMapAccess(mapId) {
+export function listRouteMapRoute(mapId) {
return request({
- url: `/api/mapBuild/${mapId}/access/all`,
+ url: `/api/mapBuild/${mapId}/route/all`,
method: 'get'
});
}
/** 查询进路明细*/
-export function queryRouteAccessDetail(data) {
+export function queryRouteRouteDetail(data) {
return request({
- url: `/api/mapBuild/${data.mapId}/access/${data.id}`,
+ url: `/api/mapBuild/${data.mapId}/route/${data.id}`,
method: 'get'
});
}
/** 创建进路*/
-export function createRouteAccess(data) {
+export function createRouteRoute(data) {
return request({
- url: `/api/mapBuild/${data.mapId}/access`,
+ url: `/api/mapBuild/${data.mapId}/route`,
method: 'post',
data: data
});
}
/** 删除进路*/
-export function deleteRouteAccess(mapId, id) {
+export function deleteRouteRoute(mapId, id) {
return request({
- url: `/api/mapBuild/${mapId}/access/${id}`,
+ url: `/api/mapBuild/${mapId}/route/${id}`,
method: 'delete'
});
}
/** 更新进路*/
-export function updateRouteAccess(data) {
+export function updateRouteRoute(data) {
return request({
- url: `/api/mapBuild/${data.mapId}/access/${data.id}`,
+ url: `/api/mapBuild/${data.mapId}/route/${data.id}`,
method: 'put',
data: data
});
}
-/** 更新敌对进路*/
-export function updateAgainstAccess(data) {
- return request({
- url: `/api/mapBuild/${data.mapId}/access/${data.id}/againstRel`,
- method: 'post',
- data: data
- });
-}
-
/** 创建联动道岔*/
export function createLinkageSwitch(data) {
return request({
@@ -226,9 +154,9 @@ export function createLinkageSwitch(data) {
}
/** 删除联动道岔*/
-export function deleteLinkageSwitch(mapId, coupleId) {
+export function deleteLinkageSwitch(coupleId) {
return request({
- url: `/api/mapBuild/switchCoupled/${mapId}/${coupleId}`,
+ url: `/api/mapBuild/switchCoupled/${coupleId}`,
method: 'delete'
});
}
@@ -236,7 +164,7 @@ export function deleteLinkageSwitch(mapId, coupleId) {
/** get联动道岔列表*/
export function listLinkageSwitch(mapId, params) {
return request({
- url: `/api/mapBuild/switchCoupled/list/${mapId}`,
+ url: `/api/mapBuild/${mapId}/switchCoupled`,
method: 'get',
params: params
});
diff --git a/src/jlmap3d/main/loaders/FBXLoader2.js b/src/jlmap3d/main/loaders/FBXLoader2.js
index fed5c2ed1..d1b5d9db1 100644
--- a/src/jlmap3d/main/loaders/FBXLoader2.js
+++ b/src/jlmap3d/main/loaders/FBXLoader2.js
@@ -834,7 +834,7 @@
* @param {number} polygonVertexIndex - Index of vertex in draw order (which index of the index buffer refers to this vertex).
* @param {number} polygonIndex - Index of polygon in geometry.
* @param {number} vertexIndex - Index of vertex inside vertex buffer (used because some data refers to old index buffer that we don't use anymore).
- * @param {{datasize: number, buffer: number[], indices: number[], mappingType: string, referenceType: string}} infoObject - Object containing data and how to access data.
+ * @param {{datasize: number, buffer: number[], indices: number[], mappingType: string, referenceType: string}} infoObject - Object containing data and how to route data.
* @returns {number[]}
*/
function getData( polygonVertexIndex, polygonIndex, vertexIndex, infoObject ) {
@@ -848,7 +848,7 @@
* @param {number} polygonVertexIndex - Index of vertex in draw order (which index of the index buffer refers to this vertex).
* @param {number} polygonIndex - Index of polygon in geometry.
* @param {number} vertexIndex - Index of vertex inside vertex buffer (used because some data refers to old index buffer that we don't use anymore).
- * @param {{datasize: number, buffer: number[], indices: number[], mappingType: string, referenceType: string}} infoObject - Object containing data and how to access data.
+ * @param {{datasize: number, buffer: number[], indices: number[], mappingType: string, referenceType: string}} infoObject - Object containing data and how to route data.
* @returns {number[]}
*/
Direct: function ( polygonVertexIndex, polygonIndex, vertexIndex, infoObject ) {
@@ -862,7 +862,7 @@
* @param {number} polygonVertexIndex - Index of vertex in draw order (which index of the index buffer refers to this vertex).
* @param {number} polygonIndex - Index of polygon in geometry.
* @param {number} vertexIndex - Index of vertex inside vertex buffer (used because some data refers to old index buffer that we don't use anymore).
- * @param {{datasize: number, buffer: number[], indices: number[], mappingType: string, referenceType: string}} infoObject - Object containing data and how to access data.
+ * @param {{datasize: number, buffer: number[], indices: number[], mappingType: string, referenceType: string}} infoObject - Object containing data and how to route data.
* @returns {number[]}
*/
IndexToDirect: function ( polygonVertexIndex, polygonIndex, vertexIndex, infoObject ) {
@@ -881,7 +881,7 @@
* @param {number} polygonVertexIndex - Index of vertex in draw order (which index of the index buffer refers to this vertex).
* @param {number} polygonIndex - Index of polygon in geometry.
* @param {number} vertexIndex - Index of vertex inside vertex buffer (used because some data refers to old index buffer that we don't use anymore).
- * @param {{datasize: number, buffer: number[], indices: number[], mappingType: string, referenceType: string}} infoObject - Object containing data and how to access data.
+ * @param {{datasize: number, buffer: number[], indices: number[], mappingType: string, referenceType: string}} infoObject - Object containing data and how to route data.
* @returns {number[]}
*/
Direct: function ( polygonVertexIndex, polygonIndex, vertexIndex, infoObject ) {
@@ -895,7 +895,7 @@
* @param {number} polygonVertexIndex - Index of vertex in draw order (which index of the index buffer refers to this vertex).
* @param {number} polygonIndex - Index of polygon in geometry.
* @param {number} vertexIndex - Index of vertex inside vertex buffer (used because some data refers to old index buffer that we don't use anymore).
- * @param {{datasize: number, buffer: number[], indices: number[], mappingType: string, referenceType: string}} infoObject - Object containing data and how to access data.
+ * @param {{datasize: number, buffer: number[], indices: number[], mappingType: string, referenceType: string}} infoObject - Object containing data and how to route data.
* @returns {number[]}
*/
IndexToDirect: function ( polygonVertexIndex, polygonIndex, vertexIndex, infoObject ) {
@@ -914,7 +914,7 @@
* @param {number} polygonVertexIndex - Index of vertex in draw order (which index of the index buffer refers to this vertex).
* @param {number} polygonIndex - Index of polygon in geometry.
* @param {number} vertexIndex - Index of vertex inside vertex buffer (used because some data refers to old index buffer that we don't use anymore).
- * @param {{datasize: number, buffer: number[], indices: number[], mappingType: string, referenceType: string}} infoObject - Object containing data and how to access data.
+ * @param {{datasize: number, buffer: number[], indices: number[], mappingType: string, referenceType: string}} infoObject - Object containing data and how to route data.
* @returns {number[]}
*/
IndexToDirect: function ( polygonVertexIndex, polygonIndex, vertexIndex, infoObject ) {
diff --git a/src/jmap/theme/beijing_01/menusPlan/chooseTemplatePlan.vue b/src/jmap/theme/beijing_01/menusPlan/chooseTemplatePlan.vue
index 34fdaf063..6b4456292 100644
--- a/src/jmap/theme/beijing_01/menusPlan/chooseTemplatePlan.vue
+++ b/src/jmap/theme/beijing_01/menusPlan/chooseTemplatePlan.vue
@@ -93,17 +93,6 @@ export default {
}
return runPlanTemplateList(params);
},
- convertField(fieldValue, enumList, converFormat) {
- if (enumList && converFormat && converFormat.length >= 2) {
- const value = converFormat[0];
- const label = converFormat[1];
- for (let i = 0; i < enumList.length; i++) {
- if ('' + fieldValue === '' + enumList[i][value]) {
- return enumList[i][label];
- }
- }
- }
- },
handleConfirm() {
this.doClose();
if (this.$refs && this.$refs.pageRules) {
diff --git a/src/jmap/theme/beijing_01/menusPlan/createTodayPlan.vue b/src/jmap/theme/beijing_01/menusPlan/createTodayPlan.vue
index 8f5e78ae4..8262b7bdf 100644
--- a/src/jmap/theme/beijing_01/menusPlan/createTodayPlan.vue
+++ b/src/jmap/theme/beijing_01/menusPlan/createTodayPlan.vue
@@ -96,17 +96,6 @@ export default {
}
return runPlanTemplateList(params);
},
- convertField(fieldValue, enumList, converFormat) {
- if (enumList && converFormat && converFormat.length >= 2) {
- const value = converFormat[0];
- const label = converFormat[1];
- for (let i = 0; i < enumList.length; i++) {
- if ('' + fieldValue === '' + enumList[i][value]) {
- return enumList[i][label];
- }
- }
- }
- },
// 生成每日运行图
handleConfirm() {
if (this.$refs && this.$refs.pageRules) {
diff --git a/src/jmap/theme/chengdu_03/menusPlan/chooseTemplatePlan.vue b/src/jmap/theme/chengdu_03/menusPlan/chooseTemplatePlan.vue
index c7562251e..f1ec55b55 100644
--- a/src/jmap/theme/chengdu_03/menusPlan/chooseTemplatePlan.vue
+++ b/src/jmap/theme/chengdu_03/menusPlan/chooseTemplatePlan.vue
@@ -93,17 +93,6 @@ export default {
}
return runPlanTemplateList(params);
},
- convertField(fieldValue, enumList, converFormat) {
- if (enumList && converFormat && converFormat.length >= 2) {
- const value = converFormat[0];
- const label = converFormat[1];
- for (let i = 0; i < enumList.length; i++) {
- if ('' + fieldValue === '' + enumList[i][value]) {
- return enumList[i][label];
- }
- }
- }
- },
handleConfirm() {
this.doClose();
if (this.$refs && this.$refs.pageRules) {
diff --git a/src/jmap/theme/chengdu_03/menusPlan/createTodayPlan.vue b/src/jmap/theme/chengdu_03/menusPlan/createTodayPlan.vue
index 66879a4e6..d4c84c708 100644
--- a/src/jmap/theme/chengdu_03/menusPlan/createTodayPlan.vue
+++ b/src/jmap/theme/chengdu_03/menusPlan/createTodayPlan.vue
@@ -95,17 +95,6 @@ export default {
}
return runPlanTemplateList(params);
},
- convertField(fieldValue, enumList, converFormat) {
- if (enumList && converFormat && converFormat.length >= 2) {
- const value = converFormat[0];
- const label = converFormat[1];
- for (let i = 0; i < enumList.length; i++) {
- if ('' + fieldValue === '' + enumList[i][value]) {
- return enumList[i][label];
- }
- }
- }
- },
// 生成每日运行图
handleConfirm() {
if (this.$refs && this.$refs.pageRules) {
diff --git a/src/jmap/theme/chengdu_04/menusPlan/chooseTemplatePlan.vue b/src/jmap/theme/chengdu_04/menusPlan/chooseTemplatePlan.vue
index 50055c314..c99e75b27 100644
--- a/src/jmap/theme/chengdu_04/menusPlan/chooseTemplatePlan.vue
+++ b/src/jmap/theme/chengdu_04/menusPlan/chooseTemplatePlan.vue
@@ -93,17 +93,6 @@ export default {
}
return runPlanTemplateList(params);
},
- convertField(fieldValue, enumList, converFormat) {
- if (converFormat && converFormat.length >= 2) {
- const value = converFormat[0];
- const label = converFormat[1];
- for (let i = 0; enumList && i < enumList.length; i++) {
- if ('' + fieldValue === '' + enumList[i][value]) {
- return enumList[i][label];
- }
- }
- }
- },
handleConfirm() {
this.doClose();
if (this.$refs && this.$refs.pageRules) {
diff --git a/src/scripts/GlobalPlugin.js b/src/scripts/GlobalPlugin.js
index 52500daf6..f33ea1e74 100644
--- a/src/scripts/GlobalPlugin.js
+++ b/src/scripts/GlobalPlugin.js
@@ -77,6 +77,18 @@ Vue.prototype.$convertField = function(fieldValue, enumList, converFormat, isLis
return isList ? arr: '';
};
+Vue.prototype.$convertSpecifiedField = function(dataDict, enumList, key, value, fieldList) {
+ if (dataDict && enumList && fieldList && enumList.length && fieldList.length) {
+ fieldList.forEach(field => {
+ enumList.forEach(elem => {
+ if (elem[key] === dataDict[field]) {
+ dataDict[field] = elem[value];
+ }
+ });
+ });
+ }
+},
+
Vue.prototype.$convertList = function(FromList, ToList, checktypeFunction) {
if (FromList) {
ToList.length = 0;
diff --git a/src/scripts/translate.js b/src/scripts/translate.js
index 6316bb63f..71a265728 100644
--- a/src/scripts/translate.js
+++ b/src/scripts/translate.js
@@ -1,7 +1,7 @@
// 转换sheet名称
export const translateSheetTitle = {
sheetTitle: ['基本信息', '皮肤配置', '交路列表', '交路-区段', '自动信号机', '自动信号机列表', '敌对进路', '进路列表', '进路延续保护区段', '进路延续保护道岔', '进路自动触发区段', '进路侧防道岔', '进路-区段', '进路-信号机', '进路-站台', '进路-道岔', '车站计数器', '车站延时解锁表示器', '线段', 'link', '路径单元关系', '路径单元', '区段', '信号机', '速度等级', '车站控制模式', '站台', '车站', '双动道岔', '道岔', '文字信息', '列车', '列车模型', '车次窗', 'zc区域控制', 'lc控制', '全线临时限速', '图片列表'],
- sheetName: ['base', 'skinVO', 'routingList', 'routingSectionList', 'autoSignalList', 'autoSignalClearList', 'accessAgainstList', 'accessList', 'routeOverlapSectionList', 'routeOverlapSwitchList', 'routeTriggerSectionList', 'routeFlankProtectionList', 'accessSectionList', 'accessSignalList', 'accessStandList', 'accessSwitchList', 'counterList', 'delayShowList', 'lineList', 'linkList', 'routeUnitRelList', 'routeUnitList', 'sectionList', 'signalList', 'speedLevel', 'stationControlList', 'stationStandList', 'stationList', 'switchCoupledList', 'switchList', 'textList', 'trainList', 'trainModelList', 'trainWindowList', 'zcList', 'lcList', 'tempSpeedLimitList', 'resourceList']
+ sheetName: ['base', 'skinVO', 'routingList', 'routingSectionList', 'autoSignalList', 'autoSignalClearList', 'accessAgainstList', 'accessList', 'routeOverlapSectionList', 'routeOverlapSwitchList', 'routeTriggerSectionList', 'routeFlankProtectionList', 'routeSectionList', 'accessSignalList', 'routeStandList', 'accessSwitchList', 'counterList', 'delayShowList', 'lineList', 'linkList', 'routeUnitRelList', 'routeUnitList', 'sectionList', 'signalList', 'speedLevel', 'stationControlList', 'stationStandList', 'stationList', 'switchCoupledList', 'switchList', 'textList', 'trainList', 'trainModelList', 'trainWindowList', 'zcList', 'lcList', 'tempSpeedLimitList', 'resourceList']
};
// 转换属性名称
@@ -128,7 +128,7 @@ export const translate = {
{ key: 'sectionCode', tHeader: '区段编号', formatter: (val) => { return val || ''; } }
]
},
- accessSectionList: {
+ routeSectionList: {
sheetName: '进路-区段',
columns: [
{ key: 'routeCode', tHeader: '进路编号', formatter: (val) => { return val || ''; } },
@@ -143,7 +143,7 @@ export const translate = {
{ key: 'position', tHeader: '坐标', formatter: (val) => { return val ? JSON.parse(val) : ''; } }
]
},
- accessStandList: {
+ routeStandList: {
sheetName: '进路-站台',
columns: [
{ key: 'routeCode', tHeader: '进路编号', formatter: (val) => { return val || ''; } },
diff --git a/src/views/display/demon/addQuest.vue b/src/views/display/demon/addQuest.vue
index 346ae91b6..f312dab70 100644
--- a/src/views/display/demon/addQuest.vue
+++ b/src/views/display/demon/addQuest.vue
@@ -1,188 +1,187 @@
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
diff --git a/src/views/lesson/lessoncategory/edit/chapter/list.vue b/src/views/lesson/lessoncategory/edit/chapter/list.vue
index 6853e7e0a..5bf5ed045 100644
--- a/src/views/lesson/lessoncategory/edit/chapter/list.vue
+++ b/src/views/lesson/lessoncategory/edit/chapter/list.vue
@@ -205,17 +205,6 @@ export default {
});
}
},
- convertField(fieldValue, enumList, converFormat) {
- if (converFormat && converFormat.length >= 2) {
- const value = converFormat[0];
- const label = converFormat[1];
- for (let i = 0; i < enumList.length; i++) {
- if ('' + fieldValue === '' + enumList[i][value]) {
- return enumList[i][label];
- }
- }
- }
- },
addObj(index, row) {
const data = [];
row['isShow'] = true;
diff --git a/src/views/lesson/trainingmanage/index.vue b/src/views/lesson/trainingmanage/index.vue
index f61a82be8..e03a1456a 100644
--- a/src/views/lesson/trainingmanage/index.vue
+++ b/src/views/lesson/trainingmanage/index.vue
@@ -250,17 +250,6 @@ export default {
});
}
},
- convertField(fieldValue, enumList, converFormat) {
- if (converFormat && converFormat.length >= 2) {
- const value = converFormat[0];
- const label = converFormat[1];
- for (let i = 0; i < enumList.length; i++) {
- if ('' + fieldValue === '' + enumList[i][value]) {
- return enumList[i][label];
- }
- }
- }
- },
autoMaticTrainging() {
this.$refs.draftTrain.show({ event: '01', title: '自动生成实训' });
},
@@ -271,12 +260,12 @@ export default {
this.$refs.draftTrain.show({ event: '03', title: '删除自动生成实训' });
},
demoDisplay(index, node) {
- const loading = this.$loading({
- lock: true,
- text: 'Loading',
- spinner: 'el-icon-loading',
- background: 'rgba(0, 0, 0, 0.7)'
- });
+ this.loading = this.$loading({
+ lock: true,
+ text: 'Loading',
+ spinner: 'el-icon-loading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ });
trainingNotify({ trainingId: node.id }).then(resp => {
/** 区分演示和正式，需要在演示时设置lessonId为0*/
const query = { group: resp.data, trainingId: node.id, lessonId: 0 };
@@ -284,7 +273,7 @@ export default {
launchFullscreen();
}).catch(error => {
this.$messageBox(`创建仿真失败: ${error.message}`);
- this.loading.close();
+ this.loading.close();
});
},
diff --git a/src/views/map/mapdraft/mapedit/automaticoperate/detail.vue b/src/views/map/mapdraft/mapedit/automaticoperate/detail.vue
index bf2fdc51d..49ea3a4de 100644
--- a/src/views/map/mapdraft/mapedit/automaticoperate/detail.vue
+++ b/src/views/map/mapdraft/mapedit/automaticoperate/detail.vue
@@ -147,24 +147,13 @@ export default {
this.mapList = response.data;
});
},
- convertField(dataDict, enumList, key, value, fieldList) {
- if (dataDict && enumList && fieldList && enumList.length && fieldList.length) {
- fieldList.forEach(field => {
- enumList.forEach(elem => {
- if (elem[key] === dataDict[field]) {
- dataDict[field] = elem[value];
- }
- });
- });
- }
- },
afterQuery(data) {
if (data && data.list) {
const that = this;
const list = data.list;
if (list) {
list.map(elem => {
- that.convertField(elem, that.mapList, 'id', 'name', ['mapId']);
+ that.$convertSpecifiedField(elem, that.mapList, 'id', 'name', ['mapId']);
elem.code = elem.signalCode;
elem.signalCode = that.formatName(elem.signalCode);
});
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/trainmodel.vue b/src/views/map/mapdraft/mapedit/mapoperate/trainmodel.vue
index ffdc93f01..218771f38 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/trainmodel.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/trainmodel.vue
@@ -44,8 +44,7 @@
+
diff --git a/src/views/map/mapdraft/mapedit/routeoperate/detail.vue b/src/views/map/mapdraft/mapedit/routeoperate/detail.vue
index fa8a7bde4..2a120d8f5 100644
--- a/src/views/map/mapdraft/mapedit/routeoperate/detail.vue
+++ b/src/views/map/mapdraft/mapedit/routeoperate/detail.vue
@@ -9,17 +9,13 @@
/>
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
diff --git a/src/layout/components/Logout.vue b/src/layout/components/Logout.vue
index 3c771d258..0a0aa21d6 100644
--- a/src/layout/components/Logout.vue
+++ b/src/layout/components/Logout.vue
@@ -8,16 +8,25 @@
-
- 创建
- 更新
-
-
+
+
+
+
+
+
+
+
+
\ No newline at end of file
+
diff --git a/src/views/map/skinStyle/index.vue b/src/views/map/skinStyle/index.vue
index 6f4b8fec1..71ad38679 100644
--- a/src/views/map/skinStyle/index.vue
+++ b/src/views/map/skinStyle/index.vue
@@ -1,143 +1,124 @@
-
+
+ 创建
+ 更新
+ 返回
+
+
-
-
-
+
+
\ No newline at end of file
+ this.skinStyleList = [];
+ getSkinStyleList().then(response => {
+ this.skinStyleList = response.data;
+ });
+ },
+ handleAdd() {
+ this.$router.push(`${UrlConfig.map.skinStyleDraft}/add/null`);
+ },
+ handleEdit(index, row) {
+ this.$router.push(`${UrlConfig.map.skinStyleDraft}/edit/${row.id}`);
+ },
+ handleDelete(index, row) {
+ this.$confirm('此操作将永久删除该皮肤, 是否继续?', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ delSkinStyle(row.id).then(() => {
+ this.$message.success('删除皮肤成功');
+ }).catch(() => {
+ this.$messageBox('删除皮肤失败');
+ });
+ }).catch(() => {
+ });
+ },
+ reloadTable() {
+ this.queryList.reload();
+ }
+ }
+};
+
diff --git a/src/views/orderauthor/author/draft.vue b/src/views/orderauthor/author/draft.vue
index d826d7710..56ae9e2aa 100644
--- a/src/views/orderauthor/author/draft.vue
+++ b/src/views/orderauthor/author/draft.vue
@@ -107,16 +107,6 @@ export default {
resizeHandler: function () {
this.height = this._clientHeight - 130;
},
- convertList(FromList, ToList, checktypeFunction) {
- if (FromList) {
- ToList.length = 0;
- FromList.forEach(elem => {
- if (checktypeFunction(elem)) {
- ToList.push({ value: elem.code, label: elem.name });
- }
- });
- }
- },
initLoadPage() {
// 加载发布课程列表
this.display = 1;
diff --git a/src/views/orderauthor/permission/draft/ruleForm.vue b/src/views/orderauthor/permission/draft/ruleForm.vue
index 10e69ad9d..dce3424fe 100644
--- a/src/views/orderauthor/permission/draft/ruleForm.vue
+++ b/src/views/orderauthor/permission/draft/ruleForm.vue
@@ -101,16 +101,6 @@ export default {
});
return name;
},
- convertList(FromList, ToList, ChecktypeFunction) {
- if (FromList) {
- ToList.length = 0;
- FromList.forEach(elem => {
- if (ChecktypeFunction(elem)) {
- ToList.push({ value: elem.code, label: elem.name });
- }
- });
- }
- },
loadInitData() {
this.EffectiveTypeList = [];
this.$Dictionary.effectiveType().then(list => {
diff --git a/src/views/package/index.vue b/src/views/package/index.vue
index cd233c674..8a49349ed 100644
--- a/src/views/package/index.vue
+++ b/src/views/package/index.vue
@@ -1,7 +1,7 @@
-
@@ -165,16 +165,6 @@ export default {
this.loadInitData();
},
methods: {
- convertList(FromList, ToList, ChecktypeFunction) {
- if (FromList) {
- ToList.length = 0;
- FromList.forEach(elem => {
- if (ChecktypeFunction(elem)) {
- ToList.push({ value: elem.code, label: elem.name });
- }
- });
- }
- },
handleRoleVest(index, row) {
this.$refs.selectRole.doShow(row.id);
},
@@ -200,8 +190,6 @@ export default {
});
},
formatterDate(row, porpInfo) {
- if (row.hasOwnProperty(porpInfo.property)) {
- }
return row[porpInfo.property];
},
queryFunction(params) {
diff --git a/src/views/publish/examRule/index.vue b/src/views/publish/examRule/index.vue
index 503f3346a..3addf718c 100644
--- a/src/views/publish/examRule/index.vue
+++ b/src/views/publish/examRule/index.vue
@@ -186,16 +186,6 @@ export default {
this.$store.dispatch('app/handleRuleList', []);
},
methods: {
- convertList(FromList, ToList, ChecktypeFunction) {
- if (FromList) {
- ToList.length = 0;
- FromList.forEach(elem => {
- if (ChecktypeFunction(elem)) {
- ToList.push({ value: elem.code, label: elem.name });
- }
- });
- }
- },
resizeHandler: function () {
if (/\/exam\//.test(`${this.$route.path}`)) {
this.height = this._clientHeight - 50;
@@ -219,17 +209,6 @@ export default {
});
});
},
- convertField(fieldValue, enumList, converFormat) {
- if (converFormat && converFormat.length >= 2) {
- const value = converFormat[0];
- const label = converFormat[1];
- for (let i = 0; enumList && i < enumList.length; i++) {
- if ('' + fieldValue === '' + enumList[i][value]) {
- return enumList[i][label];
- }
- }
- }
- },
durationField(fieldValue) {
if (fieldValue) {
const time = Number(fieldValue) / 60;
diff --git a/src/views/publish/productStatus/index.vue b/src/views/publish/productStatus/index.vue
index b56d00796..51ceb604d 100644
--- a/src/views/publish/productStatus/index.vue
+++ b/src/views/publish/productStatus/index.vue
@@ -109,18 +109,6 @@ export default {
this.skinStyleList = response.data;
});
},
- convertField(fieldValue, enumList, converFormat) {
- if (converFormat && converFormat.length >= 2) {
- const value = converFormat[0];
- const label = converFormat[1];
- for (let i = 0; i < enumList.length; i++) {
- if ('' + fieldValue === '' + enumList[i][value]) {
- return enumList[i][label];
- }
- }
- }
- },
-
// 删除
handleDelete(index, row) {
this.$confirm('此操作将删除此考试结果, 是否继续?', '提示', {
diff --git a/src/views/publish/publishLesson/index.vue b/src/views/publish/publishLesson/index.vue
index 4e74613e8..a75f07a08 100644
--- a/src/views/publish/publishLesson/index.vue
+++ b/src/views/publish/publishLesson/index.vue
@@ -113,17 +113,6 @@ export default {
this.skinStyleList = response.data;
});
},
- convertField(fieldValue, enumList, converFormat) {
- if (converFormat && converFormat.length >= 2) {
- const value = converFormat[0];
- const label = converFormat[1];
- for (let i = 0; i < enumList.length; i++) {
- if ('' + fieldValue === '' + enumList[i][value]) {
- return enumList[i][label];
- }
- }
- }
- },
// 编辑
handleEdit(index, row) {
},
diff --git a/src/views/publish/publishMap/index.vue b/src/views/publish/publishMap/index.vue
index be34017bc..cff88aa03 100644
--- a/src/views/publish/publishMap/index.vue
+++ b/src/views/publish/publishMap/index.vue
@@ -135,17 +135,6 @@ export default {
this.skinStyleList = response.data;
});
},
- convertField(fieldValue, enumList, converFormat) {
- if (converFormat && converFormat.length >= 2) {
- const value = converFormat[0];
- const label = converFormat[1];
- for (let i = 0; i < enumList.length; i++) {
- if ('' + fieldValue === '' + enumList[i][value]) {
- return enumList[i][label];
- }
- }
- }
- },
// 编辑
handleUpdate(index, row) {
this.$router.push({ path: `${UrlConfig.publish.mapDraft}/edit/${row.id}`, query: { name: row.name } });
diff --git a/src/views/publish/runPlanCommon/chooseTemplatePlan.vue b/src/views/publish/runPlanCommon/chooseTemplatePlan.vue
index 3ca3e6381..ba4edf924 100644
--- a/src/views/publish/runPlanCommon/chooseTemplatePlan.vue
+++ b/src/views/publish/runPlanCommon/chooseTemplatePlan.vue
@@ -91,17 +91,6 @@ export default {
params['skinStyle'] = this.model.skinStyle || '';
return runPlanTemplateList(params);
},
- convertField(fieldValue, enumList, converFormat) {
- if (converFormat && converFormat.length >= 2) {
- const value = converFormat[0];
- const label = converFormat[1];
- for (let i = 0; i < enumList.length; i++) {
- if ('' + fieldValue === '' + enumList[i][value]) {
- return enumList[i][label];
- }
- }
- }
- },
handleConfirm() {
this.doClose();
if (this.$refs && this.$refs.pageRules) {
diff --git a/src/views/publish/runPlanCommon/index.vue b/src/views/publish/runPlanCommon/index.vue
index d97a9b22d..5872b528a 100644
--- a/src/views/publish/runPlanCommon/index.vue
+++ b/src/views/publish/runPlanCommon/index.vue
@@ -73,17 +73,6 @@ export default {
};
},
methods: {
- convertField(fieldValue, enumList, converFormat) {
- if (converFormat && converFormat.length >= 2) {
- const value = converFormat[0];
- const label = converFormat[1];
- for (let i = 0; i < enumList.length; i++) {
- if ('' + fieldValue === '' + enumList[i][value]) {
- return enumList[i][label];
- }
- }
- }
- },
queryFunction(params) {
params['userId'] = '';
return getRunPlanLoadList(params);
diff --git a/src/views/publish/runPlanEveryDay/index.vue b/src/views/publish/runPlanEveryDay/index.vue
index d19cfee76..58d2abfcf 100644
--- a/src/views/publish/runPlanEveryDay/index.vue
+++ b/src/views/publish/runPlanEveryDay/index.vue
@@ -99,17 +99,6 @@ export default {
});
});
},
- convertField(fieldValue, enumList, converFormat) {
- if (converFormat && converFormat.length >= 2) {
- const value = converFormat[0];
- const label = converFormat[1];
- for (let i = 0; i < enumList.length; i++) {
- if ('' + fieldValue === '' + enumList[i][value]) {
- return enumList[i][label];
- }
- }
- }
- },
handleDelete(index, row) {
this.$confirm('此操作将删除每日运行图, 是否继续?', '提示', {
confirmButtonText: '确定',
diff --git a/src/views/publish/runPlanTemplate/index.vue b/src/views/publish/runPlanTemplate/index.vue
index 0d0a0f7c7..62c288cde 100644
--- a/src/views/publish/runPlanTemplate/index.vue
+++ b/src/views/publish/runPlanTemplate/index.vue
@@ -100,17 +100,6 @@ export default {
});
});
},
- convertField(fieldValue, enumList, converFormat) {
- if (converFormat && converFormat.length >= 2) {
- const value = converFormat[0];
- const label = converFormat[1];
- for (let i = 0; i < enumList.length; i++) {
- if ('' + fieldValue === '' + enumList[i][value]) {
- return enumList[i][label];
- }
- }
- }
- },
// 删除
handleDelete(index, row) {
this.$confirm('此操作将删除此运行图模板, 是否继续?', '提示', {
diff --git a/src/views/publish/simulationScript/index.vue b/src/views/publish/simulationScript/index.vue
index 4a8742ba4..583470c17 100644
--- a/src/views/publish/simulationScript/index.vue
+++ b/src/views/publish/simulationScript/index.vue
@@ -90,18 +90,6 @@ export default {
});
});
},
- convertField(fieldValue, enumList, converFormat) {
- if (converFormat && converFormat.length >= 2) {
- const value = converFormat[0];
- const label = converFormat[1];
- for (let i = 0; i < enumList.length; i++) {
- if ('' + fieldValue === '' + enumList[i][value]) {
- return enumList[i][label];
- }
- }
- }
- },
-
// 删除
handleDelete(index, row) {
this.$confirm('此操作将删除此仿真脚本, 是否继续?', '提示', {
diff --git a/src/views/replay/index.vue b/src/views/replay/index.vue
index 4544ea318..4ffaf3996 100644
--- a/src/views/replay/index.vue
+++ b/src/views/replay/index.vue
@@ -1,135 +1,131 @@
-
-
-
-
+
+
\ No newline at end of file
+ currentModel: {}
+ };
+ },
+ computed: {
+ role() {
+ return this.$store.state.user.roles.includes('04') ||
+ this.$store.state.user.roles.includes('05');
+ }
+ },
+ mounted() {
+ this.loadInitData();
+ },
+ methods: {
+ loadInitData() {
+ this.EffectiveTypeList = [];
+ this.$Dictionary.effectiveType().then(list => {
+ this.EffectiveTypeList = list.map(elem => { return { value: elem.code, label: elem.name }; });
+ });
+ },
+ reloadTable() {
+ this.queryList.reload();
+ },
+ rePlay(index, data) {
+ getPublishMapInfo(data.mapId).then(resp => {
+ const model = resp.data;
+ simulationRelpay(data.id).then(rest => {
+ const query = { skinStyle: model.skinStyle, group: rest.data, replayId: data.id, createTime: data.createTime, destroyTime: data.destroyTime };
+ this.$router.push({ path: `${UrlConfig.display}/replay`, query: query });
+ });
+ });
+ },
+ delete(index, data) {
+ this.$confirm('此操作将删除该回放, 是否继续?', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ delSimulationRecord(data.id).then(response => {
+ this.$message.success('删除成功');
+ this.reloadTable();
+ }).catch(() => {
+ this.reloadTable();
+ this.$messageBox('删除失败');
+ });
+ }).catch(() => { });
+ }
+ }
+};
+
From fc4cf549b28b158e387712b2734cf343d5936e93 Mon Sep 17 00:00:00 2001
From: ival <610568032@qq.com>
Date: Tue, 13 Aug 2019 17:33:46 +0800
Subject: [PATCH 009/172] =?UTF-8?q?=E5=88=87=E6=8D=A2=E7=B3=BB=E7=BB=9F?=
=?UTF-8?q?=E8=AF=AD=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../QueryListPage/QueryListPage.vue | 2 +-
src/layout/components/Language.vue | 55 +++++++++++++++++++
src/layout/components/Logout.vue | 12 ++++
3 files changed, 68 insertions(+), 1 deletion(-)
create mode 100644 src/layout/components/Language.vue
diff --git a/src/components/QueryListPage/QueryListPage.vue b/src/components/QueryListPage/QueryListPage.vue
index 78f3a33d5..55174169f 100644
--- a/src/components/QueryListPage/QueryListPage.vue
+++ b/src/components/QueryListPage/QueryListPage.vue
@@ -226,7 +226,7 @@ export default {
};
},
mounted() {
- this.commitQuery();
+ // this.commitQuery();
// this.tableHeight = this.$refs.table2.$el.offsetHeight + 23;
},
methods: {
diff --git a/src/layout/components/Language.vue b/src/layout/components/Language.vue
new file mode 100644
index 000000000..05a1ce122
--- /dev/null
+++ b/src/layout/components/Language.vue
@@ -0,0 +1,55 @@
+
+
+ 语言：
+
+
+
+
+
- {
+ getPublish3dMapDetail(skinCode).then(netdata => {
ModelLoad(data,scope,netdata.data,mapdata,camera,controls,scene);
});
//
diff --git a/src/jmap/config/deviceStyle.js b/src/jmap/config/deviceStyle.js
index bc429b5db..f9b8bae72 100644
--- a/src/jmap/config/deviceStyle.js
+++ b/src/jmap/config/deviceStyle.js
@@ -7,5 +7,5 @@ const mapDeviceStyle = {
};
export function selectSkinStyle(code) {
- return Object.assign({}, require(`./skinStyle/${mapDeviceStyle[code || '02']}`).default);
+ return Object.assign({}, require(`./skinCode/${mapDeviceStyle[code || '02']}`).default);
}
diff --git a/src/jmap/config/skinStyle/batong_01.js b/src/jmap/config/skinStyle/batong_01.js
deleted file mode 100644
index 893b5d1e5..000000000
--- a/src/jmap/config/skinStyle/batong_01.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import defaultStyle from '../defaultStyle';
-import deviceType from '../../constant/deviceType';
-
-class SkinStyle extends defaultStyle {
- constructor() {
- super();
- this[deviceType.Link] = {
- lineWidthColor: '#FFFFFF', // line 颜色
- linkWidth: 4.4, // link 宽度
- linkColor: '#3F3F3F', // link 线条颜色
- linkTextColor: '#FFFFFF' // link 字体颜色
- };
- }
-}
-
-export default new SkinStyle();
diff --git a/src/jmap/config/skinStyle/bejing_01.js b/src/jmap/config/skinStyle/bejing_01.js
deleted file mode 100644
index 710a1a982..000000000
--- a/src/jmap/config/skinStyle/bejing_01.js
+++ /dev/null
@@ -1,556 +0,0 @@
-import defaultStyle from '../defaultStyle';
-import deviceType from '../../constant/deviceType';
-
-class SkinStyle extends defaultStyle {
- constructor() {
- super();
- this[deviceType.Link] = {
- lineWidthColor: '#FFFFFF', // line 颜色
- linkWidth: 4.4, // link 宽度
- linkColor: '#3F3F3F', // link 线条颜色
- linkTextColor: '#FFFFFF' // link 字体颜色
- };
-
- this[deviceType.Section] = {
- text: {
- position: -1, // 区段名称位置 1 上面 -1 下面 0 对称
- distance: 11, // 文字离区段距离
- fontSize: 11, // 字体大小
- fontWeight: 'normal', // 字体粗细
- fontColor: '#FFFFFF', // 字体颜色
- textAlign: 'center', // 水平对齐方式
- textPosition: 'inside', // 文字位置
- textVerticalAlign: 'middle' // 文字垂直对齐方式
- },
- logicText: {
- position: -1, // 区段名称位置 1 上面 -1 下面 0 对称
- distance: 11, // 文字离区段距离
- fontSize: 11, // 字体大小
- fontWeight: 'normal', // 字体粗细
- fontColor: '#FFFFFF', // 字体颜色
- textAlign: 'center', // 水平对齐方式
- textPosition: 'inside', // 文字位置
- textVerticalAlign: 'middle' // 文字垂直对齐方式
- },
- standText: {
- opposite: true, // 对称相反
- position: 1, // 区段名称位置 1 上面 -1 下面 0 对称
- distance: 11, // 文字离区段距离
- fontSize: 11, // 字体大小
- fontWeight: 'normal', // 字体粗细
- fontColor: '#FFFFFF', // 字体颜色
- textAlign: 'center', // 水平对齐方式
- textPosition: 'inside', // 文字位置
- textVerticalAlign: 'middle' // 文字垂直对齐方式
- },
- reentryText: {
- opposite: true, // 对称相反
- position: 1, // 区段名称位置 1 上面 -1 下面 0 对称
- distance: 11, // 文字离区段距离
- fontSize: 11, // 字体大小
- fontWeight: 'normal', // 字体粗细
- fontColor: '#FFFFFF', // 字体颜色
- textAlign: 'center', // 水平对齐方式
- textPosition: 'inside', // 文字位置
- textVerticalAlign: 'middle' // 文字垂直对齐方式
- },
- transferText: {
- opposite: true, // 对称相反
- position: 1, // 区段名称位置 1 上面 -1 下面 0 对称
- distance: 11, // 文字离区段距离
- fontSize: 11, // 字体大小
- fontWeight: 'normal', // 字体粗细
- fontColor: '#FFFFFF', // 字体颜色
- textAlign: 'center', // 水平对齐方式
- textPosition: 'inside', // 文字位置
- textVerticalAlign: 'middle' // 文字垂直对齐方式
- },
- destinationText: {
- position: 1, // 区段名称位置 1 上面 -1 下面 0 对称
- distance: 11, // 文字离区段距离
- fontSize: 11, // 字体大小
- fontWeight: 'bold', // 字体粗细
- fontColor: 'yellow', // 字体颜色
- textAlign: 'center', // 水平对齐方式
- textPosition: 'inside', // 文字位置
- textVerticalAlign: 'middle' // 文字垂直对齐方式
- },
- mouseOverStyle: {
- borderColor: '#fff',
- borderBackgroundColor: '#22DFDF',
- textShadowColor: '#22DFDF'
- },
- line: {
- width: 5, // 区段宽度
- beyondWidth: 0, // 区段宽超出宽度
- invadeColor: '#EF0C08', // 区段侵入颜色
- spareColor: '#606060', // 区段空闲颜色
- communicationOccupiedColor: '#FF0000', // 区段通信车占用颜色
- unCommunicationOccupiedColor: '#800080', // 区段非通讯车占用颜色
- routeLockColor: '#FFFFFF', // 区段路由锁定颜色
- faultLockColor: '#006400', // 区段故障锁定颜色
- undefinedColor: '#0071C1', // 区段未定义颜色
- protectionLockedColor: '#FEFF00', // 保护区段锁闭(未用)
- blockColor: '#800080', // 区段封锁颜色
- atcExcisionColor: '#A0522D', // 区段atc切除颜色
- atsExcisionColor: '#A0522D', // 区段ats切除颜色
- timeReleaseColor: '#3F3F3F', // 区段延时释放颜色
- protectiveLockColor: '#FFFF00', // 区段保护锁闭
- protectiveTimeReleaseColor: '#0071C1', // 区段保护延时解锁
- logicalColor: '#FFFF00', // 逻辑区段颜色 (未用)
- logicalTextColor: '#C0C0C0' // 逻辑区段名称颜色 (未用)
- },
- axle: {
- radius: 3, // 计轴 半径
- distance: 5, // 计轴和区段之间的距离 （未用）
- color: '#C0C0C0', // 区段计轴颜色
- resetColor: '#00FFFF', // 区段计轴预复位颜色
- Failure: '#E6A23C' // #FFFF00 计轴失效
- },
- speedLimit: { // 限速元素
- width: 1, // 限速线的宽度
- distance: 5, // 限速线距离区段距离
- lineColor: '#FFFF00', // 限速线颜色
- nameShow: false // 名称显示
- },
- separator: {
- z: 1, // 分割符层级
- width: 1.5, // 分隔符宽度
- endWidth: 1.5, // 尽头分隔符宽度
- endColor: '#7F7F7F', // 尽头分隔符颜色
- color: '#7F7F7F' // 区段边界符颜色
- }
- };
-
- this[deviceType.Signal] = {
- distance: 0, // 设备距离区段的距离
- post: {
- standardColor: '#5578B6', // 灯灯柱颜色
- standardWidth: 1.5 // 灯柱宽度
- },
- text: {
- distance: 3, // 文字和灯杆的距离
- isNoRotation: true, // 是否禁止旋转
- isAlignCenter: false, // 信号字体对其方式
- fontSize: 11, // 信号机名称字体大小
- fontWeight: 'bold', // 信号机名称字体粗细
- defaultColor: '#C0C0C0', // 信号灯字体默认色
- blockColor: '#EF0C08', // 信号灯字体锁定颜色
- checkColor: '#00FF00' // 信号字体
- },
- lamp: {
- stopWidth: 2, // 禁止线宽度
- borderVariable: true, // 信号灯边框可变
- borderWidth: 0.5, // 信号灯边框线宽度
- borderColor: '#3149C3', // 信号灯边框线颜色
- radiusR: 5, // 信号机宽度
- blockColor: '#EF0C08', // 信号灯锁闭
- grayColor: '#7F7F7F', // 信号灯灰色
- redColor: '#FF0000', // 信号灯红色
- greenColor: '#00FF00', // 信号灯绿色
- yellowColor: '#FFFF00', // 信号灯黄色
- whiteColor: '#FFFFFF', // 信号灯白色
- blueColor: '#0070C0' // 信号灯蓝色
- },
- route: {
- direction: false, // 自动进路方向
- offset: { x: 1, y: -2 }, // 自动进路偏移量
- routeColor: '#00FF00' // 自动进路
- },
- auto: {
- direction: true, // 自动通过方向
- offset: { x: 4, y: 0}, // 自动通过偏移量
- width: 5, // 自动宽度
- autoRoute: '#00FF00', // 自动进路
- autoTrigger: '#FFFF00', // 自动触发
- manualControl: '#FFFF00', // 人工控制
- outConflict: '#C00808' // 出车冲突
- },
- delay: {
- direction: false, // 延时解锁方向
- offset: { x: 0, y: -5}, // 延时解锁偏移量
- fontSize: 9, // 延迟解锁字体大小
- fontColor: '#FF0000', // 延迟解锁颜色
- fontWeight: 'bold' // 字体粗细
- },
- button: {
- distance: 5, // 信号灯按钮距离区段的距离
- borderDashColor: '#FFFFFF', // 信号灯按钮边线
- buttonColor: 'darkgreen', // 信号灯按钮颜色
- buttonLightenColor: '#E4EF50' // 信号灯按钮闪烁颜色
- },
- mouseOverStyle: {
- borderLineColor: '#FFFFFF',
- borderLineDash: [3, 3],
- nameBackgroundColor: '#22DFDF',
- lampBorderLineColor: '#22DFDF'
- }
- };
-
- this[deviceType.StationStand] = {
- common: { // 通用属性
- textFontSize: 8 // 站台默认字体大小
- },
- safetyDoor: { // 屏蔽门
- height: 1.6, // 站台屏蔽门高度
- distance: 9, // 站台和屏蔽门之间的距离
- defaultColor: '#00FF00', // 屏蔽门默认颜色
- splitDoorColor: '#F61107' // 屏蔽门切除颜色
- },
- stand: { // 站台
- headFontSize: 8, // 站台首端字体大小
- spareColor: '#606060', // 站台空闲颜色
- stopColor: '#FEFE00', // 站台列车停站颜色
- jumpStopColor: '#9A99FF', // 站台跳停颜色
- designatedJumpStopColor: 'lightSkyBlue' // 站台指定列车跳停颜色
- },
- standEmergent: { // 紧急关闭
- mergentR: 4, // 站台紧急关闭半径
- offset: {x: 0, y: 0}, // 站台紧急关闭偏移量
- closeColor: '#F61107' // 站台紧急关闭颜色
- },
- reentry: { // 站台折返策略
- position: 0, // 折返方向
- offset: {x: -16, y: 18}, // 折返偏移量
- noHumanColor: '#0F16DA', // 站台无人折返
- autoChangeEndsColor: '#0BF400' // 站台自动换端
- },
- detainCar: { // 扣车
- text: 'H', // 扣车显示内容
- position: 1, // 扣车方向
- offset: {x: -8, y: 13}, // 扣车偏移量
- trainColor: '#E4EF50', // 车站扣车颜色
- centerTrainColor: '#FFFFFF', // 中心扣车颜色
- andCenterTrainColor: '#F61107', // 车站+中心扣车颜色
- detainTrainTextColor: '#E4EF50' // 车站扣除文字颜色
- },
- stopTime: { // 停站时间
- position: 1, // 运行时间方向
- offset: {x: -8, y: 3}, // 运行时间偏移量
- textColor: '#FFFFFF' // 停站时间字体颜色
- },
- level: { // 运行等级
- position: 1, // 运行等级方向
- offset: {x: -8, y: 22}, // 运行等级偏移量
- textColor: '#FFFFFF' // 停站等级字体颜色
- },
- mouseOverStyle: {
- borderLineColor: '#FFFFFF',
- borderLineDash: [3, 3]
- }
- };
-
- this[deviceType.StationControl] = {
- text: {
- distance: 2, // 灯和文字之间的距离
- fontSize: 10, // 控制模式字体大小
- fontFormat: 'consolas', // 控制模式字体格式
- fontColor: '#ffffff', // 控制模式字体颜色
- fontWeight: 'normal', // 控制模式字体粗细
- textAlign: 'middle', // 控制模式水平对齐
- textVerticalAlign: 'top' // 控制模式垂直对齐
- },
- lamp: {
- count: 3, // 控制模式灯个数
- offset: { x: 20, y: 0 }, // 偏移量
- radiusR: 6, // 控制模式灯的半径
- distance: 36, // 控制模式之间灯之间的距离
- grayColor: '#7F7F7F', // 控制模式灰色
- greenColor: '#00FF00', // 控制模式绿色
- redColor: '#FF0000', // 控制模式红色
- yellowColor: '#FFFF00' // 控制模式黄色
-
- },
- arrow: {
- show: false // 控制模式箭头显隐
- },
- mouseOverStyle: { // 鼠标悬浮样式
- fontSize: 10,
- fontFormat: 'consolas',
- fontColor: '#FFF000',
- fontWeight: 'normal',
- textAlign: 'middle',
- textVerticalAlign: 'top'
- }
- };
-
- this[deviceType.StationCounter] = {
- text: {
- distance: 2, // 计数器名称和文字的距离
- fontColor: '#FFFFFF', // 计数器字体颜色
- borderColor: '#E4EF50' // 计数器边框颜色
- }
- };
-
- this[deviceType.StationDelayUnlock] = {
- text: {
- distance: 3, // 延迟解锁和设备之间的距离
- fontColor: '#FFFFFF', // 延时解锁字体颜色
- borderColor: '#FFFFFF' // 延迟解锁边框颜色
- }
- };
-
- this[deviceType.Station] = {
- kilometerPosition: 'down', // 公里标位置
- fontWeight: 'bold' // 文字错细
- };
-
- this[deviceType.Switch] = {
- text: {
- position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
- offset: {x: -15, y: -10}, // 道岔名称与区段距离
- fontSize: 10, // 字体大小
- fontWeight: 'normal', // 字体粗细
- borderColor: '#FE0000', // 道岔边框颜色
- lossColor: '#FFFFFF', // 道岔失去颜色
- locateColor: '#00FF00', // 道岔定位颜色
- inversionColor: '#9C9D09', // 道岔反位颜色
- monolockColor: '#870E10' // 道岔单锁颜色
- },
- core: {
- length: 6 // 道岔单边长度
- },
- monolock: { // 道岔单锁配置
- locationColor: '#870E10', // 道岔单锁定位颜色 (红色)
- inversionColor: '#870E10', // 道岔单锁反位颜色 (红色)
- rectShow: false // 道岔单锁 矩形框是否显示
- },
- block: { // 道岔封锁配置
- nameBorderShow: true, // 道岔名称是否有包围框 显示
- contentRectShow: false // 道岔封锁显示
- },
- mouseOverStyle: {
- borderBackgroundColor: '#22DFDF', // 边框背景色
- borderColor: '#fff', // 边框颜色
- textShadowColor: '#22DFDF' // 字体阴影颜色
- }
- };
-
- this[deviceType.LcControl] = {
- text: {
- fontSize: 10, // 灯字体大小
- fontWeight: 'normal', // 字体粗细
- distance: 5 // 灯跟文字距离
- },
- lamp: {
- radiusR: 6, // 灯大小
- controlColor: '#FFFF00' // 灯颜色
- },
- mouseOverStyle: {
- fontSize: 10,
- fontFormat: 'consolas',
- fontColor: '#FFF000',
- fontWeight: 'normal',
- textAlign: 'middle',
- textVerticalAlign: 'top',
- arcColor: '#00FFFF',
- textColor: '#000000'
- }
- };
-
- this[deviceType.ZcControl] = {
- text: {
- fontSize: 10, // 字体大小
- fontWeight: 'normal', // 字体粗细
- distance: 5 // 灯跟文字距离
- },
- lamp: {
- radiusR: 6, // 灯大小
- controlColor: '#00FF00' // 灯颜色
- },
- mouseOverStyle: {
- fontSize: 10,
- fontFormat: 'consolas',
- fontColor: '#FFF000',
- fontWeight: 'normal',
- textAlign: 'middle',
- textVerticalAlign: 'top',
- arcColor: '#00FFFF',
- textColor: '#000000'
- }
- };
-
- this[deviceType.LimitControl] = {
- text: {
- fontSize: 10, // 字体大小
- fontWeight: 'normal', // 字体粗细
- distance: 5 // 灯跟文字距离
- },
- lamp: {
- radiusR: 6, // 灯大小
- controlColor: '#ECE9D8' // 灯颜色
- },
- mouseOverStyle: {
- fontSize: 10,
- fontFormat: 'consolas',
- fontColor: '#FFF000',
- fontWeight: 'normal',
- textAlign: 'middle',
- textVerticalAlign: 'top',
- textColor: '#000000',
- arcColor: '#00FFFF'
- }
- };
-
- this[deviceType.Line] = {
- lineColor: '#FFFFFF' // 线条颜色
- };
-
- this[deviceType.TrainWindow] = {
- lineColor: '#FFF', // 车次窗颜色
- lineDash: [3, 3], // 车次窗虚线间隔
- lineWidth: 1, // 车次窗线宽
- trainWindowSmooth: 0.01 // 车次窗矩形圆滑程度
- };
-
- this[deviceType.Train] = {
- trainBody: {
- trainBodyLineWidth: 0.1, // 车身line宽
- changeTrainWidth: false, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
- specialTrainType: [], // 特殊列车类型需设置显示格式
- lrPadding: 4, // 两边间隔
- upPadding: 4, // 上边距离
- trainBodyFillColor: '#725A64', // 列车车身填充颜色
- trainNameFormat: 'serviceNumber:tripNumber'// 列车显示格式
- },
- hsda: {
- lrPaddingHSDA: 3, // HSDA两边间隔
- upPaddingHSDA: 4, // HSDA上边距离
- trainHSDATextFontSize: 9, // 列车HDSA字号
- textHContent: 'H', // textH文本
- textSContent: 'S', // textS文本
- textDContent: 'D', // textD文本
- textAContent: 'A'// textA文本
- },
- trainNumber: {
- trainNumberOffset: { x: 0, y: 1}// 目的地码偏移量
- },
- trainServer: {
- serviceNumberPrefix: '00', // 服务号(表号)前缀
- defaultServiceNumber: 'AA', // 默认服务号（表号）
- trainServerOffset: { x: 4, y: 4}// 列车服务号偏移
- },
- trainTarget: {
- tripNumberPrefix: '000', // 车次号前缀
- defaultTripNumber: 'DDD', // 默认车次号2
- trainTargetOffset: { x: 36, y: 4}, // 列车车次号偏移
- trainTargetTextAlign: 'right'// 车次号文字显示位置
- },
- trainTargetNumber: {
- trainTargetNumberOffset: {x: 0, y: 0}// 车组号偏移量
- },
- trainHead: {
- trainMoreLength: 0, // 列车车头比车身高出的长度,上下相比车体伸出去的边框
- trainHeadTriangleFirst: { x: 7, y: 1}, // 列车车头三角坐标1偏移量
- trainHeadTriangleSecond: { x: 13, y: 10}, // 列车车头三角坐标2偏移量
- trainHeadTriangleThird: { x: 7, y: 19}, // 列车车头三角坐标3偏移量
- trainHeadRectHeight: 20, // 列车车头矩形高度
- trainConntWidth: 3, // 列车竖杠的宽度
- trainHeadFillColor: '#000000'// 列车车头矩形填充颜色
- },
- common: {
- trainHeight: 20, // 列车高度
- trainHeadDistance: 4, // 列车和车头之间的间距
- trainWidth: 40, // 列车长度
- trainTextFontSize: 12, // 列车字号
- fontFamily: 'consolas', // 默认字体 族类
- haveTextHSDA: true, // 是否需创建textHSDA对象
- haveArrowText: true, // 是否需创建arrowText对象
- haveTrainBorder: false, // 是否需创建trainBorder对象
- aspectRatio: 7/5, // 字体宽高比例（用以拼接text是计算位置）
- textOffset: 4, // 字体偏移（用以控制字体据车头的距离）
- trainWidthMoreText: 8, // 计算列车长度时--列车长比text多出尺寸
- useSelfFormat: true, // 使用配置项的nameFormat
- useSelfText: true // 使用配置项的字体大小
- },
- trainStatusStyle: {
- destinationStatus: [
- {status: '01', showColor: '#FFFFFF'},
- {status: '02', showColor: '#00FF00'},
- {status: '03', showColor: '#A0522D'},
- {status: '04', showColor: '#FFFF00'}
- ], // 目的地状态 01准点 02早点 03晚点 04头码车
- defaultDestinationColor: '#FFFFFF', // 默认目的地状态显示颜色
- destinationStatusSetText: 'trainTarget', // 目的地状态设置的对应哪个text的颜色
- directionType: [
- {
- type: '01',
- lineLShow: true,
- lineRShow: true,
- arrowLShow: false,
- arrowRShow: false
- },
- {
- type: '02',
- lineLShow: false,
- lineRShow: true,
- arrowLShow: false,
- arrowRShow: true
- },
- {
- type: '03',
- lineLShow: true,
- lineRShow: false,
- arrowLShow: true,
- arrowRShow: false
- }
- ], // 列车运行方向状态类型对应车头显示状态 01未知方向 02从左往右 上行 03从右往左 下行
- directionStopType: [
- {type: '01', lineLShow: false, lineRShow: false},
- {type: '02', lineLShow: false, lineRShow: true},
- {type: '03', lineLShow: true, lineRShow: false}
- ], // 列车停止方向类型对应车头显示状态 01未知方向 02从左往右 上行 03从右往左 下行
- runModeStatus: [
- {
- status: '01',
- trainLColor: '#FFFFFF',
- trainRColor: '#FFFFFF'
- },
- {
- status: '02',
- trainLColor: '#00FF00',
- trainRColor: '#00FF00'
- },
- {
- status: '03',
- trainLColor: '#FFFF00',
- trainRColor: '#FFFF00'},
- {
- status: '04',
- trainLColor: '#A0522D',
- trainRColor: '#A0522D'
- },
- {
- status: '05',
- trainLColor: '#A0522D',
- trainRColor: '#A0522D'
- }
- ], // 列车运行模式对应车头颜色 01未知 02 ATO自动驾驶模式AM 03 ATP监控下的人工驾驶模式CM 04 限制人工驾驶模式RM 05 非限制人工驾驶模式RM
- runControlStatus: [
- {status: '01', hShow: false, sShow: false},
- {status: '02', hShow: true, sShow: false},
- {status: '03', hShow: false, sShow: true}
- ], // 设置运行控制状态类型 01正常 02扣车 03停跳
- doorStatus: [
- {status: '01', dShow: false},
- {status: '02', dShow: true}
- ], // 设置车门状态类型 01关门 02开门
- communicationStatus: [
- {status: '01', trainColor: '#725A64'},
- {status: '02', trainColor: '#C0C0C0'}
- ], // 设置通信状态 01正常 02故障
- alarmStatus: [
- {status: '01', aShow: false},
- {status: '02', aShow: true}
- ], // 设置报警状态 01不报警 02报警
- serverNoType: [
- {type: '01', showColor: '#FFFFFF'},
- {type: '02', showColor: '#FFF000'}
- ], // 服务号状态类型 01显示服务号 计划车 02显示车组号: 头码车与人工车
- defaultServerNoColor: '#FFFFFF' // 默认服务号状态显示颜色
- }
- };
- }
-}
-
-export default new SkinStyle();
diff --git a/src/jmap/config/skinStyle/chengdu_03.js b/src/jmap/config/skinStyle/chengdu_03.js
deleted file mode 100644
index 796fd8bee..000000000
--- a/src/jmap/config/skinStyle/chengdu_03.js
+++ /dev/null
@@ -1,545 +0,0 @@
-import defaultStyle from '../defaultStyle';
-import deviceType from '../../constant/deviceType';
-
-class SkinStyle extends defaultStyle {
- constructor() {
- super();
- this[deviceType.Link] = {
- lineWidthColor: '#FFFFFF', // line 颜色
- linkWidth: 4.4, // link 宽度
- linkColor: '#3F3F3F', // link 线条颜色
- linkTextColor: '#FFFFFF' // link 字体颜色
- };
-
- this[deviceType.Section] = {
- text: {
- position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
- distance: 10, // 文字离区段距离
- fontSize: 12, // 字体大小
- fontWeight: 'normal', // 字体粗细
- fontColor: '#FFFFFF', // 字体颜色
- textAlign: 'center', // 水平对齐方式
- textPosition: 'inside', // 文字位置
- textVerticalAlign: 'middle' // 文字垂直对齐方式
- },
- logicText: {
- position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
- distance: 12, // 文字离区段距离
- fontSize: 11, // 字体大小
- fontWeight: 'normal', // 字体粗细
- fontColor: '#FFFFFF', // 字体颜色
- textAlign: 'center', // 水平对齐方式
- textPosition: 'inside', // 文字位置
- textVerticalAlign: 'middle' // 文字垂直对齐方式
- },
- standText: {
- position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
- distance: 24, // 文字离区段距离
- fontSize: 11, // 字体大小
- fontWeight: 'normal', // 字体粗细
- fontColor: '#FFFFFF', // 字体颜色
- textAlign: 'center', // 水平对齐方式
- textPosition: 'inside', // 文字位置
- textVerticalAlign: 'middle' // 文字垂直对齐方式
- },
- reentryText: {
- position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
- distance: 36, // 文字离区段距离
- fontSize: 11, // 字体大小
- fontWeight: 'normal', // 字体粗细
- fontColor: '#FFFFFF', // 字体颜色
- textAlign: 'center', // 水平对齐方式
- textPosition: 'inside', // 文字位置
- textVerticalAlign: 'middle' // 文字垂直对齐方式
- },
- transferText: {
- position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
- distance: 36, // 文字离区段距离
- fontSize: 11, // 字体大小
- fontWeight: 'normal', // 字体粗细
- fontColor: '#FFFFFF', // 字体颜色
- textAlign: 'center', // 水平对齐方式
- textPosition: 'inside', // 文字位置
- textVerticalAlign: 'middle' // 文字垂直对齐方式
- },
- destinationText: {
- opposite: true, // 对称相反
- position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
- distance: 12, // 文字离区段距离
- fontSize: 11, // 字体大小
- fontWeight: 'bold', // 字体粗细
- fontColor: 'yellow', // 字体颜色
- textAlign: 'center', // 水平对齐方式
- textPosition: 'inside', // 文字位置
- textVerticalAlign: 'middle' // 文字垂直对齐方式
- },
- line: {
- width: 5, // 区段宽度
- beyondWidth: 0, // 区段宽超出宽度
- invadeColor: '#FFFFFF', // 区段侵入颜色
- spareColor: '#5578B6', // 区段空闲颜色
- communicationOccupiedColor: '#FF00FF', // 区段通信车占用颜色
- unCommunicationOccupiedColor: '#DE310C', // 区段非通讯车占用颜色
- routeLockColor: '#FFFFFF', // 区段路由锁定颜色
- faultLockColor: '#006400', // 区段故障锁定颜色
- undefinedColor: '#0071C1', // 区段未定义颜色
- protectionLockedColor: '#FFFFFF', // 保护区段锁闭
- blockColor: '#00FF00', // 区段封锁颜色
- atcExcisionColor: '#A0522D', // 区段atc切除颜色
- atsExcisionColor: '#A0522D', // 区段ats切除颜色
- timeReleaseColor: '#3F3F3F', // 区段延时释放颜色
- protectiveLockColor: '#FFFF00', // 区段保护锁闭
- protectiveTimeReleaseColor: '#0071C1', // 区段保护延时解锁
- logicalColor: '#FFFF00', // 逻辑区段颜色 (未用)
- logicalTextColor: '#C0C0C0' // 逻辑区段名称颜色 (未用)
- },
- axle: {
- radius: 3, // 计轴 半径
- distance: 5, // 计轴和区段之间的距离 （未用）
- color: '#C0C0C0', // 区段计轴颜色
- resetColor: '#00FFFF', // 区段计轴预复位颜色
- Failure: '#E6A23C' // #FFFF00 计轴失效
- },
- speedLimit: { // 限速元素
- width: 1, // 限速线的宽度
- distance: 5, // 限速线距离区段距离
- lineColor: '#C0C000', // 限速线颜色 （黄色透明光）
- nameBackground: '#C0C000', // 限速名称背景颜色
- nameShow: true, // 名称显示
- nameNumberColor: '#C00808', // 限速值颜色
- nameNumberFontSize: 11, // 限速值大小
- kilometerColor: '#fff', // 公里标颜色
- kilometerFontSize: 8, // 公里标大小
- drogueWidth: 19, // 浮标宽度
- drogueHeight: 12 // 浮标高度
- },
- separator: {
- z: 6, // 分割符层级
- width: 1.5, // 分隔符宽度
- endWidth: 1.5, // 尽头分隔符宽度
- endColor: '#FFFFFF', // 尽头分隔符颜色
- color: '#FFFFFF' // 区段边界符颜色
- },
- shuttleBack: { // 折返进路 (存在此对象 显示折返箭头)
- distance: 5 // 限速线距离区段距离
- }
- };
-
- this[deviceType.Signal] = {
- distance: 10, // 设备距离区段的距离
- post: {
- standardColor: '#FFFFFF', // 灯柱颜色
- standardWidth: 2 // 灯柱宽度
- },
- text: {
- distance: 3, // 文字和灯杆的距离
- isNoRotation: true, // 是否禁止旋转
- isAlignCenter: false, // 信号字体对其方式
- fontSize: 11, // 信号机名称字体大小
- fontWeight: 'bold', // 信号机名称字体粗细
- defaultColor: '#FFFFFF', // 信号灯字体默认色
- blockColor: '#EF0C08', // 信号灯字体锁定颜色
- checkColor: '#00FF00' // 信号保护区段检查颜色
- },
- lamp: {
- borderVariable: true, // 信号灯边框可变
- stopWidth: 2, // 禁止线宽度
- borderWidth: 2, // 信号灯边框线宽度
- borderColor: '#3149C3', // 信号灯边框线颜色
- radiusR: 6, // 信号灯半径
- blockColor: '#EF0C08', // 信号灯锁闭
- grayColor: '#7F7F7F', // 信号灯灰色
- redColor: '#FF0000', // 信号灯红色
- greenColor: '#00FF00', // 信号灯绿色
- yellowColor: '#FFFF00', // 信号灯黄色
- whiteColor: '#FFFFFF', // 信号灯白色
- blueColor: '#0070C0' // 信号灯蓝色
- },
- route: {
- direction: true, // 自动通过方向
- offset: { x: 4, y: 0}, // 自动通过偏移量
- routeColor: '#00FF00' // 自动进路
- },
- auto: {
- direction: false, // 自动通过方向
- offset: { x: -4, y: 0}, // 自动通过偏移量
- width: 5, // 自动宽度
- manualControl: '#FFFF00', // 人工控制
- autoRoute: '#00FF00', // 自动进路
- autoTrigger: '#FFFF00', // 自动触发
- outConflict: '#C00808' // 出车冲突
- },
- delay: {
- direction: false, // 延时解锁方向
- offset: { x: -5, y: 0}, // 延时解锁偏移量
- fontSize: 11, // 延迟解锁字体大小
- fontColor: '#C00808', // 延迟解锁颜色
- fontWeight: 'bold' // 字体粗细
-
- },
- button: {
- distance: 5, // 信号灯按钮距离区段的距离
- borderDashColor: '#FFFFFF', // 信号灯按钮边线
- buttonColor: 'darkgreen', // 信号灯按钮颜色
- buttonLightenColor: '#E4EF50' // 信号灯按钮闪烁颜色
- }
- };
-
- this[deviceType.StationStand] = {
- common: { // 通用属性
- textFontSize: 10, // 站台默认字体大小
- haveJumpShow: true // 站台是否有列车停跳显示
- },
- safetyDoor: { // 屏蔽门
- height: 3, // 站台屏蔽门高度
- distance: 8, // 站台和屏蔽门之间的距离
- defaultColor: '#00FF00', // 屏蔽门默认颜色
- splitDoorColor: '#C00808' // 屏蔽门切除颜色
- },
- stand: { // 站台
- headFontSize: 10, // 站台首端字体大小
- spareColor: '#808080', // 站台空闲颜色
- stopColor: '#FFF000', // 站台列车停站颜色
- jumpStopColor: '#808080', // 站台跳停颜色
- designatedJumpStopColor: '#808080' // 站台指定列车跳停颜色
- },
- standEmergent: { // 紧急关闭
- mergentR: 4, // 站台紧急关闭半径
- offset: {x: 0, y: 40}, // 站台紧急关闭偏移量
- closeColor: '#F61107' // 站台紧急关闭颜色
- },
- reentry: { // 站台折返策略
- position: 0, // 折返方向
- offset: {x: -16, y: 20}, // 折返偏移量
- noHumanColor: '#0F16DA', // 站台无人折返
- autoChangeEndsColor: '#0BF400' // 站台自动换端
- },
- detainCar: { // 扣车
- text: '扣', // 扣车显示内容
- position: -1, // 扣车方向
- offset: {x: -8, y: -20}, // 扣车偏移量
- trainColor: '#FFFF00', // 车站扣车颜色
- centerTrainColor: '#C0C0C0', // 中心扣车颜色
- andCenterTrainColor: '#C0C0C0', // 车站+中心扣车颜色
- detainTrainTextColor: '#E4EF50' // 车站扣除文字颜色
- },
- stopTime: { // 停站时间
- position: 1, // 运行时间方向
- offset: {x: -8, y: -4}, // 运行时间偏移量
- textColor: '#C0C0C0' // 停站时间字体颜色
- },
- jump: {
- text: '跳', // 停跳显示内容
- position: -1, // 停跳方向
- offset: {x: -8, y: 0},
- textColor: '#0000FF', // 停跳文字颜色
- arcColor: '#0000FF', // 停跳圆圈颜色
- fillColor: 'rgba(0,0,0,0)', // 透明填充颜色
- r: 8 // 圆半径大小
- },
- level: { // 运行等级
- position: 1, // 运行等级方向
- offset: {x: -8, y: 30}, // 运行等级偏移量
- textColor: '#FFF000' // 停站等级字体颜色
- }
- };
-
- this[deviceType.StationControl] = {
- text: {
- distance: 2, // 灯和文字之间的距离
- fontSize: 11, // 字体大小
- fontFormat: 'consolas', // 字体格式
- fontColor: '#ffffff', // 字体颜色
- fontWeight: 'normal', // 字体粗细
- textAlign: 'middle', // 字体水平对齐
- textVerticalAlign: 'top' // 字体垂直对齐
- },
- lamp: {
- count: 4, // 控制模式的个数
- offset: {x: 0, y: 0}, // 偏移量
- radiusR: 6, // 控制模式灯的半径
- distance: 36, // 控制模式之间灯之间的距离
- grayColor: '#7F7F7F', // 控制模式灰色
- greenColor: '#00FF00', // 控制模式绿色
- redColor: '#FF0000', // 控制模式红色
- yellowColor: '#FFFF00' // 控制模式黄色
- },
- arrow: {
- show: true // 控制模式箭头显隐
- }
- };
-
- this[deviceType.StationCounter] = {
- text: {
- distance: 2, // 计数器名称和文字的距离
- fontColor: '#FFFFFF', // 计数器字体颜色
- borderColor: '#E4EF50' // 计数器边框颜色
- }
- };
-
- this[deviceType.StationDelayUnlock] = {
- text: {
- distance: 3, // 延迟解锁和设备之间的距离
- fontColor: '#FFFFFF', // 延时解锁字体颜色
- borderColor: '#FFFFFF' // 延迟解锁边框颜色
- }
- };
-
- this[deviceType.Station] = {
- kilometerPosition: 'up' // 公里标朝向
- };
-
- this[deviceType.Switch] = {
- text: {
- position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
- offset: {x: 5, y: -10}, // 道岔名称与区段距离
- fontSize: 11, // 字体大小
- fontWeight: 'normal', // 字体粗细
- borderColor: '#FE0000', // 道岔边框颜色
- lossColor: '#C00808', // 道岔失去颜色
- locateColor: '#00FF00', // 道岔定位颜色
- inversionColor: '#FFFF00', // 道岔反位颜色
- monolockColor: '#FFFFFF' // 道岔单锁颜色
- },
- core: {
- length: 6 // 道岔单边长度
- },
- monolock: { // 道岔单锁配置
- locationColor: '#00FF00', // 道岔单锁'定位'颜色 (绿色)
- inversionColor: '#FFFF00', // 道岔单锁'反位'颜色 (黄色)
- rectShow: true, // 道岔单锁 矩形框是否显示
- rectWidth: 18, // 矩形框 宽高
- rectBorderColor: '#fff' // 矩形边框颜色
- },
- block: { // 道岔封锁配置
- nameBorderShow: false, // 道岔名称是否有包围框 显示
- contentRectShow: true, // 道岔封锁显示
- contentRectColor: 'red' // 道岔封锁边框颜色
- }
- };
-
- this[deviceType.LcControl] = {
- text: {
- fontSize: 11, // 字体大小
- fontWeight: 'normal', // 字体粗细
- distance: 5 // 灯跟文字距离
- },
- lamp: {
- radiusR: 6, // 控制灯大小
- controlColor: '#FFFF00' // 控制灯颜色
- }
- };
-
- this[deviceType.ZcControl] = {
- text: {
- fontSize: 11, // 字体大小
- fontWeight: 'normal', // 字体粗细
- distance: 5 // 灯跟文字距离
- },
- lamp: {
- radiusR: 6, // 控制灯大小
- controlColor: '#00FF00' // 控制灯颜色
- }
- };
-
- this[deviceType.LimitControl] = {
- text: {
- fontSize: 11, // 字体大小
- fontWeight: 'normal', // 字体粗细
- distance: 5 // 灯跟文字距离
- },
- lamp: {
- radiusR: 6, // 控制灯大小
- controlColor: '#ECE9D8' // 控制灯颜色
- }
- };
-
- this[deviceType.Line] = {
- lineColor: '#FFFFFF' // 线条颜色
- };
-
- this[deviceType.TrainWindow] = {
- lineColor: '#4DD43F', // 车次窗颜色
- lineDash: null, // 车次窗虚线间隔
- lineWidth: 1, // 车次窗线宽
- trainWindowSmooth: 0 // 车次窗矩形圆滑程度
- };
-
- this[deviceType.Train] = {
- trainBody: {
- trainBodyLineWidth: 1, // 车身line宽
- changeTrainWidth: false, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
- specialTrainType: [], // 特殊列车类型需设置显示格式
- lrPadding: 4, // 两边间隔
- upPadding: 4, // 上边距离
- trainBodyFillColor: '#000099', // 列车车身填充颜色
- trainNameFormat: 'serviceNumber:targetCode'// 列车显示格式
- },
- hsda: {
- lrPaddingHSDA: 3, // HSDA两边间隔
- upPaddingHSDA: 4, // HSDA上边距离
- trainHSDATextFontSize: 9, // 列车HDSA字号
- textHContent: '扣', // textH文本
- textSContent: '跳', // textS文本
- textDContent: '门', // textD文本
- textAContent: '警' // textA文本
- },
- trainNumber: {
- targetCodePrefix: '000', // 目的地码前缀
- defaultTargetCode: 'DDD', // 默认目的地码
- trainTargetTextAlign: 'left', // 目的地码文字显示位置
- trainNumberOffset: { x: 24, y: 4}// 目的地码偏移量
- },
- trainServer: {
- serviceNumberPrefix: '000', // 服务号(表号)前缀
- defaultServiceNumber: 'TTT', // 默认服务号（表号）
- defaultServerNoColor: '#FFFFFF', // 默认服务号状态显示颜色
- trainServerOffset: { x: 4, y: 4} // 列车服务号偏移
- },
- trainTarget: {
- tripNumberPrefix: '000', // 车次号前缀
- defaultTripNumber: 'DDD', // 默认车次号2
- trainTargetOffset: { x: 36, y: 4}, // 列车车次号偏移
- trainTargetTextAlign: 'right' // 车次号文字显示位置
- },
- trainTargetNumber: {
- trainTargetNumberOffset: {x: 0, y: 0}// 车组号偏移量
- },
- trainHead: {
- trainMoreLength: 0, // 列车车头比车身高出的长度,上下相比车体伸出去的边框
- trainHeadTriangleFirst: { x: 7, y: 1}, // 列车车头三角坐标1偏移量
- trainHeadTriangleSecond: { x: 13, y: 10}, // 列车车头三角坐标2偏移量
- trainHeadTriangleThird: { x: 7, y: 19}, // 列车车头三角坐标3偏移量
- trainConntWidth: 3, // 列车竖杠的宽度
- trainHeadFillColor: '#000000', // 列车车头矩形填充颜色
- trainHeadRectHeight: 20 // 列车车头矩形高度
- },
- common: {
- trainHeight: 20, // 列车高度
- trainHeadDistance: 4, // 列车和车头之间的间距
- trainWidth: 48, // 列车长度
- trainTextFontSize: 12, // 列车字号
- fontFamily: 'consolas', // 默认字体 族类
- haveTextHSDA: true, // 是否需创建textHSDA对象
- haveArrowText: true, // 是否需创建arrowText对象
- haveTrainBorder: false, // 是否需创建trainBorder对象
- aspectRatio: 7/5, // 字体宽高比例（用以拼接text是计算位置）
- textOffset: 4, // 字体偏移（用以控制字体据车头的距离）
- trainWidthMoreText: 8, // 计算列车长度时--列车长比text多出尺寸
- useSelfFormat: true, // 使用配置项的nameFormat
- useSelfText: true // 使用配置项的字体大小
- },
- trainStatusStyle: {
- defaultDestinationColor: '#FFFFFF', // 默认目的地状态显示颜色
- destinationStatusSetText: 'trainWindowBorder', // 目的地状态设置的对应哪个颜色
- destinationStatus: [
- {status: '01', showColor: '#FFFFFF'},
- {status: '02', showColor: '#00FF00'},
- {status: '03', showColor: '#A0522D'}
- ], // 目的地状态 01准点 02早点 03晚点 04头码车
- serverNoType: [
- {type: '01', showColor: '#FFFFFF'},
- {type: '02', showColor: '#FFF000'}
- ], // 服务号状态类型 01显示服务号 计划车 02显示车组号: 头码车与人工车
- directionType: [
- {
- type: '01',
- lineLShow: true,
- lineRShow: true,
- arrowLShow: false,
- arrowRShow: false
- },
- {
- type: '02',
- lineLShow: false,
- lineRShow: true,
- arrowLShow: false,
- arrowRShow: true
- },
- {
- type: '03',
- lineLShow: true,
- lineRShow: false,
- arrowLShow: true,
- arrowRShow: false
- }
- ], // 列车运行方向状态类型对应车头显示状态 01未知方向 02从左往右 上行 03从右往左 下行
- directionStopType: [
- {
- type: '01',
- lineLShow: false,
- lineRShow: false
- },
- {
- type: '02',
- lineLShow: false,
- lineRShow: true
- },
- {
- type: '03',
- lineLShow: true,
- lineRShow: false
- }
- ], // 列车停止方向类型对应车头显示状态 01未知方向 02从左往右 上行 03从右往左 下行
- runModeStatus: [
- {
- status: '01',
- trainLColor: '#00FF00',
- trainRColor: '#00FF00'
- },
- {
- status: '02',
- trainLColor: '#FF8000',
- trainRColor: '#FF8000'
- },
- {
- status: '03',
- trainLColor: '#FFFF00',
- trainRColor: '#FFFF00'
- },
- {
- status: '04',
- trainLColor: '#C2C2C2',
- trainRColor: '#C2C2C2'
- },
- {
- status: '05',
- trainLColor: '#C2C2C2',
- trainRColor: '#C2C2C2'
- }
- ], // 列车运行模式对应车头颜色 01未知 02 ATO自动驾驶模式AM 03 ATP监控下的人工驾驶模式CM 04 限制人工驾驶模式RM 05 非限制人工驾驶模式RM
- runControlStatus: [
- {
- status: '01',
- hShow: false,
- sShow: false
- },
- {
- status: '02',
- hShow: true,
- sShow: false
- },
- {
- status: '03',
- hShow: false,
- sShow: true
- }
- ], // 设置运行控制状态类型 01正常 02扣车 03停跳
- doorStatus: [
- {status: '01', dShow: false},
- {status: '02', dShow: true}
- ], // 设置车门状态类型 01关门 02开门
- communicationStatus: [
- {status: '01', trainColor: '#725A64'},
- {status: '02', trainColor: '#C0C0C0'}
- ], // 设置通信状态 01正常 02故障
- alarmStatus: [
- {status: '01', aShow: false},
- {status: '02', aShow: true}
- ] // 设置报警状态 01不报警 02报警
- }
- };
- }
-}
-
-export default new SkinStyle();
diff --git a/src/jmap/config/skinStyle/chengdu_04.js b/src/jmap/config/skinStyle/chengdu_04.js
deleted file mode 100644
index 1aa852dc3..000000000
--- a/src/jmap/config/skinStyle/chengdu_04.js
+++ /dev/null
@@ -1,543 +0,0 @@
-import defaultStyle from '../defaultStyle';
-import deviceType from '../../constant/deviceType';
-
-class SkinStyle extends defaultStyle {
- constructor() {
- super();
- this[deviceType.Link] = {
- lineWidthColor: '#FFFFFF', // line 颜色
- linkWidth: 4, // link 宽度
- linkColor: '#4e8de6', // link 线条颜色
- linkTextColor: '#FFFFFF' // link 字体颜色
- };
-
- this[deviceType.Section] = {
- text: {
- position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
- distance: 10, // 文字离区段距离
- fontSize: 12, // 字体大小
- fontWeight: 'normal', // 字体粗细
- fontColor: 'lightgreen', // 字体颜色
- textAlign: 'center', // 水平对齐方式
- textPosition: 'inside', // 文字位置
- textVerticalAlign: 'middle' // 文字垂直对齐方式
- },
- logicText: { // 逻辑区段名称
- position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
- distance: 12, // 文字离区段距离
- fontSize: 11, // 字体大小
- fontWeight: 'normal', // 字体粗细
- fontColor: '#FFFFFF', // 字体颜色
- textAlign: 'center', // 水平对齐方式
- textPosition: 'inside', // 文字位置
- textVerticalAlign: 'middle' // 文字垂直对齐方式
- },
- standText: { // 站台
- position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
- distance: 24, // 文字离区段距离
- fontSize: 11, // 字体大小
- fontWeight: 'normal', // 字体粗细
- fontColor: '#FFFFFF', // 字体颜色
- textAlign: 'center', // 水平对齐方式
- textPosition: 'inside', // 文字位置
- textVerticalAlign: 'middle' // 文字垂直对齐方式
- },
- reentryText: { // 折返
- position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
- distance: 36, // 文字离区段距离
- fontSize: 11, // 字体大小
- fontWeight: 'normal', // 字体粗细
- fontColor: '#FFFFFF', // 字体颜色
- textAlign: 'center', // 水平对齐方式
- textPosition: 'inside', // 文字位置
- textVerticalAlign: 'middle' // 文字垂直对齐方式
- },
- transferText: { // 转换轨
- position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
- distance: 36, // 文字离区段距离
- fontSize: 11, // 字体大小
- fontWeight: 'normal', // 字体粗细
- fontColor: '#FFFFFF', // 字体颜色
- textAlign: 'center', // 水平对齐方式
- textPosition: 'inside', // 文字位置
- textVerticalAlign: 'middle' // 文字垂直对齐方式
- },
- destinationText: { // 目的地
- opposite: true, // 对称相反
- position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
- distance: 12, // 文字离区段距离
- fontSize: 11, // 字体大小
- fontWeight: 'bold', // 字体粗细
- fontColor: 'yellow', // 字体颜色
- textAlign: 'center', // 水平对齐方式
- textPosition: 'inside', // 文字位置
- textVerticalAlign: 'middle' // 文字垂直对齐方式
- },
- line: {
- width: 5, // 区段宽度
- beyondWidth: 0, // 区段宽超出宽度
- invadeColor: '#FFFFFF', // 区段侵入颜色
- spareColor: '#5578B6', // 区段空闲颜色
- communicationOccupiedColor: 'lightpink', // 区段通信车占用颜色
- unCommunicationOccupiedColor: 'red', // 区段非通讯车占用颜色
- routeLockColor: 'rgba(0, 255, 0, 1)', // 区段路由锁定颜色
- faultLockColor: 'white', // 区段故障锁定颜色
- undefinedColor: '#0071C1', // 区段未定义颜色
- protectionLockedColor: '#FFFFFF', // 保护区段锁闭
- blockColor: 'pink', // 区段封锁颜色
- atcExcisionColor: '#A0522D', // 区段atc切除颜色
- atsExcisionColor: '#A0522D', // 区段ats切除颜色
- timeReleaseColor: '#3F3F3F', // 区段延时释放颜色
- protectiveLockColor: '#92D14F', // 区段保护锁闭
- protectiveTimeReleaseColor: '#0071C1', // 区段保护延时解锁
- logicalColor: '#FFFF00', // 逻辑区段颜色 (未用)
- logicalTextColor: 'white' // 逻辑区段名称颜色 (未用)
- },
- axle: {
- radius: 3, // 计轴 半径
- distance: 5, // 计轴和区段之间的距离 （未用）
- color: 'white', // 区段计轴颜色
- resetColor: '#00FFFF', // 区段计轴预复位颜色
- Failure: '#E6A23C' // #FFFF00 计轴失效
- },
- speedLimit: { // 限速元素
- width: 1, // 限速线的宽度
- distance: 5, // 限速线距离区段距离
- lineColor: '#C0C000', // 限速线颜色 （黄色透明光）
- nameBackground: '#C0C000', // 限速名称背景颜色
- nameShow: true, // 名称显示
- nameNumberColor: '#C00808', // 限速值颜色
- nameNumberFontSize: 11, // 限速值大小
- kilometerColor: '#fff', // 公里标颜色
- kilometerFontSize: 8, // 公里标大小
- drogueWidth: 19, // 浮标宽度
- drogueHeight: 12 // 浮标高度
- },
- separator: {
- z: 6, // 分割符层级
- width: 1.5, // 分隔符宽度
- endWidth: 1.5, // 尽头分隔符宽度
- endColor: '#FFFFFF', // 尽头分隔符颜色
- color: 'white' // 区段边界符颜色
- }
- };
-
- this[deviceType.Signal] = {
- distance: 3, // 设备距离区段的距离
- post: {
- standardColor: '#C0C0C0', // 灯柱颜色
- standardWidth: 2 // 灯柱宽度
- },
- text: {
- distance: 3, // 文字和灯杆的距离
- isNoRotation: true, // 是否禁止旋转
- isAlignCenter: false, // 信号字体对其方式
- fontSize: 11, // 信号机名称字体大小
- fontWeight: 'bold', // 信号机名称字体粗细
- defaultColor: 'white', // 信号灯字体默认色
- blockColor: '#EF0C08', // 信号灯字体锁定颜色
- checkColor: '#00FF00' // 信号保护区段检查颜色
- },
- lamp: {
- borderVariable: true, // 信号灯边框可变
- stopWidth: 2, // 禁止线宽度
- borderWidth: 2, // 信号灯边框线宽度
- borderColor: '#3149C3', // 信号灯边框线颜色
- radiusR: 3, // 信号灯半径
- blockColor: '#EF0C08', // 信号灯锁闭
- grayColor: '#C0C0C0', // 信号灯灰色
- redColor: 'red', // 信号灯红色
- greenColor: 'green', // 信号灯绿色
- yellowColor: 'yellow', // 信号灯黄色
- whiteColor: '#FFFFFF', // 信号灯白色
- blueColor: '#0070C0' // 信号灯蓝色
- },
- route: {
- direction: true, // 自动通过方向
- offset: { x: 4, y: 0}, // 自动通过偏移量
- routeColor: '#00FF00' // 自动进路
- },
- auto: {
- direction: false, // 自动通过方向
- offset: { x: -4, y: 0}, // 自动通过偏移量
- width: 5, // 自动宽度
- manualControl: '#FFFF00', // 人工控制
- autoRoute: '#00FF00', // 自动进路
- autoTrigger: '#FFFF00', // 自动触发
- outConflict: '#C00808' // 出车冲突
- },
- delay: {
- direction: false, // 延时解锁方向
- offset: { x: -5, y: 0}, // 延时解锁偏移量
- fontSize: 11, // 延迟解锁字体大小
- fontColor: '#C00808', // 延迟解锁颜色
- fontWeight: 'bold' // 字体粗细
-
- },
- button: {
- distance: 5, // 信号灯按钮距离区段的距离
- borderDashColor: '#FFFFFF', // 信号灯按钮边线
- buttonColor: 'darkgreen', // 信号灯按钮颜色
- buttonLightenColor: 'yellow' // 信号灯按钮闪烁颜色
- }
- };
-
- this[deviceType.StationStand] = {
- common: { // 通用属性
- textFontSize: 10, // 站台默认字体大小
- haveJumpShow: true // 站台是否有列车停跳显示
- },
- safetyDoor: { // 屏蔽门
- height: 3, // 站台屏蔽门高度
- distance: 4, // 站台和屏蔽门之间的距离
- defaultColor: 'green', // 屏蔽门默认颜色
- splitDoorColor: 'green' // 屏蔽门切除颜色
- },
- stand: { // 站台
- headFontSize: 10, // 站台首端字体大小
- spareColor: 'white', // 站台空闲颜色
- stopColor: 'yellow', // 站台列车停站颜色
- jumpStopColor: 'blue', // 站台跳停颜色
- designatedJumpStopColor: 'lightSkyBlue' // 站台指定列车跳停颜色
- },
- standEmergent: { // 紧急关闭
- mergentR: 4, // 站台紧急关闭半径
- offset: {x: 0, y: 40}, // 站台紧急关闭偏移量
- closeColor: 'red' // 站台紧急关闭颜色
- },
- reentry: { // 站台折返策略
- position: 0, // 折返方向
- offset: {x: -16, y: 20}, // 折返偏移量
- noHumanColor: '#0F16DA', // 站台无人折返
- autoChangeEndsColor: '#0BF400' // 站台自动换端
- },
- detainCar: { // 扣车
- text: '扣', // 扣车显示内容
- position: -1, // 扣车方向
- offset: {x: -8, y: -20}, // 扣车偏移量
- trainColor: 'yellow', // 车站扣车颜色
- centerTrainColor: 'white', // 中心扣车颜色
- andCenterTrainColor: 'red', // 车站+中心扣车颜色
- detainTrainTextColor: '#E4EF50' // 车站扣除文字颜色
- },
- stopTime: { // 停站时间
- position: 1, // 运行时间方向
- offset: {x: -8, y: -4}, // 运行时间偏移量
- textColor: 'white' // 停站时间字体颜色
- },
- jump: {
- text: '跳', // 停跳显示内容
- position: -1, // 停跳方向
- offset: {x: -8, y: 0},
- textColor: '#0000FF', // 停跳文字颜色
- arcColor: '#0000FF', // 停跳圆圈颜色
- fillColor: 'rgba(0,0,0,0)', // 透明填充颜色
- r: 8 // 圆半径大小
- },
- level: { // 运行等级
- position: 1, // 运行等级方向
- offset: {x: -8, y: 30}, // 运行等级偏移量
- textColor: '#FFF000' // 停站等级字体颜色
- }
- };
-
- this[deviceType.StationControl] = {
- text: {
- distance: 2, // 灯和文字之间的距离
- fontSize: 12, // 字体大小
- fontFormat: 'consolas', // 字体格式
- fontColor: '#ffffff', // 字体颜色
- fontWeight: 'normal', // 字体粗细
- textAlign: 'middle', // 字体水平对齐
- textVerticalAlign: 'top' // 字体垂直对齐
- },
- lamp: {
- count: 4, // 控制模式的个数
- offset: {x: 0, y: 0}, // 偏移量
- radiusR: 4, // 控制模式灯的半径
- distance: 36, // 控制模式之间灯之间的距离
- grayColor: '#C0C0C0', // 控制模式灰色
- greenColor: 'green', // 控制模式绿色
- redColor: 'red', // 控制模式红色
- yellowColor: 'yellow' // 控制模式黄色
- },
- arrow: {
- show: false // 控制模式箭头显隐
- }
- };
-
- this[deviceType.StationCounter] = {
- text: {
- distance: 2, // 计数器名称和文字的距离
- fontColor: '#FFFFFF', // 计数器字体颜色
- borderColor: '#E4EF50' // 计数器边框颜色
- }
- };
-
- this[deviceType.StationDelayUnlock] = {
- text: {
- distance: 3, // 延迟解锁和设备之间的距离
- fontColor: '#FFFFFF', // 延时解锁字体颜色
- borderColor: '#FFFFFF' // 延迟解锁边框颜色
- }
- };
-
- this[deviceType.Station] = {
- kilometerPosition: 'up' // 公里标朝向
- };
-
- this[deviceType.Switch] = {
- text: {
- position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
- offset: {x: 5, y: -10}, // 道岔名称与区段距离
- fontSize: 11, // 字体大小
- fontWeight: 'normal', // 字体粗细
- borderColor: '#FE0000', // 道岔边框颜色
- lossColor: 'lightgreen', // 道岔失去颜色
- locateColor: 'lightgreen', // 道岔定位颜色
- inversionColor: 'lightgreen', // 道岔反位颜色
- monolockColor: '#FFFFFF' // 道岔单锁颜色
- },
- core: {
- length: 10 // 道岔单边长度
- },
- monolock: { // 道岔单锁配置
- locationColor: '#00FF00', // 道岔单锁'定位'颜色 (绿色)
- inversionColor: '#FFFF00', // 道岔单锁'反位'颜色 (黄色)
- rectShow: true, // 道岔单锁 矩形框是否显示
- rectWidth: 18, // 矩形框 宽高
- rectBorderColor: '#fff' // 矩形边框颜色
- },
- block: { // 道岔封锁配置
- nameBorderShow: false, // 道岔名称是否有包围框 显示
- contentRectShow: true, // 道岔封锁显示
- contentRectColor: 'red' // 道岔封锁边框颜色
- }
- };
-
- this[deviceType.LcControl] = {
- text: {
- fontSize: 11, // 字体大小
- fontWeight: 'normal', // 字体粗细
- distance: 5 // 灯跟文字距离
- },
- lamp: {
- radiusR: 6, // 控制灯大小
- controlColor: '#FFFF00' // 控制灯颜色
- }
- };
-
- this[deviceType.ZcControl] = {
- text: {
- fontSize: 11, // 字体大小
- fontWeight: 'normal', // 字体粗细
- distance: 5 // 灯跟文字距离
- },
- lamp: {
- radiusR: 6, // 控制灯大小
- controlColor: '#00FF00' // 控制灯颜色
- }
- };
-
- this[deviceType.LimitControl] = {
- text: {
- fontSize: 11, // 字体大小
- fontWeight: 'normal', // 字体粗细
- distance: 5 // 灯跟文字距离
- },
- lamp: {
- radiusR: 6, // 控制灯大小
- controlColor: '#ECE9D8' // 控制灯颜色
- }
- };
-
- this[deviceType.Line] = {
- lineColor: '#FFFFFF' // 线条颜色
- };
-
- this[deviceType.TrainWindow] = {
- lineColor: '#4DD43F', // 车次窗颜色
- lineDash: null, // 车次窗虚线间隔
- lineWidth: 1, // 车次窗线宽
- trainWindowSmooth: 0 // 车次窗矩形圆滑程度
- };
-
- this[deviceType.Train] = {
- trainBody: {
- trainBodyLineWidth: 1, // 车身line宽
- changeTrainWidth: false, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
- specialTrainType: [], // 特殊列车类型需设置显示格式
- lrPadding: 4, // 两边间隔
- upPadding: 4, // 上边距离
- trainBodyFillColor: '#000099', // 列车车身填充颜色
- trainNameFormat: 'serviceNumber:targetCode'// 列车显示格式
- },
- hsda: {
- lrPaddingHSDA: 3, // HSDA两边间隔
- upPaddingHSDA: 4, // HSDA上边距离
- trainHSDATextFontSize: 8, // 列车HDSA字号
- textHContent: '扣', // textH文本
- textSContent: '跳', // textS文本
- textDContent: '门', // textD文本
- textAContent: '警' // textA文本
- },
- trainNumber: {
- targetCodePrefix: '000', // 目的地码前缀
- defaultTargetCode: 'DDD', // 默认目的地码
- trainTargetTextAlign: 'left', // 目的地码文字显示位置
- trainNumberOffset: { x: 24, y: 4}// 目的地码偏移量
- },
- trainServer: {
- serviceNumberPrefix: '000', // 服务号(表号)前缀
- defaultServiceNumber: 'TTT', // 默认服务号（表号）
- defaultServerNoColor: '#FFFFFF', // 默认服务号状态显示颜色
- trainServerOffset: { x: 4, y: 4} // 列车服务号偏移
- },
- trainTarget: {
- tripNumberPrefix: '000', // 车次号前缀
- defaultTripNumber: 'DDD', // 默认车次号2
- trainTargetOffset: { x: 36, y: 4}, // 列车车次号偏移
- trainTargetTextAlign: 'right' // 车次号文字显示位置
- },
- trainTargetNumber: {
- trainTargetNumberOffset: {x: 0, y: 0}// 车组号偏移量
- },
- trainHead: {
- trainMoreLength: 1, // 列车车头比车身高出的长度,上下相比车体伸出去的边框
- trainHeadTriangleFirst: { x: 7, y: 1}, // 列车车头三角坐标1偏移量
- trainHeadTriangleSecond: { x: 13, y: 10}, // 列车车头三角坐标2偏移量
- trainHeadTriangleThird: { x: 7, y: 19}, // 列车车头三角坐标3偏移量
- trainConntWidth: 4, // 列车竖杠的宽度
- trainHeadFillColor: '#000000', // 列车车头矩形填充颜色
- trainHeadRectHeight: 20 // 列车车头矩形高度
- },
- common: {
- trainHeight: 20, // 列车高度
- trainHeadDistance: 2, // 列车和车头之间的间距
- trainWidth: 55, // 列车长度
- trainTextFontSize: 16, // 列车字号
- fontFamily: 'consolas', // 默认字体 族类
- haveTextHSDA: true, // 是否需创建textHSDA对象
- haveArrowText: true, // 是否需创建arrowText对象
- haveTrainBorder: false, // 是否需创建trainBorder对象
- aspectRatio: 7/5, // 字体宽高比例（用以拼接text是计算位置）
- textOffset: 4, // 字体偏移（用以控制字体据车头的距离）
- trainWidthMoreText: 8, // 计算列车长度时--列车长比text多出尺寸
- useSelfFormat: true, // 使用配置项的nameFormat
- useSelfText: true // 使用配置项的字体大小
- },
- trainStatusStyle: {
- defaultDestinationColor: '#FFFFFF', // 默认目的地状态显示颜色
- destinationStatusSetText: 'trainTarget', // 目的地状态设置的对应哪个text的颜色
- destinationStatus: [
- {status: '01', showColor: '#FFFFFF'},
- {status: '02', showColor: '#00FF00'},
- {status: '03', showColor: '#A0522D'},
- {status: '04', showColor: '#FFFF00'}
- ], // 目的地状态 01准点 02早点 03晚点 04头码车
- serverNoType: [
- {type: '01', showColor: '#FFFFFF'},
- {type: '02', showColor: '#FFF000'}
- ], // 服务号状态类型 01显示服务号 计划车 02显示车组号: 头码车与人工车
- directionType: [
- {
- type: '01',
- lineLShow: true,
- lineRShow: true,
- arrowLShow: false,
- arrowRShow: false
- },
- {
- type: '02',
- lineLShow: false,
- lineRShow: true,
- arrowLShow: false,
- arrowRShow: true
- },
- {
- type: '03',
- lineLShow: true,
- lineRShow: false,
- arrowLShow: true,
- arrowRShow: false
- }
- ], // 列车运行方向状态类型对应车头显示状态 01未知方向 02从左往右 上行 03从右往左 下行
- directionStopType: [
- {
- type: '01',
- lineLShow: false,
- lineRShow: false
- },
- {
- type: '02',
- lineLShow: false,
- lineRShow: true
- },
- {
- type: '03',
- lineLShow: true,
- lineRShow: false
- }
- ], // 列车停止方向类型对应车头显示状态 01未知方向 02从左往右 上行 03从右往左 下行
- runModeStatus: [
- {
- status: '01',
- trainLColor: '#FFFFFF',
- trainRColor: '#FFFFFF'
- },
- {
- status: '02',
- trainLColor: '#00FF00',
- trainRColor: '#00FF00'
- },
- {
- status: '03',
- trainLColor: '#FFFF00',
- trainRColor: '#FFFF00'
- },
- {
- status: '04',
- trainLColor: '#A0522D',
- trainRColor: '#A0522D'
- },
- {
- status: '05',
- trainLColor: '#A0522D',
- trainRColor: '#A0522D'
- }
- ], // 列车运行模式对应车头颜色 01未知 02 ATO自动驾驶模式AM 03 ATP监控下的人工驾驶模式CM 04 限制人工驾驶模式RM 05 非限制人工驾驶模式RM
- runControlStatus: [
- {
- status: '01',
- hShow: false,
- sShow: false
- },
- {
- status: '02',
- hShow: true,
- sShow: false
- },
- {
- status: '03',
- hShow: false,
- sShow: true
- }
- ], // 设置运行控制状态类型 01正常 02扣车 03停跳
- doorStatus: [
- {status: '01', dShow: false},
- {status: '02', dShow: true}
- ], // 设置车门状态类型 01关门 02开门
- communicationStatus: [
- {status: '01', trainColor: '#725A64'},
- {status: '02', trainColor: '#C0C0C0'}
- ], // 设置通信状态 01正常 02故障
- alarmStatus: [
- {status: '01', aShow: false},
- {status: '02', aShow: true}
- ] // 设置报警状态 01不报警 02报警
- }
- };
- }
-}
-
-export default new SkinStyle();
diff --git a/src/jmap/config/skinStyle/fuzhou_01.js b/src/jmap/config/skinStyle/fuzhou_01.js
deleted file mode 100644
index 61e8bd6c9..000000000
--- a/src/jmap/config/skinStyle/fuzhou_01.js
+++ /dev/null
@@ -1,454 +0,0 @@
-import defaultStyle from '../defaultStyle';
-import deviceType from '../../constant/deviceType';
-
-class SkinStyle extends defaultStyle {
- constructor() {
- super();
- this[deviceType.Link] = {
- lineWidthColor: '#FFFFFF', // line 颜色
- linkWidth: 4.4, // link 宽度
- linkColor: '#3F3F3F', // link 线条颜色
- linkTextColor: '#FFFFFF' // link 字体颜色
- };
-
- this[deviceType.Section] = {
- text: {
- position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
- distance: 18, // 文字离区段距离
- fontSize: 11, // 字体大小
- fontWeight: 'normal', // 字体粗细
- fontColor: '#FFFFFF', // 字体颜色
- textAlign: 'center', // 水平对齐方式
- textPosition: 'inside', // 文字位置
- textVerticalAlign: 'middle' // 文字垂直对齐方式
- },
- logicText: {
- position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
- distance: 6, // 文字离区段距离
- fontSize: 8, // 字体大小
- fontWeight: 'normal', // 字体粗细
- fontColor: '#FFFFFF', // 字体颜色
- textAlign: 'center', // 水平对齐方式
- textPosition: 'inside', // 文字位置
- textVerticalAlign: 'middle' // 文字垂直对齐方式
- },
- standText: {
- position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
- distance: 30, // 文字离区段距离
- fontSize: 11, // 字体大小
- fontWeight: 'normal', // 字体粗细
- fontColor: '#FFFFFF', // 字体颜色
- textAlign: 'center', // 水平对齐方式
- textPosition: 'inside', // 文字位置
- textVerticalAlign: 'middle' // 文字垂直对齐方式
- },
- reentryText: {
- position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
- distance: 30, // 文字离区段距离
- fontSize: 11, // 字体大小
- fontWeight: 'normal', // 字体粗细
- fontColor: '#FFFFFF', // 字体颜色
- textAlign: 'center', // 水平对齐方式
- textPosition: 'inside', // 文字位置
- textVerticalAlign: 'middle' // 文字垂直对齐方式
- },
- transferText: {
- position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
- distance: 28, // 文字离区段距离
- fontSize: 11, // 字体大小
- fontWeight: 'normal', // 字体粗细
- fontColor: '#FFFFFF', // 字体颜色
- textAlign: 'center', // 水平对齐方式
- textPosition: 'inside', // 文字位置
- textVerticalAlign: 'middle' // 文字垂直对齐方式
- },
- destinationText: {
- opposite: true, // 对称相反
- position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
- distance: 10, // 文字离区段距离
- fontSize: 10, // 字体大小
- fontWeight: 'bold', // 字体粗细
- fontColor: 'yellow', // 字体颜色
- textAlign: 'center', // 水平对齐方式
- textPosition: 'inside', // 文字位置
- textVerticalAlign: 'middle' // 文字垂直对齐方式
- },
- line: {
- width: 5, // 区段宽度
- beyondWidth: 1, // 区段宽超出宽度
- invadeColor: '#EF0C08', // 区段侵入颜色
- spareColor: '#3F3F3F', // 区段空闲颜色
- communicationOccupiedColor: '#FF329A', // 区段通信车占用颜色
- unCommunicationOccupiedColor: '#FE0000', // 区段非通讯车占用颜色
- routeLockColor: '#FFFFFF', // 区段路由锁定颜色
- faultLockColor: '#9B4A0A', // 区段故障锁定颜色
- undefinedColor: '#0071C1', // 区段未定义颜色
- protectionLockedColor: '#FEFF00', // 保护区段锁闭(未用)
- blockColor: '#800080', // 区段封锁颜色
- atcExcisionColor: '#A0522D', // 区段atc切除颜色
- atsExcisionColor: '#A0522D', // 区段ats切除颜色
- timeReleaseColor: '#3F3F3F', // 区段延时释放颜色
- protectiveLockColor: '#FFFF00', // 区段保护锁闭
- protectiveTimeReleaseColor: '#0071C1', // 区段保护延时解锁
- logicalColor: '#FFFF00', // 逻辑区段颜色 (未用)
- logicalTextColor: '#FFFFFF' // 逻辑区段名称颜色 (未用)
- },
- axle: {
- radius: 3, // 计轴 半径
- distance: 5, // 计轴和区段之间的距离 （未用）
- color: '#FFFFFF', // 区段计轴颜色
- resetColor: '#00FFFF', // 区段计轴预复位颜色
- Failure: '#E6A23C' // #FFFF00 计轴失效
- },
- speedLimit: { // 限速元素
- width: 1, // 限速线的宽短
- distance: 5, // 限速线距离区段距离
- lineColor: '#FFFF00', // 限速线颜色
- nameShow: false // 名称显示
- },
- separator: {
- z: 6, // 分割符层级
- width: 1.2, // 分隔符宽度
- endWidth: 3.5, // 尽头分隔符宽度
- endColor: '#3F3F3F', // 尽头分隔符颜色
- color: '#3149C3' // 区段边界符颜色
- }
- };
-
- this[deviceType.Signal] = {
- distance: 10, // 设备距离区段的距离
- post: {
- standardColor: '#3149C3', // 灯珠颜色
- standardWidth: 2 // 灯珠宽度
- },
- text: {
- distance: 0, // 文字和灯杆的距离
- isNoRotation: true, // 是否禁止旋转
- isAlignCenter: true, // 信号字体对其方式
- fontSize: 11, // 信号机名称字体大小
- fontWeight: 'bold', // 信号机名称字体粗细
- defaultColor: '#FFFFFF', // 信号灯字体默认色
- blockColor: '#EF0C08', // 信号灯字体锁定颜色
- checkColor: '#00FF00', // 信号字体
- nameBorderShow: true // 信号机名字边框显示
- },
- lamp: {
- stopWidth: 2, // 禁止线宽度
- borderWidth: 1, // 信号灯边框线宽度
- borderColor: '#3149C3', // 信号灯边框线颜色
- radiusR: 6, // 信号灯半径
- blockColor: '#EF0C08', // 信号灯锁闭
- grayColor: '#7F7F7F', // 信号灯灰色
- redColor: '#FF0000', // 信号灯红色
- greenColor: '#00FF00', // 信号灯绿色
- yellowColor: '#FFFF00', // 信号灯黄色
- whiteColor: '#FFFFFF', // 信号灯白色
- blueColor: '#0070C0' // 信号灯蓝色
- },
- route: {
- direction: false, // 自动进路方向
- offset: { x: -4, y: 0 }, // 自动进路偏移量
- routeColor: '#00FF00' // 自动进路
- },
- auto: {
- direction: false, // 自动通过方向
- offset: { x: -4, y: 0}, // 自动通过偏移量
- width: 5, // 自动宽度
- autoRoute: '#00FF00', // 自动进路
- autoTrigger: '#FFFF00', // 自动触发
- manualControl: '#FFFF00', // 人工控制
- outConflict: '#C00808' // 出车冲突
- },
- delay: {
- direction: true, // 延时解锁方向
- offset: { x: 15, y: -10}, // 延时解锁偏移量
- fontSize: 11, // 延迟解锁字体大小
- fontColor: '#FF0000', // 延迟解锁颜色
- fontWeight: 'bold' // 字体粗细
- },
- button: {
- distance: 5, // 信号灯按钮距离区段的距离
- borderDashColor: '#FFFFFF', // 信号灯按钮边线
- buttonColor: 'darkgreen', // 信号灯按钮颜色
- buttonLightenColor: '#E4EF50' // 信号灯按钮闪烁颜色
- }
- };
-
- this[deviceType.StationStand] = {
- common: { // 通用属性
- textFontSize: 11 // 站台默认字体大小
- },
- safetyDoor: { // 屏蔽门
- height: 3, // 站台屏蔽门高度
- distance: 8, // 站台和屏蔽门之间的距离
- defaultColor: '#00FF00', // 屏蔽门默认颜色
- splitDoorColor: '#F61107' // 屏蔽门切除颜色
- },
- stand: { // 站台
- headFontSize: 11, // 站台首端字体大小
- spareColor: '#606060', // 站台空闲颜色
- stopColor: '#FEFE00', // 站台列车停站颜色
- jumpStopColor: '#9A99FF', // 站台跳停颜色
- designatedJumpStopColor: 'lightSkyBlue' // 站台指定列车跳停颜色
- },
- standEmergent: { // 紧急关闭
- mergentR: 4, // 站台紧急关闭半径
- offset: {x: 0, y: 40}, // 站台紧急关闭偏移量
- closeColor: '#F61107' // 站台紧急关闭颜色
- },
- reentry: { // 站台折返策略
- position: 0, // 折返方向
- offset: {x: -16, y: 20}, // 折返偏移量
- noHumanColor: '#0F16DA', // 站台无人折返
- autoChangeEndsColor: '#0BF400' // 站台自动换端
- },
- detainCar: { // 扣车
- text: 'H', // 扣车显示内容
- position: -1, // 扣车方向
- offset: {x: -8, y: -6}, // 扣车偏移量
- trainColor: '#E4EF50', // 车站扣车颜色
- centerTrainColor: '#FFFFFF', // 中心扣车颜色
- andCenterTrainColor: '#F61107', // 车站+中心扣车颜色
- detainTrainTextColor: '#E4EF50' // 车站扣除文字颜色
- },
- stopTime: { // 停站时间
- position: 1, // 运行时间方向
- offset: {x: -8, y: 26}, // 运行时间偏移量
- textColor: '#FFFFFF' // 停站时间字体颜色
- },
- level: { // 运行等级
- position: 1, // 运行等级方向
- offset: {x: -8, y: 6}, // 运行等级偏移量
- textColor: '#FFFFFF' // 停站等级字体颜色
- }
- };
-
- this[deviceType.StationControl] = {
- text: {
- distance: 2, // 灯和文字之间的距离
- fontSize: 11, // 字体大小
- fontFormat: 'consolas', // 字体格式
- fontColor: '#ffffff', // 字体颜色
- fontWeight: 'normal', // 字体粗细
- textAlign: 'middle', // 字体水平对齐
- textVerticalAlign: 'top' // 字体垂直对齐
- },
- lamp: {
- count: 2, // 控制模式灯个数
- offset: {x: 0, y: 0}, // 控制模式灯偏移量
- radiusR: 4, // 控制模式灯的半径
- distance: 36, // 控制模式之间灯之间的距离
- grayColor: '#7F7F7F', // 控制模式灰色
- greenColor: '#00FF00', // 控制模式绿色
- redColor: '#FF0000', // 控制模式红色
- yellowColor: '#FFFF00' // 控制模式黄色
- },
- arrow: {
- show: true // 控制模式箭头显隐
- }
- };
-
- this[deviceType.StationCounter] = {
- text: {
- distance: 2, // 计数器名称和文字的距离
- fontColor: '#FFFFFF', // 计数器字体颜色
- borderColor: '#E4EF50' // 计数器边框颜色
- }
- };
-
- this[deviceType.StationDelayUnlock] = {
- text: {
- distance: 3, // 延迟解锁和设备之间的距离
- fontColor: '#FFFFFF', // 延时解锁字体颜色
- borderColor: '#FFFFFF' // 延迟解锁边框颜色
- }
- };
-
- this[deviceType.Station] = {
- kilometerPosition: 'up' // 公里标朝向
- };
-
- this[deviceType.Switch] = {
- text: {
- position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
- offset: {x: 0, y: 8}, // 道岔名称与区段距离
- fontSize: 11, // 字体大小
- fontWeight: 'normal', // 字体粗细
- borderColor: '#FE0000', // 道岔边框颜色
- lossColor: '#FFFFFF', // 道岔失去颜色
- locateColor: '#00FF00', // 道岔定位颜色
- inversionColor: '#9C9D09', // 道岔反位颜色
- monolockColor: '#870E10' // 道岔单锁颜色
- },
- core: {
- length: 6 // 道岔单边长度
- },
- block: { // 道岔封锁配置
- nameBorderShow: true, // 道岔名称是否有包围框 显示
- contentRectShow: false // 道岔封锁显示
- },
- monolock: { // 道岔单锁配置
- locationColor: '#870E10', // 道岔单锁定位颜色 (红色)
- inversionColor: '#870E10', // 道岔单锁反位颜色 (红色)
- rectShow: false // 道岔单锁 矩形框是否显示
- }
- };
-
- this[deviceType.Line] = {
- lineColor: '#FFFFFF' // 线条颜色
- };
-
- this[deviceType.LcControl] = {};
-
- this[deviceType.ZcControl] = {};
-
- this[deviceType.LimitControl] = {};
-
- this[deviceType.TrainWindow] = {
- lineColor: '#4DD43F', // 车次窗颜色
- lineDash: null, // 车次窗虚线间隔
- lineWidth: 1, // 车次窗线宽
- trainWindowSmooth: 0 // 车次窗矩形圆滑程度
- };
-
- this[deviceType.Train] = {
- trainBody: {
- trainBodyLineWidth: 0, // 车身line宽
- changeTrainWidth: true, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
- specialTrainType: [
- {
- type: '03',
- serviceNumber: 'MM',
- nameFormat: 'serviceNumber:groupNumber'
- }
- ], // 特殊列车类型需设置显示格式
- lrPadding: 1, // 两边间隔
- upPadding: 1, // 上边距离
- trainBodyFillColor: '#000000', // 列车车身填充颜色
- trainNameFormat: 'targetCode:serviceNumber:tripNumber'// 列车显示格式
- },
- hsda: {
- trainHSDATextFontSize: 8// 列车HDSA字号
- },
- trainNumber: {
- targetCodePrefix: '000', // 目的地码前缀
- defaultTargetCode: 'AAA', // 默认目的地码
- trainTargetTextAlign: 'left', // 车次号文字显示位置
- trainNumberOffset: { x: 1, y: 1}// 目的地码偏移量
- },
- trainServer: {
- serviceNumberPrefix: '00', // 服务号(表号)前缀
- defaultServiceNumber: 'BB', // 默认服务号（表号）
- trainServerOffset: { x: 26, y: 1}// 列车服务号偏移
- },
- trainTarget: {
- tripNumberPrefix: '0000', // 车次号前缀
- defaultDirectionCode: 'D', // 默认车次号1
- defaultTripNumber: 'CCC', // 默认车次号2
- trainTargetOffset: { x: 42, y: 1}// 列车车次号偏移
- },
- trainTargetNumber: {
- groupNumberPrefix: '000', // 车组号前缀
- defaultGroupNumber: 'EEE', // 默认车组号
- trainTargetNumberOffset: {x: 0, y: 1}// 车组号偏移量
- },
- trainHead: {
- trainMoreLength: 1, // 列车车头比车身高出的长度,上下相比车体伸出去的边框
- trainHeadTriangleFirst: { x: 0, y: 0}, // 列车车头三角坐标1偏移量
- trainHeadTriangleSecond: { x: 4, y: 7.5}, // 列车车头三角坐标2偏移量
- trainHeadTriangleThird: { x: 0, y: 15}, // 列车车头三角坐标3偏移量
- trainHeadRectHeight: 15, // 列车车头矩形高度
- trainConntWidth: 4, // 列车竖杠的宽度
- trainHeadFillColor: '#EF0C08'// 列车车头矩形填充颜色
- },
- common: {
- trainHeight: 17, // 列车高度
- trainHeadDistance: 2, // 列车和车头之间的间距
- trainWidth: 76, // 列车长度
- trainTextFontSize: 15, // 列车字号
- fontFamily: 'consolas', // 默认字体 族类
- nameFontSize: 15, // 字体大小
- haveTextHSDA: false, // 是否需创建textHSDA对象
- haveArrowText: true, // 是否需创建arrowText对象
- haveTrainBorder: false, // 是否需创建trainBorder对象
- aspectRatio: 8/15, // 字体宽高比例（用以拼接text是计算位置）
- textOffset: 1, // 字体偏移（用以控制字体据车头的距离）
- trainWidthMoreText: 2 // 计算列车长度时--列车长比text多出尺寸
- },
- trainStatusStyle: {
- destinationStatus: [
- {status: '01', showColor: '#FFFFFF'},
- {status: '02', showColor: '#00FF00'},
- {status: '03', showColor: '#3265FF'},
- {status: '04', showColor: '#9B4A09'},
- {status: '05', showColor: '#EF0C08'},
- {status: '06', showColor: '#FFFFFF'},
- {status: '07', showColor: '#FFFF00'}
- ], // 目的地状态 01准点 02早点 03严重早点 04晚点 05严重晚点 06头码车 07ATP切除
- destinationStatusSetText: 'trainServer', // 目的地状态设置的对应哪个text的颜色
- directionType: [
- {
- type: '01',
- lineLShow: false,
- lineRShow: false,
- arrowLShow: false,
- arrowRShow: false
- },
- {
- type: '02',
- lineLShow: false,
- lineRShow: false,
- arrowLShow: false,
- arrowRShow: true
- },
- {
- type: '03',
- lineLShow: false,
- lineRShow: false,
- arrowLShow: true,
- arrowRShow: false
- }
- ], // 运行方向状态类型对应车头显示状态 01未知方向 02从左往右 上行 03从右往左 下行
- directionStopType: [
- {type: '01', lineLShow: false, lineRShow: false},
- {type: '02', lineLShow: false, lineRShow: true},
- {type: '03', lineLShow: true, lineRShow: false}
- ], // 列车停止方向类型对应车头显示状态 01未知方向 02从左往右 上行 03从右往左 下行
- runModeStatus: [
- {
- status: '01',
- trainLColor: '#EF0C08',
- trainRColor: '#EF0C08'
- },
- {
- status: '02',
- trainLColor: '#00FF00',
- trainRColor: '#00FF00'
- },
- {
- status: '03',
- trainLColor: '#FFFF00',
- trainRColor: '#FFFF00'
- },
- {
- status: '04',
- trainLColor: '#EA700D',
- trainRColor: '#EA700D'
- },
- {
- status: '05',
- trainLColor: '#A0522D',
- trainRColor: '#A0522D'
- }
- ], // 列车运行模式对应车头颜色 01信号中断 02 ATO自动驾驶模式AM 03 ATP监控下的人工驾驶模式CM 04 限制人工驾驶模式RM 05 非限制人工驾驶模式RM
- runControlStatus: [], // 设置运行控制状态类型 eg:{status: '01', hShow: false, sShow: false}
- doorStatus: [], // 设置车门状态类型 eg:{status: '01', dShow: false}
- communicationStatus: [], // 设置通信状态 eg:{status: '01', trainColor:'#725A64'}
- alarmStatus: [], // 设置报警状态 eg:{status: '01', aShow: false}
- serverNoType: []// 服务号状态类型 eg:{type: '01', showColor: '#FFFFFF'}
- }
- };
- }
-}
-
-export default new SkinStyle();
diff --git a/src/jmap/map.js b/src/jmap/map.js
index 61d596a64..f062a2334 100644
--- a/src/jmap/map.js
+++ b/src/jmap/map.js
@@ -24,7 +24,7 @@ class Jlmap {
this.data = {};
// 皮肤参数
- this.skinStyle = '';
+ this.skinCode = '';
// 皮肤风格
this.style = this.loadStyle();
@@ -59,8 +59,8 @@ class Jlmap {
this.$mouseController.on(this.events.__Zoom, this.optionsHandler);
}
- loadStyle(skinStyle) {
- return selectSkinStyle(skinStyle);
+ loadStyle(skinCode) {
+ return selectSkinStyle(skinCode);
}
loadDefaultState() {
@@ -79,7 +79,7 @@ class Jlmap {
setMap(map, mapDevice) {
// 保存皮肤类型
if (map.skinVO) {
- this.skinStyle = map.skinVO.code;
+ this.skinCode = map.skinVO.code;
}
// 保存原始数据
@@ -89,7 +89,7 @@ class Jlmap {
this.mapDevice = mapDevice;
// 加载对应皮肤
- this.style = this.loadStyle(this.skinStyle);
+ this.style = this.loadStyle(this.skinCode);
// 数据加载完成 回调
if (this.methods.dataLoaded instanceof Function) { this.methods.dataLoaded(this.mapDevice); }
@@ -352,7 +352,7 @@ class Jlmap {
}
clear() {
- this.skinStyle = '';
+ this.skinCode = '';
this.style = {};
this.mapDevice = {};
this.$painter.clear();
diff --git a/src/jmap/theme/batong_01/menus/dialog/trainControl.vue b/src/jmap/theme/batong_01/menus/dialog/trainControl.vue
index af3fe5875..ab8584424 100644
--- a/src/jmap/theme/batong_01/menus/dialog/trainControl.vue
+++ b/src/jmap/theme/batong_01/menus/dialog/trainControl.vue
@@ -205,7 +205,7 @@
methods: {
loadInitData(map) {
if (map) {
- getPublishTrainList(map.skinStyle).then(resp => {
+ getPublishTrainList(map.skinCode).then(resp => {
this.trainList = resp.data;
}).catch(error => {
this.$messageBox(`获取列车车组号失败`);
diff --git a/src/jmap/theme/batong_01/menus/dialog/trainCreate.vue b/src/jmap/theme/batong_01/menus/dialog/trainCreate.vue
index 48a0c0e93..755bc5736 100644
--- a/src/jmap/theme/batong_01/menus/dialog/trainCreate.vue
+++ b/src/jmap/theme/batong_01/menus/dialog/trainCreate.vue
@@ -92,7 +92,7 @@
methods: {
loadInitData(map) {
if (Object.keys(map || {}).length) {
- getPublishTrainList(map.skinStyle).then(response => {
+ getPublishTrainList(map.skinCode).then(response => {
this.trainList = response.data;
}).catch(error => {
this.$messageBox(`获取列车列表失败`);
diff --git a/src/jmap/theme/batong_01/menus/dialog/trainDelete.vue b/src/jmap/theme/batong_01/menus/dialog/trainDelete.vue
index 3b8e01df3..003ce2e1f 100644
--- a/src/jmap/theme/batong_01/menus/dialog/trainDelete.vue
+++ b/src/jmap/theme/batong_01/menus/dialog/trainDelete.vue
@@ -77,7 +77,7 @@
methods: {
loadInitData(map) {
if (map) {
- getPublishMapTrainNos(map.skinStyle).then(response => {
+ getPublishMapTrainNos(map.skinCode).then(response => {
this.trainNoList = response.data;
}).catch(error => {
this.$messageBox(`获取列车车组号失败`);
diff --git a/src/jmap/theme/beijing_01/menus/dialog/trainCreate.vue b/src/jmap/theme/beijing_01/menus/dialog/trainCreate.vue
index 162234a2c..8d1c70e2d 100644
--- a/src/jmap/theme/beijing_01/menus/dialog/trainCreate.vue
+++ b/src/jmap/theme/beijing_01/menus/dialog/trainCreate.vue
@@ -87,7 +87,7 @@
methods: {
loadInitData(map) {
if (Object.keys(map || {}).length) {
- getPublishTrainList(map.skinStyle).then(response => {
+ getPublishTrainList(map.skinCode).then(response => {
this.trainList = response.data;
}).catch(error => {
this.$messageBox(`获取列车列表失败`);
diff --git a/src/jmap/theme/beijing_01/menus/dialog/trainDelete.vue b/src/jmap/theme/beijing_01/menus/dialog/trainDelete.vue
index d8b378a53..70225067f 100644
--- a/src/jmap/theme/beijing_01/menus/dialog/trainDelete.vue
+++ b/src/jmap/theme/beijing_01/menus/dialog/trainDelete.vue
@@ -79,7 +79,7 @@
methods: {
loadInitData(map) {
if (map) {
- getPublishMapTrainNos(map.skinStyle).then(response => {
+ getPublishMapTrainNos(map.skinCode).then(response => {
this.trainNoList = response.data;
}).catch(error => {
this.$messageBox(`获取列车车组号失败`);
diff --git a/src/jmap/theme/beijing_01/menusPlan/chooseTemplatePlan.vue b/src/jmap/theme/beijing_01/menusPlan/chooseTemplatePlan.vue
index 6b4456292..09022b49c 100644
--- a/src/jmap/theme/beijing_01/menusPlan/chooseTemplatePlan.vue
+++ b/src/jmap/theme/beijing_01/menusPlan/chooseTemplatePlan.vue
@@ -54,10 +54,10 @@ export default {
},
{
title: '皮肤类型',
- prop: 'skinStyle',
+ prop: 'skinCode',
type: 'tag',
columnValue: (row) => {
- return this.$convertField(row.skinStyle, this.skinStyleList, ['code', 'name']);
+ return this.$convertField(row.skinCode, this.skinStyleList, ['code', 'name']);
},
tagType: (row) => { return 'success'; }
}
@@ -89,7 +89,7 @@ export default {
},
queryFunction(params) {
if (this.$store.state.map && this.$store.state.map.map) {
- params['skinStyle'] = this.$store.getters['map/skinStyle'];
+ params['skinCode'] = this.$store.getters['map/skinCode'];
}
return runPlanTemplateList(params);
},
diff --git a/src/jmap/theme/beijing_01/menusPlan/createTodayPlan.vue b/src/jmap/theme/beijing_01/menusPlan/createTodayPlan.vue
index 8262b7bdf..4eaf7694f 100644
--- a/src/jmap/theme/beijing_01/menusPlan/createTodayPlan.vue
+++ b/src/jmap/theme/beijing_01/menusPlan/createTodayPlan.vue
@@ -57,10 +57,10 @@ export default {
},
{
title: '皮肤类型',
- prop: 'skinStyle',
+ prop: 'skinCode',
type: 'tag',
columnValue: (row) => {
- return this.$convertField(row.skinStyle, this.skinStyleList, ['code', 'name']);
+ return this.$convertField(row.skinCode, this.skinStyleList, ['code', 'name']);
},
tagType: (row) => { return 'success'; }
}
@@ -92,7 +92,7 @@ export default {
},
queryFunction(params) {
if (this.$store.state.map && this.$store.state.map.map) {
- params['skinStyle'] = this.$store.getters['map/skinStyle'];
+ params['skinCode'] = this.$store.getters['map/skinCode'];
}
return runPlanTemplateList(params);
},
@@ -119,12 +119,12 @@ export default {
}
},
loadRunData() {
- const skinStyle = this.$route.query.skinStyle;
+ const skinCode = this.$route.query.skinCode;
this.$store.dispatch('runPlan/clear');
- if (skinStyle) {
- getStationListBySkinStyle(skinStyle).then(response => {
+ if (skinCode) {
+ getStationListBySkinStyle(skinCode).then(response => {
const stations = response.data;
- this.PlanConvert = this.$theme.loadPlanConvert(skinStyle);
+ this.PlanConvert = this.$theme.loadPlanConvert(skinCode);
this.$store.dispatch('runPlan/setStations', stations).then(() => {
getEveryDayRunPlanData(this.$route.query.group).then(resp => {
this.$store.dispatch('runPlan/setPlanData', resp.data);
diff --git a/src/jmap/theme/beijing_01/planSchedule/index.vue b/src/jmap/theme/beijing_01/planSchedule/index.vue
index 5403a914c..15dc56293 100644
--- a/src/jmap/theme/beijing_01/planSchedule/index.vue
+++ b/src/jmap/theme/beijing_01/planSchedule/index.vue
@@ -1,8 +1,8 @@
-
-
+
+
@@ -33,7 +33,7 @@
- 创建
+ 创建
更新
@@ -74,7 +74,7 @@
id: '',
prdCode: '',
product: [],
- skinStyle: '',
+ skinCode: '',
name: '',
remarks: '',
}
@@ -89,7 +89,7 @@
name: [
{ required: true, message: '请输入课程名称', trigger: 'change' }
],
- skinStyle: [
+ skinCode: [
{ required: true, message: '请选择皮肤类型', trigger: 'change' }
],
prdCode: [
@@ -115,7 +115,7 @@
if (!isNew) {
this.refresh(node);
} else {
- this.courseModel.skinStyle = node.data.id;
+ this.courseModel.skinCode = node.data.id;
}
this.productList = [];
@@ -133,7 +133,7 @@
this.$refs.form.validate((valid) => {
if (valid) {
let model = {
- skinStyle: this.courseModel.skinStyle,
+ skinCode: this.courseModel.skinCode,
prdCode: this.courseModel.prdCode,
name: this.courseModel.name,
remarks: this.courseModel.remarks
@@ -152,7 +152,7 @@
if (valid) {
let model = {
id: this.courseModel.id,
- skinStyle: this.courseModel.skinStyle,
+ skinCode: this.courseModel.skinCode,
prdCode: this.courseModel.prdCode,
name: this.courseModel.name,
remarks: this.courseModel.remarks
@@ -181,14 +181,14 @@
},
getParentSkin(node) {
let next = node;
- let skinStyle = '';
+ let skinCode = '';
while (next) {
if (next.data && next.data.type == 'skin') {
- skinStyle = next.data.id;
+ skinCode = next.data.id;
}
next = next.parent;
}
- return skinStyle;
+ return skinCode;
},
refresh(node) {
if (node && node.data) {
@@ -196,7 +196,7 @@
let data = response.data;
this.courseModel = {
id: data.id,
- skinStyle: this.getParentSkin(node),
+ skinCode: this.getParentSkin(node),
prdCode: data.prdCode,
name: data.name,
remarks: data.remarks,
diff --git a/src/views/lesson/lessoncategory/edit/lesson/publish.vue b/src/views/lesson/lessoncategory/edit/lesson/publish.vue
index 8d4ded1b0..cdbe5a073 100644
--- a/src/views/lesson/lessoncategory/edit/lesson/publish.vue
+++ b/src/views/lesson/lessoncategory/edit/lesson/publish.vue
@@ -91,8 +91,8 @@
cityCode: model.cityCode,
}
- if (model.skinStyle && model.id) {
- getPublishMapListBySkinStyle(model.skinStyle).then(resp => {
+ if (model.skinCode && model.id) {
+ getPublishMapListBySkinStyle(model.skinCode).then(resp => {
let list = resp.data || [];
list.forEach(elem => {
if (!this.cityMapDict[elem.cityCode]) {
diff --git a/src/views/lesson/trainingRule/addBatch.vue b/src/views/lesson/trainingRule/addBatch.vue
index 71e93b836..f0d744f86 100644
--- a/src/views/lesson/trainingRule/addBatch.vue
+++ b/src/views/lesson/trainingRule/addBatch.vue
@@ -20,7 +20,7 @@ export default {
loading: false,
dialogVisible: false,
formModel: {
- skinStyle: ''
+ skinCode: ''
},
skinStyleList: [],
isShow: false
@@ -32,14 +32,14 @@ export default {
const form = {
labelWidth: '120px',
items: [
- { prop: 'skinStyle', label: '皮肤类型', type: 'select', required: true, options: this.skinStyleList }
+ { prop: 'skinCode', label: '皮肤类型', type: 'select', required: true, options: this.skinStyleList }
]
};
return form;
},
rules() {
const crules = {
- skinStyle: [
+ skinCode: [
{ required: true, message: '请选择皮肤类型', trigger: 'change' }
]
};
@@ -92,7 +92,7 @@ export default {
create() {
const self = this;
this.loading = true;
- addTrainingRulesList(this.formModel.skinStyle, OperationList[this.formModel.skinStyle].list).then(response => {
+ addTrainingRulesList(this.formModel.skinCode, OperationList[this.formModel.skinCode].list).then(response => {
self.loading = false;
self.$message.success('批量生成操作定义成功');
self.handleClose();
@@ -104,7 +104,7 @@ export default {
},
handleClose() {
this.formModel = {
- skinStyle: ''
+ skinCode: ''
};
this.$refs.dataform.resetForm();
this.isShow = false;
diff --git a/src/views/lesson/trainingRule/addEdit.vue b/src/views/lesson/trainingRule/addEdit.vue
index 14840cd2e..f1fec6a03 100644
--- a/src/views/lesson/trainingRule/addEdit.vue
+++ b/src/views/lesson/trainingRule/addEdit.vue
@@ -28,7 +28,7 @@ export default {
trainingName: '',
trainingType: '',
operateType: '',
- skinStyle: '',
+ skinCode: '',
minDuration: '',
maxDuration: '',
trainingRemark: '',
@@ -46,7 +46,7 @@ export default {
const form = {
labelWidth: '120px',
items: [
- { prop: 'skinStyle', label: '皮肤类型', type: 'select', required: true, options: this.skinStyleList, disabled: !isAdd },
+ { prop: 'skinCode', label: '皮肤类型', type: 'select', required: true, options: this.skinStyleList, disabled: !isAdd },
{ prop: 'trainingType', label: '实训类型', type: 'select', required: true, options: this.trainingTypeList, disabled: !isAdd, change: true, onChange: this.changeList },
{ prop: 'operateType', label: '操作类型', type: 'select', required: true, options: this.trainingOperateTypeMap[this.formModel.trainingType], disabled: !isAdd },
{ label: '', type: 'button', options: this.placeholderList, style: 'margin-bottom: 0; margin-top: -10px;', typeBtn: 'info', click: this.addTrainName },
@@ -70,7 +70,7 @@ export default {
operateType: [
{ required: true, message: '请输入操作类型', trigger: 'change' }
],
- skinStyle: [
+ skinCode: [
{ required: true, message: '请选择皮肤类型', trigger: 'change' }
],
minDuration: [
@@ -184,7 +184,7 @@ export default {
this.dialogVisible = true;
if (data && data.id) {
// 获取操作占位列表
- const res = await getPlaceholderList({ trainingType: data.trainingType, skinStyle: data.skinStyle });
+ const res = await getPlaceholderList({ trainingType: data.trainingType, skinCode: data.skinCode });
this.placeholderList = res.data;
this.formModel = {
id: data.id,
@@ -192,7 +192,7 @@ export default {
trainingType: data.trainingType,
operateType: data.operateType,
productTypes: data.productTypes,
- skinStyle: data.skinStyle,
+ skinCode: data.skinCode,
minDuration: data.minDuration,
maxDuration: data.maxDuration,
trainingRemark: this.repliceName(data.trainingRemark, this.placeholderList)
@@ -211,7 +211,7 @@ export default {
},
changeList(val) {
// 获取操作占位列表
- getPlaceholderList({ trainingType: val, skinStyle: '02' }).then(res => {
+ getPlaceholderList({ trainingType: val, skinCode: '02' }).then(res => {
this.placeholderList = res.data;
});
},
@@ -284,7 +284,7 @@ export default {
trainingName: '',
trainingType: '',
operateType: '',
- skinStyle: '',
+ skinCode: '',
minDuration: '',
maxDuration: '',
trainingRemark: ''
diff --git a/src/views/lesson/trainingRule/detail/edit.vue b/src/views/lesson/trainingRule/detail/edit.vue
index 3f5a738ae..1df092f14 100644
--- a/src/views/lesson/trainingRule/detail/edit.vue
+++ b/src/views/lesson/trainingRule/detail/edit.vue
@@ -89,7 +89,7 @@
methods: {
async show(data) {
this.dialogVisible = true
- let res = await getPlaceholderList({ trainingType: this.$route.query.type, skinStyle: this.$route.query.skinStyle });
+ let res = await getPlaceholderList({ trainingType: this.$route.query.type, skinCode: this.$route.query.skinCode });
this.placeholderList = res.data;
if (data && data.operateCode) {
// 获取操作占位列表
diff --git a/src/views/lesson/trainingRule/detail/index.vue b/src/views/lesson/trainingRule/detail/index.vue
index 9d2bf75e2..b33e5cda9 100644
--- a/src/views/lesson/trainingRule/detail/index.vue
+++ b/src/views/lesson/trainingRule/detail/index.vue
@@ -120,7 +120,7 @@
methods: {
async init() {
- let res = await getPlaceholderList({ trainingType: this.$route.query.type, skinStyle: this.$route.query.skinStyle });
+ let res = await getPlaceholderList({ trainingType: this.$route.query.type, skinCode: this.$route.query.skinCode });
this.placeholderList = res.data;
},
repliceName(fieldValue, enumList) {
diff --git a/src/views/lesson/trainingRule/list.vue b/src/views/lesson/trainingRule/list.vue
index b4d238593..672c8e4e2 100644
--- a/src/views/lesson/trainingRule/list.vue
+++ b/src/views/lesson/trainingRule/list.vue
@@ -36,7 +36,7 @@
labelWidth: '80px',
reset: true,
queryObject: {
- skinStyle: {
+ skinCode: {
type: 'select',
label: '皮肤类型',
config: {
@@ -70,9 +70,9 @@
},
{
title: '皮肤类型',
- prop: 'skinStyle',
+ prop: 'skinCode',
type: 'tag',
- columnValue: (row) => { return this.$convertField(row.skinStyle, this.skinStyleList, ['code', 'name']) },
+ columnValue: (row) => { return this.$convertField(row.skinCode, this.skinStyleList, ['code', 'name']) },
tagType: (row) => { return '' }
},
{
@@ -164,7 +164,7 @@
this.trainingOperateTypeMap['08'] = list; //限速实训
});
this.placeholderMap = {};
- getPlaceholderList({ skinStyle: '', trainingType: '' }).then(res => {
+ getPlaceholderList({ skinCode: '', trainingType: '' }).then(res => {
res.data.forEach(item => {
if (!this.placeholderMap[item.trainingType]) {
this.placeholderMap[item.trainingType] = [];
@@ -178,7 +178,7 @@
getSkinStyleList().then(response => {
this.skinStyleList = response.data;
response.data.forEach(elem => {
- this.queryForm.queryObject.skinStyle.config.data.push({ value: elem.code, label: elem.name });
+ this.queryForm.queryObject.skinCode.config.data.push({ value: elem.code, label: elem.name });
});
})
@@ -221,7 +221,7 @@
return res;
},
handleViewDetail(index, row) {
- this.$router.push({ path: `/lesson/manage/trainingRule/detail`, query: { id: row.id, type: row.trainingType, skinStyle: row.skinStyle } })
+ this.$router.push({ path: `/lesson/manage/trainingRule/detail`, query: { id: row.id, type: row.trainingType, skinCode: row.skinCode } })
},
handleEdit(index, row) {
diff --git a/src/views/lesson/trainingcategory/edit.vue b/src/views/lesson/trainingcategory/edit.vue
index 062928c58..ce5c9e5ae 100644
--- a/src/views/lesson/trainingcategory/edit.vue
+++ b/src/views/lesson/trainingcategory/edit.vue
@@ -84,7 +84,7 @@ export default {
id: '',
mapId: '',
mapName: '',
- skinStyle: '',
+ skinCode: '',
name: '',
remarks: '',
code: '',
@@ -153,7 +153,7 @@ export default {
if (node.data.type === 'skin') {
this.codeDisabled = false;
this.addModel.mapName = node.data.name;
- this.addModel.skinStyle = node.data.id;
+ this.addModel.skinCode = node.data.id;
this.loading = false;
} else if (node.data.type === 'prd') {
this.codeDisabled = true;
@@ -164,7 +164,7 @@ export default {
this.addModel.remarks = response.data.remarks;
this.addModel.prdType = response.data.prdType;
this.addModel.code = response.data.code;
- this.addModel.skinStyle = response.data.skinStyle;
+ this.addModel.skinCode = response.data.skinCode;
this.addModel.trainTypes = this.initTrainTypes = response.data.trainTypes;
this.addModel.id = response.data.id;
this.loading = false;
@@ -185,7 +185,7 @@ export default {
this.$refs.form.validate((valid) => {
if (valid) {
const data = {
- skinStyle: this.addModel.skinStyle,
+ skinCode: this.addModel.skinCode,
mapName: this.addModel.mapName,
name: this.addModel.name,
remarks: this.addModel.remarks,
diff --git a/src/views/lesson/trainingmanage/draft.vue b/src/views/lesson/trainingmanage/draft.vue
index ff840868b..408019276 100644
--- a/src/views/lesson/trainingmanage/draft.vue
+++ b/src/views/lesson/trainingmanage/draft.vue
@@ -1,8 +1,8 @@
-
-
+
+
@@ -125,7 +125,7 @@
operateModel: {
name: '',
type: '',
- skinStyle: '',
+ skinCode: '',
prdCode: '',
operateType: [],
maxDuration: 0,
@@ -140,7 +140,7 @@
title: '',
},
rules: {
- skinStyle: [
+ skinCode: [
{ required: true, message: '请输入地图名称', trigger: 'change' }
],
prdCode: [
@@ -181,11 +181,11 @@
this.dialogShow = false;
this.loading = false;
},
- skinStyleChoose(skinStyle) {
+ skinStyleChoose(skinCode) {
this.operateModel.prdCode = '';
this.productList = [];
- if (skinStyle) {
- getCommodityMapProduct(skinStyle).then((response) => {
+ if (skinCode) {
+ getCommodityMapProduct(skinCode).then((response) => {
this.productList = response.data;
this.productList = this.productList.filter(elem => { return elem.prdType != '03'; })
})
@@ -195,9 +195,9 @@
this.trainingTypeMap = {};
this.operateModel.operateType = [];
- let skinStyleObj = this.skinStyleList.find(elem => { return elem.code === this.operateModel.skinStyle }) || {};
+ let skinStyleObj = this.skinStyleList.find(elem => { return elem.code === this.operateModel.skinCode }) || {};
let prdTypeObj = this.productList.find(elem => { return elem.code === prdCode }) || {};
- let res = await getOperateTrainingList({ skinStyle: skinStyleObj.code, productType: prdTypeObj.prdType });
+ let res = await getOperateTrainingList({ skinCode: skinStyleObj.code, productType: prdTypeObj.prdType });
if (res && res.code == 200) {
this.trainingTypeLists = res.data;
this.trainingTypeList.forEach(elem => {
@@ -248,7 +248,7 @@
if (this.operation.event == '01') { //add
//创建实训
let data = {
- skinStyle: this.operateModel.skinStyle,
+ skinCode: this.operateModel.skinCode,
name: this.operateModel.name,
prdCode: this.operateModel.prdCode,
trainingType: this.operateModel.type,
@@ -266,7 +266,7 @@
} else if (this.operation.event == '02') { //edit
//更新实训
let data = {
- skinStyle: this.operateModel.skinStyle,
+ skinCode: this.operateModel.skinCode,
name: this.operateModel.name,
prdCode: this.operateModel.prdCode,
trainingType: this.operateModel.type,
@@ -287,7 +287,7 @@
} else if (this.operation.event == '03') { //delete
//删除实训
let data = {
- skinStyle: this.operateModel.skinStyle,
+ skinCode: this.operateModel.skinCode,
name: this.operateModel.name,
prdCode: this.operateModel.prdCode,
trainingType: `${this.operateModel.type}`,
diff --git a/src/views/lesson/trainingmanage/index.vue b/src/views/lesson/trainingmanage/index.vue
index e03a1456a..3f3d9d491 100644
--- a/src/views/lesson/trainingmanage/index.vue
+++ b/src/views/lesson/trainingmanage/index.vue
@@ -3,7 +3,7 @@
{ return this.$convertField(row.skinStyle, this.skinStyleList, ['code', 'name']); },
+ columnValue: (row) => { return this.$convertField(row.skinCode, this.skinStyleList, ['code', 'name']); },
tagType: (row) => { return ''; }
},
{
@@ -171,11 +171,11 @@ export default {
methods: {
async loadInitData() {
this.skinStyleList = [];
- this.queryForm.queryObject.skinStyle.config.data = [];
+ this.queryForm.queryObject.skinCode.config.data = [];
getSkinStyleList().then(response => {
this.skinStyleList = response.data;
response.data.forEach(elem => {
- this.queryForm.queryObject.skinStyle.config.data.push({ value: elem.code, label: elem.name });
+ this.queryForm.queryObject.skinCode.config.data.push({ value: elem.code, label: elem.name });
});
});
@@ -216,8 +216,8 @@ export default {
this.reloadTable();
},
loadInitQueryList(form) {
- if (form && form.skinStyle) {
- getCommodityMapProduct(form.skinStyle).then((response) => {
+ if (form && form.skinCode) {
+ getCommodityMapProduct(form.skinCode).then((response) => {
const productList = response.data;
if (productList && productList.length > 0) {
productList.forEach(elem => {
diff --git a/src/views/lesson/trainingrecord/category/draft.vue b/src/views/lesson/trainingrecord/category/draft.vue
index 0fd79f6c7..99de0b45e 100644
--- a/src/views/lesson/trainingrecord/category/draft.vue
+++ b/src/views/lesson/trainingrecord/category/draft.vue
@@ -112,7 +112,7 @@ export default {
name: '',
type: '',
prdCode: '',
- skinStyle: '',
+ skinCode: '',
operateType: '',
maxDuration: 0,
minDuration: 0,
@@ -180,7 +180,7 @@ export default {
if (node.parent) {
this.operateModel.type = node.data.id;
this.operateModel.prdCode = node.parent.data.id;
- this.operateModel.skinStyle = node.parent.parent.data.id;
+ this.operateModel.skinCode = node.parent.parent.data.id;
this.productTypesList = [{
code: node.parent.data.id,
name: node.parent.data.name
@@ -200,7 +200,7 @@ export default {
if (node.parent && node.parent.parent) {
this.operateModel.type = node.parent.data.id;
this.operateModel.prdCode = node.parent.parent.data.id;
- this.operateModel.skinStyle = node.parent.parent.parent.data.id;
+ this.operateModel.skinCode = node.parent.parent.parent.data.id;
this.operationList = this.trainingOperateTypeMap[node.parent.data.id] || [];
this.productTypesList = [{
code: node.parent.parent.data.id,
@@ -247,7 +247,7 @@ export default {
name: '',
type: '',
prdCode: '',
- skinStyle: '',
+ skinCode: '',
operateType: '',
maxDuration: 0,
minDuration: 0,
@@ -262,14 +262,14 @@ export default {
name: this.operateModel.name,
type: this.operateModel.type,
prdCode: this.operateModel.prdCode,
- skinStyle: this.operateModel.skinStyle,
+ skinCode: this.operateModel.skinCode,
operateType: this.operateModel.operateType,
minDuration: this.operateModel.minDuration,
maxDuration: this.operateModel.maxDuration,
remarks: this.operateModel.remarks
};
addTraining(data).then(response => {
- this.$emit('refresh', [localStore.get('cityCode') || '', localStore.get('skinStyle') || '']);
+ this.$emit('refresh', [localStore.get('cityCode') || '', localStore.get('skinCode') || '']);
this.close();
this.$message.success('添加实训成功!');
}).catch(() => {
@@ -286,14 +286,14 @@ export default {
name: this.operateModel.name,
type: this.operateModel.type,
prdCode: this.operateModel.prdCode,
- skinStyle: this.operateModel.skinStyle,
+ skinCode: this.operateModel.skinCode,
operateType: this.operateModel.operateType,
minDuration: this.operateModel.minDuration,
maxDuration: this.operateModel.maxDuration,
remarks: this.operateModel.remarks
};
updateTraining(data).then(response => {
- this.$emit('refresh', [localStore.get('cityCode') || '', localStore.get('skinStyle') || '']);
+ this.$emit('refresh', [localStore.get('cityCode') || '', localStore.get('skinCode') || '']);
this.close();
this.$message.success('更新实训成功!');
}).catch(() => {
diff --git a/src/views/lesson/trainingrecord/manage/index.vue b/src/views/lesson/trainingrecord/manage/index.vue
index c0b9137fa..151f160c6 100644
--- a/src/views/lesson/trainingrecord/manage/index.vue
+++ b/src/views/lesson/trainingrecord/manage/index.vue
@@ -77,7 +77,7 @@ export default {
getTrainingStepsDetail(trainingId, { group }).then(response => {
const stepdData = response.data;
getProductDetail(stepdData.prdCode).then(res => {
- loadMapData(stepdData.skinStyle).then(() => {
+ loadMapData(stepdData.skinCode).then(() => {
this.$store.dispatch('training/setPrdType', res.data.prdType);
this.$store.dispatch('training/setTrainingData', stepdData);
}).catch(() => {
diff --git a/src/views/management/userSimulation/add.vue b/src/views/management/userSimulation/add.vue
index 3f0a46719..ae18d9c62 100644
--- a/src/views/management/userSimulation/add.vue
+++ b/src/views/management/userSimulation/add.vue
@@ -88,7 +88,7 @@ export default {
const data = response.data.list;
if (data && data.length) {
data.forEach(elem => {
- this.LessonList.push({ value: elem.id, label: elem.name, skinStyle: elem.skinStyle });
+ this.LessonList.push({ value: elem.id, label: elem.name, skinCode: elem.skinCode });
});
}
});
@@ -124,17 +124,17 @@ export default {
this.formModel.userId = item.id;
},
async mapChange(val) {
- let skinStyle = '';
+ let skinCode = '';
this.mapPrdList = [];
this.formModel.mapPrdCode = '';
if (this.LessonList.length) {
this.LessonList.forEach(item => {
if (item.value == val) {
- skinStyle = item.skinStyle;
+ skinCode = item.skinCode;
}
});
try {
- const res = await getCommodityMapProduct(skinStyle);
+ const res = await getCommodityMapProduct(skinCode);
const data = res.data;
if (data && data.length) {
data.forEach(elem => {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/counter.vue b/src/views/map/mapdraft/mapedit/mapoperate/counter.vue
index 6446454df..417e683a5 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/counter.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/counter.vue
@@ -135,7 +135,7 @@ export default {
...mapGetters('map', [
'counterList',
'stationList',
- 'skinStyle'
+ 'skinCode'
]),
createRules: function () {
return {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/delayunlock.vue b/src/views/map/mapdraft/mapedit/mapoperate/delayunlock.vue
index 889d54cb6..1f73e287a 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/delayunlock.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/delayunlock.vue
@@ -115,7 +115,7 @@ export default {
...mapGetters('map', [
'delayShowList',
'stationList',
- 'skinStyle'
+ 'skinCode'
]),
createRules: function () {
return {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/lcControl.vue b/src/views/map/mapdraft/mapedit/mapoperate/lcControl.vue
index 5f7683f4b..d3125b090 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/lcControl.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/lcControl.vue
@@ -139,7 +139,7 @@ export default {
'sectionList',
'trainModelList',
'lcList',
- 'skinStyle'
+ 'skinCode'
]),
createRules: function () {
return {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/limitControl.vue b/src/views/map/mapdraft/mapedit/mapoperate/limitControl.vue
index d152b5551..3ca49d69e 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/limitControl.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/limitControl.vue
@@ -139,7 +139,7 @@ export default {
'sectionList',
'trainModelList',
'tempSpeedLimitList',
- 'skinStyle'
+ 'skinCode'
]),
createRules: function () {
return {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/line.vue b/src/views/map/mapdraft/mapedit/mapoperate/line.vue
index 3ac671692..0d24833f5 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/line.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/line.vue
@@ -206,7 +206,7 @@ export default {
...mapGetters('map', [
'lineList',
'stationList',
- 'skinStyle'
+ 'skinCode'
])
},
watch: {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/section.vue b/src/views/map/mapdraft/mapedit/mapoperate/section.vue
index 0c05aa8a1..97c33fefa 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/section.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/section.vue
@@ -277,7 +277,7 @@ export default {
'switchList',
'stationList',
'stationStandList',
- 'skinStyle'
+ 'skinCode'
]),
form() {
const form = {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/signal.vue b/src/views/map/mapdraft/mapedit/mapoperate/signal.vue
index 10cc367c3..39b10b0f4 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/signal.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/signal.vue
@@ -184,7 +184,7 @@ export default {
'signalList',
'sectionList',
'stationList',
- 'skinStyle'
+ 'skinCode'
]),
PhysicalSectionList() {
let list = [];
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/station.vue b/src/views/map/mapdraft/mapedit/mapoperate/station.vue
index 02603e3ed..cbd83a6df 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/station.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/station.vue
@@ -95,7 +95,7 @@ export default {
'stationList',
'sectionList',
'zcList',
- 'skinStyle'
+ 'skinCode'
]),
form() {
const form = {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue b/src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue
index eefe706e8..d6372ab95 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue
@@ -86,7 +86,7 @@ export default {
...mapGetters('map', [
'stationList',
'stationControlList',
- 'skinStyle'
+ 'skinCode'
]),
form() {
const form = {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue b/src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue
index 082950919..be0f52d28 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue
@@ -116,7 +116,7 @@ export default {
...mapGetters('map', [
'stationList',
'stationStandList',
- 'skinStyle'
+ 'skinCode'
]),
form() {
const form = {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/switch.vue b/src/views/map/mapdraft/mapedit/mapoperate/switch.vue
index 7668e2d29..e5d469290 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/switch.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/switch.vue
@@ -154,7 +154,7 @@ export default {
'sectionList',
'switchList',
'stationList',
- 'skinStyle'
+ 'skinCode'
])
},
watch: {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/text.vue b/src/views/map/mapdraft/mapedit/mapoperate/text.vue
index c652c9af7..6877826dc 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/text.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/text.vue
@@ -141,7 +141,7 @@ export default {
...mapGetters('map', [
'textList',
'stationList',
- 'skinStyle'
+ 'skinCode'
])
},
watch: {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/train.vue b/src/views/map/mapdraft/mapedit/mapoperate/train.vue
index 1f9c8af05..bcad125b2 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/train.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/train.vue
@@ -154,7 +154,7 @@ export default {
'sectionList',
'trainList',
'trainModelList',
- 'skinStyle'
+ 'skinCode'
]),
createRules: function () {
return {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/zcControl.vue b/src/views/map/mapdraft/mapedit/mapoperate/zcControl.vue
index d7015f04f..aeac42db1 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/zcControl.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/zcControl.vue
@@ -90,7 +90,7 @@ export default {
'sectionList',
'trainModelList',
'zcList',
- 'skinStyle'
+ 'skinCode'
]),
form() {
const form = {
diff --git a/src/views/map/mapdraft/mapmanage/create.vue b/src/views/map/mapdraft/mapmanage/create.vue
index fd72ab559..b0c0433ee 100644
--- a/src/views/map/mapdraft/mapmanage/create.vue
+++ b/src/views/map/mapdraft/mapmanage/create.vue
@@ -21,8 +21,8 @@
-
-
+
+
-
-
+
+
{
if (valid) {
updateMap(this.editModel).then(response => {
@@ -196,7 +196,7 @@ export default {
}
});
} else {
- this.updtModel.code = this.skinStyle;
+ this.updtModel.code = this.skinCode;
this.$refs['updt'].validate((valid) => {
if (valid) {
updateSkinStyleByCode(this.updtModel).then(response => {
diff --git a/src/views/map/mapdraft/mapmanage/maplist.vue b/src/views/map/mapdraft/mapmanage/maplist.vue
index fe7201663..b1ec65a32 100644
--- a/src/views/map/mapdraft/mapmanage/maplist.vue
+++ b/src/views/map/mapdraft/mapmanage/maplist.vue
@@ -31,12 +31,12 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/map/skinStyle/index.vue b/src/views/map/skinStyle/index.vue
deleted file mode 100644
index 71ad38679..000000000
--- a/src/views/map/skinStyle/index.vue
+++ /dev/null
@@ -1,124 +0,0 @@
-
-
-
-
- {{controlProps[item]}}
-
-
-
- 设置
- 退出
-
-
-
+
+
+
+ {{ controlProps[item] }}
+
+
+
+ 设置
+ 退出
+
+
+
\ No newline at end of file
+
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 637c2c0ab..6da125469 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -58,5 +58,5 @@
padding: 0px;
}
.el-radio{
- margin-right: 0;
+ margin-right: 20px;
}
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/index.vue b/src/views/map/mapdraft/mapedit/mapoperate/index.vue
index 001618cca..7cc5ad987 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/index.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/index.vue
@@ -229,7 +229,7 @@ import StationStandDraft from './stationstand';
import StationControlDraft from './stationcontrol';
import CounterDraft from './counter';
import DelayUnlockDraft from './delayunlock';
-import TrainDraft from './train';
+import TrainDraft from './train/index';
import LineDraft from './line';
import TextDraft from './text';
import TrainWindowDraft from './trainwindow';
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/train.vue b/src/views/map/mapdraft/mapedit/mapoperate/train.bak.vue
similarity index 100%
rename from src/views/map/mapdraft/mapedit/mapoperate/train.vue
rename to src/views/map/mapdraft/mapedit/mapoperate/train.bak.vue
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/train/create.vue b/src/views/map/mapdraft/mapedit/mapoperate/train/create.vue
new file mode 100644
index 000000000..a24e94592
--- /dev/null
+++ b/src/views/map/mapdraft/mapedit/mapoperate/train/create.vue
@@ -0,0 +1,147 @@
+
+
+
+ 创建
+ 批量创建
+
+
+
+
+
+
+
+
+
+
+ 添加
+ 更新
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/train/index.vue b/src/views/map/mapdraft/mapedit/mapoperate/train/index.vue
new file mode 100644
index 000000000..5c2e2d665
--- /dev/null
+++ b/src/views/map/mapdraft/mapedit/mapoperate/train/index.vue
@@ -0,0 +1,217 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/orderauthor/author/detail.vue b/src/views/orderauthor/author/detail.vue
index 3b25f31b8..b57a668fd 100644
--- a/src/views/orderauthor/author/detail.vue
+++ b/src/views/orderauthor/author/detail.vue
@@ -7,7 +7,7 @@
创建
批量创建
-
+
-
@@ -59,8 +59,8 @@ export default {
visible: false,
addModel: {
range: {
- beg: 0,
- end: 0
+ beg: 1,
+ end: 1
},
groupNumber: '',
modelCode: ''
@@ -132,7 +132,7 @@ export default {
break;
}
- this.$emit('dispatch', { callback: 'createBatch', params: list});
+ this.$emit('dispatch', { callback: 'create', params: list});
this.doClose();
}
}
From 72c1f1d4cabc86736d8d1ba5e7644aa9c948f43b Mon Sep 17 00:00:00 2001
From: ival <610568032@qq.com>
Date: Wed, 14 Aug 2019 13:48:06 +0800
Subject: [PATCH 018/172] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/map/mapdraft/mapedit/mapoperate/train/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/train/index.vue b/src/views/map/mapdraft/mapedit/mapoperate/train/index.vue
index 5c2e2d665..9b6f43326 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/train/index.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/train/index.vue
@@ -47,7 +47,7 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file
+
diff --git a/src/views/lesson/trainingmanage/draft.vue b/src/views/lesson/trainingmanage/draft.vue
index 408019276..c7f5d3f26 100644
--- a/src/views/lesson/trainingmanage/draft.vue
+++ b/src/views/lesson/trainingmanage/draft.vue
@@ -1,317 +1,327 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
+
diff --git a/src/views/lesson/trainingmanage/index.vue b/src/views/lesson/trainingmanage/index.vue
index 3f3d9d491..b941847a9 100644
--- a/src/views/lesson/trainingmanage/index.vue
+++ b/src/views/lesson/trainingmanage/index.vue
@@ -12,8 +12,6 @@
\ No newline at end of file
+
diff --git a/src/views/package/draft/ruleForm.vue b/src/views/package/draft/ruleForm.vue
index 5ee994efe..1c2fc5324 100644
--- a/src/views/package/draft/ruleForm.vue
+++ b/src/views/package/draft/ruleForm.vue
@@ -1,254 +1,261 @@
-
-
diff --git a/src/views/dashboard/echarts/lesson.vue b/src/views/dashboard/echarts/lesson.vue
index 122b3c509..d090944ae 100644
--- a/src/views/dashboard/echarts/lesson.vue
+++ b/src/views/dashboard/echarts/lesson.vue
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
+
diff --git a/src/views/map/runplan/chart.vue b/src/views/map/runplan/chart.vue
index 8d7fe3d83..8badca082 100644
--- a/src/views/map/runplan/chart.vue
+++ b/src/views/map/runplan/chart.vue
@@ -3,7 +3,7 @@
- 返回
+ {{$t('global.return')}}
@@ -195,12 +195,12 @@ export default {
this.myChart && this.myChart.hideLoading();
}).catch(() => {
this.myChart && this.myChart.hideLoading();
- this.$messageBox('获取运行图数据失败');
+ this.$messageBox(this.$t('error.obtainOperationGraphFailed'));
});
});
}).catch(() => {
this.myChart && this.myChart.hideLoading();
- this.$messageBox('获取车站列表失败');
+ this.$messageBox(this.$t('error.obtainStationListFailed'));
});
}
});
@@ -215,7 +215,7 @@ export default {
this.pushModels(this.option.series, this.PlanConvert.convertDataToModels(data, this.stations, this.kmRangeCoordMap, { width: 1 }));
this.loadInitData();
} catch (error) {
- this.$messageBox(`加载运行图数据失败`);
+ this.$messageBox(this.$t('error.loadingOperationGraphFailed'));
}
},
async loadInitData() {
@@ -312,9 +312,9 @@ export default {
const station = this.stations[Math.floor((param.data[1] - this.PlanConvert.EdgeHeight) / this.PlanConvert.CoordMultiple)] || { name: '', kmRange: '' };
return [
`Point Data
`, - `车站名称: ${station.name}
`, - `车站公里标: ${station.kmRange} km
`, - `到站时间: ${timeFormat(param.data[0] + this.PlanConvert.TranslationTime)} (${param.data[0]})
` + `${this.$t('map.stationName')}: ${station.name}
`, + `${this.$t('map.stationKilometerMark')}: ${station.kmRange} km
`, + `${this.$t('map.arrivalTime')}: ${timeFormat(param.data[0] + this.PlanConvert.TranslationTime)} (${param.data[0]})
` ].join(''); } }, diff --git a/src/views/map/runplan/draft/setting.vue b/src/views/map/runplan/draft/setting.vue index ee6ce592b..0eea20c7c 100644 --- a/src/views/map/runplan/draft/setting.vue +++ b/src/views/map/runplan/draft/setting.vue @@ -1,15 +1,15 @@ -
+
-
-
+
+
@@ -23,9 +23,9 @@
return {
dialogShow: false,
intervalList: [
- { code: '01', value: '1分制' },
- { code: '02', value: '2分制' },
- { code: '05', value: '5分制' },
+ { code: '01', value: this.$t('map.pointSystem1') },
+ { code: '02', value: this.$t('map.pointSystem2') },
+ { code: '05', value: this.$t('map.pointSystem5') },
],
formModel: {
timeArea: [new Date(2018, 10, 1), new Date(2018, 10, 1)],
@@ -36,7 +36,7 @@
rules() {
return {
timeArea: [
- { required: true, message: '请选择数据范围区间', trigger: 'change' }
+ { required: true, message: this.$t('map.selectDataRange'), trigger: 'change' }
]
}
}
@@ -77,4 +77,4 @@
border-bottom-width: 2px;
border-left-width: 2px;
}
-
\ No newline at end of file
+
diff --git a/src/views/map/runplan/manage/check.vue b/src/views/map/runplan/manage/check.vue
index dbf95c575..ca149251b 100644
--- a/src/views/map/runplan/manage/check.vue
+++ b/src/views/map/runplan/manage/check.vue
@@ -14,8 +14,8 @@
- 确 定
- 取 消
+ {{$t('global.confirm')}}
+ {{$t('global.cancel')}}
@@ -37,7 +37,7 @@ export default {
},
computed: {
title() {
- return '有效性检查';
+ return this.$t('map.validityCheck');
},
width() {
return 800;
diff --git a/src/views/map/runplan/manage/create.vue b/src/views/map/runplan/manage/create.vue
index 67fa08f4f..2c683a78a 100644
--- a/src/views/map/runplan/manage/create.vue
+++ b/src/views/map/runplan/manage/create.vue
@@ -1,8 +1,8 @@
-
+
-
-
+
-
+
{{ item.name }}
@@ -24,23 +24,23 @@
-
+
-
+
-
+
- 创建
- 更新
- 删除
+ {{$t('global.create')}}
+ {{$t('global.update')}}
+ {{$t('global.delete')}}
@@ -109,9 +109,9 @@ export default {
computed: {
title() {
if (this.isAdd) {
- return '创建实训类目';
+ return this.$t('map.createTrainingCategories');
} else if (this.isEdit) {
- return '编辑实训类目';
+ return this.$t('map.editTrainingCategories');
}
return '';
},
@@ -127,16 +127,16 @@ export default {
baseRules() {
return {
code: [
- { required: true, message: '请输入产品编码', trigger: 'change' }
+ { required: true, message: this.$t('map.productCodeEnter'), trigger: 'change' }
],
name: [
- { required: true, message: '请输入产品名称', trigger: 'change' }
+ { required: true, message: this.$t('map.productNameEnter'), trigger: 'change' }
],
remarks: [
- { required: true, message: '请输入产品说明', trigger: 'change' }
+ { required: true, message: this.$t('map.productDescriptionEnter'), trigger: 'change' }
],
trainTypes: [
- { required: true, message: '请选择关联实训类型', trigger: 'change' }
+ { required: true, message: this.$t('map.trainingTypeSelect'), trigger: 'change' }
]
};
}
@@ -208,9 +208,9 @@ export default {
createTrainingCategory(data).then(response => {
this.initTrainTypes = this.addModel.trainTypes;
this.$emit('refresh', [localStore.get('cityCode') || '', localStore.get('mapId') || '']);
- this.$message.success('创建产品成功');
+ this.$message.success(this.$t('tip.productCreationSuccessfully'));
}).catch(() => {
- this.$messageBox('创建产品失败');
+ this.$messageBox(this.$t('tip.productCreationFailed'));
});
}
});
@@ -220,10 +220,10 @@ export default {
if (valid) {
updateTrainingCategory(this.addModel).then(response => {
this.initTrainTypes = this.addModel.trainTypes;
- this.$message.success('更新产品成功');
+ this.$message.success(this.$t('tip.updateProductSuccessfully'));
// this.$emit('refresh', [localStore.get('cityCode') || '', localStore.get('mapId') || '']);
}).catch(() => {
- this.$messageBox('更新产品失败');
+ this.$messageBox(this.$t('tip.updateProductFailed'));
});
}
});
@@ -233,7 +233,7 @@ export default {
this.initTrainTypes.forEach(elem => {
if (this.addModel.trainTypes.indexOf(elem) < 0) {
this.addModel.trainTypes = this.initTrainTypes;
- this.$messageBox('不能缩小上次创建的实训列表的范围');
+ this.$messageBox(this.$t('error.cannotNarrowDown'));
}
});
}
@@ -242,15 +242,15 @@ export default {
this.$refs.form.validate((valid) => {
if (valid) {
deleteTrainingCategory(this.addModel).then(response => {
- this.$message.success('删除产品成功');
+ this.$message.success(this.$t('tip.deleteProductSuccessfully'));
this.$refs.form.resetFields();
this.node = null;
this.$emit('refresh', [localStore.get('cityCode') || '', localStore.get('mapId') || '']);
}).catch(error => {
if (error.code === 500009) {
- this.$messageBox('产品已被使用无法删除');
+ this.$messageBox(this.$t('tip.cannotDeleteProduct'));
} else {
- this.$messageBox('删除产品失败');
+ this.$messageBox(this.$t('tip.deleteProductFailed'));
}
});
}
diff --git a/src/views/map/product/list.vue b/src/views/map/product/list.vue
index f76fceb6b..d7f857546 100644
--- a/src/views/map/product/list.vue
+++ b/src/views/map/product/list.vue
@@ -26,11 +26,11 @@ export default {
queryObject: {
name: {
type: 'text',
- label: '名称'
+ label: this.$t('map.name')
},
cityCode: {
type: 'select',
- label: '所属城市',
+ label: this.$t('map.selectCity'),
config: {
data: []
}
@@ -44,37 +44,37 @@ export default {
indexShow: true,
columns: [
{
- title: '地图名称',
+ title: this.$t('map.mapName'),
prop: 'name'
},
{
- title: '皮肤类型',
+ title: this.$t('map.skinType'),
prop: 'skinCode',
type: 'tag',
columnValue: (row) => { return this.$convertField(row.skinCode, this.skinCodeList, ['code', 'name']); },
tagType: (row) => { return ''; }
},
{
- title: '更新时间',
+ title: this.$t('map.turnoverTime'),
prop: 'updateTime'
},
{
type: 'button',
- title: '操作',
+ title: this.$t('global.operate'),
width: '250',
buttons: [
{
- name: '产品列表',
+ name: this.$t('map.productList'),
handleClick: this.handleList,
type: ''
},
{
- name: '修改',
+ name: this.$t('global.modify'),
handleClick: this.handleEdit,
type: 'warning'
},
{
- name: '删除',
+ name: this.$t('global.delete'),
handleClick: this.handleDelete,
type: 'danger'
}
@@ -82,7 +82,7 @@ export default {
}
],
actions: [
- { text: '新增', btnCode: 'employee_insert', handler: this.handleAdd }
+ { text: this.$t('global.add'), btnCode: 'employee_insert', handler: this.handleAdd }
]
},
currentModel: {}
@@ -105,7 +105,7 @@ export default {
this.queryForm.queryObject.cityCode.config.data.push({ value: elem.code, label: elem.name });
});
}).catch(() => {
- this.$messageBox('加载城市列表失败');
+ this.$messageBox(this.$t('error.loadingCityListFailed'));
});
this.skinCodeList = [];
@@ -130,18 +130,18 @@ export default {
// 删除
handleDelete(index, row) {
- this.$confirm('此操作将删除该类型, 是否继续?', '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
+ this.$confirm(this.$t('map.deleteTypeHint'), this.$t('tip.hint'), {
+ confirmButtonText: this.$t('tip.confirm'),
+ cancelButtonText: this.$t('tip.cancel'),
type: 'warning'
}).then(() => {
delPublishMap(row.id).then(response => {
- this.$message.success('删除成功');
+ this.$message.success(this.$t('tip.successfullyDelete'));
this.reloadTable();
localStore.remove('mapId');
}).catch(() => {
this.reloadTable();
- this.$messageBox('删除失败');
+ this.$messageBox(this.$t('tip.failDelete'));
});
}).catch(() => { });
},
diff --git a/src/views/map/skinStyle/draft.vue b/src/views/map/skinStyle/draft.vue
index c71a06165..4e0f512a6 100644
--- a/src/views/map/skinStyle/draft.vue
+++ b/src/views/map/skinStyle/draft.vue
@@ -12,8 +12,8 @@
- 创建
- 更新
+ {{$t('global.create')}}
+ {{$t('global.update')}}
@@ -47,10 +47,10 @@ export default {
computed: {
title() {
if (this.isAdd) {
- return '添加地图皮肤';
+ return this.$t('map.addMapSkin');
}
if (this.isEdit) {
- return '更新地图皮肤';
+ return this.$t('map.updateMapSkin');
}
return '';
},
@@ -71,13 +71,13 @@ export default {
const form = {
labelWidth: '140px',
items: [
- { prop: 'code', label: '皮肤编码', type: 'text', required: false, disabled: this.isDisabled },
- { prop: 'name', label: '皮肤名称', type: 'text', required: false },
- { prop: 'origin', label: '原点坐标', type: 'point', required: false },
- { prop: 'scaling', label: '缩放比例', type: 'number', required: false, message: `(缩放比例最大为8级)` },
- { prop: 'linkWidth', label: 'link宽度', type: 'number', required: false, message: `(Link宽度最大为20)` },
- { prop: 'zoneWidth', label: '区段宽度', type: 'number', required: false, message: `(区段宽度最大为30)` },
- { prop: 'watermarkShow', label: '是否显示水印', type: 'radio', required: false, options: this.$ConstSelect.Whether }
+ { prop: 'code', label: this.$t('map.skinCoding'), type: 'text', required: false, disabled: this.isDisabled },
+ { prop: 'name', label: this.$t('map.skinDesignation'), type: 'text', required: false },
+ { prop: 'origin', label: this.$t('map.coordinatesOrigin'), type: 'point', required: false },
+ { prop: 'scaling', label: this.$t('map.scaling'), type: 'number', required: false, message: this.$t('map.maxScaling') },
+ { prop: 'linkWidth', label: this.$t('map.linkWidth'), type: 'number', required: false, message: this.$t('map.maxLinkWidth') },
+ { prop: 'zoneWidth', label: this.$t('map.sectionWidth'), type: 'number', required: false, message: this.$t('map.maxSectionWidth') },
+ { prop: 'watermarkShow', label: this.$t('map.showWatermarkOrNot'), type: 'radio', required: false, options: this.$ConstSelect.Whether }
]
};
return form;
@@ -86,55 +86,55 @@ export default {
rules() {
const baseRules = {
code: [
- { required: true, message: '请输入皮肤编码', trigger: 'blur' }
+ { required: true, message: this.$t('map.skinCodingInput'), trigger: 'blur' }
],
name: [
- { required: true, message: '请输入皮肤名称', trigger: 'blur' }
+ { required: true, message: this.$t('map.skinDesignationInput'), trigger: 'blur' }
],
origin: [
- { required: true, message: '请输入原点坐标', trigger: 'blur' }
+ { required: true, message: this.$t('map.coordinatesOriginInput'), trigger: 'blur' }
],
scaling: [
- { required: true, message: '请输入缩放比例', trigger: 'blur' },
+ { required: true, message: this.$t('map.scalingInput'), trigger: 'blur' },
{
validator(rule, value, callback) {
if (Number(value) >= 1 && Number(value) <= 8) {
callback();
} else {
- callback(new Error('请输入有效的缩放比例'));
+ callback(new Error(this.$t('map.scalingInputPrompt')));
}
},
trigger: 'blur'
}
],
linkWidth: [
- { required: true, message: '请输入Link宽度', trigger: 'blur' },
+ { required: true, message: this.$t('map.linkWidthInput'), trigger: 'blur' },
{
validator(rule, value, callback) {
if (Number.isInteger(Number(value)) && Number(value) >= 5 && Number(value) <= 20) {
callback();
} else {
- callback(new Error('请输入有效Link宽度'));
+ callback(new Error(this.$t('map.linkWidthInputPrompt')));
}
},
trigger: 'blur'
}
],
zoneWidth: [
- { required: true, message: '请输入区段宽度', trigger: 'blur' },
+ { required: true, message: this.$t('map.sectionWidthInput'), trigger: 'blur' },
{
validator(rule, value, callback) {
if (Number.isInteger(Number(value)) && Number(value) >= 5 && Number(value) <= 30) {
callback();
} else {
- callback(new Error('请输入有效区段宽度'));
+ callback(new Error(this.$t('map.sectionWidthInputPrompt')));
}
},
trigger: 'blur'
}
],
watermarkShow: [
- { required: true, message: '请选择是否水印', trigger: 'change' }
+ { required: true, message: this.$t('map.selectShowWatermark'), trigger: 'change' }
]
};
@@ -184,12 +184,12 @@ export default {
querySkinCodeExistByCode(this.formModel.code).then(resp => {
addSkinCode(this.formModel).then(response => {
this.turnback();
- this.$message.success('创建成功');
+ this.$message.success(this.$t('tip.creatingSuccessful'));
}).catch(() => {
- this.$messageBox('创建失败');
+ this.$messageBox(this.$t('tip.creatingFailed'));
});
}).catch(() => {
- this.$messageBox('地图皮肤编码已存在');
+ this.$messageBox(this.$t('map.skinCodingExist'));
});
});
},
@@ -198,9 +198,9 @@ export default {
this.$refs.dataform.validateForm(() => {
updateSkinCode(this.formModel).then(response => {
this.turnback();
- this.$message.success('更新成功');
+ this.$message.success(this.$t('tip.updateSuccessfully'));
}).catch(() => {
- this.$messageBox('更新失败');
+ this.$messageBox(this.$t('tip.updateFailed'));
});
});
},
diff --git a/src/views/map/skinStyle/index.vue b/src/views/map/skinStyle/index.vue
index 7b81a74b9..8fdf371cd 100644
--- a/src/views/map/skinStyle/index.vue
+++ b/src/views/map/skinStyle/index.vue
@@ -25,11 +25,11 @@ export default {
queryObject: {
name: {
type: 'text',
- label: '皮肤名称'
+ label: this.$t('map.skinDesignation'),
},
code: {
type: 'text',
- label: '皮肤编码'
+ label: this.$t('map.skinCoding'),
}
}
},
@@ -39,34 +39,34 @@ export default {
indexShow: true,
columns: [
{
- title: '皮肤编码',
+ title: this.$t('map.skinCoding'),
prop: 'code'
},
{
- title: '皮肤名称',
+ title: this.$t('map.skinDesignation'),
prop: 'name'
},
{
- title: '原点坐标',
+ title: this.$t('map.coordinatesOrigin'),
prop: 'origin',
type: 'tag',
columnValue: (row) => { return `(${row.origin.x}, ${row.origin.y})`; },
tagType: () => { return ''; }
},
{
- title: 'Link宽度',
+ title: this.$t('map.linkWidth'),
prop: 'linkWidth'
},
{
- title: '区段宽度',
+ title: this.$t('map.sectionWidth'),
prop: 'zoneWidth'
},
{
- title: '缩放比例',
+ title: this.$t('map.scalingColon'),
prop: 'scaling'
},
{
- title: '是否显示水印',
+ title: this.$t('map.showWatermarkOrNot'),
prop: 'watermarkShow',
type: 'tag',
columnValue: (row) => { return this.$ConstSelect.translate(row.watermarkShow, 'Whether'); },
@@ -76,16 +76,16 @@ export default {
},
{
type: 'button',
- title: '操作',
+ title: this.$t('global.operate'),
width: '250',
buttons: [
{
- name: '编辑',
+ name: this.$t('global.edit'),
handleClick: this.handleEdit,
type: ''
},
{
- name: '删除',
+ name: this.$t('global.delete'),
handleClick: this.handleDelete,
type: 'danger'
}
@@ -93,7 +93,7 @@ export default {
}
],
actions: [
- { text: '新增', handler: this.handleAdd }
+ { text: this.$t('global.add'), handler: this.handleAdd }
]
}
};
@@ -120,15 +120,15 @@ export default {
this.$router.push(`${UrlConfig.map.skinCodeDraft}/edit/${row.id}`);
},
handleDelete(index, row) {
- this.$confirm('此操作将永久删除该皮肤, 是否继续?', '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
+ this.$confirm(this.$t('map.skinDeleteConfirmation'), this.$t('tip.hint'), {
+ confirmButtonText: this.$t('tip.confirm'),
+ cancelButtonText: this.$t('tip.cancel'),
type: 'warning'
}).then(() => {
delSkinCode(row.id).then(() => {
- this.$message.success('删除皮肤成功');
+ this.$message.success(this.$t('tip.skinDeleteSuccessfully'));
}).catch(() => {
- this.$messageBox('删除皮肤失败');
+ this.$messageBox(this.$t('tip.skinDeleteFailed'));
});
}).catch(() => {
});
From 9787c8aaeb41492964a824bf1fc11c4cc94cf9bf Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Thu, 15 Aug 2019 10:47:59 +0800
Subject: [PATCH 025/172] =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9A=E5=9B=BD?=
=?UTF-8?q?=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/map/skinCode/draft.vue | 38 ++++++++++++++++----------------
src/views/map/skinCode/index.vue | 30 ++++++++++++-------------
2 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/src/views/map/skinCode/draft.vue b/src/views/map/skinCode/draft.vue
index 84b270b4b..599cfd8b6 100644
--- a/src/views/map/skinCode/draft.vue
+++ b/src/views/map/skinCode/draft.vue
@@ -12,9 +12,9 @@
- 创建
- 更新
- 返回
+ {{$t('global.create')}}
+ {{$t('global.update')}}
+ {{$t('global.return')}}
@@ -48,10 +48,10 @@ export default {
computed: {
title() {
if (this.isAdd) {
- return '添加地图皮肤';
+ return this.$t('map.addMapSkin');
}
if (this.isEdit) {
- return '更新地图皮肤';
+ return this.$t('map.updateMapSkin');
}
return '';
},
@@ -68,10 +68,10 @@ export default {
const form = {
labelWidth: '140px',
items: [
- { prop: 'code', label: '皮肤编码', type: 'text', required: false, disabled: this.isDisabled },
- { prop: 'name', label: '皮肤名称', type: 'text', required: false },
- { prop: 'origin', label: '原点坐标', type: 'point', required: false },
- { prop: 'scaling', label: '缩放比例', type: 'number', required: false, message: `(缩放比例最大为8级)` }
+ { prop: 'code', label: this.$t('map.skinCoding'), type: 'text', required: false, disabled: this.isDisabled },
+ { prop: 'name', label: this.$t('map.skinDesignation'), type: 'text', required: false },
+ { prop: 'origin', label: this.$t('map.coordinatesOrigin'), type: 'point', required: false },
+ { prop: 'scaling', label: this.$t('map.scaling'), type: 'number', required: false, message: this.$t('map.maxScaling') }
]
};
return form;
@@ -80,22 +80,22 @@ export default {
rules() {
const baseRules = {
code: [
- { required: true, message: '请输入皮肤编码', trigger: 'blur' }
+ { required: true, message: this.$t('map.skinCodingInput'), trigger: 'blur' }
],
name: [
- { required: true, message: '请输入皮肤名称', trigger: 'blur' }
+ { required: true, message: this.$t('map.skinDesignationInput'), trigger: 'blur' }
],
origin: [
- { required: true, message: '请输入原点坐标', trigger: 'blur' }
+ { required: true, message: this.$t('map.coordinatesOriginInput'), trigger: 'blur' }
],
scaling: [
- { required: true, message: '请输入缩放比例', trigger: 'blur' },
+ { required: true, message: this.$t('map.scalingInput'), trigger: 'blur' },
{
validator(rule, value, callback) {
if (Number(value) >= 1 && Number(value) <= 8) {
callback();
} else {
- callback(new Error('请输入有效的缩放比例'));
+ callback(new Error(this.$t('map.scalingInputPrompt')));
}
},
trigger: 'blur'
@@ -146,12 +146,12 @@ export default {
querySkinCodeExistByCode(this.formModel.code).then(resp => {
addSkinCode(this.formModel).then(response => {
this.turnback();
- this.$message.success('创建成功');
+ this.$message.success(this.$t('tip.creatingSuccessful'));
}).catch(() => {
- this.$messageBox('创建失败');
+ this.$messageBox(this.$t('tip.creatingFailed'));
});
}).catch(() => {
- this.$messageBox('地图皮肤编码已存在');
+ this.$messageBox(this.$t('map.skinCodingExist'));
});
});
},
@@ -160,9 +160,9 @@ export default {
this.$refs.dataform.validateForm(() => {
updateSkinCode(this.formModel).then(response => {
this.turnback();
- this.$message.success('更新成功');
+ this.$message.success(this.$t('tip.updateSuccessfully'));
}).catch(() => {
- this.$messageBox('更新失败');
+ this.$messageBox(this.$t('tip.updateFailed'));
});
});
},
diff --git a/src/views/map/skinCode/index.vue b/src/views/map/skinCode/index.vue
index 1c1eb50a1..278b0c009 100644
--- a/src/views/map/skinCode/index.vue
+++ b/src/views/map/skinCode/index.vue
@@ -25,11 +25,11 @@ export default {
queryObject: {
name: {
type: 'text',
- label: '皮肤名称'
+ label: this.$t('map.skinDesignation')
},
code: {
type: 'text',
- label: '皮肤编码'
+ label: this.$t('map.skinCoding')
}
}
},
@@ -39,36 +39,36 @@ export default {
indexShow: true,
columns: [
{
- title: '皮肤编码',
+ title: this.$t('map.skinCoding'),
prop: 'code'
},
{
- title: '皮肤名称',
+ title: this.$t('map.skinDesignation'),
prop: 'name'
},
{
- title: '原点坐标',
+ title: this.$t('map.coordinatesOrigin'),
prop: 'origin',
type: 'tag',
columnValue: (row) => { return `(${row.origin.x}, ${row.origin.y})`; },
tagType: () => { return ''; }
},
{
- title: '缩放比例',
+ title: this.$t('map.scalingColon'),
prop: 'scaling'
},
{
type: 'button',
- title: '操作',
+ title: this.$t('global.operate'),
width: '250',
buttons: [
{
- name: '编辑',
+ name: this.$t('global.edit'),
handleClick: this.handleEdit,
type: ''
},
{
- name: '删除',
+ name: this.$t('global.delete'),
handleClick: this.handleDelete,
type: 'danger'
}
@@ -76,7 +76,7 @@ export default {
}
],
actions: [
- { text: '新增', handler: this.handleAdd }
+ { text: this.$t('global.add'), handler: this.handleAdd }
]
}
};
@@ -103,15 +103,15 @@ export default {
this.$router.push(`${UrlConfig.map.skinCodeDraft}/edit/${row.id}`);
},
handleDelete(index, row) {
- this.$confirm('此操作将永久删除该皮肤, 是否继续?', '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
+ this.$confirm(this.$t('map.skinDeleteConfirmation'), this.$t('tip.hint'), {
+ confirmButtonText: this.$t('tip.confirm'),
+ cancelButtonText: this.$t('tip.cancel'),
type: 'warning'
}).then(() => {
delSkinCode(row.id).then(() => {
- this.$message.success('删除皮肤成功');
+ this.$message.success(this.$t('tip.skinDeleteSuccessfully'),);
}).catch(() => {
- this.$messageBox('删除皮肤失败');
+ this.$messageBox(this.$t('tip.skinDeleteFailed'));
});
}).catch(() => {
});
From d4ba56d31d57cf0e13c9ed25980ba5383739d254 Mon Sep 17 00:00:00 2001
From: ival <610568032@qq.com>
Date: Thu, 15 Aug 2019 14:28:31 +0800
Subject: [PATCH 026/172] =?UTF-8?q?=E4=BF=AE=E8=AF=A5=E6=9F=A5=E8=AF=A2?=
=?UTF-8?q?=E8=BF=9B=E8=B7=AF=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/jmap/mapdraft.js | 10 +-
src/api/statistics.js | 87 +++++++
src/views/dashboard/echarts/demonstration.vue | 32 +--
src/views/dashboard/echarts/exam.vue | 226 ++++++++++++++++++
src/views/dashboard/echarts/lesson.vue | 141 ++---------
src/views/dashboard/index.vue | 147 +++++++++++-
.../mapdraft/mapedit/routeoperate/detail.vue | 4 +-
7 files changed, 497 insertions(+), 150 deletions(-)
create mode 100644 src/api/statistics.js
diff --git a/src/api/jmap/mapdraft.js b/src/api/jmap/mapdraft.js
index afd3b8add..ccd219bb9 100644
--- a/src/api/jmap/mapdraft.js
+++ b/src/api/jmap/mapdraft.js
@@ -116,29 +116,29 @@ export function listRouteMapRoute(mapId) {
/** 查询进路明细*/
export function queryRouteRouteDetail(data) {
return request({
- url: `/api/mapBuild/${data.mapId}/route/${data.id}`,
+ url: `/api/mapBuild/route/${data.id}`,
method: 'get'
});
}
/** 创建进路*/
export function createRouteRoute(data) {
return request({
- url: `/api/mapBuild/${data.mapId}/route`,
+ url: `/api/mapBuild/route`,
method: 'post',
data: data
});
}
/** 删除进路*/
-export function deleteRouteRoute(mapId, id) {
+export function deleteRouteRoute(id) {
return request({
- url: `/api/mapBuild/${mapId}/route/${id}`,
+ url: `/api/mapBuild/route/${id}`,
method: 'delete'
});
}
/** 更新进路*/
export function updateRouteRoute(data) {
return request({
- url: `/api/mapBuild/${data.mapId}/route/${data.id}`,
+ url: `/api/mapBuild/route/${data.id}`,
method: 'put',
data: data
});
diff --git a/src/api/statistics.js b/src/api/statistics.js
new file mode 100644
index 000000000..1d6cb7633
--- /dev/null
+++ b/src/api/statistics.js
@@ -0,0 +1,87 @@
+import request from '@/utils/request';
+
+// 课程列表
+export function getLessonList(code) {
+ return request({
+ url: '/api/stats/lesson/list',
+ method: 'get',
+ params: {
+ wmCode: code
+ }
+ });
+}
+
+// 课程内实训数据统计
+export function getLessonTimeChart(data) {
+ return request({
+ url: `/api/stats/lesson/${data.id}/stats`,
+ method: 'get',
+ params: {
+ wmCode: data.code
+ }
+ });
+}
+
+// 查询参与考试的课程列表
+export function getExamTree(code) {
+ return request({
+ url: '/api/stats/exam/lessonList',
+ method: 'get',
+ params: {
+ wmCode: code
+ }
+ });
+}
+
+// 查询参与考试的试题列表
+export function getstatsExamList(data) {
+ return request({
+ url: `/api/stats/exam/${data.lessonId}/list`,
+ method: 'get',
+ params: {
+ wmCode: data.code
+ }
+ });
+}
+
+// 个人考试数据统计
+export function getExamChart(data) {
+ return request({
+ url: `/api/stats/exam/${data.examId}/stats`,
+ method: 'get',
+ params: {
+ wmCode: data.code
+ }
+ });
+}
+
+// 仿真地图下产品列表
+export function getSimulationPrdList(mapId, code) {
+ return request({
+ url: `/api/stats/simulation/${mapId}/prdList`,
+ method: 'get',
+ params: {
+ wmCode: code
+ }
+ });
+}
+// 仿真时长排名
+export function getSimulationTimeList(data) {
+ return request({
+ url: `/api/stats/simulation/${data.prdCode}/rank`,
+ method: 'get',
+ params: {
+ wmCode: data.code
+ }
+ });
+}
+// 个人仿真数据统计
+export function getSimulationTimeChart(data) {
+ return request({
+ url: `/api/stats/simulation/${data.mapId}/stats`,
+ method: 'get',
+ params: {
+ wmCode: data.code
+ }
+ });
+}
diff --git a/src/views/dashboard/echarts/demonstration.vue b/src/views/dashboard/echarts/demonstration.vue
index c58962899..c84959fc2 100644
--- a/src/views/dashboard/echarts/demonstration.vue
+++ b/src/views/dashboard/echarts/demonstration.vue
@@ -14,21 +14,25 @@ export default {
size: {
type: Object,
required: true
+ },
+ info: {
+ type: Object,
+ required: true
}
},
data() {
return {
option: {
- backgroundColor: '#394056',
+ backgroundColor: this.info.backgroundColor,
title: {
top: 20,
- text: 'Requests',
+ text: this.info.title.text,
textStyle: {
fontWeight: 'normal',
- fontSize: 16,
- color: '#F1F1F3'
+ fontSize: 18,
+ color: '#000000'
},
- left: '1%'
+ left: 'center'
},
tooltip: {
trigger: 'axis',
@@ -44,11 +48,11 @@ export default {
itemWidth: 14,
itemHeight: 5,
itemGap: 13,
- data: ['CMCC', 'CTCC', 'CUCC'],
+ data: this.info.legend.data,
right: '4%',
textStyle: {
fontSize: 12,
- color: '#F1F1F3'
+ color: '#C0C0C0'
}
},
grid: {
@@ -60,17 +64,17 @@ export default {
},
xAxis: [{
type: 'category',
- boundaryGap: false,
+ boundaryGap: true,
axisLine: {
lineStyle: {
color: '#57617B'
}
},
- data: ['13:00', '13:05', '13:10', '13:15', '13:20', '13:25', '13:30', '13:35', '13:40', '13:45', '13:50', '13:55']
+ data: this.info.xAxis.data
}],
yAxis: [{
type: 'value',
- name: '(%)',
+ name: '(s)',
axisTick: {
show: false
},
@@ -93,7 +97,7 @@ export default {
}],
series: [{
name: 'CMCC',
- type: 'line',
+ type: 'bar',
smooth: true,
symbol: 'circle',
symbolSize: 5,
@@ -127,7 +131,7 @@ export default {
data: [220, 182, 191, 134, 150, 120, 110, 125, 145, 122, 165, 122]
}, {
name: 'CTCC',
- type: 'line',
+ type: 'bar',
smooth: true,
symbol: 'circle',
symbolSize: 5,
@@ -161,7 +165,7 @@ export default {
data: [120, 110, 125, 145, 122, 165, 122, 220, 182, 191, 134, 150]
}, {
name: 'CUCC',
- type: 'line',
+ type: 'bar',
smooth: true,
symbol: 'circle',
symbolSize: 5,
@@ -199,7 +203,7 @@ export default {
},
computed: {
width() {
- return parseInt(this.size.width) * 2;
+ return parseInt(this.size.width) * 2 + 5;
},
height() {
return this.size.height;
diff --git a/src/views/dashboard/echarts/exam.vue b/src/views/dashboard/echarts/exam.vue
index e69de29bb..43c41cb00 100644
--- a/src/views/dashboard/echarts/exam.vue
+++ b/src/views/dashboard/echarts/exam.vue
@@ -0,0 +1,226 @@
+
+
+
+
+
diff --git a/src/views/dashboard/echarts/lesson.vue b/src/views/dashboard/echarts/lesson.vue
index d090944ae..2b186ec9c 100644
--- a/src/views/dashboard/echarts/lesson.vue
+++ b/src/views/dashboard/echarts/lesson.vue
@@ -1,5 +1,5 @@
-
+
+
diff --git a/src/views/dashboard/echarts/lesson.vue b/src/views/dashboard/echarts/lesson.vue
index 2b186ec9c..48375aac8 100644
--- a/src/views/dashboard/echarts/lesson.vue
+++ b/src/views/dashboard/echarts/lesson.vue
@@ -4,6 +4,7 @@
+
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 53e62349d..9cb824874 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -1,6 +1,6 @@
diff --git a/src/views/orderauthor/permission/draft/ruleForm.vue b/src/views/orderauthor/permission/draft/ruleForm.vue
index a1433e00f..b0f4c6bb4 100644
--- a/src/views/orderauthor/permission/draft/ruleForm.vue
+++ b/src/views/orderauthor/permission/draft/ruleForm.vue
@@ -38,7 +38,7 @@
-
+ {{tip}}
- - -
+
\ No newline at end of file
+
diff --git a/src/views/mapsystem/plugin/src/tip.vue b/src/views/mapsystem/plugin/src/tip.vue
index 1b9ece1ae..d571475c6 100644
--- a/src/views/mapsystem/plugin/src/tip.vue
+++ b/src/views/mapsystem/plugin/src/tip.vue
@@ -1,24 +1,24 @@
-
+
+ {{ tip }}
+ +
-
+ {{tip}}
-
+
\ No newline at end of file
+export default {
+ name: 'Tip',
+ props: {
+ tip: {
+ type: String,
+ required: true
+ }
+ },
+ data() {
+ return {
+ defaultFontSize: 14
+ };
+ },
+ methods: {
+ }
+};
+
From e0d76d03c5c8165ba6567934e0e2c367de5ca9ff Mon Sep 17 00:00:00 2001
From: ival <610568032@qq.com>
Date: Tue, 13 Aug 2019 18:26:36 +0800
Subject: [PATCH 013/172] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=90=E8=A1=8C?=
=?UTF-8?q?=E5=9B=BE=E5=8F=B3=E9=94=AE=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/map/runplan/manage/operateMenu.vue | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/views/map/runplan/manage/operateMenu.vue b/src/views/map/runplan/manage/operateMenu.vue
index 5b2c743c1..33a7045db 100644
--- a/src/views/map/runplan/manage/operateMenu.vue
+++ b/src/views/map/runplan/manage/operateMenu.vue
@@ -37,7 +37,6 @@ export default {
},
data() {
return {
- menuShow: false,
menu1: [
{
label: '创建运行图',
@@ -72,7 +71,7 @@ export default {
},
selected: function (val) {
if (val.type === 'skin') this.menu = this.menu1;
- if (val.type === 'rpd') this.menu = this.menu2;
+ if (val.type === 'plan') this.menu = this.menu2;
}
},
mounted() {
@@ -86,13 +85,11 @@ export default {
if (this.$refs && this.$refs.popMenu) {
this.$refs.popMenu.resetShowPosition(point);
}
- this.menuShow = true;
},
doClose() {
if (this.$refs && this.$refs.popMenu) {
this.$refs.popMenu.close();
}
- this.menuShow = false;
},
createChart() {
this.doClose();
From 4e88c023637298b26366f22e4fada0113efb975b Mon Sep 17 00:00:00 2001
From: ival <610568032@qq.com>
Date: Wed, 14 Aug 2019 09:33:24 +0800
Subject: [PATCH 014/172] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=AE=E5=BD=95?=
=?UTF-8?q?=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/jmap/config/skinCode/batong_01.js | 16 +
src/jmap/config/skinCode/bejing_01.js | 556 +++++++++++++++++++++++++
src/jmap/config/skinCode/chengdu_03.js | 545 ++++++++++++++++++++++++
src/jmap/config/skinCode/chengdu_04.js | 543 ++++++++++++++++++++++++
src/jmap/config/skinCode/fuzhou_01.js | 454 ++++++++++++++++++++
src/views/map/skinCode/draft.vue | 217 ++++++++++
src/views/map/skinCode/index.vue | 124 ++++++
7 files changed, 2455 insertions(+)
create mode 100644 src/jmap/config/skinCode/batong_01.js
create mode 100644 src/jmap/config/skinCode/bejing_01.js
create mode 100644 src/jmap/config/skinCode/chengdu_03.js
create mode 100644 src/jmap/config/skinCode/chengdu_04.js
create mode 100644 src/jmap/config/skinCode/fuzhou_01.js
create mode 100644 src/views/map/skinCode/draft.vue
create mode 100644 src/views/map/skinCode/index.vue
diff --git a/src/jmap/config/skinCode/batong_01.js b/src/jmap/config/skinCode/batong_01.js
new file mode 100644
index 000000000..893b5d1e5
--- /dev/null
+++ b/src/jmap/config/skinCode/batong_01.js
@@ -0,0 +1,16 @@
+import defaultStyle from '../defaultStyle';
+import deviceType from '../../constant/deviceType';
+
+class SkinStyle extends defaultStyle {
+ constructor() {
+ super();
+ this[deviceType.Link] = {
+ lineWidthColor: '#FFFFFF', // line 颜色
+ linkWidth: 4.4, // link 宽度
+ linkColor: '#3F3F3F', // link 线条颜色
+ linkTextColor: '#FFFFFF' // link 字体颜色
+ };
+ }
+}
+
+export default new SkinStyle();
diff --git a/src/jmap/config/skinCode/bejing_01.js b/src/jmap/config/skinCode/bejing_01.js
new file mode 100644
index 000000000..710a1a982
--- /dev/null
+++ b/src/jmap/config/skinCode/bejing_01.js
@@ -0,0 +1,556 @@
+import defaultStyle from '../defaultStyle';
+import deviceType from '../../constant/deviceType';
+
+class SkinStyle extends defaultStyle {
+ constructor() {
+ super();
+ this[deviceType.Link] = {
+ lineWidthColor: '#FFFFFF', // line 颜色
+ linkWidth: 4.4, // link 宽度
+ linkColor: '#3F3F3F', // link 线条颜色
+ linkTextColor: '#FFFFFF' // link 字体颜色
+ };
+
+ this[deviceType.Section] = {
+ text: {
+ position: -1, // 区段名称位置 1 上面 -1 下面 0 对称
+ distance: 11, // 文字离区段距离
+ fontSize: 11, // 字体大小
+ fontWeight: 'normal', // 字体粗细
+ fontColor: '#FFFFFF', // 字体颜色
+ textAlign: 'center', // 水平对齐方式
+ textPosition: 'inside', // 文字位置
+ textVerticalAlign: 'middle' // 文字垂直对齐方式
+ },
+ logicText: {
+ position: -1, // 区段名称位置 1 上面 -1 下面 0 对称
+ distance: 11, // 文字离区段距离
+ fontSize: 11, // 字体大小
+ fontWeight: 'normal', // 字体粗细
+ fontColor: '#FFFFFF', // 字体颜色
+ textAlign: 'center', // 水平对齐方式
+ textPosition: 'inside', // 文字位置
+ textVerticalAlign: 'middle' // 文字垂直对齐方式
+ },
+ standText: {
+ opposite: true, // 对称相反
+ position: 1, // 区段名称位置 1 上面 -1 下面 0 对称
+ distance: 11, // 文字离区段距离
+ fontSize: 11, // 字体大小
+ fontWeight: 'normal', // 字体粗细
+ fontColor: '#FFFFFF', // 字体颜色
+ textAlign: 'center', // 水平对齐方式
+ textPosition: 'inside', // 文字位置
+ textVerticalAlign: 'middle' // 文字垂直对齐方式
+ },
+ reentryText: {
+ opposite: true, // 对称相反
+ position: 1, // 区段名称位置 1 上面 -1 下面 0 对称
+ distance: 11, // 文字离区段距离
+ fontSize: 11, // 字体大小
+ fontWeight: 'normal', // 字体粗细
+ fontColor: '#FFFFFF', // 字体颜色
+ textAlign: 'center', // 水平对齐方式
+ textPosition: 'inside', // 文字位置
+ textVerticalAlign: 'middle' // 文字垂直对齐方式
+ },
+ transferText: {
+ opposite: true, // 对称相反
+ position: 1, // 区段名称位置 1 上面 -1 下面 0 对称
+ distance: 11, // 文字离区段距离
+ fontSize: 11, // 字体大小
+ fontWeight: 'normal', // 字体粗细
+ fontColor: '#FFFFFF', // 字体颜色
+ textAlign: 'center', // 水平对齐方式
+ textPosition: 'inside', // 文字位置
+ textVerticalAlign: 'middle' // 文字垂直对齐方式
+ },
+ destinationText: {
+ position: 1, // 区段名称位置 1 上面 -1 下面 0 对称
+ distance: 11, // 文字离区段距离
+ fontSize: 11, // 字体大小
+ fontWeight: 'bold', // 字体粗细
+ fontColor: 'yellow', // 字体颜色
+ textAlign: 'center', // 水平对齐方式
+ textPosition: 'inside', // 文字位置
+ textVerticalAlign: 'middle' // 文字垂直对齐方式
+ },
+ mouseOverStyle: {
+ borderColor: '#fff',
+ borderBackgroundColor: '#22DFDF',
+ textShadowColor: '#22DFDF'
+ },
+ line: {
+ width: 5, // 区段宽度
+ beyondWidth: 0, // 区段宽超出宽度
+ invadeColor: '#EF0C08', // 区段侵入颜色
+ spareColor: '#606060', // 区段空闲颜色
+ communicationOccupiedColor: '#FF0000', // 区段通信车占用颜色
+ unCommunicationOccupiedColor: '#800080', // 区段非通讯车占用颜色
+ routeLockColor: '#FFFFFF', // 区段路由锁定颜色
+ faultLockColor: '#006400', // 区段故障锁定颜色
+ undefinedColor: '#0071C1', // 区段未定义颜色
+ protectionLockedColor: '#FEFF00', // 保护区段锁闭(未用)
+ blockColor: '#800080', // 区段封锁颜色
+ atcExcisionColor: '#A0522D', // 区段atc切除颜色
+ atsExcisionColor: '#A0522D', // 区段ats切除颜色
+ timeReleaseColor: '#3F3F3F', // 区段延时释放颜色
+ protectiveLockColor: '#FFFF00', // 区段保护锁闭
+ protectiveTimeReleaseColor: '#0071C1', // 区段保护延时解锁
+ logicalColor: '#FFFF00', // 逻辑区段颜色 (未用)
+ logicalTextColor: '#C0C0C0' // 逻辑区段名称颜色 (未用)
+ },
+ axle: {
+ radius: 3, // 计轴 半径
+ distance: 5, // 计轴和区段之间的距离 （未用）
+ color: '#C0C0C0', // 区段计轴颜色
+ resetColor: '#00FFFF', // 区段计轴预复位颜色
+ Failure: '#E6A23C' // #FFFF00 计轴失效
+ },
+ speedLimit: { // 限速元素
+ width: 1, // 限速线的宽度
+ distance: 5, // 限速线距离区段距离
+ lineColor: '#FFFF00', // 限速线颜色
+ nameShow: false // 名称显示
+ },
+ separator: {
+ z: 1, // 分割符层级
+ width: 1.5, // 分隔符宽度
+ endWidth: 1.5, // 尽头分隔符宽度
+ endColor: '#7F7F7F', // 尽头分隔符颜色
+ color: '#7F7F7F' // 区段边界符颜色
+ }
+ };
+
+ this[deviceType.Signal] = {
+ distance: 0, // 设备距离区段的距离
+ post: {
+ standardColor: '#5578B6', // 灯灯柱颜色
+ standardWidth: 1.5 // 灯柱宽度
+ },
+ text: {
+ distance: 3, // 文字和灯杆的距离
+ isNoRotation: true, // 是否禁止旋转
+ isAlignCenter: false, // 信号字体对其方式
+ fontSize: 11, // 信号机名称字体大小
+ fontWeight: 'bold', // 信号机名称字体粗细
+ defaultColor: '#C0C0C0', // 信号灯字体默认色
+ blockColor: '#EF0C08', // 信号灯字体锁定颜色
+ checkColor: '#00FF00' // 信号字体
+ },
+ lamp: {
+ stopWidth: 2, // 禁止线宽度
+ borderVariable: true, // 信号灯边框可变
+ borderWidth: 0.5, // 信号灯边框线宽度
+ borderColor: '#3149C3', // 信号灯边框线颜色
+ radiusR: 5, // 信号机宽度
+ blockColor: '#EF0C08', // 信号灯锁闭
+ grayColor: '#7F7F7F', // 信号灯灰色
+ redColor: '#FF0000', // 信号灯红色
+ greenColor: '#00FF00', // 信号灯绿色
+ yellowColor: '#FFFF00', // 信号灯黄色
+ whiteColor: '#FFFFFF', // 信号灯白色
+ blueColor: '#0070C0' // 信号灯蓝色
+ },
+ route: {
+ direction: false, // 自动进路方向
+ offset: { x: 1, y: -2 }, // 自动进路偏移量
+ routeColor: '#00FF00' // 自动进路
+ },
+ auto: {
+ direction: true, // 自动通过方向
+ offset: { x: 4, y: 0}, // 自动通过偏移量
+ width: 5, // 自动宽度
+ autoRoute: '#00FF00', // 自动进路
+ autoTrigger: '#FFFF00', // 自动触发
+ manualControl: '#FFFF00', // 人工控制
+ outConflict: '#C00808' // 出车冲突
+ },
+ delay: {
+ direction: false, // 延时解锁方向
+ offset: { x: 0, y: -5}, // 延时解锁偏移量
+ fontSize: 9, // 延迟解锁字体大小
+ fontColor: '#FF0000', // 延迟解锁颜色
+ fontWeight: 'bold' // 字体粗细
+ },
+ button: {
+ distance: 5, // 信号灯按钮距离区段的距离
+ borderDashColor: '#FFFFFF', // 信号灯按钮边线
+ buttonColor: 'darkgreen', // 信号灯按钮颜色
+ buttonLightenColor: '#E4EF50' // 信号灯按钮闪烁颜色
+ },
+ mouseOverStyle: {
+ borderLineColor: '#FFFFFF',
+ borderLineDash: [3, 3],
+ nameBackgroundColor: '#22DFDF',
+ lampBorderLineColor: '#22DFDF'
+ }
+ };
+
+ this[deviceType.StationStand] = {
+ common: { // 通用属性
+ textFontSize: 8 // 站台默认字体大小
+ },
+ safetyDoor: { // 屏蔽门
+ height: 1.6, // 站台屏蔽门高度
+ distance: 9, // 站台和屏蔽门之间的距离
+ defaultColor: '#00FF00', // 屏蔽门默认颜色
+ splitDoorColor: '#F61107' // 屏蔽门切除颜色
+ },
+ stand: { // 站台
+ headFontSize: 8, // 站台首端字体大小
+ spareColor: '#606060', // 站台空闲颜色
+ stopColor: '#FEFE00', // 站台列车停站颜色
+ jumpStopColor: '#9A99FF', // 站台跳停颜色
+ designatedJumpStopColor: 'lightSkyBlue' // 站台指定列车跳停颜色
+ },
+ standEmergent: { // 紧急关闭
+ mergentR: 4, // 站台紧急关闭半径
+ offset: {x: 0, y: 0}, // 站台紧急关闭偏移量
+ closeColor: '#F61107' // 站台紧急关闭颜色
+ },
+ reentry: { // 站台折返策略
+ position: 0, // 折返方向
+ offset: {x: -16, y: 18}, // 折返偏移量
+ noHumanColor: '#0F16DA', // 站台无人折返
+ autoChangeEndsColor: '#0BF400' // 站台自动换端
+ },
+ detainCar: { // 扣车
+ text: 'H', // 扣车显示内容
+ position: 1, // 扣车方向
+ offset: {x: -8, y: 13}, // 扣车偏移量
+ trainColor: '#E4EF50', // 车站扣车颜色
+ centerTrainColor: '#FFFFFF', // 中心扣车颜色
+ andCenterTrainColor: '#F61107', // 车站+中心扣车颜色
+ detainTrainTextColor: '#E4EF50' // 车站扣除文字颜色
+ },
+ stopTime: { // 停站时间
+ position: 1, // 运行时间方向
+ offset: {x: -8, y: 3}, // 运行时间偏移量
+ textColor: '#FFFFFF' // 停站时间字体颜色
+ },
+ level: { // 运行等级
+ position: 1, // 运行等级方向
+ offset: {x: -8, y: 22}, // 运行等级偏移量
+ textColor: '#FFFFFF' // 停站等级字体颜色
+ },
+ mouseOverStyle: {
+ borderLineColor: '#FFFFFF',
+ borderLineDash: [3, 3]
+ }
+ };
+
+ this[deviceType.StationControl] = {
+ text: {
+ distance: 2, // 灯和文字之间的距离
+ fontSize: 10, // 控制模式字体大小
+ fontFormat: 'consolas', // 控制模式字体格式
+ fontColor: '#ffffff', // 控制模式字体颜色
+ fontWeight: 'normal', // 控制模式字体粗细
+ textAlign: 'middle', // 控制模式水平对齐
+ textVerticalAlign: 'top' // 控制模式垂直对齐
+ },
+ lamp: {
+ count: 3, // 控制模式灯个数
+ offset: { x: 20, y: 0 }, // 偏移量
+ radiusR: 6, // 控制模式灯的半径
+ distance: 36, // 控制模式之间灯之间的距离
+ grayColor: '#7F7F7F', // 控制模式灰色
+ greenColor: '#00FF00', // 控制模式绿色
+ redColor: '#FF0000', // 控制模式红色
+ yellowColor: '#FFFF00' // 控制模式黄色
+
+ },
+ arrow: {
+ show: false // 控制模式箭头显隐
+ },
+ mouseOverStyle: { // 鼠标悬浮样式
+ fontSize: 10,
+ fontFormat: 'consolas',
+ fontColor: '#FFF000',
+ fontWeight: 'normal',
+ textAlign: 'middle',
+ textVerticalAlign: 'top'
+ }
+ };
+
+ this[deviceType.StationCounter] = {
+ text: {
+ distance: 2, // 计数器名称和文字的距离
+ fontColor: '#FFFFFF', // 计数器字体颜色
+ borderColor: '#E4EF50' // 计数器边框颜色
+ }
+ };
+
+ this[deviceType.StationDelayUnlock] = {
+ text: {
+ distance: 3, // 延迟解锁和设备之间的距离
+ fontColor: '#FFFFFF', // 延时解锁字体颜色
+ borderColor: '#FFFFFF' // 延迟解锁边框颜色
+ }
+ };
+
+ this[deviceType.Station] = {
+ kilometerPosition: 'down', // 公里标位置
+ fontWeight: 'bold' // 文字错细
+ };
+
+ this[deviceType.Switch] = {
+ text: {
+ position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
+ offset: {x: -15, y: -10}, // 道岔名称与区段距离
+ fontSize: 10, // 字体大小
+ fontWeight: 'normal', // 字体粗细
+ borderColor: '#FE0000', // 道岔边框颜色
+ lossColor: '#FFFFFF', // 道岔失去颜色
+ locateColor: '#00FF00', // 道岔定位颜色
+ inversionColor: '#9C9D09', // 道岔反位颜色
+ monolockColor: '#870E10' // 道岔单锁颜色
+ },
+ core: {
+ length: 6 // 道岔单边长度
+ },
+ monolock: { // 道岔单锁配置
+ locationColor: '#870E10', // 道岔单锁定位颜色 (红色)
+ inversionColor: '#870E10', // 道岔单锁反位颜色 (红色)
+ rectShow: false // 道岔单锁 矩形框是否显示
+ },
+ block: { // 道岔封锁配置
+ nameBorderShow: true, // 道岔名称是否有包围框 显示
+ contentRectShow: false // 道岔封锁显示
+ },
+ mouseOverStyle: {
+ borderBackgroundColor: '#22DFDF', // 边框背景色
+ borderColor: '#fff', // 边框颜色
+ textShadowColor: '#22DFDF' // 字体阴影颜色
+ }
+ };
+
+ this[deviceType.LcControl] = {
+ text: {
+ fontSize: 10, // 灯字体大小
+ fontWeight: 'normal', // 字体粗细
+ distance: 5 // 灯跟文字距离
+ },
+ lamp: {
+ radiusR: 6, // 灯大小
+ controlColor: '#FFFF00' // 灯颜色
+ },
+ mouseOverStyle: {
+ fontSize: 10,
+ fontFormat: 'consolas',
+ fontColor: '#FFF000',
+ fontWeight: 'normal',
+ textAlign: 'middle',
+ textVerticalAlign: 'top',
+ arcColor: '#00FFFF',
+ textColor: '#000000'
+ }
+ };
+
+ this[deviceType.ZcControl] = {
+ text: {
+ fontSize: 10, // 字体大小
+ fontWeight: 'normal', // 字体粗细
+ distance: 5 // 灯跟文字距离
+ },
+ lamp: {
+ radiusR: 6, // 灯大小
+ controlColor: '#00FF00' // 灯颜色
+ },
+ mouseOverStyle: {
+ fontSize: 10,
+ fontFormat: 'consolas',
+ fontColor: '#FFF000',
+ fontWeight: 'normal',
+ textAlign: 'middle',
+ textVerticalAlign: 'top',
+ arcColor: '#00FFFF',
+ textColor: '#000000'
+ }
+ };
+
+ this[deviceType.LimitControl] = {
+ text: {
+ fontSize: 10, // 字体大小
+ fontWeight: 'normal', // 字体粗细
+ distance: 5 // 灯跟文字距离
+ },
+ lamp: {
+ radiusR: 6, // 灯大小
+ controlColor: '#ECE9D8' // 灯颜色
+ },
+ mouseOverStyle: {
+ fontSize: 10,
+ fontFormat: 'consolas',
+ fontColor: '#FFF000',
+ fontWeight: 'normal',
+ textAlign: 'middle',
+ textVerticalAlign: 'top',
+ textColor: '#000000',
+ arcColor: '#00FFFF'
+ }
+ };
+
+ this[deviceType.Line] = {
+ lineColor: '#FFFFFF' // 线条颜色
+ };
+
+ this[deviceType.TrainWindow] = {
+ lineColor: '#FFF', // 车次窗颜色
+ lineDash: [3, 3], // 车次窗虚线间隔
+ lineWidth: 1, // 车次窗线宽
+ trainWindowSmooth: 0.01 // 车次窗矩形圆滑程度
+ };
+
+ this[deviceType.Train] = {
+ trainBody: {
+ trainBodyLineWidth: 0.1, // 车身line宽
+ changeTrainWidth: false, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
+ specialTrainType: [], // 特殊列车类型需设置显示格式
+ lrPadding: 4, // 两边间隔
+ upPadding: 4, // 上边距离
+ trainBodyFillColor: '#725A64', // 列车车身填充颜色
+ trainNameFormat: 'serviceNumber:tripNumber'// 列车显示格式
+ },
+ hsda: {
+ lrPaddingHSDA: 3, // HSDA两边间隔
+ upPaddingHSDA: 4, // HSDA上边距离
+ trainHSDATextFontSize: 9, // 列车HDSA字号
+ textHContent: 'H', // textH文本
+ textSContent: 'S', // textS文本
+ textDContent: 'D', // textD文本
+ textAContent: 'A'// textA文本
+ },
+ trainNumber: {
+ trainNumberOffset: { x: 0, y: 1}// 目的地码偏移量
+ },
+ trainServer: {
+ serviceNumberPrefix: '00', // 服务号(表号)前缀
+ defaultServiceNumber: 'AA', // 默认服务号（表号）
+ trainServerOffset: { x: 4, y: 4}// 列车服务号偏移
+ },
+ trainTarget: {
+ tripNumberPrefix: '000', // 车次号前缀
+ defaultTripNumber: 'DDD', // 默认车次号2
+ trainTargetOffset: { x: 36, y: 4}, // 列车车次号偏移
+ trainTargetTextAlign: 'right'// 车次号文字显示位置
+ },
+ trainTargetNumber: {
+ trainTargetNumberOffset: {x: 0, y: 0}// 车组号偏移量
+ },
+ trainHead: {
+ trainMoreLength: 0, // 列车车头比车身高出的长度,上下相比车体伸出去的边框
+ trainHeadTriangleFirst: { x: 7, y: 1}, // 列车车头三角坐标1偏移量
+ trainHeadTriangleSecond: { x: 13, y: 10}, // 列车车头三角坐标2偏移量
+ trainHeadTriangleThird: { x: 7, y: 19}, // 列车车头三角坐标3偏移量
+ trainHeadRectHeight: 20, // 列车车头矩形高度
+ trainConntWidth: 3, // 列车竖杠的宽度
+ trainHeadFillColor: '#000000'// 列车车头矩形填充颜色
+ },
+ common: {
+ trainHeight: 20, // 列车高度
+ trainHeadDistance: 4, // 列车和车头之间的间距
+ trainWidth: 40, // 列车长度
+ trainTextFontSize: 12, // 列车字号
+ fontFamily: 'consolas', // 默认字体 族类
+ haveTextHSDA: true, // 是否需创建textHSDA对象
+ haveArrowText: true, // 是否需创建arrowText对象
+ haveTrainBorder: false, // 是否需创建trainBorder对象
+ aspectRatio: 7/5, // 字体宽高比例（用以拼接text是计算位置）
+ textOffset: 4, // 字体偏移（用以控制字体据车头的距离）
+ trainWidthMoreText: 8, // 计算列车长度时--列车长比text多出尺寸
+ useSelfFormat: true, // 使用配置项的nameFormat
+ useSelfText: true // 使用配置项的字体大小
+ },
+ trainStatusStyle: {
+ destinationStatus: [
+ {status: '01', showColor: '#FFFFFF'},
+ {status: '02', showColor: '#00FF00'},
+ {status: '03', showColor: '#A0522D'},
+ {status: '04', showColor: '#FFFF00'}
+ ], // 目的地状态 01准点 02早点 03晚点 04头码车
+ defaultDestinationColor: '#FFFFFF', // 默认目的地状态显示颜色
+ destinationStatusSetText: 'trainTarget', // 目的地状态设置的对应哪个text的颜色
+ directionType: [
+ {
+ type: '01',
+ lineLShow: true,
+ lineRShow: true,
+ arrowLShow: false,
+ arrowRShow: false
+ },
+ {
+ type: '02',
+ lineLShow: false,
+ lineRShow: true,
+ arrowLShow: false,
+ arrowRShow: true
+ },
+ {
+ type: '03',
+ lineLShow: true,
+ lineRShow: false,
+ arrowLShow: true,
+ arrowRShow: false
+ }
+ ], // 列车运行方向状态类型对应车头显示状态 01未知方向 02从左往右 上行 03从右往左 下行
+ directionStopType: [
+ {type: '01', lineLShow: false, lineRShow: false},
+ {type: '02', lineLShow: false, lineRShow: true},
+ {type: '03', lineLShow: true, lineRShow: false}
+ ], // 列车停止方向类型对应车头显示状态 01未知方向 02从左往右 上行 03从右往左 下行
+ runModeStatus: [
+ {
+ status: '01',
+ trainLColor: '#FFFFFF',
+ trainRColor: '#FFFFFF'
+ },
+ {
+ status: '02',
+ trainLColor: '#00FF00',
+ trainRColor: '#00FF00'
+ },
+ {
+ status: '03',
+ trainLColor: '#FFFF00',
+ trainRColor: '#FFFF00'},
+ {
+ status: '04',
+ trainLColor: '#A0522D',
+ trainRColor: '#A0522D'
+ },
+ {
+ status: '05',
+ trainLColor: '#A0522D',
+ trainRColor: '#A0522D'
+ }
+ ], // 列车运行模式对应车头颜色 01未知 02 ATO自动驾驶模式AM 03 ATP监控下的人工驾驶模式CM 04 限制人工驾驶模式RM 05 非限制人工驾驶模式RM
+ runControlStatus: [
+ {status: '01', hShow: false, sShow: false},
+ {status: '02', hShow: true, sShow: false},
+ {status: '03', hShow: false, sShow: true}
+ ], // 设置运行控制状态类型 01正常 02扣车 03停跳
+ doorStatus: [
+ {status: '01', dShow: false},
+ {status: '02', dShow: true}
+ ], // 设置车门状态类型 01关门 02开门
+ communicationStatus: [
+ {status: '01', trainColor: '#725A64'},
+ {status: '02', trainColor: '#C0C0C0'}
+ ], // 设置通信状态 01正常 02故障
+ alarmStatus: [
+ {status: '01', aShow: false},
+ {status: '02', aShow: true}
+ ], // 设置报警状态 01不报警 02报警
+ serverNoType: [
+ {type: '01', showColor: '#FFFFFF'},
+ {type: '02', showColor: '#FFF000'}
+ ], // 服务号状态类型 01显示服务号 计划车 02显示车组号: 头码车与人工车
+ defaultServerNoColor: '#FFFFFF' // 默认服务号状态显示颜色
+ }
+ };
+ }
+}
+
+export default new SkinStyle();
diff --git a/src/jmap/config/skinCode/chengdu_03.js b/src/jmap/config/skinCode/chengdu_03.js
new file mode 100644
index 000000000..796fd8bee
--- /dev/null
+++ b/src/jmap/config/skinCode/chengdu_03.js
@@ -0,0 +1,545 @@
+import defaultStyle from '../defaultStyle';
+import deviceType from '../../constant/deviceType';
+
+class SkinStyle extends defaultStyle {
+ constructor() {
+ super();
+ this[deviceType.Link] = {
+ lineWidthColor: '#FFFFFF', // line 颜色
+ linkWidth: 4.4, // link 宽度
+ linkColor: '#3F3F3F', // link 线条颜色
+ linkTextColor: '#FFFFFF' // link 字体颜色
+ };
+
+ this[deviceType.Section] = {
+ text: {
+ position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
+ distance: 10, // 文字离区段距离
+ fontSize: 12, // 字体大小
+ fontWeight: 'normal', // 字体粗细
+ fontColor: '#FFFFFF', // 字体颜色
+ textAlign: 'center', // 水平对齐方式
+ textPosition: 'inside', // 文字位置
+ textVerticalAlign: 'middle' // 文字垂直对齐方式
+ },
+ logicText: {
+ position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
+ distance: 12, // 文字离区段距离
+ fontSize: 11, // 字体大小
+ fontWeight: 'normal', // 字体粗细
+ fontColor: '#FFFFFF', // 字体颜色
+ textAlign: 'center', // 水平对齐方式
+ textPosition: 'inside', // 文字位置
+ textVerticalAlign: 'middle' // 文字垂直对齐方式
+ },
+ standText: {
+ position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
+ distance: 24, // 文字离区段距离
+ fontSize: 11, // 字体大小
+ fontWeight: 'normal', // 字体粗细
+ fontColor: '#FFFFFF', // 字体颜色
+ textAlign: 'center', // 水平对齐方式
+ textPosition: 'inside', // 文字位置
+ textVerticalAlign: 'middle' // 文字垂直对齐方式
+ },
+ reentryText: {
+ position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
+ distance: 36, // 文字离区段距离
+ fontSize: 11, // 字体大小
+ fontWeight: 'normal', // 字体粗细
+ fontColor: '#FFFFFF', // 字体颜色
+ textAlign: 'center', // 水平对齐方式
+ textPosition: 'inside', // 文字位置
+ textVerticalAlign: 'middle' // 文字垂直对齐方式
+ },
+ transferText: {
+ position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
+ distance: 36, // 文字离区段距离
+ fontSize: 11, // 字体大小
+ fontWeight: 'normal', // 字体粗细
+ fontColor: '#FFFFFF', // 字体颜色
+ textAlign: 'center', // 水平对齐方式
+ textPosition: 'inside', // 文字位置
+ textVerticalAlign: 'middle' // 文字垂直对齐方式
+ },
+ destinationText: {
+ opposite: true, // 对称相反
+ position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
+ distance: 12, // 文字离区段距离
+ fontSize: 11, // 字体大小
+ fontWeight: 'bold', // 字体粗细
+ fontColor: 'yellow', // 字体颜色
+ textAlign: 'center', // 水平对齐方式
+ textPosition: 'inside', // 文字位置
+ textVerticalAlign: 'middle' // 文字垂直对齐方式
+ },
+ line: {
+ width: 5, // 区段宽度
+ beyondWidth: 0, // 区段宽超出宽度
+ invadeColor: '#FFFFFF', // 区段侵入颜色
+ spareColor: '#5578B6', // 区段空闲颜色
+ communicationOccupiedColor: '#FF00FF', // 区段通信车占用颜色
+ unCommunicationOccupiedColor: '#DE310C', // 区段非通讯车占用颜色
+ routeLockColor: '#FFFFFF', // 区段路由锁定颜色
+ faultLockColor: '#006400', // 区段故障锁定颜色
+ undefinedColor: '#0071C1', // 区段未定义颜色
+ protectionLockedColor: '#FFFFFF', // 保护区段锁闭
+ blockColor: '#00FF00', // 区段封锁颜色
+ atcExcisionColor: '#A0522D', // 区段atc切除颜色
+ atsExcisionColor: '#A0522D', // 区段ats切除颜色
+ timeReleaseColor: '#3F3F3F', // 区段延时释放颜色
+ protectiveLockColor: '#FFFF00', // 区段保护锁闭
+ protectiveTimeReleaseColor: '#0071C1', // 区段保护延时解锁
+ logicalColor: '#FFFF00', // 逻辑区段颜色 (未用)
+ logicalTextColor: '#C0C0C0' // 逻辑区段名称颜色 (未用)
+ },
+ axle: {
+ radius: 3, // 计轴 半径
+ distance: 5, // 计轴和区段之间的距离 （未用）
+ color: '#C0C0C0', // 区段计轴颜色
+ resetColor: '#00FFFF', // 区段计轴预复位颜色
+ Failure: '#E6A23C' // #FFFF00 计轴失效
+ },
+ speedLimit: { // 限速元素
+ width: 1, // 限速线的宽度
+ distance: 5, // 限速线距离区段距离
+ lineColor: '#C0C000', // 限速线颜色 （黄色透明光）
+ nameBackground: '#C0C000', // 限速名称背景颜色
+ nameShow: true, // 名称显示
+ nameNumberColor: '#C00808', // 限速值颜色
+ nameNumberFontSize: 11, // 限速值大小
+ kilometerColor: '#fff', // 公里标颜色
+ kilometerFontSize: 8, // 公里标大小
+ drogueWidth: 19, // 浮标宽度
+ drogueHeight: 12 // 浮标高度
+ },
+ separator: {
+ z: 6, // 分割符层级
+ width: 1.5, // 分隔符宽度
+ endWidth: 1.5, // 尽头分隔符宽度
+ endColor: '#FFFFFF', // 尽头分隔符颜色
+ color: '#FFFFFF' // 区段边界符颜色
+ },
+ shuttleBack: { // 折返进路 (存在此对象 显示折返箭头)
+ distance: 5 // 限速线距离区段距离
+ }
+ };
+
+ this[deviceType.Signal] = {
+ distance: 10, // 设备距离区段的距离
+ post: {
+ standardColor: '#FFFFFF', // 灯柱颜色
+ standardWidth: 2 // 灯柱宽度
+ },
+ text: {
+ distance: 3, // 文字和灯杆的距离
+ isNoRotation: true, // 是否禁止旋转
+ isAlignCenter: false, // 信号字体对其方式
+ fontSize: 11, // 信号机名称字体大小
+ fontWeight: 'bold', // 信号机名称字体粗细
+ defaultColor: '#FFFFFF', // 信号灯字体默认色
+ blockColor: '#EF0C08', // 信号灯字体锁定颜色
+ checkColor: '#00FF00' // 信号保护区段检查颜色
+ },
+ lamp: {
+ borderVariable: true, // 信号灯边框可变
+ stopWidth: 2, // 禁止线宽度
+ borderWidth: 2, // 信号灯边框线宽度
+ borderColor: '#3149C3', // 信号灯边框线颜色
+ radiusR: 6, // 信号灯半径
+ blockColor: '#EF0C08', // 信号灯锁闭
+ grayColor: '#7F7F7F', // 信号灯灰色
+ redColor: '#FF0000', // 信号灯红色
+ greenColor: '#00FF00', // 信号灯绿色
+ yellowColor: '#FFFF00', // 信号灯黄色
+ whiteColor: '#FFFFFF', // 信号灯白色
+ blueColor: '#0070C0' // 信号灯蓝色
+ },
+ route: {
+ direction: true, // 自动通过方向
+ offset: { x: 4, y: 0}, // 自动通过偏移量
+ routeColor: '#00FF00' // 自动进路
+ },
+ auto: {
+ direction: false, // 自动通过方向
+ offset: { x: -4, y: 0}, // 自动通过偏移量
+ width: 5, // 自动宽度
+ manualControl: '#FFFF00', // 人工控制
+ autoRoute: '#00FF00', // 自动进路
+ autoTrigger: '#FFFF00', // 自动触发
+ outConflict: '#C00808' // 出车冲突
+ },
+ delay: {
+ direction: false, // 延时解锁方向
+ offset: { x: -5, y: 0}, // 延时解锁偏移量
+ fontSize: 11, // 延迟解锁字体大小
+ fontColor: '#C00808', // 延迟解锁颜色
+ fontWeight: 'bold' // 字体粗细
+
+ },
+ button: {
+ distance: 5, // 信号灯按钮距离区段的距离
+ borderDashColor: '#FFFFFF', // 信号灯按钮边线
+ buttonColor: 'darkgreen', // 信号灯按钮颜色
+ buttonLightenColor: '#E4EF50' // 信号灯按钮闪烁颜色
+ }
+ };
+
+ this[deviceType.StationStand] = {
+ common: { // 通用属性
+ textFontSize: 10, // 站台默认字体大小
+ haveJumpShow: true // 站台是否有列车停跳显示
+ },
+ safetyDoor: { // 屏蔽门
+ height: 3, // 站台屏蔽门高度
+ distance: 8, // 站台和屏蔽门之间的距离
+ defaultColor: '#00FF00', // 屏蔽门默认颜色
+ splitDoorColor: '#C00808' // 屏蔽门切除颜色
+ },
+ stand: { // 站台
+ headFontSize: 10, // 站台首端字体大小
+ spareColor: '#808080', // 站台空闲颜色
+ stopColor: '#FFF000', // 站台列车停站颜色
+ jumpStopColor: '#808080', // 站台跳停颜色
+ designatedJumpStopColor: '#808080' // 站台指定列车跳停颜色
+ },
+ standEmergent: { // 紧急关闭
+ mergentR: 4, // 站台紧急关闭半径
+ offset: {x: 0, y: 40}, // 站台紧急关闭偏移量
+ closeColor: '#F61107' // 站台紧急关闭颜色
+ },
+ reentry: { // 站台折返策略
+ position: 0, // 折返方向
+ offset: {x: -16, y: 20}, // 折返偏移量
+ noHumanColor: '#0F16DA', // 站台无人折返
+ autoChangeEndsColor: '#0BF400' // 站台自动换端
+ },
+ detainCar: { // 扣车
+ text: '扣', // 扣车显示内容
+ position: -1, // 扣车方向
+ offset: {x: -8, y: -20}, // 扣车偏移量
+ trainColor: '#FFFF00', // 车站扣车颜色
+ centerTrainColor: '#C0C0C0', // 中心扣车颜色
+ andCenterTrainColor: '#C0C0C0', // 车站+中心扣车颜色
+ detainTrainTextColor: '#E4EF50' // 车站扣除文字颜色
+ },
+ stopTime: { // 停站时间
+ position: 1, // 运行时间方向
+ offset: {x: -8, y: -4}, // 运行时间偏移量
+ textColor: '#C0C0C0' // 停站时间字体颜色
+ },
+ jump: {
+ text: '跳', // 停跳显示内容
+ position: -1, // 停跳方向
+ offset: {x: -8, y: 0},
+ textColor: '#0000FF', // 停跳文字颜色
+ arcColor: '#0000FF', // 停跳圆圈颜色
+ fillColor: 'rgba(0,0,0,0)', // 透明填充颜色
+ r: 8 // 圆半径大小
+ },
+ level: { // 运行等级
+ position: 1, // 运行等级方向
+ offset: {x: -8, y: 30}, // 运行等级偏移量
+ textColor: '#FFF000' // 停站等级字体颜色
+ }
+ };
+
+ this[deviceType.StationControl] = {
+ text: {
+ distance: 2, // 灯和文字之间的距离
+ fontSize: 11, // 字体大小
+ fontFormat: 'consolas', // 字体格式
+ fontColor: '#ffffff', // 字体颜色
+ fontWeight: 'normal', // 字体粗细
+ textAlign: 'middle', // 字体水平对齐
+ textVerticalAlign: 'top' // 字体垂直对齐
+ },
+ lamp: {
+ count: 4, // 控制模式的个数
+ offset: {x: 0, y: 0}, // 偏移量
+ radiusR: 6, // 控制模式灯的半径
+ distance: 36, // 控制模式之间灯之间的距离
+ grayColor: '#7F7F7F', // 控制模式灰色
+ greenColor: '#00FF00', // 控制模式绿色
+ redColor: '#FF0000', // 控制模式红色
+ yellowColor: '#FFFF00' // 控制模式黄色
+ },
+ arrow: {
+ show: true // 控制模式箭头显隐
+ }
+ };
+
+ this[deviceType.StationCounter] = {
+ text: {
+ distance: 2, // 计数器名称和文字的距离
+ fontColor: '#FFFFFF', // 计数器字体颜色
+ borderColor: '#E4EF50' // 计数器边框颜色
+ }
+ };
+
+ this[deviceType.StationDelayUnlock] = {
+ text: {
+ distance: 3, // 延迟解锁和设备之间的距离
+ fontColor: '#FFFFFF', // 延时解锁字体颜色
+ borderColor: '#FFFFFF' // 延迟解锁边框颜色
+ }
+ };
+
+ this[deviceType.Station] = {
+ kilometerPosition: 'up' // 公里标朝向
+ };
+
+ this[deviceType.Switch] = {
+ text: {
+ position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
+ offset: {x: 5, y: -10}, // 道岔名称与区段距离
+ fontSize: 11, // 字体大小
+ fontWeight: 'normal', // 字体粗细
+ borderColor: '#FE0000', // 道岔边框颜色
+ lossColor: '#C00808', // 道岔失去颜色
+ locateColor: '#00FF00', // 道岔定位颜色
+ inversionColor: '#FFFF00', // 道岔反位颜色
+ monolockColor: '#FFFFFF' // 道岔单锁颜色
+ },
+ core: {
+ length: 6 // 道岔单边长度
+ },
+ monolock: { // 道岔单锁配置
+ locationColor: '#00FF00', // 道岔单锁'定位'颜色 (绿色)
+ inversionColor: '#FFFF00', // 道岔单锁'反位'颜色 (黄色)
+ rectShow: true, // 道岔单锁 矩形框是否显示
+ rectWidth: 18, // 矩形框 宽高
+ rectBorderColor: '#fff' // 矩形边框颜色
+ },
+ block: { // 道岔封锁配置
+ nameBorderShow: false, // 道岔名称是否有包围框 显示
+ contentRectShow: true, // 道岔封锁显示
+ contentRectColor: 'red' // 道岔封锁边框颜色
+ }
+ };
+
+ this[deviceType.LcControl] = {
+ text: {
+ fontSize: 11, // 字体大小
+ fontWeight: 'normal', // 字体粗细
+ distance: 5 // 灯跟文字距离
+ },
+ lamp: {
+ radiusR: 6, // 控制灯大小
+ controlColor: '#FFFF00' // 控制灯颜色
+ }
+ };
+
+ this[deviceType.ZcControl] = {
+ text: {
+ fontSize: 11, // 字体大小
+ fontWeight: 'normal', // 字体粗细
+ distance: 5 // 灯跟文字距离
+ },
+ lamp: {
+ radiusR: 6, // 控制灯大小
+ controlColor: '#00FF00' // 控制灯颜色
+ }
+ };
+
+ this[deviceType.LimitControl] = {
+ text: {
+ fontSize: 11, // 字体大小
+ fontWeight: 'normal', // 字体粗细
+ distance: 5 // 灯跟文字距离
+ },
+ lamp: {
+ radiusR: 6, // 控制灯大小
+ controlColor: '#ECE9D8' // 控制灯颜色
+ }
+ };
+
+ this[deviceType.Line] = {
+ lineColor: '#FFFFFF' // 线条颜色
+ };
+
+ this[deviceType.TrainWindow] = {
+ lineColor: '#4DD43F', // 车次窗颜色
+ lineDash: null, // 车次窗虚线间隔
+ lineWidth: 1, // 车次窗线宽
+ trainWindowSmooth: 0 // 车次窗矩形圆滑程度
+ };
+
+ this[deviceType.Train] = {
+ trainBody: {
+ trainBodyLineWidth: 1, // 车身line宽
+ changeTrainWidth: false, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
+ specialTrainType: [], // 特殊列车类型需设置显示格式
+ lrPadding: 4, // 两边间隔
+ upPadding: 4, // 上边距离
+ trainBodyFillColor: '#000099', // 列车车身填充颜色
+ trainNameFormat: 'serviceNumber:targetCode'// 列车显示格式
+ },
+ hsda: {
+ lrPaddingHSDA: 3, // HSDA两边间隔
+ upPaddingHSDA: 4, // HSDA上边距离
+ trainHSDATextFontSize: 9, // 列车HDSA字号
+ textHContent: '扣', // textH文本
+ textSContent: '跳', // textS文本
+ textDContent: '门', // textD文本
+ textAContent: '警' // textA文本
+ },
+ trainNumber: {
+ targetCodePrefix: '000', // 目的地码前缀
+ defaultTargetCode: 'DDD', // 默认目的地码
+ trainTargetTextAlign: 'left', // 目的地码文字显示位置
+ trainNumberOffset: { x: 24, y: 4}// 目的地码偏移量
+ },
+ trainServer: {
+ serviceNumberPrefix: '000', // 服务号(表号)前缀
+ defaultServiceNumber: 'TTT', // 默认服务号（表号）
+ defaultServerNoColor: '#FFFFFF', // 默认服务号状态显示颜色
+ trainServerOffset: { x: 4, y: 4} // 列车服务号偏移
+ },
+ trainTarget: {
+ tripNumberPrefix: '000', // 车次号前缀
+ defaultTripNumber: 'DDD', // 默认车次号2
+ trainTargetOffset: { x: 36, y: 4}, // 列车车次号偏移
+ trainTargetTextAlign: 'right' // 车次号文字显示位置
+ },
+ trainTargetNumber: {
+ trainTargetNumberOffset: {x: 0, y: 0}// 车组号偏移量
+ },
+ trainHead: {
+ trainMoreLength: 0, // 列车车头比车身高出的长度,上下相比车体伸出去的边框
+ trainHeadTriangleFirst: { x: 7, y: 1}, // 列车车头三角坐标1偏移量
+ trainHeadTriangleSecond: { x: 13, y: 10}, // 列车车头三角坐标2偏移量
+ trainHeadTriangleThird: { x: 7, y: 19}, // 列车车头三角坐标3偏移量
+ trainConntWidth: 3, // 列车竖杠的宽度
+ trainHeadFillColor: '#000000', // 列车车头矩形填充颜色
+ trainHeadRectHeight: 20 // 列车车头矩形高度
+ },
+ common: {
+ trainHeight: 20, // 列车高度
+ trainHeadDistance: 4, // 列车和车头之间的间距
+ trainWidth: 48, // 列车长度
+ trainTextFontSize: 12, // 列车字号
+ fontFamily: 'consolas', // 默认字体 族类
+ haveTextHSDA: true, // 是否需创建textHSDA对象
+ haveArrowText: true, // 是否需创建arrowText对象
+ haveTrainBorder: false, // 是否需创建trainBorder对象
+ aspectRatio: 7/5, // 字体宽高比例（用以拼接text是计算位置）
+ textOffset: 4, // 字体偏移（用以控制字体据车头的距离）
+ trainWidthMoreText: 8, // 计算列车长度时--列车长比text多出尺寸
+ useSelfFormat: true, // 使用配置项的nameFormat
+ useSelfText: true // 使用配置项的字体大小
+ },
+ trainStatusStyle: {
+ defaultDestinationColor: '#FFFFFF', // 默认目的地状态显示颜色
+ destinationStatusSetText: 'trainWindowBorder', // 目的地状态设置的对应哪个颜色
+ destinationStatus: [
+ {status: '01', showColor: '#FFFFFF'},
+ {status: '02', showColor: '#00FF00'},
+ {status: '03', showColor: '#A0522D'}
+ ], // 目的地状态 01准点 02早点 03晚点 04头码车
+ serverNoType: [
+ {type: '01', showColor: '#FFFFFF'},
+ {type: '02', showColor: '#FFF000'}
+ ], // 服务号状态类型 01显示服务号 计划车 02显示车组号: 头码车与人工车
+ directionType: [
+ {
+ type: '01',
+ lineLShow: true,
+ lineRShow: true,
+ arrowLShow: false,
+ arrowRShow: false
+ },
+ {
+ type: '02',
+ lineLShow: false,
+ lineRShow: true,
+ arrowLShow: false,
+ arrowRShow: true
+ },
+ {
+ type: '03',
+ lineLShow: true,
+ lineRShow: false,
+ arrowLShow: true,
+ arrowRShow: false
+ }
+ ], // 列车运行方向状态类型对应车头显示状态 01未知方向 02从左往右 上行 03从右往左 下行
+ directionStopType: [
+ {
+ type: '01',
+ lineLShow: false,
+ lineRShow: false
+ },
+ {
+ type: '02',
+ lineLShow: false,
+ lineRShow: true
+ },
+ {
+ type: '03',
+ lineLShow: true,
+ lineRShow: false
+ }
+ ], // 列车停止方向类型对应车头显示状态 01未知方向 02从左往右 上行 03从右往左 下行
+ runModeStatus: [
+ {
+ status: '01',
+ trainLColor: '#00FF00',
+ trainRColor: '#00FF00'
+ },
+ {
+ status: '02',
+ trainLColor: '#FF8000',
+ trainRColor: '#FF8000'
+ },
+ {
+ status: '03',
+ trainLColor: '#FFFF00',
+ trainRColor: '#FFFF00'
+ },
+ {
+ status: '04',
+ trainLColor: '#C2C2C2',
+ trainRColor: '#C2C2C2'
+ },
+ {
+ status: '05',
+ trainLColor: '#C2C2C2',
+ trainRColor: '#C2C2C2'
+ }
+ ], // 列车运行模式对应车头颜色 01未知 02 ATO自动驾驶模式AM 03 ATP监控下的人工驾驶模式CM 04 限制人工驾驶模式RM 05 非限制人工驾驶模式RM
+ runControlStatus: [
+ {
+ status: '01',
+ hShow: false,
+ sShow: false
+ },
+ {
+ status: '02',
+ hShow: true,
+ sShow: false
+ },
+ {
+ status: '03',
+ hShow: false,
+ sShow: true
+ }
+ ], // 设置运行控制状态类型 01正常 02扣车 03停跳
+ doorStatus: [
+ {status: '01', dShow: false},
+ {status: '02', dShow: true}
+ ], // 设置车门状态类型 01关门 02开门
+ communicationStatus: [
+ {status: '01', trainColor: '#725A64'},
+ {status: '02', trainColor: '#C0C0C0'}
+ ], // 设置通信状态 01正常 02故障
+ alarmStatus: [
+ {status: '01', aShow: false},
+ {status: '02', aShow: true}
+ ] // 设置报警状态 01不报警 02报警
+ }
+ };
+ }
+}
+
+export default new SkinStyle();
diff --git a/src/jmap/config/skinCode/chengdu_04.js b/src/jmap/config/skinCode/chengdu_04.js
new file mode 100644
index 000000000..1aa852dc3
--- /dev/null
+++ b/src/jmap/config/skinCode/chengdu_04.js
@@ -0,0 +1,543 @@
+import defaultStyle from '../defaultStyle';
+import deviceType from '../../constant/deviceType';
+
+class SkinStyle extends defaultStyle {
+ constructor() {
+ super();
+ this[deviceType.Link] = {
+ lineWidthColor: '#FFFFFF', // line 颜色
+ linkWidth: 4, // link 宽度
+ linkColor: '#4e8de6', // link 线条颜色
+ linkTextColor: '#FFFFFF' // link 字体颜色
+ };
+
+ this[deviceType.Section] = {
+ text: {
+ position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
+ distance: 10, // 文字离区段距离
+ fontSize: 12, // 字体大小
+ fontWeight: 'normal', // 字体粗细
+ fontColor: 'lightgreen', // 字体颜色
+ textAlign: 'center', // 水平对齐方式
+ textPosition: 'inside', // 文字位置
+ textVerticalAlign: 'middle' // 文字垂直对齐方式
+ },
+ logicText: { // 逻辑区段名称
+ position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
+ distance: 12, // 文字离区段距离
+ fontSize: 11, // 字体大小
+ fontWeight: 'normal', // 字体粗细
+ fontColor: '#FFFFFF', // 字体颜色
+ textAlign: 'center', // 水平对齐方式
+ textPosition: 'inside', // 文字位置
+ textVerticalAlign: 'middle' // 文字垂直对齐方式
+ },
+ standText: { // 站台
+ position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
+ distance: 24, // 文字离区段距离
+ fontSize: 11, // 字体大小
+ fontWeight: 'normal', // 字体粗细
+ fontColor: '#FFFFFF', // 字体颜色
+ textAlign: 'center', // 水平对齐方式
+ textPosition: 'inside', // 文字位置
+ textVerticalAlign: 'middle' // 文字垂直对齐方式
+ },
+ reentryText: { // 折返
+ position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
+ distance: 36, // 文字离区段距离
+ fontSize: 11, // 字体大小
+ fontWeight: 'normal', // 字体粗细
+ fontColor: '#FFFFFF', // 字体颜色
+ textAlign: 'center', // 水平对齐方式
+ textPosition: 'inside', // 文字位置
+ textVerticalAlign: 'middle' // 文字垂直对齐方式
+ },
+ transferText: { // 转换轨
+ position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
+ distance: 36, // 文字离区段距离
+ fontSize: 11, // 字体大小
+ fontWeight: 'normal', // 字体粗细
+ fontColor: '#FFFFFF', // 字体颜色
+ textAlign: 'center', // 水平对齐方式
+ textPosition: 'inside', // 文字位置
+ textVerticalAlign: 'middle' // 文字垂直对齐方式
+ },
+ destinationText: { // 目的地
+ opposite: true, // 对称相反
+ position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
+ distance: 12, // 文字离区段距离
+ fontSize: 11, // 字体大小
+ fontWeight: 'bold', // 字体粗细
+ fontColor: 'yellow', // 字体颜色
+ textAlign: 'center', // 水平对齐方式
+ textPosition: 'inside', // 文字位置
+ textVerticalAlign: 'middle' // 文字垂直对齐方式
+ },
+ line: {
+ width: 5, // 区段宽度
+ beyondWidth: 0, // 区段宽超出宽度
+ invadeColor: '#FFFFFF', // 区段侵入颜色
+ spareColor: '#5578B6', // 区段空闲颜色
+ communicationOccupiedColor: 'lightpink', // 区段通信车占用颜色
+ unCommunicationOccupiedColor: 'red', // 区段非通讯车占用颜色
+ routeLockColor: 'rgba(0, 255, 0, 1)', // 区段路由锁定颜色
+ faultLockColor: 'white', // 区段故障锁定颜色
+ undefinedColor: '#0071C1', // 区段未定义颜色
+ protectionLockedColor: '#FFFFFF', // 保护区段锁闭
+ blockColor: 'pink', // 区段封锁颜色
+ atcExcisionColor: '#A0522D', // 区段atc切除颜色
+ atsExcisionColor: '#A0522D', // 区段ats切除颜色
+ timeReleaseColor: '#3F3F3F', // 区段延时释放颜色
+ protectiveLockColor: '#92D14F', // 区段保护锁闭
+ protectiveTimeReleaseColor: '#0071C1', // 区段保护延时解锁
+ logicalColor: '#FFFF00', // 逻辑区段颜色 (未用)
+ logicalTextColor: 'white' // 逻辑区段名称颜色 (未用)
+ },
+ axle: {
+ radius: 3, // 计轴 半径
+ distance: 5, // 计轴和区段之间的距离 （未用）
+ color: 'white', // 区段计轴颜色
+ resetColor: '#00FFFF', // 区段计轴预复位颜色
+ Failure: '#E6A23C' // #FFFF00 计轴失效
+ },
+ speedLimit: { // 限速元素
+ width: 1, // 限速线的宽度
+ distance: 5, // 限速线距离区段距离
+ lineColor: '#C0C000', // 限速线颜色 （黄色透明光）
+ nameBackground: '#C0C000', // 限速名称背景颜色
+ nameShow: true, // 名称显示
+ nameNumberColor: '#C00808', // 限速值颜色
+ nameNumberFontSize: 11, // 限速值大小
+ kilometerColor: '#fff', // 公里标颜色
+ kilometerFontSize: 8, // 公里标大小
+ drogueWidth: 19, // 浮标宽度
+ drogueHeight: 12 // 浮标高度
+ },
+ separator: {
+ z: 6, // 分割符层级
+ width: 1.5, // 分隔符宽度
+ endWidth: 1.5, // 尽头分隔符宽度
+ endColor: '#FFFFFF', // 尽头分隔符颜色
+ color: 'white' // 区段边界符颜色
+ }
+ };
+
+ this[deviceType.Signal] = {
+ distance: 3, // 设备距离区段的距离
+ post: {
+ standardColor: '#C0C0C0', // 灯柱颜色
+ standardWidth: 2 // 灯柱宽度
+ },
+ text: {
+ distance: 3, // 文字和灯杆的距离
+ isNoRotation: true, // 是否禁止旋转
+ isAlignCenter: false, // 信号字体对其方式
+ fontSize: 11, // 信号机名称字体大小
+ fontWeight: 'bold', // 信号机名称字体粗细
+ defaultColor: 'white', // 信号灯字体默认色
+ blockColor: '#EF0C08', // 信号灯字体锁定颜色
+ checkColor: '#00FF00' // 信号保护区段检查颜色
+ },
+ lamp: {
+ borderVariable: true, // 信号灯边框可变
+ stopWidth: 2, // 禁止线宽度
+ borderWidth: 2, // 信号灯边框线宽度
+ borderColor: '#3149C3', // 信号灯边框线颜色
+ radiusR: 3, // 信号灯半径
+ blockColor: '#EF0C08', // 信号灯锁闭
+ grayColor: '#C0C0C0', // 信号灯灰色
+ redColor: 'red', // 信号灯红色
+ greenColor: 'green', // 信号灯绿色
+ yellowColor: 'yellow', // 信号灯黄色
+ whiteColor: '#FFFFFF', // 信号灯白色
+ blueColor: '#0070C0' // 信号灯蓝色
+ },
+ route: {
+ direction: true, // 自动通过方向
+ offset: { x: 4, y: 0}, // 自动通过偏移量
+ routeColor: '#00FF00' // 自动进路
+ },
+ auto: {
+ direction: false, // 自动通过方向
+ offset: { x: -4, y: 0}, // 自动通过偏移量
+ width: 5, // 自动宽度
+ manualControl: '#FFFF00', // 人工控制
+ autoRoute: '#00FF00', // 自动进路
+ autoTrigger: '#FFFF00', // 自动触发
+ outConflict: '#C00808' // 出车冲突
+ },
+ delay: {
+ direction: false, // 延时解锁方向
+ offset: { x: -5, y: 0}, // 延时解锁偏移量
+ fontSize: 11, // 延迟解锁字体大小
+ fontColor: '#C00808', // 延迟解锁颜色
+ fontWeight: 'bold' // 字体粗细
+
+ },
+ button: {
+ distance: 5, // 信号灯按钮距离区段的距离
+ borderDashColor: '#FFFFFF', // 信号灯按钮边线
+ buttonColor: 'darkgreen', // 信号灯按钮颜色
+ buttonLightenColor: 'yellow' // 信号灯按钮闪烁颜色
+ }
+ };
+
+ this[deviceType.StationStand] = {
+ common: { // 通用属性
+ textFontSize: 10, // 站台默认字体大小
+ haveJumpShow: true // 站台是否有列车停跳显示
+ },
+ safetyDoor: { // 屏蔽门
+ height: 3, // 站台屏蔽门高度
+ distance: 4, // 站台和屏蔽门之间的距离
+ defaultColor: 'green', // 屏蔽门默认颜色
+ splitDoorColor: 'green' // 屏蔽门切除颜色
+ },
+ stand: { // 站台
+ headFontSize: 10, // 站台首端字体大小
+ spareColor: 'white', // 站台空闲颜色
+ stopColor: 'yellow', // 站台列车停站颜色
+ jumpStopColor: 'blue', // 站台跳停颜色
+ designatedJumpStopColor: 'lightSkyBlue' // 站台指定列车跳停颜色
+ },
+ standEmergent: { // 紧急关闭
+ mergentR: 4, // 站台紧急关闭半径
+ offset: {x: 0, y: 40}, // 站台紧急关闭偏移量
+ closeColor: 'red' // 站台紧急关闭颜色
+ },
+ reentry: { // 站台折返策略
+ position: 0, // 折返方向
+ offset: {x: -16, y: 20}, // 折返偏移量
+ noHumanColor: '#0F16DA', // 站台无人折返
+ autoChangeEndsColor: '#0BF400' // 站台自动换端
+ },
+ detainCar: { // 扣车
+ text: '扣', // 扣车显示内容
+ position: -1, // 扣车方向
+ offset: {x: -8, y: -20}, // 扣车偏移量
+ trainColor: 'yellow', // 车站扣车颜色
+ centerTrainColor: 'white', // 中心扣车颜色
+ andCenterTrainColor: 'red', // 车站+中心扣车颜色
+ detainTrainTextColor: '#E4EF50' // 车站扣除文字颜色
+ },
+ stopTime: { // 停站时间
+ position: 1, // 运行时间方向
+ offset: {x: -8, y: -4}, // 运行时间偏移量
+ textColor: 'white' // 停站时间字体颜色
+ },
+ jump: {
+ text: '跳', // 停跳显示内容
+ position: -1, // 停跳方向
+ offset: {x: -8, y: 0},
+ textColor: '#0000FF', // 停跳文字颜色
+ arcColor: '#0000FF', // 停跳圆圈颜色
+ fillColor: 'rgba(0,0,0,0)', // 透明填充颜色
+ r: 8 // 圆半径大小
+ },
+ level: { // 运行等级
+ position: 1, // 运行等级方向
+ offset: {x: -8, y: 30}, // 运行等级偏移量
+ textColor: '#FFF000' // 停站等级字体颜色
+ }
+ };
+
+ this[deviceType.StationControl] = {
+ text: {
+ distance: 2, // 灯和文字之间的距离
+ fontSize: 12, // 字体大小
+ fontFormat: 'consolas', // 字体格式
+ fontColor: '#ffffff', // 字体颜色
+ fontWeight: 'normal', // 字体粗细
+ textAlign: 'middle', // 字体水平对齐
+ textVerticalAlign: 'top' // 字体垂直对齐
+ },
+ lamp: {
+ count: 4, // 控制模式的个数
+ offset: {x: 0, y: 0}, // 偏移量
+ radiusR: 4, // 控制模式灯的半径
+ distance: 36, // 控制模式之间灯之间的距离
+ grayColor: '#C0C0C0', // 控制模式灰色
+ greenColor: 'green', // 控制模式绿色
+ redColor: 'red', // 控制模式红色
+ yellowColor: 'yellow' // 控制模式黄色
+ },
+ arrow: {
+ show: false // 控制模式箭头显隐
+ }
+ };
+
+ this[deviceType.StationCounter] = {
+ text: {
+ distance: 2, // 计数器名称和文字的距离
+ fontColor: '#FFFFFF', // 计数器字体颜色
+ borderColor: '#E4EF50' // 计数器边框颜色
+ }
+ };
+
+ this[deviceType.StationDelayUnlock] = {
+ text: {
+ distance: 3, // 延迟解锁和设备之间的距离
+ fontColor: '#FFFFFF', // 延时解锁字体颜色
+ borderColor: '#FFFFFF' // 延迟解锁边框颜色
+ }
+ };
+
+ this[deviceType.Station] = {
+ kilometerPosition: 'up' // 公里标朝向
+ };
+
+ this[deviceType.Switch] = {
+ text: {
+ position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
+ offset: {x: 5, y: -10}, // 道岔名称与区段距离
+ fontSize: 11, // 字体大小
+ fontWeight: 'normal', // 字体粗细
+ borderColor: '#FE0000', // 道岔边框颜色
+ lossColor: 'lightgreen', // 道岔失去颜色
+ locateColor: 'lightgreen', // 道岔定位颜色
+ inversionColor: 'lightgreen', // 道岔反位颜色
+ monolockColor: '#FFFFFF' // 道岔单锁颜色
+ },
+ core: {
+ length: 10 // 道岔单边长度
+ },
+ monolock: { // 道岔单锁配置
+ locationColor: '#00FF00', // 道岔单锁'定位'颜色 (绿色)
+ inversionColor: '#FFFF00', // 道岔单锁'反位'颜色 (黄色)
+ rectShow: true, // 道岔单锁 矩形框是否显示
+ rectWidth: 18, // 矩形框 宽高
+ rectBorderColor: '#fff' // 矩形边框颜色
+ },
+ block: { // 道岔封锁配置
+ nameBorderShow: false, // 道岔名称是否有包围框 显示
+ contentRectShow: true, // 道岔封锁显示
+ contentRectColor: 'red' // 道岔封锁边框颜色
+ }
+ };
+
+ this[deviceType.LcControl] = {
+ text: {
+ fontSize: 11, // 字体大小
+ fontWeight: 'normal', // 字体粗细
+ distance: 5 // 灯跟文字距离
+ },
+ lamp: {
+ radiusR: 6, // 控制灯大小
+ controlColor: '#FFFF00' // 控制灯颜色
+ }
+ };
+
+ this[deviceType.ZcControl] = {
+ text: {
+ fontSize: 11, // 字体大小
+ fontWeight: 'normal', // 字体粗细
+ distance: 5 // 灯跟文字距离
+ },
+ lamp: {
+ radiusR: 6, // 控制灯大小
+ controlColor: '#00FF00' // 控制灯颜色
+ }
+ };
+
+ this[deviceType.LimitControl] = {
+ text: {
+ fontSize: 11, // 字体大小
+ fontWeight: 'normal', // 字体粗细
+ distance: 5 // 灯跟文字距离
+ },
+ lamp: {
+ radiusR: 6, // 控制灯大小
+ controlColor: '#ECE9D8' // 控制灯颜色
+ }
+ };
+
+ this[deviceType.Line] = {
+ lineColor: '#FFFFFF' // 线条颜色
+ };
+
+ this[deviceType.TrainWindow] = {
+ lineColor: '#4DD43F', // 车次窗颜色
+ lineDash: null, // 车次窗虚线间隔
+ lineWidth: 1, // 车次窗线宽
+ trainWindowSmooth: 0 // 车次窗矩形圆滑程度
+ };
+
+ this[deviceType.Train] = {
+ trainBody: {
+ trainBodyLineWidth: 1, // 车身line宽
+ changeTrainWidth: false, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
+ specialTrainType: [], // 特殊列车类型需设置显示格式
+ lrPadding: 4, // 两边间隔
+ upPadding: 4, // 上边距离
+ trainBodyFillColor: '#000099', // 列车车身填充颜色
+ trainNameFormat: 'serviceNumber:targetCode'// 列车显示格式
+ },
+ hsda: {
+ lrPaddingHSDA: 3, // HSDA两边间隔
+ upPaddingHSDA: 4, // HSDA上边距离
+ trainHSDATextFontSize: 8, // 列车HDSA字号
+ textHContent: '扣', // textH文本
+ textSContent: '跳', // textS文本
+ textDContent: '门', // textD文本
+ textAContent: '警' // textA文本
+ },
+ trainNumber: {
+ targetCodePrefix: '000', // 目的地码前缀
+ defaultTargetCode: 'DDD', // 默认目的地码
+ trainTargetTextAlign: 'left', // 目的地码文字显示位置
+ trainNumberOffset: { x: 24, y: 4}// 目的地码偏移量
+ },
+ trainServer: {
+ serviceNumberPrefix: '000', // 服务号(表号)前缀
+ defaultServiceNumber: 'TTT', // 默认服务号（表号）
+ defaultServerNoColor: '#FFFFFF', // 默认服务号状态显示颜色
+ trainServerOffset: { x: 4, y: 4} // 列车服务号偏移
+ },
+ trainTarget: {
+ tripNumberPrefix: '000', // 车次号前缀
+ defaultTripNumber: 'DDD', // 默认车次号2
+ trainTargetOffset: { x: 36, y: 4}, // 列车车次号偏移
+ trainTargetTextAlign: 'right' // 车次号文字显示位置
+ },
+ trainTargetNumber: {
+ trainTargetNumberOffset: {x: 0, y: 0}// 车组号偏移量
+ },
+ trainHead: {
+ trainMoreLength: 1, // 列车车头比车身高出的长度,上下相比车体伸出去的边框
+ trainHeadTriangleFirst: { x: 7, y: 1}, // 列车车头三角坐标1偏移量
+ trainHeadTriangleSecond: { x: 13, y: 10}, // 列车车头三角坐标2偏移量
+ trainHeadTriangleThird: { x: 7, y: 19}, // 列车车头三角坐标3偏移量
+ trainConntWidth: 4, // 列车竖杠的宽度
+ trainHeadFillColor: '#000000', // 列车车头矩形填充颜色
+ trainHeadRectHeight: 20 // 列车车头矩形高度
+ },
+ common: {
+ trainHeight: 20, // 列车高度
+ trainHeadDistance: 2, // 列车和车头之间的间距
+ trainWidth: 55, // 列车长度
+ trainTextFontSize: 16, // 列车字号
+ fontFamily: 'consolas', // 默认字体 族类
+ haveTextHSDA: true, // 是否需创建textHSDA对象
+ haveArrowText: true, // 是否需创建arrowText对象
+ haveTrainBorder: false, // 是否需创建trainBorder对象
+ aspectRatio: 7/5, // 字体宽高比例（用以拼接text是计算位置）
+ textOffset: 4, // 字体偏移（用以控制字体据车头的距离）
+ trainWidthMoreText: 8, // 计算列车长度时--列车长比text多出尺寸
+ useSelfFormat: true, // 使用配置项的nameFormat
+ useSelfText: true // 使用配置项的字体大小
+ },
+ trainStatusStyle: {
+ defaultDestinationColor: '#FFFFFF', // 默认目的地状态显示颜色
+ destinationStatusSetText: 'trainTarget', // 目的地状态设置的对应哪个text的颜色
+ destinationStatus: [
+ {status: '01', showColor: '#FFFFFF'},
+ {status: '02', showColor: '#00FF00'},
+ {status: '03', showColor: '#A0522D'},
+ {status: '04', showColor: '#FFFF00'}
+ ], // 目的地状态 01准点 02早点 03晚点 04头码车
+ serverNoType: [
+ {type: '01', showColor: '#FFFFFF'},
+ {type: '02', showColor: '#FFF000'}
+ ], // 服务号状态类型 01显示服务号 计划车 02显示车组号: 头码车与人工车
+ directionType: [
+ {
+ type: '01',
+ lineLShow: true,
+ lineRShow: true,
+ arrowLShow: false,
+ arrowRShow: false
+ },
+ {
+ type: '02',
+ lineLShow: false,
+ lineRShow: true,
+ arrowLShow: false,
+ arrowRShow: true
+ },
+ {
+ type: '03',
+ lineLShow: true,
+ lineRShow: false,
+ arrowLShow: true,
+ arrowRShow: false
+ }
+ ], // 列车运行方向状态类型对应车头显示状态 01未知方向 02从左往右 上行 03从右往左 下行
+ directionStopType: [
+ {
+ type: '01',
+ lineLShow: false,
+ lineRShow: false
+ },
+ {
+ type: '02',
+ lineLShow: false,
+ lineRShow: true
+ },
+ {
+ type: '03',
+ lineLShow: true,
+ lineRShow: false
+ }
+ ], // 列车停止方向类型对应车头显示状态 01未知方向 02从左往右 上行 03从右往左 下行
+ runModeStatus: [
+ {
+ status: '01',
+ trainLColor: '#FFFFFF',
+ trainRColor: '#FFFFFF'
+ },
+ {
+ status: '02',
+ trainLColor: '#00FF00',
+ trainRColor: '#00FF00'
+ },
+ {
+ status: '03',
+ trainLColor: '#FFFF00',
+ trainRColor: '#FFFF00'
+ },
+ {
+ status: '04',
+ trainLColor: '#A0522D',
+ trainRColor: '#A0522D'
+ },
+ {
+ status: '05',
+ trainLColor: '#A0522D',
+ trainRColor: '#A0522D'
+ }
+ ], // 列车运行模式对应车头颜色 01未知 02 ATO自动驾驶模式AM 03 ATP监控下的人工驾驶模式CM 04 限制人工驾驶模式RM 05 非限制人工驾驶模式RM
+ runControlStatus: [
+ {
+ status: '01',
+ hShow: false,
+ sShow: false
+ },
+ {
+ status: '02',
+ hShow: true,
+ sShow: false
+ },
+ {
+ status: '03',
+ hShow: false,
+ sShow: true
+ }
+ ], // 设置运行控制状态类型 01正常 02扣车 03停跳
+ doorStatus: [
+ {status: '01', dShow: false},
+ {status: '02', dShow: true}
+ ], // 设置车门状态类型 01关门 02开门
+ communicationStatus: [
+ {status: '01', trainColor: '#725A64'},
+ {status: '02', trainColor: '#C0C0C0'}
+ ], // 设置通信状态 01正常 02故障
+ alarmStatus: [
+ {status: '01', aShow: false},
+ {status: '02', aShow: true}
+ ] // 设置报警状态 01不报警 02报警
+ }
+ };
+ }
+}
+
+export default new SkinStyle();
diff --git a/src/jmap/config/skinCode/fuzhou_01.js b/src/jmap/config/skinCode/fuzhou_01.js
new file mode 100644
index 000000000..61e8bd6c9
--- /dev/null
+++ b/src/jmap/config/skinCode/fuzhou_01.js
@@ -0,0 +1,454 @@
+import defaultStyle from '../defaultStyle';
+import deviceType from '../../constant/deviceType';
+
+class SkinStyle extends defaultStyle {
+ constructor() {
+ super();
+ this[deviceType.Link] = {
+ lineWidthColor: '#FFFFFF', // line 颜色
+ linkWidth: 4.4, // link 宽度
+ linkColor: '#3F3F3F', // link 线条颜色
+ linkTextColor: '#FFFFFF' // link 字体颜色
+ };
+
+ this[deviceType.Section] = {
+ text: {
+ position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
+ distance: 18, // 文字离区段距离
+ fontSize: 11, // 字体大小
+ fontWeight: 'normal', // 字体粗细
+ fontColor: '#FFFFFF', // 字体颜色
+ textAlign: 'center', // 水平对齐方式
+ textPosition: 'inside', // 文字位置
+ textVerticalAlign: 'middle' // 文字垂直对齐方式
+ },
+ logicText: {
+ position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
+ distance: 6, // 文字离区段距离
+ fontSize: 8, // 字体大小
+ fontWeight: 'normal', // 字体粗细
+ fontColor: '#FFFFFF', // 字体颜色
+ textAlign: 'center', // 水平对齐方式
+ textPosition: 'inside', // 文字位置
+ textVerticalAlign: 'middle' // 文字垂直对齐方式
+ },
+ standText: {
+ position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
+ distance: 30, // 文字离区段距离
+ fontSize: 11, // 字体大小
+ fontWeight: 'normal', // 字体粗细
+ fontColor: '#FFFFFF', // 字体颜色
+ textAlign: 'center', // 水平对齐方式
+ textPosition: 'inside', // 文字位置
+ textVerticalAlign: 'middle' // 文字垂直对齐方式
+ },
+ reentryText: {
+ position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
+ distance: 30, // 文字离区段距离
+ fontSize: 11, // 字体大小
+ fontWeight: 'normal', // 字体粗细
+ fontColor: '#FFFFFF', // 字体颜色
+ textAlign: 'center', // 水平对齐方式
+ textPosition: 'inside', // 文字位置
+ textVerticalAlign: 'middle' // 文字垂直对齐方式
+ },
+ transferText: {
+ position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
+ distance: 28, // 文字离区段距离
+ fontSize: 11, // 字体大小
+ fontWeight: 'normal', // 字体粗细
+ fontColor: '#FFFFFF', // 字体颜色
+ textAlign: 'center', // 水平对齐方式
+ textPosition: 'inside', // 文字位置
+ textVerticalAlign: 'middle' // 文字垂直对齐方式
+ },
+ destinationText: {
+ opposite: true, // 对称相反
+ position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
+ distance: 10, // 文字离区段距离
+ fontSize: 10, // 字体大小
+ fontWeight: 'bold', // 字体粗细
+ fontColor: 'yellow', // 字体颜色
+ textAlign: 'center', // 水平对齐方式
+ textPosition: 'inside', // 文字位置
+ textVerticalAlign: 'middle' // 文字垂直对齐方式
+ },
+ line: {
+ width: 5, // 区段宽度
+ beyondWidth: 1, // 区段宽超出宽度
+ invadeColor: '#EF0C08', // 区段侵入颜色
+ spareColor: '#3F3F3F', // 区段空闲颜色
+ communicationOccupiedColor: '#FF329A', // 区段通信车占用颜色
+ unCommunicationOccupiedColor: '#FE0000', // 区段非通讯车占用颜色
+ routeLockColor: '#FFFFFF', // 区段路由锁定颜色
+ faultLockColor: '#9B4A0A', // 区段故障锁定颜色
+ undefinedColor: '#0071C1', // 区段未定义颜色
+ protectionLockedColor: '#FEFF00', // 保护区段锁闭(未用)
+ blockColor: '#800080', // 区段封锁颜色
+ atcExcisionColor: '#A0522D', // 区段atc切除颜色
+ atsExcisionColor: '#A0522D', // 区段ats切除颜色
+ timeReleaseColor: '#3F3F3F', // 区段延时释放颜色
+ protectiveLockColor: '#FFFF00', // 区段保护锁闭
+ protectiveTimeReleaseColor: '#0071C1', // 区段保护延时解锁
+ logicalColor: '#FFFF00', // 逻辑区段颜色 (未用)
+ logicalTextColor: '#FFFFFF' // 逻辑区段名称颜色 (未用)
+ },
+ axle: {
+ radius: 3, // 计轴 半径
+ distance: 5, // 计轴和区段之间的距离 （未用）
+ color: '#FFFFFF', // 区段计轴颜色
+ resetColor: '#00FFFF', // 区段计轴预复位颜色
+ Failure: '#E6A23C' // #FFFF00 计轴失效
+ },
+ speedLimit: { // 限速元素
+ width: 1, // 限速线的宽短
+ distance: 5, // 限速线距离区段距离
+ lineColor: '#FFFF00', // 限速线颜色
+ nameShow: false // 名称显示
+ },
+ separator: {
+ z: 6, // 分割符层级
+ width: 1.2, // 分隔符宽度
+ endWidth: 3.5, // 尽头分隔符宽度
+ endColor: '#3F3F3F', // 尽头分隔符颜色
+ color: '#3149C3' // 区段边界符颜色
+ }
+ };
+
+ this[deviceType.Signal] = {
+ distance: 10, // 设备距离区段的距离
+ post: {
+ standardColor: '#3149C3', // 灯珠颜色
+ standardWidth: 2 // 灯珠宽度
+ },
+ text: {
+ distance: 0, // 文字和灯杆的距离
+ isNoRotation: true, // 是否禁止旋转
+ isAlignCenter: true, // 信号字体对其方式
+ fontSize: 11, // 信号机名称字体大小
+ fontWeight: 'bold', // 信号机名称字体粗细
+ defaultColor: '#FFFFFF', // 信号灯字体默认色
+ blockColor: '#EF0C08', // 信号灯字体锁定颜色
+ checkColor: '#00FF00', // 信号字体
+ nameBorderShow: true // 信号机名字边框显示
+ },
+ lamp: {
+ stopWidth: 2, // 禁止线宽度
+ borderWidth: 1, // 信号灯边框线宽度
+ borderColor: '#3149C3', // 信号灯边框线颜色
+ radiusR: 6, // 信号灯半径
+ blockColor: '#EF0C08', // 信号灯锁闭
+ grayColor: '#7F7F7F', // 信号灯灰色
+ redColor: '#FF0000', // 信号灯红色
+ greenColor: '#00FF00', // 信号灯绿色
+ yellowColor: '#FFFF00', // 信号灯黄色
+ whiteColor: '#FFFFFF', // 信号灯白色
+ blueColor: '#0070C0' // 信号灯蓝色
+ },
+ route: {
+ direction: false, // 自动进路方向
+ offset: { x: -4, y: 0 }, // 自动进路偏移量
+ routeColor: '#00FF00' // 自动进路
+ },
+ auto: {
+ direction: false, // 自动通过方向
+ offset: { x: -4, y: 0}, // 自动通过偏移量
+ width: 5, // 自动宽度
+ autoRoute: '#00FF00', // 自动进路
+ autoTrigger: '#FFFF00', // 自动触发
+ manualControl: '#FFFF00', // 人工控制
+ outConflict: '#C00808' // 出车冲突
+ },
+ delay: {
+ direction: true, // 延时解锁方向
+ offset: { x: 15, y: -10}, // 延时解锁偏移量
+ fontSize: 11, // 延迟解锁字体大小
+ fontColor: '#FF0000', // 延迟解锁颜色
+ fontWeight: 'bold' // 字体粗细
+ },
+ button: {
+ distance: 5, // 信号灯按钮距离区段的距离
+ borderDashColor: '#FFFFFF', // 信号灯按钮边线
+ buttonColor: 'darkgreen', // 信号灯按钮颜色
+ buttonLightenColor: '#E4EF50' // 信号灯按钮闪烁颜色
+ }
+ };
+
+ this[deviceType.StationStand] = {
+ common: { // 通用属性
+ textFontSize: 11 // 站台默认字体大小
+ },
+ safetyDoor: { // 屏蔽门
+ height: 3, // 站台屏蔽门高度
+ distance: 8, // 站台和屏蔽门之间的距离
+ defaultColor: '#00FF00', // 屏蔽门默认颜色
+ splitDoorColor: '#F61107' // 屏蔽门切除颜色
+ },
+ stand: { // 站台
+ headFontSize: 11, // 站台首端字体大小
+ spareColor: '#606060', // 站台空闲颜色
+ stopColor: '#FEFE00', // 站台列车停站颜色
+ jumpStopColor: '#9A99FF', // 站台跳停颜色
+ designatedJumpStopColor: 'lightSkyBlue' // 站台指定列车跳停颜色
+ },
+ standEmergent: { // 紧急关闭
+ mergentR: 4, // 站台紧急关闭半径
+ offset: {x: 0, y: 40}, // 站台紧急关闭偏移量
+ closeColor: '#F61107' // 站台紧急关闭颜色
+ },
+ reentry: { // 站台折返策略
+ position: 0, // 折返方向
+ offset: {x: -16, y: 20}, // 折返偏移量
+ noHumanColor: '#0F16DA', // 站台无人折返
+ autoChangeEndsColor: '#0BF400' // 站台自动换端
+ },
+ detainCar: { // 扣车
+ text: 'H', // 扣车显示内容
+ position: -1, // 扣车方向
+ offset: {x: -8, y: -6}, // 扣车偏移量
+ trainColor: '#E4EF50', // 车站扣车颜色
+ centerTrainColor: '#FFFFFF', // 中心扣车颜色
+ andCenterTrainColor: '#F61107', // 车站+中心扣车颜色
+ detainTrainTextColor: '#E4EF50' // 车站扣除文字颜色
+ },
+ stopTime: { // 停站时间
+ position: 1, // 运行时间方向
+ offset: {x: -8, y: 26}, // 运行时间偏移量
+ textColor: '#FFFFFF' // 停站时间字体颜色
+ },
+ level: { // 运行等级
+ position: 1, // 运行等级方向
+ offset: {x: -8, y: 6}, // 运行等级偏移量
+ textColor: '#FFFFFF' // 停站等级字体颜色
+ }
+ };
+
+ this[deviceType.StationControl] = {
+ text: {
+ distance: 2, // 灯和文字之间的距离
+ fontSize: 11, // 字体大小
+ fontFormat: 'consolas', // 字体格式
+ fontColor: '#ffffff', // 字体颜色
+ fontWeight: 'normal', // 字体粗细
+ textAlign: 'middle', // 字体水平对齐
+ textVerticalAlign: 'top' // 字体垂直对齐
+ },
+ lamp: {
+ count: 2, // 控制模式灯个数
+ offset: {x: 0, y: 0}, // 控制模式灯偏移量
+ radiusR: 4, // 控制模式灯的半径
+ distance: 36, // 控制模式之间灯之间的距离
+ grayColor: '#7F7F7F', // 控制模式灰色
+ greenColor: '#00FF00', // 控制模式绿色
+ redColor: '#FF0000', // 控制模式红色
+ yellowColor: '#FFFF00' // 控制模式黄色
+ },
+ arrow: {
+ show: true // 控制模式箭头显隐
+ }
+ };
+
+ this[deviceType.StationCounter] = {
+ text: {
+ distance: 2, // 计数器名称和文字的距离
+ fontColor: '#FFFFFF', // 计数器字体颜色
+ borderColor: '#E4EF50' // 计数器边框颜色
+ }
+ };
+
+ this[deviceType.StationDelayUnlock] = {
+ text: {
+ distance: 3, // 延迟解锁和设备之间的距离
+ fontColor: '#FFFFFF', // 延时解锁字体颜色
+ borderColor: '#FFFFFF' // 延迟解锁边框颜色
+ }
+ };
+
+ this[deviceType.Station] = {
+ kilometerPosition: 'up' // 公里标朝向
+ };
+
+ this[deviceType.Switch] = {
+ text: {
+ position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
+ offset: {x: 0, y: 8}, // 道岔名称与区段距离
+ fontSize: 11, // 字体大小
+ fontWeight: 'normal', // 字体粗细
+ borderColor: '#FE0000', // 道岔边框颜色
+ lossColor: '#FFFFFF', // 道岔失去颜色
+ locateColor: '#00FF00', // 道岔定位颜色
+ inversionColor: '#9C9D09', // 道岔反位颜色
+ monolockColor: '#870E10' // 道岔单锁颜色
+ },
+ core: {
+ length: 6 // 道岔单边长度
+ },
+ block: { // 道岔封锁配置
+ nameBorderShow: true, // 道岔名称是否有包围框 显示
+ contentRectShow: false // 道岔封锁显示
+ },
+ monolock: { // 道岔单锁配置
+ locationColor: '#870E10', // 道岔单锁定位颜色 (红色)
+ inversionColor: '#870E10', // 道岔单锁反位颜色 (红色)
+ rectShow: false // 道岔单锁 矩形框是否显示
+ }
+ };
+
+ this[deviceType.Line] = {
+ lineColor: '#FFFFFF' // 线条颜色
+ };
+
+ this[deviceType.LcControl] = {};
+
+ this[deviceType.ZcControl] = {};
+
+ this[deviceType.LimitControl] = {};
+
+ this[deviceType.TrainWindow] = {
+ lineColor: '#4DD43F', // 车次窗颜色
+ lineDash: null, // 车次窗虚线间隔
+ lineWidth: 1, // 车次窗线宽
+ trainWindowSmooth: 0 // 车次窗矩形圆滑程度
+ };
+
+ this[deviceType.Train] = {
+ trainBody: {
+ trainBodyLineWidth: 0, // 车身line宽
+ changeTrainWidth: true, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
+ specialTrainType: [
+ {
+ type: '03',
+ serviceNumber: 'MM',
+ nameFormat: 'serviceNumber:groupNumber'
+ }
+ ], // 特殊列车类型需设置显示格式
+ lrPadding: 1, // 两边间隔
+ upPadding: 1, // 上边距离
+ trainBodyFillColor: '#000000', // 列车车身填充颜色
+ trainNameFormat: 'targetCode:serviceNumber:tripNumber'// 列车显示格式
+ },
+ hsda: {
+ trainHSDATextFontSize: 8// 列车HDSA字号
+ },
+ trainNumber: {
+ targetCodePrefix: '000', // 目的地码前缀
+ defaultTargetCode: 'AAA', // 默认目的地码
+ trainTargetTextAlign: 'left', // 车次号文字显示位置
+ trainNumberOffset: { x: 1, y: 1}// 目的地码偏移量
+ },
+ trainServer: {
+ serviceNumberPrefix: '00', // 服务号(表号)前缀
+ defaultServiceNumber: 'BB', // 默认服务号（表号）
+ trainServerOffset: { x: 26, y: 1}// 列车服务号偏移
+ },
+ trainTarget: {
+ tripNumberPrefix: '0000', // 车次号前缀
+ defaultDirectionCode: 'D', // 默认车次号1
+ defaultTripNumber: 'CCC', // 默认车次号2
+ trainTargetOffset: { x: 42, y: 1}// 列车车次号偏移
+ },
+ trainTargetNumber: {
+ groupNumberPrefix: '000', // 车组号前缀
+ defaultGroupNumber: 'EEE', // 默认车组号
+ trainTargetNumberOffset: {x: 0, y: 1}// 车组号偏移量
+ },
+ trainHead: {
+ trainMoreLength: 1, // 列车车头比车身高出的长度,上下相比车体伸出去的边框
+ trainHeadTriangleFirst: { x: 0, y: 0}, // 列车车头三角坐标1偏移量
+ trainHeadTriangleSecond: { x: 4, y: 7.5}, // 列车车头三角坐标2偏移量
+ trainHeadTriangleThird: { x: 0, y: 15}, // 列车车头三角坐标3偏移量
+ trainHeadRectHeight: 15, // 列车车头矩形高度
+ trainConntWidth: 4, // 列车竖杠的宽度
+ trainHeadFillColor: '#EF0C08'// 列车车头矩形填充颜色
+ },
+ common: {
+ trainHeight: 17, // 列车高度
+ trainHeadDistance: 2, // 列车和车头之间的间距
+ trainWidth: 76, // 列车长度
+ trainTextFontSize: 15, // 列车字号
+ fontFamily: 'consolas', // 默认字体 族类
+ nameFontSize: 15, // 字体大小
+ haveTextHSDA: false, // 是否需创建textHSDA对象
+ haveArrowText: true, // 是否需创建arrowText对象
+ haveTrainBorder: false, // 是否需创建trainBorder对象
+ aspectRatio: 8/15, // 字体宽高比例（用以拼接text是计算位置）
+ textOffset: 1, // 字体偏移（用以控制字体据车头的距离）
+ trainWidthMoreText: 2 // 计算列车长度时--列车长比text多出尺寸
+ },
+ trainStatusStyle: {
+ destinationStatus: [
+ {status: '01', showColor: '#FFFFFF'},
+ {status: '02', showColor: '#00FF00'},
+ {status: '03', showColor: '#3265FF'},
+ {status: '04', showColor: '#9B4A09'},
+ {status: '05', showColor: '#EF0C08'},
+ {status: '06', showColor: '#FFFFFF'},
+ {status: '07', showColor: '#FFFF00'}
+ ], // 目的地状态 01准点 02早点 03严重早点 04晚点 05严重晚点 06头码车 07ATP切除
+ destinationStatusSetText: 'trainServer', // 目的地状态设置的对应哪个text的颜色
+ directionType: [
+ {
+ type: '01',
+ lineLShow: false,
+ lineRShow: false,
+ arrowLShow: false,
+ arrowRShow: false
+ },
+ {
+ type: '02',
+ lineLShow: false,
+ lineRShow: false,
+ arrowLShow: false,
+ arrowRShow: true
+ },
+ {
+ type: '03',
+ lineLShow: false,
+ lineRShow: false,
+ arrowLShow: true,
+ arrowRShow: false
+ }
+ ], // 运行方向状态类型对应车头显示状态 01未知方向 02从左往右 上行 03从右往左 下行
+ directionStopType: [
+ {type: '01', lineLShow: false, lineRShow: false},
+ {type: '02', lineLShow: false, lineRShow: true},
+ {type: '03', lineLShow: true, lineRShow: false}
+ ], // 列车停止方向类型对应车头显示状态 01未知方向 02从左往右 上行 03从右往左 下行
+ runModeStatus: [
+ {
+ status: '01',
+ trainLColor: '#EF0C08',
+ trainRColor: '#EF0C08'
+ },
+ {
+ status: '02',
+ trainLColor: '#00FF00',
+ trainRColor: '#00FF00'
+ },
+ {
+ status: '03',
+ trainLColor: '#FFFF00',
+ trainRColor: '#FFFF00'
+ },
+ {
+ status: '04',
+ trainLColor: '#EA700D',
+ trainRColor: '#EA700D'
+ },
+ {
+ status: '05',
+ trainLColor: '#A0522D',
+ trainRColor: '#A0522D'
+ }
+ ], // 列车运行模式对应车头颜色 01信号中断 02 ATO自动驾驶模式AM 03 ATP监控下的人工驾驶模式CM 04 限制人工驾驶模式RM 05 非限制人工驾驶模式RM
+ runControlStatus: [], // 设置运行控制状态类型 eg:{status: '01', hShow: false, sShow: false}
+ doorStatus: [], // 设置车门状态类型 eg:{status: '01', dShow: false}
+ communicationStatus: [], // 设置通信状态 eg:{status: '01', trainColor:'#725A64'}
+ alarmStatus: [], // 设置报警状态 eg:{status: '01', aShow: false}
+ serverNoType: []// 服务号状态类型 eg:{type: '01', showColor: '#FFFFFF'}
+ }
+ };
+ }
+}
+
+export default new SkinStyle();
diff --git a/src/views/map/skinCode/draft.vue b/src/views/map/skinCode/draft.vue
new file mode 100644
index 000000000..8d72221d4
--- /dev/null
+++ b/src/views/map/skinCode/draft.vue
@@ -0,0 +1,217 @@
+
+ {{ tip }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/map/skinCode/index.vue b/src/views/map/skinCode/index.vue
new file mode 100644
index 000000000..71ad38679
--- /dev/null
+++ b/src/views/map/skinCode/index.vue
@@ -0,0 +1,124 @@
+
+
+
+ 创建
+ 更新
+ 返回
+
+
+
+
+
+
+
From 78a805cd2f2522e9a220f86d0eb2e1ae023244b6 Mon Sep 17 00:00:00 2001
From: ival <610568032@qq.com>
Date: Wed, 14 Aug 2019 09:35:38 +0800
Subject: [PATCH 015/172] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9A=AE=E8=82=A4ski?=
=?UTF-8?q?nStyle=E4=B8=BAskinCode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/jlmap3d/load3ddata.js | 12 +-
src/api/jmap/map.js | 16 +-
src/api/management/mapprd.js | 4 +-
src/api/management/operation.js | 8 +-
src/api/runplan.js | 30 +-
src/jlmap3d/jl3dsimulation/jl3dsimulation.js | 142 ++---
src/jlmap3d/jlmap3d.js | 4 +-
src/jmap/config/deviceStyle.js | 2 +-
src/jmap/config/skinStyle/batong_01.js | 16 -
src/jmap/config/skinStyle/bejing_01.js | 556 ------------------
src/jmap/config/skinStyle/chengdu_03.js | 545 -----------------
src/jmap/config/skinStyle/chengdu_04.js | 543 -----------------
src/jmap/config/skinStyle/fuzhou_01.js | 454 --------------
src/jmap/map.js | 12 +-
.../batong_01/menus/dialog/trainControl.vue | 2 +-
.../batong_01/menus/dialog/trainCreate.vue | 2 +-
.../batong_01/menus/dialog/trainDelete.vue | 2 +-
.../beijing_01/menus/dialog/trainCreate.vue | 2 +-
.../beijing_01/menus/dialog/trainDelete.vue | 2 +-
.../menusPlan/chooseTemplatePlan.vue | 6 +-
.../beijing_01/menusPlan/createTodayPlan.vue | 14 +-
.../theme/beijing_01/planSchedule/index.vue | 8 +-
.../theme/beijing_01/planSchedule/menuBar.vue | 2 +-
.../beijing_01/planSchedule/schedule.vue | 4 +-
.../chengdu_03/menus/dialog/trainControl.vue | 2 +-
.../chengdu_03/menus/dialog/trainCreate.vue | 2 +-
.../menus/dialog/trainCreateNumber.vue | 2 +-
.../chengdu_03/menus/dialog/trainDelete.vue | 2 +-
.../menus/dialog/trainDeleteNumber.vue | 2 +-
.../menus/dialog/trainEditNumber.vue | 2 +-
.../menus/dialog/trainMoveNumber.vue | 2 +-
.../menusPlan/chooseTemplatePlan.vue | 6 +-
.../chengdu_03/menusPlan/createTodayPlan.vue | 14 +-
.../theme/chengdu_03/planSchedule/index.vue | 10 +-
.../theme/chengdu_03/planSchedule/menuBar.vue | 2 +-
.../chengdu_03/planSchedule/schedule.vue | 4 +-
.../menusPlan/chooseTemplatePlan.vue | 6 +-
.../chengdu_04/menusPlan/createTodayPlan.vue | 14 +-
.../theme/chengdu_04/planSchedule/index.vue | 8 +-
.../theme/chengdu_04/planSchedule/menuBar.vue | 2 +-
.../chengdu_04/planSchedule/schedule.vue | 4 +-
.../fuzhou_01/menus/dialog/trainControl.vue | 4 +-
.../fuzhou_01/menus/dialog/trainCreate.vue | 2 +-
.../fuzhou_01/menus/dialog/trainDelete.vue | 2 +-
.../menusPlan/chooseTemplatePlan.vue | 6 +-
.../fuzhou_01/menusPlan/createTodayPlan.vue | 14 +-
.../theme/fuzhou_01/planSchedule/index.vue | 8 +-
.../theme/fuzhou_01/planSchedule/menuBar.vue | 2 +-
.../theme/fuzhou_01/planSchedule/schedule.vue | 4 +-
src/jmap/utils/parser.js | 4 +-
src/router/index.js | 12 +-
src/scripts/OperationConfig.js | 158 ++---
src/scripts/translate.js | 6 +-
src/store/modules/map.js | 2 +-
src/utils/loaddata.js | 10 +-
src/views/demonstration/deomonList/index.vue | 2 +-
src/views/demonstration/deomonTopic/index.vue | 2 +-
src/views/demonstration/detail/index.vue | 12 +-
src/views/display/demon/addQuest.vue | 2 +-
src/views/display/demon/faultChoose.vue | 6 +-
src/views/display/demon/runPlanLoad.vue | 4 +-
src/views/display/demon/runPlanView.vue | 2 +-
src/views/display/index.vue | 34 +-
src/views/display/menuSchema.vue | 4 +-
src/views/display/tipTrainingDetail.vue | 4 +-
src/views/exam/detail/courseDetail.vue | 2 +-
src/views/exam/detail/questionDetail.vue | 6 +-
src/views/jlmap/index.vue | 8 +-
src/views/jlmap3d/edit/map3dlist.vue | 6 +-
src/views/jlmap3d/index.vue | 10 +-
.../jlmap3d/simulation/jl3dsimulation.vue | 10 +-
src/views/jointTraining/index.vue | 12 +-
src/views/jointTraining/menuSchema.vue | 4 +-
.../lessoncategory/edit/chapter/list.vue | 4 +-
.../lessoncategory/edit/lesson/index.vue | 24 +-
.../lessoncategory/edit/lesson/publish.vue | 4 +-
src/views/lesson/trainingRule/addBatch.vue | 10 +-
src/views/lesson/trainingRule/addEdit.vue | 14 +-
src/views/lesson/trainingRule/detail/edit.vue | 2 +-
.../lesson/trainingRule/detail/index.vue | 2 +-
src/views/lesson/trainingRule/list.vue | 12 +-
src/views/lesson/trainingcategory/edit.vue | 8 +-
src/views/lesson/trainingmanage/draft.vue | 24 +-
src/views/lesson/trainingmanage/index.vue | 16 +-
.../lesson/trainingrecord/category/draft.vue | 16 +-
.../lesson/trainingrecord/manage/index.vue | 2 +-
src/views/management/userSimulation/add.vue | 8 +-
.../mapdraft/mapedit/mapoperate/counter.vue | 2 +-
.../mapedit/mapoperate/delayunlock.vue | 2 +-
.../mapdraft/mapedit/mapoperate/lcControl.vue | 2 +-
.../mapedit/mapoperate/limitControl.vue | 2 +-
.../map/mapdraft/mapedit/mapoperate/line.vue | 2 +-
.../mapdraft/mapedit/mapoperate/section.vue | 2 +-
.../mapdraft/mapedit/mapoperate/signal.vue | 2 +-
.../mapdraft/mapedit/mapoperate/station.vue | 2 +-
.../mapedit/mapoperate/stationcontrol.vue | 2 +-
.../mapedit/mapoperate/stationstand.vue | 2 +-
.../mapdraft/mapedit/mapoperate/switch.vue | 2 +-
.../map/mapdraft/mapedit/mapoperate/text.vue | 2 +-
.../map/mapdraft/mapedit/mapoperate/train.vue | 2 +-
.../mapdraft/mapedit/mapoperate/zcControl.vue | 2 +-
src/views/map/mapdraft/mapmanage/create.vue | 14 +-
src/views/map/mapdraft/mapmanage/edit.vue | 16 +-
src/views/map/mapdraft/mapmanage/maplist.vue | 8 +-
.../map/mapdraft/mapmanage/operateMenu.vue | 6 +-
src/views/map/product/draft.vue | 8 +-
src/views/map/product/list.vue | 4 +-
src/views/map/runplan/chart.vue | 6 +-
src/views/map/runplan/manage/create.vue | 12 +-
src/views/map/runplan/manage/list.vue | 4 +-
src/views/map/runplan/manage/operateMenu.vue | 8 +-
src/views/map/skinStyle/draft.vue | 217 -------
src/views/map/skinStyle/index.vue | 124 ----
src/views/mapsystem/common/index.vue | 14 +-
src/views/orderauthor/commodity/draft.vue | 4 +-
src/views/package/draft/editRule.vue | 2 +-
src/views/package/draft/ruleForm.vue | 2 +-
src/views/planMonitor/detail.vue | 6 +-
src/views/planMonitor/editTool/index.vue | 12 +-
src/views/planMonitor/editTool/menuBar.vue | 6 +-
.../planMonitor/editTool/menus/addTask.vue | 6 +-
.../editTool/menus/createEmptyPlan.vue | 4 +-
.../menus/modifyingStationIntervalTime.vue | 6 +-
.../editTool/menus/modifyingTask.vue | 8 +-
.../editTool/menus/openRunPlan.vue | 10 +-
src/views/planMonitor/editTool/schedule.vue | 10 +-
src/views/publish/productStatus/index.vue | 4 +-
src/views/publish/publishMap/index.vue | 4 +-
.../runPlanCommon/chooseTemplatePlan.vue | 6 +-
src/views/publish/runPlanCommon/index.vue | 2 +-
src/views/publish/runPlanEveryDay/index.vue | 10 +-
src/views/publish/runPlanTemplate/index.vue | 10 +-
src/views/replay/index.vue | 2 +-
src/views/screenMonitor/detail/index.vue | 6 +-
src/views/teach/detail/index.vue | 4 +-
src/views/trainRoom/index.vue | 4 +-
136 files changed, 562 insertions(+), 3017 deletions(-)
delete mode 100644 src/jmap/config/skinStyle/batong_01.js
delete mode 100644 src/jmap/config/skinStyle/bejing_01.js
delete mode 100644 src/jmap/config/skinStyle/chengdu_03.js
delete mode 100644 src/jmap/config/skinStyle/chengdu_04.js
delete mode 100644 src/jmap/config/skinStyle/fuzhou_01.js
delete mode 100644 src/views/map/skinStyle/draft.vue
delete mode 100644 src/views/map/skinStyle/index.vue
diff --git a/src/api/jlmap3d/load3ddata.js b/src/api/jlmap3d/load3ddata.js
index f741651c1..942d0eadf 100644
--- a/src/api/jlmap3d/load3ddata.js
+++ b/src/api/jlmap3d/load3ddata.js
@@ -1,17 +1,17 @@
import request from '@/utils/request';
/** 根据皮肤获取地图版本信息*/
-export function getPublishMapVersion(skinStyle) {
+export function getPublishMapVersion(skinCode) {
return request({
- url: `/api/map/skin/${skinStyle}/version`,
+ url: `/api/map/skin/${skinCode}/version`,
method: 'get'
});
}
/** 根据皮肤获取发布地图详细内容*/
-export function getPublishMapDetail(skinStyle) {
+export function getPublishMapDetail(skinCode) {
const datad = request({
- url: `/api/map/skin/${skinStyle}/details`,
+ url: `/api/map/skin/${skinCode}/details`,
method: 'get'
});
return datad.then();
@@ -66,9 +66,9 @@ export function loadmap3dModel() {
method: 'get'
});
}
-export function getPublish3dMapDetail(skinStyle) {
+export function getPublish3dMapDetail(skinCode) {
const datad = request({
- url: `/api/map/${skinStyle}/3dMapData`,
+ url: `/api/map/${skinCode}/3dMapData`,
method: 'get'
});
return datad.then();
diff --git a/src/api/jmap/map.js b/src/api/jmap/map.js
index 6958aaef5..bf3a24d42 100644
--- a/src/api/jmap/map.js
+++ b/src/api/jmap/map.js
@@ -10,25 +10,25 @@ export function getPublishMapList(params) {
}
/** 根据皮肤获取发布地图列表*/
-export function getPublishMapListBySkinStyle(skinStyle) {
+export function getPublishMapListBySkinStyle(skinCode) {
return request({
- url: `/api/map/${skinStyle}/list`,
+ url: `/api/map/${skinCode}/list`,
method: 'get'
});
}
/** 根据皮肤获取地图版本信息*/
-export function getPublishMapVersion(skinStyle) {
+export function getPublishMapVersion(skinCode) {
return request({
- url: `/api/map/skin/${skinStyle}/version`,
+ url: `/api/map/skin/${skinCode}/version`,
method: 'get'
});
}
/** 根据皮肤获取发布地图详细内容*/
-export function getPublishMapDetail(skinStyle) {
+export function getPublishMapDetail(skinCode) {
return request({
- url: `/api/map/skin/${skinStyle}/details`,
+ url: `/api/map/skin/${skinCode}/details`,
method: 'get'
});
}
@@ -50,9 +50,9 @@ export function getPublishMapDetailById(id) {
}
/** 获取发布地图列车列表*/
-export function getPublishTrainList(skinStyle) {
+export function getPublishTrainList(skinCode) {
return request({
- url: `/api/map/${skinStyle}/train`,
+ url: `/api/map/${skinCode}/train`,
method: 'get'
});
}
diff --git a/src/api/management/mapprd.js b/src/api/management/mapprd.js
index 364d3f224..384e5759c 100644
--- a/src/api/management/mapprd.js
+++ b/src/api/management/mapprd.js
@@ -62,9 +62,9 @@ export function deleteTrainingCategory(data) {
/**
* 获取地图下的产品列表
*/
-export function getCommodityMapProduct(skinStyle) {
+export function getCommodityMapProduct(skinCode) {
return request({
- url: `/api/mapPrd/${skinStyle}/list`,
+ url: `/api/mapPrd/${skinCode}/list`,
method: 'get'
});
}
diff --git a/src/api/management/operation.js b/src/api/management/operation.js
index 2409521f6..a3c600395 100644
--- a/src/api/management/operation.js
+++ b/src/api/management/operation.js
@@ -90,9 +90,9 @@ export function deleteOperateStepData(id) {
/**
* 批量生成操作列表
*/
-export function addTrainingRulesList(skinStyle, data) {
+export function addTrainingRulesList(skinCode, data) {
return request({
- url: `/api/operate/${skinStyle}/generate`,
+ url: `/api/operate/${skinCode}/generate`,
method: 'post',
data: data
});
@@ -107,7 +107,7 @@ export function getPlaceholderList(data) {
method: 'get',
params: {
trainingType: data.trainingType,
- skinStyle: data.skinStyle
+ skinCode: data.skinCode
}
});
}
@@ -121,7 +121,7 @@ export function getOperateTrainingList(data) {
method: 'get',
params: {
productType: data.productType,
- skinStyle: data.skinStyle
+ skinCode: data.skinCode
}
});
}
diff --git a/src/api/runplan.js b/src/api/runplan.js
index 502dd0af8..ebf923982 100644
--- a/src/api/runplan.js
+++ b/src/api/runplan.js
@@ -13,9 +13,9 @@ export function getRunPlanList() {
/**
* 获取地图速度等级列表
*/
-export function getSpeedLevels(skinStyle) {
+export function getSpeedLevels(skinCode) {
return request({
- url: `/api/runPlan/draft/${skinStyle}/speed`,
+ url: `/api/runPlan/draft/${skinCode}/speed`,
method: 'get'
});
}
@@ -44,9 +44,9 @@ export function getStationList(mapId) {
/**
* 通过皮肤获取运行图车站列表
*/
-export function getStationListBySkinStyle(skinStyle) {
+export function getStationListBySkinStyle(skinCode) {
return request({
- url: `/api/runPlan/draft/station/${skinStyle}/bySkin`,
+ url: `/api/runPlan/draft/station/${skinCode}/bySkin`,
method: 'get'
});
}
@@ -98,16 +98,16 @@ export function publishRunPlan(data) {
*/
export function importRunPlan(data) {
return request({
- url: `/api/runPlan/draft/${data.skinStyle}/prdPlan`,
+ url: `/api/runPlan/draft/${data.skinCode}/prdPlan`,
method: 'post',
data: data.runPlanList
});
}
/** 获取运行图停车点列表*/
-export function getRunPlanStopPointList(skinStyle) {
+export function getRunPlanStopPointList(skinCode) {
return request({
- url: `/api/runPlan/draft/stopPoint/${skinStyle}`,
+ url: `/api/runPlan/draft/stopPoint/${skinCode}`,
method: 'get'
});
}
@@ -121,17 +121,17 @@ export function getRpListByMapId(mapId) {
}
/** 获取站间运行时间*/
-export function getStationRunning(skinStyle) {
+export function getStationRunning(skinCode) {
return request({
- url: `/api/runPlan/draft/${skinStyle}/stationRunning`,
+ url: `/api/runPlan/draft/${skinCode}/stationRunning`,
method: 'get'
});
}
/** 设置站间运行时间*/
-export function setStationRunning(skinStyle, data) {
+export function setStationRunning(skinCode, data) {
return request({
- url: `/api/runPlan/draft/${skinStyle}/stationRunning`,
+ url: `/api/runPlan/draft/${skinCode}/stationRunning`,
method: 'put',
data: data
});
@@ -309,17 +309,17 @@ export function deleteRunPlanEveryDay(planId) {
}
/** 获取地图运行图的车次号*/
-export function getPublishMapTrainNos(skinStyle) {
+export function getPublishMapTrainNos(skinCode) {
return request({
- url: `/api/runPlan/daily/${skinStyle}/trainNos`,
+ url: `/api/runPlan/daily/${skinCode}/trainNos`,
method: 'get'
});
}
/** 获取服务号、车组号*/
-export function getPublishMapTrainServerNos(skinStyle) {
+export function getPublishMapTrainServerNos(skinCode) {
return request({
- url: `/api/runPlan/daily/${skinStyle}/serverNos`,
+ url: `/api/runPlan/daily/${skinCode}/serverNos`,
method: 'get'
});
}
diff --git a/src/jlmap3d/jl3dsimulation/jl3dsimulation.js b/src/jlmap3d/jl3dsimulation/jl3dsimulation.js
index a7dd16443..a0e198932 100644
--- a/src/jlmap3d/jl3dsimulation/jl3dsimulation.js
+++ b/src/jlmap3d/jl3dsimulation/jl3dsimulation.js
@@ -1,37 +1,37 @@
import Vue from 'vue';
-//main
+// main
import {Three} from '@/jlmap3d/main/three.min.js';
-//模型loader
+// 模型loader
import { AssetLoader } from '@/jlmap3d/main/loaders/AssetLoader.js';
import {DDSLoader} from '@/jlmap3d/main/loaders/DDSLoader.js';
import {OBJLoader} from '@/jlmap3d/main/loaders/OBJLoader.js';
import {MTLLoader} from '@/jlmap3d/main/loaders/MTLLoader.js';
import { FBXLoader } from '@/jlmap3d/main/loaders/FBXLoader.js';
-//controls
+// controls
import {OrbitControls} from '@/jlmap3d/control/OrbitControls.js';
import { DragControls } from '@/jlmap3d/edit/control/DragControls.js';
-//component
+// component
import {Helper} from '@/jlmap3d/component/Helper';
-//data
+// data
import { Jl3ddata } from '@/jlmap3d/jl3ddata';
-//setconfig
+// setconfig
import { SetCamera } from '@/jlmap3d/config/Camera';
import { SetRender } from '@/jlmap3d/config/Render';
import { SetScene } from '@/jlmap3d/config/Scene';
-//加载器
+// 加载器
import { ModelLoad } from '@/jlmap3d/jl3dsimulation/simulationloader';
-//connect
+// connect
import {Jl3dDriving} from '@/jlmap3d/jl3dsimulation/moveupdate/DrivingConnect';
-//import {Jlmap3dSubscribe} from '@/jlmap3d/connect/TrainingConnectTest';
+// import {Jlmap3dSubscribe} from '@/jlmap3d/connect/TrainingConnectTest';
import { getPublishMapVersion, getPublishMapDetail,getPublish3dMapDetail} from '@/api/jlmap3d/load3ddata';
-//utils
+// utils
import { UpdateTrain } from '@/jlmap3d/jl3dsimulation/moveupdate/UpdateTrain';
-//import { UpdateTrain } from '@/jlmap3d/utils/UpdateTrainTest';
+// import { UpdateTrain } from '@/jlmap3d/utils/UpdateTrainTest';
import { ReStart } from '@/jlmap3d/utils/ReStart';
import {Stats} from '@/jlmap3d/main/lib/stats.min.js';
@@ -40,41 +40,41 @@ import {MouseControls} from '@/jlmap3d/control/FirstControls';
var clock = new THREE.Clock();
-export function JLmapDriving(dom, data,skinStyle) {
+export function JLmapDriving(dom, data,skinCode) {
let scope = this;
this.dom = dom;
- //渲染循环开关
+ // 渲染循环开关
this.animateswitch = false;
- //初始化webgl渲染
+ // 初始化webgl渲染
let renderer = SetRender(dom);
renderer.domElement.style.position = "absolute";
renderer.domElement.style.top = "0";
document.getElementById('jlsimulation').appendChild(renderer.domElement);
- //定义相机
+ // 定义相机
let camera = SetCamera(dom);
- //定义场景(渲染容器)
+ // 定义场景(渲染容器)
let scene = SetScene();
let speed = 0;
let drivingcode = null;
- //模型加载器
+ // 模型加载器
this.assetloader = new AssetLoader();
- //替换材质组，例：信号机不同灯光
+ // 替换材质组，例：信号机不同灯光
this.materiallist = [];
- //初始化场景线框和灯光 暂时
+ // 初始化场景线框和灯光 暂时
Helper(scene);
- //点击选中的模型
+ // 点击选中的模型
this.selectmodel = null;
- //鼠标点击模型切换
+ // 鼠标点击模型切换
this.raycasterswitch = "stand";
- //选中物体描边方框
+ // 选中物体描边方框
this.helpbox = null;
- //车门，站台门道岔动画构造器
+ // 车门，站台门道岔动画构造器
this.mixers = [];
- //模型操作命令组
+ // 模型操作命令组
this.actions = {};
this.nowspeed = null;
this.nowmxlen = null;
@@ -84,7 +84,7 @@ export function JLmapDriving(dom, data,skinStyle) {
this.stime = null;
this.webwork=new Worker("../../static/workertest/trainworker.js");
- //地图模型数据
+ // 地图模型数据
let mapdata = new Jl3ddata();
let camera2 = new THREE.PerspectiveCamera( 60,window.innerWidth / window.innerHeight, 1, 2000 );
@@ -93,40 +93,40 @@ export function JLmapDriving(dom, data,skinStyle) {
let controls3 = new MouseControls(camera2, 1.6);
controls3.enabled = true;
scene.add(controls3.getObject());
- //订阅仿真socket
+ // 订阅仿真socket
this.Subscribe = new Jl3dDriving(scope);
- //连接到通信
- //console.log(this.Subscribe.config);
+ // 连接到通信
+ // console.log(this.Subscribe.config);
- //this.webwork.postMessage(this.Subscribe.teststomp);
+ // this.webwork.postMessage(this.Subscribe.teststomp);
this.Subscribe.socketon(scope.Subscribe.topic);
- //初始化加载数据和模型
- getPublish3dMapDetail(skinStyle).then(netdata => {
+ // 初始化加载数据和模型
+ getPublish3dMapDetail(skinCode).then(netdata => {
ModelLoad(data,scope,netdata.data,mapdata,camera,controls3,scene);
});
- //let stats = new Stats();
- //dom.appendChild( stats.dom );
- //开启渲染
+ // let stats = new Stats();
+ // dom.appendChild( stats.dom );
+ // 开启渲染
animate();
startWorker();
- //动画时间
+ // 动画时间
let delta;
- //循环渲染函数
+ // 循环渲染函数
function animate() {
- //循环渲染
- //requestAnimationFrame(animate);
- //renderer.setAnimationLoop(animate);
+ // 循环渲染
+ // requestAnimationFrame(animate);
+ // renderer.setAnimationLoop(animate);
requestAnimationFrame(animate);
- //判断渲染是否开启
+ // 判断渲染是否开启
if(scope.animateswitch == true){
- //根据相机渲染场景
+ // 根据相机渲染场景
renderer.render(scene,camera2);
- //updatcontrols();
+ // updatcontrols();
controls3.update();
- //检测动画构造器播放动画
+ // 检测动画构造器播放动画
}
@@ -147,8 +147,8 @@ export function JLmapDriving(dom, data,skinStyle) {
scope.webwork.onmessage = function (event) {
- //更新列车位置
- // stats.update();
+ // 更新列车位置
+ // stats.update();
UpdateTrain(camera,mapdata.trainlisttest);
delta = clock.getDelta();
for(let i=scope.mixers.length-1;i>=0;i--){
@@ -195,7 +195,7 @@ export function JLmapDriving(dom, data,skinStyle) {
renderer.setAnimationLoop(null);
renderer.dispose();
scene.dispose();
- // controls.dispose();
+ // controls.dispose();
camera = null;
scope.assetloader = null;
@@ -208,8 +208,8 @@ export function JLmapDriving(dom, data,skinStyle) {
scope.mixers = null;
scope.actions = null;
scope.Subscribe = null;
- //console.log(scope);
- //scope = null;
+ // console.log(scope);
+ // scope = null;
}
this.rayswitch = function(value){
@@ -249,12 +249,12 @@ export function JLmapDriving(dom, data,skinStyle) {
};
this.animateon = function(){
- //controls.enabled = false;
+ // controls.enabled = false;
scope.animateswitch = true;
};
this.animateoff = function(){
- //controls.enabled = false;
+ // controls.enabled = false;
scope.animateswitch = false;
};
@@ -263,19 +263,19 @@ export function JLmapDriving(dom, data,skinStyle) {
};
this.eventon = function(){
- //raycaster交互模型点击事件
+ // raycaster交互模型点击事件
document.getElementById("jlsimulation").addEventListener( "mousedown", onselect, false );
- //窗口自适应
+ // 窗口自适应
window.addEventListener( 'resize', onWindowResized, false );
- //controls.update();
+ // controls.update();
};
this.eventoff = function(){
- //console.log("off");
- //raycaster交互模型点击事件
+ // console.log("off");
+ // raycaster交互模型点击事件
document.getElementById("jlsimulation").removeEventListener( "mousedown", onselect, false );
- //窗口自适应
+ // 窗口自适应
window.removeEventListener( 'resize', onWindowResized, false );
};
@@ -286,15 +286,15 @@ export function JLmapDriving(dom, data,skinStyle) {
camera.position.x = mesh.position.x-300;
camera.position.y = 100;
camera.position.z = mesh.children[0].position.z;
- //controls.target = new THREE.Vector3(mesh.position.x,0,mesh.children[0].position.z);
+ // controls.target = new THREE.Vector3(mesh.position.x,0,mesh.children[0].position.z);
}
- //console.log(mesh);
+ // console.log(mesh);
if(type == "station"){
camera.position.x = mesh.position.x;
camera.position.y = mesh.position.y+800;
camera.position.z = mesh.position.z+300;
- //更新相机方向
- //controls.target = new THREE.Vector3(mesh.position.x,mesh.position.y,mesh.position.z);
+ // 更新相机方向
+ // controls.target = new THREE.Vector3(mesh.position.x,mesh.position.y,mesh.position.z);
}
if(type == "train"){
camera.position.x = mesh.position.x;
@@ -306,19 +306,19 @@ export function JLmapDriving(dom, data,skinStyle) {
function onWindowResized() {
- //窗口自适应
+ // 窗口自适应
camera.aspect = window.innerWidth / window.innerHeight;
camera.updateProjectionMatrix();
renderer.setSize( window.innerWidth, window.innerHeight );
}
- //三维交互点击事件函数
+ // 三维交互点击事件函数
function onselect(event) {
if(event.button == "0"){
- //定义光线
+ // 定义光线
let raycaster = new THREE.Raycaster();
- //定义平面鼠标点击坐标
+ // 定义平面鼠标点击坐标
let mouse = new THREE.Vector2();
mouse.x = (event.clientX / window.innerWidth) * 2 - 1;
mouse.y = -(event.clientY / window.innerHeight) * 2 + 1;
@@ -330,19 +330,19 @@ export function JLmapDriving(dom, data,skinStyle) {
}
if(scope.raycasterswitch == "stand"){
- //从站台对象组获取点击目标
+ // 从站台对象组获取点击目标
let intersects1 = raycaster.intersectObjects( mapdata.stationstandlist.textlist);
- //获取最近处点击到的模型对象
+ // 获取最近处点击到的模型对象
if(intersects1[0]){
- //遍历对象组获取对象坐标更新相机数据
+ // 遍历对象组获取对象坐标更新相机数据
for(let j=0;j
-
- 创建
- 更新
- 返回
-
-
-
-
-
-
-
diff --git a/src/views/mapsystem/common/index.vue b/src/views/mapsystem/common/index.vue
index 1560d403e..582c54d93 100644
--- a/src/views/mapsystem/common/index.vue
+++ b/src/views/mapsystem/common/index.vue
@@ -46,9 +46,9 @@ export default {
},
watch: {
'$store.state.map.mapDataLoadedCount': function () {
- const skinStyle = this.$jlmap.skinStyle;
- if (skinStyle) {
- this.menus = this.$theme.loadMenuComponent(skinStyle);
+ const skinCode = this.$jlmap.skinCode;
+ if (skinCode) {
+ this.menus = this.$theme.loadMenuComponent(skinCode);
}
}
},
@@ -69,8 +69,8 @@ export default {
// 根据皮肤类型转换激活的菜单类型
getSelectedBySkinStyle(device) {
const switchSectionIsWitchSkinStyleList = ['03'];
- const skinStyle = this.$store.getters['map/skinStyle'];
- if (switchSectionIsWitchSkinStyleList.includes(skinStyle) && device._type == deviceType.Section) {
+ const skinCode = this.$store.getters['map/skinCode'];
+ if (switchSectionIsWitchSkinStyleList.includes(skinCode) && device._type == deviceType.Section) {
const section = this.$store.getters['map/getDeviceByCode'](device._code);
if (section) {
device = this.$store.getters['map/getDeviceByCode'](section.relSwitchCode);
@@ -133,10 +133,10 @@ export default {
this.$store.dispatch('training/emitTipFresh');
},
checkShouldPop(device) {
- const skinStyle = this.$store.getters['map/skinStyle'];
+ const skinCode = this.$store.getters['map/skinCode'];
if (device._type === 'Signal') {
return device._viewVal === '3';
- } else if (device._type === 'StationControl' && skinStyle == '01') { // 中控模式显示范围
+ } else if (device._type === 'StationControl' && skinCode == '01') { // 中控模式显示范围
return device._viewVal === '1';
} else {
return true;
diff --git a/src/views/orderauthor/commodity/draft.vue b/src/views/orderauthor/commodity/draft.vue
index 1f830175a..dae816de0 100644
--- a/src/views/orderauthor/commodity/draft.vue
+++ b/src/views/orderauthor/commodity/draft.vue
@@ -58,7 +58,7 @@
TimeStyleDict: {},
formModel: {
name: '',
- skinStyle: '',
+ skinCode: '',
productType: '01',
mapId: '',
mapProductCode: '',
@@ -273,7 +273,7 @@
try {
let rest = await getPublishMapInfo(mapId);
if (rest && rest.code == 200) {
- let resp = await getCommodityMapProduct(rest.data.skinStyle);
+ let resp = await getCommodityMapProduct(rest.data.skinCode);
if (resp && resp.code == 200) {
resp.data.forEach(ele => {
this.mapProductCodeList.push({ value: ele.code, label: ele.name, prdType: ele.prdType });
diff --git a/src/views/package/draft/editRule.vue b/src/views/package/draft/editRule.vue
index cc7c54504..e2678b865 100644
--- a/src/views/package/draft/editRule.vue
+++ b/src/views/package/draft/editRule.vue
@@ -203,7 +203,7 @@
this.formModel.lessonId = '';
this.mapProductList = [];
getPublishMapInfo(mapId).then(resp => {
- getCommodityMapProduct(resp.data.skinStyle).then(rest => {
+ getCommodityMapProduct(resp.data.skinCode).then(rest => {
let list = rest.data || [];
this.mapProductList = list.map(elem => {
return { value: elem.code, label: elem.name };
diff --git a/src/views/package/draft/ruleForm.vue b/src/views/package/draft/ruleForm.vue
index c0a9286af..5ee994efe 100644
--- a/src/views/package/draft/ruleForm.vue
+++ b/src/views/package/draft/ruleForm.vue
@@ -138,7 +138,7 @@
async computedMapProduct(item) {
let name = '';
let resp = await getPublishMapInfo(item.mapId);
- let rest = await getCommodityMapProduct(resp.data.skinStyle);
+ let rest = await getCommodityMapProduct(resp.data.skinCode);
let list = rest.data || [];
list.forEach(elem => {
if (elem.id = item.mapProductCode) {
diff --git a/src/views/planMonitor/detail.vue b/src/views/planMonitor/detail.vue
index 0186290b2..6b675bf44 100644
--- a/src/views/planMonitor/detail.vue
+++ b/src/views/planMonitor/detail.vue
@@ -48,7 +48,7 @@
courseModel: {
mapId: '',
name: '',
- skinStyle: '',
+ skinCode: '',
updateTime: '',
pmsList: [],
},
@@ -115,7 +115,7 @@
that.courseModel = {
name: res.data.name,
mapId: res.data.id,
- skinStyle: res.data.skinStyle,
+ skinCode: res.data.skinCode,
updateTime: res.data.updateTime,
pmsList: that.screenList || [],
PermissionType: PermissionType.PLAN
@@ -148,7 +148,7 @@
},
jump() {
let query = {
- skinStyle: this.courseModel.skinStyle, mapId: this.courseModel.mapId,
+ skinCode: this.courseModel.skinCode, mapId: this.courseModel.mapId,
}
this.$router.push({ path: `${UrlConfig.plan.tool}`, query: query });
},
diff --git a/src/views/planMonitor/editTool/index.vue b/src/views/planMonitor/editTool/index.vue
index 65c820652..723fa7887 100644
--- a/src/views/planMonitor/editTool/index.vue
+++ b/src/views/planMonitor/editTool/index.vue
@@ -1,17 +1,17 @@
+
+
+
+
+
+
+
+ 删除
+
+
+
+
+ 创建
+
+
+
+
+
+
+
+
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/trainmodel.vue b/src/views/map/mapdraft/mapedit/mapoperate/train/trainmodel.vue
similarity index 100%
rename from src/views/map/mapdraft/mapedit/mapoperate/trainmodel.vue
rename to src/views/map/mapdraft/mapedit/mapoperate/train/trainmodel.vue
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/trainmodel.bak.vue b/src/views/map/mapdraft/mapedit/mapoperate/trainmodel.bak.vue
new file mode 100644
index 000000000..218771f38
--- /dev/null
+++ b/src/views/map/mapdraft/mapedit/mapoperate/trainmodel.bak.vue
@@ -0,0 +1,186 @@
+
+
- 仿真名称： {{ courseModel.name }}
- 无仿真产品
-
- - 产品说明： - {{ courseModel.remarks }} -
-- 权限列表： -
-
- 购买
- 权限分发
- 权限转赠
- 开始仿真
- 创建房间
- 进入房间
-
-
+ 仿真名称： {{ courseModel.name }}
+ 无仿真产品
+
+ + 产品说明： + {{ courseModel.remarks }} +
++ 权限列表： +
+
+ 购买
+ 权限分发
+ 权限转赠
+ 开始仿真
+ 创建房间
+ 进入房间
+
+
-
-
-
-
- 添加规则
-
-
-
- {{computedName(PermissionTypeList, scope.row.permissionType)}}
-
-
-
-
- {{computedName(PublishMapList, scope.row.mapId)}}
-
-
-
-
- {{scope.row.mapProductCode}}
-
-
-
-
- {{computedName(PublisLessonList, scope.row.lessonId)}}
-
-
-
-
-
-
-
-
-
-
- 修改
- 删除
-
-
-
-
-
-
-
+
+
\ No newline at end of file
+
diff --git a/src/views/teach/practical/index.vue b/src/views/teach/practical/index.vue
index 15c3c6957..49fb16a1a 100644
--- a/src/views/teach/practical/index.vue
+++ b/src/views/teach/practical/index.vue
@@ -1,112 +1,112 @@
-
-
+
+
\ No newline at end of file
+
diff --git a/src/jmap/theme/beijing_01/planSchedule/schedule.vue b/src/jmap/theme/beijing_01/planSchedule/schedule.vue
index eadfeace6..3733445b4 100644
--- a/src/jmap/theme/beijing_01/planSchedule/schedule.vue
+++ b/src/jmap/theme/beijing_01/planSchedule/schedule.vue
@@ -26,7 +26,6 @@
import { mapGetters } from 'vuex';
import { timeFormat } from '@/utils/date';
import { runDiagramGetTime } from '@/api/simulation';
-import { getStationListBySkinStyle } from '@/api/runplan';
import DataTable from '../menusPlan/components/dataTable';
export default {
diff --git a/src/jmap/theme/chengdu_03/menusPlan/chooseTemplatePlan.vue b/src/jmap/theme/chengdu_03/menusPlan/chooseTemplatePlan.vue
index c74a09940..747a38d6b 100644
--- a/src/jmap/theme/chengdu_03/menusPlan/chooseTemplatePlan.vue
+++ b/src/jmap/theme/chengdu_03/menusPlan/chooseTemplatePlan.vue
@@ -19,8 +19,7 @@
-
diff --git a/src/views/map/mapdraft/mapedit/routeoperate/detail.vue b/src/views/map/mapdraft/mapedit/routeoperate/detail.vue
index 5bd5a0c4a..1581c5d17 100644
--- a/src/views/map/mapdraft/mapedit/routeoperate/detail.vue
+++ b/src/views/map/mapdraft/mapedit/routeoperate/detail.vue
@@ -9,21 +9,21 @@
/>
-
- 打包
- 获取二维码
- 返回
-
-
-
+
+
+
+
+ 添加规则
+
+
+
+ {{ computedName(PermissionTypeList, scope.row.permissionType) }}
+
+
+
+
+ {{ computedName(PublishMapList, scope.row.mapId) }}
+
+
+
+
+ {{ scope.row.mapProductCode }}
+
+
+
+
+ {{ computedName(PublisLessonList, scope.row.lessonId) }}
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+ 打包
+ 获取二维码
+ 返回
+
-
- 实训名称： {{ courseModel.name }}
-
-
-
-
-
- - 完成实训最佳用时： - {{ courseModel.minDuration | setTime}} 秒 -
-- 完成实训最大用时： - {{ courseModel.maxDuration | setTime}} 秒 -
-- 实训说明： - {{ courseModel.remarks }} -
-
- 开始实训
-
-
+ 实训名称： {{ courseModel.name }}
+
+
+
+
+
+ + 完成实训最佳用时： + {{ courseModel.minDuration | setTime }} 秒 +
++ 完成实训最大用时： + {{ courseModel.maxDuration | setTime }} 秒 +
++ 实训说明： + {{ courseModel.remarks }} +
+
+ 开始实训
+
+ `, - `车站名称: ${station.name}
`, - `车站公里标: ${station.kmRange} km
`, - `到站时间: ${timeFormat(param.data[0] + this.PlanConvert.TranslationTime)} (${param.data[0]})
` + `${this.$t('map.stationName')}: ${station.name}
`, + `${this.$t('map.stationKilometerMark')}: ${station.kmRange} km
`, + `${this.$t('map.arrivalTime')}: ${timeFormat(param.data[0] + this.PlanConvert.TranslationTime)} (${param.data[0]})
` ].join(''); } }, diff --git a/src/views/map/runplan/draft/setting.vue b/src/views/map/runplan/draft/setting.vue index ee6ce592b..0eea20c7c 100644 --- a/src/views/map/runplan/draft/setting.vue +++ b/src/views/map/runplan/draft/setting.vue @@ -1,15 +1,15 @@ -
@@ -21,19 +21,19 @@
:value="item.code">
-->
-
+
-
+
-
+
-
+
@@ -49,11 +49,11 @@
style="margin-top: 20px;"
:rules="chartRules"
>
-
+
-
-
+
+
-
+
-
-
+
-
-
+
-
+
-
-
+
+
-
-
+
+
@@ -163,44 +163,44 @@ export default {
levelRules() {
return {
level1: [
- { required: true, message: '请输入速度等级1', trigger: 'change' }
+ { required: true, message: this.$t('map.speedLevelEnter1'), trigger: 'change' }
],
level2: [
- { required: true, message: '请输入速度等级2', trigger: 'change' }
+ { required: true, message: this.$t('map.speedLevelEnter2'), trigger: 'change' }
],
level3: [
- { required: true, message: '请输入速度等级3', trigger: 'change' }
+ { required: true, message: this.$t('map.speedLevelEnter3'), trigger: 'change' }
],
level4: [
- { required: true, message: '请输入速度等级4', trigger: 'change' }
+ { required: true, message: this.$t('map.speedLevelEnter4'), trigger: 'change' }
]
};
},
chartRules() {
return {
name: [
- { required: true, message: '请输入名称', trigger: 'blur' }
+ { required: true, message: this.$t('map.nameEnter'), trigger: 'blur' }
],
direct: [
- { required: true, message: '请选择行驶方向', trigger: 'change' }
+ { required: true, message: this.$t('map.drivingDirectionSelect'), trigger: 'change' }
],
timeInterval: [
- { required: true, message: '请输入发车间隔时间', trigger: 'blur' }
+ { required: true, message: this.$t('map.timeBetweenDeparturesEnter'), trigger: 'blur' }
],
startTime: [
- { required: true, message: '请输入开始时间', trigger: 'blur' }
+ { required: true, message: this.$t('global.enterStartTime'), trigger: 'blur' }
],
endTime: [
- { required: true, message: '请输入结束时间', trigger: 'blur' }
+ { required: true, message: this.$t('global.enterEndTime'), trigger: 'blur' }
],
parkingTime: [
- { required: true, message: '请输入停靠时间', trigger: 'blur' }
+ { required: true, message: this.$t('map.stopTimeEnter'), trigger: 'blur' }
],
entrance: [
- { required: true, message: '请选择入站口', trigger: 'change' }
+ { required: true, message: this.$t('map.entranceStationSelect'), trigger: 'change' }
],
exit: [
- { required: true, message: '请选择出战口', trigger: 'change' }
+ { required: true, message: this.$t('map.exportStationSelect'), trigger: 'change' }
]
};
}
@@ -247,7 +247,7 @@ export default {
this.disabled = true;
}
}).catch(() => {
- this.$messageBox('获取速度等级失败');
+ this.$messageBox(this.$t('error.getSpeedLevelFailed'));
});
},
createSpeedRank() {
@@ -268,9 +268,9 @@ export default {
}).catch(error => {
if (error.code === 20001) {
this.active = 1;
- this.$messageBox('速度等级已存在');
+ this.$messageBox(this.$t('error.speedRatingExists'));
} else {
- this.$messageBox('创建速度等级失败');
+ this.$messageBox(this.$t('error.createSpeedLevelFailed'));
}
this.loading = false;
});
@@ -302,7 +302,7 @@ export default {
this.close();
}, 1000);
}).catch(() => {
- this.$messageBox('创建运行图失败');
+ this.$messageBox(this.$t('map.createOperationGraphFailed'));
this.loading = false;
});
}
diff --git a/src/views/map/runplan/manage/import.vue b/src/views/map/runplan/manage/import.vue
index f057ed5fd..9cef296dd 100644
--- a/src/views/map/runplan/manage/import.vue
+++ b/src/views/map/runplan/manage/import.vue
@@ -1,13 +1,13 @@
-
+
@@ -36,7 +36,7 @@ export default {
rules() {
return {
filename: [
- { required: true, message: '请选择需要导入的文件', trigger: 'change' }
+ { required: true, message: this.$t('map.selectImportFiles'), trigger: 'change' }
]
};
}
@@ -57,7 +57,7 @@ export default {
if (file) {
const loading = this.$loading({
lock: true,
- text: '正在导入中...',
+ text: this.$t('map.underImport'),
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
diff --git a/src/views/map/runplan/manage/list.vue b/src/views/map/runplan/manage/list.vue
index aabb95840..ea22c4728 100644
--- a/src/views/map/runplan/manage/list.vue
+++ b/src/views/map/runplan/manage/list.vue
@@ -1,9 +1,9 @@
{ this.loading = false; });
}).catch(() => {
this.loading = false;
- this.$messageBox('刷新运行图列表失败');
+ this.$messageBox(this.$t('error.refreshOperationGraphFailed'));
});
},
handleNodeClick(obj, node) {
diff --git a/src/views/map/runplan/manage/operateMenu.vue b/src/views/map/runplan/manage/operateMenu.vue
index 33a7045db..4ffe89880 100644
--- a/src/views/map/runplan/manage/operateMenu.vue
+++ b/src/views/map/runplan/manage/operateMenu.vue
@@ -39,22 +39,22 @@ export default {
return {
menu1: [
{
- label: '创建运行图',
+ label: this.$t('map.createOperationGraph'),
handler: this.createChart
},
{
- label: '导入运行图',
+ label: this.$t('map.importOperationGraph'),
handler: this.importChart,
type: 'file'
}
],
menu2: [
{
- label: '发布运行图',
+ label: this.$t('map.publishOperationGraph'),
handler: this.publishChart
},
{
- label: '删除运行图',
+ label: this.$t('map.deleteOperationGraph'),
handler: this.deleteChart
}
],
@@ -117,10 +117,10 @@ export default {
this.refresh();
}).catch(() => {
- this.$messageBox('删除运行图失败');
+ this.$messageBox(this.$t('tip.deleteOperationGraphFailed'));
});
} else {
- this.$messageBox('正创建中不能做删除操作');
+ this.$messageBox(this.$t('error.cannotDeleted'));
}
},
importChart(file) {
@@ -129,7 +129,7 @@ export default {
const loading = this.$loading({
lock: true,
visible: true,
- text: '正在导入中...',
+ text: this.$t('map.underImport'),
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
@@ -161,18 +161,18 @@ export default {
importRunPlan({ skinStyle: skinStyle, runPlanList: jsonData }).then(response => {
loading.close();
that.refresh();
- that.$message.success('导入运行图成功!');
+ that.$message.success(this.$t('tip.importOperationGraphSuccessfully'));
}).catch((error) => {
console.error(error);
loading.close();
that.refresh();
- that.$message.warning('导入运行图失败!');
+ that.$message.warning(this.$t('tip.importOperationGraphFailed'));
});
} catch (error) {
console.error(error);
loading.close();
that.refresh();
- that.$message.warning('解析运行图失败!');
+ that.$message.warning(this.$t('tip.parsingOperationGraphFailed'));
}
}
};
diff --git a/src/views/map/runplan/manage/publish.vue b/src/views/map/runplan/manage/publish.vue
index 62b33e057..d9d3710a4 100644
--- a/src/views/map/runplan/manage/publish.vue
+++ b/src/views/map/runplan/manage/publish.vue
@@ -1,15 +1,15 @@
-
+
-
+
@@ -60,16 +60,16 @@ export default {
if (resp.data && resp.data.length) {
this.$emit('showCheckInfo', { contextList: resp.data });
} else {
- this.$message.success('发布运行成功');
+ this.$message.success(this.$t('tip.publishedOperationalGraphSuccessfully'));
}
this.close();
}).catch(() => {
- this.$messageBox('发布运行图失败');
+ this.$messageBox(this.$t('tip.publishedOperationalGraphFailed'));
this.loading = false;
this.close();
});
} else {
- this.$messageBox('创建中的数据不能发布');
+ this.$messageBox(this.$t('error.cannotPublished'));
this.close();
}
diff --git a/src/views/map/skinStyle/draft.vue b/src/views/map/skinStyle/draft.vue
index 8d72221d4..0d3576b2d 100644
--- a/src/views/map/skinStyle/draft.vue
+++ b/src/views/map/skinStyle/draft.vue
@@ -12,9 +12,9 @@
- 创建
- 更新
- 返回
+ {{$t('global.create')}}
+ {{$t('global.update')}}
+ {{$t('global.return')}}
@@ -48,10 +48,10 @@ export default {
computed: {
title() {
if (this.isAdd) {
- return '添加地图皮肤';
+ return this.$t('map.addMapSkin');
}
if (this.isEdit) {
- return '更新地图皮肤';
+ return this.$t('map.updateMapSkin');
}
return '';
},
@@ -68,10 +68,10 @@ export default {
const form = {
labelWidth: '140px',
items: [
- { prop: 'code', label: '皮肤编码', type: 'text', required: false, disabled: this.isDisabled },
- { prop: 'name', label: '皮肤名称', type: 'text', required: false },
- { prop: 'origin', label: '原点坐标', type: 'point', required: false },
- { prop: 'scaling', label: '缩放比例', type: 'number', required: false, message: `(缩放比例最大为8级)` }
+ { prop: 'code', label: this.$t('map.skinCoding'), type: 'text', required: false, disabled: this.isDisabled },
+ { prop: 'name', label: this.$t('map.skinDesignation'), type: 'text', required: false },
+ { prop: 'origin', label: this.$t('map.coordinatesOrigin'), type: 'point', required: false },
+ { prop: 'scaling', label: this.$t('map.scaling'), type: 'number', required: false, message: this.$t('map.maxScaling')}
]
};
return form;
@@ -80,22 +80,22 @@ export default {
rules() {
const baseRules = {
code: [
- { required: true, message: '请输入皮肤编码', trigger: 'blur' }
+ { required: true, message: this.$t('map.skinCodingInput'), trigger: 'blur' }
],
name: [
- { required: true, message: '请输入皮肤名称', trigger: 'blur' }
+ { required: true, message: this.$t('map.skinDesignationInput'), trigger: 'blur' }
],
origin: [
- { required: true, message: '请输入原点坐标', trigger: 'blur' }
+ { required: true, message: this.$t('map.coordinatesOriginInput'), trigger: 'blur' }
],
scaling: [
- { required: true, message: '请输入缩放比例', trigger: 'blur' },
+ { required: true, message: this.$t('map.scalingInput'), trigger: 'blur' },
{
validator(rule, value, callback) {
if (Number(value) >= 1 && Number(value) <= 8) {
callback();
} else {
- callback(new Error('请输入有效的缩放比例'));
+ callback(new Error(this.$t('map.scalingInputPrompt')));
}
},
trigger: 'blur'
@@ -146,12 +146,12 @@ export default {
querySkinStyleExistByCode(this.formModel.code).then(resp => {
addSkinStyle(this.formModel).then(response => {
this.turnback();
- this.$message.success('创建成功');
+ this.$message.success(this.$t('tip.creatingSuccessful'));
}).catch(() => {
- this.$messageBox('创建失败');
+ this.$messageBox(this.$t('tip.creatingFailed'));
});
}).catch(() => {
- this.$messageBox('地图皮肤编码已存在');
+ this.$messageBox(this.$t('map.skinCodingExist'));
});
});
},
@@ -160,9 +160,9 @@ export default {
this.$refs.dataform.validateForm(() => {
updateSkinStyle(this.formModel).then(response => {
this.turnback();
- this.$message.success('更新成功');
+ this.$message.success(this.$t('tip.updateSuccessfully'));
}).catch(() => {
- this.$messageBox('更新失败');
+ this.$messageBox(this.$t('tip.updateFailed'));
});
});
},
diff --git a/src/views/map/skinStyle/index.vue b/src/views/map/skinStyle/index.vue
index 71ad38679..d6906d115 100644
--- a/src/views/map/skinStyle/index.vue
+++ b/src/views/map/skinStyle/index.vue
@@ -25,11 +25,11 @@ export default {
queryObject: {
name: {
type: 'text',
- label: '皮肤名称'
+ label: this.$t('map.skinDesignation')
},
code: {
type: 'text',
- label: '皮肤编码'
+ label: this.$t('map.skinCoding')
}
}
},
@@ -39,36 +39,36 @@ export default {
indexShow: true,
columns: [
{
- title: '皮肤编码',
+ title: this.$t('map.skinCoding'),
prop: 'code'
},
{
- title: '皮肤名称',
+ title: this.$t('map.skinDesignation'),
prop: 'name'
},
{
- title: '原点坐标',
+ title: this.$t('map.coordinatesOrigin'),
prop: 'origin',
type: 'tag',
columnValue: (row) => { return `(${row.origin.x}, ${row.origin.y})`; },
tagType: () => { return ''; }
},
{
- title: '缩放比例',
+ title: this.$t('map.scalingColon'),
prop: 'scaling'
},
{
type: 'button',
- title: '操作',
+ title: this.$t('global.operate'),
width: '250',
buttons: [
{
- name: '编辑',
+ name: this.$t('global.edit'),
handleClick: this.handleEdit,
type: ''
},
{
- name: '删除',
+ name: this.$t('global.delete'),
handleClick: this.handleDelete,
type: 'danger'
}
@@ -76,7 +76,7 @@ export default {
}
],
actions: [
- { text: '新增', handler: this.handleAdd }
+ { text: this.$t('global.add'), handler: this.handleAdd }
]
}
};
@@ -103,15 +103,15 @@ export default {
this.$router.push(`${UrlConfig.map.skinStyleDraft}/edit/${row.id}`);
},
handleDelete(index, row) {
- this.$confirm('此操作将永久删除该皮肤, 是否继续?', '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
+ this.$confirm(this.$t('map.skinDeleteConfirmation'), this.$t('tip.hint'), {
+ confirmButtonText: this.$t('tip.confirm'),
+ cancelButtonText: this.$t('tip.cancel'),
type: 'warning'
}).then(() => {
delSkinStyle(row.id).then(() => {
- this.$message.success('删除皮肤成功');
+ this.$message.success(this.$t('tip.skinDeleteSuccessfully'),);
}).catch(() => {
- this.$messageBox('删除皮肤失败');
+ this.$messageBox(this.$t('tip.skinDeleteFailed'),);
});
}).catch(() => {
});
From 1b42eec5e3e4a6fc52d1db6d3dae02598b6018bb Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Thu, 15 Aug 2019 10:37:47 +0800
Subject: [PATCH 024/172] =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9A=E5=9B=BD?=
=?UTF-8?q?=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/i18n/langs/en/map.js | 14 ++++-
src/i18n/langs/zh/map.js | 85 ++++++++++++++++++++++++++++++-
src/i18n/langs/zh/tip.js | 18 ++++++-
src/views/map/product/draft.vue | 48 ++++++++---------
src/views/map/product/list.vue | 32 ++++++------
src/views/map/skinStyle/draft.vue | 52 +++++++++----------
src/views/map/skinStyle/index.vue | 36 ++++++-------
7 files changed, 197 insertions(+), 88 deletions(-)
diff --git a/src/i18n/langs/en/map.js b/src/i18n/langs/en/map.js
index 0673e7ac9..aa7240648 100644
--- a/src/i18n/langs/en/map.js
+++ b/src/i18n/langs/en/map.js
@@ -310,7 +310,7 @@ export default {
skinDeleteConfirmation: 'This will permanently remove the skin. Do you want to continue?',
addMapSkin: 'AddMapSkin',
updateMapSkin: 'UpdateMapSkin',
- maxScaling: 'The maximum scale is 8 steps',
+ maxScaling: '(The maximum scale is 8 steps)',
skinCodingInput: 'Please enter skin code',
skinDesignationInput: 'Please enter skin name',
coordinatesOriginInput: 'Please enter the origin coordinates',
@@ -375,5 +375,15 @@ export default {
productCodeEnter: 'Please enter the product code',
productNameEnter: 'Please enter product name',
productDescriptionEnter: 'Please enter product description',
- trainingTypeSelect: 'Please select the associated training type'
+ trainingTypeSelect: 'Please select the associated training type',
+ linkWidth: 'LinkWidth',
+ maxLinkWidth: '(Link width is at most 20)',
+ sectionWidth: 'SectionWidth',
+ maxSectionWidth: '(Section width is maximum 30)',
+ showWatermarkOrNot: 'ShowWatermarkOrNot',
+ linkWidthInput: 'Please enter Link width',
+ linkWidthInputPrompt: 'Please enter a valid Link width',
+ sectionWidthInput: 'Please enter section width',
+ sectionWidthInputPrompt: 'Please enter a valid segment width',
+ selectShowWatermark: 'Select whether or not to watermark'
};
diff --git a/src/i18n/langs/zh/map.js b/src/i18n/langs/zh/map.js
index ca983d695..736b5254e 100644
--- a/src/i18n/langs/zh/map.js
+++ b/src/i18n/langs/zh/map.js
@@ -427,6 +427,89 @@ export default {
thenList: '交路列表',
startStation: '起始站',
- endStation: '终到站'
+ endStation: '终到站',
+
+ skinDesignation: '皮肤名称',
+ skinCoding: '皮肤编码',
+ coordinatesOrigin: '坐标原点',
+ skinDeleteConfirmation: '此操作将永久删除该皮肤, 是否继续?',
+ addMapSkin: '添加地图皮肤',
+ updateMapSkin: '更新地图皮肤',
+ maxScaling: '(缩放比例最大为8级)',
+ skinCodingInput: '请输入皮肤编码',
+ skinDesignationInput: '请输入皮肤名称',
+ coordinatesOriginInput: '请输入原点坐标',
+ scalingInput: '请输入缩放比例',
+ scalingInputPrompt: '请输入有效的缩放比例',
+ skinCodingExist: '地图皮肤编码已存在',
+ stationKilometerMark: '车站公里标',
+ arrivalTime: '到站时间',
+ operationGraphPublished: '运行图发布为',
+ operationGraphName: '运行图名称:',
+ createOperationGraph: '创建运行图',
+ importOperationGraph: '导入运行图',
+ publishOperationGraph: '发布运行图',
+ deleteOperationGraph: '删除运行图',
+ underImport: '正在导入中...',
+ mapList: '地图列表',
+ import: '导入',
+ selectImportFiles: '请选择需要导入的文件',
+ createNewOperationGraph: '新建运行图',
+ setOperatingSpeed: '设置运行速度',
+ speedClass1: '速度等级1',
+ speedClass2: '速度等级2',
+ speedClass3: '速度等级3',
+ speedClass4: '速度等级4',
+ name: '名称',
+ startingRunningDirection: '始发运行方向',
+ timeBetweenDepartures: '发车间隔时间',
+ stopTime: '停靠时间',
+ entranceStation: '入口车站',
+ exportStation: '出口车站',
+ speedLevelEnter1: '请输入速度等级1',
+ speedLevelEnter2: '请输入速度等级2',
+ speedLevelEnter3: '请输入速度等级3',
+ speedLevelEnter4: '请输入速度等级4',
+ nameEnter: '请输入名称',
+ drivingDirectionSelect: '请选择行驶方向',
+ timeBetweenDeparturesEnter: '请输入发车间隔时间',
+ stopTimeEnter: '请输入停靠时间',
+ entranceStationSelect: '请选择入站口',
+ exportStationSelect: '请选择出站口',
+ validityCheck: '有效性检查',
+ setupOperationGraph: '设置运行图',
+ selectOperationGraphDataRange: '选取运行图数据范围',
+ to: '至',
+ selectionTimeRange: '选择时间范围',
+ selectDataRange: '请选择数据范围区间',
+ pointSystem1: '1分制',
+ pointSystem2: '2分制',
+ pointSystem5: '5分制',
+ skinType: '皮肤风格',
+ turnoverTime: '更新时间',
+ productList: '产品列表',
+ deleteTypeHint: '此操作将删除该类型, 是否继续？',
+ belongsToMapName: '所属地图名称',
+ productType: '产品类型',
+ productCode: '产品编码',
+ productName: '产品名称',
+ productDescription: '产品说明',
+ associateTrainingTypes: '关联实训类型',
+ createTrainingCategories: '创建实训类目',
+ editTrainingCategories: '编辑实训类目',
+ productCodeEnter: '请输入产品编码',
+ productNameEnter: '请输入产品名称',
+ productDescriptionEnter: '请输入产品说明',
+ trainingTypeSelect: '请选择关联实训类型',
+ linkWidth: 'link宽度',
+ maxLinkWidth: '(Link宽度最大为20)',
+ sectionWidth: '区段宽度',
+ maxSectionWidth: '(区段宽度最大为30)',
+ showWatermarkOrNot: '是否显示水印',
+ linkWidthInput: '请输入Link宽度',
+ linkWidthInputPrompt: '请输入有效Link宽度',
+ sectionWidthInput: '请输入区段宽度',
+ sectionWidthInputPrompt: '请输入有效区段宽度',
+ selectShowWatermark: '请选择是否水印'
};
diff --git a/src/i18n/langs/zh/tip.js b/src/i18n/langs/zh/tip.js
index bec20dc9f..46f5e4bd7 100644
--- a/src/i18n/langs/zh/tip.js
+++ b/src/i18n/langs/zh/tip.js
@@ -41,5 +41,21 @@ export default {
unpackingSuccessful: '解包成功',
unpackingFailed: '解包失败',
pleaseEnterNameQuery: '请输入名称查询',
- routeSameID: '相同ID的数据已存在'
+ routeSameID: '相同ID的数据已存在',
+
+ skinDeleteSuccessfully: '删除皮肤成功',
+ skinDeleteFailed: '删除皮肤失败',
+ publishedOperationalGraphSuccessfully: '发布运行图成功',
+ publishedOperationalGraphFailed: '发布运行图失败',
+ deleteOperationGraphFailed: '删除运行图失败',
+ importOperationGraphSuccessfully: '导入运行图成功!',
+ importOperationGraphFailed: '导入运行图失败!',
+ parsingOperationGraphFailed: '解析运行图失败!',
+ productCreationSuccessfully: '创建产品成功',
+ productCreationFailed: '创建产品失败',
+ updateProductSuccessfully: '更新产品成功',
+ updateProductFailed: '更新产品失败',
+ deleteProductSuccessfully: '删除产品成功',
+ deleteProductFailed: '删除产品失败',
+ cannotDeleteProduct: '产品已被使用无法删除'
};
diff --git a/src/views/map/product/draft.vue b/src/views/map/product/draft.vue
index cb6ef1493..31dbaaff1 100644
--- a/src/views/map/product/draft.vue
+++ b/src/views/map/product/draft.vue
@@ -13,10 +13,10 @@
style="padding-top: 60px"
>
- 地图列表
+ {{$t('map.mapList')}}
-
-
{{ jl3dname }}
- 退出任务
+ 退出剧本
按计划行车
@@ -32,7 +32,7 @@ import { runDiagramStart, runDiagramOver, runDiagramGetTime } from '@/api/simula
import { PermissionType } from '@/scripts/ConstDic';
import { exitFullscreen } from '@/utils/screen';
import { getCountTime } from '@/utils/index';
-import { runDiagramIsStart, quitQuest } from '@/api/simulation';
+import { runDiagramIsStart, quitScript } from '@/api/simulation';
import { timeFormat } from '@/utils/date';
import { EventBus } from '@/scripts/event-bus';
@@ -167,7 +167,7 @@ export default {
});
},
handleQuitQuest() {
- quitQuest(this.group).then(resp => {
+ quitScript(this.group).then(resp => {
this.$emit('quitQuest');
}).catch(() => {
this.$messageBox('退出任务失败');
From b84b6ea500499ccf2e4953d8b4d4fefd6e8bb6f3 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Fri, 16 Aug 2019 15:12:03 +0800
Subject: [PATCH 042/172] =?UTF-8?q?desc:=20=E4=BF=AE=E6=94=B9=E5=9C=B0?=
=?UTF-8?q?=E5=9B=BE=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/components/font/index.vue | 2 +-
.../jlmap3d/edit/component/map3dlist.vue | 10 +-
src/views/lesson/trainingcategory/tree.vue | 200 +++++-----
src/views/map/mapdraft/mapedit/configMap.vue | 160 ++++++++
.../automaticoperate/detail.vue | 0
.../automaticoperate/index.vue | 15 +-
.../automaticoperate/preview.vue | 0
.../automaticoperate/route.vue | 0
.../mapdraft/mapedit/dataRelation/index.vue | 250 +++++++++++++
.../{ => dataRelation}/pathoperate/detail.vue | 0
.../{ => dataRelation}/pathoperate/index.vue | 17 +-
.../pathoperate/pathRoute.vue | 0
.../{ => dataRelation}/pathoperate/route.vue | 0
.../routeoperate/detail.vue | 0
.../{ => dataRelation}/routeoperate/index.vue | 16 +-
.../routeoperate/preview.vue | 0
.../routeoperate/related.vue | 0
.../{ => dataRelation}/routeoperate/route.vue | 0
.../routingoperate/detail.vue | 0
.../routingoperate/index.vue | 15 +-
.../routingoperate/preview.vue | 0
.../routingoperate/route.vue | 0
.../switchoperate/detail.vue | 0
.../switchoperate/index.vue | 15 +-
.../switchoperate/route.vue | 0
src/views/map/mapdraft/mapedit/index.vue | 114 ++----
.../mapedit/mapoperate/ImageControl.vue | 39 +-
.../mapedit/mapoperate/config/data.vue | 295 +++++++++++++++
.../mapedit/mapoperate/config/list.vue | 349 ++++++++++--------
.../mapdraft/mapedit/mapoperate/counter.vue | 74 ++--
.../mapedit/mapoperate/delayunlock.vue | 67 ++--
.../map/mapdraft/mapedit/mapoperate/index.vue | 24 +-
.../mapdraft/mapedit/mapoperate/lcControl.vue | 61 ++-
.../mapedit/mapoperate/limitControl.vue | 100 +++--
.../map/mapdraft/mapedit/mapoperate/line.vue | 107 ++----
.../map/mapdraft/mapedit/mapoperate/link.vue | 83 ++---
.../mapdraft/mapedit/mapoperate/section.vue | 141 +++----
.../mapdraft/mapedit/mapoperate/signal.vue | 61 +--
.../mapdraft/mapedit/mapoperate/station.vue | 45 ++-
.../mapedit/mapoperate/stationcontrol.vue | 33 +-
.../mapedit/mapoperate/stationstand.vue | 39 +-
.../mapdraft/mapedit/mapoperate/switch.vue | 41 +-
.../map/mapdraft/mapedit/mapoperate/text.vue | 63 ++--
.../mapedit/mapoperate/trainwindow.vue | 63 ++--
.../mapdraft/mapedit/mapoperate/zcControl.vue | 33 +-
src/views/map/mapdraft/mapmanage/maplist.vue | 16 +-
.../map/mapdraft/mapmanage/operateMenu.vue | 35 --
src/views/planMonitor/editTool/index.vue | 5 +-
src/views/planMonitor/editTool/menuBar.vue | 6 +-
.../editTool/menus/openRunPlan.vue | 2 +-
50 files changed, 1661 insertions(+), 935 deletions(-)
create mode 100644 src/views/map/mapdraft/mapedit/configMap.vue
rename src/views/map/mapdraft/mapedit/{ => dataRelation}/automaticoperate/detail.vue (100%)
rename src/views/map/mapdraft/mapedit/{ => dataRelation}/automaticoperate/index.vue (86%)
rename src/views/map/mapdraft/mapedit/{ => dataRelation}/automaticoperate/preview.vue (100%)
rename src/views/map/mapdraft/mapedit/{ => dataRelation}/automaticoperate/route.vue (100%)
create mode 100644 src/views/map/mapdraft/mapedit/dataRelation/index.vue
rename src/views/map/mapdraft/mapedit/{ => dataRelation}/pathoperate/detail.vue (100%)
rename src/views/map/mapdraft/mapedit/{ => dataRelation}/pathoperate/index.vue (87%)
rename src/views/map/mapdraft/mapedit/{ => dataRelation}/pathoperate/pathRoute.vue (100%)
rename src/views/map/mapdraft/mapedit/{ => dataRelation}/pathoperate/route.vue (100%)
rename src/views/map/mapdraft/mapedit/{ => dataRelation}/routeoperate/detail.vue (100%)
rename src/views/map/mapdraft/mapedit/{ => dataRelation}/routeoperate/index.vue (86%)
rename src/views/map/mapdraft/mapedit/{ => dataRelation}/routeoperate/preview.vue (100%)
rename src/views/map/mapdraft/mapedit/{ => dataRelation}/routeoperate/related.vue (100%)
rename src/views/map/mapdraft/mapedit/{ => dataRelation}/routeoperate/route.vue (100%)
rename src/views/map/mapdraft/mapedit/{ => dataRelation}/routingoperate/detail.vue (100%)
rename src/views/map/mapdraft/mapedit/{ => dataRelation}/routingoperate/index.vue (86%)
rename src/views/map/mapdraft/mapedit/{ => dataRelation}/routingoperate/preview.vue (100%)
rename src/views/map/mapdraft/mapedit/{ => dataRelation}/routingoperate/route.vue (100%)
rename src/views/map/mapdraft/mapedit/{ => dataRelation}/switchoperate/detail.vue (100%)
rename src/views/map/mapdraft/mapedit/{ => dataRelation}/switchoperate/index.vue (86%)
rename src/views/map/mapdraft/mapedit/{ => dataRelation}/switchoperate/route.vue (100%)
create mode 100644 src/views/map/mapdraft/mapedit/mapoperate/config/data.vue
diff --git a/src/views/components/font/index.vue b/src/views/components/font/index.vue
index 7211f8b8c..7c6d221bb 100644
--- a/src/views/components/font/index.vue
+++ b/src/views/components/font/index.vue
@@ -68,6 +68,6 @@ export default {
diff --git a/src/views/jlmap3d/edit/component/map3dlist.vue b/src/views/jlmap3d/edit/component/map3dlist.vue
index 95b225a1a..decadcf73 100644
--- a/src/views/jlmap3d/edit/component/map3dlist.vue
+++ b/src/views/jlmap3d/edit/component/map3dlist.vue
@@ -26,7 +26,7 @@
@node-click="handleNodeClick"
@node-contextmenu="showContextMenu"
>
-
+
@@ -49,20 +49,20 @@
\ No newline at end of file
+
diff --git a/src/views/map/mapdraft/mapedit/configMap.vue b/src/views/map/mapdraft/mapedit/configMap.vue
new file mode 100644
index 000000000..843c36a50
--- /dev/null
+++ b/src/views/map/mapdraft/mapedit/configMap.vue
@@ -0,0 +1,160 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/map/mapdraft/mapedit/automaticoperate/detail.vue b/src/views/map/mapdraft/mapedit/dataRelation/automaticoperate/detail.vue
similarity index 100%
rename from src/views/map/mapdraft/mapedit/automaticoperate/detail.vue
rename to src/views/map/mapdraft/mapedit/dataRelation/automaticoperate/detail.vue
diff --git a/src/views/map/mapdraft/mapedit/automaticoperate/index.vue b/src/views/map/mapdraft/mapedit/dataRelation/automaticoperate/index.vue
similarity index 86%
rename from src/views/map/mapdraft/mapedit/automaticoperate/index.vue
rename to src/views/map/mapdraft/mapedit/dataRelation/automaticoperate/index.vue
index af540b2db..078118834 100644
--- a/src/views/map/mapdraft/mapedit/automaticoperate/index.vue
+++ b/src/views/map/mapdraft/mapedit/dataRelation/automaticoperate/index.vue
@@ -1,5 +1,16 @@
-
+
+
diff --git a/src/views/map/mapdraft/mapedit/pathoperate/detail.vue b/src/views/map/mapdraft/mapedit/dataRelation/pathoperate/detail.vue
similarity index 100%
rename from src/views/map/mapdraft/mapedit/pathoperate/detail.vue
rename to src/views/map/mapdraft/mapedit/dataRelation/pathoperate/detail.vue
diff --git a/src/views/map/mapdraft/mapedit/pathoperate/index.vue b/src/views/map/mapdraft/mapedit/dataRelation/pathoperate/index.vue
similarity index 87%
rename from src/views/map/mapdraft/mapedit/pathoperate/index.vue
rename to src/views/map/mapdraft/mapedit/dataRelation/pathoperate/index.vue
index f6f58f6f2..c1a10b8d5 100644
--- a/src/views/map/mapdraft/mapedit/pathoperate/index.vue
+++ b/src/views/map/mapdraft/mapedit/dataRelation/pathoperate/index.vue
@@ -1,6 +1,15 @@
-
- {{ $t('global.create') }}
{{ $t('global.update') }}
{{ $t('orderAuthor.renew') }}
- {{ $t('global.return') }}
+ {{ $t('global.back') }}
+
+
diff --git a/src/views/display/menuDemon.vue b/src/views/display/menuDemon.vue
index 026c8f450..ffffcdac9 100644
--- a/src/views/display/menuDemon.vue
+++ b/src/views/display/menuDemon.vue
@@ -9,7 +9,7 @@
+
+
+
+
+ {{ $t('map.logicalView') }}
+ {{ $t('map.physicalView') }}
+ {{ $t('map.mixedView') }}
+
+
+
+
+
+
+ {{ view.name }}
+
+
+
+
+
+ {{ view.name }}
+
+
+
+
+
+
+
+
+ 地图显示
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ $t('map.activate') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ opts.label }}
-
-
-
-
-
-
@@ -105,7 +105,7 @@ export default {
form() {
const form = {
- labelWidth: '135px',
+ labelWidth: '140px',
items: [
{ prop: 'name', label: this.$t('orderAuthor.commodityName'), type: 'text', required: false },
{ prop: 'productType', label: this.$t('orderAuthor.productType'), type: 'select', required: false, disabled: this.isDisabled, options: this.productTypeList, change: true, onChange: this.typeChange },
diff --git a/src/views/orderauthor/commodity/index.vue b/src/views/orderauthor/commodity/index.vue
index d2249c676..1476c970f 100644
--- a/src/views/orderauthor/commodity/index.vue
+++ b/src/views/orderauthor/commodity/index.vue
@@ -20,7 +20,7 @@ export default {
pageIndex: 'pageNum'
},
queryForm: {
- labelWidth: '80px',
+ labelWidth: '100px',
reset: true,
queryObject: {
name: {
diff --git a/src/views/orderauthor/order/draft.vue b/src/views/orderauthor/order/draft.vue
index e798fafc2..d6be9ea6b 100644
--- a/src/views/orderauthor/order/draft.vue
+++ b/src/views/orderauthor/order/draft.vue
@@ -20,7 +20,7 @@
+
+
+
+
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/config/list.vue b/src/views/map/mapdraft/mapedit/mapoperate/config/list.vue
index 4b49c31a8..54dd75fc1 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/config/list.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/config/list.vue
@@ -1,160 +1,176 @@
-
-
-
-
- {{ item.label }}
-
{
item.disabled = false;
this.equipmentList.forEach(nor => {
- if (item.code == nor.stationCode) {
+ if (item.code == nor.deviceCode) {
item.disabled = true;
}
});
@@ -549,7 +549,7 @@ export default {
async start() {
let flag = true;
this.equipmentList.forEach(item => {
- if (!item.stationCode) {
+ if (!item.deviceCode) {
flag = false;
}
});
@@ -600,13 +600,13 @@ export default {
id: val.id,
nickName: val.nickName,
userRole: 'Attendant',
- stationCode: val.stationCode
+ deviceCode: val.deviceCode
}];
putUserRoles(params, this.$route.query.group);
this.stationList.forEach(item => {
item.disabled = false;
this.equipmentList.forEach(nor => {
- if (item.code == nor.stationCode) {
+ if (item.code == nor.deviceCode) {
item.disabled = true;
}
});
@@ -693,7 +693,7 @@ export default {
this.stationList.forEach(item => {
item.disabled = false;
this.equipmentList.forEach(nor => {
- if (item.code == nor.stationCode) {
+ if (item.code == nor.deviceCode) {
item.disabled = true;
}
});
@@ -723,7 +723,7 @@ export default {
id: item.id,
nickName: item.nickName,
userRole: 'Audience',
- stationCode: ''
+ deviceCode: ''
}];
putUserRoles(params, this.$route.query.group);
},
diff --git a/src/views/trainRoom/operateMenu.vue b/src/views/trainRoom/operateMenu.vue
index 8ffbd3a13..a55008655 100644
--- a/src/views/trainRoom/operateMenu.vue
+++ b/src/views/trainRoom/operateMenu.vue
@@ -1,83 +1,85 @@
-
+
\ No newline at end of file
diff --git a/src/views/scriptManage/category/tree.vue b/src/views/scriptManage/category/tree.vue
index 195c933e9..c61109954 100644
--- a/src/views/scriptManage/category/tree.vue
+++ b/src/views/scriptManage/category/tree.vue
@@ -1,15 +1,16 @@
-
-
-
-
+
+
diff --git a/src/views/orderauthor/order/canDistribute.vue b/src/views/orderauthor/order/canDistribute.vue
index e8e25941a..8f9a721d4 100644
--- a/src/views/orderauthor/order/canDistribute.vue
+++ b/src/views/orderauthor/order/canDistribute.vue
@@ -1,54 +1,62 @@
-
-
+
+
diff --git a/src/views/orderauthor/order/draft.vue b/src/views/orderauthor/order/draft.vue
index d593daf3d..d005c870f 100644
--- a/src/views/orderauthor/order/draft.vue
+++ b/src/views/orderauthor/order/draft.vue
@@ -1,511 +1,508 @@
-
{{ $t('global.create') }}
{{ $t('global.update') }}
- {{ $t('global.return') }}
+ {{ $t('global.back') }}
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
- {{ items.name }}
+
+
+
- {{ item.label }}
-
-
-
-
-
-
-
+
+
+
+
+
+
+ {{ opts.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
@@ -85,4 +91,4 @@
.tipLable {
line-height: 33px;
}
-
\ No newline at end of file
+
diff --git a/src/views/jointTraining/menuDraft/operateMenu.vue b/src/views/jointTraining/menuDraft/operateMenu.vue
index 3f5a81600..53b027729 100644
--- a/src/views/jointTraining/menuDraft/operateMenu.vue
+++ b/src/views/jointTraining/menuDraft/operateMenu.vue
@@ -1,135 +1,135 @@
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
-
+
+
diff --git a/src/views/trainRoom/index.vue b/src/views/trainRoom/index.vue
index 9b05a3c82..258a62425 100644
--- a/src/views/trainRoom/index.vue
+++ b/src/views/trainRoom/index.vue
@@ -46,7 +46,7 @@
/>
-
+
+
\ No newline at end of file
+ },
+ doClose() {
+ if (this.$refs && this.$refs.popMenu) {
+ this.$refs.popMenu.close();
+ }
+ },
+ async kicked() {
+ try {
+ await putJointTrainingUserkicked(this.clickUserId, this.$route.query.group);
+ } catch (error) {
+ console.error(error);
+ }
+ }
+ }
+};
+
diff --git a/src/views/trainRoom/trainChat.vue b/src/views/trainRoom/trainChat.vue
index 2ad3cc161..3a8f4d5c1 100644
--- a/src/views/trainRoom/trainChat.vue
+++ b/src/views/trainRoom/trainChat.vue
@@ -1,204 +1,217 @@
-
-
-
-
-
-
-
+
-
-
- -
-
-
- - {{nor.chatTime}} {{nor.userName}}-- {{nor.value}} -- -
-
-
- - {{nor.userName}} {{nor.chatTime}}-- {{nor.value}} -- -
-
- {{nor.roomTip}} -
-
-
-
-
-
-
-
-
+
+
@@ -31,7 +30,6 @@
:map-info="mapInfo"
:route-data="routeData"
:card-height="cardHeight"
- @handleSelectView="handleSelectView"
/>
@@ -111,9 +109,6 @@ export default {
setSelected(selected) {
this.$refs.routeEdit.setSelected(selected);
},
- handleSelectView(handle) {
- this.$emit('handleSelectView', handle);
- },
setCenter(code) {
this.$emit('setCenter', code);
}
diff --git a/src/views/map/mapdraft/mapedit/dataRelation/automaticoperate/route.vue b/src/views/map/mapdraft/mapedit/dataRelation/automaticoperate/route.vue
index f9fb788bb..5c8e5a51b 100644
--- a/src/views/map/mapdraft/mapedit/dataRelation/automaticoperate/route.vue
+++ b/src/views/map/mapdraft/mapedit/dataRelation/automaticoperate/route.vue
@@ -120,9 +120,7 @@ export default {
}
},
mounted() {
- this.$nextTick(() => {
- this.handleSelectView(ViewMode.PHYSICAL);
- });
+
},
methods: {
hover(field) {
@@ -142,10 +140,6 @@ export default {
}
}
},
- // 切换地图属性
- handleSelectView(handle) {
- this.$emit('handleSelectView', handle);
- },
buildModel(code) {
const model = Object.assign({}, this.addModel);
if (code) { model['code'] = code; }
diff --git a/src/views/map/mapdraft/mapedit/dataRelation/index.vue b/src/views/map/mapdraft/mapedit/dataRelation/index.vue
index a1eef5213..f58722c35 100644
--- a/src/views/map/mapdraft/mapedit/dataRelation/index.vue
+++ b/src/views/map/mapdraft/mapedit/dataRelation/index.vue
@@ -35,7 +35,6 @@
:card-height="cardHeight+25"
:map-info="mapInfo"
:selected="selected"
- @handleSelectView="handleSelectView"
@setCenter="setCenter"
/>
@@ -45,7 +44,6 @@
:card-height="cardHeight+25"
:map-info="mapInfo"
:selected="selected"
- @handleSelectView="handleSelectView"
@setCenter="setCenter"
/>
@@ -55,7 +53,6 @@
:card-height="cardHeight+25"
:map-info="mapInfo"
:selected="selected"
- @handleSelectView="handleSelectView"
@setCenter="setCenter"
/>
@@ -65,7 +62,6 @@
:card-height="cardHeight+25"
:map-info="mapInfo"
:selected="selected"
- @handleSelectView="handleSelectView"
@setCenter="setCenter"
/>
@@ -75,7 +71,6 @@
:card-height="cardHeight+25"
:map-info="mapInfo"
:selected="selected"
- @handleSelectView="handleSelectView"
@setCenter="setCenter"
/>
@@ -199,9 +194,6 @@ export default {
break;
}
},
- handleSelectView(handle) {
- this.$emit('handleSelectView', handle);
- },
setCenter(code) {
this.$emit('setCenter', code);
},
diff --git a/src/views/map/mapdraft/mapedit/dataRelation/pathoperate/index.vue b/src/views/map/mapdraft/mapedit/dataRelation/pathoperate/index.vue
index c1a10b8d5..d26a4ebc6 100644
--- a/src/views/map/mapdraft/mapedit/dataRelation/pathoperate/index.vue
+++ b/src/views/map/mapdraft/mapedit/dataRelation/pathoperate/index.vue
@@ -6,7 +6,6 @@
:map-info="mapInfo"
:route-data="routeData"
:card-height="cardHeight"
- @handleSelectView="handleSelectView"
/>
+
+
\ No newline at end of file
+
From f5152e58077aeebd6e1a8fa4cd764d67c49f4618 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Fri, 16 Aug 2019 16:00:49 +0800
Subject: [PATCH 046/172] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E6=A0=B9?=
=?UTF-8?q?=E6=8D=AE=E5=8C=85=E5=9B=B4=E7=9B=92=E5=8E=BB=E8=AE=A1=E7=AE=97?=
=?UTF-8?q?=E8=AF=86=E5=88=AB=E5=8F=B7=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/jmap/config/skinCode/bejing_01.js | 1 -
src/jmap/config/skinCode/chengdu_03.js | 1 -
src/jmap/config/skinCode/fuzhou_01.js | 1 -
src/jmap/shape/Train/TrainBody.js | 18 +++++++++---------
4 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/src/jmap/config/skinCode/bejing_01.js b/src/jmap/config/skinCode/bejing_01.js
index 6f190cc1c..951191791 100644
--- a/src/jmap/config/skinCode/bejing_01.js
+++ b/src/jmap/config/skinCode/bejing_01.js
@@ -457,7 +457,6 @@ class SkinCode extends defaultStyle {
haveTextHSDA: true, // 是否需创建textHSDA对象
haveArrowText: true, // 是否需创建arrowText对象
haveTrainBorder: false, // 是否需创建trainBorder对象
- aspectRatio: 7/5, // 字体宽高比例（用以拼接text是计算位置）
textOffset: 4, // 字体偏移（用以控制字体据车头的距离）
trainWidthMoreText: 8, // 计算列车长度时--列车长比text多出尺寸
useSelfFormat: true, // 使用配置项的nameFormat
diff --git a/src/jmap/config/skinCode/chengdu_03.js b/src/jmap/config/skinCode/chengdu_03.js
index 77bf6c5e6..c795b3cb1 100644
--- a/src/jmap/config/skinCode/chengdu_03.js
+++ b/src/jmap/config/skinCode/chengdu_03.js
@@ -423,7 +423,6 @@ class SkinCode extends defaultStyle {
haveTextHSDA: true, // 是否需创建textHSDA对象
haveArrowText: true, // 是否需创建arrowText对象
haveTrainBorder: false, // 是否需创建trainBorder对象
- aspectRatio: 4/7, // 字体宽高比例（用以拼接text是计算位置）
textOffset: 4, // 字体偏移（用以控制字体据车头的距离）
trainWidthMoreText: 8, // 计算列车长度时--列车长比text多出尺寸
useSelfFormat: true, // 使用配置项的nameFormat
diff --git a/src/jmap/config/skinCode/fuzhou_01.js b/src/jmap/config/skinCode/fuzhou_01.js
index f5233389e..51ab11820 100644
--- a/src/jmap/config/skinCode/fuzhou_01.js
+++ b/src/jmap/config/skinCode/fuzhou_01.js
@@ -371,7 +371,6 @@ class SkinCode extends defaultStyle {
haveTextHSDA: false, // 是否需创建textHSDA对象
haveArrowText: true, // 是否需创建arrowText对象
haveTrainBorder: false, // 是否需创建trainBorder对象
- aspectRatio: 8/15, // 字体宽高比例（用以拼接text是计算位置）
textOffset: 1, // 字体偏移（用以控制字体据车头的距离）
trainWidthMoreText: 2 // 计算列车长度时--列车长比text多出尺寸
},
diff --git a/src/jmap/shape/Train/TrainBody.js b/src/jmap/shape/Train/TrainBody.js
index 57874c7e1..de2e42324 100644
--- a/src/jmap/shape/Train/TrainBody.js
+++ b/src/jmap/shape/Train/TrainBody.js
@@ -217,23 +217,23 @@ export default class TrainBody extends Group {
formatChangePosition(model, style) {
if (this.nameFormat) {
const arr = this.nameFormat.split(':');
- let fontNumber = 0;
+ let widthText = 0;
arr.forEach(ele => {
if (ele == 'targetCode') {
- this.textTrainNumber.setStyle('x', parseInt(model.point.x + fontNumber * model.fontSize * style.Train.common.aspectRatio + style.Train.common.textOffset) );
- fontNumber += (style.Train.trainNumber.targetCodePrefix || '').length;
+ this.textTrainNumber.setStyle('x', parseInt(model.point.x + widthText + style.Train.common.textOffset) );
+ widthText += this.textTrainNumber.getBoundingRect().width;
this.add(this.textTrainNumber);
} else if (ele == 'serviceNumber') {
- this.textTrainServer.setStyle('x', parseInt(model.point.x + fontNumber * model.fontSize * style.Train.common.aspectRatio + style.Train.common.textOffset));
- fontNumber += (style.Train.trainServer.serviceNumberPrefix || '').length;
+ this.textTrainServer.setStyle('x', parseInt(model.point.x + widthText + style.Train.common.textOffset));
+ widthText += this.textTrainServer.getBoundingRect().width;
this.add(this.textTrainServer);
} else if (ele == 'tripNumber') {
- this.textTrainTarget.setStyle('x', parseInt(model.point.x + fontNumber * model.fontSize * style.Train.common.aspectRatio + style.Train.common.textOffset));
- fontNumber += (style.Train.trainTarget.tripNumberPrefix || '').length;
+ this.textTrainTarget.setStyle('x', parseInt(model.point.x + widthText + style.Train.common.textOffset));
+ widthText += this.textTrainTarget.getBoundingRect().width;
this.add(this.textTrainTarget);
} else if (ele == 'groupNumber') {
- this.textTrainTargetNumber.setStyle('x', parseInt(model.point.x + fontNumber * model.fontSize * style.Train.common.aspectRatio + style.Train.common.textOffset));
- fontNumber += (style.Train.trainTargetNumber.groupNumberPrefix || '').length;
+ this.textTrainTargetNumber.setStyle('x', parseInt(model.point.x + widthText + style.Train.common.textOffset));
+ widthText += this.textTrainTargetNumber.getBoundingRect().width;
this.add(this.textTrainTargetNumber);
}
});
From 44d021a6ec3f153e50cb9e68130f732a50895ed6 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Fri, 16 Aug 2019 16:19:08 +0800
Subject: [PATCH 047/172] =?UTF-8?q?desc:=20=E4=BF=AE=E6=94=B9=E5=9C=B0?=
=?UTF-8?q?=E5=9B=BE=E7=BB=98=E5=88=B6=E5=8A=A0=E8=BD=BD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/map/mapdraft/mapedit/configMap.vue | 5 +++
.../dataRelation/automaticoperate/index.vue | 5 ---
.../dataRelation/automaticoperate/route.vue | 8 +----
.../mapdraft/mapedit/dataRelation/index.vue | 8 -----
.../dataRelation/pathoperate/index.vue | 5 ---
.../dataRelation/pathoperate/route.vue | 7 ----
.../dataRelation/routeoperate/index.vue | 34 -------------------
.../dataRelation/routeoperate/route.vue | 9 +----
.../dataRelation/routingoperate/index.vue | 5 ---
.../dataRelation/routingoperate/route.vue | 7 ----
.../dataRelation/switchoperate/index.vue | 5 ---
.../dataRelation/switchoperate/route.vue | 9 +----
src/views/map/mapdraft/mapedit/index.vue | 3 +-
.../map/mapdraft/mapedit/mapoperate/index.vue | 20 +----------
14 files changed, 10 insertions(+), 120 deletions(-)
diff --git a/src/views/map/mapdraft/mapedit/configMap.vue b/src/views/map/mapdraft/mapedit/configMap.vue
index 843c36a50..7fe90507c 100644
--- a/src/views/map/mapdraft/mapedit/configMap.vue
+++ b/src/views/map/mapdraft/mapedit/configMap.vue
@@ -60,6 +60,11 @@ export default {
physicalLevelsSelect: []
};
},
+ watch: {
+ '$store.state.map.mapDataLoadedCount': function (val) {
+ this.handleSelectView(this.viewSelect);
+ }
+ },
mounted() {
this.initPage();
},
diff --git a/src/views/map/mapdraft/mapedit/dataRelation/automaticoperate/index.vue b/src/views/map/mapdraft/mapedit/dataRelation/automaticoperate/index.vue
index 078118834..63f8b7365 100644
--- a/src/views/map/mapdraft/mapedit/dataRelation/automaticoperate/index.vue
+++ b/src/views/map/mapdraft/mapedit/dataRelation/automaticoperate/index.vue
@@ -6,7 +6,6 @@
:map-info="mapInfo"
:route-data="routeData"
:card-height="cardHeight"
- @handleSelectView="handleSelectView"
/>
+
+ -
+
-
+ + {{ nor.chatTime }} {{ nor.userName }}++ {{ nor.value }}+ +
+
-
+ + {{ nor.userName }} {{ nor.chatTime }}++ {{ nor.value }} ++ +
+
- {{ nor.roomTip }}
+
+
+
+
+
+
+
+
+
+
-
-
- {{formatTrainingUsedTime}}
-
-
-
-
- 开始
- 结束
- 返回
-
-
-
+
\ No newline at end of file
+
diff --git a/src/views/display/menuLesson.vue b/src/views/display/menuLesson.vue
index 6ff35ac77..0fdc6a965 100644
--- a/src/views/display/menuLesson.vue
+++ b/src/views/display/menuLesson.vue
@@ -1,197 +1,202 @@
-
+
+ {{ formatTrainingUsedTime }}
+
+
+
+ 开始
+ 结束
+ 返回
+
+
+
-
-
-
-
- 教学模式
- 练习模式
- 测验模式
-
- {{formatUsedTime}}
- 得分：{{formatScore}}
-
-
-
-
- 开始
- 结束
- 返回
-
-
-
+
\ No newline at end of file
+
diff --git a/src/views/display/menuScreen.vue b/src/views/display/menuScreen.vue
index fe8c51c4c..c25c7edf5 100644
--- a/src/views/display/menuScreen.vue
+++ b/src/views/display/menuScreen.vue
@@ -1,119 +1,118 @@
-
+
+
+ 教学模式
+ 练习模式
+ 测验模式
+
+ {{ formatUsedTime }}
+ 得分：{{ formatScore }}
+
+
+
+ 开始
+ 结束
+ 返回
+
+
+
-
+
@@ -23,7 +24,7 @@
-
+
-
- 试用时间：{{ countTime }}
-
-
+
+
\ No newline at end of file
+
diff --git a/src/views/display/menuSystemTime.vue b/src/views/display/menuSystemTime.vue
index c7d0f8e1d..852864356 100644
--- a/src/views/display/menuSystemTime.vue
+++ b/src/views/display/menuSystemTime.vue
@@ -1,42 +1,50 @@
-
+
+ 试用时间：{{ countTime }}
+
+
-
+
+
\ No newline at end of file
+
diff --git a/src/views/display/tipExamList.vue b/src/views/display/tipExamList.vue
index bb3e50a05..aa889654f 100644
--- a/src/views/display/tipExamList.vue
+++ b/src/views/display/tipExamList.vue
@@ -1,272 +1,277 @@
-
- {
loading.close();
that.refresh();
- that.$message.success(this.$t('tip.importOperationGraphSuccessfully'));
- }).catch((error) => {
- console.error(error);
+ that.$message.success(that.$t('tip.importOperationGraphSuccessfully'));
+ }).catch(() => {
loading.close();
that.refresh();
- that.$message.warning(this.$t('tip.importOperationGraphFailed'));
+ that.$message.warning(that.$t('tip.importOperationGraphFailed'));
});
} catch (error) {
- console.error(error);
loading.close();
that.refresh();
- that.$message.warning(this.$t('tip.parsingOperationGraphFailed'));
+ that.$message.warning(that.$t('tip.parsingOperationGraphFailed'));
}
}
};
From 138dfe5e06f9d17a6485aa4c2611f986be1559a2 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Mon, 19 Aug 2019 11:18:46 +0800
Subject: [PATCH 074/172] =?UTF-8?q?desc:=20=20=E4=BF=AE=E6=94=B9=E5=9C=B0?=
=?UTF-8?q?=E5=9B=BE=E7=BB=98=E5=88=B6=E5=9B=BE=E5=B1=82=E9=85=8D=E7=BD=AE?=
=?UTF-8?q?=EF=BC=8C=20=E8=B0=83=E6=95=B4=E9=81=93=E5=B2=94=E6=97=B6?=
=?UTF-8?q?=E9=97=B4=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/i18n/langs/en/map.js | 4 +--
src/i18n/langs/en/rules.js | 2 +-
src/i18n/langs/zh/map.js | 4 +--
src/i18n/langs/zh/rules.js | 2 +-
src/jmap/shape/Switch/index.js | 6 ++--
src/scripts/attribute.js | 6 ++--
src/views/map/mapdraft/mapedit/configMap.vue | 31 ++++++++++---------
.../mapdraft/mapedit/mapoperate/switch.vue | 2 +-
8 files changed, 29 insertions(+), 28 deletions(-)
diff --git a/src/i18n/langs/en/map.js b/src/i18n/langs/en/map.js
index 43a428598..0d219ab3f 100644
--- a/src/i18n/langs/en/map.js
+++ b/src/i18n/langs/en/map.js
@@ -410,8 +410,8 @@ export default {
switchShowName: '是否显示道岔名称:',
switchPositionX: '道岔名称x偏移量:',
switchPositionY: '道岔名称y偏移量:',
- turnTime: '道岔时间:',
- timeoutShow: '是否显示道岔时间:',
+ turnTime: '道岔转换时间:',
+ timeoutShow: '是否显示道岔倒计时时间:',
sectionACode: '关联的A Section Code:',
sectionBCode: '关联的B Section Code:',
sectionCCode: '关联的C Section Code:',
diff --git a/src/i18n/langs/en/rules.js b/src/i18n/langs/en/rules.js
index db4295d26..fe3b95607 100644
--- a/src/i18n/langs/en/rules.js
+++ b/src/i18n/langs/en/rules.js
@@ -97,7 +97,7 @@ export default {
switchNamePointX: '请输入道岔名称坐标x',
switchNamePointY: '请输入道岔名称坐标y',
switchStationCode: '请输入设备集中站',
- switchTurnTime: '请输入道岔时间',
+ switchTurnTime: '请输入道岔转换时间',
switchTpX: '请输入时间坐标x',
switchTpY: '请输入时间坐标y',
diff --git a/src/i18n/langs/zh/map.js b/src/i18n/langs/zh/map.js
index ef4374821..435c37198 100644
--- a/src/i18n/langs/zh/map.js
+++ b/src/i18n/langs/zh/map.js
@@ -333,8 +333,8 @@ export default {
switchShowName: '是否显示道岔名称:',
switchPositionX: '道岔名称x偏移量:',
switchPositionY: '道岔名称y偏移量:',
- turnTime: '道岔时间:',
- timeoutShow: '是否显示道岔时间:',
+ turnTime: '道岔转换时间:',
+ timeoutShow: '是否显示道岔倒计时时间:',
sectionACode: '关联的A Section Code:',
sectionBCode: '关联的B Section Code:',
sectionCCode: '关联的C Section Code:',
diff --git a/src/i18n/langs/zh/rules.js b/src/i18n/langs/zh/rules.js
index db4295d26..fe3b95607 100644
--- a/src/i18n/langs/zh/rules.js
+++ b/src/i18n/langs/zh/rules.js
@@ -97,7 +97,7 @@ export default {
switchNamePointX: '请输入道岔名称坐标x',
switchNamePointY: '请输入道岔名称坐标y',
switchStationCode: '请输入设备集中站',
- switchTurnTime: '请输入道岔时间',
+ switchTurnTime: '请输入道岔转换时间',
switchTpX: '请输入时间坐标x',
switchTpY: '请输入时间坐标y',
diff --git a/src/jmap/shape/Switch/index.js b/src/jmap/shape/Switch/index.js
index de7602a9c..34786f860 100644
--- a/src/jmap/shape/Switch/index.js
+++ b/src/jmap/shape/Switch/index.js
@@ -65,7 +65,7 @@ export default class Switch extends Group {
const point2 = [point1[0] + directx * switchWidth / this.triangle.getSinRate(), point1[1]];
const point3 = [point2[0] + directx * this.triangle.getCotRate() * swPadding, point2[1] + directy * swPadding];
const point4 = [point3[0] + direct * this.triangle.getSin(switchWidth), point3[1] - direct * this.triangle.getCos(switchWidth)];
- this.locShelter = new ESwLocal({
+ this.locShelter = new ESwLocal({ // 定位
zlevel: this.zlevel,
z: this.z,
style: style,
@@ -92,7 +92,7 @@ export default class Switch extends Group {
const spoint3 = [model.intersection.x - directx * width3, model.intersection.y + directy * switchWidth1];
const spoint4 = [spoint1[0] + directx * (width2 + width1) - directx * width3, spoint3[1]];
- this.relocShelter = new ESwLnversion({
+ this.relocShelter = new ESwLnversion({ // 反位
zlevel: this.zlevel,
z: this.z,
style: style,
@@ -148,7 +148,7 @@ export default class Switch extends Group {
createLockRect() {
const offsetX = this.model.locateType == '01' ? 3 : 0;
- this.lockRect = new ELockRect({
+ this.lockRect = new ELockRect({ // 锁定矩形
zlevel: this.zlevel,
z: this.z + 6,
x: this.model.intersection.x - this.style.Switch.monolock.rectWidth / 2 + offsetX,
diff --git a/src/scripts/attribute.js b/src/scripts/attribute.js
index abfd1f5bb..8b49b48f8 100644
--- a/src/scripts/attribute.js
+++ b/src/scripts/attribute.js
@@ -272,8 +272,8 @@ export const attribute = {
{ prop: 'nameShow', label: '是否显示道岔名称:', type: 'checkbox' },
{ prop: 'namePoint.x', firstLevel: 'namePoint', secondLevel: 'x', label: '道岔名称x偏移量:', type: 'number', placeholder: 'px' },
{ prop: 'namePoint.y', firstLevel: 'namePoint', secondLevel: 'y', label: '道岔名称y偏移量:', type: 'number', placeholder: 'px' },
- { prop: 'turnTime', label: '道岔时间:', type: 'number', min: 0, max: 1000, placeholder: 's' },
- { prop: 'timeoutShow', label: '是否显示道岔时间:', type: 'checkbox' },
+ { prop: 'turnTime', label: '道岔转换时间:', type: 'number', min: 0, max: 1000, placeholder: 's' },
+ { prop: 'timeoutShow', label: '是否显示道岔倒计时时间:', type: 'checkbox' },
{ prop: 'sectionACode', label: '关联的A Section Code:', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: [], optionCode: 'sectionList' },
{ prop: 'sectionBCode', label: '关联的B Section Code:', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: [], optionCode: 'sectionList' },
{ prop: 'sectionCCode', label: '关联的C Section Code:', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: [], optionCode: 'sectionList' },
@@ -297,7 +297,7 @@ export const attribute = {
{ required: true, message: '请输入设备集中站', trigger: 'change' }
],
turnTime: [
- { required: true, message: '请输入道岔时间', trigger: 'blur' }
+ { required: true, message: '请输入道岔转换时间', trigger: 'blur' }
],
'tp.x': [
{ required: true, message: '请输入时间坐标x', trigger: 'blur' }
diff --git a/src/views/map/mapdraft/mapedit/configMap.vue b/src/views/map/mapdraft/mapedit/configMap.vue
index 7fe90507c..47ef12d74 100644
--- a/src/views/map/mapdraft/mapedit/configMap.vue
+++ b/src/views/map/mapdraft/mapedit/configMap.vue
@@ -1,30 +1,28 @@
-
-
-
- {{ $t('map.logicalView') }}
- {{ $t('map.physicalView') }}
- {{ $t('map.mixedView') }}
-
+
+
+ {{ $t('map.logicalView') }}
+ {{ $t('map.physicalView') }}
+
-
-
+
+
{{ view.name }}
-
+
{{ view.name }}
@@ -35,7 +33,6 @@
-
\ No newline at end of file
+
From 43dfc042813cb3640ad66073238c504878f08ca9 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 19 Aug 2019 14:09:08 +0800
Subject: [PATCH 079/172] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BF=9D=E5=AD=98?=
=?UTF-8?q?=E6=95=B0=E6=8D=AE=20=E5=89=A7=E6=9C=AC=E7=BC=96=E5=88=B6?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/store/modules/scriptRecord.js | 65 ----
src/views/display/scriptRecord/addAction.vue | 11 +-
.../display/scriptRecord/addBehavior.vue | 316 ------------------
.../display/scriptRecord/deviceCondition.vue | 173 ----------
src/views/display/scriptRecord/getAction.vue | 23 +-
.../display/scriptRecord/getBehavior.vue | 147 --------
.../scriptRecord/roleConditionScript.vue | 82 -----
.../display/scriptRecord/roleSection.vue | 160 ---------
.../display/scriptRecord/targetCondition.vue | 97 ------
src/views/display/scriptRecord/taskScript.vue | 197 -----------
src/views/display/tipScriptRecord.vue | 268 ++++++++-------
src/views/scriptManage/category/tree.vue | 31 +-
12 files changed, 187 insertions(+), 1383 deletions(-)
delete mode 100644 src/views/display/scriptRecord/addBehavior.vue
delete mode 100644 src/views/display/scriptRecord/deviceCondition.vue
delete mode 100644 src/views/display/scriptRecord/getBehavior.vue
delete mode 100644 src/views/display/scriptRecord/roleConditionScript.vue
delete mode 100644 src/views/display/scriptRecord/roleSection.vue
delete mode 100644 src/views/display/scriptRecord/targetCondition.vue
delete mode 100644 src/views/display/scriptRecord/taskScript.vue
diff --git a/src/store/modules/scriptRecord.js b/src/store/modules/scriptRecord.js
index c42264c2c..14bd652de 100644
--- a/src/store/modules/scriptRecord.js
+++ b/src/store/modules/scriptRecord.js
@@ -4,84 +4,19 @@
const scriptRecord = {
namespaced: true,
state: {
- deviceConditionList: [], //任务目标列表
- memberList:[], //角色列表,
- script:[], //剧本列表,
- memberName:"", //角色名称,
- behaviorName:"", //动作名称
mapLocation: {}, //地图定位
},
getters: {
- deviceConditionList: (state) => {
- return state.deviceConditionList;
- },
- memberList:(state)=>{
- return state.memberList;
- },
- script:(state)=>{
- return state.script;
- },
- memberName:(state)=>{
- return state.memberName;
- },
- behaviorName:(state)=>{
- return state.behaviorName;
- },
mapLocation:(state)=>{
return state.mapLocation;
}
},
mutations: {
- setDeviceCondition: (state, deviceConditionList) => {
- state.deviceConditionList = deviceConditionList;
- },
- setMemberList: (state, memberList) => {
- state.memberList = memberList;
- },
- setScript:(state, script) => {
- state.script = script;
- },
- setMemberName:(state, memberName) => {
- state.memberName = memberName;
- },
- setBehaviorName:(state, behaviorName) => {
- state.behaviorName = behaviorName;
- },
setMapLocation:(state, mapLocation) => {
state.mapLocation = mapLocation;
},
},
actions: {
- /**
- * 设置任务目标列表
- */
- updateDeviceCondition: ({ commit }, deviceConditionList) => {
- commit('setDeviceCondition', deviceConditionList);
- },
- /**
- * 设置角色列表
- */
- updateMemberList: ({ commit }, memberList) => {
- commit('setMemberList', memberList);
- },
- /**
- * 设置剧本列表
- */
- updateScript: ({ commit }, script) => {
- commit('setScript', script);
- },
- /**
- * 设置角色名称
- */
- updateMemberName:({ commit }, memberName) => {
- commit('setMemberName', memberName);
- },
- /**
- * 设置动作名称
- */
- updateBehaviorName:({ commit }, behaviorName) => {
- commit('setBehaviorName', behaviorName);
- },
/**
* 设置地图定位
*/
diff --git a/src/views/display/scriptRecord/addAction.vue b/src/views/display/scriptRecord/addAction.vue
index e680938f3..776480db3 100644
--- a/src/views/display/scriptRecord/addAction.vue
+++ b/src/views/display/scriptRecord/addAction.vue
@@ -6,9 +6,9 @@
+
-
购买
- 权限分发(上课)
- 权限转赠
+ 权限分发(上课)
+ 权限转赠
@@ -65,6 +65,7 @@ export default {
return {
num: 5,
height: '',
+ loading: false,
WhetherTypeList: [],
EffectiveTypeList: [],
courseModel: {
@@ -121,18 +122,21 @@ export default {
}
},
buy() {
+ this.loading = true;
this.$router.push({
path: `${UrlConfig.teach.pay}/${this.$route.params.lessonId}`,
query: { permissionType: PermissionType.LESSON, prdCode: this.courseModel.prdCode, mapId: this.courseModel.mapId }
});
},
transfer() {
+ this.loading = false;
if (this.$refs) {
this.activeName = 'second';
this.$refs.limitList.transfer(this.courseModel);
}
},
distribute() {
+ this.loading = false;
if (this.$refs) {
this.activeName = 'second';
this.$refs.limitList.distribute(this.courseModel);
diff --git a/src/views/teach/practical/index.vue b/src/views/teach/practical/index.vue
index 14e44bca4..9419628a0 100644
--- a/src/views/teach/practical/index.vue
+++ b/src/views/teach/practical/index.vue
@@ -20,7 +20,7 @@
-
-
-
- - 考试计时： - {{formatExamUsedTime}} -
-- {{examName}} -
-
-
+
-
-
-
- {{trainingList.indexOf(data)+1}}.{{
- data.trainingName}}
-
-
-
-
-
-
-
-
-
- - 本题名称： - {{ courseModel.name }} -
-- 最佳用时： - {{ courseModel.minDuration }}秒 -
-- 最大用时： - {{ courseModel.maxDuration }}秒 -
-- 实训说明： - {{ courseModel.remarks }} -
-
-
-
-
-
-
-
- 查看试题
- 上一题
- 下一题
- 提交试卷
-
-
- 提交试卷
-
- - 考试计时： - {{formatExamUsedTime}} -
-
+
\ No newline at end of file
+
diff --git a/src/views/display/tipScriptRecord.vue b/src/views/display/tipScriptRecord.vue
index 7a60a4bfd..8890d660b 100644
--- a/src/views/display/tipScriptRecord.vue
+++ b/src/views/display/tipScriptRecord.vue
@@ -1,129 +1,127 @@
-
+
+
+
+
+
+ + 考试计时： + {{ formatExamUsedTime }} +
++ {{ examName }} +
+
+
+
+
+
+ {{ trainingList.indexOf(data)+1 }}.{{
+ data.trainingName }}
+
+
+
+
+
+
+
+
+ + 本题名称： + {{ courseModel.name }} +
++ 最佳用时： + {{ courseModel.minDuration }}秒 +
++ 最大用时： + {{ courseModel.maxDuration }}秒 +
++ 实训说明： + {{ courseModel.remarks }} +
+
+
+
+
+
+
+
+ 查看试题
+ 上一题
+ 下一题
+ 提交试卷
+
+
+ 提交试卷
+
+ + 考试计时： + {{ formatExamUsedTime }} +
+
-
-
@@ -45,12 +45,10 @@ export default {
mixins: [
WindowResizeHandler
],
- mixins: [
- WindowResizeHandler
- ],
data() {
return {
height: '',
+ loading: false,
courseModel: {
id: '',
name: '',
@@ -98,11 +96,13 @@ export default {
}
},
start() {
+ this.loading = true;
const query = { skinCode: this.$route.query.skinCode, trainingId: this.$route.query.trainingId, userExamId: this.$route.query.userExamId, examQuestionId: this.$route.params.examQuestionId };
this.$router.push({ path: '/display/exam', query: query });
launchFullscreen();
},
back() {
+ this.loading = true;
this.$confirm('此操作将放弃本次考试, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@@ -112,7 +112,9 @@ export default {
setExamGive(this.$route.query.userExamId).then(() => {
this.$router.push({ path: '/exam/home' });
});
- }).catch(() => { });
+ }).catch(() => {
+ this.loading = false;
+ });
}
}
};
diff --git a/src/views/teach/detail/index.vue b/src/views/teach/detail/index.vue
index c40944194..6524b65bc 100644
--- a/src/views/teach/detail/index.vue
+++ b/src/views/teach/detail/index.vue
@@ -42,8 +42,8 @@
-
-
-
- - {{ title }} -
-
-
+
-
- 重置剧本
- {{$t('scriptRecord.saveMaplocation')}}
- {{$t('scriptRecord.saveBackground')}}
- {{$t('scriptRecord.saveData')}}
-
-
-
-
-
+
\ No newline at end of file
+
diff --git a/src/views/display/tipTrainingDetail.vue b/src/views/display/tipTrainingDetail.vue
index 6f2dee0db..46f6ae9bb 100644
--- a/src/views/display/tipTrainingDetail.vue
+++ b/src/views/display/tipTrainingDetail.vue
@@ -1,149 +1,150 @@
-
+
+
+
+
+
+ + {{ title }} +
+
+
+
+ 重置剧本
+ {{ $t('scriptRecord.saveMaplocation') }}
+ {{ $t('scriptRecord.saveBackground') }}
+ {{ $t('scriptRecord.saveData') }}
+
+
+
+
-
购买
- 权限分发(考试)
- 权限转赠
- 查看课程试卷
+ 权限分发(考试)
+ 权限转赠
+ 查看课程试卷
@@ -57,6 +57,7 @@ export default {
data() {
return {
height: '',
+ loading: false,
courseModel: {
id: '',
name: '请选择课程',
@@ -117,24 +118,28 @@ export default {
}
},
buy() {
+ this.loading = true;
this.$router.push({
path: `${UrlConfig.exam.pay}/${this.$route.params.lessonId}`,
query: { permissionType: PermissionType.EXAM, prdCode: this.courseModel.prdCode, mapId: this.courseModel.mapId }
});
},
checkCourse() {
+ this.loading = true;
this.$router.push({
path: `${UrlConfig.exam.examRuleManage}`,
query: { lessonId: this.courseModel.id }
});
},
transfer() {
+ this.loading = false;
if (this.$refs) {
this.activeName = 'second';
this.$refs.limitList.transfer(this.courseModel);
}
},
distribute() {
+ this.loading = false;
if (this.$refs) {
this.activeName = 'second';
this.$refs.limitList.distribute(this.courseModel);
diff --git a/src/views/exam/detail/examDetail.vue b/src/views/exam/detail/examDetail.vue
index 5962d4cc9..4e786ed21 100644
--- a/src/views/exam/detail/examDetail.vue
+++ b/src/views/exam/detail/examDetail.vue
@@ -43,7 +43,7 @@
-
-
-
-
- - {{lessonName}} -
-
-
+
-
-
-
-
-
-
-
- - 实训名称： - {{ courseModel.name }} -
-- 最佳用时： - {{ courseModel.minDuration }}秒 -
-- 最大用时： - {{ courseModel.maxDuration }}秒 -
-- 实训说明： - {{ courseModel.remarks }} -
-
+
\ No newline at end of file
+
From 068dbdbbdeb514557856cf3c8ea9dfe99c711a86 Mon Sep 17 00:00:00 2001
From: ival <610568032@qq.com>
Date: Mon, 19 Aug 2019 10:58:14 +0800
Subject: [PATCH 072/172] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/demonstration/detail/index.vue | 23 +++++++++++++++--------
src/views/exam/detail/courseDetail.vue | 11 ++++++++---
src/views/exam/detail/examDetail.vue | 18 ++++++++++--------
src/views/exam/detail/questionDetail.vue | 14 ++++++++------
src/views/teach/detail/index.vue | 8 ++++++--
src/views/teach/practical/index.vue | 12 ++++--------
6 files changed, 51 insertions(+), 35 deletions(-)
diff --git a/src/views/demonstration/detail/index.vue b/src/views/demonstration/detail/index.vue
index 4e2916510..12b2f8f4e 100644
--- a/src/views/demonstration/detail/index.vue
+++ b/src/views/demonstration/detail/index.vue
@@ -30,12 +30,12 @@
+
+
+
+
+
+ + {{ lessonName }} +
+
+
+
+
+
+
+
+
+ + 实训名称： + {{ courseModel.name }} +
++ 最佳用时： + {{ courseModel.minDuration }}秒 +
++ 最大用时： + {{ courseModel.maxDuration }}秒 +
++ 实训说明： + {{ courseModel.remarks }} +
+
- 购买
- 权限分发
- 权限转赠
- 开始仿真
- 创建房间
- 进入房间
+ 购买
+ 权限分发
+ 权限转赠
+ 开始仿真
+ 创建房间
+ 进入房间
@@ -81,6 +81,7 @@ export default {
goodsId: '',
tryUser: 0,
loading: true,
+ buttonLoading: false,
currentLessonId: '',
currentPrdCode: '',
productList: [],
@@ -240,6 +241,7 @@ export default {
async start() {
if (this.courseModel.prdType == '03') {
try {
+ this.buttonLoading = true;
const param = {
mapId: Number(this.mapId),
prdCode: this.courseModel.prdCode
@@ -250,12 +252,13 @@ export default {
this.$router.push({ path: `/trainroom`, query: query });
}
} catch (error) {
+ this.buttonLoading = false;
if (error.code == 20001) {
this.$confirm(`每个用户只能创建一个综合演练房间, 是否进入房间`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
- }).then(() => { }).catch(() => { });
+ }).then(() => {}).catch(() => {});
}
if (error.code == 500009) {
this.$messageBox(error.message);
@@ -272,7 +275,7 @@ export default {
type: 'warning'
}).then(() => {
this.buy();
- }).catch(() => { });
+ }).catch(() => {});
} else {
this.jump();
}
@@ -281,6 +284,7 @@ export default {
},
jump() {
const data = { mapId: this.courseModel.mapId, code: this.currentPrdCode };
+ this.buttonLoading = true;
simulationNotify(data).then(resp => {
// try 0 有权限不走试用
const query = { skinCode: this.courseModel.skinCode, group: resp.data, prdType: this.courseModel.prdType, mapId: this.courseModel.mapId, code: this.currentPrdCode, goodsId: this.goodsId, try: this.tryUser };
@@ -292,17 +296,20 @@ export default {
});
},
buy() {
+ this.buttonLoading = true;
this.$router.push({
path: `${UrlConfig.demonstration.pay}/${this.courseModel.id}`,
query: { permissionType: PermissionType.SIMULATION, prdCode: this.courseModel.prdCode, mapId: this.courseModel.mapId }
});
},
transfer() {
+ this.buttonLoading = false;
if (this.$refs) {
this.$refs[`limit_${this.currentPrdCode}`][0].transfer(this.courseModel);
}
},
distribute() {
+ this.buttonLoading = false;
if (this.$refs) {
this.$refs[`limit_${this.currentPrdCode}`][0].distribute(this.courseModel);
}
diff --git a/src/views/exam/detail/courseDetail.vue b/src/views/exam/detail/courseDetail.vue
index fcdfd5068..d500cc471 100644
--- a/src/views/exam/detail/courseDetail.vue
+++ b/src/views/exam/detail/courseDetail.vue
@@ -35,9 +35,9 @@
- 开始考试
+ 开始考试
@@ -67,6 +67,7 @@ export default {
data() {
return {
height: '',
+ loading: false,
examDetails: {
lessonId: '',
name: '',
@@ -156,11 +157,15 @@ export default {
}
},
buy() {
+ this.loading = true;
getPublishLessonDetail({ id: this.examDetails.lessonId }).then((res) => {
this.$router.push({
path: `${UrlConfig.exam.pay}/${this.examDetails.lessonId}`,
query: { permissionType: PermissionType.EXAM, prdCode: res.data.prdCode, mapId: res.data.mapId }
});
+ }).catch(() => {
+ this.$messageBox('获取课程详情失败');
+ this.loading = false;
});
},
@@ -194,12 +199,7 @@ export default {
}
},
exmaStart() {
- this.loading = this.$loading({
- lock: true,
- text: 'Loading',
- spinner: 'el-icon-loading',
- background: 'rgba(0, 0, 0, 0.7)'
- });
+ this.loading = true;
this.examDetail();
if (this.examList.length) {
examNotify({ examId: this.$route.params.examId }).then(resp => {
@@ -212,9 +212,11 @@ export default {
this.$router.push({ path: `${UrlConfig.display}/exam`, query: query });
launchFullscreen();
}).catch(error => {
+ this.loading = false;
this.$messageBox(`创建仿真失败: ${error.message}`);
- this.loading.close();
});
+ } else {
+ this.loading = false;
}
}
}
diff --git a/src/views/exam/detail/questionDetail.vue b/src/views/exam/detail/questionDetail.vue
index d50a27914..95ee1b73d 100644
--- a/src/views/exam/detail/questionDetail.vue
+++ b/src/views/exam/detail/questionDetail.vue
@@ -22,8 +22,8 @@
-
- 开始实训
+ 开始实训
@@ -43,6 +43,7 @@ export default {
data() {
return {
height: '',
+ loading: false,
courseModel: {
id: '',
name: '',
@@ -85,12 +86,7 @@ export default {
}
},
start() {
- const loading = this.$loading({
- lock: true,
- text: 'Loading',
- spinner: 'el-icon-loading',
- background: 'rgba(0, 0, 0, 0.7)'
- });
+ this.loading = true;
trainingNotify({ trainingId: this.$route.params.trainingId }).then(resp => {
const query = {
group: resp.data, trainingId: this.$route.params.trainingId, lessonId: this.$route.params.lessonId
@@ -98,8 +94,8 @@ export default {
this.$router.push({ path: `${UrlConfig.display}/teach`, query: query });
launchFullscreen();
}).catch(error => {
+ this.loading = false;
this.$messageBox(`创建仿真失败: ${error.message}`);
- loading.close();
});
}
}
From 4da9dc977b5f4fe5ee687a121223f30cc120c07a Mon Sep 17 00:00:00 2001
From: ival <610568032@qq.com>
Date: Mon, 19 Aug 2019 11:16:29 +0800
Subject: [PATCH 073/172] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=B3=E9=94=AE?=
=?UTF-8?q?=E8=8F=9C=E5=8D=95=EF=BC=8C=E6=96=87=E5=AD=97=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/PopMenu/index.vue | 13 +++++++------
src/views/map/runplan/manage/operateMenu.vue | 10 ++++------
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/components/PopMenu/index.vue b/src/components/PopMenu/index.vue
index 3636f2484..34614ed7d 100644
--- a/src/components/PopMenu/index.vue
+++ b/src/components/PopMenu/index.vue
@@ -69,8 +69,8 @@
-
地图显示
+ 图层显示
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{tag}}
-
- 添加
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/views/display/scriptRecord/deviceCondition.vue b/src/views/display/scriptRecord/deviceCondition.vue
deleted file mode 100644
index 8c4764167..000000000
--- a/src/views/display/scriptRecord/deviceCondition.vue
+++ /dev/null
@@ -1,173 +0,0 @@
-
-
-
-
- {{buttonName}}
-
-
-
-
- 添加
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 删除
-
-
- 确定
- 取消
-
-
-
-
-
-
-
diff --git a/src/views/display/scriptRecord/getAction.vue b/src/views/display/scriptRecord/getAction.vue
index b2cf0f2e9..9401ed438 100644
--- a/src/views/display/scriptRecord/getAction.vue
+++ b/src/views/display/scriptRecord/getAction.vue
@@ -5,6 +5,7 @@
{{scope.row.deviceType}}
- {{scope.row.code}}
- {{scope.row.condition}}
- {{scope.row.paramDeviceType}}
- {{scope.row.paramCode}}
-
- 地图列表
+ 地图列表
+ 添加剧本
+
diff --git a/src/views/display/tipScriptRecord.vue b/src/views/display/tipScriptRecord.vue
index 3d596cf76..804564828 100644
--- a/src/views/display/tipScriptRecord.vue
+++ b/src/views/display/tipScriptRecord.vue
@@ -13,9 +13,14 @@
- 重置剧本
+ 暂停
+ 恢复并执行
{{$t('scriptRecord.saveMaplocation')}}
+ 重置剧本
{{$t('scriptRecord.saveBackground')}}
{{$t('scriptRecord.saveData')}}
@@ -29,7 +34,7 @@
import Vue from 'vue';
import GetAction from './scriptRecord/getAction';
import { launchFullscreen, exitFullscreen } from '@/utils/screen';
- import {saveScriptScenes, saveScriptData, dumpScriptData,updateMapLocation} from '@/api/simulation';
+ import {saveScriptScenes, saveScriptData, dumpScriptData,updateMapLocation,scriptPause,executeScript} from '@/api/simulation';
export default {
name: 'TipScriptRecord',
@@ -50,14 +55,11 @@
mapLocation:{},
autoSaveScript: null,
isSavingScript:false,
+ isPause:false,
+ executeDisabled:false,
// isSaveStage: true,
}
},
- watch: {
- '$store.state.map.mapViewLoadedCount': function (val) {
- Vue.prototype.$jlmap.setOptions(this.$store.state.scriptRecord.mapLocation);
- }
- },
created() {
},
mounted(){
@@ -83,6 +85,13 @@
this.isShrink = true;
}
},
+ setIsParse(isPause){
+ this.isPause=isPause;
+ },
+ setDisabled(data)
+ {
+ this.executeDisabled=!data;
+ },
initAutoSaveScript() {
const timeout = 1000 * 20;
this.clearAutoSave(this.autoSaveScript);
@@ -94,13 +103,25 @@
this.autoSaveScript = null;
}
},
- // getActions(row){
- // this.displayType="action";
- // this.behaviorId=row.id;
- // this.$store.dispatch('scriptRecord/updateBehaviorName',row.description);
- // },
+ pauseScript(){
+ scriptPause(this.group).then(resp => {
+ // this.isSaveStage = false;
+ this.$store.dispatch('scriptRecord/updateSimulationPause',true);
+ // this.$message.success('暂停成功');
+ }).catch(error => {
+ this.$messageBox('暂停失败!');
+ });
+ },
+ executePlayScript(){
+ executeScript(this.group).then(resp => {
+ // this.isSaveStage = false;
+ this.$store.dispatch('scriptRecord/updateSimulationPause',false);
+ // this.$message.success('暂停成功');
+ }).catch(error => {
+ this.$messageBox('恢复失败!');
+ });
+ },
saveScenesStage() {
-
saveScriptScenes(this.group).then(resp => {
// this.isSaveStage = false;
this.$message.success('保存背景成功');
@@ -125,6 +146,7 @@
})
},
dumpScenesData() {
+ this.clearAutoSave();
let group=this.group;
this.$confirm('此操作将会清除已保存的编制数据, 是否继续?', '提示', {
confirmButtonText: '确定',
@@ -133,11 +155,15 @@
}).then(() => {
dumpScriptData(group).then(resp => {
// this.isSaveStage = true;
+ this.$refs["getAction"].loadInitData();
+ this.initAutoSaveScript();
this.$message.success('清除数据成功');
}).catch(error => {
this.$messageBox('清除数据失败!');
})
- }).catch(error => { })
+ }).catch(error => {
+ this.initAutoSaveScript();
+ })
},
saveMaplocation()
{
@@ -205,6 +231,11 @@
margin-left: 20px;
float:right;
}
+ .button-group1{
+ margin-top:15px;
+ margin-left: 20px;
+ float:left;
+ }
.actionInfo{
margin-top:30px;
}
From c5ecf86107c5f52dfb8559293edb7e2c4615f421 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 19 Aug 2019 18:31:13 +0800
Subject: [PATCH 089/172] =?UTF-8?q?=E8=B0=83=E6=95=B4:=20=E5=9B=BD?=
=?UTF-8?q?=E9=99=85=E5=8C=96+=E6=88=90=E9=83=BD=E4=B8=89=E5=8F=B7?=
=?UTF-8?q?=E7=BA=BF=E4=BA=BA=E5=B7=A5=E8=BD=A6=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/i18n/langs/en/global.js | 3 +-
src/i18n/langs/en/orderAuthor.js | 109 +++++++++++-----------
src/i18n/langs/zh/global.js | 3 +-
src/i18n/langs/zh/orderAuthor.js | 3 +-
src/jmap/config/skinCode/chengdu_03.js | 8 ++
src/jmap/shape/Train/TrainBody.js | 16 +++-
src/jmap/shape/Train/index.js | 14 ++-
src/views/orderauthor/commodity/index.vue | 2 +-
src/views/orderauthor/order/draft.vue | 8 +-
9 files changed, 99 insertions(+), 67 deletions(-)
diff --git a/src/i18n/langs/en/global.js b/src/i18n/langs/en/global.js
index 3e76f9476..a9c48b43b 100644
--- a/src/i18n/langs/en/global.js
+++ b/src/i18n/langs/en/global.js
@@ -78,6 +78,7 @@ export default {
trainingHasStart: "(name)'s room has begun",
trainingNotStart: "(name)'s room hasn't started yet",
inputRoomNumber: 'Please enter the room number.',
- chooseRoom: 'Choose Room'
+ chooseRoom: 'Choose Room',
+ month: 'month'
};
diff --git a/src/i18n/langs/en/orderAuthor.js b/src/i18n/langs/en/orderAuthor.js
index 9d00c6281..33c2451b0 100644
--- a/src/i18n/langs/en/orderAuthor.js
+++ b/src/i18n/langs/en/orderAuthor.js
@@ -1,85 +1,86 @@
export default {
name: 'Name',
- productType: 'ProductType',
+ productType: 'Product type',
map: 'Map',
state: 'State',
- commodityName: 'CommodityName',
- mapName: 'MapName',
- courseName: 'CourseName',
+ commodityName: 'Commodity name',
+ mapName: 'Map name',
+ courseName: 'Course name',
price: 'Price',
describtion: 'Describtion',
- creationTime: 'CreationTime',
- setupFailure: 'SetupFailure',
- setupEffective: 'SetupEffective',
+ creationTime: 'Creation time',
+ setupFailure: 'Setup failure',
+ setupEffective: 'Setup effective',
organizationOrEnterprise: 'Organization/Enterprise',
userName: 'UserName',
- permissionType: 'PermissionType',
- permissionNumber: 'PermissionNumber',
- permanenceOrNot: 'PermanenceOrNot',
+ permissionType: 'Permission type',
+ permissionNumber: 'Permission number',
+ permanenceOrNot: 'Permanence or not',
startDate: 'StartDate',
- purchaseMonths: 'PurchaseMonths',
- totalPrice: 'TotalPrice',
- paymentMethod: 'PaymentMethod',
- creationDate: 'CreationDate',
- orderType: 'OrderType',
- contractNumber: 'ContractNumber',
- businessType: 'BusinessType',
- paymentStatus: 'PaymentStatus',
+ purchaseMonths: 'Purchase months',
+ totalPrice: 'Total price',
+ paymentMethod: 'Payment method',
+ creationDate: 'Creation date',
+ orderType: 'Order type',
+ contractNumber: 'Contract number',
+ businessType: 'Business type',
+ paymentStatus: 'Payment status',
salesman: 'Salesman',
- obtainQrCode: 'ObtainQrCode',
- userMobile: 'UserMobile',
- mapProductName: 'MapProductName',
+ obtainQrCode: 'Obtain QrCode',
+ userMobile: 'User mobile',
+ mapProductName: 'Map product name',
publicOrPrivate: 'Public/Private',
- totalPermissions: 'TotalPermissions',
- residualPermissionNumber: 'ResidualPermissionNumber',
- authorityStatus: 'AuthorityStatus',
+ totalPermissions: 'Total permissions',
+ residualPermissionNumber: 'Residual permissionNumber',
+ authorityStatus: 'Authority status',
startTime: 'StartTime',
endTime: 'EndTime',
- courseAuthorityStatus: 'CourseAuthorityStatus',
+ courseAuthorityStatus: 'Course authority status',
source: 'Source',
- founderPhone: 'FounderPhone',
+ founderPhone: 'Founder phone',
founder: 'Founder',
- privilegePackaging: 'PrivilegePackaging',
+ privilegePackaging: 'Privilege packaging',
packaging: 'Packaging',
unpacking: 'Unpacking',
- authorityDetails: 'AuthorityDetails',
+ authorityDetails: 'Authority details',
renew: 'Renew',
- productName: 'ProductName',
+ productName: 'Product name',
recovery: 'Recovery',
- permissionPack: 'PermissionPack',
- privilegeTransferQRCode: 'PrivilegeTransferQRCode',
- generatingQRCode: 'GeneratingQRCode',
- transferQRCode: 'TransferQRCode',
+ permissionPack: 'Permission pack',
+ privilegeTransferQRCode: 'Privilege transfer QRCode',
+ generatingQRCode: 'Generating QRCode',
+ transferQRCode: 'Transfer QRCode',
today: 'Today',
yesterday: 'Yesterday',
- aWeekAgo: 'AWeekAgo',
- updateOrder: 'UpdateOrder',
- renewOrder: 'RenewOrder',
- unknownRouter: 'UnknownRouter',
- increasePurchaseTime: 'IncreasePurchaseTime',
- choosePurchaseTime: 'ChoosePurchaseTime',
- increasePermissionNumber: 'IncreasePermissionNumber',
- choosePermissionNumber: 'ChoosePermissionNumber',
+ aWeekAgo: 'A week ago',
+ updateOrder: 'Update order',
+ renewOrder: 'Renew order',
+ unknownRouter: 'Unknown router',
+ increasePurchaseTime: 'Increase purchase time',
+ choosePurchaseTime: 'Choose purchase time',
+ increasePermissionNumber: 'Increase permission number',
+ choosePermissionNumber: 'Choose permission number',
itemPricing: 'itemPricing',
addUserPermissions: 'Add user permissions',
- publicAuthority: 'PublicAuthority',
- privateAuthority: 'PrivateAuthority',
+ publicAuthority: 'Public authority',
+ privateAuthority: 'Private authority',
optionPrivilegeTransfer: 'Option privilege transfer',
- trainingList: 'TrainingList',
+ trainingList: 'Training list',
selectPermissionsPackage: 'Select package authority',
- addRecords: 'AddRecords',
- totalNumber: 'TotalNumber',
+ addRecords: 'Add records',
+ totalNumber: 'Total number',
permissionToDistributeQRCode: 'Permission to distribute qr code',
editPermissionRules: 'Edit permission rules',
- addGoods: 'AddGoods',
- updateGoods: 'UpdateGoods',
+ addGoods: 'Add goods',
+ updateGoods: 'Update goods',
lesson: 'Lesson',
whetherTrial: 'WhetherTrial',
- unitOfTime: 'UnitOfTime',
- trialTime: 'TrialTime',
- distributionUser: 'DistributionUser',
+ unitOfTime: 'Unit of time',
+ trialTime: 'Trial time',
+ distributionUser: 'Distribution user',
orderNumber: 'OrderNumber',
- sourcesOfInformation: 'SourcesOfInformation',
- distributePermission: 'DistributePermission',
- orderCreation: 'OrderCreation'
+ sourcesOfInformation: 'Sources of information',
+ distributePermission: 'Distribute permission',
+ orderCreation: 'Order creation',
+ chooseGoods: 'Choose goods'
};
diff --git a/src/i18n/langs/zh/global.js b/src/i18n/langs/zh/global.js
index 7ac7adcb7..bf10e77db 100644
--- a/src/i18n/langs/zh/global.js
+++ b/src/i18n/langs/zh/global.js
@@ -79,5 +79,6 @@ export default {
trainingHasStart: '{{name}}的房间已开始',
trainingNotStart: '{{name}}的房间未开始',
inputRoomNumber: '请输入房间号',
- chooseRoom: '选择房间'
+ chooseRoom: '选择房间',
+ month: '月'
};
diff --git a/src/i18n/langs/zh/orderAuthor.js b/src/i18n/langs/zh/orderAuthor.js
index 37983e4ad..b3089866e 100644
--- a/src/i18n/langs/zh/orderAuthor.js
+++ b/src/i18n/langs/zh/orderAuthor.js
@@ -82,5 +82,6 @@ export default {
orderNumber: '订单号',
sourcesOfInformation: '信息来源',
distributePermission: '权限分发',
- orderCreation: '订单创建'
+ orderCreation: '订单创建',
+ chooseGoods: '选择商品'
};
diff --git a/src/jmap/config/skinCode/chengdu_03.js b/src/jmap/config/skinCode/chengdu_03.js
index e830934da..74bcc594c 100644
--- a/src/jmap/config/skinCode/chengdu_03.js
+++ b/src/jmap/config/skinCode/chengdu_03.js
@@ -374,6 +374,10 @@ class SkinCode extends defaultStyle {
type: '03',
serviceNumber: '---',
nameFormat: 'groupNumber:serviceNumber'
+ },
+ {
+ type: '03',
+ nameFormat: 'serviceNumber:trainNumber'
}
], // 特殊列车类型需设置显示格式
lrPadding: 4, // 两边间隔
@@ -435,6 +439,10 @@ class SkinCode extends defaultStyle {
useSelfText: true // 使用配置项的字体大小
},
trainStatusStyle: {
+ trainTypeStatus: [
+ {type: '03', serviceNumberColor: '#FFF000', groupNumberColor: '#FFF000'},
+ {type: '02', trainNumberColor: '#FFF000', groupNumberColor: '#FFF000'}
+ ], // 列车类型对应的识别号样式
defaultDestinationColor: '#FFFFFF', // 默认目的地状态显示颜色
destinationStatusSetText: 'trainWindowBorder', // 目的地状态设置的对应哪个颜色
destinationStatus: [
diff --git a/src/jmap/shape/Train/TrainBody.js b/src/jmap/shape/Train/TrainBody.js
index bc9534d8f..86a9a54fe 100644
--- a/src/jmap/shape/Train/TrainBody.js
+++ b/src/jmap/shape/Train/TrainBody.js
@@ -174,12 +174,20 @@ export default class TrainBody extends Group {
this.trainBodyBox && this.trainBodyBox.setStyle('fill', color);
}
setTextTrainServerColor(color) {
- this.textTrainServer.setStyle('textFill', color);
- this.textTrainServer.setStyle('textStroke', color);
+ this.textTrainServer&&this.textTrainServer.setStyle('textFill', color);
+ this.textTrainServer&&this.textTrainServer.setStyle('textStroke', color);
}
setTextTrainTargetColor(color) {
- this.textTrainTarget.setStyle('textFill', color);
- this.textTrainTarget.setStyle('textStroke', color);
+ this.textTrainTarget&&this.textTrainTarget.setStyle('textFill', color);
+ this.textTrainTarget&&this.textTrainTarget.setStyle('textStroke', color);
+ }
+ setTextTrainNumberColor(color) {
+ this.textTrainNumber&&this.textTrainNumber.setStyle('textFill', color);
+ this.textTrainNumber&&this.textTrainNumber.setStyle('textStroke', color);
+ }
+ setTextTrainTargetNumberColor(color) {
+ this.textTrainTargetNumber&&this.textTrainTargetNumber.setStyle('textFill', color);
+ this.textTrainTargetNumber&&this.textTrainTargetNumber.setStyle('textStroke', color);
}
setHShow(isShow) {
if (this.textH) {
diff --git a/src/jmap/shape/Train/index.js b/src/jmap/shape/Train/index.js
index b1e8c1413..b71b6acb5 100644
--- a/src/jmap/shape/Train/index.js
+++ b/src/jmap/shape/Train/index.js
@@ -282,7 +282,18 @@ export default class Train extends Group {
});
}
}
-
+ setTrainTypeStatus(type) {
+ if (this.style.Train.trainStatusStyle.trainTypeStatus) {
+ this.style.Train.trainStatusStyle.trainTypeStatus.some((item) => {
+ if ( type === item.type) {
+ item.serviceNumberColor && this.trainB && this.trainB.setTextTrainServerColor(item.serviceNumberColor);
+ item.trainNumberColor && this.trainB && this.trainB.setTextTrainNumberColor(item.trainNumberColor);
+ item.trainTargetColor && this.trainB && this.trainB.setTextTrainTargetColor(item.trainTargetColor);
+ item.groupNumberColor && this.trainB && this.trainB.setTextTrainTargetNumberColor(item.groupNumberColor);
+ }
+ });
+ }
+ }
// 设置状态
setState(model) {
this.model = model;
@@ -296,6 +307,7 @@ export default class Train extends Group {
this.setDoorStatus(model.doorStatus); // 设置车门状态类型
this.setCommunicationStatus(model.communicationStatus); // 设置通信状态类型
this.setAlarmStatus(model.alarmStatus); // 设置报警状态
+ this.setTrainTypeStatus(model.type); // 根据列车类型设置列车识别号样式
}
}
// 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
diff --git a/src/views/orderauthor/commodity/index.vue b/src/views/orderauthor/commodity/index.vue
index d271e66e4..ba3db7326 100644
--- a/src/views/orderauthor/commodity/index.vue
+++ b/src/views/orderauthor/commodity/index.vue
@@ -106,7 +106,7 @@
{
type: 'button',
title: this.$t('global.operate'),
- width: '250',
+ width: '270',
buttons: [
{
name: this.$t('global.edit'),
diff --git a/src/views/orderauthor/order/draft.vue b/src/views/orderauthor/order/draft.vue
index d593daf3d..a54184e89 100644
--- a/src/views/orderauthor/order/draft.vue
+++ b/src/views/orderauthor/order/draft.vue
@@ -163,16 +163,16 @@
items: [
{ prop: 'organizationId', label: this.$t('orderAuthor.organizationOrEnterprise'), type: 'select', required: false, disabled: this.isDisabled, options: this.OrganizationList, allowCreate: true, onChange: this.onChange },
// { prop: 'goodsId', label: '商品名称', type: 'select', required: false, disabled: this.isDisabled, options: this.goodsList, change: true, onChange: this.selectCommodity },
- { prop: 'goodsName', label: this.$t('orderAuthor.commodityName'), type: 'text', required: false, disabled: true, rightWidth: true, disabled: true, buttontip: '选择商品', buttonClick: this.buttonClick },
- { prop: 'price', label: this.$t('orderAuthor.itemPricing'), type: 'number', required: false, disabled: true, min: 0, message: '元' },
+ { prop: 'goodsName', label: this.$t('orderAuthor.commodityName'), type: 'text', required: false, rightWidth: true, disabled: true, buttontip: this.$t('orderAuthor.chooseGoods'), buttonClick: this.buttonClick },
+ { prop: 'price', label: this.$t('orderAuthor.itemPricing'), type: 'number', required: false, disabled: true, min: 0, message: this.$t('global.yuan') },
{ prop: 'orderType', label: this.$t('orderAuthor.orderType'), type: 'select', required: false, disabled: this.isDisabled, options: this.OrderTypeList },
{ prop: 'sellerId', label: this.$t('orderAuthor.salesman'), type: 'select', required: false, show: this.isShowSeller, disabled: this.isDisabled, options: this.SellerList },
{ prop: 'contractNo', label: this.$t('orderAuthor.contractNumber'), type: 'text', required: false, show: this.isShowContractNo },
{ prop: 'amount', label: this.totalTitle, type: 'number', required: false, show: true, min: 0 },
{ prop: 'forever', label: this.$t('orderAuthor.permanenceOrNot'), type: 'radio', required: false, options: this.$ConstSelect.Whether, disabled: this.foreverIsDisabled },
{ prop: 'startTime', label: this.$t('orderAuthor.startDate'), type: 'date', required: false, show: this.isShowStartDate, viewFormat: "yyyy-MM-dd", valueFormat: "yyyy-MM-dd", picker: this.DatePicker },
- { prop: 'monthAmount', label: this.monthsTitle, type: 'number', required: false, show: this.isShowMonths, min: 0, message: '月' },
- { prop: 'totalPrice', label: this.$t('orderAuthor.totalPrice'), type: 'number', required: false, show: this.isShowPrice, min: 0, message: '元' },
+ { prop: 'monthAmount', label: this.monthsTitle, type: 'number', required: false, show: this.isShowMonths, min: 0, message: this.$t('global.month') },
+ { prop: 'totalPrice', label: this.$t('orderAuthor.totalPrice'), type: 'number', required: false, show: this.isShowPrice, min: 0, message: this.$t('global.yuan') },
{ prop: 'bizType', label: this.$t('orderAuthor.businessType'), type: 'select', required: false, disabled: true, options: this.BizTypeList },
{ prop: 'payWays', label: this.$t('orderAuthor.paymentMethod'), type: 'select', required: false, disabled: this.payTypeIsDisabled, show: this.isShowPayType, options: this.PayTypeList },
{ prop: 'payStatus', label: this.$t('orderAuthor.paymentStatus'), type: 'select', required: false, disabled: this.payStatusDisabled, show: this.isShowPayStatus, options: this.PayStatusTypeList },
From 68e7eaeeb6c540d7d159b13ef63c0be9ee9dcec5 Mon Sep 17 00:00:00 2001
From: ival <610568032@qq.com>
Date: Mon, 19 Aug 2019 18:42:53 +0800
Subject: [PATCH 090/172] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E5=85=B8?=
=?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=9A=84=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/i18n/langs/en/error.js | 7 +-
src/i18n/langs/en/orderAuthor.js | 4 +-
src/i18n/langs/en/rules.js | 6 +-
src/i18n/langs/en/system.js | 35 +-
src/i18n/langs/zh/error.js | 6 +-
src/i18n/langs/zh/orderAuthor.js | 3 +-
src/i18n/langs/zh/rules.js | 7 +-
src/i18n/langs/zh/system.js | 35 +-
.../management/dictionaryDetail/edit.vue | 38 +-
.../management/existingSimulation/index.vue | 10 +-
src/views/management/userControl/edit.vue | 20 +-
src/views/management/userControl/index.vue | 26 +-
src/views/management/userExam/edit.vue | 24 +-
src/views/management/userExam/index.vue | 34 +-
src/views/management/userSimulation/add.vue | 39 +-
src/views/management/userSimulation/index.vue | 38 +-
src/views/management/userTraining/add.vue | 38 +-
.../management/userTraining/addTraining.vue | 6 +-
src/views/management/userTraining/edit.vue | 21 +-
src/views/management/userTraining/index.vue | 38 +-
src/views/orderauthor/author/draft.vue | 6 +-
src/views/orderauthor/author/index.vue | 469 +++++----
src/views/orderauthor/commodity/index.vue | 423 ++++----
src/views/orderauthor/order/addGoods.vue | 366 +++----
src/views/orderauthor/order/canDistribute.vue | 106 +-
src/views/orderauthor/order/draft.vue | 953 +++++++++---------
src/views/orderauthor/order/list.vue | 592 ++++++-----
src/views/orderauthor/permission/detail.vue | 323 +++---
.../permission/draft/choosePermission.vue | 413 ++++----
.../orderauthor/permission/draft/ruleForm.vue | 10 +-
src/views/orderauthor/permission/index.vue | 509 +++++-----
31 files changed, 2339 insertions(+), 2266 deletions(-)
diff --git a/src/i18n/langs/en/error.js b/src/i18n/langs/en/error.js
index 9211cff3a..30fa912f3 100644
--- a/src/i18n/langs/en/error.js
+++ b/src/i18n/langs/en/error.js
@@ -40,5 +40,10 @@ export default {
codeHasExist: 'Coding already exists',
formartError: 'The format is incorrect, only characters/numbers/_',
createDictionaryFailed: 'Failed to create dictionary',
- updateDictionaryFailed: 'Failed to update dictionary'
+ updateDictionaryFailed: 'Failed to update dictionary',
+ createDetailFailed: 'Failed to create details',
+ updateDetailFailed: 'Failed to update details',
+ addFailed: 'Failure to add',
+ updateFailed: 'Failure to update'
+
};
diff --git a/src/i18n/langs/en/orderAuthor.js b/src/i18n/langs/en/orderAuthor.js
index 64514d27b..85beb736e 100644
--- a/src/i18n/langs/en/orderAuthor.js
+++ b/src/i18n/langs/en/orderAuthor.js
@@ -53,6 +53,7 @@ export default {
today: 'Today',
yesterday: 'Yesterday',
aWeekAgo: 'AWeekAgo',
+ addOrder: 'AddOrder',
updateOrder: 'UpdateOrder',
renewOrder: 'RenewOrder',
unknownRouter: 'UnknownRouter',
@@ -82,5 +83,6 @@ export default {
orderNumber: 'OrderNumber',
sourcesOfInformation: 'SourcesOfInformation',
distributePermission: 'DistributePermission',
- orderCreation: 'OrderCreation'
+ orderCreation: 'OrderCreation',
+ select: 'Select'
};
diff --git a/src/i18n/langs/en/rules.js b/src/i18n/langs/en/rules.js
index e4d54884c..e08bba367 100644
--- a/src/i18n/langs/en/rules.js
+++ b/src/i18n/langs/en/rules.js
@@ -180,6 +180,10 @@ export default {
unitOfTimeRadio: 'Please select a time unit',
goodsDescribtionInput: 'Please enter product description',
userNameInput: 'Please enter user name',
- permissionTypeInput: 'Please select the permission type'
+ permissionTypeInput: 'Please select the permission type',
+ timeInput: 'Please enter the time',
+ chooseUser: 'Please select the user',
+ pleaseInputLessonName: 'Please enter the course name',
+ pleaseSelectTraining: 'Please select training'
};
diff --git a/src/i18n/langs/en/system.js b/src/i18n/langs/en/system.js
index ada9a3241..eeb86c0a7 100644
--- a/src/i18n/langs/en/system.js
+++ b/src/i18n/langs/en/system.js
@@ -11,8 +11,8 @@ export default {
updateSuccess: 'Update successful',
destory: 'Destory',
simulationGroup: 'Simulation Group',
- username: 'User Name',
- phoneNumber: 'Cell-phone Number',
+ userName: 'User Name',
+ mobile: 'Cell-phone Number',
skinCode: 'Skin Code',
prdType: 'Product Type',
simulationType: 'Simulation Type',
@@ -21,5 +21,34 @@ export default {
isError: 'Is Error',
isSuspend: 'Is Suspend',
isDrivingAsplanned: 'Whether to drive as planned',
- delUserSimulationIsContinue: 'This operation will delete the user simulation data. Do you want to continue?'
+ delUserSimulationIsContinue: 'This operation will delete the user simulation data. Do you want to continue?',
+ createDetail: 'Create details',
+ editDetail: 'Editorial details',
+ mapName: 'Map Name',
+ trainingName: 'Training Name',
+ trainingUseTime: 'Training Time',
+ minute: 'Minute',
+ second: 'Second',
+ createSimulationTitle: 'Create Simulation Information',
+ addSuccess: 'Added Successfully',
+ pleaseInputNames: 'Please enter your nickname/name/cell phone number',
+ examUser: 'Examination Users',
+ examScore: 'Examination Score',
+ examResult: 'Examination Results',
+ examName: 'Paper Name',
+ delExamResultIsContinue: 'This operation will delete the test result. Do you want to continue?',
+ editExamDetail: 'Edit exam details',
+ subscribeMap: 'Subscribe',
+ roles: 'Roles',
+ email: 'Email',
+ nickname: 'Nickname',
+ delTypeIsContinue: 'This operation will delete the type. Do you want to continue?',
+ permission: 'Permission',
+ editUserPermission: 'Edit User Rights',
+ lessonName: 'Lesson Name',
+ selectTraining: 'Selection Training',
+ createUserTraining: 'Creating User Training',
+ editTrainingDetail: 'Editor Training Details',
+ trainingTime: 'Training duration'
+
};
diff --git a/src/i18n/langs/zh/error.js b/src/i18n/langs/zh/error.js
index 73d0d7695..9d2918ead 100644
--- a/src/i18n/langs/zh/error.js
+++ b/src/i18n/langs/zh/error.js
@@ -40,6 +40,10 @@ export default {
codeHasExist: '编码已存在',
formartError: '格式不正确，只能是字符/数字/_',
createDictionaryFailed: '创建字典失败',
- updateDictionaryFailed: '更新字典失败'
+ updateDictionaryFailed: '更新字典失败',
+ createDetailFailed: '创建明细失败',
+ updateDetailFailed: '更新明细失败',
+ addFailed: '添加失败',
+ updateFailed: '更新失败'
};
diff --git a/src/i18n/langs/zh/orderAuthor.js b/src/i18n/langs/zh/orderAuthor.js
index 6c1dea71e..b7efbefe7 100644
--- a/src/i18n/langs/zh/orderAuthor.js
+++ b/src/i18n/langs/zh/orderAuthor.js
@@ -83,5 +83,6 @@ export default {
orderNumber: '订单号',
sourcesOfInformation: '信息来源',
distributePermission: '权限分发',
- orderCreation: '订单创建'
+ orderCreation: '订单创建',
+ select: '选择'
};
diff --git a/src/i18n/langs/zh/rules.js b/src/i18n/langs/zh/rules.js
index 98072406c..623a3a93c 100644
--- a/src/i18n/langs/zh/rules.js
+++ b/src/i18n/langs/zh/rules.js
@@ -179,5 +179,10 @@ export default {
unitOfTimeRadio: '请选择时间单位',
goodsDescribtionInput: '请输入商品描述',
userNameInput: '请输入用户名称',
- permissionTypeInput: '请选择权限类型'
+ permissionTypeInput: '请选择权限类型',
+ timeInput: '请输入时长',
+ chooseUser: '请选择用户',
+ pleaseInputLessonName: '请输入课程名称',
+ pleaseSelectTraining: '请选择实训'
+
};
diff --git a/src/i18n/langs/zh/system.js b/src/i18n/langs/zh/system.js
index b92e9f29b..ac2ef3ca0 100644
--- a/src/i18n/langs/zh/system.js
+++ b/src/i18n/langs/zh/system.js
@@ -11,8 +11,8 @@ export default {
updateSuccess: '更新成功',
destory: '销 毁',
simulationGroup: '仿真Group',
- username: '用户名',
- phoneNumber: '手机号',
+ userName: '用户名',
+ mobile: '手机号',
skinCode: '皮肤编号',
prdType: '产品类型',
simulationType: '仿真类型',
@@ -21,5 +21,34 @@ export default {
isError: '是否错误',
isSuspend: '是否暂停',
isDrivingAsplanned: '是否按计划行车',
- delUserSimulationIsContinue: '此操作将删除此用户仿真数据, 是否继续?'
+ delUserSimulationIsContinue: '此操作将删除此用户仿真数据, 是否继续?',
+ createDetail: '创建明细',
+ editDetail: '编辑明细',
+ mapName: '地图名称',
+ trainingName: '实训名称',
+ trainingUseTime: '实训用时',
+ minute: '分',
+ second: '秒',
+ createSimulationTitle: '创建仿真信息',
+ addSuccess: '添加成功',
+ pleaseInputNames: '请输入昵称/名字/手机号',
+ examUser: '考试用户',
+ examScore: '考试成绩',
+ examResult: '考试结果',
+ examName: '试卷名称',
+ delExamResultIsContinue: '此操作将删除此考试结果, 是否继续?',
+ editExamDetail: '编辑考试详情',
+ subscribeMap: '订阅地图',
+ roles: '角色',
+ email: '邮箱',
+ nickname: '昵称',
+ delTypeIsContinue: '此操作将删除该类型, 是否继续?',
+ permission: '权限',
+ editUserPermission: '编辑用户权限',
+ lessonName: '课程名称',
+ selectTraining: '选择实训',
+ createUserTraining: '创建用户实训',
+ editTrainingDetail: '编辑实训详情',
+ trainingTime: '实训时长'
+
};
diff --git a/src/views/management/dictionaryDetail/edit.vue b/src/views/management/dictionaryDetail/edit.vue
index 19d88b51d..3a80b410a 100644
--- a/src/views/management/dictionaryDetail/edit.vue
+++ b/src/views/management/dictionaryDetail/edit.vue
@@ -40,12 +40,12 @@ export default {
const form = {
labelWidth: '60px',
items: [
- { prop: 'code', label: '编码', type: 'text', required: true, disabled: !isAdd },
- { prop: 'name', label: '名称', type: 'text', required: true },
+ { prop: 'code', label: this.$t('system.code'), type: 'text', required: true, disabled: !isAdd },
+ { prop: 'name', label: this.$t('system.name'), type: 'text', required: true },
{
- prop: 'status', label: '状态', type: 'select', required: true, options: this.$ConstSelect.Status
+ prop: 'status', label: this.$t('system.status'), type: 'select', required: true, options: this.$ConstSelect.Status
},
- { prop: 'remarks', label: '备注', type: 'textarea', required: false }
+ { prop: 'remarks', label: this.$t('system.remarks'), type: 'textarea', required: false }
]
};
return form;
@@ -53,21 +53,21 @@ export default {
rules() {
const crules = {
name: [
- { required: true, message: '请输入名称', trigger: 'blur' },
- { min: 1, max: 25, message: '长度在 1 到 25 个字符', trigger: 'blur' }
+ { required: true, message: this.$t('rules.pleaseInputName'), trigger: 'blur' },
+ { min: 1, max: 25, message: this.$t('rules.strLength1To25'), trigger: 'blur' }
],
status: [
- { required: true, message: '请选择状态', trigger: 'change' }
+ { required: true, message: this.$t('rules.pleaseSelectStatus'), trigger: 'change' }
],
remarks: [
- { max: 50, message: '不能超过 50 个字符', trigger: 'blur' }
+ { max: 50, message: this.$t('rules.strLengthNotExceed50'), trigger: 'blur' }
]
};
if (this.type === 'ADD') {
return Object.assign(crules, {
code: [
- { required: true, message: '请输入编码', trigger: 'blur' },
- { min: 1, max: 25, message: '长度在 1 到 25 个字符', trigger: 'blur' },
+ { required: true, message: this.$t('rules.pleaseInputCode'), trigger: 'blur' },
+ { min: 1, max: 25, message: this.$t('rules.strLength1To25'), trigger: 'blur' },
{ validator: this.validateCode, trigger: 'blur' }
]
});
@@ -77,25 +77,25 @@ export default {
},
title() {
if (this.type === 'ADD') {
- return '创建明细';
+ return this.$t('system.createDetail');
} else {
- return '编辑明细';
+ return this.$t('system.editDetail');
}
}
},
methods: {
validateCode(rule, value, callback) {
if (!validateCharCode(value)) {
- return callback(new Error('格式不正确，只能是字符/数字/_'));
+ return callback(new Error(this.$t('error.formartError')));
} else {
checkDicDetailCodeExist(this.dicId, value).then(response => {
if (response.data) {
- return callback(new Error('编码已存在'));
+ return callback(new Error(this.$t('error.codeHasExist')));
} else {
return callback();
}
}).catch(() => {
- return callback(new Error('服务异常'));
+ return callback(new Error(this.$t('error.serviceException')));
});
}
},
@@ -121,21 +121,21 @@ export default {
create() {
const self = this;
create(this.dicId, this.formModel).then(response => {
- self.$message.success('创建字典目录成功');
+ self.$message.success(this.$t('system.createSuccess'));
self.handleClose();
self.$emit('reloadTable');
}).catch(error => {
- self.$message.error('创建字典目录失败：' + error.message);
+ self.$message.error(`${this.$t('error.createDetailFailed')}:${error.message}`);
});
},
update() {
const self = this;
update(this.dicId, this.formModel).then(response => {
- self.$message.success('更新字典目录成功');
+ self.$message.success(this.$t('system.updateSuccess'));
self.handleClose();
self.$emit('reloadTable');
}).catch(error => {
- self.$message.error('更新字典目录失败：' + error.message);
+ self.$message.error(`${this.$t('error.updateDetailFailed')}:${error.message}`);
});
},
handleClose(done) {
diff --git a/src/views/management/existingSimulation/index.vue b/src/views/management/existingSimulation/index.vue
index c8275dc98..34c5fbd50 100644
--- a/src/views/management/existingSimulation/index.vue
+++ b/src/views/management/existingSimulation/index.vue
@@ -28,11 +28,11 @@ export default {
},
userName: {
type: 'text',
- label: this.$t('system.username')
+ label: this.$t('system.userName')
},
mobile: {
type: 'text',
- label: this.$t('system.phoneNumber')
+ label: this.$t('system.mobile')
},
skinCode: {
type: 'select',
@@ -64,11 +64,11 @@ export default {
indexShow: true,
columns: [
{
- title: this.$t('system.username'),
+ title: this.$t('system.userName'),
prop: 'creator.name'
},
{
- title: this.$t('system.phoneNumber'),
+ title: this.$t('system.mobile'),
prop: 'creator.mobile'
},
{
@@ -170,7 +170,7 @@ export default {
return sessionId;
},
handleDelete(index, row) {
- this.$confirm(this.$t('global.delUserSimulationIsContinue'), this.$t('global.tips'), {
+ this.$confirm(this.$t('system.delUserSimulationIsContinue'), this.$t('global.tips'), {
confirmButtonText: this.$t('global.confirm'),
cancelButtonText: this.$t('global.cancel'),
type: 'warning'
diff --git a/src/views/management/userControl/edit.vue b/src/views/management/userControl/edit.vue
index 73562f1e2..4550fece4 100644
--- a/src/views/management/userControl/edit.vue
+++ b/src/views/management/userControl/edit.vue
@@ -1,9 +1,9 @@
-
+
@@ -31,11 +31,11 @@ export default {
const form = {
labelWidth: '60px',
items: [
- { prop: 'name', label: '名称', type: 'text', required: true, disabled: true },
+ { prop: 'name', label: this.$t('system.name'), type: 'text', required: true, disabled: true },
// { prop: 'nickname', label: '昵称', type: 'text', required: true },
// { prop: 'mobile', label: '电话', type: 'text', required: true },
// { prop: 'email', label: '邮箱', type: 'text' },
- { prop: 'roles', label: '权限', type: 'select', required: true, options: this.$ConstSelect.roleList, multiple: true }
+ { prop: 'roles', label: this.$t('system.permission'), type: 'select', required: true, options: this.$ConstSelect.roleList, multiple: true }
]
};
return form;
@@ -43,11 +43,11 @@ export default {
rules() {
const crules = {
name: [
- { required: true, message: '请输入名称', trigger: 'blur' },
- { min: 1, max: 25, message: '长度在 1 到 25 个字符', trigger: 'blur' }
+ { required: true, message: this.$t('rules.pleaseInputName'), trigger: 'blur' },
+ { min: 1, max: 25, message: this.$t('rules.strLength1To25'), trigger: 'blur' }
],
status: [
- { required: true, message: '请选择状态', trigger: 'change' }
+ { required: true, message: this.$t('rules.pleaseSelectStatus'), trigger: 'change' }
]
};
return crules;
@@ -76,11 +76,11 @@ export default {
update() {
const self = this;
putRoles(this.formModel).then(response => {
- self.$message.success('修改成功');
+ self.$message.success(this.$t('system.updateSuccess'));
self.handleClose();
self.$emit('reloadTable');
}).catch(error => {
- self.$message.error('修改失败：' + error.message);
+ self.$message.error(`${this.$t('error.updateFailed')}: ${error.message}`);
});
},
handleClose(done) {
diff --git a/src/views/management/userControl/index.vue b/src/views/management/userControl/index.vue
index 35aab7498..eafbbbe37 100644
--- a/src/views/management/userControl/index.vue
+++ b/src/views/management/userControl/index.vue
@@ -29,11 +29,11 @@ export default {
queryObject: {
name: {
type: 'text',
- label: '名称'
+ label: this.$t('system.name')
},
roles: {
type: 'select',
- label: '角色',
+ label: this.$t('system.roles'),
config: {
data: this.$ConstSelect.roleList
}
@@ -47,23 +47,23 @@ export default {
indexShow: true,
columns: [
{
- title: '名称',
+ title: this.$t('system.name'),
prop: 'name'
},
{
- title: '昵称',
+ title: this.$t('system.nickname'),
prop: 'nickname'
},
{
- title: '电话',
+ title: this.$t('system.mobile'),
prop: 'mobile'
},
{
- title: '邮箱',
+ title: this.$t('system.email'),
prop: 'email'
},
{
- title: '角色',
+ title: this.$t('system.roles'),
prop: 'roles',
type: 'tagMore',
columnValue: (row) => { return this.$convertField(row.roles, this.$ConstSelect.roleList, ['value', 'label'], true); },
@@ -71,15 +71,15 @@ export default {
},
{
type: 'button',
- title: '操作',
+ title: this.$t('global.operate'),
width: '250',
buttons: [
{
- name: '编辑',
+ name: this.$t('global.edit'),
handleClick: this.handleUserEdit
},
{
- name: '订阅地图',
+ name: this.$t('system.subscribeMap'),
handleClick: this.handleMapCorrelation,
type: 'danger'
}
@@ -100,9 +100,9 @@ export default {
// 删除
handleUserDelete(index, row) {
- this.$confirm('此操作将删除该类型, 是否继续?', '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
+ this.$confirm(this.$t('system.delTypeIsContinue'), this.$t('global.tips'), {
+ confirmButtonText: this.$t('global.confirm'),
+ cancelButtonText: this.$t('global.cancel'),
type: 'warning'
}).then(() => {
// delPublishMap(row.id).then(response => {
diff --git a/src/views/management/userExam/edit.vue b/src/views/management/userExam/edit.vue
index 24c4769c3..ccd8f4e38 100644
--- a/src/views/management/userExam/edit.vue
+++ b/src/views/management/userExam/edit.vue
@@ -2,8 +2,8 @@
@@ -34,12 +34,12 @@ export default {
computed: {
form() {
const form = {
- labelWidth: '100px',
+ labelWidth: '160px',
items: [
- { prop: 'userName', label: '用户名称', type: 'text', required: false, disabled: true },
- { prop: 'examName', label: '试卷名称', type: 'text', required: true, disabled: true },
- { prop: 'score', label: '考试分数', type: 'text', required: true },
- { prop: 'result', label: '考试结果', type: 'select', required: true, options: this.$ConstSelect.examResultList }
+ { prop: 'userName', label: this.$t('system.userName'), type: 'text', required: false, disabled: true },
+ { prop: 'examName', label: this.$t('system.examName'), type: 'text', required: true, disabled: true },
+ { prop: 'score', label: this.$t('system.examScore'), type: 'text', required: true },
+ { prop: 'result', label: this.$t('system.examResult'), type: 'select', required: true, options: this.$ConstSelect.examResultList }
]
};
return form;
@@ -47,16 +47,16 @@ export default {
rules() {
const crules = {
score: [
- { required: true, message: '请输入名称', trigger: 'blur' }
+ { required: true, message: this.$t('rules.pleaseInputName'), trigger: 'blur' }
],
result: [
- { required: true, message: '请选择状态', trigger: 'change' }
+ { required: true, message: this.$t('rules.pleaseSelectStatus'), trigger: 'change' }
]
};
return crules;
},
title() {
- return '编辑考试详情';
+ return this.$t('system.editExamDetail');
}
},
methods: {
@@ -79,11 +79,11 @@ export default {
update() {
const self = this;
updateExam(this.formModel).then(response => {
- self.$message.success('修改成功！');
+ self.$message.success(this.$t('system.updateSuccess'));
self.handleClose();
self.$emit('reloadTable');
}).catch(error => {
- self.$message.error('修改失败！' + error.message);
+ self.$message.error(`${this.$t('error.updateFailed')}: ${error.message}`);
});
},
handleClose(done) {
diff --git a/src/views/management/userExam/index.vue b/src/views/management/userExam/index.vue
index 4e44c07c8..95efae1af 100644
--- a/src/views/management/userExam/index.vue
+++ b/src/views/management/userExam/index.vue
@@ -22,20 +22,20 @@ export default {
pageIndex: 'pageNum'
},
queryForm: {
- labelWidth: '80px',
+ labelWidth: '150px',
reset: true,
queryObject: {
examName: {
type: 'text',
- label: '试卷名称'
+ label: this.$t('system.examName')
},
userName: {
type: 'text',
- label: '考试用户'
+ label: this.$t('system.examUser')
},
result: {
type: 'select',
- label: '考试结果',
+ label: this.$t('system.examResult'),
config: {
data: this.$ConstSelect.examResultList
}
@@ -49,11 +49,11 @@ export default {
indexShow: true,
columns: [
{
- title: '试卷名称',
+ title: this.$t('system.examName'),
prop: 'examName'
},
{
- title: '考试结果',
+ title: this.$t('system.examResult'),
prop: 'result',
type: 'tag',
columnValue: (row) => { return this.$convertField(row.result, this.$ConstSelect.examResultList, ['value', 'label']); },
@@ -67,28 +67,28 @@ export default {
}
},
{
- title: '考试成绩',
+ title: this.$t('system.examScore'),
prop: 'score'
},
{
- title: '考试用户',
+ title: this.$t('system.examUser'),
prop: 'userName'
},
{
- title: '用户手机号',
+ title: this.$t('system.mobile'),
prop: 'userMobile'
},
{
type: 'button',
- title: '操作',
+ title: this.$t('global.operate'),
width: '250',
buttons: [
{
- name: '编辑',
+ name: this.$t('global.edit'),
handleClick: this.edit
},
{
- name: '删除',
+ name: this.$t('global.delete'),
handleClick: this.handleDelete,
type: 'danger'
}
@@ -115,17 +115,17 @@ export default {
// 删除
handleDelete(index, row) {
- this.$confirm('此操作将删除此考试结果, 是否继续?', '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
+ this.$confirm(this.$t('system.delExamResultIsContinue'), this.$t('global.tips'), {
+ confirmButtonText: this.$t('global.confirm'),
+ cancelButtonText: this.$t('global.cancel'),
type: 'warning'
}).then(() => {
delPublishExam(row.id).then(response => {
- this.$message.success('删除成功');
+ this.$message.success(this.$t('system.deleteSuccess'));
this.reloadTable();
}).catch(() => {
this.reloadTable();
- this.$messageBox('删除失败');
+ this.$messageBox(this.$t('error.deleteFailed'));
});
});
},
diff --git a/src/views/management/userSimulation/add.vue b/src/views/management/userSimulation/add.vue
index ae18d9c62..94a44d4df 100644
--- a/src/views/management/userSimulation/add.vue
+++ b/src/views/management/userSimulation/add.vue
@@ -2,8 +2,8 @@
@@ -41,12 +41,12 @@ export default {
computed: {
form() {
const form = {
- labelWidth: '100px',
+ labelWidth: '120px',
items: [
- { prop: 'mapId', label: '地图名称', type: 'select', required: true, options: this.LessonList, change: true, onChange: this.mapChange },
- { prop: 'mapPrdCode', label: '产品名称', type: 'select', required: true, options: this.mapPrdList, placeholder: '请选择产品' },
- { prop: 'userName', label: '用户名称', type: 'complete', required: false, querySearchAsync: this.querySearchAsync, handleSelect: this.prdSelect, placeholder: '请输入昵称/名字/手机号' },
- { prop: 'duration', label: '实训时长', type: 'text', rightWidth: true, required: true, message: 's' }
+ { prop: 'mapId', label: this.$t('system.mapName'), type: 'select', required: true, options: this.LessonList, change: true, onChange: this.mapChange, placeholder: this.$t('rules.mapInput') },
+ { prop: 'mapPrdCode', label: this.$t('system.productName'), type: 'select', required: true, options: this.mapPrdList, placeholder: this.$t('rules.productInput') },
+ { prop: 'userName', label: this.$t('system.userName'), type: 'complete', required: false, querySearchAsync: this.querySearchAsync, handleSelect: this.prdSelect, placeholder: this.$t('system.pleaseInputNames') },
+ { prop: 'duration', label: this.$t('system.trainingUseTime'), type: 'text', rightWidth: true, required: true, message: 's' }
]
};
return form;
@@ -54,22 +54,22 @@ export default {
rules() {
const crules = {
mapId: [
- { required: true, message: '请选择地图', trigger: 'change' }
+ { required: true, message: this.$t('rules.mapInput'), trigger: 'change' }
],
userName: [
- { required: true, message: '请选择用户', trigger: 'change' }
+ { required: true, message: this.$t('rules.chooseUser'), trigger: 'change' }
],
mapPrdCode: [
- { required: true, message: '请选择产品', trigger: 'change' }
+ { required: true, message: this.$t('rules.productInput'), trigger: 'change' }
],
duration: [
- { required: true, message: '请输入时长', trigger: 'blur' }
+ { required: true, message: this.$t('rules.timeInput'), trigger: 'blur' }
]
};
return crules;
},
title() {
- return '创建仿真信息';
+ return this.$t('system.createSimulationTitle');
}
},
mounted() {
@@ -113,7 +113,7 @@ export default {
});
cb(results);
} catch (error) {
- console.error(error, '查询用户list');
+ console.error(error);
cb(results);
}
} else {
@@ -148,13 +148,6 @@ export default {
},
show(data) {
this.dialogVisible = true;
- // this.formModel = {
- // mapId: '',
- // mapPrdCode: '',
- // userId: '',
- // userName: '',
- // duration: '',
- // };
},
doSave() {
const self = this;
@@ -172,14 +165,14 @@ export default {
};
if (params.userId) {
postSimulationStats(params).then(response => {
- self.$message.success('新增成功！');
+ self.$message.success(this.$t('system.addSuccess'));
self.handleClose();
self.$emit('reloadTable');
}).catch(error => {
- self.$message.error('新增失败！' + error.message);
+ self.$message.error(this.$t('error.addFailed') + error.message);
});
} else {
- this.$message.error('请选择用户');
+ this.$message.error(this.$t('rules.chooseUser'));
}
},
handleClose(done) {
diff --git a/src/views/management/userSimulation/index.vue b/src/views/management/userSimulation/index.vue
index e16045f55..1251f9b9f 100644
--- a/src/views/management/userSimulation/index.vue
+++ b/src/views/management/userSimulation/index.vue
@@ -29,16 +29,16 @@ export default {
pageIndex: 'pageNum'
},
queryForm: {
- labelWidth: '80px',
+ labelWidth: '120px',
reset: true,
queryObject: {
trainingName: {
type: 'text',
- label: '实训名称'
+ label: this.$t('system.trainingName')
},
userName: {
type: 'text',
- label: '用户名'
+ label: this.$t('system.userName')
}
}
@@ -49,41 +49,41 @@ export default {
indexShow: true,
columns: [
{
- title: '用户名称',
+ title: this.$t('system.userName'),
prop: 'userName'
},
{
- title: '用户手机号',
+ title: this.$t('system.mobile'),
prop: 'userMobile'
},
{
- title: '地图名称',
+ title: this.$t('system.mapName'),
prop: 'mapName'
},
{
- title: '实训用时',
+ title: this.$t('system.trainingUseTime'),
prop: 'duration',
type: 'tag',
columnValue: (row) => { return this.computation(row.duration); },
tagType: (row) => { return 'success'; }
},
{
- title: '产品名称',
+ title: this.$t('system.productName'),
prop: 'mapPrdName'
},
{
type: 'button',
- title: '操作',
+ title: this.$t('global.operate'),
width: '250',
hide: (row) => { return !row.fake; },
buttons: [
{
- name: '编辑',
+ name: this.$t('global.edit'),
handleClick: this.edit,
showControl: (row) => { return row.fake; }
},
{
- name: '删除',
+ name: this.$t('global.delete'),
handleClick: this.handleDelete,
type: 'danger',
showControl: (row) => { return row.fake; }
@@ -92,7 +92,7 @@ export default {
}
],
actions: [
- { text: '新增', handler: this.createTraining }
+ { text: this.$t('global.add'), handler: this.createTraining }
]
},
currentModel: {}
@@ -121,9 +121,9 @@ export default {
const f = parseInt(fieldValue / 60);
const s = fieldValue % 60;
if (f > 0) {
- return `${f}分${s}秒`;
+ return `${f} ${this.$t('system.minute')} ${s} ${this.$t('system.second')}`;
} else {
- return `${s}秒`;
+ return `${s} ${this.$t('system.second')}`;
}
}
},
@@ -135,17 +135,17 @@ export default {
// 删除
handleDelete(index, row) {
- this.$confirm('此操作将删除此用户仿真数据, 是否继续?', '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
+ this.$confirm(this.$t('system.delUserSimulationIsContinue'), this.$t('global.tips'), {
+ confirmButtonText: this.$t('global.confirm'),
+ cancelButtonText: this.$t('global.cancel'),
type: 'warning'
}).then(() => {
deleteSimulationStats(row.id).then(response => {
- this.$message.success('删除成功');
+ this.$message.success(this.$t('system.deleteSuccess'));
this.reloadTable();
}).catch(() => {
this.reloadTable();
- this.$messageBox('删除失败');
+ this.$messageBox(this.$t('error.deleteFailed'));
});
});
},
diff --git a/src/views/management/userTraining/add.vue b/src/views/management/userTraining/add.vue
index d943c6e29..9bd04ad24 100644
--- a/src/views/management/userTraining/add.vue
+++ b/src/views/management/userTraining/add.vue
@@ -3,8 +3,8 @@
@@ -34,7 +34,7 @@ export default {
data() {
return {
dialogVisibles: false,
- title: '选择实训',
+ title: this.$t('system.selectTraining'),
treeData: [{
children: [],
name: ''
diff --git a/src/views/management/userTraining/edit.vue b/src/views/management/userTraining/edit.vue
index ed229affe..8555f8b11 100644
--- a/src/views/management/userTraining/edit.vue
+++ b/src/views/management/userTraining/edit.vue
@@ -2,8 +2,8 @@
@@ -37,10 +37,10 @@ export default {
const form = {
labelWidth: '100px',
items: [
- { prop: 'lessonName', label: '教学名称', type: 'text', required: false, disabled: true },
- { prop: 'trainingName', label: '实训名称', type: 'text', required: true, disabled: true },
- { prop: 'userName', label: '用户名称', type: 'text', required: true, disabled: true },
- { prop: 'duration', label: '实训时长', type: 'text', required: true, rightWidth: true, message: 's' }
+ { prop: 'lessonName', label: this.$t('system.lessonName'), type: 'text', required: false, disabled: true },
+ { prop: 'trainingName', label: this.$t('system.trainingName'), type: 'text', required: true, disabled: true },
+ { prop: 'userName', label: this.$t('system.userName'), type: 'text', required: true, disabled: true },
+ { prop: 'duration', label: this.$t('system.trainingTime'), type: 'text', required: true, rightWidth: true, message: 's' }
]
};
return form;
@@ -48,13 +48,13 @@ export default {
rules() {
const crules = {
duration: [
- { required: true, message: '请输入时长', trigger: 'blur' }
+ { required: true, message: this.$t('rules.timeInput'), trigger: 'blur' }
]
};
return crules;
},
title() {
- return '编辑实训详情';
+ return this.$t('system.editTrainingDetail');
}
},
methods: {
@@ -67,7 +67,6 @@ export default {
userName: data.userName,
trainingName: data.trainingName,
duration: data.duration
- // trainingCount: data.trainingCount
};
}
},
@@ -84,11 +83,11 @@ export default {
duration: this.formModel.duration
};
putUserTraining(param).then(response => {
- self.$message.success('修改成功！');
+ self.$message.success(this.$t('system.updateSuccess'));
self.handleClose();
self.$emit('reloadTable');
}).catch(error => {
- self.$message.error('修改失败！' + error.message);
+ self.$message.error(`${this.$t('error.updateFailed')}: ${error.message}`);
});
},
handleClose(done) {
diff --git a/src/views/management/userTraining/index.vue b/src/views/management/userTraining/index.vue
index 39fac325b..f69b186d6 100644
--- a/src/views/management/userTraining/index.vue
+++ b/src/views/management/userTraining/index.vue
@@ -24,16 +24,16 @@ export default {
pageIndex: 'pageNum'
},
queryForm: {
- labelWidth: '80px',
+ labelWidth: '120px',
reset: true,
queryObject: {
trainingName: {
type: 'text',
- label: '实训名称'
+ label: this.$t('system.trainingName')
},
userName: {
type: 'text',
- label: '用户名'
+ label: this.$t('system.userName')
}
}
@@ -44,40 +44,40 @@ export default {
indexShow: true,
columns: [
{
- title: '用户名称',
+ title: this.$t('system.userName'),
prop: 'userName'
},
{
- title: '用户手机号',
+ title: this.$t('system.mobile'),
prop: 'userMobile'
},
{
- title: '课程名称',
+ title: this.$t('system.lessonName'),
prop: 'lessonName'
},
{
- title: '实训用时',
+ title: this.$t('system.trainingUseTime'),
prop: 'duration',
type: 'tag',
columnValue: (row) => { return this.computation(row.duration); },
tagType: (row) => { return 'success'; }
},
{
- title: '实训名称',
+ title: this.$t('system.trainingName'),
prop: 'trainingName'
},
{
type: 'button',
- title: '操作',
+ title: this.$t('global.operate'),
width: '250',
buttons: [
{
- name: '编辑',
+ name: this.$t('global.edit'),
handleClick: this.edit,
showControl: (row) => { return row.fake != '0'; }
},
{
- name: '删除',
+ name: this.$t('global.delete'),
handleClick: this.handleDelete,
type: 'danger',
showControl: (row) => { return row.fake != '0'; }
@@ -86,7 +86,7 @@ export default {
}
],
actions: [
- { text: '新增', handler: this.createTraining }
+ { text: this.$t('global.add'), handler: this.createTraining }
]
},
currentModel: {}
@@ -107,9 +107,9 @@ export default {
const f = parseInt(fieldValue / 60);
const s = fieldValue % 60;
if (f > 0) {
- return `${f}分${s}秒`;
+ return `${f} ${this.$t('system.minute')} ${s} ${this.$t('system.second')}`;
} else {
- return `${s}秒`;
+ return `${s} ${this.$t('system.second')}`;
}
}
},
@@ -121,17 +121,17 @@ export default {
// 删除
handleDelete(index, row) {
- this.$confirm('此操作将删除此考试结果, 是否继续?', '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
+ this.$confirm(this.$t('system.delExamResultIsContinue'), this.$t('global.tips'), {
+ confirmButtonText: this.$t('global.confirm'),
+ cancelButtonText: this.$t('global.cancel'),
type: 'warning'
}).then(() => {
deleteUserTraining(row.id).then(response => {
- this.$message.success('删除成功');
+ this.$message.success(this.$t('system.deleteSuccess'));
this.reloadTable();
}).catch(() => {
this.reloadTable();
- this.$messageBox('删除失败');
+ this.$messageBox(this.$t('error.deleteFailed'));
});
});
},
diff --git a/src/views/orderauthor/author/draft.vue b/src/views/orderauthor/author/draft.vue
index 23cc20b9e..d5051ae55 100644
--- a/src/views/orderauthor/author/draft.vue
+++ b/src/views/orderauthor/author/draft.vue
@@ -11,8 +11,8 @@
- {{$t('global.create')}}
- {{$t('global.return')}}
+ {{ $t('global.create') }}
+ {{ $t('global.return') }}
@@ -63,7 +63,7 @@ export default {
},
rules() {
- const _this = this;
+ const _this = this;
const baseRules = {
userId: [
{ required: true, message: this.$t('rules.userNameInput'), trigger: 'blur' }
diff --git a/src/views/orderauthor/author/index.vue b/src/views/orderauthor/author/index.vue
index 30db034cf..c0bd0934b 100644
--- a/src/views/orderauthor/author/index.vue
+++ b/src/views/orderauthor/author/index.vue
@@ -1,244 +1,241 @@
-
-
-
-
+
+
diff --git a/src/views/orderauthor/commodity/index.vue b/src/views/orderauthor/commodity/index.vue
index d271e66e4..d2249c676 100644
--- a/src/views/orderauthor/commodity/index.vue
+++ b/src/views/orderauthor/commodity/index.vue
@@ -1,221 +1,220 @@
-
-
-
-
+
+
diff --git a/src/views/orderauthor/order/addGoods.vue b/src/views/orderauthor/order/addGoods.vue
index 67bd4b220..dab334ff8 100644
--- a/src/views/orderauthor/order/addGoods.vue
+++ b/src/views/orderauthor/order/addGoods.vue
@@ -1,189 +1,195 @@
-
-
- {{$t('orderAuthor.publicAuthority')}}
- {{$t('orderAuthor.privateAuthority')}}
-
-
-
-
+
+ {{ $t('orderAuthor.publicAuthority') }}
+ {{ $t('orderAuthor.privateAuthority') }}
+
+
+
+
-
-
-
+
@@ -177,10 +177,10 @@
{
addScriptAction(group,data).then(response=>{
this.modifying=false;
- this.initActionData();
this.$message.success('添加动作成功');
this.$emit('create');
- this.resetDisabled();
+ // this.resetDisabled();
+ this.initActionData();
}).catch(error => {
this.modifying=false;
this.$messageBox(`添加动作失败: ${error.message}`);
@@ -191,13 +191,14 @@
let actionId=this.modalData.actionVO.id;
modifyScriptAction(group,actionId,data).then(response=>{
this.modifying=false;
- this.initActionData();
+
this.isNotModify=true;
this.$parent.$parent.$parent.setDisabled(this.isNotModify);
this.$emit('modifyButtonName');
this.$message.success('修改动作成功');
this.$emit('create');
- this.resetDisabled();
+ // this.resetDisabled();
+ this.initActionData();
}).catch(error => {
this.modifying=false;
this.$messageBox(`修改动作失败: ${error.message}`);
@@ -214,6 +215,19 @@
if(this.$refs['modalData'])
{
this.$refs['modalData'].resetFields();
+ // this.$nextTick(function(){
+ this.deviceTypeReadOnly=false;
+ // this.modalData.actionVO.type="Conversation";
+ // this.modalData.actionVO.memberId="";
+ // this.modalData.actionVO.targetId="";
+ // this.modalData.actionVO.deviceCommand="";
+ // this.modalData.actionVO.reply="";
+ // this.modalData.param.startStation="";
+ this.isConversitionAdd=true;
+ this.isCommandAdd=false;
+ this.isJinLu=false;
+ // this.modalData.param.endStation="";
+ // });
}
},
clearValidate(){
@@ -223,20 +237,7 @@
}
},
initActionData(){
- this.deviceTypeReadOnly=false;
- this.modalData.actionVO.memberId="";
- this.modalData.actionVO.targetId="";
- this.$nextTick(function(){
- this.modalData.actionVO.type="Conversation";
- });
- // this.modalData.actionVO.time=0;
- this.modalData.actionVO.reply="";
- this.modalData.param.startStation="";
- this.isConversitionAdd=true;
- this.isCommandAdd=false;
- this.isJinLu=false;
- this.modalData.actionVO.deviceCommand=null;
- this.modalData.param.endStation="";
+ this.resetDisabled();
},
changeType(index){
switch(index)
@@ -271,6 +272,7 @@
},
changeCommand(index){
+ this.modalData.actionVO.deviceCommand
switch(index)
{
case "Train_Manual_Route_Blocking_Drive":{
diff --git a/src/views/display/tipScriptRecord.vue b/src/views/display/tipScriptRecord.vue
index 804564828..1db46d317 100644
--- a/src/views/display/tipScriptRecord.vue
+++ b/src/views/display/tipScriptRecord.vue
@@ -155,6 +155,7 @@
}).then(() => {
dumpScriptData(group).then(resp => {
// this.isSaveStage = true;
+ this.$parent.resetBeginTime();
this.$refs["getAction"].loadInitData();
this.initAutoSaveScript();
this.$message.success('清除数据成功');
From d71e42a84d0b8fa91ad86b950eccf00266b18183 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 19 Aug 2019 19:42:17 +0800
Subject: [PATCH 094/172] =?UTF-8?q?=E5=89=A7=E6=9C=AC=E7=BC=96=E5=88=B6?=
=?UTF-8?q?=E6=A8=A1=E5=9D=97=E8=A1=A8=E5=8D=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/display/scriptRecord/addAction.vue | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/views/display/scriptRecord/addAction.vue b/src/views/display/scriptRecord/addAction.vue
index ce2b3000e..2079ded0f 100644
--- a/src/views/display/scriptRecord/addAction.vue
+++ b/src/views/display/scriptRecord/addAction.vue
@@ -217,16 +217,16 @@
this.$refs['modalData'].resetFields();
// this.$nextTick(function(){
this.deviceTypeReadOnly=false;
- // this.modalData.actionVO.type="Conversation";
- // this.modalData.actionVO.memberId="";
- // this.modalData.actionVO.targetId="";
+ this.modalData.actionVO.type="Conversation";
+ this.modalData.actionVO.memberId="";
+ this.modalData.actionVO.targetId="";
// this.modalData.actionVO.deviceCommand="";
- // this.modalData.actionVO.reply="";
- // this.modalData.param.startStation="";
+ this.modalData.actionVO.reply="";
+ this.modalData.param.startStation="";
this.isConversitionAdd=true;
this.isCommandAdd=false;
this.isJinLu=false;
- // this.modalData.param.endStation="";
+ this.modalData.param.endStation="";
// });
}
},
From 36a1f8e8781432ce8d0d5487e8951e095ee36cf3 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 19 Aug 2019 20:27:23 +0800
Subject: [PATCH 095/172] =?UTF-8?q?=E8=B0=83=E6=95=B4:=20=E5=BF=AB?=
=?UTF-8?q?=E9=80=9F=E5=85=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/demonstration/deomonList/index.vue | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/views/demonstration/deomonList/index.vue b/src/views/demonstration/deomonList/index.vue
index c1ce266f0..9b94b9fa2 100644
--- a/src/views/demonstration/deomonList/index.vue
+++ b/src/views/demonstration/deomonList/index.vue
@@ -21,14 +21,13 @@
@node-click="clickEvent"
>
- {{ $t('global.trainingHasStart').replace('(name)', data.creator.nickName) }}
- {{ $t('global.trainingHasStart').replace('(name)', data.creator.nickName) }}
+ {{ $t('global.trainingHasStart').replace('{name}', data.creator.nickName) }}
+ {{ $t('global.trainingHasStart').replace('{name}', data.creator.nickName) }}
diff --git a/src/views/orderauthor/author/index.vue b/src/views/orderauthor/author/index.vue
index c0bd0934b..625ae7341 100644
--- a/src/views/orderauthor/author/index.vue
+++ b/src/views/orderauthor/author/index.vue
@@ -26,7 +26,7 @@ export default {
pageIndex: 'pageNum'
},
queryForm: {
- labelWidth: '120px',
+ labelWidth: '140px',
reset: true,
queryObject: {
'userMobile': {
diff --git a/src/views/orderauthor/commodity/draft.vue b/src/views/orderauthor/commodity/draft.vue
index 739a0209e..bf3ca955a 100644
--- a/src/views/orderauthor/commodity/draft.vue
+++ b/src/views/orderauthor/commodity/draft.vue
@@ -19,7 +19,7 @@
-
-
-
-
-
-
-
-
-
- {{$t('global.create')}}
- {{$t('global.update')}}
- {{$t('orderAuthor.renew')}}
- {{$t('global.return')}}
-
-
-
+
+
From 3e0282784b0bd388c04f23ddf48168bf9d77e9da Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 19 Aug 2019 19:32:08 +0800
Subject: [PATCH 092/172] =?UTF-8?q?=E8=B0=83=E6=95=B4:=20=E5=8A=A0?=
=?UTF-8?q?=E8=BD=BD=E5=89=A7=E6=9C=ACbutton=20=E6=96=87=E5=AD=97=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/display/demon/addQuest.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/display/demon/addQuest.vue b/src/views/display/demon/addQuest.vue
index d9ab6bf52..ff39fe9ab 100644
--- a/src/views/display/demon/addQuest.vue
+++ b/src/views/display/demon/addQuest.vue
@@ -111,7 +111,7 @@ export default {
width: '250',
buttons: [
{
- name: '加载任务',
+ name: '加载剧本',
type: 'primary',
handleClick: this.handleLoad
}
From d7bf9a172c90cda7098f99f15ae4e73e7eb4c96f Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 19 Aug 2019 19:37:52 +0800
Subject: [PATCH 093/172] =?UTF-8?q?=E5=89=A7=E6=9C=AC=E7=BC=96=E5=88=B6?=
=?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/display/menuScript.vue | 3 ++
src/views/display/scriptRecord/addAction.vue | 40 ++++++++++----------
src/views/display/tipScriptRecord.vue | 1 +
3 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/src/views/display/menuScript.vue b/src/views/display/menuScript.vue
index 68ef4e807..40fd70bdd 100644
--- a/src/views/display/menuScript.vue
+++ b/src/views/display/menuScript.vue
@@ -101,6 +101,9 @@ export default {
selectBeginTime() {
this.$refs.setTime.doShow();
},
+ resetBeginTime(){
+ this.isDisable = false;
+ },
start(model) {
this.isDisable = true;
runDiagramStart(model, this.group).then(res => {
diff --git a/src/views/display/scriptRecord/addAction.vue b/src/views/display/scriptRecord/addAction.vue
index cdc037566..ce2b3000e 100644
--- a/src/views/display/scriptRecord/addAction.vue
+++ b/src/views/display/scriptRecord/addAction.vue
@@ -19,7 +19,7 @@
+
+
+
+
+
+
+
+
+
+ {{ $t('global.create') }}
+ {{ $t('global.update') }}
+ {{ $t('orderAuthor.renew') }}
+ {{ $t('global.return') }}
+
+
- 计划车显示模式
-
-
-
- 表号+车次号
-
-
- 表号+车组号
-
-
-
-
- 目的地号+车次号
-
-
- 目的地号+车组号
-
-
-
-
- 目的地号+表号+车次号
-
-
- 目的地号+表号+车组号
-
-
-
-
-
- 头码车显示模式
-
-
-
- 目的地号+车次号
-
-
- 目的地号+车组号
-
-
-
-
-
- 字体大小
-
-
-
-
- （范围：16-99）
-
-
-
-
+ 计划车显示模式
+
+
+
+ 表号+车次号
+
+
+ 表号+车组号
+
-
+
+ 目的地号+车次号
+
+
+ 目的地号+车组号
+
+
+
+
+ 目的地号+表号+车次号
+
+
+ 目的地号+表号+车组号
+
+
+
+
+
+ 头码车显示模式
+
+
+
+ 目的地号+车次号
+
+
+ 目的地号+车组号
+
+
+
+
+
+ 字体大小
+
+
+
+
+ （范围：16-99）
+
+
+
+
- 计划车显示模式
-
-
-
- 表号+车次号
-
-
- 表号+车组号
-
-
-
-
- 目的地号+车次号
-
-
- 目的地号+车组号
-
-
-
-
- 目的地号+表号+车次号
-
-
- 目的地号+表号+车组号
-
-
-
-
-
- 头码车显示模式
-
-
-
- 目的地号+车次号
-
-
- 目的地号+车组号
-
-
-
-
-
- 字体大小
-
-
-
-
- （范围：16-99）
-
-
-
-
+ 计划车显示模式
+
+
+
+ 表号+车次号
+
+
+ 表号+车组号
+
-
+
+ 目的地号+车次号
+
+
+ 目的地号+车组号
+
+
+
+
+ 目的地号+表号+车次号
+
+
+ 目的地号+表号+车组号
+
+
+
+
+
+ 头码车显示模式
+
+
+
+ 目的地号+车次号
+
+
+ 目的地号+车组号
+
+
+
+
+
+ 字体大小
+
+
+
+
+ （范围：16-99）
+
+
+
+
- 计划车显示模式
-
-
-
- 表号+车次号
-
-
- 表号+车组号
-
-
-
-
- 目的地号+车次号
-
-
- 目的地号+车组号
-
-
-
-
- 目的地号+表号+车次号
-
-
- 目的地号+表号+车组号
-
-
-
-
-
- 头码车显示模式
-
-
-
- 目的地号+车次号
-
-
- 目的地号+车组号
-
-
-
-
-
- 字体大小
-
-
-
-
- （范围：16-99）
-
-
-
-
+ 计划车显示模式
+
+
+
+ 表号+车次号
+
+
+ 表号+车组号
+
-
+
+ 目的地号+车次号
+
+
+ 目的地号+车组号
+
+
+
+
+ 目的地号+表号+车次号
+
+
+ 目的地号+表号+车组号
+
+
+
+
+
+ 头码车显示模式
+
+
+
+ 目的地号+车次号
+
+
+ 目的地号+车组号
+
+
+
+
+
+ 字体大小
+
+
+
+
+ （范围：16-99）
+
+
+
+
-
+
- {{ $t('map.create') }}
-
+
@@ -127,6 +131,10 @@ export default {
const form = {
labelWidth: '150px',
items: {
+ code: {
+ name: '',
+ item: []
+ },
draw: {
name: this.$t('map.drawData'),
item: [
@@ -238,7 +246,11 @@ export default {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/station.vue b/src/views/map/mapdraft/mapedit/mapoperate/station.vue
index cf57db6e4..ca9aaaa0e 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/station.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/station.vue
@@ -1,14 +1,16 @@
+
@@ -57,7 +56,6 @@ import { EventBus } from '@/scripts/event-bus';
import ConfigMap from './configMap';
import DataRelation from './dataRelation/index';
-import { setTimeout } from 'timers';
export default {
name: 'MapView',
@@ -80,8 +78,7 @@ export default {
autoSaveTask: null,
selected: null,
mapInfo: { name: this.$t('map.pleaseSelectMap') },
- timeDemon: null,
- loading: false
+ timeDemon: null
};
},
watch: {
@@ -123,10 +120,7 @@ export default {
this.$refs.configMap.doShow();
},
selectViewDraft(data) {
- this.loading = true;
- setTimeout(() => {
- this.viewDraft = data;
- }, 300);
+ this.viewDraft = data;
},
loadInitPage() {
this.$store.dispatch('training/changeMode', { mode: TrainingMode.MAP_EDIT });
@@ -178,6 +172,11 @@ export default {
this.$refs.jlmapVisual.setLevelVisible(handle);
}
},
+ handleSelectHybridView(handle) {
+ if (this.$refs && this.$refs.jlmapVisual) {
+ this.$refs.jlmapVisual.setLevelVisible(handle);
+ }
+ },
clickEvent(em) {
var device = this.getDeviceByEm(em);
this.onSelect(device);
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/ImageControl.vue b/src/views/map/mapdraft/mapedit/mapoperate/ImageControl.vue
index edee0f19e..e23552c46 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/ImageControl.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/ImageControl.vue
@@ -1,22 +1,26 @@
+
-
+
-
- {{ $t('map.updateObj') }}
- {{ $t('map.deleteObj') }}
-
+
-
- {{ $t('map.create') }}
-
+
@@ -109,6 +113,10 @@ export default {
const form = {
labelWidth: '150px',
items: {
+ code: {
+ name: '',
+ item: []
+ },
draw: {
name: this.$t('map.drawData'),
item: [
@@ -269,7 +277,11 @@ export default {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/delayunlock.vue b/src/views/map/mapdraft/mapedit/mapoperate/delayunlock.vue
index b93545609..1b8280cc1 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/delayunlock.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/delayunlock.vue
@@ -1,14 +1,16 @@
-
+
-
- {{ $t('map.updateObj') }}
- {{ $t('map.deleteObj') }}
-
+
@@ -25,9 +27,11 @@
-
- {{ $t('map.create') }}
-
+
@@ -117,6 +121,10 @@ export default {
const form = {
labelWidth: '120px',
items: {
+ code: {
+ name: '',
+ item: []
+ },
draw: {
name: this.$t('map.drawData'),
item: [
@@ -248,4 +256,9 @@ export default {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/index.vue b/src/views/map/mapdraft/mapedit/mapoperate/index.vue
index ae323b0cf..c269233c5 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/index.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/index.vue
@@ -329,7 +329,7 @@ export default {
},
resizeCardHeight() {
var padding = 0;
- this.cardHeights = this.cardHeight - padding - 90;
+ this.cardHeights = this.cardHeight - padding - 74;
},
handleSelectControlPage(device) {
const type = device._type;
@@ -394,7 +394,7 @@ export default {
/deep/ .map-draft-group {
float: right;
- margin: 10px 5px;
+ margin: 6px 5px;
}
/deep/ .view-control {
@@ -405,6 +405,19 @@ export default {
.mapEdit .el-tabs__nav-wrap.is-scrollable {
padding: 0 20px;
}
+ .mapEdit .el-tabs__header .el-tabs__item.is-active {
+ border-bottom-color: #f5f7fa;
+ background: #f5f7fa;
+ }
+ .mapEdit .el-tabs__active-bar{
+ background: transparent;
+ }
+
+ .card .el-tabs__nav .el-tabs__item.is-active {
+ border-bottom: 2px solid #E4E7ED;
+ background: #409eff;
+ color: #fff;
+ }
.mapEdit .el-tabs__nav-prev {
width: 20px;
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/lcControl.vue b/src/views/map/mapdraft/mapedit/mapoperate/lcControl.vue
index 0f92dfacd..519161ae6 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/lcControl.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/lcControl.vue
@@ -1,14 +1,16 @@
-
+
-
- {{ $t('map.updateObj') }}
- {{ $t('map.deleteObj') }}
-
+
@@ -37,9 +39,11 @@
-
-
+
-
- {{ $t('map.updateObj') }}
- {{ $t('map.deleteObj') }}
-
+
@@ -25,9 +27,11 @@
-
- {{ $t('map.create') }}
-
+
@@ -101,12 +105,16 @@ export default {
const form = {
labelWidth: '150px',
items: {
+ code: {
+ name: '',
+ item: []
+ },
draw: {
name: this.$t('map.drawData'),
item: [
- { prop: 'concentrateStationCode', label: this.$t('map.concentrateStationCode'), type: 'select', optionLabel: 'code&&name', optionValue: 'code', options: this.stationList },
- { prop: 'code', label: this.$t('map.stationCode'), type: 'select', optionLabel: 'code&&name', optionValue: 'code', options: this.stationList, change: true, deviceChange: this.deviceChange },
+ { prop: 'code', label: this.$t('map.stationCode'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.stationList, change: true, deviceChange: this.deviceChange },
{ prop: 'name', label: this.$t('map.stationName'), type: 'input' },
+ { prop: 'concentrateStationCode', label: this.$t('map.concentrateStationCode'), type: 'select', optionLabel: 'code&&name', optionValue: 'code', options: this.stationList },
{ prop: 'visible', label: this.$t('map.stationVisible'), type: 'checkbox' },
{ prop: 'nameFont', label: this.$t('map.stationNameFont'), type: 'font', placeholder: this.$t('tip.stationFont') },
{ prop: 'nameFontColor', label: this.$t('map.stationNameFontColor'), type: 'color' },
@@ -315,4 +323,9 @@ export default {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue b/src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue
index 1f44b4a5f..45a0f615c 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue
@@ -1,14 +1,16 @@
-
+
-
- {{ $t('map.updateObj') }}
- {{ $t('map.deleteObj') }}
-
+
@@ -25,9 +27,11 @@
-
- {{ $t('map.create') }}
-
+
@@ -92,12 +96,16 @@ export default {
const form = {
labelWidth: '160px',
items: {
+ code: {
+ name: '',
+ item: []
+ },
draw: {
name: this.$t('map.drawData'),
item: [
- { prop: 'stationCode', label: this.$t('map.equipmentStation'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.stationList },
{ prop: 'code', label: this.$t('map.stationControlCode'), type: 'select', optionLabel: 'code', optionValue: 'code', options: this.stationControlList, change: true, deviceChange: this.deviceChange },
{ prop: 'name', label: this.$t('map.stationControlName'), type: 'input' },
+ { prop: 'stationCode', label: this.$t('map.equipmentStation'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.stationList },
{ prop: 'zokContent', label: this.$t('map.zokContent'), type: 'input' },
{ prop: 'zakContent', label: this.$t('map.zakContent'), type: 'input' },
{ prop: 'jjzkContent', label: this.$t('map.jjzkContent'), type: 'input' },
@@ -270,4 +278,9 @@ export default {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue b/src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue
index 25533df4f..2b0809ad3 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue
@@ -1,14 +1,16 @@
-
+
-
- {{ $t('map.updateObj') }}
- {{ $t('map.deleteObj') }}
-
+
@@ -48,9 +50,11 @@
-
- {{ $t('map.create') }}
-
+
@@ -122,12 +126,16 @@ export default {
const form = {
labelWidth: '130px',
items: {
+ code: {
+ name: '',
+ item: []
+ },
draw: {
name: this.$t('map.drawData'),
item: [
- { prop: 'deviceStationCode', label: this.$t('map.equipmentStation'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.stationList },
- { prop: 'code', label: this.$t('map.relStandCode'), type: 'select', optionLabel: 'code&&name', optionValue: 'code', options: this.stationStandList, change: true, deviceChange: this.deviceChange },
+ { prop: 'code', label: this.$t('map.relStandCode'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.stationStandList, change: true, deviceChange: this.deviceChange },
{ prop: 'name', label: this.$t('map.stationstandNameColon'), type: 'input', disabled: true },
+ { prop: 'deviceStationCode', label: this.$t('map.equipmentStation'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.stationList },
{ prop: 'direction', label: this.$t('map.stationstandTopBottom'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.RunDirectionTypeList },
{ prop: 'visible', label: this.$t('map.stationVisible'), type: 'checkbox' },
{ prop: 'nameShow', label: this.$t('map.stationstandShowName'), type: 'checkbox' },
@@ -176,10 +184,10 @@ export default {
{ required: true, message: this.$t('rules.stationstandHeight'), trigger: 'change' }
],
'position.x': [
- { required: true, message: this.$t('rule.stationstandPositionX'), trigger: 'change' }
+ { required: true, message: this.$t('rules.trainPositionX'), trigger: 'change' }
],
'position.y': [
- { required: true, message: this.$t('rule.stationstandPositionY'), trigger: 'change' }
+ { required: true, message: this.$t('rules.trainPositionY'), trigger: 'change' }
]
};
// 清空表单验证提示信息
@@ -332,4 +340,9 @@ export default {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/switch.vue b/src/views/map/mapdraft/mapedit/mapoperate/switch.vue
index c984f34fb..3de885a33 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/switch.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/switch.vue
@@ -1,14 +1,16 @@
-
+
-
- {{ $t('map.updateObj') }}
- {{ $t('map.deleteObj') }}
-
+
@@ -25,9 +27,11 @@
-
- {{ $t('map.create') }}
-
+
@@ -97,12 +101,16 @@ export default {
const form = {
labelWidth: '170px',
items: {
+ code: {
+ name: '',
+ item: []
+ },
draw: {
name: this.$t('map.drawData'),
item: [
- { prop: 'stationCode', label: this.$t('map.equipmentStation'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.stationList },
{ prop: 'code', label: this.$t('map.switchCode'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.switchList, change: true, deviceChange: this.deviceChange },
{ prop: 'name', label: this.$t('map.switchName'), type: 'input' },
+ { prop: 'stationCode', label: this.$t('map.equipmentStation'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.stationList },
{ prop: 'nameShow', label: this.$t('map.switchShowName'), type: 'checkbox' },
{ prop: 'namePoint.x', firstLevel: 'namePoint', secondLevel: 'x', label: this.$t('map.switchPositionX'), type: 'number', placeholder: 'px' },
{ prop: 'namePoint.y', firstLevel: 'namePoint', secondLevel: 'y', label: this.$t('map.switchPositionY'), type: 'number', placeholder: 'px' },
@@ -410,7 +418,11 @@ export default {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/train/index.vue b/src/views/map/mapdraft/mapedit/mapoperate/train/index.vue
index 9b6f43326..cc21ba5eb 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/train/index.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/train/index.vue
@@ -1,63 +1,26 @@
-
-
+
-
+
删除
-
-
- 创建
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/trainwindow.vue b/src/views/map/mapdraft/mapedit/mapoperate/trainwindow.vue
index 421f99f35..fb49bd227 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/trainwindow.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/trainwindow.vue
@@ -1,14 +1,16 @@
-
+
-
- {{ $t('map.updateObj') }}
- {{ $t('map.deleteObj') }}
-
+
@@ -28,9 +30,11 @@
:titles="['Section集合', '选择Section']"
/>
-
- {{ $t('map.create') }}
-
+
@@ -126,6 +130,10 @@ export default {
const form = {
labelWidth: '120px',
items: {
+ code: {
+ name: '',
+ item: []
+ },
draw: {
name: this.$t('map.drawData'),
item: [
@@ -362,4 +370,9 @@ export default {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/zcControl.vue b/src/views/map/mapdraft/mapedit/mapoperate/zcControl.vue
index 32686ad7d..e83a5d499 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/zcControl.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/zcControl.vue
@@ -1,22 +1,26 @@
-
+
-
- {{ $t('map.updateObj') }}
- {{ $t('map.deleteObj') }}
-
+
-
- {{ $t('map.create') }}
-
+
@@ -98,10 +102,14 @@ export default {
const form = {
labelWidth: '150px',
items: {
+ code: {
+ name: '',
+ item: []
+ },
draw: {
name: this.$t('map.drawData'),
item: [
- { prop: 'code', label: this.$t('map.code'), type: 'select', optionLabel: 'code', optionValue: 'code', options: this.zcList, change: true, deviceChange: this.deviceChange },
+ { prop: 'code', label: this.$t('map.code'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.zcList, change: true, deviceChange: this.deviceChange },
{ prop: 'name', label: this.$t('map.statusSignalName'), type: 'input' },
{ prop: 'visible', label: this.$t('map.showZc'), type: 'checkboxx' },
{ prop: 'position', label: this.$t('map.stateSignalsPlotCoordinates'), type: 'coordinate', width: '140px', children: [
@@ -241,7 +249,11 @@ export default {
From 21a0110966f0cc1e0236ca6e42a6ac914a8bf32f Mon Sep 17 00:00:00 2001
From: ival <610568032@qq.com>
Date: Tue, 20 Aug 2019 12:47:39 +0800
Subject: [PATCH 102/172] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BD=95=E5=88=B6?=
=?UTF-8?q?=E8=84=9A=E6=9C=AC=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/mixin/WindowResizeHandler.js | 4 +-
src/router/index.js | 12 +-
src/utils/baseUrl.js | 4 +-
src/views/display/index.vue | 18 +-
src/views/display/menuScript.vue | 7 +-
src/views/display/tipScriptRecord.vue | 349 +++++++++----------
src/views/jlmap/index.vue | 2 +-
src/views/map/mapdraft/mapedit/index.vue | 2 +-
src/views/map/mapdraft/mapmanage/create.vue | 4 +-
src/views/scriptManage/detail/index.vue | 267 +++++++-------
src/views/scriptManage/display/index.vue | 50 +++
src/views/scriptManage/scriptmanage/list.vue | 339 +++++++++---------
12 files changed, 556 insertions(+), 502 deletions(-)
create mode 100644 src/views/scriptManage/display/index.vue
diff --git a/src/mixin/WindowResizeHandler.js b/src/mixin/WindowResizeHandler.js
index e74700b04..53d3ff02b 100644
--- a/src/mixin/WindowResizeHandler.js
+++ b/src/mixin/WindowResizeHandler.js
@@ -3,8 +3,8 @@ import * as throttleUtil from '@/utils/throttle';
export default {
data() {
return {
- _clientWidth: '',
- _clientHeight: ''
+ _clientWidth: 0,
+ _clientHeight: 0
};
},
beforeMount() {
diff --git a/src/router/index.js b/src/router/index.js
index 5faa83896..b2058ee8a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -40,6 +40,7 @@ import Lessoncategory from '@/views/lesson/lessoncategory/index';
import Scriptmanage from '@/views/scriptManage/index';
import ScriptmanageHome from '@/views/scriptManage/home';
+import ScriptDisplay from '@/views/scriptManage/display/index';
import ScriptDetail from '@/views/scriptManage/detail/index';
import Teach from '@/views/teach/index';
@@ -133,6 +134,7 @@ export const userPlan = '015'; // 计划系统
export const UrlConfig = {
display: '/display',
+ scriptDisplay: '/scriptDisplay',
examRuleDraft: '/examRule/draft',
examRuleManage: '/examRule/manage',
map: {
@@ -211,7 +213,8 @@ export const UrlConfig = {
},
script: {
prefix: '/script',
- detail: '/script/detail'
+ detail: '/script/detail',
+ display: '/script/display'
}
};
@@ -310,6 +313,13 @@ export const asyncRouter = [
},
hidden: true
},
+ {
+ path: '/scriptDisplay/:mode',
+ component: ScriptDisplay,
+ meta: {
+ },
+ hidden: true
+ },
{
path: '/trainroom',
component: TrainRoom,
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 2e575c51e..4050e7e22 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -3,9 +3,9 @@ export function getBaseUrl() {
let BASE_API;
if (process.env.NODE_ENV === 'development') {
// BASE_API = 'https://joylink.club/jlcloud';
- BASE_API = 'https://test.joylink.club/jlcloud';
+ // BASE_API = 'https://test.joylink.club/jlcloud';
// BASE_API = 'http://192.168.3.5:9000'; // 袁琪
- // BASE_API = 'http://192.168.3.6:9000'; // 旭强
+ BASE_API = 'http://192.168.3.6:9000'; // 旭强
// BASE_API = 'http://192.168.3.4:9000' // 琰培
} else {
BASE_API = process.env.VUE_APP_BASE_API;
diff --git a/src/views/display/index.vue b/src/views/display/index.vue
index 76819dbe0..ad44ba7fd 100644
--- a/src/views/display/index.vue
+++ b/src/views/display/index.vue
@@ -107,6 +107,14 @@ export default {
Jl3dDrive
},
mixins: [WindowResizeHandler],
+ props: {
+ size: {
+ type: Object,
+ default() {
+ return null;
+ }
+ }
+ },
data() {
return {
mode: '',
@@ -235,8 +243,8 @@ export default {
},
methods: {
resizeHandler() {
- const width = this._clientWidth;
- const height = this._clientHeight;
+ const width = this.size ? this.size.width : this._clientWidth;
+ const height = this.size ? this.size.height : this._clientHeight;
this.$store.dispatch('config/resize', { width, height });
@@ -332,9 +340,9 @@ export default {
},
// 加载地图数据
async initLoadData() {
- const width = document.documentElement.clientWidth;
- const height = document.documentElement.clientHeight + 200;
- this.$store.dispatch('config/resize', { width, height });
+ // const width = document.documentElement.clientWidth;
+ // const height = document.documentElement.clientHeight + 200;
+ // this.$store.dispatch('config/resize', { width, height });
this.$store.dispatch('training/reset');
try {
diff --git a/src/views/display/menuScript.vue b/src/views/display/menuScript.vue
index 40fd70bdd..c342725b7 100644
--- a/src/views/display/menuScript.vue
+++ b/src/views/display/menuScript.vue
@@ -13,7 +13,7 @@
-
- {{$t('global.create')}}
- {{$t('global.update')}}
+ {{ $t('global.create') }}
+ {{ $t('global.update') }}
@@ -47,10 +47,10 @@ export default {
computed: {
title() {
if (this.isAdd) {
- return this.$t('map.addMapSkin');
+ return this.$t('map.addMapSkin');
}
if (this.isEdit) {
- return this.$t('map.updateMapSkin');
+ return this.$t('map.updateMapSkin');
}
return '';
},
diff --git a/src/views/map/skinStyle/index.vue b/src/views/map/skinStyle/index.vue
index 0c82090ae..cfdb2c82a 100644
--- a/src/views/map/skinStyle/index.vue
+++ b/src/views/map/skinStyle/index.vue
@@ -25,11 +25,11 @@ export default {
queryObject: {
name: {
type: 'text',
- label: this.$t('map.skinDesignation'),
+ label: this.$t('map.skinDesignation')
},
code: {
type: 'text',
- label: this.$t('map.skinCoding'),
+ label: this.$t('map.skinCoding')
}
}
},
diff --git a/src/views/teach/category/tree.vue b/src/views/teach/category/tree.vue
index 208f82070..ce3e8379e 100644
--- a/src/views/teach/category/tree.vue
+++ b/src/views/teach/category/tree.vue
@@ -1,8 +1,7 @@
-
diff --git a/src/views/scriptManage/detail/index.vue b/src/views/scriptManage/detail/index.vue
index ce8c7117a..3e58781b7 100644
--- a/src/views/scriptManage/detail/index.vue
+++ b/src/views/scriptManage/detail/index.vue
@@ -1,146 +1,139 @@
-
-
@@ -22,7 +22,9 @@ export default {
props: {
selected: {
type: Object,
- requited: true
+ default: function () {
+ return null;
+ }
}
},
data() {
diff --git a/src/views/map/skinCode/draft.vue b/src/views/map/skinCode/draft.vue
index 036f11c2b..ace0c8a78 100644
--- a/src/views/map/skinCode/draft.vue
+++ b/src/views/map/skinCode/draft.vue
@@ -12,9 +12,9 @@
- {{$t('global.create')}}
- {{$t('global.update')}}
- {{$t('global.return')}}
+ {{ $t('global.create') }}
+ {{ $t('global.update') }}
+ {{ $t('global.return') }}
@@ -48,10 +48,10 @@ export default {
computed: {
title() {
if (this.isAdd) {
- return this.$t('map.addMapSkin');
+ return this.$t('map.addMapSkin');
}
if (this.isEdit) {
- return this.$t('map.updateMapSkin');
+ return this.$t('map.updateMapSkin');
}
return '';
},
diff --git a/src/views/map/skinStyle/draft.vue b/src/views/map/skinStyle/draft.vue
index 8726d1bc2..1922c77a4 100644
--- a/src/views/map/skinStyle/draft.vue
+++ b/src/views/map/skinStyle/draft.vue
@@ -12,8 +12,8 @@
-
-
-
- - {{ title }} -
-
-
+
-
- 暂停
- 恢复并执行
- {{$t('scriptRecord.saveMaplocation')}}
- 重置剧本
- {{$t('scriptRecord.saveBackground')}}
- {{$t('scriptRecord.saveData')}}
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
+
diff --git a/src/views/jlmap/index.vue b/src/views/jlmap/index.vue
index fae4fa351..26e486365 100644
--- a/src/views/jlmap/index.vue
+++ b/src/views/jlmap/index.vue
@@ -60,7 +60,7 @@ export default {
return canvasId;
},
show() {
- if (this.mode === TrainingMode.EDIT || this.mode === TrainingMode.MAP_EDIT) {
+ if (this.mode == TrainingMode.EDIT || this.mode == TrainingMode.MAP_EDIT) {
return true;
}
return false;
diff --git a/src/views/map/mapdraft/mapedit/index.vue b/src/views/map/mapdraft/mapedit/index.vue
index c925f9300..92d3d06ad 100644
--- a/src/views/map/mapdraft/mapedit/index.vue
+++ b/src/views/map/mapdraft/mapedit/index.vue
@@ -89,7 +89,7 @@ export default {
this.initAutoSaveTask();
},
$route() {
- this.$$nextTick(() => {
+ this.$nextTick(() => {
this.loadInitPage();
});
}
diff --git a/src/views/map/mapdraft/mapmanage/create.vue b/src/views/map/mapdraft/mapmanage/create.vue
index 97949700a..382c79878 100644
--- a/src/views/map/mapdraft/mapmanage/create.vue
+++ b/src/views/map/mapdraft/mapmanage/create.vue
@@ -13,7 +13,7 @@
ref="newForm"
label-position="right"
:model="newModel"
- label-width="120px"
+ label-width="140px"
size="mini"
:rules="newRules"
@submit.native.prevent
@@ -39,7 +39,7 @@
label-position="right"
:model="pullModel"
:rules="pullRules"
- label-width="120px"
+ label-width="140px"
size="mini"
>
+
+
+
+
+
+ + {{ title }} +
+
+
+
+ 暂停
+ 恢复并执行
+ {{ $t('scriptRecord.saveMaplocation') }}
+ 重置剧本
+ {{ $t('scriptRecord.saveBackground') }}
+ {{ $t('scriptRecord.saveData') }}
+
+
+
+
+
+
+
+
-
-
+
+
diff --git a/src/views/scriptManage/scriptmanage/list.vue b/src/views/scriptManage/scriptmanage/list.vue
index ed8742a55..a9013736c 100644
--- a/src/views/scriptManage/scriptmanage/list.vue
+++ b/src/views/scriptManage/scriptmanage/list.vue
@@ -1,178 +1,173 @@
-
diff --git a/src/views/map/runplan/manage/publish.vue b/src/views/map/runplan/manage/publish.vue
index d9d3710a4..89dee4444 100644
--- a/src/views/map/runplan/manage/publish.vue
+++ b/src/views/map/runplan/manage/publish.vue
@@ -8,8 +8,8 @@
剧本详情
-
-
-
-
-
-
+
+
+
+ 剧本详情
+
+
-
+
+
+
+
-
-
-
-
-
-
-
+
+
\ No newline at end of file
+ currentModel: {}
+ };
+ },
+ created() {
+ this.loadInitData();
+ },
+ methods: {
+ loadInitData() {
+ this.mapList = [];
+ listPublishMap().then(response => {
+ this.mapList = response.data;
+ // this.mapList = response.data.map(elem => { return { value: elem.id, label: elem.name } });
+ response.data.forEach(elem => {
+ this.queryForm.queryObject.mapId.config.data.push({ value: elem.id, label: elem.name });
+ });
+ });
+ },
+ // 确定创建
+ handleConfirmCreate(data) {
+ createQuest(data).then(resp => {
+ this.reloadTable();
+ this.$message.success('创建剧本成功');
+ }).catch(error => {
+ this.$messageBox(`创建剧本失败: ${error.message}`);
+ });
+ },
+ // 修改
+ handleModify(index, row) {
+ this.$refs.modifyScript.doShow(row.id);
+ },
+ // 确认修改
+ handleConfirmModify(data) {
+ updateQuest(data.id, data).then(resp => {
+ this.reloadTable();
+ this.$message.success('修改剧本成功');
+ }).catch(error => {
+ this.$messageBox(`修改剧本失败: ${error.message}`);
+ });
+ },
+ // 创建
+ handleCreate(index, row) {
+ this.$refs.createScript.doShow(null);
+ },
+ // 录制
+ handleRecord(index, row) {
+ scriptRecordNotify(row.id).then(resp => {
+ const query = { mapId: row.mapId, group: resp.data, scriptId: row.id };
+ this.$router.push({ path: `${UrlConfig.scriptDisplay}/script`, query });
+ launchFullscreen();
+ }).catch(error => {
+ this.$messageBox(`创建仿真失败: ${error.message}`);
+ });
+ },
+ // 删除
+ handleDelete(index, row) {
+ this.$confirm('此操作将删除此剧本脚本, 是否继续?', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ deleteQuest(row.id).then(response => {
+ this.$message.success('删除成功');
+ this.reloadTable();
+ }).catch(error => {
+ this.reloadTable();
+ if (error.code == 500) {
+ this.$messageBox('删除失败');
+ } else if (error.code == 500009) {
+ this.$messageBox('该模板已被加载计划使用，无法删除');
+ }
+ });
+ }).catch(() => { });
+ },
+ reloadTable() {
+ this.queryList.reload();
+ }
+ }
+};
+
From 468e62438380836875feecef8d7adb25f645fe40 Mon Sep 17 00:00:00 2001
From: ival <610568032@qq.com>
Date: Tue, 20 Aug 2019 13:03:39 +0800
Subject: [PATCH 103/172] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=E5=B8=83=E5=B1=80=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/jlmap/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/jlmap/index.vue b/src/views/jlmap/index.vue
index 26e486365..3e83e78ee 100644
--- a/src/views/jlmap/index.vue
+++ b/src/views/jlmap/index.vue
@@ -1,5 +1,5 @@
-
+
-
+
-
- 删除
+ {{ $t('map.deleteObj') }}
From 0db73aba5f089d6c95edb027ab27030105b04d2e Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 20 Aug 2019 13:21:38 +0800
Subject: [PATCH 105/172] =?UTF-8?q?=E5=89=A7=E6=9C=AC=E7=BC=96=E5=88=B6?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=BB=93=E6=9E=84=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/display/scriptRecord/addAction.vue | 97 +++++++-----
src/views/display/scriptRecord/getAction.vue | 51 +++++--
src/views/display/tipScriptRecord.vue | 151 ++++++++-----------
3 files changed, 156 insertions(+), 143 deletions(-)
diff --git a/src/views/display/scriptRecord/addAction.vue b/src/views/display/scriptRecord/addAction.vue
index 2079ded0f..0c48d20d0 100644
--- a/src/views/display/scriptRecord/addAction.vue
+++ b/src/views/display/scriptRecord/addAction.vue
@@ -1,43 +1,47 @@
{{ $t('error.edit') }}
+ {{ $t('error.nextStep') }}
+ -->
diff --git a/src/views/publish/examRule/draft/index.vue b/src/views/publish/examRule/draft/index.vue
index 155c71140..93e1c07d6 100644
--- a/src/views/publish/examRule/draft/index.vue
+++ b/src/views/publish/examRule/draft/index.vue
@@ -1,7 +1,7 @@
@@ -44,22 +44,22 @@ export default {
lessonName: '',
height: '',
queryForm: {
- labelWidth: '120px',
+ labelWidth: '160px',
queryObject: {
'lessonId': {
type: this.$route.query.lessonId ? '' : 'select',
- label: '课程',
+ label: this.$t('publish.lessonName'),
config: {
data: []
}
},
'name': {
type: 'text',
- label: '试卷名称'
+ label: this.$t('publish.paperName')
},
'creatorName': {
type: 'text',
- label: '创建人'
+ label: this.$t('publish.creator')
}
},
reset: !this.$route.query.lessonId
@@ -70,7 +70,7 @@ export default {
indexShow: true,
columns: [
{
- title: '课程名称',
+ title: this.$t('publish.lessonName'),
prop: 'lessonId',
type: 'tag',
show: !this.$route.query.lessonId,
@@ -78,15 +78,15 @@ export default {
tagType: (row) => { return ''; }
},
{
- title: '试卷名称',
+ title: this.$t('publish.paperName'),
prop: 'name'
},
{
- title: '创建人',
+ title: this.$t('publish.creator'),
prop: 'creatorName'
},
{
- title: '是否试用',
+ title: this.$t('global.isTry'),
prop: 'trial',
type: 'tag',
columnValue: (row) => { return this.$ConstSelect.translate(row.trial, 'Whether'); },
@@ -98,28 +98,28 @@ export default {
}
},
{
- title: '时长',
+ title: this.$t('global.duration'),
prop: 'duration',
type: 'tag',
columnValue: (row) => { return this.durationField(row.duration); },
tagType: (row) => { return ''; }
},
{
- title: '考试时间',
+ title: this.$t('publish.examTime'),
prop: 'startTime',
type: 'formatter',
format: 'yyyy-MM-dd hh:ss'
},
{
- title: '满分',
+ title: this.$t('publish.fullMark'),
prop: 'fullPoint'
},
{
- title: '及格分',
+ title: this.$t('publish.passScore'),
prop: 'passingPoint'
},
{
- title: '状态',
+ title: this.$t('global.status'),
prop: 'status',
type: 'tag',
columnValue: (row) => { return this.$convertField(row.status, this.EffectiveTypeList, ['value', 'label']); },
@@ -132,23 +132,23 @@ export default {
},
{
type: 'button',
- title: '操作',
+ title: this.$t('global.operate'),
width: '300',
buttons: [
{
- name: '快速创建',
+ name: this.$t('global.fastCreate'),
type: 'primary',
handleClick: this.handleDistribute,
showControl: (row) => { return row.bizType !== '02'; }
},
{
- name: '修改',
+ name: this.$t('global.edit'),
type: 'primary',
showControl: (row) => { return row.creatorId == this.userId; },
handleClick: this.handleUpdate
},
{
- name: '下架',
+ name: this.$t('global.soldOut'),
type: 'warning',
handleClick: this.handleEfficacy,
showControl: (row) => {
@@ -156,7 +156,7 @@ export default {
}
},
{
- name: '上架',
+ name: this.$t('global.putaway'),
type: 'primary',
handleClick: this.handleEffective,
showControl: (row) => {
@@ -164,7 +164,7 @@ export default {
}
},
{
- name: '删除',
+ name: this.$t('global.delete'),
type: 'danger',
handleClick: this.deleteList,
showControl: (row) => { return row.creatorId == this.userId; }
@@ -173,7 +173,7 @@ export default {
}
],
actions: [
- { text: '新增', btnCode: 'employee_insert', handler: this.handleNormalAdd }
+ { text: this.$t('global.add'), btnCode: 'employee_insert', handler: this.handleNormalAdd }
]
}
};
@@ -238,57 +238,57 @@ export default {
},
// 删除
deleteList(index, data) {
- this.$confirm('此操作将删除该试卷, 是否继续?', '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
+ this.$confirm(this.$t('publish.wellDelPaper'), this.$t('global.tips'), {
+ confirmButtonText: this.$t('global.confirm'),
+ cancelButtonText: this.$t('global.cancel'),
type: 'warning'
}).then(() => {
deleteExam(data).then(res => {
this.queryList.reload();
this.$message({
type: 'success',
- message: '删除成功!'
+ message: this.$t('publish.setSuccess')
});
}).catch(res => {
if (res.code == '500009') {
- this.$message({ type: 'warning', message: '该试卷已被使用，不能删除' });
+ this.$message({ type: 'warning', message: this.$t('error.paperHasUseNotDel') });
} else {
- this.$message({ type: 'error', message: '删除异常，请联系管理员' });
+ this.$message({ type: 'error', message: this.$t('error.deleteException') });
}
});
}).catch(() => { });
},
handleEfficacy(index, data) {
- this.$confirm('此操作将此试卷下架?', '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
+ this.$confirm(this.$t('publish.wellSoldOutPaper'), this.$t('global.tips'), {
+ confirmButtonText: this.$t('global.confirm'),
+ cancelButtonText: this.$t('global.cancel'),
type: 'warning'
}).then(() => {
setExamEfficacy(data).then(res => {
this.queryList.reload();
this.$message({
type: 'success',
- message: '设置成功!'
+ message: this.$t('publish.setSuccess')
});
}).catch(res => {
- this.$message({ type: 'warning', message: '设置失败,' + res.message });
+ this.$message({ type: 'warning', message: `${this.$t('error.setFailed')}${res.message}` });
});
}).catch(() => { });
},
handleEffective(index, data) {
- this.$confirm('此操作将此试卷上架?', '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
+ this.$confirm(this.$t('publish.wellPutawayPaper'), this.$t('global.tips'), {
+ confirmButtonText: this.$t('global.confirm'),
+ cancelButtonText: this.$t('global.cancel'),
type: 'warning'
}).then(() => {
setExamEffectivey(data).then(res => {
this.queryList.reload();
this.$message({
type: 'success',
- message: '设置成功!'
+ message: this.$t('publish.setSuccess')
});
}).catch(res => {
- this.$message({ type: 'warning', message: '设置失败,' + res.message });
+ this.$message({ type: 'warning', message: `${this.$t('error.setFailed')}${res.message}` });
});
}).catch(() => { });
}
diff --git a/src/views/publish/productStatus/index.vue b/src/views/publish/productStatus/index.vue
index c5e4431aa..ba25b2f0d 100644
--- a/src/views/publish/productStatus/index.vue
+++ b/src/views/publish/productStatus/index.vue
@@ -20,7 +20,7 @@ export default {
pageIndex: 'pageNum'
},
queryForm: {
- labelWidth: '80px',
+ labelWidth: '140px',
reset: true,
queryObject: {
name: {
diff --git a/src/views/publish/runPlanTemplate/index.vue b/src/views/publish/runPlanTemplate/index.vue
index c265a3e5c..be7757936 100644
--- a/src/views/publish/runPlanTemplate/index.vue
+++ b/src/views/publish/runPlanTemplate/index.vue
@@ -102,37 +102,37 @@ export default {
},
// 删除
handleDelete(index, row) {
- this.$confirm('此操作将删除此运行图模板, 是否继续?', '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
+ this.$confirm(this.$t('publish.wellDelTemplate'), this.$t('global.tips'), {
+ confirmButtonText: this.$t('global.confirm'),
+ cancelButtonText: this.$t('global.cancel'),
type: 'warning'
}).then(() => {
deleteRunPlanTemplate(row.id).then(response => {
- this.$message.success('删除成功');
+ this.$message.success(this.$t('publish.deleteSuccess'));
this.reloadTable();
}).catch(error => {
this.reloadTable();
if (error.code == 500) {
- this.$messageBox('删除失败');
+ this.$messageBox(this.$t('error.deleteFailed'));
} else if (error.code == 500009) {
- this.$messageBox('该模板已被加载计划使用，无法删除');
+ this.$messageBox(this.$t('error.templateHasBeUse'));
}
});
}).catch(() => { });
},
// 生成每日运行图
handleGenerateEveryDay(index, row) {
- this.$confirm('此操作将生成每日运行图, 是否继续?', '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
+ this.$confirm(this.$t('publish.wellGenerateEveryRunPlan'), this.$t('global.tips'), {
+ confirmButtonText: this.$t('global.confirm'),
+ cancelButtonText: this.$t('global.cancel'),
type: 'warning'
}).then(() => {
generateCommonRunPlanEveryDay(row.id).then(response => {
this.reloadTable();
- this.$message.success('生成通用每日运行图成功。');
+ this.$message.success(this.$t('publish.createCommonSuccess'));
}).catch(() => {
this.reloadTable();
- this.$messageBox('生成通用每日运行图失败！');
+ this.$messageBox(this.$t('error.operationFailure'));
});
}).catch(() => { });
},
diff --git a/src/views/publish/simulationScript/index.vue b/src/views/publish/simulationScript/index.vue
index ed44406c5..9b2b9a36d 100644
--- a/src/views/publish/simulationScript/index.vue
+++ b/src/views/publish/simulationScript/index.vue
@@ -92,20 +92,20 @@ export default {
},
// 删除
handleDelete(index, row) {
- this.$confirm('此操作将删除此仿真脚本, 是否继续?', '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
+ this.$confirm(this.$t('publish.wellDelTemplate'), this.$t('global.tips'), {
+ confirmButtonText: this.$t('global.confirm'),
+ cancelButtonText: this.$t('global.cancel'),
type: 'warning'
}).then(() => {
deleteQuest(row.id).then(response => {
- this.$message.success('删除成功');
+ this.$message.success(this.$t('publish.deleteSuccess'));
this.reloadTable();
}).catch(error => {
this.reloadTable();
if (error.code == 500) {
- this.$messageBox('删除失败');
+ this.$messageBox(this.$t('error.deleteFailed'));
} else if (error.code == 500009) {
- this.$messageBox('该模板已被加载计划使用，无法删除');
+ this.$messageBox(this.$t('error.templateHasBeUse'));
}
});
}).catch(() => { });
@@ -113,8 +113,7 @@ export default {
// 查看详情
handleDetail(index, row) {
- console.log(index, row);
- this.$messageBox('该功能暂时未开启');
+ this.$messageBox(this.$t('global.notBeUse'));
},
reloadTable() {
From 520f1ef3563bde51a951a6363af85670bede3467 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Tue, 20 Aug 2019 17:10:08 +0800
Subject: [PATCH 114/172] =?UTF-8?q?=E8=B0=83=E6=95=B4:=20=E5=9B=BD?=
=?UTF-8?q?=E9=99=85=E5=8C=96=E5=88=9B=E5=BB=BA=E8=BF=9E=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/i18n/langs/en/index.js | 4 +++-
src/i18n/langs/en/planMonitor.js | 3 +++
src/i18n/langs/zh/index.js | 4 +++-
src/i18n/langs/zh/planMonitor.js | 3 +++
4 files changed, 12 insertions(+), 2 deletions(-)
create mode 100644 src/i18n/langs/en/planMonitor.js
create mode 100644 src/i18n/langs/zh/planMonitor.js
diff --git a/src/i18n/langs/en/index.js b/src/i18n/langs/en/index.js
index a07a08e0d..080f9fb5c 100644
--- a/src/i18n/langs/en/index.js
+++ b/src/i18n/langs/en/index.js
@@ -11,6 +11,7 @@ import system from './system';
import orderAuthor from './orderAuthor';
import publish from './publish';
import permission from './permission';
+import planMonitor from './planMonitor';
export default {
...enLocale,
@@ -25,5 +26,6 @@ export default {
system,
orderAuthor,
publish,
- permission
+ permission,
+ planMonitor
};
diff --git a/src/i18n/langs/en/planMonitor.js b/src/i18n/langs/en/planMonitor.js
new file mode 100644
index 000000000..6d916df14
--- /dev/null
+++ b/src/i18n/langs/en/planMonitor.js
@@ -0,0 +1,3 @@
+export default {
+
+};
diff --git a/src/i18n/langs/zh/index.js b/src/i18n/langs/zh/index.js
index c009ef004..678bd41c0 100644
--- a/src/i18n/langs/zh/index.js
+++ b/src/i18n/langs/zh/index.js
@@ -11,6 +11,7 @@ import system from './system';
import orderAuthor from './orderAuthor';
import publish from './publish';
import permission from './permission';
+import planMonitor from './planMonitor';
export default {
...cnLocale,
@@ -25,5 +26,6 @@ export default {
system,
orderAuthor,
publish,
- permission
+ permission,
+ planMonitor
};
diff --git a/src/i18n/langs/zh/planMonitor.js b/src/i18n/langs/zh/planMonitor.js
new file mode 100644
index 000000000..6d916df14
--- /dev/null
+++ b/src/i18n/langs/zh/planMonitor.js
@@ -0,0 +1,3 @@
+export default {
+
+};
From 433360f979f11d570e514ef4e5138b30da6dc299 Mon Sep 17 00:00:00 2001
From: ival <610568032@qq.com>
Date: Tue, 20 Aug 2019 17:22:45 +0800
Subject: [PATCH 115/172] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=9E=E6=94=BE?=
=?UTF-8?q?=E7=9A=84=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/i18n/langs/en/index.js | 4 ++-
src/i18n/langs/en/publish.js | 14 +++++-----
src/i18n/langs/en/replay.js | 9 +++++++
src/i18n/langs/en/system.js | 7 +++--
src/i18n/langs/zh/index.js | 4 ++-
src/i18n/langs/zh/publish.js | 14 +++++-----
src/i18n/langs/zh/replay.js | 8 ++++++
src/i18n/langs/zh/system.js | 7 +++--
src/views/management/dictionary/index.vue | 2 +-
.../management/existingSimulation/index.vue | 2 +-
src/views/management/userControl/index.vue | 2 +-
src/views/management/userExam/index.vue | 2 +-
src/views/management/userSimulation/index.vue | 2 +-
src/views/management/userTraining/index.vue | 2 +-
src/views/publish/productStatus/index.vue | 6 ++---
src/views/publish/publishLesson/index.vue | 6 ++---
src/views/publish/publishMap/index.vue | 6 ++---
src/views/replay/index.vue | 26 +++++++++----------
18 files changed, 71 insertions(+), 52 deletions(-)
create mode 100644 src/i18n/langs/en/replay.js
create mode 100644 src/i18n/langs/zh/replay.js
diff --git a/src/i18n/langs/en/index.js b/src/i18n/langs/en/index.js
index a07a08e0d..0615dac50 100644
--- a/src/i18n/langs/en/index.js
+++ b/src/i18n/langs/en/index.js
@@ -11,6 +11,7 @@ import system from './system';
import orderAuthor from './orderAuthor';
import publish from './publish';
import permission from './permission';
+import replay from './replay';
export default {
...enLocale,
@@ -25,5 +26,6 @@ export default {
system,
orderAuthor,
publish,
- permission
+ permission,
+ replay
};
diff --git a/src/i18n/langs/en/publish.js b/src/i18n/langs/en/publish.js
index 5ef50045f..1be650352 100644
--- a/src/i18n/langs/en/publish.js
+++ b/src/i18n/langs/en/publish.js
@@ -7,18 +7,18 @@ export default {
updateTime: 'Update Time',
operationSuccess: 'Operate successfully',
deleteSuccess: 'Delete successfully',
- wellDelTypeIsContinue: 'This action deletes the type. Do you want to continue?',
- wellPutawayMapIsContinue: 'This will launch the map. Do you want to continue?',
- wellSoldOutMapIscontinue: 'This operation will remove this map. Do you want to continue?',
+ wellDelType: 'This action deletes the type. Do you want to continue?',
+ wellPutawayMap: 'This will launch the map. Do you want to continue?',
+ wellSoldOutMap: 'This operation will remove this map. Do you want to continue?',
productName: 'Product Name',
productType: 'Product Type',
productCode: 'Product Code',
lessonIntroduction: 'Lesson Introduction',
updateSuccess: 'Update successfully',
- wellPutawayTrainingIsContinue: 'Will this operation continue on the last sortie?',
- wellSoldOutTrainingIsContinue: 'Will this operation continue for the next sortie?',
- wellPutawayProductIsContinue: 'This operation will put the product on the shelf. Do you want to continue?',
- wellSoldOutProductIsContinue: 'This operation will be removed from the shelves. Do you want to continue?',
+ wellPutawayTraining: 'Will this operation continue on the last sortie?',
+ wellSoldOutTraining: 'Will this operation continue for the next sortie?',
+ wellPutawayProduct: 'This operation will put the product on the shelf. Do you want to continue?',
+ wellSoldOutProduct: 'This operation will be removed from the shelves. Do you want to continue?',
runPlanName: 'Run Plan Name',
runEveryDayTime: 'Daily Running Time',
userId: 'User Id',
diff --git a/src/i18n/langs/en/replay.js b/src/i18n/langs/en/replay.js
new file mode 100644
index 000000000..97d3e8a35
--- /dev/null
+++ b/src/i18n/langs/en/replay.js
@@ -0,0 +1,9 @@
+export default {
+ replay: 'playback',
+ mapName: 'Map Name',
+ creatorId: 'Creator of ID',
+ createTime: 'Create Time',
+ deleteSuccess: 'Delete successfully',
+ wellDelReplay: 'This action will delete the playback. Do you want to continue?'
+
+};
diff --git a/src/i18n/langs/en/system.js b/src/i18n/langs/en/system.js
index 15456ff92..623edb89b 100644
--- a/src/i18n/langs/en/system.js
+++ b/src/i18n/langs/en/system.js
@@ -6,7 +6,6 @@ export default {
createDirectory: 'Create dictionary',
editDictionary: 'Edit dictionary',
deleteSuccess: 'Successful deletion',
- dleeteTipContext: 'This operation will delete the type. Do you want to continue?',
createSuccess: 'Create successful',
updateSuccess: 'Update successful',
destory: 'Destory',
@@ -20,7 +19,7 @@ export default {
isError: 'Is Error',
isSuspend: 'Is Suspend',
isDrivingAsplanned: 'Whether to drive as planned',
- delUserSimulationIsContinue: 'This operation will delete the user simulation data. Do you want to continue?',
+ wellDelUserSimulation: 'This operation will delete the user simulation data. Do you want to continue?',
createDetail: 'Create details',
editDetail: 'Editorial details',
mapName: 'Map Name',
@@ -35,12 +34,12 @@ export default {
examScore: 'Examination Score',
examResult: 'Examination Results',
examName: 'Paper Name',
- delExamResultIsContinue: 'This operation will delete the test result. Do you want to continue?',
+ wellDelExamResult: 'This operation will delete the test result. Do you want to continue?',
editExamDetail: 'Edit exam details',
subscribeMap: 'Subscribe',
roles: 'Roles',
nickname: 'Nickname',
- delTypeIsContinue: 'This operation will delete the type. Do you want to continue?',
+ wellDelType: 'This operation will delete the type. Do you want to continue?',
permission: 'Permission',
editUserPermission: 'Edit User Rights',
lessonName: 'Lesson Name',
diff --git a/src/i18n/langs/zh/index.js b/src/i18n/langs/zh/index.js
index c009ef004..16083f819 100644
--- a/src/i18n/langs/zh/index.js
+++ b/src/i18n/langs/zh/index.js
@@ -11,6 +11,7 @@ import system from './system';
import orderAuthor from './orderAuthor';
import publish from './publish';
import permission from './permission';
+import replay from './replay';
export default {
...cnLocale,
@@ -25,5 +26,6 @@ export default {
system,
orderAuthor,
publish,
- permission
+ permission,
+ replay
};
diff --git a/src/i18n/langs/zh/publish.js b/src/i18n/langs/zh/publish.js
index eb2aa3f49..4a74de3b8 100644
--- a/src/i18n/langs/zh/publish.js
+++ b/src/i18n/langs/zh/publish.js
@@ -7,18 +7,18 @@ export default {
updateTime: '更新时间',
operationSuccess: '操作成功',
deleteSuccess: '删除成功',
- wellDelTypeIsContinue: '此操作将删除该类型, 是否继续?',
- wellPutawayMapIsContinue: '此操作将上架此地图, 是否继续?',
- wellSoldOutMapIscontinue: '此操作将下架此地图, 是否继续?',
+ wellDelType: '此操作将删除该类型, 是否继续?',
+ wellPutawayMap: '此操作将上架此地图, 是否继续?',
+ wellSoldOutMap: '此操作将下架此地图, 是否继续?',
productName: '产品名称',
productType: '产品类型',
productCode: '产品编码',
lessonIntroduction: '课程简介',
updateSuccess: '更新成功',
- wellPutawayTrainingIsContinue: '此操作将上架此实训, 是否继续?',
- wellSoldOutTrainingIsContinue: '此操作将下架此实训, 是否继续?',
- wellPutawayProductIsContinue: '此操作将上架此产品, 是否继续?',
- wellSoldOutProductIsContinue: '此操作将下架此产品, 是否继续?',
+ wellPutawayTraining: '此操作将上架此实训, 是否继续?',
+ wellSoldOutTraining: '此操作将下架此实训, 是否继续?',
+ wellPutawayProduct: '此操作将上架此产品, 是否继续?',
+ wellSoldOutProduct: '此操作将下架此产品, 是否继续?',
runPlanName: '运行图名称',
runEveryDayTime: '每日运行时间',
userId: '用户Id',
diff --git a/src/i18n/langs/zh/replay.js b/src/i18n/langs/zh/replay.js
new file mode 100644
index 000000000..da34d0dcd
--- /dev/null
+++ b/src/i18n/langs/zh/replay.js
@@ -0,0 +1,8 @@
+export default {
+ replay: '回放',
+ mapName: '地图名称',
+ creatorId: '创建人ID',
+ createTime: '创建时间',
+ deleteSuccess: '删除成功',
+ wellDelReplay: '此操作将删除该回放, 是否继续?'
+};
diff --git a/src/i18n/langs/zh/system.js b/src/i18n/langs/zh/system.js
index 50f88d6f4..8906e92ae 100644
--- a/src/i18n/langs/zh/system.js
+++ b/src/i18n/langs/zh/system.js
@@ -6,7 +6,6 @@ export default {
createDirectory: '创建目录',
editDictionary: '编辑目录',
deleteSuccess: '删除成功',
- dleeteTipContext: '此操作将删除该类型, 是否继续?',
createSuccess: '创建成功',
updateSuccess: '更新成功',
destory: '销 毁',
@@ -20,7 +19,7 @@ export default {
isError: '是否错误',
isSuspend: '是否暂停',
isDrivingAsplanned: '是否按计划行车',
- delUserSimulationIsContinue: '此操作将删除此用户仿真数据, 是否继续?',
+ wellDelUserSimulation: '此操作将删除此用户仿真数据, 是否继续?',
createDetail: '创建明细',
editDetail: '编辑明细',
mapName: '地图名称',
@@ -35,12 +34,12 @@ export default {
examScore: '考试成绩',
examResult: '考试结果',
examName: '试卷名称',
- delExamResultIsContinue: '此操作将删除此考试结果, 是否继续?',
+ wellDelExamResult: '此操作将删除此考试结果, 是否继续?',
editExamDetail: '编辑考试详情',
subscribeMap: '订阅地图',
roles: '角色',
nickname: '昵称',
- delTypeIsContinue: '此操作将删除该类型, 是否继续?',
+ wellDelType: '此操作将删除该类型, 是否继续?',
permission: '权限',
editUserPermission: '编辑用户权限',
lessonName: '课程名称',
diff --git a/src/views/management/dictionary/index.vue b/src/views/management/dictionary/index.vue
index 10f0beae3..3ea9d5e1a 100644
--- a/src/views/management/dictionary/index.vue
+++ b/src/views/management/dictionary/index.vue
@@ -114,7 +114,7 @@ export default {
},
handleDelete(index, row) {
- this.$confirm(this.$t('global.dleeteTipContext'), this.$t('global.tips'), {
+ this.$confirm(this.$t('global.wellDelType'), this.$t('global.tips'), {
confirmButtonText: this.$t('global.confirm'),
cancelButtonText: this.$t('global.cancel'),
type: 'warning'
diff --git a/src/views/management/existingSimulation/index.vue b/src/views/management/existingSimulation/index.vue
index 2b5c0b3cb..644bfb146 100644
--- a/src/views/management/existingSimulation/index.vue
+++ b/src/views/management/existingSimulation/index.vue
@@ -170,7 +170,7 @@ export default {
return sessionId;
},
handleDelete(index, row) {
- this.$confirm(this.$t('system.delUserSimulationIsContinue'), this.$t('global.tips'), {
+ this.$confirm(this.$t('system.wellDelUserSimulation'), this.$t('global.tips'), {
confirmButtonText: this.$t('global.confirm'),
cancelButtonText: this.$t('global.cancel'),
type: 'warning'
diff --git a/src/views/management/userControl/index.vue b/src/views/management/userControl/index.vue
index 3f366cfa6..b85cd59df 100644
--- a/src/views/management/userControl/index.vue
+++ b/src/views/management/userControl/index.vue
@@ -100,7 +100,7 @@ export default {
// 删除
handleUserDelete(index, row) {
- this.$confirm(this.$t('system.delTypeIsContinue'), this.$t('global.tips'), {
+ this.$confirm(this.$t('system.wellDelType'), this.$t('global.tips'), {
confirmButtonText: this.$t('global.confirm'),
cancelButtonText: this.$t('global.cancel'),
type: 'warning'
diff --git a/src/views/management/userExam/index.vue b/src/views/management/userExam/index.vue
index 3349e0412..9274c1fe9 100644
--- a/src/views/management/userExam/index.vue
+++ b/src/views/management/userExam/index.vue
@@ -115,7 +115,7 @@ export default {
// 删除
handleDelete(index, row) {
- this.$confirm(this.$t('system.delExamResultIsContinue'), this.$t('global.tips'), {
+ this.$confirm(this.$t('system.wellDelExamResult'), this.$t('global.tips'), {
confirmButtonText: this.$t('global.confirm'),
cancelButtonText: this.$t('global.cancel'),
type: 'warning'
diff --git a/src/views/management/userSimulation/index.vue b/src/views/management/userSimulation/index.vue
index 8522c4340..7742a2546 100644
--- a/src/views/management/userSimulation/index.vue
+++ b/src/views/management/userSimulation/index.vue
@@ -135,7 +135,7 @@ export default {
// 删除
handleDelete(index, row) {
- this.$confirm(this.$t('system.delUserSimulationIsContinue'), this.$t('global.tips'), {
+ this.$confirm(this.$t('system.wellDelUserSimulation'), this.$t('global.tips'), {
confirmButtonText: this.$t('global.confirm'),
cancelButtonText: this.$t('global.cancel'),
type: 'warning'
diff --git a/src/views/management/userTraining/index.vue b/src/views/management/userTraining/index.vue
index e7205c416..d0d5af0ee 100644
--- a/src/views/management/userTraining/index.vue
+++ b/src/views/management/userTraining/index.vue
@@ -121,7 +121,7 @@ export default {
// 删除
handleDelete(index, row) {
- this.$confirm(this.$t('system.delExamResultIsContinue'), this.$t('global.tips'), {
+ this.$confirm(this.$t('system.wellDelExamResult'), this.$t('global.tips'), {
confirmButtonText: this.$t('global.confirm'),
cancelButtonText: this.$t('global.cancel'),
type: 'warning'
diff --git a/src/views/publish/productStatus/index.vue b/src/views/publish/productStatus/index.vue
index ba25b2f0d..f48338b78 100644
--- a/src/views/publish/productStatus/index.vue
+++ b/src/views/publish/productStatus/index.vue
@@ -107,7 +107,7 @@ export default {
},
// 删除
handleDelete(index, row) {
- this.$confirm(this.$t('publish.wellDelTypeIsContinue'), this.$t('global.tips'), {
+ this.$confirm(this.$t('publish.wellDelType'), this.$t('global.tips'), {
confirmButtonText: this.$t('global.confirm'),
cancelButtonText: this.$t('global.cancel'),
type: 'warning'
@@ -123,7 +123,7 @@ export default {
},
handlePutaway(index, row) {
- this.$confirm(this.$t('publish.wellPutawayProductIsContinue'), this.$t('global.tips'), {
+ this.$confirm(this.$t('publish.wellPutawayProduct'), this.$t('global.tips'), {
confirmButtonText: this.$t('global.confirm'),
cancelButtonText: this.$t('global.cancel'),
type: 'warning'
@@ -139,7 +139,7 @@ export default {
},
handleSoldOut(index, row) {
- this.$confirm(this.$t('publish.wellSoldOutProductIsContinue'), this.$t('global.tips'), {
+ this.$confirm(this.$t('publish.wellSoldOutProduct'), this.$t('global.tips'), {
confirmButtonText: this.$t('global.confirm'),
cancelButtonText: this.$t('global.cancel'),
type: 'warning'
diff --git a/src/views/publish/publishLesson/index.vue b/src/views/publish/publishLesson/index.vue
index 945aaf0ef..bb60a847d 100644
--- a/src/views/publish/publishLesson/index.vue
+++ b/src/views/publish/publishLesson/index.vue
@@ -119,7 +119,7 @@ export default {
// 删除
handleDelete(index, row) {
- this.$confirm(this.$t('publish.wellDelTypeIsContinue'), this.$t('global.tips'), {
+ this.$confirm(this.$t('publish.wellDelType'), this.$t('global.tips'), {
confirmButtonText: this.$t('global.confirm'),
cancelButtonText: this.$t('global.cancel'),
type: 'warning'
@@ -135,7 +135,7 @@ export default {
}).catch(() => { });
},
handlePutaway(index, row) {
- this.$confirm(this.$t('publish.wellPutawayTrainingIsContinue'), this.$t('global.tips'), {
+ this.$confirm(this.$t('publish.wellPutawayTraining'), this.$t('global.tips'), {
confirmButtonText: this.$t('global.confirm'),
cancelButtonText: this.$t('global.cancel'),
type: 'warning'
@@ -151,7 +151,7 @@ export default {
},
handleSoldOut(index, row) {
- this.$confirm(this.$t('publish.wellSoldOutTrainingIsContinue'), this.$t('global.tips'), {
+ this.$confirm(this.$t('publish.wellSoldOutTraining'), this.$t('global.tips'), {
confirmButtonText: this.$t('global.confirm'),
cancelButtonText: this.$t('global.cancel'),
type: 'warning'
diff --git a/src/views/publish/publishMap/index.vue b/src/views/publish/publishMap/index.vue
index 95b26fada..e1a128266 100644
--- a/src/views/publish/publishMap/index.vue
+++ b/src/views/publish/publishMap/index.vue
@@ -142,7 +142,7 @@ export default {
// 删除
handleDelete(index, row) {
- this.$confirm(this.$t('publish.wellDelTypeIsContinue'), this.$t('global.tips'), {
+ this.$confirm(this.$t('publish.wellDelType'), this.$t('global.tips'), {
confirmButtonText: this.$t('global.confirm'),
cancelButtonText: this.$t('global.cancel'),
type: 'warning'
@@ -163,7 +163,7 @@ export default {
},
handlePutaway(index, row) {
- this.$confirm(this.$t('publish.wellPutawayMapIsContinue'), this.$t('global.tips'), {
+ this.$confirm(this.$t('publish.wellPutawayMap'), this.$t('global.tips'), {
confirmButtonText: this.$t('global.confirm'),
cancelButtonText: this.$t('global.cancel'),
type: 'warning'
@@ -179,7 +179,7 @@ export default {
},
handleSoldOut(index, row) {
- this.$confirm(this.$t('publish.wellSoldOutMapIscontinue'), this.$t('global.tips'), {
+ this.$confirm(this.$t('publish.wellSoldOutMap'), this.$t('global.tips'), {
confirmButtonText: this.$t('global.confirm'),
cancelButtonText: this.$t('global.cancel'),
type: 'warning'
diff --git a/src/views/replay/index.vue b/src/views/replay/index.vue
index 2b50157a3..3a72c14d8 100644
--- a/src/views/replay/index.vue
+++ b/src/views/replay/index.vue
@@ -25,7 +25,7 @@ export default {
queryObject: {
mapName: {
type: 'text',
- label: '地图名称'
+ label: this.$t('global.mapName')
}
}
},
@@ -35,19 +35,19 @@ export default {
indexShow: true,
columns: [
{
- title: '地图名称',
+ title: this.$t('replay.mapName'),
prop: 'mapName'
},
{
- title: '创建人ID',
+ title: this.$t('replay.creatorId'),
prop: 'creatorId'
},
{
- title: '创建时间',
+ title: this.$t('replay.createTime'),
prop: 'createTime'
},
{
- title: '状态',
+ title: this.$t('global.status'),
prop: 'status',
type: 'tag',
columnValue: (row) => { return this.$convertField(row.status, this.EffectiveTypeList, ['value', 'label']); },
@@ -60,17 +60,17 @@ export default {
},
{
type: 'button',
- title: '操作',
+ title: this.$t('global.operate'),
width: '250',
buttons: [
{
- name: '回放',
+ name: this.$t('replay.replay'),
handleClick: this.rePlay,
type: '',
showControl: (row) => { return row.status == '1'; }
},
{
- name: '删除',
+ name: this.$t('global.delete'),
handleClick: this.delete,
type: 'danger',
showControl: (row) => { return this.role; }
@@ -112,17 +112,17 @@ export default {
});
},
delete(index, data) {
- this.$confirm('此操作将删除该回放, 是否继续?', '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
+ this.$confirm(this.$t('replay.wellDelReplay'), this.$t('global.tips'), {
+ confirmButtonText: this.$t('global.confirm'),
+ cancelButtonText: this.$t('global.cancel'),
type: 'warning'
}).then(() => {
delSimulationRecord(data.id).then(response => {
- this.$message.success('删除成功');
+ this.$message.success(this.$t('replay.deleteSuccess'));
this.reloadTable();
}).catch(() => {
this.reloadTable();
- this.$messageBox('删除失败');
+ this.$messageBox(this.$t('error.deleteFailedv'));
});
}).catch(() => { });
}
From 7f2c74181828336ba9320c5442808aeab67662cc Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 20 Aug 2019 17:54:40 +0800
Subject: [PATCH 116/172] =?UTF-8?q?=E5=89=A7=E6=9C=AC=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2=20=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/simulation.js | 5 +--
src/store/modules/scriptRecord.js | 11 +++++++
src/views/scriptManage/category/tree.vue | 1 +
src/views/scriptManage/home.vue | 7 +++++
.../scriptManage/scriptRecord/addAction.vue | 31 +++++++++++++------
.../scriptManage/scriptRecord/getAction.vue | 3 +-
6 files changed, 45 insertions(+), 13 deletions(-)
diff --git a/src/api/simulation.js b/src/api/simulation.js
index 1ec95ce0a..5f334e718 100644
--- a/src/api/simulation.js
+++ b/src/api/simulation.js
@@ -420,10 +420,11 @@ export function getSimulationInfo(group) {
}
/** 获取可用的设备指令*/
-export function getAvailableDeviceCommand() {
+export function getAvailableDeviceCommand(params) {
return request({
url: `/api/simulation/deviceCommand/available`,
- method: 'get'
+ method: 'get',
+ params
});
}
diff --git a/src/store/modules/scriptRecord.js b/src/store/modules/scriptRecord.js
index 3f27a3f44..f15778b3e 100644
--- a/src/store/modules/scriptRecord.js
+++ b/src/store/modules/scriptRecord.js
@@ -6,6 +6,8 @@ const scriptRecord = {
state: {
mapLocation: {}, //地图定位,
simulationPause: true ,
+ scriptId:"",
+
},
getters: {
mapLocation: (state)=>{
@@ -14,6 +16,9 @@ const scriptRecord = {
simulationPause:(state)=>{
return state.simulationPause;
},
+ scriptId: (state)=>{
+ return state.scriptId;
+ },
},
mutations: {
setMapLocation: (state, mapLocation) => {
@@ -22,6 +27,9 @@ const scriptRecord = {
setSimulationPause: (state, simulationPause) => {
state.simulationPause = simulationPause;
},
+ setscriptId: (state, scriptId) => {
+ state.scriptId = scriptId;
+ },
},
actions: {
/**
@@ -33,6 +41,9 @@ const scriptRecord = {
updateSimulationPause: ({ commit }, simulationPause) => {
commit('setSimulationPause', simulationPause);
},
+ updateScriptId: ({ commit }, scriptId) => {
+ commit('setscriptId', scriptId);
+ },
}
};
export default scriptRecord;
\ No newline at end of file
diff --git a/src/views/scriptManage/category/tree.vue b/src/views/scriptManage/category/tree.vue
index c61109954..5e1d51463 100644
--- a/src/views/scriptManage/category/tree.vue
+++ b/src/views/scriptManage/category/tree.vue
@@ -82,6 +82,7 @@ export default {
// debugger;
// this.$store
localStore.set("script_mapId", id);
+ this.$store.dispatch('scriptRecord/updateScriptId',id);
this.getQuestPageList(id);
},
async getQuestPageList(id){
diff --git a/src/views/scriptManage/home.vue b/src/views/scriptManage/home.vue
index fb8e431d8..c8f86e746 100644
--- a/src/views/scriptManage/home.vue
+++ b/src/views/scriptManage/home.vue
@@ -18,6 +18,7 @@
\ No newline at end of file
+
diff --git a/src/views/components/systemTime/index.vue b/src/views/components/systemTime/index.vue
index 0a0cef9d9..a964e1645 100644
--- a/src/views/components/systemTime/index.vue
+++ b/src/views/components/systemTime/index.vue
@@ -1,75 +1,84 @@
-
加载剧本
- 运行图预览
+ 运行图预览
- 提交订单
+ {{ $t('global.submitOrders') }}
- 返回
+ {{ $t('global.back') }}
@@ -69,14 +69,14 @@ export default {
data() {
return {
disabled: true,
- choose: '一月',
+ choose: this.$t('global.january'),
chooseList: [
- { label: '一月', value: 1 },
- { label: '三月', value: 3 },
- { label: '一年', value: 12 },
- { label: '两年', value: 24 },
- { label: '五年', value: 60 },
- { label: '十年', value: 120 }
+ { label: this.$t('global.january'), value: 1 },
+ { label: this.$t('global.march'), value: 3 },
+ { label: this.$t('global.year'), value: 12 },
+ { label: this.$t('global.twoYears'), value: 24 },
+ { label: this.$t('global.fiveYears'), value: 60 },
+ { label: this.$t('global.tenYears'), value: 120 }
],
saleModel: {
goodsId: '',
@@ -94,48 +94,48 @@ export default {
nameTitle() {
if (this.$route.query.permissionType == PermissionType.EXAM ||
this.$route.query.permissionType == PermissionType.LESSON) {
- return '课程名称';
+ return this.$t('global.courseName');
} else if (this.$route.query.permissionType == PermissionType.SCREEN) {
- return '大屏名称';
+ return this.$t('global.screenName');
} else {
- return '产品名称';
+ return this.$t('global.productName');
}
},
priceTitle() {
switch (this.$route.query.permissionType) {
- case PermissionType.LESSON: return '课程单价';
- case PermissionType.EXAM: return '考试单价';
- case PermissionType.SIMULATION: return '仿真单价';
- case PermissionType.SCREEN: return '大屏单价';
+ case PermissionType.LESSON: return this.$t('global.coursePrice');
+ case PermissionType.EXAM: return this.$t('global.testPrice');
+ case PermissionType.SIMULATION: return this.$t('global.simulationPrice');
+ case PermissionType.SCREEN: return this.$t('global.timeUnitPrice');
}
return '';
},
rules() {
return {
'name': [
- { required: true, message: '课程名称不能为空', trigger: 'blur' }
+ { required: true, message: this.$t('rules.courseNameEmpty'), trigger: 'blur' }
],
'months': [
- { required: true, message: '请输入购买月数', trigger: 'blur' },
+ { required: true, message: this.$t('rules.purchaseMonth'), trigger: 'blur' },
{
validator(rule, value, callback) {
if (Number.isInteger(Number(value)) && Number(value) >= 0) {
callback();
} else {
- callback(new Error('请输入有效的购买月数'));
+ callback(new Error(this.$t('tip.purchaseMonth')));
}
},
trigger: 'blur'
}
],
'total': [
- { required: true, message: '请输入权限数量', trigger: 'blur' },
+ { required: true, message: this.$t('rules.accessNumber'), trigger: 'blur' },
{
validator(rule, value, callback) {
if (Number.isInteger(Number(value)) && Number(value) >= 0) {
callback();
} else {
- callback(new Error('请输入有效的权限个数'));
+ callback(new Error(this.$t('tip.permissionsNumber')));
}
},
trigger: 'blur'
@@ -163,7 +163,7 @@ export default {
methods: {
// 选择自定义时长，修改页面控件状态
chooseEvent(label) {
- this.disabled = label !== '自定义';
+ this.disabled = label !== this.$t('global.custom');
this.chooseList.forEach(elem => {
if (label === elem.label) {
this.saleModel.months = elem.value;
@@ -184,7 +184,7 @@ export default {
commitOrder(model).then(response => {
this.$emit('commit', response.data);
}).catch(() => {
- this.$messageBox('提交订单失败');
+ this.$messageBox(this.$t('tip.failedSubmitOrder'));
});
}
});
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/train/create.vue b/src/views/map/mapdraft/mapedit/mapoperate/train/create.vue
index 743f58480..19e0a7dab 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/train/create.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/train/create.vue
@@ -1,23 +1,23 @@
- 创建
- 批量创建
+ {{ $t('map.create') }}
+ {{ $t('map.createBatch') }}
-
+
-
+
-
+
- 添加
- 更新
+ {{ $t('map.add') }}
+ {{ $t('map.updata') }}
- 删除
+ {{ $t('map.deleteObj') }}
@@ -79,14 +79,14 @@ export default {
range.end >= range.beg) {
callback();
} else {
- callback(new Error('请选择有效的区间'));
+ callback(new Error(this.$t('tip.selectValidInterval')));
}
},
trigger: 'blur'
}
],
modelCode: [
- { required: true, message: '请选择车类型', trigger: 'change' }
+ { required: true, message: this.$t('rules.selectTrainType'), trigger: 'change' }
]
};
}
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/train/index.vue b/src/views/map/mapdraft/mapedit/mapoperate/train/index.vue
index 6ea475221..08870ffc6 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/train/index.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/train/index.vue
@@ -62,13 +62,13 @@ export default {
},
rules: {
code: [
- { required: true, message: '请重新选择设备', trigger: 'change' }
+ { required: true, message: this.$t('rules.pleaseReSelectDevice'), trigger: 'change' }
],
groupNumber: [
- { required: true, message: '请输入车组号', trigger: 'blur' }
+ { required: true, message: this.$t('rules.pleaseEnterGroupNumber'), trigger: 'blur' }
],
modelCode: [
- { required: true, message: '请选择车类型', trigger: 'change' }
+ { required: true, message: this.$t('rules.selectTrainType'), trigger: 'change' }
]
},
search: ''
@@ -130,7 +130,7 @@ export default {
if (Object.keys(this.$store.state.map.map || {}).length) {
this.$refs.trainMode.doShow({}, 'ADD');
} else {
- this.$messageBox('请先选择地图');
+ this.$messageBox(this.$t('tip.selectMap'));
}
},
uptTrainMode(code) {
@@ -138,7 +138,7 @@ export default {
if (index >= 0) {
this.$refs.trainMode.doShow(this.trainModelList[index], 'UPT');
} else {
- this.$messageBox('请选择查看的列车模型');
+ this.$messageBox(this.$t('tip.selectTrainType'));
}
},
delTrainMode(code) {
@@ -154,15 +154,15 @@ export default {
const train = this.$store.getters['map/getDeviceByCode'](row.code);
if (train) {
const _that = this;
- this.$confirm('是否确认删除？', '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
+ this.$confirm(this.$t('tip.confirmDeletion'), this.$t('tip.hint'), {
+ confirmButtonText: this.$t('tip.confirm'),
+ cancelButtonText: this.$t('tip.cancel'),
type: 'warning'
}).then(() => {
_that.$emit('delMapModel', train);
_that.deviceSelect();
}).catch(() => {
- _that.$message.info('已取消删除');
+ _that.$message.info(this.$t('tip.cancelledDelete'));
});
}
},
diff --git a/src/views/map/product/draft.vue b/src/views/map/product/draft.vue
deleted file mode 100644
index c1947c450..000000000
--- a/src/views/map/product/draft.vue
+++ /dev/null
@@ -1,318 +0,0 @@
-
-
-
+
-
+
{{ item.name }}
@@ -18,22 +18,22 @@
-
+
-
+
-
+
@@ -50,24 +50,23 @@
- 创建
- 更新
- 删除
+ {{ $t('map.create') }}
+ {{ $t('map.updata') }}
+ {{ $t('map.deleteObj') }}
diff --git a/src/views/lesson/trainingcategory/tree.vue b/src/views/map/product/tree.vue
similarity index 93%
rename from src/views/lesson/trainingcategory/tree.vue
rename to src/views/map/product/tree.vue
index c75099a02..17eca4c9b 100644
--- a/src/views/lesson/trainingcategory/tree.vue
+++ b/src/views/map/product/tree.vue
@@ -1,9 +1,9 @@
{ this.loading = false; });
}).catch(() => {
- this.$messageBox('刷新失败');
+ this.$messageBox(this.$t('tip.refreshFailure'));
this.loading = false;
});
}
diff --git a/src/views/map/runplan/draft/setting.vue b/src/views/map/runplan/draft/setting.vue
index 9a05cfdd1..ae2c131c3 100644
--- a/src/views/map/runplan/draft/setting.vue
+++ b/src/views/map/runplan/draft/setting.vue
@@ -1,69 +1,73 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
\ No newline at end of file
+
diff --git a/src/views/map/runplan/manage/check.vue b/src/views/map/runplan/manage/check.vue
index ca149251b..12dbc355c 100644
--- a/src/views/map/runplan/manage/check.vue
+++ b/src/views/map/runplan/manage/check.vue
@@ -14,8 +14,8 @@
- {{$t('global.confirm')}}
- {{$t('global.cancel')}}
+ {{ $t('global.confirm') }}
+ {{ $t('global.cancel') }}
diff --git a/src/views/map/runplan/manage/create.vue b/src/views/map/runplan/manage/create.vue
index 4f2917a74..c9b4a15d9 100644
--- a/src/views/map/runplan/manage/create.vue
+++ b/src/views/map/runplan/manage/create.vue
@@ -98,11 +98,11 @@
@@ -118,7 +118,9 @@ export default {
props: {
selected: {
type: Object,
- requited: true
+ default: function () {
+ return null;
+ }
}
},
data() {
diff --git a/src/views/map/runplan/manage/import.vue b/src/views/map/runplan/manage/import.vue
index c06ff5e44..644d254c4 100644
--- a/src/views/map/runplan/manage/import.vue
+++ b/src/views/map/runplan/manage/import.vue
@@ -6,8 +6,8 @@
@@ -21,7 +21,9 @@ export default {
props: {
selected: {
type: Object,
- requited: true
+ default: function () {
+ return null;
+ }
}
},
data() {
diff --git a/src/views/map/runplan/manage/list.vue b/src/views/map/runplan/manage/list.vue
index 2b8e7b9c5..4fcc7e31c 100644
--- a/src/views/map/runplan/manage/list.vue
+++ b/src/views/map/runplan/manage/list.vue
@@ -1,7 +1,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{buttonName}}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{buttonName}}
+
+
+
+
diff --git a/src/views/display/scriptRecord/getAction.vue b/src/views/display/scriptRecord/getAction.vue
index 6eaf8aa73..250173c47 100644
--- a/src/views/display/scriptRecord/getAction.vue
+++ b/src/views/display/scriptRecord/getAction.vue
@@ -1,14 +1,14 @@
- 添加对话
+
+
-
\ No newline at end of file
+ reloadTable() {
+ this.queryList.reload();
+ }
+ }
+};
+
diff --git a/src/views/publish/examRule/draft/editRule.vue b/src/views/publish/examRule/draft/editRule.vue
index 085e82cd9..c162c6a4c 100644
--- a/src/views/publish/examRule/draft/editRule.vue
+++ b/src/views/publish/examRule/draft/editRule.vue
@@ -47,8 +47,8 @@
diff --git a/src/views/publish/examRule/draft/examFrom.vue b/src/views/publish/examRule/draft/examFrom.vue
index e338c6f61..151bdd23c 100644
--- a/src/views/publish/examRule/draft/examFrom.vue
+++ b/src/views/publish/examRule/draft/examFrom.vue
@@ -67,9 +67,9 @@
剧本动作
-
@@ -137,10 +137,14 @@
},
create(){
this.reloadTable();
+ this.$nextTick(function(){
+ debugger;
+ var div = this.$refs['elActionScrollbar'].$refs['wrap'];
+ div.scrollTop=this.$refs['elActionScrollbar'].wrap.scrollHeight;
+ });
+
},
modifyAction(row){
- // var div = this.$refs['elActionScrollbar'].$refs['wrap'];
- // div.scrollTop=this.$refs['elActionScrollbar'].wrap.scrollHeight;
this.operateType="modify";
this.buttonName="修改动作"
this.$refs.addBehavior.doShow(row);
@@ -154,6 +158,10 @@
diff --git a/src/views/display/tipScriptRecord.vue b/src/views/display/tipScriptRecord.vue
index 1db46d317..60210617f 100644
--- a/src/views/display/tipScriptRecord.vue
+++ b/src/views/display/tipScriptRecord.vue
@@ -1,32 +1,18 @@
-
+
+
@@ -23,8 +23,8 @@
+
-
-
-
-
-
-
-
- - {{ title }} -
-
-
@@ -64,7 +50,7 @@
},
mounted(){
this.initAutoSaveScript();
- this.shrink();
+ // this.shrink();
},
beforeDestroy() {
this.clearAutoSave();
@@ -122,12 +108,23 @@
});
},
saveScenesStage() {
+
+ let data=Vue.prototype.$jlmap.$options;
+ let group=this.$route.query.group;
+ let dataZoom={scale:data.scaleRate,x:data.offsetX,y:data.offsetY};
saveScriptScenes(this.group).then(resp => {
+ updateMapLocation(group,dataZoom).then(response=>{
+ // this.$message.success('更新定位成功');
+ this.$message.success('保存背景成功');
+ }).catch(error => {
+ this.$messageBox(`更新定位失败: ${error.message}`);
+ });
// this.isSaveStage = false;
- this.$message.success('保存背景成功');
+ // this.$message.success('保存背景成功');
}).catch(error => {
this.$messageBox('保存背景失败!');
})
+
},
saveScenesData() {
this.isSavingScript=true;
@@ -168,14 +165,7 @@
},
saveMaplocation()
{
- let data=Vue.prototype.$jlmap.$options;
- let group=this.$route.query.group;
- let dataZoom={scale:data.scaleRate,x:data.offsetX,y:data.offsetY};
- updateMapLocation(group,dataZoom).then(response=>{
- this.$message.success('更新定位成功');
- }).catch(error => {
- this.$messageBox(`更新定位失败: ${error.message}`);
- });
+
}
}
}
@@ -183,12 +173,14 @@
diff --git a/src/views/display/tipScriptRecord.vue b/src/views/scriptManage/display/tipScriptRecord.vue
similarity index 98%
rename from src/views/display/tipScriptRecord.vue
rename to src/views/scriptManage/display/tipScriptRecord.vue
index 036746b7d..bc59ad248 100644
--- a/src/views/display/tipScriptRecord.vue
+++ b/src/views/scriptManage/display/tipScriptRecord.vue
@@ -15,12 +15,10 @@
-
- 暂停
- 恢复并执行
- {{$t('scriptRecord.saveMaplocation')}}
- 重置剧本
- {{$t('scriptRecord.saveBackground')}}
- {{$t('scriptRecord.saveData')}}
-
-
-
+
-
-
-
-
-
+
+ 暂停
+ 恢复并执行
+
+ 重置剧本
+ {{$t('scriptRecord.saveBackground')}}
+ {{$t('scriptRecord.saveData')}}
+
+
+
+
- 课程名称： {{ lessonName }}
+ {{ $t('publish.lessonName') }}： {{ lessonName }}
@@ -20,11 +20,11 @@
- 上一步
- 下一步
- 修改
- 创建
- 返回
+ {{ this.$t('global.lastStep') }}
+ {{ this.$t('global.lastStep') }}
+ {{ $t('global.update') }}
+ {{ $t('global.create') }}
+ {{ $t('global.back') }}
diff --git a/src/views/publish/examRule/draft/rule.vue b/src/views/publish/examRule/draft/rule.vue
index 161d06b43..d406122ba 100644
--- a/src/views/publish/examRule/draft/rule.vue
+++ b/src/views/publish/examRule/draft/rule.vue
@@ -7,17 +7,17 @@
+
- 修改
- 删除
+ {{ $t('global.edit') }}
+ {{ $t('global.delete') }}
+ 上一步
+ 新增
+
-->
- 课程名称： {{ lessonName }}
+ {{ $t('publish.lessonName') }}： {{ lessonName }}
-
-
+
+
+
\ No newline at end of file
+
diff --git a/src/views/components/systemTime/point.vue b/src/views/components/systemTime/point.vue
index 888730e2e..2be8a63ad 100644
--- a/src/views/components/systemTime/point.vue
+++ b/src/views/components/systemTime/point.vue
@@ -1,38 +1,39 @@
-
-
+
\ No newline at end of file
+
diff --git a/src/views/display/index.vue b/src/views/display/index.vue
index ad44ba7fd..6f468b7d5 100644
--- a/src/views/display/index.vue
+++ b/src/views/display/index.vue
@@ -26,10 +26,10 @@
-
@@ -100,7 +113,7 @@
{
let target=memberVOList.find(elem=>{return elem.id==element.targetId});
let targetName=target.name==undefined?"":" - "+target.name;
- this.actionInfoList.push({id:element.id,detail:""+member.role+memberName+""+" 对 "+""+target.role+targetName+"：",otherInfo:element.reply,row:element,disabled:false});
+ this.actionInfoList.push({id:element.id,isCoversition:true,memberName:member.role+memberName,targetName:target.role+targetName,reply:element.reply,row:element,visible:true});
break;
}
case "Command":
@@ -110,12 +123,12 @@
{
case 'Train_Manual_Route_Blocking_Drive':
{
- this.actionInfoList.push({id:element.id,detail:""+member.role+memberName+"执行指令 ：",otherInfo:deviceCommand.label,row:element,disabled:true});
+ this.actionInfoList.push({id:element.id,isCoversition:false,memberName:member.role+memberName,command:deviceCommand.label,row:element,visible:false});
break;
}
case 'Train_Manual_Limit_Drive':
{
- this.actionInfoList.push({id:element.id,detail:""+member.role+memberName+"执行指令 : ",otherInfo:deviceCommand.label,row:element,disabled:true});
+ this.actionInfoList.push({id:element.id,isCoversition:false,memberName:member.role+memberName,command:deviceCommand.label,row:element,visible:false});
break;
}
default:
@@ -226,4 +239,10 @@
width: 380px;
position: absolute;
}
+ .roleClass{
+ color:#409EFF
+ }
+ .commandStyle{
+ color:#f00;
+ }
From c22d97b94478b9e02c4f1aacbab7212e6ce297e9 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Wed, 21 Aug 2019 13:46:36 +0800
Subject: [PATCH 132/172] =?UTF-8?q?desc:=20=E6=95=99=E5=AD=A6=E7=B3=BB?=
=?UTF-8?q?=E7=BB=9F=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/i18n/langs/en/index.js | 2 +
src/i18n/langs/en/map.js | 7 +
src/i18n/langs/en/teach.js | 19 ++
src/i18n/langs/en/tip.js | 12 +-
src/i18n/langs/zh/global.js | 26 +-
src/i18n/langs/zh/index.js | 2 +
src/i18n/langs/zh/map.js | 7 +
src/i18n/langs/zh/rules.js | 6 +-
src/i18n/langs/zh/teach.js | 19 ++
src/i18n/langs/zh/tip.js | 17 +-
src/router/index.js | 4 +-
src/utils/baseUrl.js | 4 +-
src/views/components/pay/commit.vue | 64 ++--
.../mapedit/mapoperate/train/create.vue | 26 +-
.../mapedit/mapoperate/train/index.vue | 18 +-
src/views/map/product/draft.vue | 318 ------------------
.../trainingcategory => map/product}/edit.vue | 59 ++--
.../product}/index.vue | 1 -
src/views/map/product/list.vue | 154 ---------
.../trainingcategory => map/product}/tree.vue | 6 +-
src/views/map/runplan/draft/setting.vue | 126 +++----
src/views/map/runplan/index.vue | 98 +++---
src/views/map/runplan/manage/check.vue | 4 +-
src/views/map/runplan/manage/create.vue | 12 +-
src/views/map/runplan/manage/import.vue | 8 +-
src/views/map/runplan/manage/list.vue | 2 +-
src/views/map/runplan/manage/publish.vue | 8 +-
src/views/map/skinCode/draft.vue | 10 +-
src/views/map/skinStyle/draft.vue | 8 +-
src/views/map/skinStyle/index.vue | 4 +-
src/views/teach/category/tree.vue | 13 +-
src/views/teach/detail/index.vue | 18 +-
src/views/teach/home.vue | 4 +-
src/views/teach/practical/index.vue | 14 +-
34 files changed, 372 insertions(+), 728 deletions(-)
create mode 100644 src/i18n/langs/en/teach.js
create mode 100644 src/i18n/langs/zh/teach.js
delete mode 100644 src/views/map/product/draft.vue
rename src/views/{lesson/trainingcategory => map/product}/edit.vue (79%)
rename src/views/{lesson/trainingcategory => map/product}/index.vue (91%)
delete mode 100644 src/views/map/product/list.vue
rename src/views/{lesson/trainingcategory => map/product}/tree.vue (93%)
diff --git a/src/i18n/langs/en/index.js b/src/i18n/langs/en/index.js
index 604621405..bd7583158 100644
--- a/src/i18n/langs/en/index.js
+++ b/src/i18n/langs/en/index.js
@@ -9,6 +9,7 @@ import scriptRecord from './scriptRecord';
import tip from './tip';
import system from './system';
import orderAuthor from './orderAuthor';
+import teach from './teach';
export default {
...enLocale,
@@ -16,6 +17,7 @@ export default {
global,
router,
lesson,
+ teach,
error,
rules,
scriptRecord,
diff --git a/src/i18n/langs/en/map.js b/src/i18n/langs/en/map.js
index 94037d77d..74318140d 100644
--- a/src/i18n/langs/en/map.js
+++ b/src/i18n/langs/en/map.js
@@ -23,6 +23,7 @@ export default {
layerDisplay: 'The layer display',
viewShows: 'View shows',
contentShows: 'content show',
+ createBatch: 'Create a batch',
save: 'save',
updata: 'update',
@@ -299,6 +300,7 @@ export default {
zzkContent: 'Station control content:',
stationControlZok: 'central',
+ skinStyleColon: 'Skin type:',
skinDesignation: 'SkinName',
skinCoding: 'SkinCoding',
coordinatesOrigin: 'CoordinatesOrigin',
@@ -341,9 +343,13 @@ export default {
productType: 'ProductType',
productCode: 'ProductCode',
productName: 'ProductName',
+ createProductCategories: 'Create product categories',
productDescription: 'ProductDescription',
associateTrainingTypes: 'AssociateTrainingTypes',
createTrainingCategories: 'CreateTrainingCategories',
+ editTraining: 'Edit product categories',
+ productCategories: 'The product category',
+ selectOperation: 'Please select operation',
editTrainingCategories: 'EditTrainingCategories',
linkWidth: 'LinkWidth',
maxLinkWidth: '(Link width is at most 20)',
@@ -380,6 +386,7 @@ export default {
trainCode: 'Train number:',
groupNumber: 'The number of:',
+ groupNumberInterval: 'Group number interval:',
modelCode: 'Car type:',
trainmodelCreate: 'New car type',
diff --git a/src/i18n/langs/en/teach.js b/src/i18n/langs/en/teach.js
new file mode 100644
index 000000000..79e55c94a
--- /dev/null
+++ b/src/i18n/langs/en/teach.js
@@ -0,0 +1,19 @@
+export default {
+ title: 'Urban rail transit teaching system',
+ describe: 'This system is equipped with real business logic and software architecture based on the business and process-driven mode of metro employees and training sites. From the perspective of business process, standard operation, training mode and open principle, it strives to build a practical training and teaching system that best meets user needs and responds to changes quickly.',
+ trainingName: 'Training name:',
+ trainingTime: 'Best time to complete the training:',
+ trainingMaximum: 'Maximum time to complete the training:',
+ trainingInstructions: 'Training instructions:',
+ startTraining: 'Began to practice',
+
+ courseName: 'Course name',
+ courseDescription: 'Course description',
+ courseDetails: 'Course details',
+ free: 'free',
+ permissionsDetails: 'Permissions for details',
+ buy: 'buy',
+ permissionDistribute: 'Permission distribution (class)',
+ authorityTransferred: 'Authority transferred',
+ courseList: 'Course list'
+};
diff --git a/src/i18n/langs/en/tip.js b/src/i18n/langs/en/tip.js
index 7c32a30b0..4ee5e76f1 100644
--- a/src/i18n/langs/en/tip.js
+++ b/src/i18n/langs/en/tip.js
@@ -25,6 +25,8 @@ export default {
selectedSectionEmpty: 'The selected section is empty',
selectedStationEmpty: 'The selected station is empty',
+ enterKeywordsFiltering: 'Enter keywords for filtering',
+
selectMap: 'Please select the map first',
selectTrainType: 'Please select the train model to view',
@@ -63,6 +65,8 @@ export default {
createRoutingFailed: 'Failed to create junction',
pathUpdataSuccessful: 'Road update successful!',
pathUpdataFailed: 'Update traffic failed',
+ productCodeExists: 'The product Code already exists',
+ narrowScope: 'You cannot narrow down the training list you created last time',
failedLoadMap: 'Failed to load map data',
sectionPointsDeficiency: 'Segment coordinates missing',
@@ -89,5 +93,11 @@ export default {
skinDeleteConfirmation: 'This will permanently remove the skin. Do you want to continue?',
skinCodingExist: 'Map skin codes already exist',
underImport: 'UnderImport...',
- deleteTypeHint: 'This action deletes the type. Do you want to continue?'
+ deleteTypeHint: 'This action deletes the type. Do you want to continue?',
+ selectValidInterval: 'Please select a valid interval',
+
+ failedCourse: 'Failed to obtain course information',
+ createSimulationFaild: 'Failed to create simulation',
+ accessCourseNo: 'No access to this course, please go and buy it!'
+
};
diff --git a/src/i18n/langs/zh/global.js b/src/i18n/langs/zh/global.js
index a54e0ebcf..4f99370f0 100644
--- a/src/i18n/langs/zh/global.js
+++ b/src/i18n/langs/zh/global.js
@@ -80,5 +80,29 @@ export default {
trainingNotStart: '{name}的房间未开始',
inputRoomNumber: '请输入房间号',
chooseRoom: '选择房间',
- month: '月'
+ month: '月',
+
+ permissions: '权限',
+ yuanMonth: '元/月',
+ permissionType: '权限类型:',
+ purchaseDuration: '购买时长:',
+ custom: '自定义',
+ permissionNum: '权限数量:',
+ indexA: '个',
+ purchasePrice: '购买总价:',
+ submitOrders: '提交订单',
+
+ january: '一月',
+ march: '三月',
+ year: '一年',
+ twoYears: '两年',
+ fiveYears: '五年',
+ tenYears: '十年',
+ courseName: '课程名称',
+ screenName: '大屏名称',
+ productName: '产品名称',
+ coursePrice: '课程单价',
+ testPrice: '考试单价',
+ simulationPrice: '仿真单价',
+ timeUnitPrice: '大屏单价'
};
diff --git a/src/i18n/langs/zh/index.js b/src/i18n/langs/zh/index.js
index e1f4f0b32..9cc82bf39 100644
--- a/src/i18n/langs/zh/index.js
+++ b/src/i18n/langs/zh/index.js
@@ -9,6 +9,7 @@ import scriptRecord from './scriptRecord';
import tip from './tip';
import system from './system';
import orderAuthor from './orderAuthor';
+import teach from './teach';
export default {
...cnLocale,
@@ -17,6 +18,7 @@ export default {
router,
lesson,
error,
+ teach,
rules,
scriptRecord,
tip,
diff --git a/src/i18n/langs/zh/map.js b/src/i18n/langs/zh/map.js
index 2a712b9c2..335ee4b0f 100644
--- a/src/i18n/langs/zh/map.js
+++ b/src/i18n/langs/zh/map.js
@@ -23,6 +23,7 @@ export default {
layerDisplay: '图层显示',
viewShows: '视图显示',
contentShows: '内容显示',
+ createBatch: '批量创建',
save: '保存',
updata: '更新',
@@ -330,6 +331,7 @@ export default {
trainCode: '列车编号:',
groupNumber: '车组号:',
+ groupNumberInterval: '车组号区间:',
trainNumber: '车组号',
modelCode: '车类型:',
@@ -414,6 +416,7 @@ export default {
startStation: '起始站',
endStation: '终到站',
+ skinStyleColon: '皮肤类型:',
skinDesignation: '皮肤名称',
skinCoding: '皮肤编码',
coordinatesOrigin: '坐标原点',
@@ -456,9 +459,13 @@ export default {
productType: '产品类型',
productCode: '产品编码',
productName: '产品名称',
+ createProductCategories: '创建产品类目',
productDescription: '产品说明',
associateTrainingTypes: '关联实训类型',
createTrainingCategories: '创建实训类目',
+ editTraining: '编辑产品类目',
+ productCategories: '产品类目',
+ selectOperation: '请选择操作',
editTrainingCategories: '编辑实训类目',
linkWidth: 'link宽度',
maxLinkWidth: '(Link宽度最大为20)',
diff --git a/src/i18n/langs/zh/rules.js b/src/i18n/langs/zh/rules.js
index 302f5ee23..7a16ab935 100644
--- a/src/i18n/langs/zh/rules.js
+++ b/src/i18n/langs/zh/rules.js
@@ -210,5 +210,9 @@ export default {
linkWidthInputPrompt: '请输入有效Link宽度',
sectionWidthInput: '请输入区段宽度',
sectionWidthInputPrompt: '请输入有效区段宽度',
- selectShowWatermark: '请选择是否水印'
+ selectShowWatermark: '请选择是否水印',
+
+ courseNameEmpty: '课程名称不能为空',
+ purchaseMonth: '请输入购买月数',
+ accessNumber: '请输入权限数量'
};
diff --git a/src/i18n/langs/zh/teach.js b/src/i18n/langs/zh/teach.js
new file mode 100644
index 000000000..4a148e78d
--- /dev/null
+++ b/src/i18n/langs/zh/teach.js
@@ -0,0 +1,19 @@
+export default {
+ title: '城市轨道交通教学系统',
+ describe: '该系统具备真实的业务逻辑，以地铁员工和培训点为要素的业务和流程驱动方式进行软件架构，从业务流程、标准作业、培训方式及开放原则等角度出发，力求打造最符合用户需求及快速响应变化的实训教学系统。',
+ trainingName: '实训名称：',
+ trainingTime: '完成实训最佳用时：',
+ trainingMaximum: '完成实训最大用时：',
+ trainingInstructions: '实训说明：',
+ startTraining: '开始实训',
+
+ courseName: '课程名称',
+ courseDescription: '课程说明',
+ courseDetails: '课程详情',
+ free: '免费',
+ permissionsDetails: '权限详情',
+ buy: '购买',
+ permissionDistribute: '权限分发(上课)',
+ authorityTransferred: '权限转赠',
+ courseList: '课程列表'
+};
diff --git a/src/i18n/langs/zh/tip.js b/src/i18n/langs/zh/tip.js
index 2a1aec950..2da8511cb 100644
--- a/src/i18n/langs/zh/tip.js
+++ b/src/i18n/langs/zh/tip.js
@@ -8,6 +8,7 @@ export default {
hint: '提示',
cancelledDelete: '已取消删除',
cancelGeneration: '已取消批量生成',
+ refreshFailure: '刷新失败',
updateSuccessfully: '更新成功',
saveSuccessfully: '保存成功',
@@ -25,6 +26,8 @@ export default {
selectedSectionEmpty: '选择的区段为空',
selectedStationEmpty: '选择的车站为空',
+ enterKeywordsFiltering: '输入关键字进行过滤',
+
selectMap: '请先选择地图',
selectTrainType: '请选择查看的列车模型',
@@ -59,6 +62,9 @@ export default {
deleteProductSuccessfully: '删除产品成功',
deleteProductFailed: '删除产品失败',
cannotDeleteProduct: '产品已被使用无法删除',
+ productCodeExists: '产品Code已存在',
+ narrowScope: '不能缩小上次创建的实训列表的范围',
+
pathCreationSuccessful: '创建交路成功！',
createRoutingFailed: '创建交路失败',
pathUpdataSuccessful: '更新交路成功！',
@@ -89,6 +95,15 @@ export default {
skinDeleteConfirmation: '此操作将永久删除该皮肤, 是否继续?',
skinCodingExist: '地图皮肤编码已存在',
underImport: '正在导入中...',
- deleteTypeHint: '此操作将删除该类型, 是否继续？'
+ deleteTypeHint: '此操作将删除该类型, 是否继续？',
+ selectValidInterval: '请选择有效的区间',
+
+ failedCourse: '获取课程信息失败',
+ createSimulationFaild: '创建仿真失败',
+ accessCourseNo: '无此课程权限, 请前往购买！',
+
+ failedSubmitOrder: '提交订单失败',
+ permissionsNumber: '请输入有效的权限个数',
+ purchaseMonth: '请输入有效的购买月数'
};
diff --git a/src/router/index.js b/src/router/index.js
index b2058ee8a..4dca952fb 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -27,8 +27,8 @@ import SkinCodeDraft from '@/views/map/skinCode/draft';
import Mapdraft from '@/views/map/mapdraft/index';
import Mapedit from '@/views/map/mapdraft/mapedit/index';
import Runplan from '@/views/map/runplan/index';
+import MapProduct from '@/views/map/product/index';
import RunplanView from '@/views/map/runplan/chart';
-import Trainingcategory from '@/views/lesson/trainingcategory/index';
import Trainingrecord from '@/views/lesson/trainingrecord/index';
import TrainingrecordManage from '@/views/lesson/trainingrecord/manage/index';
import Taskmanage from '@/views/lesson/taskmanage/list';
@@ -389,7 +389,7 @@ export const asyncRouter = [
},
{
path: 'product',
- component: Trainingcategory,
+ component: MapProduct,
meta: {
i18n: 'router.productEdit'
}
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 4050e7e22..2e575c51e 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -3,9 +3,9 @@ export function getBaseUrl() {
let BASE_API;
if (process.env.NODE_ENV === 'development') {
// BASE_API = 'https://joylink.club/jlcloud';
- // BASE_API = 'https://test.joylink.club/jlcloud';
+ BASE_API = 'https://test.joylink.club/jlcloud';
// BASE_API = 'http://192.168.3.5:9000'; // 袁琪
- BASE_API = 'http://192.168.3.6:9000'; // 旭强
+ // BASE_API = 'http://192.168.3.6:9000'; // 旭强
// BASE_API = 'http://192.168.3.4:9000' // 琰培
} else {
BASE_API = process.env.VUE_APP_BASE_API;
diff --git a/src/views/components/pay/commit.vue b/src/views/components/pay/commit.vue
index 73faf0c9e..5ecb4e1b6 100644
--- a/src/views/components/pay/commit.vue
+++ b/src/views/components/pay/commit.vue
@@ -12,30 +12,30 @@
{{ saleModel.name }}
-
- {{ systemName }}权限
+
+ {{ systemName }}{{ $t('global.permissions') }}
{{ saleModel.price.toFixed(2) }}
- 元/月
+ {{ $t('global.yuanMonth') }}
-
+
-
+
-
+
{{ parseInt(sumPrice) }}
. {{ (sumPrice -
parseInt(sumPrice)).toFixed(2).toString().replace('.0', '').replace(' ', '') }}
@@ -44,9 +44,9 @@
-
+
+ 暂停中
+
+
+
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/src/views/lesson/trainingRule/list.vue b/src/views/lesson/trainingRule/list.vue
index 2ee855950..90092c59d 100644
--- a/src/views/lesson/trainingRule/list.vue
+++ b/src/views/lesson/trainingRule/list.vue
@@ -1,260 +1,258 @@
-
-
-
-
+
+
\ No newline at end of file
+ reloadTable() {
+ this.queryList.reload();
+ }
+ }
+};
+
diff --git a/src/views/lesson/trainingmanage/index.vue b/src/views/lesson/trainingmanage/index.vue
index 1a2cbcce8..736022b3d 100644
--- a/src/views/lesson/trainingmanage/index.vue
+++ b/src/views/lesson/trainingmanage/index.vue
@@ -42,7 +42,7 @@ export default {
queryObject: {
skinCode: {
type: 'select',
- label: '皮肤类型',
+ label: this.$t('lesson.skinType'),
change: this.skinCodeChoose,
config: {
data: []
@@ -58,7 +58,7 @@ export default {
},
type: {
type: 'select',
- label: '实训类型',
+ label: this.$t('lesson.trainingType'),
change: this.typeChoose,
config: {
data: []
@@ -66,7 +66,7 @@ export default {
},
operateType: {
type: 'select',
- label: '操作类型',
+ label: this.$t('lesson.operationType'),
config: {
data: []
}
@@ -80,7 +80,7 @@ export default {
},
name: {
type: 'text',
- label: '实训名称'
+ label: this.$t('lesson.trainingName')
}
}
},
@@ -90,56 +90,56 @@ export default {
indexShow: true,
columns: [
{
- title: '实训名称',
+ title: this.$t('lesson.trainingName'),
prop: 'name'
},
{
- title: '皮肤类型',
+ title: this.$t('lesson.skinType'),
prop: 'skinCode',
type: 'tag',
columnValue: (row) => { return this.$convertField(row.skinCode, this.skinCodeList, ['code', 'name']); },
tagType: (row) => { return ''; }
},
{
- title: '产品',
+ title: this.$t('lesson.product'),
prop: 'prdCode',
type: 'tag',
columnValue: (row) => { return this.$convertField(row.prdCode, this.prdTypeList, ['code', 'name']); },
tagType: (row) => { return 'success'; }
},
{
- title: '实训类型',
+ title: this.$t('lesson.trainingType'),
prop: 'type',
type: 'tag',
columnValue: (row) => { return this.$convertField(row.type, this.trainingTypeList, ['code', 'name']); },
tagType: (row) => { return 'success'; }
},
{
- title: '操作类型',
+ title: this.$t('lesson.operationType'),
prop: 'operateType',
type: 'tag',
columnValue: (row) => { return this.$convertField(row.operateType, this.trainingOperateTypeMap[row.type], ['code', 'name']); },
tagType: (row) => { return 'success'; }
},
{
- title: '最小用时',
+ title: this.$t('lesson.minDuration'),
prop: 'minDuration'
},
{
- title: '最大用时',
+ title: this.$t('lesson.maxDuration'),
prop: 'maxDuration'
},
{
- title: '描述',
+ title: this.$t('lesson.remarks'),
prop: 'remarks'
},
{
type: 'button',
- title: '操作',
+ title: this.$t('global.operate'),
width: '250',
buttons: [
{
- name: '演示',
+ name: this.$t('lesson.demonstration'),
handleClick: this.demoDisplay,
type: ''
}
diff --git a/src/views/publish/examRule/index.vue b/src/views/publish/examRule/index.vue
index 215dc4ab3..8b46f4397 100644
--- a/src/views/publish/examRule/index.vue
+++ b/src/views/publish/examRule/index.vue
@@ -133,7 +133,7 @@ export default {
{
type: 'button',
title: this.$t('global.operate'),
- width: '300',
+ width: '380',
buttons: [
{
name: this.$t('global.fastCreate'),
From 300ed723654b5dc8ad4d1f23d12da1afa3987fe3 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Wed, 21 Aug 2019 12:03:01 +0800
Subject: [PATCH 131/172] =?UTF-8?q?=E6=8C=87=E4=BB=A4=E6=96=87=E5=AD=97?=
=?UTF-8?q?=E4=B8=BA=E7=BA=A2=E8=89=B2=EF=BC=8C=E9=9A=90=E8=97=8F=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9=E6=8C=89=E9=92=AE=20=E6=8C=87=E4=BB=A4=E5=92=8C?=
=?UTF-8?q?=E5=AF=B9=E8=AF=9D=E6=B7=BB=E5=8A=A0=E5=90=8E=E5=8E=9F=E5=86=85?=
=?UTF-8?q?=E5=AE=B9=E4=B8=8D=E6=B8=85=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../scriptManage/display/tipScriptRecord.vue | 4 ---
.../scriptManage/scriptRecord/addAction.vue | 11 +++++--
.../scriptManage/scriptRecord/getAction.vue | 29 +++++++++++++++----
3 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/src/views/scriptManage/display/tipScriptRecord.vue b/src/views/scriptManage/display/tipScriptRecord.vue
index 68e98ff9f..cd151c8e7 100644
--- a/src/views/scriptManage/display/tipScriptRecord.vue
+++ b/src/views/scriptManage/display/tipScriptRecord.vue
@@ -162,10 +162,6 @@ import {saveScriptScenes, saveScriptData, dumpScriptData, updateMapLocation, scr
this.initAutoSaveScript();
})
},
- saveMaplocation()
- {
-
- }
}
}
diff --git a/src/views/scriptManage/scriptRecord/addAction.vue b/src/views/scriptManage/scriptRecord/addAction.vue
index f89f477ce..b78b1e19a 100644
--- a/src/views/scriptManage/scriptRecord/addAction.vue
+++ b/src/views/scriptManage/scriptRecord/addAction.vue
@@ -98,6 +98,11 @@
this.$parent.$parent.$parent.setIsParse(this.isPause);
this.$refs['modalData'].clearValidate();
this.$refs['commandData'].clearValidate();
+ if(!val)
+ {
+ this.initActionData();
+ this.initCommandActionData();
+ }
},
},
data() {
@@ -219,7 +224,7 @@
this.adding=false;
this.$message.success('添加指令成功');
this.$emit('create',true);
- this.initCommandActionData();
+ // this.initCommandActionData();
}).catch(error => {
this.adding=false;
this.$messageBox(`添加指令失败: ${error.message}`);
@@ -245,7 +250,7 @@
this.modifying=false;
this.$message.success('添加对话成功');
this.$emit('create',true);
- this.initActionData();
+ // this.initActionData();
}).catch(error => {
this.modifying=false;
this.$messageBox(`添加对话失败: ${error.message}`);
@@ -261,7 +266,7 @@
this.$emit('modifyButtonName');
this.$message.success('修改对话成功');
this.$emit('create',false);
- this.initActionData();
+ // this.initActionData();
}).catch(error => {
this.modifying=false;
this.$messageBox(`修改对话失败: ${error.message}`);
diff --git a/src/views/scriptManage/scriptRecord/getAction.vue b/src/views/scriptManage/scriptRecord/getAction.vue
index 6723be95e..f8fab3f14 100644
--- a/src/views/scriptManage/scriptRecord/getAction.vue
+++ b/src/views/scriptManage/scriptRecord/getAction.vue
@@ -14,12 +14,25 @@
+
- {{actionInfo.otherInfo}}
+
+
+ {{actionInfo.memberName}}
+ 对
+ {{actionInfo.targetName}}
+ :
+ {{actionInfo.reply}}
+
+
+ {{actionInfo.memberName}}
+ 执行指令:
+ {{actionInfo.command}}
+
- 修改
+ 修改
-
-
-
-
-
diff --git a/src/views/lesson/trainingcategory/edit.vue b/src/views/map/product/edit.vue
similarity index 79%
rename from src/views/lesson/trainingcategory/edit.vue
rename to src/views/map/product/edit.vue
index ce5c9e5ae..8fb1913de 100644
--- a/src/views/lesson/trainingcategory/edit.vue
+++ b/src/views/map/product/edit.vue
@@ -7,10 +7,10 @@
-
-
-
-
-
-
-
-
-
-
- {{ item.name }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{$t('global.create')}}
- {{$t('global.update')}}
- {{$t('global.delete')}}
-
-
-
- 产品类目
+ {{ $t('map.productCategories') }}
-
- {{$t('map.mapList')}}
+ {{ $t('map.mapList') }}
- 课程列表
-
+ {{ $t('teach.courseList') }}
- 课程名称： {{ courseModel.name }}
+ {{ $t('teach.courseName') }}: {{ courseModel.name }}
-
-
+
@@ -20,7 +20,7 @@
-
+
- 城市轨道交通教学系统
+ {{ $t('teach.title') }}
课程说明: +
{{ $t('teach.courseDescription') }}: {{ courseModel.remarks }}
- {{ it.name }} - (免费) + ({{ $t('teach.free') }})
- 购买
- 权限分发(上课)
- 权限转赠
+ {{ $t('teach.buy') }}
+ {{ $t('teach.permissionDistribute') }}
+ {{ $t('teach.authorityTransferred') }}
@@ -117,7 +117,7 @@ export default {
PermissionType: PermissionType.LESSON
};
}).catch(error => {
- this.$message.error('获取课程信息失败:' + error.message);
+ this.$message.error(this.$t('tip.failedCourse') + ':' + error.message);
});
}
},
diff --git a/src/views/teach/home.vue b/src/views/teach/home.vue
index 9b998db86..2adefc704 100644
--- a/src/views/teach/home.vue
+++ b/src/views/teach/home.vue
@@ -3,7 +3,7 @@
- 城市轨道交通教学系统
+ {{ $t('teach.title') }}
![]()
@@ -14,7 +14,7 @@
- 该系统具备真实的业务逻辑，以地铁员工和培训点为要素的业务和流程驱动方式进行软件架构，从业务流程、标准作业、培训方式及开放原则等角度出发，力求打造最符合用户需求及快速响应变化的实训教学系统。
+ {{ $t('teach.describe') }}
- 实训名称： {{ courseModel.name }}
+ {{ $t('teach.trainingName') }} {{ courseModel.name }}
- 完成实训最佳用时： + {{ $t('teach.trainingTime') }} {{ courseModel.minDuration | setTime }} 秒
- 完成实训最大用时： + {{ $t('teach.trainingMaximum') }} {{ courseModel.maxDuration | setTime }} 秒
- 实训说明： + {{ $t('teach.trainingInstructions') }} {{ courseModel.remarks }}
- 开始实训
+ {{ $t('teach.startTraining') }}
-
- 公用权限
- 专用权限
-
-
-
-
+
+ {{ $t('global.publishPermission') }}
+ {{ $t('global.specialPermission') }}
+
+
+
+
- 仿真名称： {{ courseModel.name }}
- 无仿真产品
+ {{ $t('demonstration.simulationName') + courseModel.name }}
+ {{$t('demonstration.noSimulationProducts')}}
- 产品说明： + {{$t('demonstration.productDescription')}} {{ courseModel.remarks }}
- 权限列表： + {{$t('global.permissionList')}}
- 购买
- 权限分发
- 权限转赠
- 开始仿真
- 创建房间
- 进入房间
+ {{$t('global.buy')}}
+ {{$t('global.distributePermission')}}
+ {{$t('global.transferQRCode')}}
+ {{$t('demonstration.startSimulation')}}
+ {{$t('demonstration.createRoom')}}
+ {{$t('demonstration.enterRoom')}}
- 城市轨道交通仿真系统
+ {{$t('demonstration.simulationSystem')}}
![]()
@@ -13,8 +13,7 @@
- 城市轨道交通仿真系统以各地铁信号系统为基础，针对培训部分进行改造，旨在构建一套用于行车演示的专业仿真模拟系统。
- 该系统具有高灵活性以便于将来的扩展升级，同时，仿真系统具备正常操作及故障操作两种模式，除了正常的功能操作以外还可以进行设备的故障模拟。
+ {{$t('demonstration.simulationSystemDescription')}}
- 地图列表
+ {{$t('global.mapList')}}
- {{ $t('planMonitor.line')+courseModel.name }}
+ {{ $t('global.line')+courseModel.name }}
- {{ $t('planMonitor.turnoverTime') }} + {{ $t('global.updateTime') }} {{ courseModel.updateTime }}
- {{ $t('planMonitor.permissionList') }} + {{ $t('global.permissionList') }}
@@ -40,16 +40,6 @@ export default {
LimitList
},
filters: {
- setTime(val) {
- if (val <= 1) {
- return `0`+this.$t('global.minute');
- } else if (val > 1 && val <= 60) {
- return '1'+this.$t('global.minute');
- } else if (val > 60) {
- const time = parseInt(val / 60);
- return time+this.$t('global.minutes');
- }
- }
},
mixins: [
WindowResizeHandler
diff --git a/src/views/planMonitor/planmanage/planList.vue b/src/views/planMonitor/planmanage/planList.vue
index 122f4f982..9aa7b8518 100644
--- a/src/views/planMonitor/planmanage/planList.vue
+++ b/src/views/planMonitor/planmanage/planList.vue
@@ -1,7 +1,7 @@
- 更新时间：
+ {{ $t('global.updateTime') }}
{{ courseModel.updateTime }}
- 产品试用时长：
- {{ tryTime | setTime }}
+ {{ $t('screenMonitor.productTrialDuration') }}
+ {{ showTryTime }}
- 权限列表：
+ {{ $t('global.permissionList') }}
-
- {{ $t('planMonitor.mapList') }}
+ {{ $t('global.mapList') }}
- 线路： {{ courseModel.name }}
+ {{$t('global.line') + courseModel.name }}
- 城市轨道交通大屏系统
+ {{$t('screenMonitor.screenSystem')}}
@@ -13,7 +13,7 @@
- 城市轨道交通大屏系统以各地铁信号系统及真实地铁线路数据为基础，旨在构建一套行车演示的专业模拟系统。 该系统具有高灵活性可自由切换线路数据。
+ {{$t('screenMonitor.screenSystemDescription')}}
- 地图列表
+ {{$t('global.mapList')}}
添加对话
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
@@ -46,7 +57,8 @@
\ No newline at end of file
+
diff --git a/src/views/lesson/lessoncategory/category/tree.vue b/src/views/lesson/lessoncategory/category/tree.vue
index fc5b626ec..7836e17b4 100644
--- a/src/views/lesson/lessoncategory/category/tree.vue
+++ b/src/views/lesson/lessoncategory/category/tree.vue
@@ -1,10 +1,10 @@
-
-
-
-
-
-
-
-
+
-
-
-
-
-
- {{actionInfo.memberName}}
- 对
- {{actionInfo.targetName}}
- :
- {{actionInfo.reply}}
-
-
- {{actionInfo.memberName}}
- 执行指令:
- {{actionInfo.command}}
-
-
-
- 修改
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{actionInfo.memberName}}
+ 对
+ {{actionInfo.targetName}}
+ :
+ {{actionInfo.reply}}
+
+
+ {{actionInfo.memberName}}
+ 执行指令:
+ {{actionInfo.command}}
+
+
+
+ 修改
+
+
+
- 课程列表
- 从发布课程新建
+ {{$t('lesson.courseList')}}
+ {{$t('lesson.createNewCoursesFromRelease')}}
-
-
+
+
+ {{ view.name }}
+
+
+
+
+
+ {{ view.name }}
+
+
+
+
+
+
+
+
diff --git a/src/views/scriptManage/scriptRecord/addRole.vue b/src/views/scriptManage/scriptRecord/addRole.vue
index 6f77acacb..4348ed133 100644
--- a/src/views/scriptManage/scriptRecord/addRole.vue
+++ b/src/views/scriptManage/scriptRecord/addRole.vue
@@ -1,6 +1,5 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/src/views/scriptManage/scriptmanage/list.vue b/src/views/scriptManage/scriptmanage/list.vue
deleted file mode 100644
index a9013736c..000000000
--- a/src/views/scriptManage/scriptmanage/list.vue
+++ /dev/null
@@ -1,173 +0,0 @@
-
- 返回
@@ -168,8 +168,8 @@
v-if="userId == roomInfo.creatorId"
type="danger"
style="float: right; margin-right: 0px;"
- @click="exit"
:loading="loading"
+ @click="exit"
>销毁房间
@@ -263,7 +263,7 @@ export default {
starting: false,
mapId: '',
num: 0,
- loading: false
+ loading: false
};
},
watch: {
@@ -372,7 +372,7 @@ export default {
},
async joinJointTrain() {
// launchFullscreen();
- this.loading = true;
+ this.loading = true;
await putJointTrainingSimulationEntrance(this.$route.query.group);
const rest = await getPublishMapInfo(this.mapId);
const query = { skinCode: rest.data.skinCode, mapId: this.mapId, group: this.$route.query.group };
@@ -553,11 +553,11 @@ export default {
this.$refs.qrCode.doShow(param);
}
}
- this.loading = false;
+ this.loading = false;
},
async start() {
let flag = true;
- this.loading = true;
+ this.loading = true;
this.equipmentList.forEach(item => {
if (!item.deviceCode) {
flag = false;
@@ -567,14 +567,14 @@ export default {
if (flag) {
try {
await startJointTraining(this.$route.query.group);
- this.loading = false;
+ this.loading = false;
} catch (error) {
this.messageInfo('开始综合演练失败。', 'error');
- this.loading = false;
+ this.loading = false;
}
} else {
this.messageInfo('车站值班员所属车站不能为空', 'error');
- this.loading = false;
+ this.loading = false;
}
},
async stop() {
From b9b2fd5b77e23dd799c187c1a5ccc39f47b934d4 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Fri, 23 Aug 2019 18:40:02 +0800
Subject: [PATCH 162/172] =?UTF-8?q?desc:=20=E8=B0=83=E6=95=B4=E5=9C=B0?=
=?UTF-8?q?=E5=9B=BE=E7=BB=98=E5=88=B6=E6=95=B0=E6=8D=AE=E9=80=BB=E8=BE=91?=
=?UTF-8?q?=EF=BC=8C=20=E6=96=B0=E5=A2=9E=E5=8F=91=E5=B8=83=E5=8E=86?=
=?UTF-8?q?=E5=8F=B2=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/jmap/map.js | 9 +
src/i18n/langs/zh/map.js | 4 +-
src/jmap/config/skinCode/bejing_01.js | 1 +
src/jmap/config/skinCode/chengdu_03.js | 1 +
src/jmap/config/skinCode/chengdu_04.js | 1 +
src/jmap/config/skinCode/fuzhou_01.js | 3 +-
src/jmap/shape/Station/index.js | 18 +-
src/router/index.js | 6 +
src/scripts/attribute.js | 449 ------------------
src/scripts/translate.js | 8 +-
.../mapedit/mapoperate/ImageControl.vue | 6 -
.../mapdraft/mapedit/mapoperate/counter.vue | 9 +-
.../mapedit/mapoperate/delayunlock.vue | 6 -
.../mapdraft/mapedit/mapoperate/lcControl.vue | 6 -
.../mapedit/mapoperate/limitControl.vue | 6 -
.../map/mapdraft/mapedit/mapoperate/line.vue | 7 -
.../map/mapdraft/mapedit/mapoperate/link.vue | 6 -
.../mapdraft/mapedit/mapoperate/section.vue | 94 ++--
.../mapdraft/mapedit/mapoperate/signal.vue | 9 +-
.../mapdraft/mapedit/mapoperate/station.vue | 16 +-
.../mapedit/mapoperate/stationcontrol.vue | 12 +-
.../mapedit/mapoperate/stationstand.vue | 9 +-
.../mapdraft/mapedit/mapoperate/switch.vue | 10 +-
.../map/mapdraft/mapedit/mapoperate/text.vue | 10 +-
.../mapedit/mapoperate/trainwindow.vue | 8 +-
.../mapdraft/mapedit/mapoperate/zcControl.vue | 9 +-
src/views/publish/publishMap/index.vue | 29 +-
src/views/publish/publishMap/list.vue | 96 ++++
28 files changed, 208 insertions(+), 640 deletions(-)
delete mode 100644 src/scripts/attribute.js
create mode 100644 src/views/publish/publishMap/list.vue
diff --git a/src/api/jmap/map.js b/src/api/jmap/map.js
index 66deec6b6..e4d7a29dc 100644
--- a/src/api/jmap/map.js
+++ b/src/api/jmap/map.js
@@ -113,3 +113,12 @@ export function updatePublishMapName(data) {
data: data
});
}
+
+/** 修改发布地图名称*/
+export function getPublishMapDetailList(params, code) {
+ return request({
+ url: `/api/map/${code}/versions`,
+ method: 'get',
+ params: params
+ });
+}
diff --git a/src/i18n/langs/zh/map.js b/src/i18n/langs/zh/map.js
index 45662f0f7..d831c3238 100644
--- a/src/i18n/langs/zh/map.js
+++ b/src/i18n/langs/zh/map.js
@@ -286,9 +286,9 @@ export default {
signalGuidePositionY: '引导信号y:',
signalGuidePosition: '引导信号:',
- concentrateStationCode: '所属联锁站编码:',
+ concentrateStationCode: '所属联锁站:',
stationCode: '车站编码:',
- zcCode: '所属zc区域编码:',
+ zcCode: '所属zc区域:',
centralized: '是否集中站:',
stationRunPlanName: '真实名称:',
stationVisible: '是否显示:',
diff --git a/src/jmap/config/skinCode/bejing_01.js b/src/jmap/config/skinCode/bejing_01.js
index d7433e709..d60250e8e 100644
--- a/src/jmap/config/skinCode/bejing_01.js
+++ b/src/jmap/config/skinCode/bejing_01.js
@@ -307,6 +307,7 @@ class SkinCode extends defaultStyle {
text: {
show: true // 公里标名称显示
},
+ kmPostShow: true, // 公里标显示
kilometerPosition: 'down', // 公里标位置
fontWeight: 'bold' // 文字错细
};
diff --git a/src/jmap/config/skinCode/chengdu_03.js b/src/jmap/config/skinCode/chengdu_03.js
index fc928d348..f7727888d 100644
--- a/src/jmap/config/skinCode/chengdu_03.js
+++ b/src/jmap/config/skinCode/chengdu_03.js
@@ -303,6 +303,7 @@ class SkinCode extends defaultStyle {
text: {
show: true // 公里标名称显示
},
+ kmPostShow: false, // 公里标显示
kilometerPosition: 'up' // 公里标朝向
};
diff --git a/src/jmap/config/skinCode/chengdu_04.js b/src/jmap/config/skinCode/chengdu_04.js
index 3123902d8..418fefd30 100644
--- a/src/jmap/config/skinCode/chengdu_04.js
+++ b/src/jmap/config/skinCode/chengdu_04.js
@@ -300,6 +300,7 @@ class SkinCode extends defaultStyle {
text: {
show: true // 公里标名称显示
},
+ kmPostShow: false, // 公里标显示
kilometerPosition: 'up' // 公里标朝向
};
diff --git a/src/jmap/config/skinCode/fuzhou_01.js b/src/jmap/config/skinCode/fuzhou_01.js
index 6d576f3c8..2cebd978b 100644
--- a/src/jmap/config/skinCode/fuzhou_01.js
+++ b/src/jmap/config/skinCode/fuzhou_01.js
@@ -282,7 +282,8 @@ class SkinCode extends defaultStyle {
text: {
show: true // 公里标名称显示
},
- kilometerPosition: 'up' // 公里标朝向
+ kmPostShow: true, // 公里标显示
+ kilometerPosition: 'up' // 公里标朝向
};
this[deviceType.Switch] = {
diff --git a/src/jmap/shape/Station/index.js b/src/jmap/shape/Station/index.js
index cfd8c5562..642962ef8 100644
--- a/src/jmap/shape/Station/index.js
+++ b/src/jmap/shape/Station/index.js
@@ -22,6 +22,7 @@ export default class Station extends Group {
const style = this.style;
if (style.Station.text.show) {
+ // 公里标名称是否显示
this.stationText = new ETextName({
zlevel: this.zlevel,
z: this.z,
@@ -36,6 +37,11 @@ export default class Station extends Group {
textVerticalAlign: 'top',
textFill: model.nameFontColor
});
+ this.add(this.stationText);
+ }
+
+ if (style.Station.kmPostShow) {
+ // 公里标是否显示
let direction = 1;
if (this.style.Station.kilometerPosition == 'up') {
direction = -1;
@@ -54,19 +60,7 @@ export default class Station extends Group {
textVerticalAlign: 'top',
textFill: model.kmPostFontColor
});
-
- this.add(this.stationText);
this.add(this.mileageText);
- this.setShowMileageText(model.kmPostShow);
- }
- }
-
- /** 设置公里标是否显示*/
- setShowMileageText(show) {
- if (show) {
- this.mileageText.show();
- } else {
- this.mileageText.hide();
}
}
diff --git a/src/router/index.js b/src/router/index.js
index 4dca952fb..418079668 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -76,6 +76,7 @@ import PackageDraft from '@/views/package/draft/ruleForm';
import PublishMap from '@/views/publish/publishMap/index';
import PublishMapDraft from '@/views/publish/publishMap/draft';
+import PublishMapDetail from '@/views/publish/publishMap/list';
import RunPlanCommon from '@/views/publish/runPlanCommon/index';
import RunPlanCommonDraft from '@/views/publish/runPlanCommon/draft';
import RunPlanTemplate from '@/views/publish/runPlanTemplate/index';
@@ -746,6 +747,11 @@ export const asyncRouter = [
i18n: 'router.publishMapManage'
}
},
+ {
+ path: 'map/detail',
+ hidden: true,
+ component: PublishMapDetail
+ },
{
path: 'product',
component: ProductStatus,
diff --git a/src/scripts/attribute.js b/src/scripts/attribute.js
deleted file mode 100644
index 8b49b48f8..000000000
--- a/src/scripts/attribute.js
+++ /dev/null
@@ -1,449 +0,0 @@
-export function getAttrList(code, key, that) {
- attribute[code][key].items.forEach(ele => {
- if (ele.type == 'select') {
- ele.options = that[ele.optionCode];
- }
- if (ele.change && that[ele.deviceChange]) {
- ele.deviceChange = that[ele.deviceChange];
- }
- if (ele.isDisabled) {
- ele.disabled = that[ele.isDisabled];
- }
- if (ele.hiddenName) {
- ele.isHidden = !that[ele.hiddenName];
- }
- if (ele.isButtonType) {
- ele.buttonShowType = that[ele.isButtonType];
- }
- if (ele.buttonType) {
- ele.hover = that.hover;
- }
- if (ele.pointDisabledName) {
- ele.pointDisabled = that[ele.pointDisabledName];
- }
- if (ele.addPointChange) {
- ele.addPoint = that[ele.addPointChange];
- }
- if (ele.delPointChange) {
- ele.delPoint = that[ele.delPointChange];
- }
- });
- return Object.assign({}, attribute[code][key]);
-}
-
-export function getAttrRules(code, key) {
- return Object.assign({}, attribute[code][key]);
-}
-
-export const attribute = {
- /*
- * select optionCode 表示 循环列表名称
- * select 有点change事件 deviceChange 表示事件名称
- * 有判断 显隐问题 使用 hiddenName 表示判断属性名称
- * 有判断 是否禁用 使用 isDisabled 表示判断属性名称
- */
- link: {
- attr: {
- labelWidth: '130px',
- items: [
- { prop: 'code', label: 'Link编码:', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: [], optionCode: 'linkList', change: true, deviceChange: 'deviceChange' },
- { prop: 'name', label: 'Link名称:', type: 'input' },
- { prop: 'lengthShow', label: 'Link显示长度:', type: 'number', min: 50, placeholder: 'px' },
- { prop: 'lengthFact', label: 'Link实际长度:', type: 'number', min: 0, placeholder: '米' },
- { prop: 'color', label: 'Link颜色:', type: 'color' },
- { prop: 'leftFdCode', label: '左侧正向Link:', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: [], optionCode: 'linkList' },
- { prop: 'leftSdCode', label: '左侧侧向Link:', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: [], optionCode: 'linkList' },
- { prop: 'rightFdCode', label: '右侧正向Link:', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: [], optionCode: 'linkList' },
- { prop: 'rightSdCode', label: '右侧侧向Link:', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: [], optionCode: 'linkList' },
- { prop: 'lp', label: 'Link 起点坐标:', type: 'coordinate', width: '160px', children: [
- { prop: 'lp.x', firstLevel: 'lp', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '20px', disabled: true },
- { prop: 'lp.y', firstLevel: 'lp', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '20px', disabled: true }
- ] },
- { prop: 'rp', label: 'Link 终点坐标:', type: 'coordinate', width: '160px', children: [
- { prop: 'rp.x', firstLevel: 'rp', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '20px', disabled: true },
- { prop: 'rp.y', firstLevel: 'rp', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '20px', disabled: true }
- ] }
- ],
- rules: {
- code: [
- { required: true, message: '请选择设备', trigger: 'change' }
- ],
- name: [
- { required: true, message: '请输入Link名称', trigger: 'blur' }
- ],
- lengthFact: [
- { required: true, message: '请输入Link实际长度', trigger: 'blur' }
- ]
- }
- }
- },
- section: {
- attr: {
- labelWidth: '160px',
- items: [
- { prop: 'stationCode', label: '所属设备集中站:', type: 'select', optionLabel: 'name&&code', optionValue: 'code', disabled: false, options: [], optionCode: 'stationList', isDisabled: 'isStationCodeDisabled'},
- { prop: 'parentCode', label: '关联物理区段:', type: 'select', optionLabel: 'code&&name', optionValue: 'code', disabled: true, options: [], optionCode: 'sectionList', isHidden: true, hiddenName: 'isParentCode' },
- { prop: 'code', label: '区段编码:', type: 'select', optionLabel: 'code&&name', optionValue: 'code', options: [], optionCode: 'sectionList', change: true, deviceChange: 'deviceChange' },
- { prop: 'type', label: '区段类型:', type: 'select', optionLabel: 'name', optionValue: 'code', options: [], optionCode: 'SectionTypeList' },
- { prop: 'name', label: '区段名称:', type: 'input' },
- { prop: 'namePoint', label: '区段名称偏移量:', type: 'coordinate', width: '160px', children: [
- { prop: 'namePoint.x', firstLevel: 'namePoint', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '20px' },
- { prop: 'namePoint.y', firstLevel: 'namePoint', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '20px' }
- ] },
- { prop: 'kmRangeLeft', label: '左侧公里标(米):', type: 'number', min: 0, placeholder: '' },
- { prop: 'kmRangeRight', label: '右侧公里标(米):', type: 'number', min: 0, placeholder: '' },
- { prop: 'region', label: '区间:', type: 'select', optionLabel: 'label', optionValue: 'value', options: [], optionCode: 'regionList' },
- { prop: 'nameShow', label: '是否显示区段名称:', type: 'checkbox', isHidden: true, hiddenName: 'isSectionType' },
- { prop: 'axleShow', label: '是否显示计轴:', type: 'checkbox', disabled: false, isHidden: true, hiddenName: 'isSectionType', isDisabled: 'isStationAxleShow' },
- { prop: 'logicSectionShow', label: '是否显示逻辑区段:', type: 'checkbox', isHidden: true, hiddenName: 'isSectionType' },
- { prop: 'logicSectionNameShow', label: '是否显示逻辑区段名称:', type: 'checkbox', disabled: false, isHidden: true, hiddenName: 'isSectionType', isDisabled: 'islogicSectionNameShow' },
- { prop: 'isStandTrack', label: '是否站台轨:', type: 'checkbox', isHidden: true, hiddenName: 'isSectionType' },
- { prop: 'standTrackName', label: '站台轨名称:', type: 'input', isHidden: true, hiddenName: 'isstandTrackNameShow' },
- { prop: 'standTrackNamePosition', label: '站台轨名称偏移量:', type: 'coordinate', isHidden: true, hiddenName: 'isstandTrackNameShow', children: [
- { prop: 'standTrackNamePosition.x', firstLevel: 'standTrackNamePosition', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '20px', disabled: true },
- { prop: 'standTrackNamePosition.y', firstLevel: 'standTrackNamePosition', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '20px', disabled: true }
- ] },
- { prop: 'relStandCode', label: '站台编码:', type: 'selectHover', optionLabel: 'code&&name', optionValue: 'code', options: [], optionCode: 'stationStandList', buttonType: 'relStandCode', hover: 'hover', isButtonType: 'isButtonType', buttonShowType: false, isHidden: true, hiddenName: 'isrelStandCode' },
- { prop: 'isReentryTrack', label: '是否折返轨:', type: 'checkbox', isHidden: true, hiddenName: 'isSectionType' },
- { prop: 'reentryTrackName', label: '折返轨名称:', type: 'input', isHidden: true, hiddenName: 'isreentryTrackName' },
- { prop: 'reentryTrackNamePosition', label: '折返轨名称偏移量:', type: 'coordinate', isHidden: true, hiddenName: 'isreentryTrackName', children: [
- { prop: 'reentryTrackNamePosition.x', firstLevel: 'reentryTrackNamePosition', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '20px', disabled: true },
- { prop: 'reentryTrackNamePosition.y', firstLevel: 'reentryTrackNamePosition', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '20px', disabled: true }
- ] },
- { prop: 'isTransferTrack', label: '是否转换轨:', type: 'checkbox', isHidden: true, hiddenName: 'isSectionType' },
- { prop: 'transferTrackName', label: '转换轨名称:', type: 'input', isHidden: true, hiddenName: 'istransferTrackName' },
- { prop: 'transferTrackNamePosition', label: '转换轨名称偏移量:', type: 'coordinate', isHidden: true, hiddenName: 'istransferTrackName', children: [
- { prop: 'transferTrackNamePosition.x', firstLevel: 'transferTrackNamePosition', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '20px', disabled: true },
- { prop: 'transferTrackNamePosition.y', firstLevel: 'transferTrackNamePosition', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '20px', disabled: true }
- ] },
- { prop: 'destinationCode', label: '目的地码:', type: 'input', isHidden: true, hiddenName: 'isdestinationCode' },
- { prop: 'destinationCodePoint', label: '目的地码坐标:', type: 'coordinate', isHidden: true, hiddenName: 'isdestinationCode', children: [
- { prop: 'destinationCodePoint.x', firstLevel: 'destinationCodePoint', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '20px', disabled: true },
- { prop: 'destinationCodePoint.y', firstLevel: 'destinationCodePoint', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '20px', disabled: true }
- ] },
- { prop: 'destinationCodeShow', label: '是否显示目的地码:', type: 'checkbox', isHidden: true, hiddenName: 'isdestinationCode' },
- { prop: 'leftStopPointOffset', label: '左向停车点偏移量:', type: 'number', min: 0, placeholder: '', isHidden: true, hiddenName: 'isStopPointOffset' },
- { prop: 'rightStopPointOffset', label: '右向停车点偏移量:', type: 'number', min: 0, placeholder: '', isHidden: true, hiddenName: 'isStopPointOffset' },
- { prop: 'isSwitchSection', label: '是否道岔区段:', type: 'checkbox', isHidden: true, hiddenName: 'isSectionType' },
- { prop: 'relSwitchCode', label: '关联道岔Code:', type: 'select', optionLabel: 'code&&name', optionValue: 'code', options: [], optionCode: 'switchList', change: true, deviceChange: 'deviceChange', isHidden: true, hiddenName: 'isRelSwitchCode' },
- { prop: 'logicSectionNameSort', label: '逻辑区段排序:', type: 'radio', isHidden: true, hiddenName: 'isLogicSectionNameSort', radioList: [
- {value: true, label: '从小到大'},
- {value: false, label: '从大到小'}
- ] },
- { prop: 'linkCode', label: '关联的Link:', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: [], optionCode: 'linkList', disabled: true, isHidden: true, hiddenName: 'isSectionType' },
- { prop: 'sepTypeLeft', label: '左侧分隔符类型:', type: 'select', optionLabel: 'name', optionValue: 'code', options: [], optionCode: 'SectionSepTypeList', isHidden: true, hiddenName: 'isSectionType' },
- { prop: 'offsetLeft', label: '左侧Link偏移量:', type: 'number', min: 0, placeholder: '米', isHidden: true, hiddenName: 'isSectionType' },
- { prop: 'sepTypeRight', label: '右侧分隔符类型:', type: 'select', optionLabel: 'name', optionValue: 'code', options: [], optionCode: 'SectionSepTypeList', isHidden: true, hiddenName: 'isSectionType' },
- { prop: 'offsetRight', label: '右侧Link偏移量:', type: 'number', min: 0, placeholder: '米', isHidden: true, hiddenName: 'isSectionType' },
- { prop: 'isSegmentation', label: '是否分割:', type: 'checkbox', isHidden: true, hiddenName: 'isSectionType' },
- { prop: 'segmentationPosition', label: '默认背景:', type: 'coordinate', isHidden: true, hiddenName: 'issegmentationPosition', children: [
- { prop: 'segmentationPosition.x', firstLevel: 'segmentationPosition', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '20px', disabled: true },
- { prop: 'segmentationPosition.y', firstLevel: 'segmentationPosition', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '20px', disabled: true }
- ] },
- { prop: 'isCurve', label: '是否曲线:', type: 'checkbox', isHidden: true, hiddenName: 'isSectionType' },
- { prop: 'points', label: '区段显示坐标:', type: 'points', width: '160px', isHidden: true, hiddenName: 'isPointsShow', pointDisabled: true, pointDisabledName: 'pointDisabledName', addPoint: 'addPoint', addPointChange: 'addPoint', delPoint: 'delPoint', delPointChange: 'delPoint' },
- { prop: 'trainPosType', label: '列车所在方向:', type: 'select', optionLabel: 'name', optionValue: 'code', options: [], optionCode: 'TrainPositionTypeList', isHidden: true, hiddenName: 'isSectionType' }
- ],
- rules: {
- code: [
- { required: true, message: '请选择设备', trigger: 'change' }
- ],
- name: [
- { required: true, message: '请输入区段名称', trigger: 'blur' }
- ],
- type: [
- { required: true, message: '请输入区段类型', trigger: 'blur' }
- ],
- relStandCode: [
- { required: true, message: '请选择关联站台', trigger: 'change' }
- ],
- leftStopPointOffset: [
- { required: true, message: '请输入左向停车点偏移量', trigger: 'blur' }
- ],
- rightStopPointOffset: [
- { required: true, message: '请输入右向停车点偏移量', trigger: 'blur' }
- ],
- destinationCode: [
- { required: true, message: '请输入目的地码', trigger: 'blur' }
- ],
- 'destinationCodePoint.x': [
- { required: true, message: '请输入目的地码坐标X', trigger: 'blur' }
- ],
- 'destinationCodePoint.y': [
- { required: true, message: '请输入目的地码坐标Y', trigger: 'blur' }
- ],
- 'namePoint.x': [
- { required: true, message: '请输入区段名称坐标X', trigger: 'blur' }
- ],
- 'namePoint.y': [
- { required: true, message: '请输入区段名称坐标Y', trigger: 'blur' }
- ],
- logicSectionNameSort: [
- { required: true, message: '请选择逻辑区段名称排序', trigger: 'change' }
- ],
- offsetLeft: [
- { required: true, message: '请输入左侧Link偏移量', trigger: 'blur' }
- ],
- sepTypeLeft: [
- { required: true, message: '请选择左侧分隔符', trigger: 'change' }
- ],
- offsetRight: [
- { required: true, message: '请输入右侧Link偏移量', trigger: 'blur' }
- ],
- sepTypeRight: [
- { required: true, message: '请选择右侧分隔符', trigger: 'change' }
- ]
- }
- }
- },
- signal: {
- attr: {
- labelWidth: '150px',
- items: [
- { prop: 'stationCode', label: '所属设备集中站:', type: 'select', optionLabel: 'name&&code', optionValue: 'code', required: true, options: [], optionCode: 'stationList' },
- { prop: 'code', label: '信号机编码:', type: 'select', optionLabel: 'code&&name', optionValue: 'code', required: true, options: [], optionCode: 'signalList', change: true, deviceChange: 'deviceChange' },
- { prop: 'name', label: '信号机名称:', type: 'input', required: true },
- { prop: 'uniqueName', label: '信号机唯一名称:', type: 'input', required: true },
- { prop: 'nameShow', label: '是否显示信号机名称:', type: 'checkbox' },
- { prop: 'lampPostType', label: '灯柱类型:', type: 'select', optionLabel: 'name', optionValue: 'code', options: [], optionCode: 'SignalLampPostTypeList' },
- { prop: 'lampPositionType', label: '灯位类型:', type: 'select', optionLabel: 'name', optionValue: 'code', options: [], optionCode: 'SignalLampPositionTypeList' },
- { prop: 'useType', label: '用途类型:', type: 'select', optionLabel: 'name', optionValue: 'code', options: [], optionCode: 'SignalUseTypeList' },
- { prop: 'potLampType', label: '点灯类型:', type: 'select', optionLabel: 'name', optionValue: 'code', options: [], optionCode: 'SignalPotLampTypeList' },
- { prop: 'directionType', label: '方向类型:', type: 'select', optionLabel: 'name', optionValue: 'code', options: [], optionCode: 'SignalDirectionTypeList' },
- { prop: 'positionType', label: '信号机位置类型:', type: 'select', optionLabel: 'name', optionValue: 'code', options: [], optionCode: 'SignalPositionTypeList' },
- { prop: 'linkCode', label: 'LinkCode:', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: [], optionCode: 'linkList' },
- { prop: 'offset', label: '偏移量:', type: 'number', min: 0, placeholder: '米', required: true },
- { prop: 'position.x', firstLevel: 'position', secondLevel: 'x', label: '信号机x:', type: 'number', placeholder: '米', required: true },
- { prop: 'position.y', firstLevel: 'position', secondLevel: 'y', label: '信号机y:', type: 'number', placeholder: '米', required: true },
- { prop: 'rotate', label: '旋转角度:', type: 'number', min: -90, max: 90, placeholder: '度', required: true },
- { prop: 'namePosition.x', firstLevel: 'namePosition', secondLevel: 'x', label: '信号机名字偏移量 x:', type: 'number', placeholder: 'px' },
- { prop: 'namePosition.y', firstLevel: 'namePosition', secondLevel: 'x', label: '信号机名字偏移量 y:', type: 'number', placeholder: 'px' },
- { prop: 'buttonShow', label: '是否显示按钮:', type: 'checkbox' },
- { prop: 'buttonPosition.x', firstLevel: 'buttonPosition', secondLevel: 'x', label: '按钮x:', type: 'number', placeholder: 'px', required: true },
- { prop: 'buttonPosition.y', firstLevel: 'buttonPosition', secondLevel: 'x', label: '按钮y:', type: 'number', placeholder: 'px', required: true },
- { prop: 'guideShow', label: '是否显示引导信号灯:', type: 'checkbox' },
- { prop: 'guidePosition.x', firstLevel: 'guidePosition', secondLevel: 'x', label: '引导信号x:', type: 'number', placeholder: 'px', required: true },
- { prop: 'guidePosition.y', firstLevel: 'guidePosition', secondLevel: 'x', label: '引导信号y:', type: 'number', placeholder: 'px', required: true }
- ],
- rules: {
- code: [
- { required: true, message: '请选择设备', trigger: 'change' }
- ],
- name: [
- { required: true, message: '请输入信号灯名称', trigger: 'blur' }
- ],
- uniqueName: [
- { required: true, message: '请输入信号机唯一名称', trigger: 'blur' }
- ],
- offset: [
- { required: true, message: '请输入偏移量', trigger: 'blur' }
- ],
- stationCode: [
- { required: true, message: '请输入设备集中站', trigger: 'change' }
- ],
- 'position.x': [
- { required: true, message: '信号机x', trigger: 'blur' }
- ],
- 'position.y': [
- { required: true, message: '信号机y', trigger: 'blur' }
- ],
- 'buttonPosition.x': [
- { required: true, message: '请输入按钮x', trigger: 'blur' }
- ],
- 'buttonPosition.y': [
- { required: true, message: '请输入按钮y', trigger: 'blur' }
- ],
- 'guidePosition.x': [
- { required: true, message: '请输入引导信号x', trigger: 'blur' }
- ],
- 'guidePosition.y': [
- { required: true, message: '请输入引导信号y', trigger: 'blur' }
- ]
- }
- }
- },
- switch: {
- attr: {
- labelWidth: '170px',
- items: [
- { prop: 'stationCode', label: '所属设备集中站:', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: [], optionCode: 'stationList' },
- { prop: 'code', label: '道岔编码:', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: [], optionCode: 'switchList', change: true, deviceChange: 'deviceChange' },
- { prop: 'name', label: '道岔名称:', type: 'input' },
- { prop: 'nameShow', label: '是否显示道岔名称:', type: 'checkbox' },
- { prop: 'namePoint.x', firstLevel: 'namePoint', secondLevel: 'x', label: '道岔名称x偏移量:', type: 'number', placeholder: 'px' },
- { prop: 'namePoint.y', firstLevel: 'namePoint', secondLevel: 'y', label: '道岔名称y偏移量:', type: 'number', placeholder: 'px' },
- { prop: 'turnTime', label: '道岔转换时间:', type: 'number', min: 0, max: 1000, placeholder: 's' },
- { prop: 'timeoutShow', label: '是否显示道岔倒计时时间:', type: 'checkbox' },
- { prop: 'sectionACode', label: '关联的A Section Code:', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: [], optionCode: 'sectionList' },
- { prop: 'sectionBCode', label: '关联的B Section Code:', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: [], optionCode: 'sectionList' },
- { prop: 'sectionCCode', label: '关联的C Section Code:', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: [], optionCode: 'sectionList' },
- { prop: 'tp.x', firstLevel: 'tp', secondLevel: 'x', label: '时间x坐标偏移量:', type: 'number', placeholder: 'px' },
- { prop: 'tp.y', firstLevel: 'tp', secondLevel: 'y', label: '时间y坐标偏移量:', type: 'number', placeholder: 'px' }
- ],
- rules: {
- code: [
- { required: true, message: '请选择设备', trigger: 'change' }
- ],
- name: [
- { required: true, message: '请输入道岔名称', trigger: 'blur' }
- ],
- 'namePoint.x': [
- { required: true, message: '请输入道岔名称坐标x', trigger: 'blur' }
- ],
- 'namePoint.y': [
- { required: true, message: '请输入道岔名称坐标y', trigger: 'blur' }
- ],
- stationCode: [
- { required: true, message: '请输入设备集中站', trigger: 'change' }
- ],
- turnTime: [
- { required: true, message: '请输入道岔转换时间', trigger: 'blur' }
- ],
- 'tp.x': [
- { required: true, message: '请输入时间坐标x', trigger: 'blur' }
- ],
- 'tp.y': [
- { required: true, message: '请输入时间坐标y', trigger: 'blur' }
- ]
- }
- }
- },
- station: {
- attr: {
- labelWidth: '150px',
- items: [
- { prop: 'concentrateStationCode', label: '所属联锁站编码:', type: 'select', optionLabel: 'code&&name', optionValue: 'code', options: [], optionCode: 'stationList' },
- { prop: 'code', label: '车站编码:', type: 'select', optionLabel: 'code&&name', optionValue: 'code', options: [], optionCode: 'stationList', change: true, deviceChange: 'deviceChange' },
- { prop: 'zcCode', label: '所属zc区域编码:', type: 'select', optionLabel: 'code&&name', optionValue: 'code', options: [], optionCode: 'zcList' },
- { prop: 'centralized', label: '是否集中站:', type: 'checkbox' },
- { prop: 'name', label: '车站名称:', type: 'input' },
- { prop: 'runPlanName', label: '真实名称:', type: 'input' },
- { prop: 'visible', label: '是否显示:', type: 'checkbox' },
- { prop: 'nameFont', label: '车站字体:', type: 'font', placeholder: '车站字体' },
- { prop: 'nameFontColor', label: '车站字体颜色:', type: 'color' },
- { prop: 'kmPostShow', label: '是否显示公里标名称:', type: 'checkbox' },
- { prop: 'kmRange', label: '公里标距离:', type: 'number', min: 0, placeholder: '米' },
- { prop: 'kmPost', label: '公里标名称:', type: 'input' },
- { prop: 'kmPostFont', label: '公里标字体:', type: 'font', placeholder: '公里标字体' },
- { prop: 'kmPostFontColor', label: '公里标字体颜色:', type: 'color' },
- { prop: 'position.x', firstLevel: 'position', secondLevel: 'x', label: 'x坐标:', type: 'number', placeholder: 'px' },
- { prop: 'position.y', firstLevel: 'position', secondLevel: 'y', label: 'y坐标:', type: 'number', placeholder: 'px' }
- ],
- rules: {
- code: [
- { required: true, message: '请选择设备', trigger: 'change' }
- ],
- name: [
- { required: true, message: '请输入车站名称', trigger: 'blur' }
- ],
- kmRange: [
- { required: true, message: '请输入公里标距离', trigger: 'blur' }
- ],
- kmPost: [
- { required: true, message: '请输入公里标名称', trigger: 'blur' }
- ],
- 'position.x': [
- { required: true, message: '请输入x坐标', trigger: 'blur' }
- ],
- 'position.y': [
- { required: true, message: '请输入y坐标', trigger: 'blur' }
- ]
- }
- }
- },
- stationControl: {
- attr: {
- labelWidth: '160px',
- items: [
- { prop: 'stationCode', label: '所属设备集中站:', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: [], optionCode: 'stationList' },
- { prop: 'code', label: '控制模式编码:', type: 'select', optionLabel: 'code', optionValue: 'code', options: [], optionCode: 'stationControlList', change: true, deviceChange: 'deviceChange' },
- { prop: 'zcCode', label: '所属zc区域编码:', type: 'select', optionLabel: 'code&&name', optionValue: 'code', options: [], optionCode: 'zcList' },
- { prop: 'name', label: '控制模式名称:', type: 'input' },
- { prop: 'zokContent', label: '中控内容:', type: 'input' },
- { prop: 'zakContent', label: '站控内容:', type: 'input' },
- { prop: 'jjzkContent', label: '紧急站控/总报警内容:', type: 'input' },
- { prop: 'zzkContent', label: '站中控内容:', type: 'input' },
- { prop: 'position.x', firstLevel: 'position', secondLevel: 'x', label: '坐标 x:', type: 'number', placeholder: 'px' },
- { prop: 'position.y', firstLevel: 'position', secondLevel: 'y', label: '坐标 y:', type: 'number', placeholder: 'px' }
- ],
- rules: {
- code: [
- { required: true, message: '请选择设备', trigger: 'change' }
- ],
- stationCode: [
- { required: true, message: '请选择所属车站', trigger: 'change' }
- ],
- zokContent: [
- { required: true, message: '请输入中控内容', trigger: 'blur' }
- ],
- zakContent: [
- { required: true, message: '请输入站控内容', trigger: 'blur' }
- ],
- jjzkContent: [
- { required: true, message: '请输入紧急站控内容', trigger: 'blur' }
- ],
- zzkContent: [
- { required: true, message: '请输入站中控内容', trigger: 'blur' }
- ],
- 'position.x': [
- { required: true, message: '请输入坐标x', trigger: 'blur' }
- ],
- 'position.y': [
- { required: true, message: '请输入坐标y', trigger: 'blur' }
- ]
- }
- }
- },
- stationStand: {
- attr: {
- labelWidth: '130px',
- items: [
- { prop: 'deviceStationCode', label: '所属设备集中站:', type: 'select', optionLabel: 'name', optionValue: 'code', options: [], optionCode: 'stationList' },
- { prop: 'code', label: '站台编码:', type: 'select', optionLabel: 'code&&name', optionValue: 'code', options: [], optionCode: 'stationStandList', change: true, deviceChange: 'deviceChange' },
- { prop: 'name', label: '站台名称:', type: 'input', disabled: true },
- { prop: 'stationCode', label: '所属车站:', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: [], optionCode: 'stationList' },
- { prop: 'direction', label: '上下行方向:', type: 'select', optionLabel: 'name', optionValue: 'code', options: [], optionCode: 'RunDirectionTypeList' },
- { prop: 'visible', label: '是否显示:', type: 'checkbox' },
- { prop: 'nameShow', label: '是否显示名称:', type: 'checkbox' },
- { prop: 'doorLocationType', label: '站台方向:', type: 'select', optionLabel: 'name', optionValue: 'code', options: [], optionCode: 'DoorLocationTypeList' },
- { prop: 'hasDoor', label: '是否显示屏蔽门:', type: 'checkbox' },
- { prop: 'width', label: '宽度 w:', type: 'number', min: 0, max: 2000, placeholder: 'px' },
- { prop: 'height', label: '高度 h', type: 'number', min: 0, max: 2000, placeholder: 'px' },
- { prop: 'position.x', firstLevel: 'position', secondLevel: 'x', label: '坐标 x:', type: 'number', placeholder: 'px' },
- { prop: 'position.y', firstLevel: 'position', secondLevel: 'y', label: '坐标 y:', type: 'number', placeholder: 'px' }
- ],
- rules: {
- code: [
- { required: true, message: '请重新选择设备', trigger: 'change' }
- ],
- stationCode: [
- { required: true, message: '请选择关联车站', trigger: 'change' }
- ],
- name: [
- { required: true, message: '请输入计数器名称', trigger: 'change' }
- ],
- doorLocationType: [
- { required: true, message: '请选择站台方向', trigger: 'change' }
- ],
- deviceStationCode: [
- { required: true, message: '请选择所属设备集中站', trigger: 'change' }
- ],
- direction: [
- { required: true, message: '请选择上下行方向', trigger: 'change' }
- ],
- width: [
- { required: true, message: '请输入车站宽度', trigger: 'change' }
- ],
- height: [
- { required: true, message: '请输入车站高度', trigger: 'change' }
- ],
- 'position.x': [
- { required: true, message: '请输入x坐标', trigger: 'change' }
- ],
- 'position.y': [
- { required: true, message: '请输入y坐标', trigger: 'change' }
- ]
- }
- }
- }
-};
diff --git a/src/scripts/translate.js b/src/scripts/translate.js
index 582d19873..c354e8d21 100644
--- a/src/scripts/translate.js
+++ b/src/scripts/translate.js
@@ -230,11 +230,11 @@ export const translate = {
{ key: 'name', tHeader: '区段名称', formatter: (val) => { return val || ''; } },
{ key: 'code', tHeader: '编号', formatter: (val) => { return val || ''; } },
{ key: 'namePosition', tHeader: '名称坐标', formatter: (val) => { return val ? JSON.parse(val) : ''; } },
- { key: 'nameShow', tHeader: '名称是否显示', formatter: (val) => { return val || false; } },
+ // { key: 'nameShow', tHeader: '名称是否显示', formatter: (val) => { return val || false; } },
{ key: 'axleShow', tHeader: '是否显示计轴器', formatter: (val) => { return val || false; } },
{ key: 'type', tHeader: '类型', formatter: (val) => { return val || ''; } },
{ key: 'linkCode', tHeader: 'link编号', formatter: (val) => { return val || ''; } },
- { key: 'logicSectionNameShow', tHeader: '是否显示逻辑区段名称', formatter: (val) => { return val || false; } },
+ // { key: 'logicSectionNameShow', tHeader: '是否显示逻辑区段名称', formatter: (val) => { return val || false; } },
{ key: 'logicSectionNameSort', tHeader: '逻辑区段按名称排序方式', formatter: (val) => { return val || false; } },
{ key: 'logicSectionNum', tHeader: '逻辑区段数量', formatter: (val) => { return val ? JSON.parse(val) : [0]; } },
{ key: 'logicSectionShow', tHeader: '是否显示逻辑区段', formatter: (val) => { return val || false; } },
@@ -276,7 +276,7 @@ export const translate = {
{ key: 'uniqueName', tHeader: '信号机唯一名称', formatter: (val) => { return val || ''; } },
{ key: 'code', tHeader: '编号', formatter: (val) => { return val || ''; } },
{ key: 'namePosition', tHeader: '名称坐标', formatter: (val) => { return val ? JSON.parse(val) : ''; } },
- { key: 'nameShow', tHeader: '名称是否显示', formatter: (val) => { return val || false; } },
+ // { key: 'nameShow', tHeader: '名称是否显示', formatter: (val) => { return val || false; } },
{ key: 'buttonPosition', tHeader: '按钮坐标', formatter: (val) => { return val ? JSON.parse(val) : ''; } },
{ key: 'buttonShow', tHeader: '是否显示按钮', formatter: (val) => { return val || false; } },
{ key: 'directionType', tHeader: '方向类型', formatter: (val) => { return val || ''; } },
@@ -362,7 +362,7 @@ export const translate = {
{ key: 'name', tHeader: '道岔名称', formatter: (val) => { return val || ''; } },
{ key: 'code', tHeader: '编号', formatter: (val) => { return val || ''; } },
{ key: 'namePosition', tHeader: '名称坐标', formatter: (val) => { return val ? JSON.parse(val) : ''; } },
- { key: 'nameShow', tHeader: '名称是否显示', formatter: (val) => { return val || false; } },
+ // { key: 'nameShow', tHeader: '名称是否显示', formatter: (val) => { return val || false; } },
{ key: 'sectionACode', tHeader: 'A线物理区段编号', formatter: (val) => { return val || ''; } },
{ key: 'sectionBCode', tHeader: 'B线物理区段编号', formatter: (val) => { return val || ''; } },
{ key: 'sectionCCode', tHeader: 'C线物理区段编号', formatter: (val) => { return val || ''; } },
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/ImageControl.vue b/src/views/map/mapdraft/mapedit/mapoperate/ImageControl.vue
index 2c807a904..5de5aeea2 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/ImageControl.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/ImageControl.vue
@@ -175,12 +175,6 @@ export default {
watch: {
selected: function (val, oldVal) {
this.deviceSelect(val);
- },
- $route() {
- this.$nextTick(() => {
- this.$refs.form.resetFields();
- this.activeName = 'first';
- });
}
},
mounted() {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/counter.vue b/src/views/map/mapdraft/mapedit/mapoperate/counter.vue
index edb3ddb91..cd216f781 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/counter.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/counter.vue
@@ -170,12 +170,6 @@ export default {
watch: {
selected: function (val, oldVal) {
this.deviceSelect(val);
- },
- $route() {
- this.$nextTick(() => {
- this.$refs.form.resetFields();
- this.activeName = 'first';
- });
}
},
mounted() {
@@ -187,6 +181,7 @@ export default {
deviceSelect(selected) {
this.$refs.form.resetFields();
this.$refs.make.resetFields();
+ this.activeName = 'first';
if (selected && selected._type.toUpperCase() === 'Counter'.toUpperCase()) {
this.editModel.code = selected.code;
this.editModel.name = selected.name;
@@ -198,10 +193,8 @@ export default {
x: selected.position.x,
y: selected.position.y
};
- this.activeName = 'first';
} else if (selected && selected._type.toUpperCase() === 'Station'.toUpperCase()) {
this.addModel.stationCode = selected.code;
- this.activeName = 'second';
}
},
create() {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/delayunlock.vue b/src/views/map/mapdraft/mapedit/mapoperate/delayunlock.vue
index 4e48272bb..46595a4f7 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/delayunlock.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/delayunlock.vue
@@ -152,12 +152,6 @@ export default {
watch: {
selected: function (val, oldVal) {
this.deviceSelect(val);
- },
- $route() {
- this.$nextTick(() => {
- this.$refs.form.resetFields();
- this.activeName = 'first';
- });
}
},
mounted() {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/lcControl.vue b/src/views/map/mapdraft/mapedit/mapoperate/lcControl.vue
index 3a6b2d88a..a66bb0497 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/lcControl.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/lcControl.vue
@@ -159,12 +159,6 @@ export default {
watch: {
selected: function (val, oldVal) {
this.deviceSelect(val);
- },
- $route() {
- this.$nextTick(() => {
- this.$refs.form.resetFields();
- this.activeName = 'first';
- });
}
},
mounted() {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/limitControl.vue b/src/views/map/mapdraft/mapedit/mapoperate/limitControl.vue
index f9ce8a704..3e4c22f1e 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/limitControl.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/limitControl.vue
@@ -150,12 +150,6 @@ export default {
watch: {
selected: function (val, oldVal) {
this.deviceSelect(val);
- },
- $route() {
- this.$nextTick(() => {
- this.$refs.form.resetFields();
- this.activeName = 'first';
- });
}
},
mounted() {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/line.vue b/src/views/map/mapdraft/mapedit/mapoperate/line.vue
index afd3d5805..1f98af3a7 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/line.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/line.vue
@@ -179,12 +179,6 @@ export default {
watch: {
selected(val, oldVal) {
this.deviceSelect(val);
- },
- $route() {
- this.$nextTick(() => {
- this.$refs.form.resetFields();
- this.activeName = 'first';
- });
}
},
mounted() {
@@ -207,7 +201,6 @@ export default {
this.editModel.points = [...selected.points];
} else if (selected && selected._type.toUpperCase() === 'Station'.toUpperCase()) {
this.addModel.stationName = selected.name;
- this.activeName = 'second';
}
},
addPoint(index) {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/link.vue b/src/views/map/mapdraft/mapedit/mapoperate/link.vue
index b85af0706..5ce68e9bc 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/link.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/link.vue
@@ -273,12 +273,6 @@ export default {
selected(val, oldVal) {
this.deviceSelect(val);
},
- $route() {
- this.$nextTick(() => {
- this.activeName = 'first';
- this.$refs.dataform.clearValidate();
- });
- },
linkList(value) {
this.linkLists = JSON.parse(JSON.stringify(this.linkList));
this.linkLists.unshift({code: '', name: '无'});
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/section.vue b/src/views/map/mapdraft/mapedit/mapoperate/section.vue
index 8032277b2..b5b36955b 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/section.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/section.vue
@@ -182,7 +182,7 @@ export default {
destinationCode: '', // 目的地码
destinationCodePoint: { x: 0, y: 0 }, // 目的地码坐标
destinationCodeShow: false, // 是否显示目的地码
- nameShow: false,
+ // nameShow: false,
axleShow: false,
namePoint: { x: 0, y: 0 },
kmRangeRight: 0,
@@ -190,7 +190,7 @@ export default {
region: '',
logicSectionNum: [],
logicSectionShow: false,
- logicSectionNameShow: false,
+ // logicSectionNameShow: false,
isStandTrack: false,
standTrackName: '',
standTrackNamePosition: { x: 0, y: 0 },
@@ -288,20 +288,26 @@ export default {
{ prop: 'type', label: this.$t('map.sectionType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SectionTypeList, disabled: true },
{ prop: 'linkCode', label: this.$t('map.relevanceLinkCode'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.linkList, disabled: true, isHidden: !this.isSectionType },
{ prop: 'parentCode', label: this.$t('map.associatedSection'), type: 'select', mode: true, optionLabel: 'name&&code', optionValue: 'code', disabled: true, options: this.sectionList, isHidden: !this.isParentCode },
- { prop: 'isStandTrack', label: this.$t('map.isStandTrack'), type: 'checkbox', isHidden: !this.isSectionType },
+
+ { prop: 'isStandTrack', label: this.$t('map.isStandTrack'), type: 'checkbox', isHidden: !this.isSwitchSectionShow }, // 1
+
{ prop: 'standTrackName', label: this.$t('map.standTrackName'), type: 'input', isHidden: !this.isstandTrackNameShow },
{ prop: 'standTrackNamePosition', label: this.$t('map.standTrackNamePosition'), type: 'coordinate', width: '150px', isHidden: !this.isstandTrackNameShow, children: [
{ prop: 'standTrackNamePosition.x', firstLevel: 'standTrackNamePosition', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '20px'},
{ prop: 'standTrackNamePosition.y', firstLevel: 'standTrackNamePosition', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '20px'}
] },
{ prop: 'relStandCode', label: this.$t('map.relStandCode'), type: 'selectHover', optionLabel: 'code&&name', optionValue: 'code', options: this.stationStandList, hover: this.hover, buttonType: 'relStandCode', buttonShowType: this.isButtonType, isHidden: !this.isrelStandCode },
- { prop: 'isReentryTrack', label: this.$t('map.isReentryTrack'), type: 'checkbox', isHidden: !this.isSectionType },
+
+ { prop: 'isReentryTrack', label: this.$t('map.isReentryTrack'), type: 'checkbox', isHidden: !this.isSwitchSectionShow }, // 1
+
{ prop: 'reentryTrackName', label: this.$t('map.reentryTrackName'), type: 'input', isHidden: !this.isreentryTrackName },
{ prop: 'reentryTrackNamePosition', label: this.$t('map.reentryTrackNamePosition'), type: 'coordinate', width: '150px', isHidden: !this.isreentryTrackName, children: [
{ prop: 'reentryTrackNamePosition.x', firstLevel: 'reentryTrackNamePosition', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '20px'},
{ prop: 'reentryTrackNamePosition.y', firstLevel: 'reentryTrackNamePosition', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '20px'}
] },
- { prop: 'isTransferTrack', label: this.$t('map.isTransferTrack'), type: 'checkbox', isHidden: !this.isSectionType },
+
+ { prop: 'isTransferTrack', label: this.$t('map.isTransferTrack'), type: 'checkbox', isHidden: !this.isSwitchSectionShow }, // 1
+
{ prop: 'transferTrackName', label: this.$t('map.transferTrackName'), type: 'input', isHidden: !this.istransferTrackName },
{ prop: 'transferTrackNamePosition', label: this.$t('map.transferTrackNamePosition'), type: 'coordinate', width: '150px', isHidden: !this.istransferTrackName, children: [
{ prop: 'transferTrackNamePosition.x', firstLevel: 'transferTrackNamePosition', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '20px'},
@@ -315,14 +321,16 @@ export default {
{ prop: 'destinationCodeShow', label: this.$t('map.destinationCodeShow'), type: 'checkbox', isHidden: !this.isdestinationCode },
{ prop: 'leftStopPointOffset', label: this.$t('map.leftStopPointOffset'), type: 'number', min: 0, isHidden: !this.isStopPointOffset },
{ prop: 'rightStopPointOffset', label: this.$t('map.rightStopPointOffset'), type: 'number', min: 0, isHidden: !this.isStopPointOffset },
+
{ prop: 'isSwitchSection', label: this.$t('map.isSwitchSection'), type: 'checkbox', isHidden: !this.isSectionType },
- { prop: 'relSwitchCode', label: this.$t('map.relSwitchCode'), type: 'select', optionLabel: 'code&&name', optionValue: 'code', options: this.switchList, change: true, deviceChange: this.deviceChange, isHidden: !this.isRelSwitchCode },
- { prop: 'logicSectionShow', label: this.$t('map.displayLogicalExtents'), type: 'checkbox', isHidden: !this.isSectionType },
- { prop: 'logicSectionNameShow', label: this.$t('map.displayLogicalWxtentNames'), type: 'checkbox', disabled: this.islogicSectionNameShow, isHidden: !this.isSectionType },
+ { prop: 'relSwitchCode', label: this.$t('map.relSwitchCode'), type: 'select', optionLabel: 'code&&name', optionValue: 'code', options: this.switchList, change: true, deviceChange: this.deviceChange, isHidden: !this.isRelSwitchCode, disabled: true },
+
+ { prop: 'logicSectionShow', label: this.$t('map.displayLogicalExtents'), type: 'checkbox', isHidden: !this.isSwitchSectionShow }, // 1
+ // { prop: 'logicSectionNameShow', label: this.$t('map.displayLogicalWxtentNames'), type: 'checkbox', disabled: this.islogicSectionNameShow, isHidden: !this.isSwitchSectionShow }, // 1
{ prop: 'logicSectionNameSort', label: this.$t('map.logicSectionNameSort'), type: 'radio', isHidden: !this.isLogicSectionNameSort, radioList: [
{value: true, label: this.$t('map.fromSmallToLarge')},
{value: false, label: this.$t('map.fromLargeToSmall')}
- ] },
+ ] }, // 1
{ prop: 'sepTypeLeft', label: this.$t('map.sepTypeLeft'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SectionSepTypeList, isHidden: !this.isSectionType },
{ prop: 'sepTypeRight', label: this.$t('map.sepTypeRight'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SectionSepTypeList, isHidden: !this.isSectionType },
{ prop: 'isSegmentation', label: this.$t('map.isSegmentation'), type: 'checkbox', isHidden: !this.isSectionType },
@@ -436,9 +444,8 @@ export default {
return list;
},
- // 判断显隐
+ // 判断显隐 true 显示 false 隐藏
isParentCode() {
- // true 显示 false 隐藏
return this.editModel.type == '02' || this.editModel.relSwitchCode;
},
isStationCodeDisabled() {
@@ -450,9 +457,9 @@ export default {
isStationAxleShow() {
return this.editModel.section == '02';
},
- islogicSectionNameShow() {
- return !this.editModel.logicSectionShow;
- },
+ // islogicSectionNameShow() {
+ // return !this.editModel.logicSectionShow;
+ // },
isstandTrackNameShow() {
return this.editModel.type !== '03' && this.editModel.isStandTrack;
},
@@ -478,8 +485,8 @@ export default {
isRelSwitchCode() {
return this.editModel.type !== '03' && this.editModel.isSwitchSection;
},
- isLogicSectionNameSort() {
- return this.editModel.type == '01';
+ isLogicSectionNameSort() { // 逻辑区段排序 判断
+ return this.editModel.type == '01' && !this.editModel.isSwitchSection;
},
issegmentationPosition() {
return this.editModel.type !== '03' && this.editModel.isSegmentation;
@@ -495,17 +502,14 @@ export default {
return this.$store.state.map.map.skinVO.code == '03';
}
return false;
+ },
+ isSwitchSectionShow() { // 判断道岔区段不显示
+ return this.editModel.type !== '03' && !this.editModel.isSwitchSection;
}
},
watch: {
selected(val, oldVal) {
this.deviceSelect(val);
- },
- $route() {
- this.$nextTick(() => {
- this.$refs.dataform.clearValidate();
- this.activeName = 'first';
- });
}
},
mounted() {
@@ -548,6 +552,7 @@ export default {
if (!this.fieldS) { // 判断是否激活选择站台
this.editModel.points = [];
this.$refs.dataform.clearValidate();
+ this.activeName = 'first';
if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase()) {
this.editModel.code = selected.code;
this.editModel.name = selected.name;
@@ -556,7 +561,7 @@ export default {
x: selected.namePosition.x,
y: selected.namePosition.y
};
- this.editModel.nameShow = selected.nameShow;
+ // this.editModel.nameShow = selected.nameShow;
this.editModel.axleShow = selected.axleShow;
this.editModel.relStandCode = selected.relStandCode;
this.editModel.leftStopPointOffset = selected.leftStopPointOffset;
@@ -576,7 +581,7 @@ export default {
this.editModel.logicSectionNum = selected.type === '01' ? selected.logicSectionNum : [0];
this.editModel.logicSectionShow = selected.logicSectionShow;
- this.editModel.logicSectionNameShow = selected.logicSectionNameShow;
+ // this.editModel.logicSectionNameShow = selected.logicSectionNameShow;
this.editModel.isStandTrack = selected.isStandTrack;
this.editModel.standTrackName = selected.standTrackName;
this.editModel.standTrackNamePosition = {
@@ -623,19 +628,14 @@ export default {
this.computedLogicSectionNumList(this.editModel.logicSectionNum);
- // 激活选择Section
- // this.activeName = 'three';
if (this.field.toUpperCase() === 'splitSection'.toUpperCase()) {
this.addModel.code = selected.code;
} else if (this.field.toUpperCase() === 'leftSection'.toUpperCase()) {
this.mergeModel.lsectioncode = selected.code;
} else if (this.field.toUpperCase() === 'rightSection'.toUpperCase()) {
this.mergeModel.rsectioncode = selected.code;
- } else {
- this.activeName = 'first';
}
} else {
- // this.activeName = 'second';
this.tableData = [];
}
}
@@ -666,7 +666,7 @@ export default {
axleShow: false,
type: '02',
namePosition: { x: 0, y: 0 },
- nameShow: model.logicSectionNameShow,
+ // nameShow: model.logicSectionNameShow,
isStandTrack: false,
standTrackName: model.standTrackName,
standTrackNamePosition: {
@@ -695,7 +695,7 @@ export default {
relSwitchCode: model.relSwitchCode,
logicSectionNum: [],
logicSectionShow: model.logicSectionShow,
- logicSectionNameShow: model.logicSectionNameShow,
+ // logicSectionNameShow: model.logicSectionNameShow,
stationCode: model.stationCode,
linkCode: model.linkCode,
offsetLeft: middleOffset * (index) + model.offsetLeft,
@@ -744,7 +744,7 @@ export default {
});
/* 设置物理名称可见*/
- this.editModel.nameShow = true;
+ // this.editModel.nameShow = true;
this.editModel.logicSectionNum = [...logicSectionNumList];
models.push(this.editModel);
this.activeName = 'first';
@@ -776,7 +776,7 @@ export default {
code: uid,
name: uname,
type: '01',
- nameShow: true,
+ // nameShow: true,
axleShow: false,
isStandTrack: false,
standTrackName: '',
@@ -797,7 +797,7 @@ export default {
namePosition: { x: 0, y: 0 },
logicSectionNum: [0],
logicSectionShow: true,
- logicSectionNameShow: true,
+ // logicSectionNameShow: true,
logicSectionNameSort: true,
linkCode: link.code,
sepTypeLeft: '01',
@@ -881,7 +881,7 @@ export default {
leftStopPointOffset: Number(this.editModel.leftStopPointOffset),
rightStopPointOffset: Number(this.editModel.rightStopPointOffset),
- nameShow: this.editModel.nameShow,
+ // nameShow: this.editModel.nameShow,
axleShow: this.editModel.axleShow,
namePosition: {
x: this.editModel.namePoint.x,
@@ -919,7 +919,7 @@ export default {
points: JSON.parse(pointArr),
logicSectionNum: this.editModel.logicSectionNum,
logicSectionShow: this.editModel.logicSectionShow,
- logicSectionNameShow: this.editModel.logicSectionNameShow,
+ // logicSectionNameShow: this.editModel.logicSectionNameShow,
sepTypeLeft: this.editModel.sepTypeLeft,
offsetLeft: this.editModel.offsetLeft,
sepTypeRight: this.editModel.sepTypeRight,
@@ -947,7 +947,7 @@ export default {
const model = this.buildEditModel();
this.sectionList.forEach(section => {
if (section.parentCode == model.code) {
- section.nameShow = section.logicSectionNameShow = model.logicSectionNameShow;
+ // section.nameShow = section.logicSectionNameShow = model.logicSectionNameShow;
section.logicSectionShow = model.logicSectionShow;
section.trainPosType = model.trainPosType;
edits.push(section);
@@ -1005,7 +1005,7 @@ export default {
name: uidL,
type: '01',
parentCode: '',
- nameShow: selected.nameShow,
+ // nameShow: selected.nameShow,
axleShow: selected.axleShow,
isStandTrack: false,
kmRangeRight: '',
@@ -1026,7 +1026,7 @@ export default {
logicSectionNameSort: selected.logicSectionNameSort,
logicSectionNum: selected.logicSectionNum,
logicSectionShow: selected.logicSectionShow,
- logicSectionNameShow: selected.logicSectionNameShow,
+ // logicSectionNameShow: selected.logicSectionNameShow,
sepTypeLeft: selected.sepTypeLeft,
offsetLeft: selected.offsetLeft,
sepTypeRight: '01',
@@ -1052,7 +1052,7 @@ export default {
name: uidR,
type: '01',
parentCode: '',
- nameShow: selected.nameShow,
+ // nameShow: selected.nameShow,
axleShow: selected.axleShow,
isStandTrack: false,
kmRangeRight: '',
@@ -1073,7 +1073,7 @@ export default {
logicSectionNameSort: selected.logicSectionNameSort,
logicSectionNum: selected.logicSectionNum,
logicSectionShow: selected.logicSectionShow,
- logicSectionNameShow: selected.logicSectionNameShow,
+ // logicSectionNameShow: selected.logicSectionNameShow,
sepTypeLeft: '01',
offsetLeft: selected.offsetLeft,
sepTypeRight: selected.sepTypeRight,
@@ -1165,7 +1165,7 @@ export default {
});
if (lsection.points[lsection.points.length - 1].x == rsection.points[0].x && lsection.points[lsection.points.length - 1].y == rsection.points[0].y) {
- model.nameShow = lsection.nameShow;
+ // model.nameShow = lsection.nameShow;
model.axleShow = lsection.axleShow;
model.logicSectionNum = lsection.logicSectionNum;
model.logicSectionShow = lsection.logicSectionShow;
@@ -1174,7 +1174,7 @@ export default {
model.offsetLeft = lsection.offsetLeft;
model.sepTypeRight = rsection.sepTypeRight;
model.offsetRight = lsection.offsetRight + rsection.offsetRight;
- model.logicSectionNameShow = lsection.logicSectionNameShow;
+ // model.logicSectionNameShow = lsection.logicSectionNameShow;
model.isCurve = lsection.isCurve;
model.points = [
{ x: lsection.points[0].x, y: lsection.points[0].y },
@@ -1186,7 +1186,7 @@ export default {
this.$emit('addOrUpdateMapModel', model);
}
if (lsection.points[0].x == rsection.points[rsection.points.length - 1].x && lsection.points[0].y == rsection.points[rsection.points.length - 1].y) {
- model.nameShow = rsection.nameShow;
+ // model.nameShow = rsection.nameShow;
model.axleShow = rsection.axleShow;
model.logicSectionNum = rsection.logicSectionNum;
model.logicSectionShow = rsection.logicSectionShow;
@@ -1195,7 +1195,7 @@ export default {
model.offsetLeft = rsection.offsetLeft;
model.sepTypeRight = lsection.sepTypeRight;
model.offsetRight = lsection.offsetRight + rsection.offsetRight;
- model.logicSectionNameShow = rsection.logicSectionNameShow;
+ // model.logicSectionNameShow = rsection.logicSectionNameShow;
model.isCurve = rsection.isCurve;
model.points = [
{ x: rsection.points[0].x, y: rsection.points[0].y },
@@ -1269,7 +1269,7 @@ export default {
code: uid,
name: sectiona.name || sectionb.name || sectionc.name,
type: '03',
- nameShow: true,
+ // nameShow: true,
axleShow: false,
namePosition: point,
isStandTrack: false,
@@ -1291,7 +1291,7 @@ export default {
points: [{ x: 0, y: 0 }, { x: 0, y: 0 }],
logicSectionNum: [0],
logicSectionShow: false,
- logicSectionNameShow: false,
+ // logicSectionNameShow: false,
sepTypeLeft: '00',
offsetLeft: 0,
sepTypeRight: '00',
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/signal.vue b/src/views/map/mapdraft/mapedit/mapoperate/signal.vue
index 6dc58bad8..cb0208c70 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/signal.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/signal.vue
@@ -306,12 +306,6 @@ export default {
watch: {
selected(val, oldVal) {
this.deviceSelect(val);
- },
- $route() {
- this.$nextTick(() => {
- this.$refs.dataform.resetFields();
- this.activeName = 'first';
- });
}
},
mounted() {
@@ -349,6 +343,7 @@ export default {
deviceSelect(selected) {
this.$refs.dataform.resetFields();
this.$refs.make.resetFields();
+ this.activeName = 'first';
if (selected && selected._type.toUpperCase() === 'Signal'.toUpperCase()) {
this.editModel.code = selected.code;
this.editModel.name = selected.name;
@@ -390,7 +385,6 @@ export default {
y: selected.guidePosition.y
};
}
- this.activeName = 'first';
} else if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase()) {
// 获取逻辑区段关联的物理区段
if (selected.type === '02') {
@@ -399,7 +393,6 @@ export default {
} else {
this.addModel.sectionCode = selected.code;
}
- this.activeName = 'second';
}
},
hover(field) {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/station.vue b/src/views/map/mapdraft/mapedit/mapoperate/station.vue
index 2b8631965..2fc09c171 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/station.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/station.vue
@@ -118,10 +118,8 @@ export default {
{ prop: 'position.x', firstLevel: 'position', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '25px' },
{ prop: 'position.y', firstLevel: 'position', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '25px' }
] },
- // { prop: 'visible', label: this.$t('map.stationVisible'), type: 'checkbox' },
{ prop: 'nameFont', label: this.$t('map.stationNameFont'), type: 'font', placeholder: this.$t('tip.stationFont') },
{ prop: 'nameFontColor', label: this.$t('map.stationNameFontColor'), type: 'color' },
- // { prop: 'kmPostShow', label: this.$t('map.stationKmPostShow'), type: 'checkbox' },
{ prop: 'kmRange', label: this.$t('map.stationKmRange'), type: 'number', min: 0, placeholder: this.$t('tip.meter') },
{ prop: 'kmPost', label: this.$t('map.stationKmPost'), type: 'input' },
{ prop: 'kmPostFont', label: this.$t('map.stationKmPostFont'), type: 'font', placeholder: this.$t('tip.kilometerFont') },
@@ -132,8 +130,8 @@ export default {
name: this.$t('map.mapData'),
item: [
{ prop: 'concentrateStationCode', label: this.$t('map.concentrateStationCode'), type: 'select', optionLabel: 'code&&name', optionValue: 'code', options: this.stationList },
- { prop: 'zcCode', label: this.$t('map.zcCode'), type: 'select', optionLabel: 'code&&name', optionValue: 'code', options: this.zcList },
{ prop: 'centralized', label: this.$t('map.centralized'), type: 'checkbox' },
+ { prop: 'zcCode', label: this.$t('map.zcCode'), type: 'select', optionLabel: 'code&&name', optionValue: 'code', options: this.zcList, isHidden: !this.isZcCode },
{ prop: 'runPlanName', label: this.$t('map.stationRunPlanName'), type: 'input' }
]
}
@@ -176,17 +174,14 @@ export default {
list = this.sectionList.filter(elem => { return elem.type === '01'; });
}
return list;
+ },
+ isZcCode() {
+ return this.editModel.centralized;
}
},
watch: {
selected: function (val) {
this.deviceSelect(val);
- },
- $route() {
- this.$nextTick(() => {
- this.$refs.dataform.resetFields();
- this.activeName = 'first';
- });
}
},
methods: {
@@ -197,6 +192,7 @@ export default {
deviceSelect(selected) {
this.$refs.dataform.resetFields();
this.$refs.make.resetFields();
+ this.activeName = 'first';
if (selected && selected._type.toUpperCase() === 'Station'.toUpperCase()) {
this.editModel.centralized = selected.centralized;
this.editModel.concentrateStationCode = selected.concentrateStationCode;
@@ -219,7 +215,6 @@ export default {
y: selected.position.y
};
}
- this.activeName = 'first';
} else if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase()) {
// 获取逻辑区段关联的物理区段
if (selected.type !== '01') {
@@ -228,7 +223,6 @@ export default {
} else {
this.addModel.sectionCode = selected.code;
}
- this.activeName = 'second';
}
},
create() {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue b/src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue
index ca94969f2..0763e761d 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue
@@ -118,8 +118,7 @@ export default {
map: {
name: this.$t('map.mapData'),
item: [
- { prop: 'stationCode', label: this.$t('map.equipmentStation'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.stationList },
- { prop: 'zcCode', label: this.$t('map.zcCode'), type: 'select', optionLabel: 'code&&name', optionValue: 'code', options: this.zcList }
+ { prop: 'stationCode', label: this.$t('map.equipmentStation'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.stationList }
]
}
}
@@ -165,12 +164,6 @@ export default {
watch: {
selected(val, oldVal) {
this.deviceSelect(val);
- },
- $route() {
- this.$nextTick(() => {
- this.$refs.dataform.resetFields();
- this.activeName = 'first';
- });
}
},
mounted() {
@@ -183,6 +176,7 @@ export default {
deviceSelect(selected) {
this.$refs.dataform.resetFields();
this.$refs.make.resetFields();
+ this.activeName = 'first';
if (selected && selected._type.toUpperCase() === 'StationControl'.toUpperCase()) {
this.editModel.name = selected.name;
this.editModel.code = selected.code;
@@ -198,10 +192,8 @@ export default {
y: selected.position.y
};
}
- this.activeName = 'first';
} else if (selected && selected._type.toUpperCase() === 'Station'.toUpperCase()) {
this.addModel.stationCode = selected.code;
- this.activeName = 'second';
}
},
create() {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue b/src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue
index f04c25400..fa18ca1ef 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue
@@ -217,12 +217,6 @@ export default {
watch: {
selected: function (val, oldVal) {
this.deviceSelect(val);
- },
- $route() {
- this.$nextTick(() => {
- this.$refs.dataform.resetFields();
- this.activeName = 'first';
- });
}
},
mounted() {
@@ -241,6 +235,7 @@ export default {
deviceSelect(selected) {
this.$refs.dataform.resetFields();
this.$refs.make.resetFields();
+ this.activeName = 'first';
if (selected && selected._type.toUpperCase() === 'StationStand'.toUpperCase()) {
this.editModel.name = selected.name;
this.editModel.code = selected.code;
@@ -259,10 +254,8 @@ export default {
}
this.editModel.visible = selected.visible;
this.editModel.direction = selected.direction;
- this.activeName = 'first';
} else if (selected && selected._type.toUpperCase() === 'Station'.toUpperCase()) {
this.addModel.stationCode = selected.code;
- this.activeName = 'second';
}
},
create() {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/switch.vue b/src/views/map/mapdraft/mapedit/mapoperate/switch.vue
index 7164b8b70..4c8b18452 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/switch.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/switch.vue
@@ -178,12 +178,6 @@ export default {
watch: {
selected: function (val, oldVal) {
this.deviceSelect(val);
- },
- $route() {
- this.$nextTick(() => {
- this.$refs.dataform.resetFields();
- this.activeName = 'first';
- });
}
},
mounted() {
@@ -198,6 +192,7 @@ export default {
},
deviceSelect(selected) {
this.$refs.dataform.resetFields();
+ this.activeName = 'first';
if (selected && selected._type.toUpperCase() === 'Switch'.toUpperCase()) {
this.editModel.name = selected.name;
this.editModel.code = selected.code;
@@ -218,9 +213,6 @@ export default {
y: selected.tp.y
};
}
- this.activeName = 'first';
- } else {
- this.activeName = 'second';
}
},
create() {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/text.vue b/src/views/map/mapdraft/mapedit/mapoperate/text.vue
index 826216d77..5aeb563e0 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/text.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/text.vue
@@ -169,12 +169,6 @@ export default {
watch: {
selected: function (val, oldVal) {
this.deviceSelect(val);
- },
- $route() {
- this.$nextTick(() => {
- this.$refs.form.resetFields();
- this.activeName = 'first';
- });
}
},
methods: {
@@ -185,6 +179,7 @@ export default {
deviceSelect(selected) {
this.$refs.form.resetFields();
this.$refs.make.resetFields();
+ this.activeName = 'first';
if (selected && selected._type.toUpperCase() === 'Text'.toUpperCase()) {
this.editModel.code = selected.code;
[this.editModel.prepend, this.editModel.content] = selected.content.split('::');
@@ -194,9 +189,6 @@ export default {
x: selected.position.x,
y: selected.position.y
};
- this.activeName = 'first';
- } else if (selected && selected._type.toUpperCase() === 'Station'.toUpperCase()) {
- this.activeName = 'second';
}
},
create() {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/trainwindow.vue b/src/views/map/mapdraft/mapedit/mapoperate/trainwindow.vue
index d4963519b..6ea5cf0b9 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/trainwindow.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/trainwindow.vue
@@ -165,12 +165,6 @@ export default {
watch: {
selected: function (val, oldVal) {
this.deviceSelect(val);
- },
- $route() {
- this.$nextTick(() => {
- this.$refs.form.resetFields();
- this.activeName = 'first';
- });
}
},
methods: {
@@ -183,6 +177,7 @@ export default {
},
deviceSelect(selected) {
this.$refs.form.resetFields();
+ this.activeName = 'first';
if (selected && selected._type.toUpperCase() === 'TrainWindow'.toUpperCase()) {
this.editModel.code = selected.code;
this.editModel.width = selected.width;
@@ -192,7 +187,6 @@ export default {
x: selected.point.x,
y: selected.point.y
};
- this.activeName = 'first';
}
},
createModel(opts) {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/zcControl.vue b/src/views/map/mapdraft/mapedit/mapoperate/zcControl.vue
index 7a393a489..724b748cd 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/zcControl.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/zcControl.vue
@@ -156,13 +156,6 @@ export default {
watch: {
selected(val, oldVal) {
this.deviceSelect(val);
- },
- $route() {
- this.$nextTick(() => {
- this.$refs.dataform &&
- this.$refs.dataform.resetFields();
- this.activeName = 'first';
- });
}
},
mounted() {
@@ -175,6 +168,7 @@ export default {
deviceSelect(selected) {
this.$refs.dataform.resetFields();
this.$refs.make.resetFields();
+ this.activeName = 'first';
if (selected && selected._type.toUpperCase() === 'ZcControl'.toUpperCase()) {
this.editModel.code = selected.code;
this.editModel.name = selected.name;
@@ -183,7 +177,6 @@ export default {
x: selected.position.x,
y: selected.position.y
};
- this.activeName = 'first';
}
},
create() {
diff --git a/src/views/publish/publishMap/index.vue b/src/views/publish/publishMap/index.vue
index e1a128266..8496a98ec 100644
--- a/src/views/publish/publishMap/index.vue
+++ b/src/views/publish/publishMap/index.vue
@@ -62,15 +62,20 @@ export default {
columnValue: (row) => { return this.$convertField(row.skinCode, this.skinCodeList, ['code', 'name']); },
tagType: (row) => { return ''; }
},
- {
- title: this.$t('publish.updateTime'),
- prop: 'updateTime'
- },
+ // {
+ // title: this.$t('publish.updateTime'),
+ // prop: 'updateTime'
+ // },
{
type: 'button',
title: this.$t('global.operate'),
- width: this.$i18n.locale == 'en' ? '520': '420',
+ width: this.$i18n.locale == 'en' ? '540': '540',
buttons: [
+ {
+ name: '发布历史',
+ handleClick: this.publicList,
+ type: ''
+ },
{
name: this.$t('global.putaway'),
handleClick: this.handlePutaway,
@@ -96,12 +101,12 @@ export default {
{
name: this.$t('global.exportMap'),
handleClick: this.handleExportMap
- },
- {
- name: this.$t('global.export'),
- handleClick: this.handleExportMapSame,
- showControl: () => { return process.env.NODE_ENV === 'development'; }
}
+ // {
+ // name: this.$t('global.export'),
+ // handleClick: this.handleExportMapSame,
+ // showControl: () => { return process.env.NODE_ENV === 'development'; }
+ // }
]
}
]
@@ -162,6 +167,10 @@ export default {
this.queryList.reload();
},
+ publicList(index, row) {
+ this.$router.push({ path: `/publish/map/detail`, query: { code: row.skinCode } });
+ },
+
handlePutaway(index, row) {
this.$confirm(this.$t('publish.wellPutawayMap'), this.$t('global.tips'), {
confirmButtonText: this.$t('global.confirm'),
diff --git a/src/views/publish/publishMap/list.vue b/src/views/publish/publishMap/list.vue
new file mode 100644
index 000000000..0e47d5247
--- /dev/null
+++ b/src/views/publish/publishMap/list.vue
@@ -0,0 +1,96 @@
+
+
+
+
+
+
+
+
+
+
+ {{ $t('map.logicalView') }}
+ {{ $t('map.physicalView') }}
+
+
+
+
+
+
+ {{ view.name }}
-
-
-
-
-
- {{ view.name }}
-
-
-
-
-
- {{ view.name }}
-
-
-
-
-
- {{ view.name }}
-
-
-
-
-
-
-
+
+
-
+
{{option.role+(option.name==undefined?'':option.name)}}
@@ -10,7 +9,7 @@
-
+
diff --git a/src/views/scriptManage/scriptmanage/create.vue b/src/views/scriptManage/scriptmanage/create.vue
deleted file mode 100644
index 98a9503c1..000000000
--- a/src/views/scriptManage/scriptmanage/create.vue
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
From 6a6bb3a4055a1703c3231943b72d0c5ff7169b7a Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Fri, 23 Aug 2019 09:14:21 +0800
Subject: [PATCH 159/172] =?UTF-8?q?desc:=20=E4=BF=AE=E6=94=B9=E5=9C=B0?=
=?UTF-8?q?=E5=9B=BE=E7=BB=98=E5=88=B6=E6=A0=B7=E5=BC=8F=EF=BC=8C=E9=80=BB?=
=?UTF-8?q?=E8=BE=91=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/i18n/langs/en/rules.js | 1 +
src/i18n/langs/zh/map.js | 74 +++--
src/i18n/langs/zh/rules.js | 1 +
src/jmap/config/skinCode/bejing_01.js | 23 +-
src/jmap/config/skinCode/chengdu_03.js | 9 +-
src/jmap/config/skinCode/chengdu_04.js | 9 +-
src/jmap/config/skinCode/fuzhou_01.js | 9 +-
src/jmap/map.js | 6 +-
src/jmap/shape/Section/index.js | 11 +-
src/jmap/shape/StationControl/index.js | 116 +++----
src/views/components/font/index.vue | 15 +-
.../dataRelation/routeoperate/detail.vue | 16 +-
.../dataRelation/routeoperate/route.vue | 297 ++++++++----------
.../mapedit/mapoperate/ImageControl.vue | 6 +-
.../mapedit/mapoperate/config/data.vue | 6 +-
.../mapedit/mapoperate/config/list.vue | 6 +-
.../mapdraft/mapedit/mapoperate/counter.vue | 8 +-
.../mapedit/mapoperate/delayunlock.vue | 8 +-
.../mapdraft/mapedit/mapoperate/lcControl.vue | 2 -
.../mapedit/mapoperate/limitControl.vue | 2 -
.../map/mapdraft/mapedit/mapoperate/line.vue | 2 -
.../map/mapdraft/mapedit/mapoperate/link.vue | 31 +-
.../mapdraft/mapedit/mapoperate/section.vue | 75 ++---
.../mapdraft/mapedit/mapoperate/signal.vue | 33 +-
.../mapdraft/mapedit/mapoperate/station.vue | 16 +-
.../mapedit/mapoperate/stationcontrol.vue | 8 +-
.../mapedit/mapoperate/stationstand.vue | 14 +-
.../mapdraft/mapedit/mapoperate/switch.vue | 18 +-
.../map/mapdraft/mapedit/mapoperate/text.vue | 52 ++-
.../mapedit/mapoperate/train/create.vue | 5 +-
.../mapedit/mapoperate/train/index.vue | 6 +-
.../mapedit/mapoperate/trainwindow.vue | 8 +-
.../mapdraft/mapedit/mapoperate/zcControl.vue | 2 -
src/views/map/mapdraft/mapmanage/edit.vue | 13 +-
src/views/map/mapdraft/mapmanage/publish.vue | 2 +-
35 files changed, 486 insertions(+), 424 deletions(-)
diff --git a/src/i18n/langs/en/rules.js b/src/i18n/langs/en/rules.js
index b3e2557e6..7a5272730 100644
--- a/src/i18n/langs/en/rules.js
+++ b/src/i18n/langs/en/rules.js
@@ -32,6 +32,7 @@ export default {
pointY: 'Coordinates y:',
direct: 'The direction of:',
basisLink: 'Based on the Link:',
+ sectionRelSwitchCode: 'sectionRelSwitchCode',
pleaseSelectSectionName: 'Select the section name',
pleaseFillOffset: 'Please fill in the offset',
diff --git a/src/i18n/langs/zh/map.js b/src/i18n/langs/zh/map.js
index 393886a0b..45662f0f7 100644
--- a/src/i18n/langs/zh/map.js
+++ b/src/i18n/langs/zh/map.js
@@ -114,7 +114,7 @@ export default {
automaticSignalCode: '自动信号编码',
signalCodeName: '信号机名称',
signalCode: '信号机code',
- sectionData: '区段数据',
+ sectionData: '区段列表',
preview: '预览',
operation: '操作',
compile: '编辑',
@@ -124,11 +124,11 @@ export default {
sectionList: '区段列表',
automaticSignal: '自动信号',
- signalID: '信号机ID:',
+ signalID: '信号机:',
activate: '激活',
pleaseSelectSignal: '请选择信号机',
- triggerSegmentData: '请选择进路自动触发区段数据',
+ triggerSegmentData: '请选择进路自动触发区段',
automaticSignalSuccessful: '创建自动信号成功！',
failedCreateSignal: '创建自动信号失败',
automaticSignalUpdateSucceeded: '更新自动信号成功！',
@@ -212,7 +212,7 @@ export default {
sectionLogicalNumber: '逻辑区段数量',
sectionLsectioncode: '左侧区段名称:',
sectionRsectioncode: '右侧区段名称:',
- associatedSection: '关联物理区段:',
+ associatedSection: '所属物理/道岔区段:',
blockCoding: '区段编码:',
sectionType: '区段类型:',
sectionNameColon: '区段名称:',
@@ -239,12 +239,12 @@ export default {
destinationCodeShow: '是否显示目的地码:',
leftStopPointOffset: '左向停车点偏移量:',
rightStopPointOffset: '右向停车点偏移量:',
- isSwitchSection: '是否道岔区段:',
- relSwitchCode: '关联道岔Code:',
+ isSwitchSection: '是否关联道岔:',
+ relSwitchCode: '关联道岔:',
logicSectionNameSort: '逻辑区段排序:',
fromSmallToLarge: '从小到大',
fromLargeToSmall: '从大到小',
- relevanceLinkCode: '关联的Link:',
+ relevanceLinkCode: '所在Link:',
sepTypeLeft: '左侧分隔符类型:',
sectionOffsetLeft: '左侧Link偏移量:',
sepTypeRight: '右侧分隔符类型:',
@@ -269,17 +269,22 @@ export default {
potLampType: '点灯类型:',
signalDirectionType: '方向类型:',
signalPositionType: '信号机位置类型:',
- signalOffset: '偏移量:',
+ signalOffset: '所属link偏移量:',
+ signalLinkCode: '所属link',
signalPositionX: '信号机x:',
signalPositionY: '信号机y:',
+ signalPosition: '信号机坐标:',
signalNamePositionX: '信号机名字偏移量 x:',
signalNamePositionY: '信号机名字偏移量 y:',
+ signalNamePosition: '信号机名字偏移量:',
signalButtonShow: '是否显示按钮:',
signalButtonPositionX: '按钮x:',
signalButtonPositionY: '按钮y:',
+ signalButtonPosition: '按钮:',
signalGuideShow: '是否显示引导信号灯:',
signalGuidePositionX: '引导信号x:',
signalGuidePositionY: '引导信号y:',
+ signalGuidePosition: '引导信号:',
concentrateStationCode: '所属联锁站编码:',
stationCode: '车站编码:',
@@ -296,7 +301,9 @@ export default {
stationKmPostFontColor: '公里标字体颜色:',
stationPositionX: 'x坐标:',
stationPositionY: 'y坐标:',
+ stationPosition: '车站坐标:',
+ stationControlPosition: '控制模式坐标:',
stationControlCode: '控制模式编码:',
stationControlName: '控制模式名称:',
zokContent: '中控内容:',
@@ -313,6 +320,7 @@ export default {
stationstandShowName: '是否显示名称:',
stationstandWidth: '宽度 w:',
stationstandHeight: '高度 h:',
+ stationstandPosition: '车站坐标:',
switchCode: '道岔编码:',
switchName: '道岔名称:',
@@ -320,6 +328,7 @@ export default {
switchShowName: '是否显示道岔名称:',
switchPositionX: '道岔名称x偏移量:',
switchPositionY: '道岔名称y偏移量:',
+ switchPosition: '道岔名称偏移量:',
turnTime: '道岔转换时间:',
timeoutShow: '是否显示道岔倒计时时间:',
sectionACode: '关联的A Section Code:',
@@ -327,6 +336,11 @@ export default {
sectionCCode: '关联的C Section Code:',
switchTpX: '时间x坐标偏移量:',
switchTpY: '时间y坐标偏移量:',
+ switchTp: '时间坐标偏移量:',
+ counterPosition: '计数器坐标:',
+ delayUnlockPosition: '延迟解锁坐标:',
+ trainWindowPoints: '车次窗坐标:',
+ textPoints: '坐标:',
textCode: '文字编码:',
textContent: '文本内容:',
@@ -370,7 +384,7 @@ export default {
startingSignalName: '始端信号机名称',
endingSignalName: '终端信号机名称',
- routeID: '进路ID',
+ routeID: '进路',
routeName: '进路名称:',
routeStationName: '所属车站名称',
@@ -381,16 +395,16 @@ export default {
accessType: '进路性质类型',
automaticRouteType: '自动进路类型',
nearSectionCode: '接近区段名称',
- continueProtectSwitchData: '延续保护道岔数据',
- accessSideTurnoutData: '进路侧防道岔数据',
+ continueProtectSwitchData: '延续保护道岔',
+ accessSideTurnoutData: '进路侧防道岔',
turnBackRailName: '折返轨名称',
- routeSegmentData: '进路自动触发区段数据',
- routeProtectsData: '进路延续保护区段数据',
- accessPhysical: '进路物理区段数据',
- routeRouteScreenData: '进路屏蔽门数据',
- routeRouteTurnoutData: '进路道岔数据',
- hostileApproachData: '敌对进路数据',
+ routeSegmentData: '进路自动触发区段',
+ routeProtectsData: '进路延续保护区段',
+ accessPhysical: '进路物理区段',
+ routeRouteScreenData: '进路屏蔽门',
+ routeRouteTurnoutData: '进路道岔',
+ hostileApproachData: '敌对进路',
relation: '关系',
associatedRoute: '关联进路:',
@@ -401,20 +415,20 @@ export default {
accessTypeColon: '进路性质类型:',
automaticRouteTypeColon: '自动进路类型:',
- startSignalId: '始端信号机ID:',
- endSignalId: '终端信号机ID:',
+ startSignalId: '始端信号机:',
+ endSignalId: '终端信号机:',
switchType: '道岔类型',
- switchId: '道岔ID',
- accessSwitchList: '进路道岔数据:',
- accessStandList: '进路屏蔽门数据:',
- accessSectionList: '进路物理区段数据:',
- turnBackSectionCode: '折返轨ID:',
- routeFlankProtectionList: '侧防道岔数据:',
- routeOverlapSwitchList: '延续保护道岔数据:',
- routeOverlapSectionList: '进路延续保护区段数据:',
- routeTriggerSectionList: '进路自动触发区段数据:',
- nearSectionCodeColon: '接近区段ID:',
+ switchId: '道岔',
+ accessSwitchList: '进路道岔:',
+ accessStandList: '进路屏蔽门:',
+ accessSectionList: '进路物理区段:',
+ turnBackSectionCode: '折返轨:',
+ routeFlankProtectionList: '侧防道岔:',
+ routeOverlapSwitchList: '延续保护道岔:',
+ routeOverlapSectionList: '进路延续保护区段:',
+ routeTriggerSectionList: '进路自动触发区段:',
+ nearSectionCodeColon: '接近区段:',
thenList: '交路列表',
startStation: '起始站',
@@ -485,7 +499,7 @@ export default {
routingDirection: '方向',
remarks: '描述',
remarksColon: '描述:',
- trafficSegmentData: '交路区段数据:',
+ trafficSegmentData: '交路区段:',
startSectionColon: '起始区段:',
endStationColon: '终到站:',
endSectionColon: '终到区段:',
diff --git a/src/i18n/langs/zh/rules.js b/src/i18n/langs/zh/rules.js
index f22c49f44..488df975a 100644
--- a/src/i18n/langs/zh/rules.js
+++ b/src/i18n/langs/zh/rules.js
@@ -184,6 +184,7 @@ export default {
chooseUser: '请选择用户',
pleaseInputLessonName: '请输入课程名称',
pleaseSelectTraining: '请选择实训',
+ sectionRelSwitchCode: '请选择关联道岔',
maxScaling: '(缩放比例最大为8级)',
skinCodingInput: '请输入皮肤编码',
diff --git a/src/jmap/config/skinCode/bejing_01.js b/src/jmap/config/skinCode/bejing_01.js
index ed041031a..aa7be1736 100644
--- a/src/jmap/config/skinCode/bejing_01.js
+++ b/src/jmap/config/skinCode/bejing_01.js
@@ -12,7 +12,11 @@ class SkinCode extends defaultStyle {
};
this[deviceType.Section] = {
- text: {
+ active: {
+ routeColor: false // 进路触发颜色
+ },
+ text: { // 物理区段名称
+ show: true, // 物理区段名称显示
position: -1, // 区段名称位置 1 上面 -1 下面 0 对称
distance: 11, // 文字离区段距离
fontSize: 11, // 字体大小
@@ -22,7 +26,8 @@ class SkinCode extends defaultStyle {
textPosition: 'inside', // 文字位置
textVerticalAlign: 'middle' // 文字垂直对齐方式
},
- logicText: {
+ logicText: { // 逻辑区段名称
+ show: true, // 逻辑区段名称显示
position: -1, // 区段名称位置 1 上面 -1 下面 0 对称
distance: 11, // 文字离区段距离
fontSize: 11, // 字体大小
@@ -32,7 +37,8 @@ class SkinCode extends defaultStyle {
textPosition: 'inside', // 文字位置
textVerticalAlign: 'middle' // 文字垂直对齐方式
},
- standText: {
+ standText: { // 站台轨名称
+ show: true, // 站台轨名称显示
opposite: true, // 对称相反
position: 1, // 区段名称位置 1 上面 -1 下面 0 对称
distance: 11, // 文字离区段距离
@@ -43,7 +49,8 @@ class SkinCode extends defaultStyle {
textPosition: 'inside', // 文字位置
textVerticalAlign: 'middle' // 文字垂直对齐方式
},
- reentryText: {
+ reentryText: { // 折返轨名称
+ show: true, // 折返轨名称显示
opposite: true, // 对称相反
position: 1, // 区段名称位置 1 上面 -1 下面 0 对称
distance: 11, // 文字离区段距离
@@ -54,7 +61,8 @@ class SkinCode extends defaultStyle {
textPosition: 'inside', // 文字位置
textVerticalAlign: 'middle' // 文字垂直对齐方式
},
- transferText: {
+ transferText: { // 转换轨名称
+ show: true, // 转换轨名称显示
opposite: true, // 对称相反
position: 1, // 区段名称位置 1 上面 -1 下面 0 对称
distance: 11, // 文字离区段距离
@@ -65,7 +73,8 @@ class SkinCode extends defaultStyle {
textPosition: 'inside', // 文字位置
textVerticalAlign: 'middle' // 文字垂直对齐方式
},
- destinationText: {
+ destinationText: { // 目的码名称
+ show: true, // 目的码名称显示
position: 1, // 区段名称位置 1 上面 -1 下面 0 对称
distance: 11, // 文字离区段距离
fontSize: 11, // 字体大小
@@ -262,7 +271,7 @@ class SkinCode extends defaultStyle {
emergencyControlShow: true, // 紧急站控显示
centerControlShow: true, // 中控显示
substationControlShow: true, // 站控按钮显示
- turnedAroundControlShow: true // 按图折返显示
+ turnedAroundControlShow: false // 按图折返显示
},
arrow: {
show: false // 控制模式箭头显隐
diff --git a/src/jmap/config/skinCode/chengdu_03.js b/src/jmap/config/skinCode/chengdu_03.js
index 741105feb..bb6a557c4 100644
--- a/src/jmap/config/skinCode/chengdu_03.js
+++ b/src/jmap/config/skinCode/chengdu_03.js
@@ -12,6 +12,9 @@ class SkinCode extends defaultStyle {
};
this[deviceType.Section] = {
+ active: {
+ routeColor: true // 进路触发颜色
+ },
text: {
position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
distance: 10, // 文字离区段距离
@@ -262,7 +265,11 @@ class SkinCode extends defaultStyle {
grayColor: '#7F7F7F', // 控制模式灰色
greenColor: '#00FF00', // 控制模式绿色
redColor: '#FF0000', // 控制模式红色
- yellowColor: '#FFFF00' // 控制模式黄色
+ yellowColor: '#FFFF00', // 控制模式黄色
+ emergencyControlShow: true, // 紧急站控显示
+ centerControlShow: true, // 中控显示
+ substationControlShow: true, // 站控按钮显示
+ turnedAroundControlShow: false // 按图折返显示
},
arrow: {
show: false // 控制模式箭头显隐
diff --git a/src/jmap/config/skinCode/chengdu_04.js b/src/jmap/config/skinCode/chengdu_04.js
index fcbd05d35..c1fda0199 100644
--- a/src/jmap/config/skinCode/chengdu_04.js
+++ b/src/jmap/config/skinCode/chengdu_04.js
@@ -12,6 +12,9 @@ class SkinCode extends defaultStyle {
};
this[deviceType.Section] = {
+ active: {
+ routeColor: false // 进路触发颜色
+ },
text: {
position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
distance: 10, // 文字离区段距离
@@ -259,7 +262,11 @@ class SkinCode extends defaultStyle {
grayColor: '#C0C0C0', // 控制模式灰色
greenColor: 'green', // 控制模式绿色
redColor: 'red', // 控制模式红色
- yellowColor: 'yellow' // 控制模式黄色
+ yellowColor: 'yellow', // 控制模式黄色
+ emergencyControlShow: true, // 紧急站控显示
+ centerControlShow: true, // 中控显示
+ substationControlShow: true, // 站控按钮显示
+ turnedAroundControlShow: false // 按图折返显示
},
arrow: {
show: false // 控制模式箭头显隐
diff --git a/src/jmap/config/skinCode/fuzhou_01.js b/src/jmap/config/skinCode/fuzhou_01.js
index 16742e1bb..76a712c84 100644
--- a/src/jmap/config/skinCode/fuzhou_01.js
+++ b/src/jmap/config/skinCode/fuzhou_01.js
@@ -12,6 +12,9 @@ class SkinCode extends defaultStyle {
};
this[deviceType.Section] = {
+ active: {
+ routeColor: false // 进路触发颜色
+ },
text: {
position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
distance: 18, // 文字离区段距离
@@ -241,7 +244,11 @@ class SkinCode extends defaultStyle {
grayColor: '#7F7F7F', // 控制模式灰色
greenColor: '#00FF00', // 控制模式绿色
redColor: '#FF0000', // 控制模式红色
- yellowColor: '#FFFF00' // 控制模式黄色
+ yellowColor: '#FFFF00', // 控制模式黄色
+ emergencyControlShow: false, // 紧急站控显示
+ centerControlShow: true, // 中控显示
+ substationControlShow: true, // 站控按钮显示
+ turnedAroundControlShow: false // 按图折返显示
},
arrow: {
show: true // 控制模式箭头显隐
diff --git a/src/jmap/map.js b/src/jmap/map.js
index 17c60f03f..fc7f7d66b 100644
--- a/src/jmap/map.js
+++ b/src/jmap/map.js
@@ -308,8 +308,10 @@ class Jlmap {
} else {
const elem = list[idex];
if (elem) {
- Object.keys(elem).forEach(key => {
- elem[key] = model[key];
+ Object.keys(model).forEach(key => {
+ if (key != 'instance') {
+ elem[key] = model[key];
+ }
});
} else {
list.push(Object.assign({}, model));
diff --git a/src/jmap/shape/Section/index.js b/src/jmap/shape/Section/index.js
index 032cd17ae..c6ba1f7f8 100644
--- a/src/jmap/shape/Section/index.js
+++ b/src/jmap/shape/Section/index.js
@@ -731,12 +731,21 @@ export default class Section extends Group {
/** 设置状态*/
setState(model) {
this.recover();
+ if (model.status == '01') {
+ if (this.name && this.style.Section.active.routeColor) {
+ this.name.setStyle({textFill: this.style.Section.text.fontColor});
+ }
+ } else {
+ if (this.name && this.style.Section.active.routeColor) {
+ this.name.setStyle({textFill: 'green'});
+ }
+ }
switch (model.status) {
case '00': /** 未定义*/
this.undefine();
break;
case '01': /** 空闲*/
- this.spare();
+ this.spare(); // 空闲状态下 名称白色 其他条件为绿色
break;
case '02': /** 通信车占用*/
this.communicationOccupied();
diff --git a/src/jmap/shape/StationControl/index.js b/src/jmap/shape/StationControl/index.js
index ab82196c1..b84702861 100644
--- a/src/jmap/shape/StationControl/index.js
+++ b/src/jmap/shape/StationControl/index.js
@@ -26,57 +26,69 @@ export default class StationControl extends Group {
create() {
const model = this.model;
// 紧急站控
- this.emergencyControl = new ESingleControl({
- _subType: 'emergency',
- style: this.style,
- zlevel: this.zlevel,
- z: this.z,
- point: {
- x: model.position.x - this.style.StationControl.lamp.distance * 3 / 2 + this.style.StationControl.lamp.offset.x,
- y: model.position.y + this.style.StationControl.lamp.offset.y
- },
- context: model.jjzkContent,
- pop: false
- });
+ if (this.style.StationControl.lamp.emergencyControlShow) {
+ this.emergencyControl = new ESingleControl({
+ _subType: 'emergency',
+ style: this.style,
+ zlevel: this.zlevel,
+ z: this.z,
+ point: {
+ x: model.position.x - this.style.StationControl.lamp.distance * 3 / 2 + this.style.StationControl.lamp.offset.x,
+ y: model.position.y + this.style.StationControl.lamp.offset.y
+ },
+ context: model.jjzkContent,
+ pop: false
+ });
+ this.add(this.emergencyControl);
+ }
// 中控按钮
- this.centerControl = new ESingleControl({
- _subType: 'center',
- style: this.style,
- zlevel: this.zlevel,
- z: this.z,
- point: {
- x: model.position.x - this.style.StationControl.lamp.distance / 2 + this.style.StationControl.lamp.offset.x,
- y: model.position.y + this.style.StationControl.lamp.offset.y
- },
- context: model.zokContent,
- pop: false
- });
+ if (this.style.StationControl.lamp.centerControlShow) {
+ this.centerControl = new ESingleControl({
+ _subType: 'center',
+ style: this.style,
+ zlevel: this.zlevel,
+ z: this.z,
+ point: {
+ x: model.position.x - this.style.StationControl.lamp.distance / 2 + this.style.StationControl.lamp.offset.x,
+ y: model.position.y + this.style.StationControl.lamp.offset.y
+ },
+ context: model.zokContent,
+ pop: false
+ });
+ this.add(this.centerControl);
+ }
// 站控按钮
- this.substationControl = new ESingleControl({
- _subType: 'substation',
- style: this.style,
- zlevel: this.zlevel,
- z: this.z,
- point: {
- x: model.position.x + this.style.StationControl.lamp.distance / 2 + this.style.StationControl.lamp.offset.x,
- y: model.position.y + this.style.StationControl.lamp.offset.y
- },
- context: model.zakContent,
- pop: false
- });
+ if (this.style.StationControl.lamp.substationControlShow) {
+ this.substationControl = new ESingleControl({
+ _subType: 'substation',
+ style: this.style,
+ zlevel: this.zlevel,
+ z: this.z,
+ point: {
+ x: model.position.x + this.style.StationControl.lamp.distance / 2 + this.style.StationControl.lamp.offset.x,
+ y: model.position.y + this.style.StationControl.lamp.offset.y
+ },
+ context: model.zakContent,
+ pop: false
+ });
+ this.add(this.substationControl);
+ }
// 按图折返
- this.turnedAroundControl = new ESingleControl({
- _subType: 'turnedAround',
- style: this.style,
- zlevel: this.zlevel,
- z: this.z,
- point: {
- x: model.position.x + this.style.StationControl.lamp.distance * 3 / 2 + this.style.StationControl.lamp.offset.x,
- y: model.position.y + this.style.StationControl.lamp.offset.y
- },
- context: '按图折返',
- pop: false
- });
+ if (this.style.StationControl.lamp.turnedAroundControlShow) {
+ this.turnedAroundControl = new ESingleControl({
+ _subType: 'turnedAround',
+ style: this.style,
+ zlevel: this.zlevel,
+ z: this.z,
+ point: {
+ x: model.position.x + this.style.StationControl.lamp.distance * 3 / 2 + this.style.StationControl.lamp.offset.x,
+ y: model.position.y + this.style.StationControl.lamp.offset.y
+ },
+ context: '按图折返',
+ pop: false
+ });
+ this.add(this.turnedAroundControl);
+ }
// 箭头
if (this.style.StationControl.arrow.show) {
const point = arrow(this.model.position.x, this.model.position.y + this.style.StationControl.lamp.radiusR / 2, this.style.StationControl.lamp.distance / 6, this.style.StationControl.lamp.radiusR * 0.8);
@@ -95,14 +107,6 @@ export default class StationControl extends Group {
});
this.add(this.arrowsControl);
}
- this.add(this.substationControl);
- this.add(this.centerControl);
- if (this.style.StationControl.lamp.count == 3) {
- this.add(this.emergencyControl);
- } else if (this.style.StationControl.lamp.count == 4) {
- this.add(this.emergencyControl);
- this.add(this.turnedAroundControl);
- }
}
// 设置状态
diff --git a/src/views/components/font/index.vue b/src/views/components/font/index.vue
index 7c6d221bb..03259fc24 100644
--- a/src/views/components/font/index.vue
+++ b/src/views/components/font/index.vue
@@ -1,5 +1,5 @@
-
+
@@ -65,9 +65,20 @@ export default {
}
};
-
diff --git a/src/views/map/mapdraft/mapedit/dataRelation/routeoperate/detail.vue b/src/views/map/mapdraft/mapedit/dataRelation/routeoperate/detail.vue
index f5d59f18f..914c1c13a 100644
--- a/src/views/map/mapdraft/mapedit/dataRelation/routeoperate/detail.vue
+++ b/src/views/map/mapdraft/mapedit/dataRelation/routeoperate/detail.vue
@@ -80,18 +80,18 @@ export default {
selectCheckShow: false,
indexShow: true,
columns: [
- {
- title: this.$t('map.routeID'),
- prop: 'code'
- },
+ // {
+ // title: this.$t('map.routeID'),
+ // prop: 'code'
+ // },
{
title: this.$t('map.pathName'),
prop: 'name'
},
- {
- title: this.$t('map.pathUnitMapName'),
- prop: 'mapId'
- },
+ // {
+ // title: this.$t('map.pathUnitMapName'),
+ // prop: 'mapId'
+ // },
{
title: this.$t('map.routeStationName'),
prop: 'stationCode'
diff --git a/src/views/map/mapdraft/mapedit/dataRelation/routeoperate/route.vue b/src/views/map/mapdraft/mapedit/dataRelation/routeoperate/route.vue
index a986bc867..e0da5d7d1 100644
--- a/src/views/map/mapdraft/mapedit/dataRelation/routeoperate/route.vue
+++ b/src/views/map/mapdraft/mapedit/dataRelation/routeoperate/route.vue
@@ -37,6 +37,20 @@
/>
+
+
+
+ {{ $t('map.activate') }}
+
{{ $t('map.activate') }}
-
{{ $t('map.activate') }}
-
-
-
- {{ $t('map.activate') }}
-
-
-
-
-
-
-
- {{ $t('map.activate') }}
- {{ $t('map.add') }}
-
-
-
-
-
-
- {{ swictchName(scope.row.switchCode) }}
-
-
-
-
-
- {{ $t('map.remove') }}
-
-
-
-
-
-
-
-
-
- {{ $t('map.activate') }}
- {{ $t('map.add') }}
-
-
-
-
-
-
- {{ swictchName(scope.row.switchCode) }}
-
-
-
-
-
- {{ $t('map.remove') }}
-
-
-
-
-
-
-
-
-
- {{ $t('map.activate') }}
-
激活
-
-
-
- 激活
-
激活
添加
-
+
{{ swictchName(scope.row.switchCode) }}
-
+
+
+
+ 激活
+
+
+
+
+ {{ $t('map.activate') }}
+ {{ $t('map.add') }}
+
+
+
+
+
+
+ {{ swictchName(scope.row.switchCode) }}
+
+
+
+
+
+ {{ $t('map.remove') }}
+
+
+
+
+
+
+
+
+ {{ $t('map.activate') }}
+
+
+
+
+ {{ $t('map.activate') }}
+ {{ $t('map.add') }}
+
+
+
+
+
+
+ {{ swictchName(scope.row.switchCode) }}
+
+
+
+
+
+ {{ $t('map.remove') }}
+
+
+
+
+
{{ $t('map.save') }}
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/ImageControl.vue b/src/views/map/mapdraft/mapedit/mapoperate/ImageControl.vue
index ee3607179..2c807a904 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/ImageControl.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/ImageControl.vue
@@ -111,7 +111,7 @@ export default {
]),
dataForm() {
const form = {
- labelWidth: '150px',
+ labelWidth: '130px',
items: {
code: {
name: '',
@@ -126,7 +126,7 @@ export default {
{ prop: 'height', label: this.$t('map.imageHeight'), type: 'number', min: 0 },
{ prop: 'zIndex', label: this.$t('map.imageZindex'), type: 'number', min: 0 },
{ prop: 'rotate', label: this.$t('map.rotateAngle'), type: 'number', min: 0 },
- { prop: 'position', label: this.$t('map.imagePoint'), type: 'coordinate', width: '140px', children: [
+ { prop: 'position', label: this.$t('map.imagePoint'), type: 'coordinate', width: '120px', children: [
{ prop: 'position.x', firstLevel: 'position', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '20px' },
{ prop: 'position.y', firstLevel: 'position', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '20px' }
] }
@@ -206,8 +206,6 @@ export default {
y: selected.position.y
};
this.activeName = 'first';
- } else {
- this.activeName = 'second';
}
},
create() {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/config/data.vue b/src/views/map/mapdraft/mapedit/mapoperate/config/data.vue
index 8db820036..263a90896 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/config/data.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/config/data.vue
@@ -194,7 +194,11 @@ export default {
} else if (label == 'label') {
return option.label;
} else if (label == 'name&&code') {
- return option.name + ' (' + option.code+ ')';
+ if (option.code) {
+ return option.name + ' (' + option.code+ ')';
+ } else {
+ return option.name;
+ }
} else if (label == 'code&&name') {
return option.code + ' (' + option.name+ ')';
} else {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/config/list.vue b/src/views/map/mapdraft/mapedit/mapoperate/config/list.vue
index a451becb0..905fbb351 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/config/list.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/config/list.vue
@@ -209,7 +209,11 @@ export default {
} else if (label == 'label') {
return option.label;
} else if (label == 'name&&code') {
- return option.name + ' (' + option.code+ ')';
+ if (option.code) {
+ return option.name + ' (' + option.code+ ')';
+ } else {
+ return option.name;
+ }
} else if (label == 'code&&name') {
return option.code + ' (' + option.name+ ')';
} else {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/counter.vue b/src/views/map/mapdraft/mapedit/mapoperate/counter.vue
index caaa61374..edb3ddb91 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/counter.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/counter.vue
@@ -150,8 +150,10 @@ export default {
{ prop: 'name', label: this.$t('map.counterName'), type: 'input' },
{ prop: 'type', label: this.$t('map.counterType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.typeList },
{ prop: 'max', label: this.$t('map.countMax'), type: 'number', min: 0, placeholder: '个' },
- { prop: 'position.x', firstLevel: 'position', secondLevel: 'x', label: this.$t('map.pointX'), type: 'number', placeholder: 'px' },
- { prop: 'position.y', firstLevel: 'position', secondLevel: 'y', label: this.$t('map.pointY'), type: 'number', placeholder: 'px' }
+ { prop: 'position', label: this.$t('map.counterPosition'), type: 'coordinate', width: '110px', children: [
+ { prop: 'position.x', firstLevel: 'position', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '25px' },
+ { prop: 'position.y', firstLevel: 'position', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '25px' }
+ ] }
]
},
map: {
@@ -200,8 +202,6 @@ export default {
} else if (selected && selected._type.toUpperCase() === 'Station'.toUpperCase()) {
this.addModel.stationCode = selected.code;
this.activeName = 'second';
- } else {
- this.activeName = 'second';
}
},
create() {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/delayunlock.vue b/src/views/map/mapdraft/mapedit/mapoperate/delayunlock.vue
index 36052f204..4e48272bb 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/delayunlock.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/delayunlock.vue
@@ -132,8 +132,10 @@ export default {
{ prop: 'unlockTime', label: this.$t('map.delayTime'), type: 'number', min: 0, max: 1000, placeholder: 's' },
{ prop: 'fontFamily', label: this.$t('map.font'), type: 'font' },
{ prop: 'textFontColor', label: this.$t('map.color'), type: 'color' },
- { prop: 'position.x', firstLevel: 'position', secondLevel: 'x', label: this.$t('map.pointX'), type: 'number', placeholder: 'px' },
- { prop: 'position.y', firstLevel: 'position', secondLevel: 'y', label: this.$t('map.pointY'), type: 'number', placeholder: 'px' }
+ { prop: 'position', label: this.$t('map.delayUnlockPosition'), type: 'coordinate', width: '110px', children: [
+ { prop: 'position.x', firstLevel: 'position', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '25px' },
+ { prop: 'position.y', firstLevel: 'position', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '25px' }
+ ] }
]
},
map: {
@@ -182,8 +184,6 @@ export default {
} else if (selected && selected._type.toUpperCase() === 'Station'.toUpperCase()) {
this.addModel.stationCode = selected.code;
this.activeName = 'second';
- } else {
- this.activeName = 'second';
}
this.$refs.form.clearValidate();
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/lcControl.vue b/src/views/map/mapdraft/mapedit/mapoperate/lcControl.vue
index b586aabf8..3a6b2d88a 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/lcControl.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/lcControl.vue
@@ -185,8 +185,6 @@ export default {
y: selected.position.y
};
this.activeName = 'first';
- } else {
- this.activeName = 'second';
}
},
create() {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/limitControl.vue b/src/views/map/mapdraft/mapedit/mapoperate/limitControl.vue
index ed47eee2a..f9ce8a704 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/limitControl.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/limitControl.vue
@@ -176,8 +176,6 @@ export default {
y: selected.position.y
};
this.activeName = 'first';
- } else {
- this.activeName = 'second';
}
},
create() {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/line.vue b/src/views/map/mapdraft/mapedit/mapoperate/line.vue
index 3df2e2ea8..afd3d5805 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/line.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/line.vue
@@ -208,8 +208,6 @@ export default {
} else if (selected && selected._type.toUpperCase() === 'Station'.toUpperCase()) {
this.addModel.stationName = selected.name;
this.activeName = 'second';
- } else {
- this.activeName = 'second';
}
},
addPoint(index) {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/link.vue b/src/views/map/mapdraft/mapedit/mapoperate/link.vue
index ddd902dc3..b85af0706 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/link.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/link.vue
@@ -170,20 +170,19 @@ export default {
item: [
{ prop: 'code', label: this.$t('map.linkCode'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.linkList, change: true, deviceChange: this.deviceChange },
{ prop: 'name', label: this.$t('map.linkName'), type: 'input' },
- { prop: 'lengthShow', label: this.$t('map.linkDisplayLength'), type: 'number', min: 50, placeholder: 'px' },
- { prop: 'color', label: this.$t('map.linkColor'), type: 'color' },
- { prop: 'leftFdCode', label: this.$t('map.linkLeftFdCode'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.linkList },
- { prop: 'leftSdCode', label: this.$t('map.linkLeftSdCode'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.linkList },
- { prop: 'rightFdCode', label: this.$t('map.linkRightFdCode'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.linkList },
- { prop: 'rightSdCode', label: this.$t('map.linkRightSdCode'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.linkList },
- { prop: 'lp', label: this.$t('map.linkLp'), type: 'coordinate', width: '160px', children: [
+ { prop: 'lp', label: this.$t('map.linkLp'), type: 'coordinate', width: '119px', children: [
{ prop: 'lp.x', firstLevel: 'lp', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '20px', disabled: false },
{ prop: 'lp.y', firstLevel: 'lp', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '20px', disabled: false }
] },
- { prop: 'rp', label: this.$t('map.linkRp'), type: 'coordinate', width: '160px', children: [
+ { prop: 'rp', label: this.$t('map.linkRp'), type: 'coordinate', width: '119px', children: [
{ prop: 'rp.x', firstLevel: 'rp', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '20px', disabled: false },
{ prop: 'rp.y', firstLevel: 'rp', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '20px', disabled: false }
- ] }
+ ] },
+ { prop: 'color', label: this.$t('map.linkColor'), type: 'color' },
+ { prop: 'leftFdCode', label: this.$t('map.linkLeftFdCode'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.linkLists },
+ { prop: 'leftSdCode', label: this.$t('map.linkLeftSdCode'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.linkLists },
+ { prop: 'rightFdCode', label: this.$t('map.linkRightFdCode'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.linkLists },
+ { prop: 'rightSdCode', label: this.$t('map.linkRightSdCode'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.linkLists }
]
},
map: {
@@ -279,6 +278,10 @@ export default {
this.activeName = 'first';
this.$refs.dataform.clearValidate();
});
+ },
+ linkList(value) {
+ this.linkLists = JSON.parse(JSON.stringify(this.linkList));
+ this.linkLists.unshift({code: '', name: '无'});
}
},
mounted() {
@@ -301,10 +304,10 @@ export default {
this.editModel.lengthShow = Math.sqrt(Math.pow(selected.rp.x - selected.lp.x, 2) + Math.pow(selected.rp.y - selected.lp.y, 2));
this.editModel.lengthFact = selected.lengthFact;
this.editModel.color = selected.color;
- this.editModel.leftFdCode = selected.leftFdCode;
- this.editModel.leftSdCode = selected.leftSdCode;
- this.editModel.rightFdCode = selected.rightFdCode;
- this.editModel.rightSdCode = selected.rightSdCode;
+ this.editModel.leftFdCode = selected.leftFdCode || '';
+ this.editModel.leftSdCode = selected.leftSdCode || '';
+ this.editModel.rightFdCode = selected.rightFdCode || '';
+ this.editModel.rightSdCode = selected.rightSdCode || '';
this.editModel.lp = {
x: selected.lp.x,
y: selected.lp.y
@@ -314,8 +317,6 @@ export default {
y: selected.rp.y
};
this.activeName = 'first';
- } else {
- this.activeName = 'second';
}
});
},
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/section.vue b/src/views/map/mapdraft/mapedit/mapoperate/section.vue
index 70bf04a71..8032277b2 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/section.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/section.vue
@@ -136,30 +136,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -235,13 +211,14 @@ export default {
offsetLeft: 0,
sepTypeRight: '',
offsetRight: 0,
- trainPosType: '',
+ trainPosType: '01',
+ // pointY: '',
parentCode: '',
points: [],
isCurve: false
},
editRuleModel: {
- trainType: '01',
+ // trainType: '01',
pointY: 0
},
tableData: [],
@@ -304,15 +281,13 @@ export default {
item: [
{ prop: 'code', label: this.$t('map.blockCoding'), type: 'select', mode: false, optionLabel: 'name&&code', optionValue: 'code', options: this.sectionList, change: true, deviceChange: this.deviceChange },
{ prop: 'name', label: this.$t('map.sectionNameColon'), type: 'input' },
- { prop: 'parentCode', label: this.$t('map.associatedSection'), type: 'select', mode: true, optionLabel: 'code&&name', optionValue: 'code', disabled: true, options: this.sectionList, isHidden: !this.isParentCode },
{ prop: 'namePoint', label: this.$t('map.sectionNameOffset'), type: 'coordinate', width: '150px', children: [
- { prop: 'namePoint.x', firstLevel: 'namePoint', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '20px' },
- { prop: 'namePoint.y', firstLevel: 'namePoint', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '20px' }
+ { prop: 'namePoint.x', firstLevel: 'namePoint', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '25px' },
+ { prop: 'namePoint.y', firstLevel: 'namePoint', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '25px' }
] },
- { prop: 'nameShow', label: this.$t('map.displayExtentName'), type: 'checkbox', isHidden: !this.isSectionType },
- { prop: 'axleShow', label: this.$t('map.displayAxleCounter'), type: 'checkbox', disabled: this.isStationAxleShow, isHidden: !this.isSectionType},
- { prop: 'logicSectionShow', label: this.$t('map.displayLogicalExtents'), type: 'checkbox', isHidden: !this.isSectionType },
- { prop: 'logicSectionNameShow', label: this.$t('map.displayLogicalWxtentNames'), type: 'checkbox', disabled: this.islogicSectionNameShow, isHidden: !this.isSectionType },
+ { prop: 'type', label: this.$t('map.sectionType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SectionTypeList, disabled: true },
+ { prop: 'linkCode', label: this.$t('map.relevanceLinkCode'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.linkList, disabled: true, isHidden: !this.isSectionType },
+ { prop: 'parentCode', label: this.$t('map.associatedSection'), type: 'select', mode: true, optionLabel: 'name&&code', optionValue: 'code', disabled: true, options: this.sectionList, isHidden: !this.isParentCode },
{ prop: 'isStandTrack', label: this.$t('map.isStandTrack'), type: 'checkbox', isHidden: !this.isSectionType },
{ prop: 'standTrackName', label: this.$t('map.standTrackName'), type: 'input', isHidden: !this.isstandTrackNameShow },
{ prop: 'standTrackNamePosition', label: this.$t('map.standTrackNamePosition'), type: 'coordinate', width: '150px', isHidden: !this.isstandTrackNameShow, children: [
@@ -342,11 +317,12 @@ export default {
{ prop: 'rightStopPointOffset', label: this.$t('map.rightStopPointOffset'), type: 'number', min: 0, isHidden: !this.isStopPointOffset },
{ prop: 'isSwitchSection', label: this.$t('map.isSwitchSection'), type: 'checkbox', isHidden: !this.isSectionType },
{ prop: 'relSwitchCode', label: this.$t('map.relSwitchCode'), type: 'select', optionLabel: 'code&&name', optionValue: 'code', options: this.switchList, change: true, deviceChange: this.deviceChange, isHidden: !this.isRelSwitchCode },
+ { prop: 'logicSectionShow', label: this.$t('map.displayLogicalExtents'), type: 'checkbox', isHidden: !this.isSectionType },
+ { prop: 'logicSectionNameShow', label: this.$t('map.displayLogicalWxtentNames'), type: 'checkbox', disabled: this.islogicSectionNameShow, isHidden: !this.isSectionType },
{ prop: 'logicSectionNameSort', label: this.$t('map.logicSectionNameSort'), type: 'radio', isHidden: !this.isLogicSectionNameSort, radioList: [
{value: true, label: this.$t('map.fromSmallToLarge')},
{value: false, label: this.$t('map.fromLargeToSmall')}
] },
- { prop: 'linkCode', label: this.$t('map.relevanceLinkCode'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.linkList, disabled: true, isHidden: !this.isSectionType },
{ prop: 'sepTypeLeft', label: this.$t('map.sepTypeLeft'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SectionSepTypeList, isHidden: !this.isSectionType },
{ prop: 'sepTypeRight', label: this.$t('map.sepTypeRight'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SectionSepTypeList, isHidden: !this.isSectionType },
{ prop: 'isSegmentation', label: this.$t('map.isSegmentation'), type: 'checkbox', isHidden: !this.isSectionType },
@@ -364,10 +340,9 @@ export default {
{ prop: 'stationCode', label: this.$t('map.equipmentStation'), type: 'select', mode: true, optionLabel: 'name&&code', optionValue: 'code', disabled: this.isStationCodeDisabled, options: this.stationList },
{ prop: 'offsetLeft', label: this.$t('map.sectionOffsetLeft'), type: 'number', min: 0, placeholder: '米', isHidden: !this.isSectionType },
{ prop: 'offsetRight', label: this.$t('map.sectionOffsetRight'), type: 'number', min: 0, placeholder: '米', isHidden: !this.isSectionType },
- { prop: 'region', label: this.$t('map.sectionColon'), type: 'select', optionLabel: 'label', optionValue: 'value', options: this.regionList },
+ { prop: 'region', label: this.$t('map.sectionColon'), type: 'select', optionLabel: 'label', optionValue: 'value', options: this.regionList, isHidden: !this.sectionColonShow },
{ prop: 'kmRangeLeft', label: this.$t('map.leftKilometerMark'), type: 'number', min: 0 },
{ prop: 'kmRangeRight', label: this.$t('map.rightKilometerMark'), type: 'number', min: 0 },
- { prop: 'type', label: this.$t('map.sectionType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SectionTypeList },
{ prop: 'trainPosType', label: this.$t('map.trainDirection'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.TrainPositionTypeList, isHidden: !this.isSectionType }
]
}
@@ -424,6 +399,9 @@ export default {
],
sepTypeRight: [
{ required: true, message: this.$t('rules.sectionSepTypeRight'), trigger: 'change' }
+ ],
+ relSwitchCode: [
+ { required: true, message: this.$t('rules.sectionRelSwitchCode'), trigger: 'change' }
]
};
return rules;
@@ -460,6 +438,7 @@ export default {
// 判断显隐
isParentCode() {
+ // true 显示 false 隐藏
return this.editModel.type == '02' || this.editModel.relSwitchCode;
},
isStationCodeDisabled() {
@@ -510,6 +489,12 @@ export default {
},
pointDisabledName() {
return this.editModel.type == '02';
+ },
+ sectionColonShow() {
+ if (this.$store.state.map.map) {
+ return this.$store.state.map.map.skinVO.code == '03';
+ }
+ return false;
}
},
watch: {
@@ -639,7 +624,7 @@ export default {
this.computedLogicSectionNumList(this.editModel.logicSectionNum);
// 激活选择Section
- this.activeName = 'three';
+ // this.activeName = 'three';
if (this.field.toUpperCase() === 'splitSection'.toUpperCase()) {
this.addModel.code = selected.code;
} else if (this.field.toUpperCase() === 'leftSection'.toUpperCase()) {
@@ -650,7 +635,7 @@ export default {
this.activeName = 'first';
}
} else {
- this.activeName = 'second';
+ // this.activeName = 'second';
this.tableData = [];
}
}
@@ -766,16 +751,6 @@ export default {
this.$emit('addOrUpdateMapModel', models);
this.$emit('delMapModel', remove);
},
- editSectionTrain() {
- const data = [];
- this.sectionList.forEach(ele => {
- if (ele.points[0].y == this.editRuleModel.pointY && ele.points[ele.points.length - 1].y == this.editRuleModel.pointY) {
- ele.trainPosType = this.editRuleModel.trainType;
- data.push(ele);
- }
- });
- this.$emit('addOrUpdateMapModel', data);
- },
addPoint(index) {
const data = { x: 0, y: 0 };
this.editModel.points.splice(index + 1, 0, data);
@@ -977,6 +952,10 @@ export default {
section.trainPosType = model.trainPosType;
edits.push(section);
}
+ // if (section.points[0].y == this.editModel.pointY && section.points[section.points.length - 1].y == this.editModel.pointY) {
+ // section.trainPosType = this.editModel.trainPosType;
+ // edits.push(section);
+ // }
});
edits.push(model);
this.fieldS = '';
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/signal.vue b/src/views/map/mapdraft/mapedit/mapoperate/signal.vue
index 80ccdf43e..6dc58bad8 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/signal.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/signal.vue
@@ -219,22 +219,30 @@ export default {
item: [
{ prop: 'code', label: this.$t('map.signalCodeColon'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.signalList, change: true, deviceChange: this.deviceChange },
{ prop: 'name', label: this.$t('map.signalNameColon'), type: 'input' },
- { prop: 'nameShow', label: this.$t('map.signalDisplayName'), type: 'checkbox' },
+ { prop: 'position', label: this.$t('map.signalPosition'), type: 'coordinate', width: '140px', children: [
+ { prop: 'position.x', firstLevel: 'position', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '25px' },
+ { prop: 'position.y', firstLevel: 'position', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '25px' }
+ ] },
+ // { prop: 'nameShow', label: this.$t('map.signalDisplayName'), type: 'checkbox' },
{ prop: 'lampPostType', label: this.$t('map.lampPostType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SignalLampPostTypeList },
{ prop: 'lampPositionType', label: this.$t('map.lampPositionType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SignalLampPositionTypeList },
{ prop: 'directionType', label: this.$t('map.signalDirectionType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SignalDirectionTypeList },
{ prop: 'positionType', label: this.$t('map.signalPositionType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SignalPositionTypeList },
- { prop: 'position.x', firstLevel: 'position', secondLevel: 'x', label: this.$t('map.signalPositionX'), type: 'number', placeholder: 'px' },
- { prop: 'position.y', firstLevel: 'position', secondLevel: 'y', label: this.$t('map.signalPositionY'), type: 'number', placeholder: 'px' },
{ prop: 'rotate', label: this.$t('map.rotateAngle'), type: 'number', min: -90, max: 90, placeholder: this.$t('tip.angle') },
- { prop: 'namePosition.x', firstLevel: 'namePosition', secondLevel: 'x', label: this.$t('map.signalNamePositionX'), type: 'number', placeholder: 'px' },
- { prop: 'namePosition.y', firstLevel: 'namePosition', secondLevel: 'x', label: this.$t('map.signalNamePositionY'), type: 'number', placeholder: 'px' },
+ { prop: 'namePosition', label: this.$t('map.signalNamePosition'), type: 'coordinate', width: '140px', children: [
+ { prop: 'namePosition.x', firstLevel: 'namePosition', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '25px' },
+ { prop: 'namePosition.y', firstLevel: 'namePosition', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '25px' }
+ ] },
{ prop: 'buttonShow', label: this.$t('map.signalButtonShow'), type: 'checkbox' },
- { prop: 'buttonPosition.x', firstLevel: 'buttonPosition', secondLevel: 'x', label: this.$t('map.signalButtonPositionX'), type: 'number', placeholder: 'px' },
- { prop: 'buttonPosition.y', firstLevel: 'buttonPosition', secondLevel: 'x', label: this.$t('map.signalButtonPositionY'), type: 'number', placeholder: 'px' },
+ { prop: 'buttonPosition', label: this.$t('map.signalButtonPosition'), type: 'coordinate', width: '140px', children: [
+ { prop: 'buttonPosition.x', firstLevel: 'buttonPosition', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '25px' },
+ { prop: 'buttonPosition.y', firstLevel: 'buttonPosition', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '25px' }
+ ] },
{ prop: 'guideShow', label: this.$t('map.signalGuideShow'), type: 'checkbox' },
- { prop: 'guidePosition.x', firstLevel: 'guidePosition', secondLevel: 'x', label: this.$t('map.signalGuidePositionX'), type: 'number', placeholder: 'px' },
- { prop: 'guidePosition.y', firstLevel: 'guidePosition', secondLevel: 'x', label: this.$t('map.signalGuidePositionY'), type: 'number', placeholder: 'px' }
+ { prop: 'guidePosition', label: this.$t('map.signalGuidePosition'), type: 'coordinate', width: '140px', children: [
+ { prop: 'guidePosition.x', firstLevel: 'guidePosition', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '25px' },
+ { prop: 'guidePosition.y', firstLevel: 'guidePosition', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '25px' }
+ ] }
]
},
map: {
@@ -244,7 +252,7 @@ export default {
{ prop: 'uniqueName', label: this.$t('map.signalUniqueName'), type: 'input' },
{ prop: 'useType', label: this.$t('map.signalUseType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SignalUseTypeList },
{ prop: 'potLampType', label: this.$t('map.potLampType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SignalPotLampTypeList },
- { prop: 'linkCode', label: 'LinkCode:', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.linkList },
+ { prop: 'linkCode', label: this.$t('map.signalLinkCode')+':', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.linkList },
{ prop: 'offset', label: this.$t('map.signalOffset'), type: 'number', min: 0, placeholder: this.$t('tip.meter') }
]
@@ -267,9 +275,6 @@ export default {
offset: [
{ required: true, message: this.$t('rules.pleaseEnterSignalOffset'), trigger: 'blur' }
],
- stationCode: [
- { required: true, message: this.$t('rules.pleaseEnterSignalStation'), trigger: 'change' }
- ],
'position.x': [
{ required: true, message: this.$t('rules.pleaseEnterSignalPositionX'), trigger: 'blur' }
],
@@ -395,8 +400,6 @@ export default {
this.addModel.sectionCode = selected.code;
}
this.activeName = 'second';
- } else {
- this.activeName = 'second';
}
},
hover(field) {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/station.vue b/src/views/map/mapdraft/mapedit/mapoperate/station.vue
index d065f8470..2b8631965 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/station.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/station.vue
@@ -103,7 +103,7 @@ export default {
]),
form() {
const form = {
- labelWidth: '150px',
+ labelWidth: '130px',
items: {
code: {
name: '',
@@ -114,16 +114,18 @@ export default {
item: [
{ prop: 'code', label: this.$t('map.stationCode'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.stationList, change: true, deviceChange: this.deviceChange },
{ prop: 'name', label: this.$t('map.stationName'), type: 'input' },
- { prop: 'visible', label: this.$t('map.stationVisible'), type: 'checkbox' },
+ { prop: 'position', label: this.$t('map.stationPosition'), type: 'coordinate', width: '120px', children: [
+ { prop: 'position.x', firstLevel: 'position', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '25px' },
+ { prop: 'position.y', firstLevel: 'position', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '25px' }
+ ] },
+ // { prop: 'visible', label: this.$t('map.stationVisible'), type: 'checkbox' },
{ prop: 'nameFont', label: this.$t('map.stationNameFont'), type: 'font', placeholder: this.$t('tip.stationFont') },
{ prop: 'nameFontColor', label: this.$t('map.stationNameFontColor'), type: 'color' },
- { prop: 'kmPostShow', label: this.$t('map.stationKmPostShow'), type: 'checkbox' },
+ // { prop: 'kmPostShow', label: this.$t('map.stationKmPostShow'), type: 'checkbox' },
{ prop: 'kmRange', label: this.$t('map.stationKmRange'), type: 'number', min: 0, placeholder: this.$t('tip.meter') },
{ prop: 'kmPost', label: this.$t('map.stationKmPost'), type: 'input' },
{ prop: 'kmPostFont', label: this.$t('map.stationKmPostFont'), type: 'font', placeholder: this.$t('tip.kilometerFont') },
- { prop: 'kmPostFontColor', label: this.$t('map.stationKmPostFontColor'), type: 'color' },
- { prop: 'position.x', firstLevel: 'position', secondLevel: 'x', label: this.$t('map.stationPositionX'), type: 'number', placeholder: 'px' },
- { prop: 'position.y', firstLevel: 'position', secondLevel: 'y', label: this.$t('map.stationPositionY'), type: 'number', placeholder: 'px' }
+ { prop: 'kmPostFontColor', label: this.$t('map.stationKmPostFontColor'), type: 'color' }
]
},
map: {
@@ -227,8 +229,6 @@ export default {
this.addModel.sectionCode = selected.code;
}
this.activeName = 'second';
- } else {
- this.activeName = 'second';
}
},
create() {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue b/src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue
index e99479825..ca94969f2 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue
@@ -109,8 +109,10 @@ export default {
{ prop: 'zakContent', label: this.$t('map.zakContent'), type: 'input' },
{ prop: 'jjzkContent', label: this.$t('map.jjzkContent'), type: 'input' },
{ prop: 'zzkContent', label: this.$t('map.zzkContent'), type: 'input' },
- { prop: 'position.x', firstLevel: 'position', secondLevel: 'x', label: this.$t('map.pointX'), type: 'number', placeholder: 'px' },
- { prop: 'position.y', firstLevel: 'position', secondLevel: 'y', label: this.$t('map.pointY'), type: 'number', placeholder: 'px' }
+ { prop: 'position', label: this.$t('map.stationControlPosition'), type: 'coordinate', width: '150px', children: [
+ { prop: 'position.x', firstLevel: 'position', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '25px' },
+ { prop: 'position.y', firstLevel: 'position', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '25px' }
+ ] }
]
},
map: {
@@ -200,8 +202,6 @@ export default {
} else if (selected && selected._type.toUpperCase() === 'Station'.toUpperCase()) {
this.addModel.stationCode = selected.code;
this.activeName = 'second';
- } else {
- this.activeName = 'second';
}
},
create() {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue b/src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue
index 460f8019b..f04c25400 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue
@@ -134,16 +134,18 @@ export default {
name: this.$t('map.drawData'),
item: [
{ prop: 'code', label: this.$t('map.relStandCode'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.stationStandList, change: true, deviceChange: this.deviceChange },
- { prop: 'name', label: this.$t('map.stationstandNameColon'), type: 'input', disabled: true },
+ { prop: 'name', label: this.$t('map.stationstandNameColon'), type: 'input' },
+ { prop: 'position', label: this.$t('map.stationstandPosition'), type: 'coordinate', width: '120px', children: [
+ { prop: 'position.x', firstLevel: 'position', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '25px' },
+ { prop: 'position.y', firstLevel: 'position', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '25px' }
+ ] },
{ prop: 'direction', label: this.$t('map.stationstandTopBottom'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.RunDirectionTypeList },
{ prop: 'visible', label: this.$t('map.stationVisible'), type: 'checkbox' },
- { prop: 'nameShow', label: this.$t('map.stationstandShowName'), type: 'checkbox' },
+ // { prop: 'nameShow', label: this.$t('map.stationstandShowName'), type: 'checkbox' },
{ prop: 'doorLocationType', label: this.$t('map.stationstandDirection'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.DoorLocationTypeList },
{ prop: 'hasDoor', label: this.$t('map.stationstandHasDoor'), type: 'checkbox' },
{ prop: 'width', label: this.$t('map.stationstandWidth'), type: 'number', min: 0, max: 2000, placeholder: 'px' },
- { prop: 'height', label: this.$t('map.stationstandHeight'), type: 'number', min: 0, max: 2000, placeholder: 'px' },
- { prop: 'position.x', firstLevel: 'position', secondLevel: 'x', label: this.$t('map.pointX'), type: 'number', placeholder: 'px' },
- { prop: 'position.y', firstLevel: 'position', secondLevel: 'y', label: this.$t('map.pointY'), type: 'number', placeholder: 'px' }
+ { prop: 'height', label: this.$t('map.stationstandHeight'), type: 'number', min: 0, max: 2000, placeholder: 'px' }
]
},
map: {
@@ -261,8 +263,6 @@ export default {
} else if (selected && selected._type.toUpperCase() === 'Station'.toUpperCase()) {
this.addModel.stationCode = selected.code;
this.activeName = 'second';
- } else {
- this.activeName = 'second';
}
},
create() {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/switch.vue b/src/views/map/mapdraft/mapedit/mapoperate/switch.vue
index e786d61aa..7164b8b70 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/switch.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/switch.vue
@@ -110,12 +110,15 @@ export default {
item: [
{ prop: 'code', label: this.$t('map.switchCode'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.switchList, change: true, deviceChange: this.deviceChange },
{ prop: 'name', label: this.$t('map.switchName'), type: 'input' },
- { prop: 'nameShow', label: this.$t('map.switchShowName'), type: 'checkbox' },
- { prop: 'namePoint.x', firstLevel: 'namePoint', secondLevel: 'x', label: this.$t('map.switchPositionX'), type: 'number', placeholder: 'px' },
- { prop: 'namePoint.y', firstLevel: 'namePoint', secondLevel: 'y', label: this.$t('map.switchPositionY'), type: 'number', placeholder: 'px' },
- // { prop: 'timeoutShow', label: this.$t('map.timeoutShow'), type: 'checkbox' },
- { prop: 'tp.x', firstLevel: 'tp', secondLevel: 'x', label: this.$t('map.switchTpX'), type: 'number', placeholder: 'px' },
- { prop: 'tp.y', firstLevel: 'tp', secondLevel: 'y', label: this.$t('map.switchTpY'), type: 'number', placeholder: 'px' }
+ // { prop: 'nameShow', label: this.$t('map.switchShowName'), type: 'checkbox' },
+ { prop: 'namePoint', label: this.$t('map.switchPosition'), type: 'coordinate', width: '160px', children: [
+ { prop: 'namePoint.x', firstLevel: 'namePoint', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '25px' },
+ { prop: 'namePoint.y', firstLevel: 'namePoint', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '25px' }
+ ] },
+ { prop: 'tp', label: this.$t('map.switchTp'), type: 'coordinate', width: '160px', children: [
+ { prop: 'tp.x', firstLevel: 'tp', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '25px' },
+ { prop: 'tp.y', firstLevel: 'tp', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '25px' }
+ ] }
]
},
map: {
@@ -146,9 +149,6 @@ export default {
'namePoint.y': [
{ required: true, message: this.$t('rules.switchNamePointY'), trigger: 'blur' }
],
- stationCode: [
- { required: true, message: this.$t('rules.switchStationCode'), trigger: 'change' }
- ],
turnTime: [
{ required: true, message: this.$t('rules.switchTurnTime'), trigger: 'blur' }
],
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/text.vue b/src/views/map/mapdraft/mapedit/mapoperate/text.vue
index 4095a6318..826216d77 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/text.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/text.vue
@@ -23,12 +23,25 @@
-
-
-
-
+
进入仿真
结束仿真
@@ -158,8 +158,8 @@
v-if="userId == roomInfo.creatorId"
type=""
style="float: right; margin-right: 0px;"
- @click="postCode"
:loading="loading"
+ @click="postCode"
>生成二维码
+ {{ $t('map.textPoints') }}
+
+
+
+
+
@@ -141,16 +141,16 @@
+
+
+
+
+
From 4b7873c2d75fc84294cd8d743a7e6103864ab4b4 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 26 Aug 2019 10:12:39 +0800
Subject: [PATCH 163/172] =?UTF-8?q?ibp=E7=9B=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/assets/ibp_images/ibp_bg.png | Bin 0 -> 5217109 bytes
src/assets/ibp_images/red_button.png | Bin 0 -> 13067 bytes
src/ibp/constant/deviceRender.js | 44 ++++
src/ibp/constant/deviceType.js | 12 ++
src/ibp/constant/ibpData.js | 39 ++++
src/ibp/ibpPan.js | 308 +++++++++++++++++++++++++++
src/ibp/mouseController.js | 201 +++++++++++++++++
src/ibp/options.js | 100 +++++++++
src/ibp/painter.js | 194 +++++++++++++++++
src/ibp/shape/arrow.js | 38 ++++
src/ibp/shape/background.js | 50 +++++
src/ibp/shape/button.js | 26 +++
src/ibp/shape/element/control.js | 105 +++++++++
src/ibp/shape/element/textName.js | 71 ++++++
src/ibp/shape/factory.js | 19 ++
src/ibp/transformHandle.js | 71 ++++++
src/ibp/utils/parser.js | 81 +++++++
src/views/display/index.vue | 18 +-
src/views/display/menuDemon.vue | 4 +
src/views/ibp/index.vue | 154 ++++++++++++++
20 files changed, 1533 insertions(+), 2 deletions(-)
create mode 100644 src/assets/ibp_images/ibp_bg.png
create mode 100644 src/assets/ibp_images/red_button.png
create mode 100644 src/ibp/constant/deviceRender.js
create mode 100644 src/ibp/constant/deviceType.js
create mode 100644 src/ibp/constant/ibpData.js
create mode 100644 src/ibp/ibpPan.js
create mode 100644 src/ibp/mouseController.js
create mode 100644 src/ibp/options.js
create mode 100644 src/ibp/painter.js
create mode 100644 src/ibp/shape/arrow.js
create mode 100644 src/ibp/shape/background.js
create mode 100644 src/ibp/shape/button.js
create mode 100644 src/ibp/shape/element/control.js
create mode 100644 src/ibp/shape/element/textName.js
create mode 100644 src/ibp/shape/factory.js
create mode 100644 src/ibp/transformHandle.js
create mode 100644 src/ibp/utils/parser.js
create mode 100644 src/views/ibp/index.vue
diff --git a/src/assets/ibp_images/ibp_bg.png b/src/assets/ibp_images/ibp_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba2d03cbfad40685fa2de7c0d208bd7c52d9e5fd
GIT binary patch
literal 5217109
zcmc$_2{@GP-#0$CQc{MZZqhV{QjOi%qZ-R3EkZJ(v5ajlWS70jAYqavMYm|7v5mQ`
zAw>2&!i
+
+ {{ $t('global.back') }}
+
+
+ 1*oM$z)
z+|N2dASZ22s{Si!RKcp;6`A7ce}h{#&aOteeb3kX`Gq0VQ?+wTh5nnbXV>=pwlZX#
z$5{7&(+VTda_v*7&We*3ZXNfoMJCu=^9m~$R|t-#>t(mz6wA##z__)dZ~QmjDG|p?yZM1mv6w9K%YlSPeQ6c^6Ky
zno{+w$QbU#UcW40^D*$