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

应急指挥调度图标更换

Browse Source
This commit is contained in:
fan 2022-10-19 14:02:11 +08:00
parent 74c1005a8a
commit c170f8fa74
7 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/App.vue
View File

@ -2,7 +2,10 @@
<div id="app">
<router-view />
<deomon-topic ref="deomonTopic" />
<img v-show="loading" :src="loadingImg" class="AppAll">
<div v-show="loading" class="AppAll">
<img v-if="project === 'login' || project === 'design'" :src="jlFavicon" class="CompanyIcon">
<img :src="loadingImg" style="width: 100%; height: 100%;">
</div>
<div
v-if="!$store.state.user.baseUrl"
v-loading="!$store.state.user.baseUrl"
@ -25,6 +28,7 @@ import WindowResizeHandler from '@/mixin/WindowResizeHandler';
import LoadingImg from '@/assets/loading.gif';
import AppLoading from '@/assets/appLoading.png';
import { openIndexedDB } from '@/utils/indexedDb';
import Favicon from '@/assets/icon/favicon.png';
export default {
name: 'App',
@ -38,7 +42,9 @@ export default {
return {
loadingImg: LoadingImg,
appLoading: AppLoading,
loading: false
loading: false,
project: '',
jlFavicon: Favicon
};
},
watch: {
@ -75,9 +81,9 @@ export default {
}
},
created() {
const project = getSessionStorage('project');
if (project) {
document.querySelector("link[rel*='icon']").href = loginInfo[project].linkIcon || ProjectIcon[project];
this.project = getSessionStorage('project');
if (this.project) {
document.querySelector("link[rel*='icon']").href = loginInfo[this.project].linkIcon || ProjectIcon[this.project];
}
},
mounted() {
@ -127,7 +133,7 @@ export default {
</script>
<style lang="scss" scoped>
.AppAll{position: absolute;top: 0;left: 0;width: 100%;height: 100%;z-index: 2003}
.AppAll{position: absolute;top: 0;left: 0;width: 100%;height: 100%;z-index: 3003}
.centerImg {
position: absolute;
left:50%;
@ -137,4 +143,12 @@ export default {
margin-left: -240px;
margin-top: -228px;
}
.CompanyIcon{
position: absolute;
z-index: 3000;
left: 50%;
margin-left: -60px;
width: 120px;
top: 30px;
}
</style>

BIN
src/assets/icon/favicon_yjddzh.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 98 KiB

BIN
src/assets/loading.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 MiB

After

Width:  |  Height:  |  Size: 1.5 MiB

3
src/scripts/ProjectConfig.js
View File

@ -19,6 +19,7 @@ import FaviconRichor from '@/assets/icon/favicon_richor.png';
import FaviconZzww from '@/assets/icon/favicon_zzww.png';
import FaviconUnittec from '@/assets/icon/favicon_unittec.png';
import FaviconSay from '@/assets/icon/favicon_say.png';
import FaviconYjddzh from '@/assets/icon/favicon_yjddzh.png';
import Link_Bxkc from '@/assets/icon/link_bxkc.png';
import Link_Crsc from '@/assets/icon/link_crsc.png';
import Link_Hls from '@/assets/icon/link_hls.png';
@ -777,7 +778,7 @@ export const ProjectIcon = {
hls: FaviconHls,
designhls: FaviconHls,
wjls: Favicon,
yjddzh: Favicon,
yjddzh: FaviconYjddzh,
drts: Favicon,
designdrts: Favicon,
hlsdrts: FaviconHls,

2
src/utils/baseUrl.js
View File

@ -27,7 +27,7 @@ export function handlerUrl(data) {
BASE_API = 'https://test.joylink.club/jlcloud';
// BASE_API = 'http://192.168.3.233/rtss-server';
// BASE_API = 'http://114.116.51.125/jlcloud';
BASE_API = 'http://192.168.3.90:9000'; // 周寅
// BASE_API = 'http://192.168.3.90:9000'; // 周寅
// BASE_API = 'http://192.168.3.94:9000'; // 旭强
// BASE_API = 'http://192.168.3.15:9000'; // 张赛
// BASE_API = 'http://192.168.3.5:9000'; // 夏增彬

19
src/views/demonstration/detail/index.vue
View File

@ -56,8 +56,7 @@ export default {
prdType: '',
pmsList: []
},
lineCode:'',
loadingProjectList: ['login', 'design', 'xty', 'designxty', 'gzb', 'designxty', 'xadt', 'designxadt', 'drts', 'designdrts', 'hlsdrts', 'designhlsdrts', 'teaching', 'designteaching']
lineCode:''
};
},
computed: {
@ -168,9 +167,7 @@ export default {
const data = { mapId: this.courseModel.mapId, prdType: this.currentPrdType };
createSimulationNew(data).then(resp => {
const query = { lineCode: this.courseModel.lineCode, group: resp.data, mapId: this.courseModel.mapId};
if (this.loadingProjectList.includes(this.project)) {
this.$store.dispatch('app/transitionAnimations');
}
this.$store.dispatch('app/transitionAnimations');
this.$router.push({ path: `/jointTrainingNew`, query: query });
launchFullscreen();
}).catch(error => {
@ -205,9 +202,7 @@ export default {
const data = { mapId: this.courseModel.mapId, prdType: this.currentPrdType };
createSimulationNew(data).then(resp => {
const query = { lineCode: this.courseModel.lineCode, group: resp.data, prdType: this.courseModel.prdType, mapId: this.courseModel.mapId, goodsId: this.goodsId, try: this.tryUser };
if (this.loadingProjectList.includes(this.project)) {
this.$store.dispatch('app/transitionAnimations');
}
this.$store.dispatch('app/transitionAnimations');
this.$router.push({ path: `/displayBigScreen/${this.courseModel.mapId}`, query: query });
}).catch(error => {
if (error.code == 10003) {
@ -229,9 +224,7 @@ export default {
createSimulation(data).then(resp => {
const query = { lineCode: this.courseModel.lineCode, group: resp.data, prdType: this.courseModel.prdType, mapId: this.courseModel.mapId, goodsId: this.goodsId, try: this.tryUser, project: this.project, newApi: this.newApi };
this.$store.dispatch('training/setPrdType', this.currentPrdType); // 改变prdType
if (this.loadingProjectList.includes(this.project)) {
this.$store.dispatch('app/transitionAnimations');
}
this.$store.dispatch('app/transitionAnimations');
this.$router.push({ path: `/displayCity/demon`, query: query });
launchFullscreen();
}).catch(error=>{
@ -246,9 +239,7 @@ export default {
createSimulationNew(data).then(resp => {
const query = { lineCode: this.courseModel.lineCode, group: resp.data, prdType: this.courseModel.prdType, mapId: this.courseModel.mapId, goodsId: this.goodsId, try: this.tryUser, project: this.project, newApi: this.newApi };
this.$store.dispatch('training/setPrdType', this.currentPrdType); // 改变prdType
if (this.loadingProjectList.includes(this.project)) {
this.$store.dispatch('app/transitionAnimations');
}
this.$store.dispatch('app/transitionAnimations');
if (this.currentPrdType === '02' && this.courseModel.lineCode === '14') {
this.$router.push({ path: `/displayBaSiDi/demon`, query: query });
} else {

15
src/views/designPlatform/demonList.vue
View File

@ -49,8 +49,7 @@ export default {
},
node: {
},
localParamName: 'publish_cityCode',
loadingProjectList: ['login', 'design', 'xty', 'designxty', 'gzb', 'designxty', 'xadt', 'designxadt', 'drts', 'designdrts', 'hlsdrts', 'designhlsdrts', 'teaching', 'designteaching']
localParamName: 'publish_cityCode'
};
},
computed: {
@ -128,18 +127,14 @@ export default {
break;
}
case 'bigSplitScreen': {
if (this.loadingProjectList.includes(this.project)) {
this.$store.dispatch('app/transitionAnimations');
}
this.$store.dispatch('app/transitionAnimations');
this.$router.push({ path: `/bigSplitScreen/${obj.mapId}` });
break;
}
case 'trainingDesign': {
const data = { mapId: obj.mapId, prdType: '01' };
createSimulationNew(data).then(resp => {
if (this.loadingProjectList.includes(this.project)) {
this.$store.dispatch('app/transitionAnimations');
}
this.$store.dispatch('app/transitionAnimations');
const query = { mapId: obj.mapId, group: resp.data, lineCode:obj.lineCode};
this.$router.push({ path: `/trainingDesign`, query });
}).catch(error => {
@ -150,9 +145,7 @@ export default {
case 'trainingPreview': {
const data = { mapId: obj.mapId };
createSimulationNew(data).then(resp => {
if (this.loadingProjectList.includes(this.project)) {
this.$store.dispatch('app/transitionAnimations');
}
this.$store.dispatch('app/transitionAnimations');
this.$store.dispatch('training/setPrdType', '02');
const query = { ...data, group: resp.data, scriptId: obj.id, lineCode:obj.lineCode};
this.$router.push({ path: `/trainingPreview`, query });