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

Browse Source
This commit is contained in:
joylink_cuiweidong 2020-05-25 14:56:02 +08:00
commit b67adf1afb
4 changed files with 3 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/jmapNew/shape/Signal/ESigPost.js
View File

@ -33,6 +33,7 @@ class ESigPost extends Group {
this.hor = new Polyline({ this.hor = new Polyline({
zlevel: model.zlevel, zlevel: model.zlevel,
z: model.z, z: model.z,
_val: '3',
shape: { shape: {
points: [ points: [
[model.x, model.y], [model.x, model.y],

2
src/jmapNew/shape/Signal/index.js
View File

@ -67,6 +67,7 @@ class Signal extends Group {
this.ciConfirm = new Text({ this.ciConfirm = new Text({
zlevel: this.zlevel, zlevel: this.zlevel,
z: this.z, z: this.z,
_val: '3',
silent: false, silent: false,
_subType: 'enabled', _subType: 'enabled',
style: { style: {
@ -110,6 +111,7 @@ class Signal extends Group {
this.tText = new Text({ this.tText = new Text({
zlevel: this.zlevel, zlevel: this.zlevel,
z: this.z, z: this.z,
_val: '3',
style: { style: {
x: endPoint.x, x: endPoint.x,
y: endPoint.y, y: endPoint.y,

37
src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue
View File

@ -50,21 +50,6 @@
v-model="formModel.destinationCode" v-model="formModel.destinationCode"
/> />
</el-form-item> </el-form-item>
<!--<el-form-item v-if="formModel.type == '03'" :label="this.$t('menu.category')+this.$t('global.colon')" prop="category">-->
<!--<el-select-->
<!--:id="domIdTrainNumber"-->
<!--v-model="formModel.category"-->
<!--filterable-->
<!--:disabled="true"-->
<!--&gt;-->
<!--<el-option-->
<!--v-for="item in categoryList"-->
<!--:key="item.value"-->
<!--:label="item.name"-->
<!--:value="item.value"-->
<!--/>-->
<!--</el-select>-->
<!--</el-form-item>-->
</el-form> </el-form>
<el-row justify="center" class="button-group"> <el-row justify="center" class="button-group">
<el-col :span="10" :offset="2"> <el-col :span="10" :offset="2">
@ -424,28 +409,6 @@ export default {
editTrainId() { editTrainId() {
this.$refs['form'].validate((valid) => { this.$refs['form'].validate((valid) => {
if (valid) { if (valid) {
// const operate = {
// send: true,
//
// operation: OperationEvent.Train.editTrainId.menu.operation,
// cmdType: CMD.Train.CMD_EDIT_TRAIN_ID,
// messages: [this.$t('tip.editTrainIdTip')],
// val: `${this.formModel.trainType}::${this.formModel.tripNumber}`
// };
//
// this.loading = true;
// this.$store.dispatch('training/next', operate).then(({ valid }) => {
// this.loading = false;
// if (valid) {
// this.doClose();
// this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
// this.$refs.confirmTrain.doShow(operate);
// }
// }).catch(() => {
// this.loading = false;
// this.doClose();
// this.$refs.noticeInfo.doShow();
// });
const params = { const params = {
groupNumber: this.formModel.groupNumber, groupNumber: this.formModel.groupNumber,
type: this.formModel.type, type: this.formModel.type,

1
src/views/components/StatusIcon/statusIcon.vue
View File

@ -68,7 +68,6 @@ export default {
this.$store.state.map.holdStandList.forEach(item => { this.$store.state.map.holdStandList.forEach(item => {
const stand = this.$store.getters['map/getDeviceByCode'](item); const stand = this.$store.getters['map/getDeviceByCode'](item);
const station = this.$store.getters['map/getDeviceByCode'](stand.stationCode); const station = this.$store.getters['map/getDeviceByCode'](stand.stationCode);
console.log(station);
const dir = stand.right ? '上行站台' : '下行站台'; const dir = stand.right ? '上行站台' : '下行站台';
if (stand) { if (stand) {
this.tip = this.tip + station.name + ':<br>' + dir + '站台存在扣车命令'; this.tip = this.tip + station.name + ':<br>' + dir + '站台存在扣车命令';