Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

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;
         }
     }
 };

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') {

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();
 
     }

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();

src/views/newMap/jointTrainingNew/chatView/chatBox.vue

@@ -4,7 +4,7 @@
     <div v-show="!minimize" class="chat-box">
       <chat-member-list ref="chatMemberList" :group="group" :current-coversition="currentCoversition" />
       <div class="chat-box-main">
-        <chat-coversition-list ref="chatCoversitionList" :group="group" @hideAddCoversition="hideAddCoversition" @setCurrentCoversition="setCurrentCoversition" @setHeadTitle="setHeadTitle" />
+        <chat-coversition-list ref="chatCoversitionList" :group="group" @showAddCoverition="showAddCoverition" @hideAddCoversition="hideAddCoversition" @setCurrentCoversition="setCurrentCoversition" @setHeadTitle="setHeadTitle" />
         <div class="chat-window">
           <div class="chat-box-header">
             <div class="chat-box-header-title">{{ headerTitle }}</div>
@@ -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;

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);
             });