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

src/views/newMap/chatView/chatBox.vue

@@ -1,13 +1,15 @@
 <template>
   <div class="chatBox" :class="{'active': drawer}" :style="{'bottom':bottom+'px'}">
     <div class="menuTrainListBtn" @click="clickBtn">
-      <div v-if="userRole == 'DISPATCHER'" id="teleName">
+      <div v-if="userRole == 'DISPATCHER'">
+        <div id="teleName" />
         <p style="margin: 0;">调</p>
         <p style="margin: 0;">度</p>
         <p style="margin: 0;">电</p>
         <p style="margin: 0;">话</p>
       </div>
-      <div v-if="userRole != 'AUDIENCE' && userRole != 'DISPATCHER'" id="teleName">
+      <div v-if="userRole != 'AUDIENCE' && userRole != 'DISPATCHER'">
+        <div id="teleName" />
         <p style="margin: 0;">电</p>
         <p style="margin: 0;">话</p>
       </div>
@@ -798,6 +800,9 @@ export default {
             this.quitLoading = true;
             this.userString = '';
             overSimulationConversition(this.group, this.conversitionId).then(resp => {
+                if (this.recordSending) {
+                    this.cancleRecording();
+                }
                 this.connectSuccess = false;
                 this.conversitionMemberList = [];
                 this.messageList = [];
@@ -1229,6 +1234,17 @@ export default {
     -webkit-animation: isInviting infinite 1s;	/* Safari 和 Chrome */
     -o-animation: isInviting infinite 1s;	/* Opera */
 }
+#teleName{
+    background: #6BBE16;
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    left: 0;
+    top: 0;
+    border-radius: 0px 5px 5px 0px;
+    z-index: -1;
+    opacity: 0;
+}
 </style>
 <style lang="scss">
 .isInviting::before{

src/views/scriptManage/tipScriptRecord.vue

@@ -187,7 +187,17 @@ export default {
             this.quickChangeMember = {list:quickChangeMember};
             const memberdata = this.quickChangeMember.list.find(mem=>{ return mem.id == newRole.id; });
             if (!memberdata) {
-                newRole.userId = this.$store.state.user.id; this.quickChangeMember.list.push(newRole);
+                newRole.userId = this.$store.state.user.id;
+                const roleTypeEnumMap = {
+                    'STATION_SUPERVISOR':'行值',
+                    'DISPATCHER':'行调',
+                    'DRIVER':'司机',
+                    'MAINTAINER':'通号',
+                    'DEPOT_DISPATCHER':'车辆段调度',
+                    'PARENT_DEPARTMENT':'上级部门'
+                };
+                newRole.type = roleTypeEnumMap[newRole.type];
+                this.quickChangeMember.list.push(newRole);
             }
         },
         addMember() {