Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
This commit is contained in:
joylink_cuiweidong
commit
15c6a151c9
@ -50,6 +50,8 @@ const Trainingmanage = () => import('@/views/lesson/trainingmanage/index');
|
||||
const LessonEdit = () => import('@/views/lesson/lessoncategory/index');
|
||||
const LessonHome = () => import('@/views/lesson/home');
|
||||
const LessonDetail = () => import('@/views/lesson/details');
|
||||
const BigScreen = () => import('@/views/designPlatform/bigScreen');
|
||||
const BigSplitScreen = () => import('@/views/designPlatform/bigSplitScreen');
|
||||
|
||||
const ScriptmanageHome = () => import('@/views/scriptManage/home');
|
||||
const ScriptDisplay = () => import('@/views/scriptManage/display/index');
|
||||
@ -245,6 +247,16 @@ export const publicAsyncRoute = [
|
||||
component: JointTrainingNew,
|
||||
hidden: true
|
||||
},
|
||||
{
|
||||
path: '/displayBigScreen/:mapId',
|
||||
component: BigScreen,
|
||||
hidden: true
|
||||
},
|
||||
{ // 大屏切分
|
||||
path: '/bigSplitScreen/:mapId',
|
||||
component: BigSplitScreen,
|
||||
hidden: true
|
||||
},
|
||||
{
|
||||
path: '/jlmap3d',
|
||||
component: Jlmap3d,
|
||||
@ -363,6 +375,11 @@ export const asyncRouter = [
|
||||
component: MapPreviewNew,
|
||||
hidden: true
|
||||
},
|
||||
{
|
||||
path: 'bigScreen/:mapId',
|
||||
component: BigScreen,
|
||||
hidden: true
|
||||
},
|
||||
{ // ibp列表
|
||||
path: 'ibp/home/:mapId',
|
||||
component: IbpHome,
|
||||
|
||||
@ -132,11 +132,6 @@ export default {
|
||||
components: { QrcodeVue, FloatPart },
|
||||
data() {
|
||||
const validateUsername = (rule, value, callback) => {
|
||||
// if (value.length < 5 && !this.project.endsWith('gzb')) {
|
||||
// callback(new Error(this.$t('login.enterTheCorrectUserName')));
|
||||
// } else {
|
||||
// callback();
|
||||
// }
|
||||
if (value) {
|
||||
callback();
|
||||
} else {
|
||||
@ -229,26 +224,18 @@ export default {
|
||||
},
|
||||
syncLogin() {
|
||||
const synchronousLogin = ['IBP', 'LSW', 'CCTV', 'ISCS_LW', 'ISCS_CW', 'VR_PSD'];
|
||||
if (this.$route.query.type) {
|
||||
return synchronousLogin.includes(this.$route.query.type);
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
return this.$route.query.type ? synchronousLogin.includes(this.$route.query.type) : false;
|
||||
},
|
||||
loadingText() {
|
||||
const textMap = {
|
||||
ISCS_LW: '检测主现地工作站登录中',
|
||||
ISCS_CW: '检测主行调工作站登录中',
|
||||
IBP: '检测主现地工作站登陆中',
|
||||
ISCS_LW: '检测现地工作站登录中',
|
||||
ISCS_CW: '检测行调工作站登录中',
|
||||
IBP: '检测现地工作站登陆中',
|
||||
CCTV: '检测教研机登录中',
|
||||
VR_PSD: '检测教研机登录中',
|
||||
LSW: '检测教研机登录中'
|
||||
};
|
||||
if (this.$route.query.type) {
|
||||
return textMap[this.$route.query.type];
|
||||
} else {
|
||||
return '';
|
||||
}
|
||||
return this.$route.query.type ? textMap[this.$route.query.type] : '';
|
||||
}
|
||||
},
|
||||
created() {
|
||||
|
||||
@ -204,12 +204,12 @@ export default {
|
||||
}];
|
||||
}
|
||||
},
|
||||
'$store.state.map.activeTrainListUpdate': function () {
|
||||
'$store.state.map.activeTrainListChange': function () {
|
||||
this.activeTrains = [];
|
||||
const activeTrainList = this.$store.state.map.activeTrainList;
|
||||
if (activeTrainList && activeTrainList.length) {
|
||||
activeTrainList.forEach(train => {
|
||||
this.activeTrains.push(train.groupNumber);
|
||||
activeTrainList.forEach(groupNumber => {
|
||||
this.activeTrains.push(groupNumber);
|
||||
});
|
||||
}
|
||||
this.$refs.tree && this.$refs.tree.filter(this.queryMember);
|
||||
|
||||
@ -318,6 +318,7 @@ export default {
|
||||
}
|
||||
this.$store.dispatch('training/over').then(() => {
|
||||
this.backLoading = true;
|
||||
this.$store.dispatch('map/resetActiveTrainList');
|
||||
if (this.$route.query.projectDevice) {
|
||||
this.$store.dispatch('LogOut').then(() => {
|
||||
location.reload();
|
||||
|
||||
@ -182,12 +182,21 @@ export default {
|
||||
this.bottom = this.bottom + object.offsetHeight + objectBottom;
|
||||
}
|
||||
},
|
||||
'$store.state.map.activeTrainListUpdate': function (val) { // 按计划行车的列车列表更新标识
|
||||
'$store.state.training.prdType': function(val) {
|
||||
this.$nextTick(() => {
|
||||
const object = document.querySelector('.menuButton');
|
||||
if (object) {
|
||||
const objectBottom = parseInt(object.style.bottom) || 0;
|
||||
this.bottom = this.bottom + object.offsetHeight + objectBottom;
|
||||
}
|
||||
});
|
||||
},
|
||||
'$store.state.map.activeTrainListChange': function (val) { // 按计划行车的列车列表更新标识
|
||||
this.activeTrains = [];
|
||||
const activeTrainList = this.$store.state.map.activeTrainList;
|
||||
if (activeTrainList && activeTrainList.length) {
|
||||
activeTrainList.forEach(train => {
|
||||
this.activeTrains.push(train.groupNumber);
|
||||
activeTrainList.forEach(groupNumber => {
|
||||
this.activeTrains.push(groupNumber);
|
||||
});
|
||||
}
|
||||
if (this.$refs.tree) {
|
||||
@ -457,7 +466,7 @@ export default {
|
||||
flag = this.memberData[data.id].nickName.indexOf(value) !== -1;
|
||||
}
|
||||
let driverNoShow = true;
|
||||
if (data.role && data.role === 'DRIVER' && !this.activeTrains.includes(data.deviceCode)) {
|
||||
if (data.type && data.type === 'DRIVER' && !this.activeTrains.includes(data.deviceCode)) {
|
||||
driverNoShow = false;
|
||||
}
|
||||
return (data.label.indexOf(value) !== -1 || flag) && driverNoShow;
|
||||
|
||||
@ -144,7 +144,6 @@ export default {
|
||||
this.trainingOperateTypeMap['07'] = list; // 列车实训
|
||||
});
|
||||
}
|
||||
console.log(this.trainingOperateTypeMap, '111111111111111');
|
||||
await this.getList();
|
||||
await this.init();
|
||||
},
|
||||
|
||||
@ -138,7 +138,8 @@ export default {
|
||||
const data = res.data.config ? JSON.parse(res.data.config) : {};
|
||||
this.formData = {
|
||||
quadrant: data.quadrant,
|
||||
deviceCode: data.deviceCode
|
||||
deviceCode: data.deviceCode,
|
||||
psdCode: data.psdCode
|
||||
};
|
||||
});
|
||||
getAllMapOnline().then(resp => {
|
||||
|
||||
@ -40,6 +40,7 @@ export default {
|
||||
designgzb: 'GZB',
|
||||
designhyd: 'HED'
|
||||
},
|
||||
projectPathMap: { designxty: 'xty', designgzb: 'gzb', designhyd: 'hyd'},
|
||||
queryForm: {
|
||||
labelWidth: '120px',
|
||||
reset: true,
|
||||
@ -121,6 +122,9 @@ export default {
|
||||
computed: {
|
||||
projectCode() {
|
||||
return this.projectMap[getSessionStorage('project')];
|
||||
},
|
||||
projectPath() {
|
||||
return this.projectPathMap[getSessionStorage('project')];
|
||||
}
|
||||
},
|
||||
created() {
|
||||
@ -190,7 +194,7 @@ export default {
|
||||
},
|
||||
getPath(index, row) {
|
||||
let url = '';
|
||||
url = `${window.location.protocol}//${window.location.host}/login?project=${this.projectCode.toLowerCase()}&projectDevice=${row.code}&type=${row.type}`;
|
||||
url = `${window.location.protocol}//${window.location.host}/login?project=${this.projectPath}&projectDevice=${row.code}&type=${row.type}`;
|
||||
this.url = url;
|
||||
this.$messageBox();
|
||||
this.$confirm(`登录路径：${url}`, '登录路径', {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user