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

desc: 调整权限分发 组织结构配置

Browse Source
This commit is contained in:
zyy 2019-09-27 10:06:46 +08:00
parent 5c973ba468
commit f712c93622
6 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/i18n/langs/en/global.js
View File

@ -157,5 +157,6 @@ export default {
colon: ':',
processFailure: 'Process failure',
enterLastStep: 'Please enter a hint and click next',
pleaseOpearte: 'Please proceed'
pleaseOpearte: 'Please proceed',
help: 'help'
};

3
src/i18n/langs/zh/global.js
View File

@ -157,6 +157,7 @@ export default {
colon: '：',
processFailure: '处理失败',
enterLastStep: '请输入提示并点击下一步',
pleaseOpearte: '请开始操作'
pleaseOpearte: '请开始操作',
help: '帮助'
};

5
src/layout/components/Logout.vue
View File

@ -10,6 +10,11 @@
<el-dropdown-item>
<span style="display:block;" @click="language">{{ $t('global.language') }}</span>
</el-dropdown-item>
<el-dropdown-item>
<a href="https://joylink.club/helps/help1.pdf" target="frame1">
<span style="display:block;">{{ $t('global.help') }}</span>
</a>
</el-dropdown-item>
<el-dropdown-item>
<span style="display:block;" @click="logout">{{ $t('global.exit') }}</span>
</el-dropdown-item>

4
src/utils/baseUrl.js
View File

@ -3,10 +3,10 @@ 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.3.5: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 {
BASE_API = process.env.VUE_APP_BASE_API;
}

12
src/views/display/menuDemon.vue
View File

@ -2,21 +2,21 @@
<div>
<div class="display-card" :style="{top: offset+'px'}">
<el-row>
<span v-if="countTime" class="display-score">{{$t('display.demon.trialTime')}} {{ countTime }}</span>
<span v-if="countTime" class="display-score">{{ $t('display.demon.trialTime') }} {{ countTime }}</span>
</el-row>
</div>
<div class="display-draft">
<el-button-group>
<el-button v-if="isShowScheduling" type="primary" @click="jumpScheduling">{{$t('display.demon.dispatchingPlan')}}</el-button>
<el-button v-if="isShowScheduling" type="primary" @click="jumpScheduling">{{ $t('display.demon.dispatchingPlan') }}</el-button>
<el-button type="jumpjlmap3d" @click="jumpjlmap3d">{{ jl3dname }}</el-button>
<template v-if="isShowQuest">
<el-button type="danger" @click="handleQuitQuest">{{$t('display.demon.exitScript')}}</el-button>
<el-button type="danger" @click="handleQuitQuest">{{ $t('display.demon.exitScript') }}</el-button>
</template>
<template v-else>
<el-button type="success" :disabled="isDisable" @click="selectBeginTime">{{$t('display.demon.drivingByPlan')}}</el-button>
<el-button type="danger" :disabled="!isDisable" @click="end">{{$t('display.demon.exitPlan')}}</el-button>
<el-button type="success" :disabled="isDisable" @click="selectBeginTime">{{ $t('display.demon.drivingByPlan') }}</el-button>
<el-button type="danger" :disabled="!isDisable" @click="end">{{ $t('display.demon.exitPlan') }}</el-button>
</template>
<el-button type="primary" @click="back">{{$t('display.demon.back')}}</el-button>
<el-button type="primary" @click="back">{{ $t('display.demon.back') }}</el-button>
</el-button-group>
</div>
<set-time ref="setTime" @ConfirmSelectBeginTime="start" />

16
src/views/orderauthor/permission/create/order.vue
View File

@ -60,6 +60,7 @@ export default {
BizTypeList: [],
PayTypeList: [],
PayStatusTypeList: [],
OrgzList: [],
foreverInitData: false,
canDistribute: true,
urlInfo: {},
@ -344,6 +345,19 @@ export default {
}
}
},
buildModel() {
// 如果新增的条目不存在字典当中,则需要在临时字典中取对应的值
let orgzId = this.formModel.organizationId;
if (this.OrgzList && this.OrgzList.length) {
for (var i in this.OrgzList) {
if (orgzId === this.OrgzList[i].name) {
orgzId = this.OrgzList[i].id;
break;
}
}
}
return orgzId;
},
packageCode() {
if (this.permissionType == '01') {
this.createPackage();
@ -355,6 +369,7 @@ export default {
this.$refs.dataform.validateForm(() => {
this.orderList = [];
this.goodsList.forEach(item => {
this.formModel.organizationId = this.buildModel();
const param = deepAssign({}, this.formModel);
param.goodsId = item.id;
param.goodsName = item.name;
@ -390,6 +405,7 @@ export default {
// 万能权限生成订单，生成二维码
createPermission() {
this.$refs.dataform.validateForm(() => {
this.formModel.organizationId = this.buildModel();
const param = {
createVO: {
isPackage: true,