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:
fan 2020-04-23 13:37:59 +08:00
commit 880e837285
21 changed files with 90 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/jmapNew/theme/foshan_01/menus/dialog/childDialog/confirmControlSpeed.vue
View File

@ -128,7 +128,7 @@ export default {
this.$emit('setOperate', { step: 1, success: true });
this.doClose();
}
}).catch((error) => {
}).catch(() => {
this.loading = false;
this.$emit('setOperate', { step: 0, success: false });
this.doClose();
@ -147,9 +147,7 @@ export default {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.doClose();
}
}).catch(error => {
this.doClose();
});
}).catch(() => { this.doClose(); });
}
}
};

6
src/jmapNew/theme/foshan_01/menus/dialog/childDialog/confirmSignalUnlock.vue
View File

@ -94,7 +94,7 @@ export default {
this.$emit('setOperate', { step: 1, success: true });
this.doClose();
}
}).catch((error) => {
}).catch(() => {
this.loading = false;
this.$emit('setOperate', { step: 0, success: false });
this.doClose();
@ -112,9 +112,7 @@ export default {
this.$emit('setOperate', { step: 0, success: false });
this.doClose();
}
}).catch(error => {
this.doClose();
});
}).catch(() => { this.doClose(); });
}
}
};

36
src/jmapNew/theme/foshan_01/menus/dialog/trainAddPlan.vue
View File

@ -14,31 +14,31 @@
<div style="width: 96%;">
<el-form-item label="车 组 号:" label-width="95px" prop="trainCode">
<el-select v-model="addModel.trainCode" filterable>
<el-option
v-for="train in trainList"
:key="train.groupNumber"
:label="train.groupNumber"
:value="train.code"
/>
</el-select>
<el-option
v-for="train in trainList"
:key="train.groupNumber"
:label="train.groupNumber"
:value="train.code"
/>
</el-select>
</el-form-item>
<el-form-item label="车 次 号:" label-width="95px" prop="tripNumber">
<el-select v-model="addModel.tripNumber" filterable @change="tripNumberChange">
<el-option
v-for="tripNum in tripNumberList"
:key="tripNum"
:label="tripNum"
:value="tripNum"
v-for="tripNum in tripNumberList"
:key="tripNum"
:label="tripNum"
:value="tripNum"
/>
</el-select>
</el-select>
</el-form-item>
<el-form-item label="服 务 号:" label-width="95px" prop="serviceNumber">
<el-select v-model="addModel.serviceNumber" filterable>
<el-option
v-for="serviceNumber in serviceNumberList"
:key="serviceNumber"
:label="serviceNumber"
:value="serviceNumber"
v-for="serviceNumber in serviceNumberList"
:key="serviceNumber"
:label="serviceNumber"
:value="serviceNumber"
/>
</el-select>
</el-form-item>
@ -61,7 +61,6 @@ import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import { getTripNumberList, getServiceNumbersByTripNum } from '@/api/simulation';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
export default {
// name: 'TrainMove',
name: 'TrainAddPlan',
@ -155,7 +154,8 @@ export default {
}
});
}).catch(error => {
this.$messageBox(error.message);
console.log(error);
// this.$messageBox(error.message);
});
this.dialogShow = true;
this.$nextTick(function () {

4
src/jmapNew/theme/foshan_01/menus/dialog/trainDeletePlan.vue
View File

@ -124,7 +124,7 @@ export default {
if (valid) {
this.doClose();
}
}).catch(error => {
}).catch(() => {
this.loading = false;
this.doClose();
});
@ -143,7 +143,7 @@ export default {
if (valid) {
this.doClose();
}
}).catch(error => { this.doClose(); });
}).catch(() => { this.doClose(); });
}
}
};

4
src/jmapNew/theme/foshan_01/menus/dialog/trainMoveEvently.vue
View File

@ -136,7 +136,7 @@ export default {
if (valid) {
this.doClose();
}
}).catch(error => {
}).catch(() => {
this.loading = false;
this.doClose();
// this.$refs.noticeInfo.doShow(operate);
@ -156,7 +156,7 @@ export default {
if (valid) {
this.doClose();
}
}).catch(error => { this.doClose(); });
}).catch(() => { this.doClose(); });
}
}
};

2
src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/twoConfirmation.vue
View File

@ -121,7 +121,7 @@ export default {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
}
}, 1000).catch((error) => {
}, 1000).catch(() => {
this.$refs.noticeInfo.doShow(operate);
});
}

2
src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/userAdd.vue
View File

@ -155,7 +155,7 @@ export default {
if (valid) {
this.doClose();
}
}).catch(error => { this.doClose(); this.model; });
}).catch(() => { this.doClose(); this.model; });
}
}
};

2
src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/userDelete.vue
View File

@ -127,7 +127,7 @@ export default {
if (valid) {
this.doClose();
}
}).catch(error => { this.doClose(); });
}).catch(() => { this.doClose(); });
}
}
};

2
src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/userEdit.vue
View File

@ -172,7 +172,7 @@ export default {
if (valid) {
this.doClose();
}
}).catch(error => { this.doClose(); });
}).catch(() => { this.doClose(); });
}
}
};

2
src/jmapNew/theme/foshan_01/menus/menuDialog/detainTrainContorl.vue
View File

@ -149,7 +149,7 @@ export default {
} else {
this.disabledSure = false;
}
}).catch((error) => {
}).catch(() => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow(operate);

4
src/jmapNew/theme/foshan_01/menus/menuDialog/detainTrainContorlUpDown.vue
View File

@ -149,7 +149,7 @@ export default {
} else {
this.disabledSure = false;
}
}).catch((error) => {
}).catch(() => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow(operate);
@ -182,7 +182,7 @@ export default {
}
};
</script>
<style scoped rel="stylesheet/scss" lang="scss" scoped>
<style scoped rel="stylesheet/scss" lang="scss">
@import "src/styles/mixin.scss";
/deep/ .el-radio {

4
src/jmapNew/theme/foshan_01/menus/menuDialog/helpAbout.vue
View File

@ -109,7 +109,7 @@ export default {
if (valid) {
this.doClose();
}
}).catch(error => {
}).catch(() => {
this.loading = false;
this.doClose();
});
@ -124,7 +124,7 @@ export default {
if (valid) {
this.doClose();
}
}).catch(error => { this.doClose(); });
}).catch(() => { this.doClose(); });
}
}
};

14
src/jmapNew/theme/foshan_01/menus/menuDialog/manageUser.vue
View File

@ -158,7 +158,7 @@ export default {
if (valid) {
this.$refs.userAdd.doShow(operate);
}
}).catch(error => {
}).catch(() => {
this.loading = false;
});
},
@ -176,7 +176,7 @@ export default {
if (valid) {
this.$refs.userEdit.doShow(operate, this.selected);
}
}).catch(error => {
}).catch(() => {
this.loading = false;
});
} else {
@ -198,7 +198,7 @@ export default {
if (valid) {
this.$refs.userDelete.doShow(operate, this.selected);
}
}).catch(error => {
}).catch(() => {
this.loading = false;
});
} else {
@ -215,7 +215,7 @@ export default {
this.loading = true;
this.$store.dispatch('training/next', operate).then(({ valid }) => {
this.loading = false;
}).catch(error => {
}).catch(() => {
this.loading = false;
});
},
@ -230,7 +230,7 @@ export default {
this.$store.dispatch('training/next', operate).then(({ valid }) => {
this.loading = false;
this.selected = row;
}).catch(error => {
}).catch(() => {
this.loading = false;
});
},
@ -246,7 +246,7 @@ export default {
if (valid) {
this.doClose();
}
}).catch(error => {
}).catch(() => {
this.loading = false;
this.doClose();
});
@ -261,7 +261,7 @@ export default {
if (valid) {
this.doClose();
}
}).catch(error => { this.doClose(); });
}).catch(() => { this.doClose(); });
},
// 增删改函数处理
operateUser(data) {

3
src/jmapNew/theme/foshan_01/menus/menuDialog/stationControl.vue
View File

@ -197,7 +197,6 @@ export default {
} else {
this.disabledSure = false;
}
}).catch(() => {
});
},
// 请求站控
@ -216,7 +215,6 @@ export default {
} else {
this.disabledSure = false;
}
}).catch((error) => {
});
},
// 紧急站控
@ -235,7 +233,6 @@ export default {
} else {
this.disabledSure = false;
}
}).catch(() => {
});
}
}

4
src/jmapNew/theme/foshan_01/menus/menuDialog/trainAdd.vue
View File

@ -137,7 +137,7 @@ export default {
} else {
// this.$refs.noticeInfo.doShow(operate);
}
}).catch(error => {
}).catch(() => {
this.loading = false;
this.doClose();
// this.$refs.noticeInfo.doShow(operate);
@ -157,7 +157,7 @@ export default {
if (valid) {
this.doClose();
}
}).catch(error => { this.doClose(); });
}).catch(() => { this.doClose(); });
}
}
};

4
src/jmapNew/theme/foshan_01/menus/menuDialog/trainDelete.vue
View File

@ -120,7 +120,7 @@ export default {
} else {
// this.$refs.noticeInfo.doShow(operate);
}
}).catch(error => {
}).catch(() => {
this.loading = false;
this.doClose();
// this.$refs.noticeInfo.doShow(operate);
@ -140,7 +140,7 @@ export default {
if (valid) {
this.doClose();
}
}).catch(error => { this.doClose(); });
}).catch(() => { this.doClose(); });
}
}
};

4
src/jmapNew/theme/foshan_01/menus/menuDialog/trainTranstalet.vue
View File

@ -137,7 +137,7 @@ export default {
} else {
// this.$refs.noticeInfo.doShow(operate);
}
}).catch(error => {
}).catch(() => {
this.loading = false;
this.doClose();
// this.$refs.noticeInfo.doShow(operate);
@ -157,7 +157,7 @@ export default {
if (valid) {
this.doClose();
}
}).catch(error => { this.doClose(); });
}).catch(() => { this.doClose(); });
}
}
};

4
src/jmapNew/theme/foshan_01/menus/passiveDialog/control.vue
View File

@ -264,7 +264,7 @@ export default {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.doClose();
}
}).catch((error) => {
}).catch(() => {
this.$refs.noticeInfo.doShow(operate);
});
},
@ -284,7 +284,7 @@ export default {
if (valid) {
this.doClose();
}
}).catch((error) => {
}).catch(() => {
this.$refs.noticeInfo.doShow(operate);
});
}

70
src/jmapNew/theme/haerbin_01/menus/dialog/trainInitPlan.vue
View File

@ -12,38 +12,38 @@
>
<div class="el-dialog-div">
<el-form ref="form" size="small" label-width="100px" :model="addModel" :rules="rules" label-position="left">
<el-form-item prop="trainCode" label="车组号:">
<!--<el-input v-model="addModel.trainCode"/>-->
<el-select v-model="addModel.trainCode" filterable>
<el-option
v-for="train in trainList"
:key="train.groupNumber"
:label="train.groupNumber"
:value="train.code"
/>
</el-select>
</el-form-item>
<el-form-item label="车次号:" prop="tripNumber">
<!--<el-input v-model="addModel.tripNumber"/>-->
<el-select v-model="addModel.tripNumber" @change="tripNumberChange" filterable>
<el-option
v-for="tripNum in tripNumberList"
:key="tripNum"
:label="tripNum"
:value="tripNum"
/>
</el-select>
</el-form-item>
<el-form-item label="服务号:" prop="serviceNumber">
<el-select v-model="addModel.serviceNumber" filterable>
<el-option
v-for="serviceNumber in serviceNumberList"
:key="serviceNumber"
:label="serviceNumber"
:value="serviceNumber"
/>
</el-select>
</el-form-item>
trainCode" label="车组号:">
inCode"/>-->
rainCode" filterable>
"车次号:" prop="tripNumber">
dModel.tripNumber"/>-->
del.tripNumber" filtefiltefiltefilt filtefilterable @change="tripNumberChange"
item>
tem label="服务号:" prop="serviceNumber">
addModel.serviceNumber" filterable>
t"
item>
</el-form>
</div>
<el-row justify="center" class="button-group">
@ -150,7 +150,8 @@ export default {
}
});
}).catch(error => {
this.$messageBox(error.message);
console.log(error);;
// this.$messageBox(error.message);
});
this.dialogShow = true;
this.$nextTick(function () {
@ -185,10 +186,11 @@ export default {
this.doClose();
}
}).catch(error => {
; ;onsole.log(error);
this.loading = false;
this.doClose();
// this.$refs.noticeInfo.doShow(operate);
this.$messageBox(error.message);
// this.$messageBox(error.message);
});
} else {
return false;

3
src/jmapNew/theme/ningbo_01/menus/dialog/trainAddPlan.vue
View File

@ -155,7 +155,8 @@ export default {
}
});
}).catch(error => {
this.$messageBox(error.message);
console.log(error);
// this.$messageBox(error.message);
});
this.dialogShow = true;
this.$nextTick(function () {

3
src/jmapNew/theme/xian_02/menus/dialog/trainAddPlan.vue
View File

@ -155,7 +155,8 @@ export default {
}
});
}).catch(error => {
this.$messageBox(error.message);
console.log(error);
// this.$messageBox(error.message);
});
this.dialogShow = true;
this.$nextTick(function () {