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

Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

Browse Source
This commit is contained in:
joylink_cuiweidong 2020-12-17 10:00:03 +08:00
commit 3b5ed0b399
7 changed files with 171 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jmapNew/shape/TrainWindow/index.js
View File

@ -14,7 +14,7 @@ class TrainWindow extends Group {
this.style = style;
this.z = 9;
this.prdType = store.state.training.prdType;
this.isShowShape = true;
this.isShowShape = model.isShowShape;
this.create();
this.createMouseEvent();
this.setState(model);

2
src/jmapNew/theme/chengdu_01/menus/index.vue
View File

@ -35,7 +35,7 @@ export default {
components: {
MenuBar,
MenuRequest,
MenuCancel,
// MenuCancel,
MenuSignal,
MenuSwitch,
MenuSection,

5
src/store/modules/map.js
View File

@ -1014,6 +1014,11 @@ const map = {
trainWindowList.forEach(elem => {
elem._type = deviceType.TrainWindow;
elem.trainWindowShow = show;
if (state.mapDevice[elem.code] && state.mapDevice[elem.code].instance) {
elem.isShowShape = state.mapDevice[elem.code].instance.isShowShape;
} else {
elem.isShowShape = true;
}
deviceList.push(elem);
});
}

4
src/utils/baseUrl.js
View File

@ -2,11 +2,11 @@ export function getBaseUrl() {
let BASE_API;
if (process.env.NODE_ENV === 'development') {
// 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.8.107:9000'; // 袁琪
// BASE_API = 'http://192.168.8.129:9000'; // 旭强
// BASE_API = 'http://192.168.8.119:9000'; // 张赛
BASE_API = 'http://192.168.8.110:9000'; // 杜康
// BASE_API = 'http://192.168.8.110:9000'; // 杜康
// BASE_API = 'http://b29z135112.zicp.vip';
// BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康
// BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛

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

@ -38,7 +38,7 @@ export default {
items: [
{ prop: 'dataMapId', label: '发布数据地图:', type: 'select', options: this.mapList, change: true, onChange: this.changeMapId},
{ prop: 'dataStationCode', label: '发布地图车站:', type: 'select', options: this.dataStationList },
{ prop: 'stationCode', label: '关联站台:', type: 'select', options: this.stationList }
{ prop: 'stationCode', label: '关联车站:', type: 'select', options: this.stationList }
]
};
return form;

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

@ -39,7 +39,7 @@ export default {
const form = {
labelWidth: '150px',
items: [
{ prop: 'stationCode', label: '关联站台:', type: 'select', options: this.stationList }
{ prop: 'stationCode', label: '关联车站:', type: 'select', options: this.stationList }
]
};
return form;

160
src/views/messageBoard/manage.vue Normal file
View File

@ -0,0 +1,160 @@
<template>
<div>
<QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
</div>
</template>
<script>
export default {
name: 'Manage',
data() {
return {
pagerConfig: {
pageSize: 'pageSize',
pageIndex: 'pageNum'
},
queryForm: {
labelWidth: '140px',
reset: false,
queryObject: {
mapId: {
type: 'select',
label: this.$t('orderAuthor.mapName'),
config: {
data: []
}
}
}
},
queryList: {
query: this.queryFunction,
selectCheckShow: false,
indexShow: true,
columns: [
{
title: this.$t('orderAuthor.organizationOrEnterprise'),
prop: 'organizationName'
},
{
title: this.$t('orderAuthor.permissionName'),
prop: 'permissionName'
},
{
title: this.$t('orderAuthor.founder'),
prop: 'userNickname'
},
{
title: this.$t('orderAuthor.publicOrPrivate'),
prop: 'canDistribute',
type: 'tag',
columnValue: (row) => { return this.$ConstSelect.translate(row.canDistribute, 'PermissionUseList'); },
tagType: (row) => {
switch (row.canDistribute) {
case true: return 'success';
case false: return 'danger';
}
}
},
{
title: this.$t('orderAuthor.permanenceOrNot'),
prop: 'forever',
type: 'tag',
columnValue: (row) => { return this.$ConstSelect.translate(row.forever, 'Whether'); },
tagType: (row) => {
switch (row.forever) {
case true: return 'success';
case false: return 'danger';
}
}
},
{
title: this.$t('global.amount'),
prop: 'amount'
},
{
title: this.$t('global.remains'),
prop: 'remains'
},
{
title: this.$t('orderAuthor.startTime'),
prop: 'startTime',
type: 'formatter',
formatter: this.formatterDate
},
{
title: this.$t('orderAuthor.endTime'),
prop: 'endTime',
type: 'formatter',
formatter: this.formatterDate
},
{
title: this.$t('global.status'),
prop: 'status',
type: 'tag',
columnValue: (row) => { return this.$convertField(row.status, this.EffectiveTypeList, ['value', 'label']); },
tagType: (row) => {
switch (row.status) {
case '1': return 'success';
default: return 'danger';
}
}
},
{
type: 'button',
title: this.$t('global.operate'),
width: this.$i18n.locale == 'en' ? '400' : '300',
buttons: [
{
name: this.$t('orderAuthor.obtainQrCode'),
handleClick: this.handleRtCodeShow,
type: '',
showControl: (row) => { return row.status == '1'; }
},
{
name: this.$t('orderAuthor.setupFailure'),
handleClick: this.handleDelete,
type: '',
showControl: (row) => { return row.status == '1'; }
},
{
name: this.$t('orderAuthor.authorityDetails'),
handleClick: this.handlePermissionDetail,
type: '',
showControl: (row) => { return row.status == '1' && (row.source == '02' || row.source == '04'); }
},
{
name: this.$t('orderAuthor.distributionAttribution'),
handleClick: this.handleBelongs,
type: '',
showControl: (row) => { return row.amount !== row.remains; }
},
{
name: this.$t('orderAuthor.recovery'),
handleClick: this.handleRestore,
type: 'danger',
showControl: (row) => { return row.status == '1' && row.canRestore; }
}
]
}
],
actions: [
{ text: this.$t('orderAuthor.createPackage'), handler: this.handleCreatePackage },
{ text: '创建项目权限包', handler: this.handleCreateProjectPackage },
{ text: this.$t('orderAuthor.receivingPermission'), handler: this.handlerPermission, show: process.env.NODE_ENV == 'development' }
]
}
};
},
mounted() {
this.loadInitData();
},
methods:{
}
};
</script>
<style scoped>
</style>