diff --git a/src/components/QueryListPage/QueryListPage.vue b/src/components/QueryListPage/QueryListPage.vue
index 29d22845f..4554a1097 100644
--- a/src/components/QueryListPage/QueryListPage.vue
+++ b/src/components/QueryListPage/QueryListPage.vue
@@ -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();
diff --git a/src/layout/components/userInfo.vue b/src/layout/components/userInfo.vue
index 010b3cce6..3c36cdfa8 100644
--- a/src/layout/components/userInfo.vue
+++ b/src/layout/components/userInfo.vue
@@ -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;
diff --git a/src/views/messageBoard/index.vue b/src/views/messageBoard/index.vue
index 0d3c400da..659b57231 100644
--- a/src/views/messageBoard/index.vue
+++ b/src/views/messageBoard/index.vue
@@ -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%;
diff --git a/src/views/newMap/displayNew/demonMenu.vue b/src/views/newMap/displayNew/demonMenu.vue
index 00fa22848..20d643553 100644
--- a/src/views/newMap/displayNew/demonMenu.vue
+++ b/src/views/newMap/displayNew/demonMenu.vue
@@ -27,7 +27,7 @@
理论考试
- 留言板
+ 留言板
联系方式
@@ -261,7 +261,6 @@ export default {
this.$emit('goTheoryQuiz');
},
messageBoardShow() {
- // this.$refs.messageBoard.doShow();
const routeData = this.$router.resolve({
path:'/messageBoard',
query:{
diff --git a/src/views/newMap/displayNew/lesson/index.vue b/src/views/newMap/displayNew/lesson/index.vue
index 60c02b94a..5f456dee0 100644
--- a/src/views/newMap/displayNew/lesson/index.vue
+++ b/src/views/newMap/displayNew/lesson/index.vue
@@ -9,6 +9,7 @@
{{ formatUsedTime }}
{{ $t('display.lesson.score') }}{{ formatScore }}
+ 留言板
@@ -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');
}
}
};
diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue
index 2be8c0333..b918a9e85 100644
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@@ -23,6 +23,7 @@
设备管理
教学系统
考试系统
+ 留言板
@@ -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 => {
diff --git a/src/views/system/companyManage/index.vue b/src/views/system/companyManage/index.vue
index 47e87bc6f..09d9c8d18 100644
--- a/src/views/system/companyManage/index.vue
+++ b/src/views/system/companyManage/index.vue
@@ -2,7 +2,7 @@
-
+
@@ -50,7 +50,10 @@ export default {
},
{
title: '单位管理人员',
- prop: ''
+ prop: 'managerNames',
+ type: 'tagMore',
+ columnValue: (row) => { return row.managerNames; },
+ tagType: (row) => { return 'success'; }
},
{
type: 'button',
diff --git a/src/views/system/companyManage/manager.vue b/src/views/system/companyManage/manager.vue
index b263b0ae8..a93d8c6bc 100644
--- a/src/views/system/companyManage/manager.vue
+++ b/src/views/system/companyManage/manager.vue
@@ -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);