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 2019-10-17 10:13:08 +08:00
parent 0118f94e6c
commit 11190ef66f
6 changed files with 262 additions and 255 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/router/index.js
View File

@ -114,7 +114,6 @@ import runPlanApproval from '@/views/approval/runPlan/index';
import { loginTitle } from '@/scripts/ConstDic'; import { loginTitle } from '@/scripts/ConstDic';
import { getSessionStorage } from '@/utils/auth'; import { getSessionStorage } from '@/utils/auth';
/** /**
* Note: sub-menu only appear when route children.length >= 1 * Note: sub-menu only appear when route children.length >= 1
* Detail see: https://panjiachen.github.io/vue-element-admin-site/guide/essentials/router-and-nav.html * Detail see: https://panjiachen.github.io/vue-element-admin-site/guide/essentials/router-and-nav.html

4
src/utils/auth.js
View File

@ -67,9 +67,9 @@ export function handleToken() {
const path = window.location.href; const path = window.location.href;
if (path.includes('/dp/') || path.includes('/display/dp')) { if (path.includes('/dp/') || path.includes('/display/dp')) {
return getScreenToken(); return getScreenToken();
} else if (path.includes('/design') || path.includes('/scriptDisplay') || path.includes('/publish') || path.includes('/orderauthor') || path.includes('/system') || path.includes('/display/plan') || path.includes('/display/manage') || path.includes('/apply/')) { } else if (path.includes('/design') || path.includes('/scriptDisplay') || path.includes('/publish') || path.includes('/orderauthor') || path.includes('/system') || path.includes('/display/manage') || path.includes('/apply/')) {
return getDesignToken(); return getDesignToken();
} else if (path.includes('/plan')) { } else if (path.includes('/plan') || path.includes('/display/plan')) {
return getDesignToken() || getToken(); return getDesignToken() || getToken();
} else { } else {
return getToken(); return getToken();

4
src/utils/baseUrl.js
View File

@ -4,8 +4,8 @@ export function getBaseUrl() {
if (process.env.NODE_ENV === 'development') { if (process.env.NODE_ENV === 'development') {
// BASE_API = 'https://joylink.club/jlcloud'; // BASE_API = 'https://joylink.club/jlcloud';
// BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'https://test.joylink.club/jlcloud';
// BASE_API = 'http://192.168.3.5:9000'; // 袁琪 BASE_API = 'http://192.168.3.5:9000'; // 袁琪
BASE_API = 'http://192.168.3.6:9000'; // 旭强 // BASE_API = 'http://192.168.3.6:9000'; // 旭强
// BASE_API = 'http://192.168.3.41:9000'; // 王兴杰 // BASE_API = 'http://192.168.3.41:9000'; // 王兴杰
} else { } else {
BASE_API = process.env.VUE_APP_BASE_API; BASE_API = process.env.VUE_APP_BASE_API;

2
src/views/ibp/index.vue
View File

@ -196,7 +196,7 @@ export default {
this.loading = false; this.loading = false;
}, },
statusMessage(val) { statusMessage(val) {
this.$ibp.setDeviceStatus(val); this.$ibp && this.$ibp.setDeviceStatus(val);
} }
} }
}; };

8
src/views/planMonitor/editTool/statusBar.vue
View File

@ -27,10 +27,18 @@ export default {
name: 'PlanStatusBar', name: 'PlanStatusBar',
data() { data() {
return { return {
isNotUser:true
}; };
}, },
watch: { watch: {
},
created(){
if(/^\/plan\/usertool/.test(this.$route.fullPath)){
this.isNotUser=false;
}else{
this.isNotUser=true;
}
}, },
methods: { methods: {
showTrain() { showTrain() {