+
-
@@ -409,9 +409,88 @@
-
+
@@ -430,8 +509,11 @@ export default {
operateTableHeight: 100,
searchTableHeight: 260,
tableHeight: 200,
+ trainTableHeight: 200,
activeTab: 'operate',
cmdTab: 'cmd',
+ wordTab: 'word',
+ wirelessTab: 'wireless',
textTab: 'text',
typeObj: {
Normal: '普通调度命令',
@@ -527,15 +609,24 @@ export default {
{ value: '', label: '全部'},
{ value: true, label: '只显示签收完成的'},
{ value: false, label: '只显示未签收完成的'}
- ]
+ ],
+ wirelessObj: {
+ type: 'dispatchCmd',
+ transStationCode: '',
+ trainNum: '',
+ code: ''
+ },
+ trainRow: null,
+ trainTableData: [],
+ permissionWireless: false
};
},
computed: {
...mapState('training', [
- 'memberList', 'memberData', 'simulationUserList', 'initTime'
+ 'memberList', 'memberData', 'simulationUserList'
]),
...mapState('socket', [
- 'dispatchCommandState'
+ 'dispatchCommandState', 'simulationTimeSync'
]),
currentStatus() {
let s = '编辑';
@@ -559,6 +650,14 @@ export default {
}
return s;
},
+ disabledTrainAllograph() {
+ let s = false;
+ const sArr = ['Sent', 'Received', 'SrmReceived'];
+ if (!this.trainRow || !sArr.includes(this.getCurrentState(this.trainRow).state)) {
+ s = true;
+ }
+ return s;
+ },
typeOptions() {
const list = [];
Object.keys(this.typeObj).forEach(item => {
@@ -570,7 +669,7 @@ export default {
return list;
},
getSimulationTime() {
- const t = parseTime(this.initTime, '{h}:{i}:{s}');
+ const t = parseTime(this.simulationTimeSync, '{h}:{i}:{s}');
const tArr = t.split(':');
let s = ' ';
let h = tArr[0];
@@ -613,6 +712,11 @@ export default {
},
DisStationId() {
return this.getActiveSender.deviceCode ? this.getActiveSender.deviceCode : '';
+ },
+ transStationOption() {
+ // const list = [...this.getTableData, {code:'', name: 'GSM-R系统'}];
+ const list = [...this.getTableData];
+ return list;
}
},
watch: {
@@ -620,7 +724,7 @@ export default {
this.allographRow = null;
},
dispatchCommandState(obj) {
- Object.values(obj.cpStateMap).forEach(item => {
+ obj && Object.values(obj.cpStateMap).forEach(item => {
if (item.cpId) {
if (!this.queryResData.companyStateMap) {
this.queryResData.companyStateMap = {};
@@ -633,6 +737,12 @@ export default {
this.getOperateTableHeight();
this.getSearchTableHeight();
this.getTableHeight();
+ this.getTrainTableHeight();
+ },
+ '$store.state.socket.simulationReset': function (val) {
+ this.queryResData = {};
+ this.$store.dispatch('socket/setDispatchCommandState', null);
+ this.initData();
}
},
beforeDestroy() {},
@@ -645,8 +755,180 @@ export default {
this.getOperateTableHeight();
this.getSearchTableHeight();
this.getTableHeight();
+ this.getTrainTableHeight();
},
methods:{
+ trainAllographCmd() {
+ if (!this.trainRow) { return; }
+ const test = `将为【${this.trainRow.trainNum}】次列车，代签 无线调度命令`;
+ const messageData = [test];
+ const h = this.$createElement;
+ messageData.push(h('p', null, '代签之前，请务必与本次列车司机联系确认！'));
+ messageData.push(h('p', null, '您确定要进行【无线调度命令 代签】操作吗？'));
+ this.$confirm('提示', {
+ title: '无线代签操作提示',
+ message: h('div', null, messageData),
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ console.log('无线受令代签');
+ const rcId = this.getRcId(this.trainRow.code);
+ const params = {cmdId: this.command.cmdId, rcId: rcId, proxySign: true};
+ const operate = {
+ operation: this.getDomObj('trainAllographCmd').operation,
+ param: params,
+ userOperationType: UserOperationType.LEFTCLICK
+ };
+ this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+ if (valid) {
+ sendCommandNew(this.group, 'CTC_SIGN_DIS_COMMAND', params).then((res) => {
+ console.log(res, '---res');
+ this.$message.success('无线受令代签成功！');
+ this.searchCmd();
+ this.initData();
+ }).catch(error => {
+ this.$messageBox('无线受令代签令失败：' + error.message);
+ });
+ }
+ });
+ }).catch((err) => {
+ console.log('取消无线受令代签', err);
+ });
+ },
+ getRcId(val) {
+ let id = '';
+ const find = this.command.rcvCompanies.find(item => {
+ return item.code == val;
+ });
+ if (find && find.id) {
+ id = find.id;
+ }
+ return id;
+ },
+ getTransStationName(code) {
+ let name = '';
+ const find = this.transStationOption.find(item => {
+ return item.code == code;
+ });
+ if (find) {
+ name = find.name;
+ }
+ return name;
+ },
+ permissionAdd() {
+ if (this.permissionWireless) { return; }
+ const operate = {
+ operation: this.getDomObj('permissionAddWireless').operation,
+ userOperationType: UserOperationType.LEFTCLICK
+ };
+ this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+ if (valid) {
+ this.permissionWireless = true;
+ this.initWirelessData();
+ }
+ });
+ },
+ initWirelessData() {
+ this.wirelessObj = {
+ ...this.resetWirelessData()
+ };
+ this.trainRow = null;
+ this.trainTableData = [];
+ },
+ resetWirelessData() {
+ return {
+ type: 'dispatchCmd',
+ transStationCode: '',
+ trainNum: '',
+ code: ''
+ };
+ },
+ findTrainToTable() {
+ if (!this.wirelessObj.trainNum) {
+ this.$messageBox('请选择车次号');
+ return;
+ }
+ const operate = {
+ operation: this.getDomObj('findTrain').operation,
+ param: {...this.wirelessObj},
+ userOperationType: UserOperationType.LEFTCLICK
+ };
+ this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+ if (valid) {
+ sendCommandNew(this.group, 'Train_Query_Trip_Number_Online_Train', {tripNumber: this.wirelessObj.trainNum}).then((res) => {
+ const code = res.data;
+ this.wirelessObj.code = code;
+ const obj = {
+ name: '',
+ code: code,
+ cpType: 'Train',
+ rsCompany: true,
+ trainViaGsmR: !this.wirelessObj.transStationCode,
+ trainNum: this.wirelessObj.trainNum,
+ transStationCode: this.wirelessObj.transStationCode
+ };
+ const index = this.trainTableData.findIndex(item => {
+ return item.code == code;
+ });
+ if (index >= 0) {
+ this.trainTableData.splice(index, 1, obj);
+ } else {
+ this.trainTableData.push(obj);
+ }
+ const rcIndex = this.command.rcvCompanies.findIndex(item => {
+ return item.code == code;
+ });
+ if (rcIndex >= 0) {
+ this.command.rcvCompanies.splice(rcIndex, 1, obj);
+ } else {
+ this.command.rcvCompanies.push(obj);
+ }
+ }).catch(error => {
+ this.$messageBox('查找机车失败：' + error.message);
+ });
+ }
+ });
+ },
+ deleteTrainTable() {
+ const operate = {
+ operation: this.getDomObj('deleteTrainTable').operation,
+ param: this.trainRow,
+ userOperationType: UserOperationType.LEFTCLICK
+ };
+ this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+ if (valid) {
+ const index = this.trainTableData.findIndex(item => {
+ return item == this.trainRow;
+ });
+ if (index >= 0) {
+ this.trainTableData.splice(index, 1);
+ }
+ const rcIndex = this.command.rcvCompanies.findIndex(item => {
+ return item == this.trainRow;
+ });
+ if (index >= 0) {
+ this.command.rcvCompanies.splice(rcIndex, 1);
+ }
+ this.trainRow = null;
+ }
+ });
+ },
+ trainTableRowChange(row) {
+ this.trainRow = row;
+ this.setCurrentRow(row, 'table6');
+ },
+ getTrainTableHeight() {
+ const allH = this.$store.state.app.height;
+ const rightTopH = 241;
+ const fH = 160;
+ const tabHeardH = 29;
+ const paddingH = 10;
+ const btnH = 40;
+ let h = allH - rightTopH - fH - tabHeardH - paddingH - btnH;
+ h = h > 0 ? h : 0;
+ this.trainTableHeight = h;
+ },
getDomObj(key) {
return OperationEvent.DispatchCmd.menuButton[key];
},
@@ -746,9 +1028,9 @@ export default {
}
});
}
- if (state == 'Signed') {
- console.log(list, 'list');
- }
+ // if (state == 'Signed') {
+ // console.log(list, 'list');
+ // }
return list.reverse();
},
findDisCmdObj(obj, val) {
@@ -830,7 +1112,7 @@ export default {
return status;
},
setCurrentRow(obj, refName) {
- const tableArr = ['table', 'table1', 'table2', 'table3', 'table4', 'table5'];
+ const tableArr = ['table', 'table1', 'table2', 'table3', 'table4', 'table5', 'table6'];
tableArr.forEach(key => {
if (key != refName) {
this.$refs[key] && this.$refs[key].setCurrentRow();
@@ -849,12 +1131,20 @@ export default {
});
this.setCurrentRow(obj, refName);
this.$refs.table.clearSelection();
+ this.initWirelessData();
const infoList = this.command.rcvCompanies || [];
infoList.forEach(item => {
- const findObj = this.getTableData.find(ii => {
- return ii.code == item.code;
- });
- findObj && this.$refs.table.toggleRowSelection(findObj, true);
+ if (item.cpType == 'Train') {
+ this.trainTableData.push(item);
+ if (refName == 'table1') {
+ this.permissionWireless = true;
+ }
+ } else {
+ const findObj = this.getTableData.find(ii => {
+ return ii.code == item.code;
+ });
+ findObj && this.$refs.table.toggleRowSelection(findObj, true);
+ }
});
},
getSignedBy(info) {
@@ -990,6 +1280,8 @@ export default {
this.command = {
...this.resetData()
};
+ this.initWirelessData();
+ this.permissionWireless = false;
// this.currentInfo = {};
this.$refs.table && this.$refs.table.clearSelection();
this.$refs.form && this.$refs.form.resetFields();
@@ -1032,17 +1324,21 @@ export default {
console.log('tabClick');
},
selectionChange(selection) {
- const arr = [];
selection.forEach(item => {
- arr.push({
- name: item.name,
- rsCompany: true,
- cpType: item.cpType,
- code: item.code,
- ...item
+ const find = this.command.rcvCompanies.find(every => {
+ return item.code == every.code;
});
+ if (!find) {
+ const obj = {
+ name: item.name,
+ rsCompany: true,
+ cpType: item.cpType,
+ code: item.code,
+ ...item
+ };
+ this.command.rcvCompanies.push(obj);
+ }
});
- this.command.rcvCompanies = arr;
},
getCompanyIdList(sum) {
return new Promise((resolve, reject) => {
@@ -1125,7 +1421,8 @@ export default {
type: 'warning'
}).then(() => {
console.log('代签');
- const params = {cmdId: this.command.cmdId, rcId: this.allographRow.cpId, proxySign: true};
+ const rcId = this.getRcId(this.allographRow.code);
+ const params = {cmdId: this.command.cmdId, rcId: rcId, proxySign: true};
const operate = {
operation: this.getDomObj('allographCmd').operation,
param: params,
@@ -1143,8 +1440,8 @@ export default {
});
}
});
- }).catch(() => {
- console.log('取消代签');
+ }).catch((err) => {
+ console.log('取消代签', err);
});
},
sendCmd() {
@@ -1152,7 +1449,8 @@ export default {
const messageData = [test];
const h = this.$createElement;
this.command.rcvCompanies.forEach((item, index) => {
- const msg = `${index + 1}. ${item.name || ''}`;
+ const txtTrainNum = item.trainNum ? item.trainNum + '车次' : '';
+ const msg = `${index + 1}. ${item.name || ''} ${txtTrainNum}`;
messageData.push(h('p', null, msg));
});
this.$confirm('提示', {
@@ -1302,7 +1600,7 @@ export default {
content: "";
position: absolute;
}
- .middle, .left {
+ .middle, .left, .right {
.middle-padding {
padding-right: 5px;
}
@@ -1324,6 +1622,19 @@ export default {
align-items: center;
}
}
+ .right {
+ height: 100%;
+ .right-top {
+ .word-box {
+ padding: 5px;
+ height: 200px;
+ overflow: auto;
+ }
+ }
+ .wirelessTab-footer {
+ height: 40px;
+ }
+ }
}
diff --git a/src/views/newMap/display/terminals/floodControlSafetyTable/controlTable.vue b/src/views/newMap/display/terminals/floodControlSafetyTable/controlTable.vue
new file mode 100644
index 000000000..77fd480c0
--- /dev/null
+++ b/src/views/newMap/display/terminals/floodControlSafetyTable/controlTable.vue
@@ -0,0 +1,378 @@
+
+
+
{{ covertName(content.memberId) }}
@@ -101,8 +101,10 @@ export default {
}
},
watch: {
- '$store.state.socket.simulationReset': function () { // 仿真重置
- this.messageList = [];
+ '$store.state.socket.simulationReset': function (val) { // 仿真重置
+ if (val) {
+ this.messageList = [];
+ }
},
'$store.state.training.domConfig': function(val) {
this.trainingDesign = val.trainingDesign;
@@ -144,8 +146,13 @@ export default {
playAllAudio() {
this.$nextTick(function() {
this.currentMessage = this.currentAudioList.shift();
+ console.log(this.currentMessage, '************');
+ if (this.currentMessage.type === 'Text') {
+ return;
+ }
document.querySelector('#audioPlay').src = this.currentMessage.audioPath;
document.querySelector('#audioPlay').play();
+ console.log(document.querySelector('#audioPlay'), '--------------');
this.$set(this.currentMessage, 'activeAuto', true);
this.play = true;
document.querySelector('#audioPlay').onended = () => {
@@ -454,6 +461,7 @@ export default {
top: 0;
border-radius: 50%;
}
+.eachChatContent{width: 100%;min-height: 65px;display:inline-block;}
.chat-box-footer-send.disbled{
cursor: no-drop;
}
diff --git a/src/views/newMap/display/exam/examPanel.vue b/src/views/newMap/display/exam/examPanel.vue
index ad437ab25..2e50d5c5a 100644
--- a/src/views/newMap/display/exam/examPanel.vue
+++ b/src/views/newMap/display/exam/examPanel.vue
@@ -1,10 +1,10 @@
-
-
+
-
-
- 满分: {{ composition.fullScore }}
- 考试时间: {{ composition.validDuration }}分钟
- 理论题
-
-
-
- {{ index + 1 }}
-
- 实训题
-
-
-
-
- {{ index + 1 }}
-
- 理论题
+
+
+
+ {{ index + 1 }}
+
+ 实训题
+
+
+
+
+ {{ index + 1 }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/newMap/display/terminals/abnormalTrain/index.vue b/src/views/newMap/display/terminals/abnormalTrain/index.vue
new file mode 100644
index 000000000..f2bc7929c
--- /dev/null
+++ b/src/views/newMap/display/terminals/abnormalTrain/index.vue
@@ -0,0 +1,110 @@
+
+ | 非正常情况接发列车关键环节控制表 | +|||||||||
|
+
+ 值班员：
+
+
+
+ |
+
+
+ 干部上岗是由：
+
+
+ |
+
+
+ 监控干部：
+
+
+ |
+
+
+ 天气：
+
+
+ |
+
+
+ 日期：
+
+
+ |
+ |||||
|
+ 通知干部上岗
+ |
+
+ 报告列车调度员
+ |
+
+ 报告指挥中心
+ |
+
+ 监控干部到岗
+ |
+
+ 安排工作人员
+ |
+ |||||
| 登记单位 | +运统46登记 | +运统46签认 | +报告列车调度员 | +调度命令核对、接收 | +运统46到点、签认 | +运统46销记、签认 | +调度命令核对、接收 | +||
|
+ |
+
+ |
+
+ |
+
+ |
+
+ |
+
+ |
+ ||||
| 注：1.以上内容，只对涉及的项目监控后划“√”。2.车务发现或接到报告设备故障时，可立即报告列车调度员，然后登记，有关单位签认 | +|||||||||
| 故障（施工、天窗、维修作业）内容： |
+ |||||||||
| 区间闭塞、封闭情况 | +|||||||||
| 接车进路准备方式 | +|||||||||
| 接车信号 | +|||||||||
| 发车进路准备方式发车凭证 | +|||||||||
| 其他关键环节 | +|||||||||
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/newMap/display/terminals/diagramEdit/components/routingoperate/routeMap.vue b/src/views/newMap/display/terminals/diagramEdit/components/routingoperate/routeMap.vue
index f250fd50b..e98f2c255 100644
--- a/src/views/newMap/display/terminals/diagramEdit/components/routingoperate/routeMap.vue
+++ b/src/views/newMap/display/terminals/diagramEdit/components/routingoperate/routeMap.vue
@@ -4,7 +4,7 @@
+
+
+
+
+
+
- 常用词汇
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查找机车
+
+
+
+
+
+ {{ scope.row.code || 'XXXXXX' }}
+
+
+
+
+ {{ getSignedStatus(getCurrentState(scope.row)) }}
+
+
+
+
+ {{ getSignedBy(getCurrentState(scope.row)) || '' }}
+
+
+
+
+ {{ getCurrentState(scope.row).time || '' }}
+
+
+
+
+ {{ getTransStationName(scope.row.transStationCode) }}
+
+
+
+
+
+ 增加
+ 代签
+ 删除
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/newMap/display/terminals/floodControlSafetyTable/index.vue b/src/views/newMap/display/terminals/floodControlSafetyTable/index.vue
new file mode 100644
index 000000000..b47454e05
--- /dev/null
+++ b/src/views/newMap/display/terminals/floodControlSafetyTable/index.vue
@@ -0,0 +1,110 @@
+
+ | 防洪安全上岗签到表 | +|||||||
|
+
+ 车站：
+
+
+
+ |
+
+
+ 车站值班员：
+
+
+ |
+
+
+ 日期：
+
+
+ |
+ |||||
| 车站值班员收、发通知记录表 | +|||||||
| 汇报人姓名 | +通知车站时间 | +通知方式 | +险情类别 | +雨量值（级） | +通知站长时间 | +站长到岗时间 | +站长签名 | +
| |
+
+ |
+ |
+ |
+ |
+
+ |
+
+ |
+ |
+
| 发生雨量值（级）或险情地点： |
+ 行车要求： |
+ ||||||
| + | |||||||
| 站长通知战区防洪小组记录表 | +|||||||
| 序号 | +通知单位名称 | +接收人姓名 | +通知时间 | +通知方式 | +备注 | +||
| {{ index + 1 }} | +
+ |
+ ||||||
| + | |||||||
| 战区防洪人员签到记录表 | +|||||||
| 序号 | +单位名称（工区） | +到达时间 | +职务 | +联系电话 | +签名 | +返回时间 | +|
| {{ index + 1 }} | +
+ |
+
+ |
+ |||||
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/newMap/display/terminals/index.vue b/src/views/newMap/display/terminals/index.vue
index c8ae59129..749df5fdc 100644
--- a/src/views/newMap/display/terminals/index.vue
+++ b/src/views/newMap/display/terminals/index.vue
@@ -25,7 +25,7 @@
+
+
+
+
+
+ PSL
-
-
+
![]()
-
禁止
允许
+
![]()
禁止
-
+
![]()
-
开门按钮
+
![]()
关门按钮
-
+
![]()
import icons from '@/assets/psl_images/psl_icons';
-import { getPslStatus, pressPslButton } from '@/api/simulation';
+import { getPslStatus } from '@/api/simulation';
import {mapGetters} from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
export default {
name: 'PSL',
data() {
@@ -112,6 +114,9 @@ export default {
]),
group() {
return this.$route.query.group;
+ },
+ psl() {
+ return OperationEvent.Psl;
}
},
watch: {
@@ -147,9 +152,23 @@ export default {
this.indicators = resp.data;
}
})
- .catch(err => {});
+ .catch(() => {});
+ },
+ standCodeChange(val) {
+ const operate = {
+ start: true,
+ over: true,
+ operation: OperationEvent.Psl.standChange.change.operation,
+ param: {
+ standCode: val
+ }
+ };
+ this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+ if (valid) {
+ this.initData(this.group, this.standCode);
+ }
+ });
},
-
doClose() {
this.loading = false;
this.dialogShow = false;
@@ -159,7 +178,25 @@ export default {
return status !== undefined ? icons[`${type}_${status}`] : icons[type];
},
btnClickHandler(btnType) {
- pressPslButton(this.group, this.standCode, btnType);
+ const operationMap = {
+ YXJZ: this.psl.pslOperation.turn.operation,
+ HSJC: this.psl.hsjcOperation.turn.operation,
+ KM: this.psl.openDoor.button.operation,
+ GM: this.psl.closeDoor.button.operation,
+ SD: this.psl.testLamp.button.operation
+ };
+ const operate = {
+ start: true,
+ send: true,
+ operation: operationMap[btnType],
+ cmdType: CMD.PSL.CMD_PSL_PRESS_BUTTON,
+ param: {
+ standCode: this.standCode,
+ button: btnType
+ }
+ };
+ this.$store.dispatch('trainingNew/next', operate);
+ // pressPslButton(this.group, this.standCode, btnType);
}
}
};
diff --git a/src/views/newMap/display/terminals/registerBook.vue b/src/views/newMap/display/terminals/registerBook.vue
index e7916f83f..858e8e82d 100644
--- a/src/views/newMap/display/terminals/registerBook.vue
+++ b/src/views/newMap/display/terminals/registerBook.vue
@@ -1,115 +1,166 @@
-
试灯按钮
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 保存
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/newMap/display/terminals/trainTicket/greenLicence.vue b/src/views/newMap/display/terminals/trainTicket/greenLicence.vue
index cda2ba62c..cbe3aea40 100644
--- a/src/views/newMap/display/terminals/trainTicket/greenLicence.vue
+++ b/src/views/newMap/display/terminals/trainTicket/greenLicence.vue
@@ -3,36 +3,36 @@
簿册
-
- 新增
-
-
+ 新增
+
+ 许 可 证
第
- 号
在
-
+
出站（进路）信号机故障
未设出站信号机
列车头部越过出站（进路）信号机
的情况下，准许第
-
{{ greenLicenseForm.stationSeal }}（站名印）车站值班员（签名）
-
-
年
- 月
- 日填发
-
+
+
+
diff --git a/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/route.vue b/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/route.vue
index 946dd5c50..c258c1cc8 100644
--- a/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/route.vue
@@ -101,7 +101,7 @@
>{{ $t('map.activate') }}
-
+