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

2020-06-03 13:19:11 +08:00 · 2020-06-03 13:19:11 +08:00 · a98495f43f
commit a98495f43f
parent a57ae39ebf 00705cd006
6 changed files with 54 additions and 35 deletions
--- a/src/jmapNew/theme/beijing_01/menus/menuButton.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuButton.vue
@ -1,5 +1,5 @@
 <template>
-  <div v-if="isShowBtn" class="menu" style="height: 45px;" :style="{left: point.x+'px', top: point.y+'px' }">
+  <div v-if="isShowBtn" menuButtonclass="menu menuButton" style="height: 45px;" :style="{left: point.x+'px', bottom: point.y+'px' }">
    <button
      :id="Signal.arrangementRoute.button.domId"
      :style="{display: 'block', float: 'left', width: width+'px', backgroundColor:buttonUpColor}"
@ -257,8 +257,8 @@ export default {
    data() {
        return {
            point: {
-                x: -1000,
-                y: -1000
+                x: 0,
+                y: 15
            },
            operation: '0',
            buttonName: '',
@ -302,18 +302,13 @@ export default {
        '$store.state.menuOperation.selectedCount': function (val) {
            this.selectedChange();
        }
-    },  
+    },
    mounted() {
        this.resetPosition();
    },
    methods: {
        resetPosition() {
            this.$nextTick(() => {
-                const canvasOffset = this.$store.state.config.canvasOffset;
-                this.point = {
-                    x: canvasOffset.x + 20,
-                    y: canvasOffset.y + this.$store.state.config.height - 65
-                };
                this.$store.dispatch('training/tipReload');
            });
        },
--- a/src/jmapNew/theme/foshan_01/menus/menuButton.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuButton.vue
@ -1,5 +1,5 @@
 <template>
-  <div v-if="isShowBtn" class="menu" style="height: 45px;" :style="{left: point.x+'px', top: point.y+'px' }">
+  <div v-if="isShowBtn" class="menu menuButton" style="height:45px;" :style="{left: point.x+'px', bottom: point.y+'px' }">
    <button
      :id="Signal.cancelTrainRoute.button.domId"
      :style="{display: 'block', float: 'left', width: width+'px', backgroundColor:buttonUpColor}"
@ -254,8 +254,8 @@ export default {
    data() {
        return {
            point: {
-                x: -1000,
-                y: -1000
+                x: 5,
+                y: 15
            },
            operation: '0',
            buttonName: '',
@ -297,11 +297,6 @@ export default {
    methods: {
        resetPosition() {
            this.$nextTick(() => {
-                const canvasOffset = this.$store.state.config.canvasOffset;
-                this.point = {
-                    x: canvasOffset.x + 20,
-                    y: canvasOffset.y + this.$store.state.config.height - 65
-                };
                this.$store.dispatch('training/tipReload');
            });
        },
--- a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue
@ -1,5 +1,5 @@
 <template>
-  <div id="menuButton">
+  <div id="menuButton" class="menuButton">
    <div class="haerbin-01__systerm button">
      <el-row>
        <el-col :span="11">
--- a/src/views/newMap/displayNew/chatView/chatBox.vue
+++ b/src/views/newMap/displayNew/chatView/chatBox.vue
@ -1,6 +1,6 @@
 <template>
  <!-- v-quickMenuDrag  -->
-  <div class="chatBox">
+  <div class="chatBox" :style="{'bottom':bottom+'px'}">
    <div v-show="!minimize" class="chat-box">
      <chat-member-list ref="chatMemberList" :group="group" :current-coversition="currentCoversition" @addCoversition="addCoversition" />
      <div class="chat-box-main">
@ -77,6 +77,7 @@ export default {
    data() {
        return {
            minimize:true,
+            bottom:15,
            recordSending:false,
            currentCoversition:{},
            seconds:0,
@ -114,6 +115,13 @@ export default {
        },
        '$store.state.socket.scriptFinish':function(val, old) {
            this.$message('剧本执行完成');
+        },
+        '$store.state.map.mapViewLoadedCount':function(val) {
+            const object = document.querySelector('.menuButton');
+            if (object) {
+                const objectBottom = parseInt(object.offsetHeight.style.bottom) || 0;
+                this.bottom = this.bottom + object.offsetHeight + objectBottom;
+            }
        }

    },
@ -279,7 +287,7 @@ export default {
  position: absolute;
  padding-left:5px;
  left: 0;
-  bottom:28px;
+  bottom:15px;
  z-index:22;
 }
 .chat-box{
--- a/src/views/newMap/jointTrainingNew/chatView/chatBox.vue
+++ b/src/views/newMap/jointTrainingNew/chatView/chatBox.vue
@ -1,10 +1,10 @@
 <template>
  <!-- v-quickMenuDrag  -->
-  <div class="chatBox">
+  <div class="chatBox" :style="{'bottom':bottom+'px'}">
    <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" :user-role="userRole" @showAddCoverition="showAddCoverition" @hideAddCoversition="hideAddCoversition" @setCurrentCoversition="setCurrentCoversition" @setHeadTitle="setHeadTitle" />
+        <chat-coversition-list ref="chatCoversitionList" :group="group" :user-role="userRole" @hideAddCoversition="hideAddCoversition" @setCurrentCoversition="setCurrentCoversition" @setHeadTitle="setHeadTitle" />
        <div class="chat-window">
          <div class="chat-box-header">
            <div class="chat-box-header-title">{{ headerTitle }}</div>
@ -30,6 +30,7 @@
          </div>
          <div class="chat-box-footer">
            <div class="chat-box-footer-tool" />
+            <div v-if="isButtonShow" class="chat-box-footer-quit" @click="quitCoversition()">退出群聊</div>
            <div v-if="currentCoversition.all||isButtonShow" class="chat-box-footer-send" @click="startRecording()">发送语音</div>
          </div>
        </div>
@ -54,7 +55,7 @@ import ChatCoversitionList from './chatCoversitionList';
 import ChatCreateGroup from './chatCreateGroup';
 import ChatTooltip from './chatTooltip';
 import RecordRTC from 'recordrtc';
-import {uploadAudioFileNew} from '@/api/chat';
+import {uploadAudioFileNew, quitCoversition} from '@/api/chat';
 export default {
    name: 'ChatBox',
    components:{
@ -78,6 +79,7 @@ export default {
    data() {
        return {
            minimize:false,
+            bottom:15,
            recordSending:false,
            currentCoversition:{},
            seconds:0,
@ -100,6 +102,15 @@ export default {
            return this.userRole != 'ADMIN' && this.userRole != 'AUDIENCE' && this.isHasCoversition;
        }
    },
+    watch:{
+        '$store.state.map.mapViewLoadedCount':function(val) {
+            const object = document.querySelector('.menuButton');
+            if (object) {
+                const objectBottom = parseInt(object.offsetHeight.style.bottom) || 0;
+                this.bottom = this.bottom + object.offsetHeight + objectBottom;
+            }
+        }
+    },
    mounted() {
        this.initPage();
    },
@ -138,8 +149,14 @@ export default {
        hideAddCoversition() {
            this.isHasCoversition = true;
        },
-        showAddCoverition() {
-            this.isHasCoversition = false;
+        quitCoversition() {
+            quitCoversition(this.group, this.currentCoversition.id).then(res=>{
+                this.currentCoversition = null;
+                this.$refs.chatCoversitionList.initPage(true);
+                this.isHasCoversition = false;
+            }).catch(error=>{
+                this.$messageBox('退出会话失败: ' + error.message);
+            });
        },
        addCoversition({data, headerTitle}) {
            this.$refs.chatCoversitionList.addCoversition(data);
@ -360,7 +377,19 @@ export default {
 .coversition-list{

 }
-
+.chat-box-footer-quit{
+    background: red;
+    width: 65px;
+    font-size: 12px;
+    padding: 5px 0px 4px 0px;
+    text-align: center;
+    border-radius: 3px;
+    color: #fff;
+    float: left;
+    margin-left: 10px;
+    margin-bottom: 10px;
+    cursor: pointer;
+}
 .showMembers{
    float: right;
    line-height: 40px;
--- a/src/views/newMap/jointTrainingNew/chatView/chatCoversitionList.vue
+++ b/src/views/newMap/jointTrainingNew/chatView/chatCoversitionList.vue
@ -15,7 +15,7 @@
  </div>
 </template>
 <script>
-import {getSimulationConversationListNew, quitCoversition} from '@/api/chat';
+import {getSimulationConversationListNew} from '@/api/chat';
 export default {
    name:'ChatCoversitionList',
    props: {
@ -95,14 +95,6 @@ export default {
                this.coversitionList.push(coversition);
            }
            this.changeCoversition(coversition);
-        },
-        closeCoversition(coversitionId) {
-            quitCoversition(this.group, coversitionId).then(res=>{
-                this.initPage(true);
-                this.$emit('showAddCoverition');
-            }).catch(error=>{
-                this.$messageBox('退出会话失败: ' + error.message);
-            });
        }
    }
 };