diff --git a/src/components/QueryListPage/QueryForm.vue b/src/components/QueryListPage/QueryForm.vue index 28421fb31..47cd039d8 100644 --- a/src/components/QueryListPage/QueryForm.vue +++ b/src/components/QueryListPage/QueryForm.vue @@ -510,6 +510,9 @@ export default { if ( typeof row.selectChange === 'function') { row.selectChange && row.selectChange(form); } + }, + getFormModel() { + return this.formModel; } } }; diff --git a/src/components/QueryListPage/QueryListPage.vue b/src/components/QueryListPage/QueryListPage.vue index 54abab9d7..12d30a7c2 100644 --- a/src/components/QueryListPage/QueryListPage.vue +++ b/src/components/QueryListPage/QueryListPage.vue @@ -486,6 +486,13 @@ export default { } this.queryList.data = [...this.queryList.data]; }, + getFormModel() { + if (this.$refs.queryForm) { + return this.$refs.queryForm.getFormModel(); + } else { + return ''; + } + }, sortChange(data) { const self = this; if (data.order && data.column.sortable == 'custom') { diff --git a/src/jmapNew/shape/Switch/index.js b/src/jmapNew/shape/Switch/index.js index 0dce65d13..3303fbb2c 100644 --- a/src/jmapNew/shape/Switch/index.js +++ b/src/jmapNew/shape/Switch/index.js @@ -121,7 +121,7 @@ export default class Switch extends Group { fill: 'rgba(0, 0, 0, 1)', lineDash: [3, 3], stroke: '#F00', - lineWidth: 1 + lineWidth: 2 } }); this.add(this.lossShow); @@ -333,8 +333,8 @@ export default class Switch extends Group { this.lossShow && this.lossShow.show(); this.lossShow && this.lossShow.animateStyle(true) .when(0, { stroke: this.style.backgroundColor }) - .when(1000, { stroke: '#F00' }) - .when(2000, { stroke: this.style.backgroundColor }) + .when(500, { stroke: '#F00' }) + .when(1000, { stroke: this.style.backgroundColor }) .start(); } diff --git a/src/views/jsxt/refereeList/index.vue b/src/views/jsxt/refereeList/index.vue index 0b7d97b4e..c2292df31 100644 --- a/src/views/jsxt/refereeList/index.vue +++ b/src/views/jsxt/refereeList/index.vue @@ -141,7 +141,8 @@ export default { return statusDict[status]; }, getData() { - const params = {raceId:this.$route.query.raceId, pageSize:999, pageNum:1}; + const formModel = this.$refs.queryListPage.getFormModel(); + const params = {raceId:this.$route.query.raceId, pageSize:999, pageNum:1, name: formModel ? formModel.name : '', organization: formModel ? formModel.organization : ''}; getRaceUserList(params).then(response=>{ this.queryList.data = response.data.list; this.refresh(); diff --git a/src/views/newMap/jointTrainingNew/chatView/chatBox.vue b/src/views/newMap/jointTrainingNew/chatView/chatBox.vue index 7d459b424..b1f77c663 100644 --- a/src/views/newMap/jointTrainingNew/chatView/chatBox.vue +++ b/src/views/newMap/jointTrainingNew/chatView/chatBox.vue @@ -4,7 +4,7 @@
- +
{{ headerTitle }}
@@ -131,6 +131,9 @@ export default { hideAddCoversition() { this.isHasCoversition = true; }, + showAddCoverition() { + this.isHasCoversition = false; + }, addCoversition({data, headerTitle}) { this.$refs.chatCoversitionList.addCoversition(data); this.isHasCoversition = true; diff --git a/src/views/newMap/jointTrainingNew/chatView/chatCoversitionList.vue b/src/views/newMap/jointTrainingNew/chatView/chatCoversitionList.vue index f8991c771..a64faae8e 100644 --- a/src/views/newMap/jointTrainingNew/chatView/chatCoversitionList.vue +++ b/src/views/newMap/jointTrainingNew/chatView/chatCoversitionList.vue @@ -76,6 +76,7 @@ export default { closeCoversition(coversitionId) { quitCoversition(this.group, coversitionId).then(res=>{ this.initPage(true); + this.$emit('showAddCoverition'); }).catch(error=>{ this.$messageBox('退出会话失败: ' + error.message); });