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

Merge remote-tracking branch 'origin/test'

Browse Source
This commit is contained in:
fan 2023-04-14 13:09:38 +08:00
commit 1aca150711
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/jmapNew/theme/ningbo_03/menus/menuDialog/routeCommand.vue
View File

@ -445,7 +445,8 @@ export default {
operation: OperationEvent.Command.commandNingBo3.Signal_command_path.operation, operation: OperationEvent.Command.commandNingBo3.Signal_command_path.operation,
param: { param: {
pathCode: `${row.code}` pathCode: `${row.code}`
} },
val: `${row.code}`
}; };
this.$store.dispatch('trainingNew/next', step).then(({ valid }) => { this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
if (valid) { if (valid) {

17
src/views/organization/trainingManage/index.vue
View File

@ -75,6 +75,13 @@ export default {
columnValue: (row) => { return this.covertData(row); }, columnValue: (row) => { return this.covertData(row); },
tagType: (row) => { return ''; } tagType: (row) => { return ''; }
}, },
{
title: '是否共享',
prop: 'shared',
type: 'tag',
columnValue: (row) => { return row.shared ? '是' : '否'; },
tagType: (row) => { return ''; }
},
{ {
title: this.$t('trainingManage.labelJson'), title: this.$t('trainingManage.labelJson'),
prop: 'labelJson', prop: 'labelJson',
@ -97,18 +104,19 @@ export default {
name: '上架', name: '上架',
handleClick: this.handlerShelf, handleClick: this.handlerShelf,
type: 'primary', type: 'primary',
showControl: row => row.state !== 1 showControl: row => row.state !== 1 && row.orgId === this.orgId
}, },
{ {
name: '下架', name: '下架',
handleClick: this.handlerSoldOut, handleClick: this.handlerSoldOut,
type: 'warning', type: 'warning',
showControl: row => row.state !== 2 showControl: row => row.state !== 2 && row.orgId === this.orgId
}, },
{ {
name: '删除', name: '删除',
handleClick: this.handlerDelete, handleClick: this.handlerDelete,
type: 'danger' type: 'danger',
showControl: row => row.orgId === this.orgId
} }
] ]
} }
@ -119,6 +127,9 @@ export default {
computed: { computed: {
project() { project() {
return getSessionStorage('project'); return getSessionStorage('project');
},
orgId() {
return this.$store.state.user.companyId;
} }
}, },
created() { created() {