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/jmapNew/config/skinCode/chengdu_01.js b/src/jmapNew/config/skinCode/chengdu_01.js index 5a083dcd0..53f27194f 100644 --- a/src/jmapNew/config/skinCode/chengdu_01.js +++ b/src/jmapNew/config/skinCode/chengdu_01.js @@ -108,6 +108,11 @@ class SkinCode extends defaultStyle { }, speedLimitName: { z: 10, + leftName: true, // 左侧限速值是否展示 + rightName: true, // 右侧限速值是否展示 + nameBackgroundIsRect: false, // 限速值背景是否为矩形 + nameBackgroundBorderWidth: 0, // 限速值背景是否边框宽度 + nameBackgroundBorderColor: '#000', // 限速值背景边框颜色 limitValueDistance: -15, kilometerFontSize: 8, // 公里标大小 kilometerColor: '#fff', // 公里标颜色 diff --git a/src/jmapNew/config/skinCode/chengdu_03.js b/src/jmapNew/config/skinCode/chengdu_03.js index 6e34272f1..3604709ca 100644 --- a/src/jmapNew/config/skinCode/chengdu_03.js +++ b/src/jmapNew/config/skinCode/chengdu_03.js @@ -108,6 +108,11 @@ class SkinCode extends defaultStyle { }, speedLimitName: { z: 10, + leftName: true, // 左侧限速值是否展示 + rightName: true, // 右侧限速值是否展示 + nameBackgroundIsRect: false, // 限速值背景是否为矩形 + nameBackgroundBorderWidth: 0, // 限速值背景是否边框宽度 + nameBackgroundBorderColor: '#000', // 限速值背景边框颜色 limitValueDistance: -15, kilometerFontSize: 8, // 公里标大小 kilometerColor: '#fff', // 公里标颜色 diff --git a/src/jmapNew/config/skinCode/haerbin_01.js b/src/jmapNew/config/skinCode/haerbin_01.js index 57364c7a8..ea1d37e3e 100644 --- a/src/jmapNew/config/skinCode/haerbin_01.js +++ b/src/jmapNew/config/skinCode/haerbin_01.js @@ -6,7 +6,7 @@ class SkinCode extends defaultStyle { super(); this.fontFamily = '宋体'; this[deviceType.Section] = { - elemnetType:['name', 'logicText', 'standTrackText', 'reentryTrackText', 'transferTrackText', 'line', 'lineBorder', 'sectionBlock', 'speedLimit'], + elemnetType:['name', 'logicText', 'standTrackText', 'reentryTrackText', 'transferTrackText', 'line', 'lineBorder', 'sectionBlock', 'speedLimitName'], active: { routeColor: false // 进路触发颜色 }, @@ -113,6 +113,21 @@ class SkinCode extends defaultStyle { lineColor: '#FFFF00', // 限速线颜色 nameShow: false // 名称显示 }, + speedLimitName: { + z: 10, + leftName: true, // 左侧限速值是否展示 + rightName: false, // 右侧限速值是否展示 + nameBackgroundIsRect: true, // 限速值背景是否为矩形 + nameBackgroundBorderWidth: 1, // 限速值背景是否边框宽度 + nameBackgroundBorderColor: '#C00808', // 限速值背景边框颜色 + limitValueDistance: 18, + kilometerFontSize: 0, // 公里标大小 + nameNumberFontSize: 11, // 限速值大小 + nameNumberColor: '#C00808', // 限速值颜色 + nameBackground: '#000', // 限速名称背景颜色 + drogueWidth: 15, // 浮标宽度 + drogueHeight: 12 // 浮标高度 + }, separator: { z: 3, // 分割符层级 width: 1.2, // 分隔符宽度 diff --git a/src/jmapNew/config/skinCode/race_01.js b/src/jmapNew/config/skinCode/race_01.js index ec4c206a0..5c4ab8f49 100644 --- a/src/jmapNew/config/skinCode/race_01.js +++ b/src/jmapNew/config/skinCode/race_01.js @@ -68,6 +68,11 @@ class SkinCode extends defaultStyle { }, speedLimitName: { z: 10, + leftName: true, // 左侧限速值是否展示 + rightName: true, // 右侧限速值是否展示 + nameBackgroundIsRect: false, // 限速值背景是否为矩形 + nameBackgroundBorderWidth: 0, // 限速值背景是否边框宽度 + nameBackgroundBorderColor: '#C00808', // 限速值背景边框颜色 limitValueDistance: 15, // 限速值距离 kilometerFontSize: 0, // 公里标大小 kilometerColor: '#000', // 公里标颜色 diff --git a/src/jmapNew/shape/Section/ELimitName.js b/src/jmapNew/shape/Section/ELimitName.js index 6b2640a1e..e499eb94c 100644 --- a/src/jmapNew/shape/Section/ELimitName.js +++ b/src/jmapNew/shape/Section/ELimitName.js @@ -22,110 +22,122 @@ export default class ELimitName extends Group { const y1 = model.points[0].y + style.Section.speedLimitName.limitValueDistance; const x2 = model.points[model.points.length - 1].x; const y2 = model.points[model.points.length - 1].y + style.Section.speedLimitName.limitValueDistance; - this.leftPolygon = new Polygon({ - zlevel: this.zlevel, - z: this.z + 9, - shape: { - points: [ - [x1, y1], - [x1 + rectW, y1], - [x1 + (rectW + rectH / 2), y1 - rectH / 2], - [x1 + rectW, y1 - rectH], - [x1, y1 - rectH] - ] - }, - style: { - lineWidth: 0, - fill: style.Section.speedLimitName.nameBackground - } - }); - this.rightPolygon = new Polygon({ - zlevel: this.zlevel, - z: this.z + 9, - shape: { - points: [ - [x2, y2], - [x2 - rectW, y2], - [x2 - (rectW + rectH / 2), y2 - rectH / 2], - [x2 - rectW, y2 - rectH], - [x2, y2 - rectH] - ] - }, - style: { - lineWidth: 0, - fill: style.Section.speedLimitName.nameBackground - } - }); - this.leftLimitValue = new Text({ - zlevel: this.zlevel, - z: this.z + 10, - style: { - x: x1 + 2, - y: y1, - fontWeight: 'normal', - fontSize: style.Section.speedLimitName.nameNumberFontSize, - fontFamily: style.fontFamily, - text: '', - textFill: style.Section.speedLimitName.nameNumberColor, - textAlign: 'left', - textPosition: style.Section.name.textPosition || 'inside', - textVerticalAlign: 'bottom' - } - }); - this.rightLimitValue = new Text({ - zlevel: this.zlevel, - z: this.z + 10, - style: { - x: x2 - 2, - y: y2, - fontWeight: 'normal', - fontSize: style.Section.speedLimitName.nameNumberFontSize, - fontFamily: style.fontFamily, - text: '', - textFill: style.Section.speedLimitName.nameNumberColor, - textAlign: 'right', - textPosition: style.Section.name.textPosition || 'inside', - textVerticalAlign: 'bottom' - } - }); - this.leftKilometerValue = new Text({ - zlevel: this.zlevel, - z: this.z + 10, - style: { - x: x1, - y: y1 + 12, - fontWeight: 'normal', - fontSize: style.Section.speedLimitName.kilometerFontSize, - fontFamily: style.fontFamily, - text: '17.981km', - textFill: style.Section.speedLimitName.kilometerColor, - textAlign: 'left', - textPosition: style.Section.name.textPosition || 'inside', - textVerticalAlign: 'bottom' - } - }); - this.rightKilometerValue = new Text({ - zlevel: this.zlevel, - z: this.z + 10, - style: { - x: x2, - y: y2 + 12, - fontWeight: 'normal', - fontSize: style.Section.speedLimitName.kilometerFontSize, - fontFamily: style.fontFamily, - text: '17.981km', - textFill: style.Section.speedLimitName.kilometerColor, - textAlign: 'right', - textPosition: style.Section.name.textPosition || 'inside', - textVerticalAlign: 'bottom' - } - }); - this.add(this.leftPolygon); - this.add(this.rightPolygon); - this.add(this.leftLimitValue); - this.add(this.rightLimitValue); - this.add(this.leftKilometerValue); - this.add(this.rightKilometerValue); + if (style.Section.speedLimitName.leftName) { + const leftPoints = style.Section.speedLimitName.nameBackgroundIsRect ? [[x1, y1], + [x1 + rectW, y1], + [x1 + rectW, y1 - rectH], + [x1, y1 - rectH]] : [[x1, y1], + [x1 + rectW, y1], + [x1 + (rectW + rectH / 2), y1 - rectH / 2], + [x1 + rectW, y1 - rectH], + [x1, y1 - rectH]]; + this.leftPolygon = new Polygon({ + zlevel: this.zlevel, + z: this.z + 9, + shape: { + points: leftPoints + }, + style: { + lineWidth: style.Section.speedLimitName.nameBackgroundBorderWidth, + fill: style.Section.speedLimitName.nameBackground, + stroke: style.Section.speedLimitName.nameBackgroundBorderColor + } + }); + this.leftLimitValue = new Text({ + zlevel: this.zlevel, + z: this.z + 10, + style: { + x: x1 + 2, + y: y1, + fontWeight: 'normal', + fontSize: style.Section.speedLimitName.nameNumberFontSize, + fontFamily: style.fontFamily, + text: '', + textFill: style.Section.speedLimitName.nameNumberColor, + textAlign: 'left', + textPosition: style.Section.name.textPosition || 'inside', + textVerticalAlign: 'bottom' + } + }); + this.leftKilometerValue = new Text({ + zlevel: this.zlevel, + z: this.z + 10, + style: { + x: x1, + y: y1 + 12, + fontWeight: 'normal', + fontSize: style.Section.speedLimitName.kilometerFontSize, + fontFamily: style.fontFamily, + text: '17.981km', + textFill: style.Section.speedLimitName.kilometerColor, + textAlign: 'left', + textPosition: style.Section.name.textPosition || 'inside', + textVerticalAlign: 'bottom' + } + }); + this.add(this.leftPolygon); + this.add(this.leftLimitValue); + this.add(this.leftKilometerValue); + } + if (style.Section.speedLimitName.rightName) { + const rightPoints = style.Section.speedLimitName.nameBackgroundIsRect ? [[x2, y2], + [x2 - rectW, y2], + [x2 - rectW, y2 - rectH], + [x2, y2 - rectH]] : [[x2, y2], + [x2 - rectW, y2], + [x2 - (rectW + rectH / 2), y2 - rectH / 2], + [x2 - rectW, y2 - rectH], + [x2, y2 - rectH]]; + this.rightPolygon = new Polygon({ + zlevel: this.zlevel, + z: this.z + 9, + shape: { + points: rightPoints + }, + style: { + lineWidth: style.Section.speedLimitName.nameBackgroundBorderWidth, + fill: style.Section.speedLimitName.nameBackground, + stroke: style.Section.speedLimitName.nameBackgroundBorderColor + } + }); + + this.rightLimitValue = new Text({ + zlevel: this.zlevel, + z: this.z + 10, + style: { + x: x2 - 2, + y: y2, + fontWeight: 'normal', + fontSize: style.Section.speedLimitName.nameNumberFontSize, + fontFamily: style.fontFamily, + text: '', + textFill: style.Section.speedLimitName.nameNumberColor, + textAlign: 'right', + textPosition: style.Section.name.textPosition || 'inside', + textVerticalAlign: 'bottom' + } + }); + + this.rightKilometerValue = new Text({ + zlevel: this.zlevel, + z: this.z + 10, + style: { + x: x2, + y: y2 + 12, + fontWeight: 'normal', + fontSize: style.Section.speedLimitName.kilometerFontSize, + fontFamily: style.fontFamily, + text: '17.981km', + textFill: style.Section.speedLimitName.kilometerColor, + textAlign: 'right', + textPosition: style.Section.name.textPosition || 'inside', + textVerticalAlign: 'bottom' + } + }); + this.add(this.rightPolygon); + this.add(this.rightLimitValue); + this.add(this.rightKilometerValue); + } } hide() { diff --git a/src/jmapNew/theme/chengdu_03/menus/index.vue b/src/jmapNew/theme/chengdu_03/menus/index.vue index ef111f7ad..c88200ad3 100644 --- a/src/jmapNew/theme/chengdu_03/menus/index.vue +++ b/src/jmapNew/theme/chengdu_03/menus/index.vue @@ -33,7 +33,6 @@ export default { components: { MenuBar, MenuButton, - MenuCancel, MenuSignal, MenuSwitch, MenuSection, diff --git a/src/jmapNew/theme/haerbin_01/menus/menuBar.vue b/src/jmapNew/theme/haerbin_01/menus/menuBar.vue index 52fa69ced..73f2513f3 100644 --- a/src/jmapNew/theme/haerbin_01/menus/menuBar.vue +++ b/src/jmapNew/theme/haerbin_01/menus/menuBar.vue @@ -126,7 +126,7 @@
考评
-
日志
+
日志
锁屏
@@ -139,6 +139,7 @@ + @@ -154,6 +155,7 @@ import BuzzerAudio from '@/assets/buzzer.mp3'; import AlarmTableHmi from './menuDialog/alarmTableHmi'; import AlarmTableLow from './menuDialog/alarmTableLow'; import TrainControl from './dialog/trainControl'; +import LogDetail from './menuDialog/logDetail'; export default { name: 'MenuBar', @@ -161,7 +163,8 @@ export default { NoticeInfo, AlarmTableLow, AlarmTableHmi, - TrainControl + TrainControl, + LogDetail }, props: { selected: { @@ -379,6 +382,10 @@ export default { } }); }, + showLogDetail() { + // this.$refs.logDetail.doShow(); + this.undeveloped(); + }, login() { if (this.loginActive) { if (this.loginText === '退出') { diff --git a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue index 502992822..00cc4ea77 100644 --- a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue +++ b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue @@ -53,7 +53,7 @@ :data="tempData" border :cell-style="tableStyle" - style="width: 100%;background: #E0E0E0;border: none;outline: none; height: 56px" + style="width: 100%;background: #E0E0E0;border: none;outline: none; height: 28px" size="mini" class="haerbin_table" highlight-current-row @@ -61,6 +61,14 @@ > + + + @@ -147,6 +155,8 @@ export default { data() { return { tempData: [], + speedList: [{label: '15km/h', value: 15}, {label: '25km/h', value:25}, {label: '45km/h', value:45}, {label: '60km/h', value: 60}], + speedLimitValue: 15, oldDevice: null, // 上一次点击元素 canCommand: true, cr1Confrim: false, @@ -204,6 +214,9 @@ export default { }, cr2ConfirmId() { return OperationEvent.Command.commandHaerbin.confrimCr2.domId; + }, + speedShow() { + return this.cmdType == CMD.Section.CMD_SECTION_SET_LIMIT_SPEED || this.cmdType == CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED; } }, watch: { @@ -373,8 +386,7 @@ export default { this.tempData.push(this.selectedObj); this.param = { switchCode: this.selectedObj.code, - sectionCode: section.code, - speedLimitValue: '5' // 默认区段临时限速 + sectionCode: section.code }; }, handleSingalMenu() { @@ -468,8 +480,7 @@ export default { this.tempData = []; this.tempData.push(this.selectedObj); this.param = { - sectionCode: this.selectedObj.code, - speedLimitValue: '5' + sectionCode: this.selectedObj.code }; }, handleDirectionRodMenu() { @@ -577,6 +588,9 @@ export default { }); } } + if (this.cmdType == CMD.Section.CMD_SECTION_SET_LIMIT_SPEED || this.cmdType == CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED) { + this.param.speedLimitValue = this.speedLimitValue; + } }, command() { this.handleParam(); @@ -652,6 +666,7 @@ export default { this.operate = ''; // 清空指令 this.cmdType = ''; this.securityCommand = ''; + this.speedLimitValue = 15; this.secondConfirm = false; this.cr1Confrim = false; if (this.oldClickObj) { @@ -804,6 +819,16 @@ export default { height: 20px; line-height: 20px; } + /deep/.el-input--small .el-input__inner{ + height: 28px; + line-height: 28px; + } + /deep/.el-table__empty-text{ + line-height: 28px; + } + /deep/.el-table__empty-block{ + min-height: 28px; + } diff --git a/src/layout/components/userInfo.vue b/src/layout/components/userInfo.vue index 010b3cce6..22866c0da 100644 --- a/src/layout/components/userInfo.vue +++ b/src/layout/components/userInfo.vue @@ -236,14 +236,14 @@ -
-
单位:
-
-
- {{ handleCompany(userInfo.companyId) }} -
-
-
+ + + + + + + +
绑定微信:
@@ -398,16 +398,22 @@ export default { .catch(error => { console.log(error, '请求个人信息失败'); }); - getCompanyList().then(resp => { - this.companyList = resp.data; - }).catch((error) => { - console.log(error, '获取公司列表信息失败'); - }); + // getCompanyList().then(resp => { + // this.companyList = resp.data; + // }).catch((error) => { + // console.log(error, '获取公司列表信息失败'); + // }); }, doClose() { 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; @@ -458,15 +464,15 @@ export default { } } }, - handleCompany(companyId) { - let name = ''; - this.companyList.forEach(item => { - if (item.id == companyId) { - name = item.name; - } - }); - return name; - }, + // handleCompany(companyId) { + // let name = ''; + // this.companyList.forEach(item => { + // if (item.id == companyId) { + // name = item.name; + // } + // }); + // return name; + // }, switcherMobile() { // this.editInfo.mobile = this.userInfo.mobile; this.mobileShow = !this.mobileShow; diff --git a/src/router/index_Common.js b/src/router/index_Common.js index 84464aed4..a7c0507d4 100644 --- a/src/router/index_Common.js +++ b/src/router/index_Common.js @@ -766,7 +766,7 @@ export const asyncRouter = [ { // 单位管理 path: 'companyManage', - hidden: true, + // hidden: true, component: CompanyManage, meta: { i18n: 'router.companyManage' diff --git a/src/scripts/cmdPlugin/Handler.js b/src/scripts/cmdPlugin/Handler.js index 8ccb9b347..832693c12 100644 --- a/src/scripts/cmdPlugin/Handler.js +++ b/src/scripts/cmdPlugin/Handler.js @@ -33,17 +33,27 @@ class Handler { } afterValid(operation, valid) { - const basicInfo = store.getters['training/basicInfo']; - if (basicInfo.id && valid) { - const group = router.currentRoute.query.group; - sendTrainingNextStepNew({ trainingId: basicInfo.id, operation: operation }, group); - } - - if (!valid) { - this.pop(); - } else if (operation.cancel === true) { - this.clear(); - } + return new Promise((resolve, reject) => { + const basicInfo = store.getters['training/basicInfo']; + if (basicInfo.id && valid) { + const group = router.currentRoute.query.group; + sendTrainingNextStepNew({ trainingId: basicInfo.id, operation: operation }, group).then(res=>{ + if (!valid) { + this.pop(); + } else if (operation.cancel === true) { + this.clear(); + } + resolve(); + }).catch(error => { + if (!valid) { + this.pop(); + } else if (operation.cancel === true) { + this.clear(); + } + reject(error); + }); + } + }); } getWholeParam() { @@ -94,24 +104,25 @@ class Handler { this.storeOperation(operation); const rtn = { valid: false, response: null }; const valid = ValidateHandler.vaildate(this.getTrainingMode(), operation); - this.afterValid(operation, valid); - rtn.valid = valid; - if (operation.cmdType && valid) { - const command = this.getCommand(operation); - if (command) { - CommandHandler.execute(command.id, command.get()).then(response => { - rtn.response = response; - resolve(rtn); - }).catch(error => { - reject(error); - }); + this.afterValid(operation, valid).then(()=>{ + rtn.valid = valid; + if (operation.cmdType && valid) { + const command = this.getCommand(operation); + if (command) { + CommandHandler.execute(command.id, command.get()).then(response => { + rtn.response = response; + resolve(rtn); + }).catch(error => { + reject(error); + }); + } else { + rtn.response = '获取指令失败，暂无指令或参数传值不正确，请检查指令字典'; + reject(rtn); + } } else { - rtn.response = '获取指令失败，暂无指令或参数传值不正确，请检查指令字典'; - reject(rtn); + resolve(rtn); } - } else { - resolve(rtn); - } + }); }); } diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 798608c73..c0569ef83 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -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'; // 张赛 diff --git a/src/views/designPlatform/demonList.vue b/src/views/designPlatform/demonList.vue index d6064243a..cbf1f8f18 100644 --- a/src/views/designPlatform/demonList.vue +++ b/src/views/designPlatform/demonList.vue @@ -1,19 +1,21 @@ @@ -231,45 +233,28 @@ export default { }; 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/studentManage/index.vue b/src/views/studentManage/index.vue index 16727f3e5..309b50c5b 100644 --- a/src/views/studentManage/index.vue +++ b/src/views/studentManage/index.vue @@ -105,7 +105,7 @@ 查询 - + { that.classList = []; getProjectClassList(ProjectCode[that.project]).then(respon => { that.classList = respon.data; + that.loadingStudentInfo = false; }).catch(() =>{ that.$message.error('获取班级数据失败！'); + that.loadingStudentInfo = false; }); that.$message.success('学生信息导入成功！'); }).catch(() => { that.$message.error('学生信息导入失败！'); + that.loadingStudentInfo = false; }); } catch (error) { that.$message.warning(`解析成绩单失败:${error}`); 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 d10cd935d..a93d8c6bc 100644 --- a/src/views/system/companyManage/manager.vue +++ b/src/views/system/companyManage/manager.vue @@ -98,6 +98,9 @@ export default { doShow(companyId) { this.dialogVisible = true; this.companyId = companyId; + this.$nextTick(() => { + this.reloadTable(); + }); }, handleClose() { this.dialogVisible = false; @@ -107,7 +110,7 @@ export default { return this.companyMap[companyId]; }, reloadTable() { - this.queryList.reload(); + this.queryList.queryReload(); }, addParams(params) { params.companyId = this.companyId; @@ -122,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); diff --git a/src/views/trainingPlatform/demonList.vue b/src/views/trainingPlatform/demonList.vue index 3f2918a4e..338a88a59 100644 --- a/src/views/trainingPlatform/demonList.vue +++ b/src/views/trainingPlatform/demonList.vue @@ -1,37 +1,39 @@ @@ -65,9 +67,9 @@ export default { project() { return getSessionStorage('project'); }, - getMapByCode() { - const project = getSessionStorage('project'); - return GetMapListByProjectList.includes(project); + IsProject() { + // 实训平台 是否为通过项目code获取地图列表的项目 + return GetMapListByProjectList.includes(this.project); } }, watch: { @@ -76,7 +78,7 @@ export default { } }, mounted() { - if (this.getMapByCode) { + if (this.IsProject) { this.refresh(); } }, @@ -148,7 +150,7 @@ export default { this.filterSelect = filterSelect; try { let res = {}; - if (this.getMapByCode) { + if (this.IsProject) { res = await getSubSystemByProjectCode(); } else { res = await getTrainingSystemList(filterSelect); @@ -210,37 +212,26 @@ export default { };