joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls

Browse Source
This commit is contained in:
fan 2022-08-04 11:05:04 +08:00
commit e20e212536
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js
View File

@ -529,7 +529,20 @@ export const operateEnum = {
] ]
}, },
RAIL_FILL_IN_REGISTER:{ RAIL_FILL_IN_REGISTER:{
name:'填写行车簿册' name:'填写行车簿册',
isList:true,
params:[
{
code:'stationCode',
name:'车站为',
function:getStationNameById
},
{
code:'line',
name:'单条记录',
function:getRecordByLine
}
]
}, },
RAIL_FILL_IN_TICKET:{ RAIL_FILL_IN_TICKET:{
name:'填写票据' name:'填写票据'
@ -633,6 +646,7 @@ export const operateEnum = {
// 转换函数 // 转换函数
export function covertOperate(operationType, operationParamMap) { export function covertOperate(operationType, operationParamMap) {
debugger;
if (operationType == 'Set_Fault' || operationType == 'Cancel_Fault') { if (operationType == 'Set_Fault' || operationType == 'Cancel_Fault') {
let deviceName = ''; let deviceName = '';
const device = store.getters['map/getDeviceByCode'](operationParamMap.code) || {}; const device = store.getters['map/getDeviceByCode'](operationParamMap.code) || {};
@ -983,6 +997,12 @@ function getDeviceNameById(deviceCode) {
return device.name; return device.name;
} }
function getRecordByLine(line) {
// '{"stationCode":"Station58852","line":{"moonDay":"","hourMinute":"","result":"","noticeTime":{"moonDay":"","hourMinute":"","info":""},"arriveTime":{"moonDay":"","hourMinute":"","info":""},"endTime":{"moonDay":"","hourMinute":"","info":""}}}'
return '，结果为' + line.result;
// JSON.stringify(line);
}
function getTripNumberByCode(code) { function getTripNumberByCode(code) {
return code.slice(3, code.length || 0); return code.slice(3, code.length || 0);
} }

4
src/views/newMap/newMapdraft/dataRelation/bigroutingoperate/route.vue
View File

@ -98,7 +98,7 @@
>{{ $t('map.activate') }}</el-button> >{{ $t('map.activate') }}</el-button>
</el-form-item> </el-form-item>
<el-form-item v-if="!addModel.multiRoute"> <el-form-item v-if="!addModel.multiRoute">
<el-select v-model="addModel.pathSwitchPosition.normal" :placeholder="$t('map.pleaseSelect')"> <el-select key="123" v-model="addModel.pathSwitchPosition.normal" :placeholder="$t('map.pleaseSelect')">
<el-option <el-option
v-for="item in SwitchLocateTypeList" v-for="item in SwitchLocateTypeList"
:key="item.value" :key="item.value"
@ -448,7 +448,7 @@ export default {
this.addModel = { this.addModel = {
...this.initModelData() ...this.initModelData()
}; };
this.$refs.form.resetFields(); // this.$refs.form.resetFields();
} }
this.isModify = false; this.isModify = false;
}, },