西铁院title、logo修改,综合演练房间角色调整后,角色顺序不再变化

This commit is contained in:
fan 2019-11-04 11:29:35 +08:00
parent 0217650979
commit 50aee38b48
4 changed files with 43 additions and 23 deletions

BIN
src/assets/logo_xty.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 97 KiB

View File

@ -7,18 +7,25 @@
</template> </template>
<script> <script>
import logoImg from '@/assets/logo_changan.png'; import logoImg from '@/assets/logo_changan.png';
import logoImgXty from '@/assets/logo_xty.png';
import { getSessionStorage } from '@/utils/auth'; import { getSessionStorage } from '@/utils/auth';
import { loginTitle } from '@/scripts/ConstDic'; import { loginTitle } from '@/scripts/ConstDic';
export default { export default {
data() { data() {
return { return {
logoImg: logoImg, logoImg: '',
systemTitle: '城市轨道交通实训平台' systemTitle: ''
}; };
}, },
mounted() { mounted() {
this.systemTitle=loginTitle[getSessionStorage('project')]; const project = getSessionStorage('project');
this.systemTitle = loginTitle[project];
if (project.endsWith('xty')) {
this.logoImg = logoImgXty;
} else {
this.logoImg = logoImg;
}
}, },
methods: { methods: {
goToMain() { goToMain() {

View File

@ -2199,10 +2199,10 @@ export const IbpOperation = {
import LangStorage from '@/utils/lang'; import LangStorage from '@/utils/lang';
export const loginTitle = { export const loginTitle = {
xty: '西铁院实训平台', xty: '西路职业技术学城市轨道交通实训平台',
login: LangStorage.getLang() == 'en' ? ' Urban Rail Transit Practical Training Platform' : '城市轨道交通实训平台', login: LangStorage.getLang() == 'en' ? ' Urban Rail Transit Practical Training Platform' : '城市轨道交通实训平台',
design: LangStorage.getLang() == 'en' ? ' Urban Rail Transit Design Platform' : '城市轨道交通设计平台', design: LangStorage.getLang() == 'en' ? ' Urban Rail Transit Design Platform' : '城市轨道交通设计平台',
designxty: '西铁院设计平台' designxty: '西路职业技术学城市轨道交通设计平台'
}; };
export const ProjectCode = { export const ProjectCode = {

View File

@ -539,29 +539,39 @@ export default {
case 'Dispatcher': case 'Dispatcher':
this.dispatchList.push(item); this.dispatchList.push(item);
break; break;
case 'Attendant': case 'Attendant': {
let newAttendantFlag = true;
this.equipmentList.forEach((nor, index) => { this.equipmentList.forEach((nor, index) => {
if (nor.id == item.id) { if (nor.id == item.id) {
this.equipmentList.splice(index, 1); this.equipmentList[index] = item;
newAttendantFlag = false;
} }
}); });
if (newAttendantFlag) {
this.equipmentList.push(item); this.equipmentList.push(item);
}
break; break;
}
case 'Driver': case 'Driver':
this.driverList.push(item); this.driverList.push(item);
break; break;
case 'Repair': case 'Repair':
this.signalList.push(item); this.signalList.push(item);
break; break;
case 'IBP': case 'IBP': {
let newIbpFlag = true;
item.deviceCode = [item.deviceCode || '', item.ibpPart || ''];
this.ibpList.forEach((nor, index) => { this.ibpList.forEach((nor, index) => {
if (nor.id == item.id) { if (nor.id == item.id) {
this.ibpList.splice(index, 1); this.ibpList[index] = item;
newIbpFlag = false;
} }
}); });
item.deviceCode = [item.deviceCode, item.ibpPart]; if (newIbpFlag) {
this.ibpList.push(item); this.ibpList.push(item);
}
break; break;
}
case 'BigScreen': case 'BigScreen':
this.bigScreenList.push(item); this.bigScreenList.push(item);
break; break;
@ -856,10 +866,13 @@ export default {
ibpPart: val.ibpPart ibpPart: val.ibpPart
}]; }];
putUserRoles(params, this.$route.query.group); putUserRoles(params, this.$route.query.group);
this.setSelectedItemDisabled(role, stationList, list);
},
setSelectedItemDisabled(role, stationList, list) {
stationList.forEach(item => { stationList.forEach(item => {
item.disabled = false; item.disabled = false;
list.forEach(nor => { list.forEach(nor => {
if (item.value === nor.deviceCode[0]) { if (item.code === nor.deviceCode) {
item.disabled = true; item.disabled = true;
} }
}); });