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 2020-05-14 11:03:24 +08:00
parent f7d772e192
commit 8335ee1259
5 changed files with 38 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/jmapNew/shape/Train/TrainBody.js
View File

@ -137,7 +137,6 @@ export default class TrainBody extends Group {
text: targetCode.substring(targetCode.length - style.Train.trainNumber.targetCodePrefix.length), text: targetCode.substring(targetCode.length - style.Train.trainNumber.targetCodePrefix.length),
textFill: style.trainTextColor, textFill: style.trainTextColor,
textStroke: style.trainTextColor, textStroke: style.trainTextColor,
fontWeight: 400,
textStrokeWidth: 0, textStrokeWidth: 0,
fontSize: model.fontSize, fontSize: model.fontSize,
fontFamily: style.Train.common.fontFamily, fontFamily: style.Train.common.fontFamily,
@ -301,20 +300,12 @@ export default class TrainBody extends Group {
this.trainBodyBox && this.trainBodyBox.setColor(key, color); this.trainBodyBox && this.trainBodyBox.setColor(key, color);
} }
getBoundingRect() { getBoundingRect() {
let rect = null; const rect = new BoundingRect(0, 0, 0, 0);
this.eachChild(elem => { if (this.trainBodyBox) {
if (elem) { const tempRect = this.trainBodyBox.getBoundingRect().clone();
const tempRect = elem.getBoundingRect();
if ((tempRect.x || tempRect.y) && tempRect.width && tempRect.height) {
if (rect) {
rect.union(tempRect); rect.union(tempRect);
} else {
rect = tempRect;
} }
} return rect;
}
});
return rect || new BoundingRect(0, 0, 0, 0);
} }
formatChangePosition(model, style) { formatChangePosition(model, style) {
if (this.nameFormat) { if (this.nameFormat) {

2
src/router/index_Common.js
View File

@ -964,7 +964,7 @@ export const asyncRouter = [
component: Layout, component: Layout,
meta: { meta: {
i18n: 'router.studentManage', i18n: 'router.studentManage',
roles: [admin, user] roles: [admin, user, lessonCreater]
}, },
hidden: getSessionStorage('project') ? !getSessionStorage('project').endsWith('gzb') && !window.document.location.pathname.includes('gzb') : !window.document.location.pathname.includes('gzb'), hidden: getSessionStorage('project') ? !getSessionStorage('project').endsWith('gzb') && !window.document.location.pathname.includes('gzb') : !window.document.location.pathname.includes('gzb'),
children: [ children: [

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

@ -20,7 +20,7 @@
<script> <script>
import { listPublishMap, getMapListByProjectCode } from '@/api/jmap/map'; import { listPublishMap, getMapListByProjectCode } from '@/api/jmap/map';
import { UrlConfig } from '@/scripts/ConstDic'; import { UrlConfig } from '@/scripts/ConstDic';
import { superAdmin, admin } from '@/router/index_APP_TARGET'; import { superAdmin, admin, lessonCreater } from '@/router/index_APP_TARGET';
import { getSessionStorage, setSessionStorage, removeSessionStorage } from '@/utils/auth'; import { getSessionStorage, setSessionStorage, removeSessionStorage } from '@/utils/auth';
import FilterCity from '@/views/components/filterCity'; import FilterCity from '@/views/components/filterCity';
import localStore from 'storejs'; import localStore from 'storejs';
@ -215,7 +215,7 @@ export default {
this.$store.dispatch('config/resize', { width: width, height: height }); this.$store.dispatch('config/resize', { width: width, height: height });
}, },
isAdministrator() { isAdministrator() {
return this.$store.state.user.roles.includes(superAdmin) || this.$store.state.user.roles.includes(admin); return this.$store.state.user.roles.includes(superAdmin) || this.$store.state.user.roles.includes(admin) || this.$store.state.user.roles.includes(lessonCreater);
} }
} }
}; };

4
src/views/studentManage/index.vue
View File

@ -404,9 +404,9 @@ export default {
studentData.students = students; studentData.students = students;
} }
importStudentResults(ProjectCode[that.project], studentData).then(resp => { importStudentResults(ProjectCode[that.project], studentData).then(resp => {
that.$message.success('学生成绩导入成功！'); that.$message.success('学生信息导入成功！');
}).catch(error => { }).catch(error => {
that.$message.error('学生成绩导入失败！'); that.$message.error('学生信息导入失败！');
}); });
} catch (error) { } catch (error) {
that.$message.warning(`解析成绩单失败:${error}`); that.$message.warning(`解析成绩单失败:${error}`);