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 
# Conflicts:
#	src/views/newMap/displayNew/demonMenu.vue
This commit is contained in:
joylink_cuiweidong 2020-12-02 17:49:08 +08:00
commit 95c685bfab
8 changed files with 51 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/components/QueryListPage/QueryListPage.vue
View File

@ -211,11 +211,11 @@ export default {
queryList: {
type: Object,
required: true
},
cardPadding: {
type: Number,
default: 0
}
},
cardPadding: {
type: Number,
default: 0
}
},
data() {
return {
@ -281,6 +281,10 @@ export default {
self.choose = null;
return self.commitQuery();
};
this.queryList.queryReload = function() {
self.choose = null;
return self.$refs.queryForm.query();
};
},
mounted() {
// this.commitQuery();

6
src/layout/components/userInfo.vue
View File

@ -408,6 +408,12 @@ export default {
this.visible = false;
this.binding = false;
this.bindSuccess = false;
this.nameShow = true;
this.nickNameShow = true;
this.mobileShow = true;
this.emailShow = true;
this.passwordShow = true;
this.companyShow = true;
},
switcherName() {
this.editInfo.name = this.userInfo.name;

1
src/views/messageBoard/index.vue
View File

@ -382,6 +382,7 @@ export default {
width: 100%;
background-image:url('../../assets/bg_board.jpg');
background-size: 100% 100%;
min-height: 100%;
}
/deep/.ql-container{
height: 80%;

3
src/views/newMap/displayNew/demonMenu.vue
View File

@ -27,7 +27,7 @@
<!-- <el-button v-if="isContest" size="small" @click=" fieldTeach">实操教学</el-button> -->
<!-- <el-button v-if="isContest" size="small" @click=" fieldExam">实操测验</el-button> -->
<el-button v-if="isContest" size="small" @click="goTheoryQuiz">理论考试</el-button>
<el-button v-if="isContest" size="small" @click="messageBoardShow">留言板</el-button>
<el-button v-if="isContest || project === 'gzb'" size="small" @click="messageBoardShow">留言板</el-button>
<el-button v-if="isContest" size="small" @click="contectUs">联系方式</el-button>
</el-button-group>
</div>
@ -261,7 +261,6 @@ export default {
this.$emit('goTheoryQuiz');
},
messageBoardShow() {
// this.$refs.messageBoard.doShow();
const routeData = this.$router.resolve({
path:'/messageBoard',
query:{

15
src/views/newMap/displayNew/lesson/index.vue
View File

@ -9,6 +9,7 @@
</el-radio-group>
<span class="display-time">{{ formatUsedTime }}</span>
<span v-if="demoMode === TrainingMode.TEST" class="display-score">{{ $t('display.lesson.score') }}{{ formatScore }}</span>
<el-button v-if="project == 'gzb'" size="small" @click="messageBoardShow">留言板</el-button>
</el-row>
</div>
<div id="teachGroupButton" class="display-draft" :style="{bottom: offsetBottom + 'px'}">
@ -35,6 +36,7 @@ import { TrainingMode, UrlConfig } from '@/scripts/ConstDic';
import { timeFormat } from '@/utils/date';
import { getTrainingStepsDetailNew, loadTrainingInSimulation } from '@/api/jmap/training';
import { EventBus } from '@/scripts/event-bus';
import { getSessionStorage } from '@/utils/auth';
export default {
name: 'MenuLesson',
@ -99,6 +101,9 @@ export default {
},
prdType() {
return this.$route.query.prdType;
},
project() {
return getSessionStorage('project');
}
},
watch: {
@ -284,6 +289,16 @@ export default {
this.$nextTick(() => {
EventBus.$emit('viewLoading', false);
});
},
messageBoardShow() {
const routeData = this.$router.resolve({
path:'/messageBoard',
query:{
project: this.project,
noPreLogout: true
}
});
window.open(routeData.href, '_blank', 'noopener noreferrer');
}
}
};

11
src/views/newMap/jointTrainingNew/menuDemon.vue
View File

@ -23,6 +23,7 @@
<el-button v-if="deviceManageShow" size="small" @click="handleEquipment">设备管理</el-button>
<el-button v-if="teachSystemShow" size="small" @click="handleTeach">教学系统</el-button>
<el-button v-if="examSystemShow" size="small" @click="handleExam">考试系统</el-button>
<el-button v-if="project == 'gzb'" size="small" @click="messageBoardShow">留言板</el-button>
</el-button-group>
</div>
<div class="display-draft" :class="{'display-type-hb': lineCode == '07' && $store.state.training.prdType=='01', 'haerbin_btn_box': lineCode == '07'}" :style="{bottom: offsetBottom + 'px'}">
@ -430,6 +431,16 @@ export default {
this.btnWidth = 0;
}
},
messageBoardShow() {
const routeData = this.$router.resolve({
path:'/messageBoard',
query:{
project: this.project,
noPreLogout: true
}
});
window.open(routeData.href, '_blank', 'noopener noreferrer');
},
handleTeach() {
getPublishLessonListByMapId({mapId: this.mapId}).then(resp => {
const lesson = resp.data.find(item => {

7
src/views/system/companyManage/index.vue
View File

@ -2,7 +2,7 @@
<div>
<QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
<edit-company ref="editCompany" @reloadTable="reloadTable" />
<company-manager ref="companyManager" />
<company-manager ref="companyManager" @reloadTable="reloadTable" />
<qr-code ref="qrCode" />
</div>
</template>
@ -50,7 +50,10 @@ export default {
},
{
title: '单位管理人员',
prop: ''
prop: 'managerNames',
type: 'tagMore',
columnValue: (row) => { return row.managerNames; },
tagType: (row) => { return 'success'; }
},
{
type: 'button',

4
src/views/system/companyManage/manager.vue
View File

@ -110,7 +110,7 @@ export default {
return this.companyMap[companyId];
},
reloadTable() {
this.queryList.reload();
this.queryList.queryReload();
},
addParams(params) {
params.companyId = this.companyId;
@ -125,6 +125,8 @@ export default {
});
setCompanyManager(this.companyId, userIds).then(resp => {
this.$message.success('绑定单位管理员成功！');
this.dialogVisible = false;
this.$emit('reloadTable');
}).catch(error => {
this.$message.error('绑定单位管理员失败！');
console.error(error);