From f02a55724b0bc75b2ce8586d078842e41f4d9015 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Wed, 14 Oct 2020 16:19:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/yuyin.png                      | Bin 0 -> 1323 bytes
 src/jmapNew/shape/Section/ELimitLines.js  |  54 +++++++++++-----------
 src/views/newMap/chatView/chatContent.vue |  17 +++++--
 3 files changed, 39 insertions(+), 32 deletions(-)
 create mode 100644 src/assets/yuyin.png

diff --git a/src/assets/yuyin.png b/src/assets/yuyin.png
new file mode 100644
index 0000000000000000000000000000000000000000..32055af5e5face519b963d0dd76101aea17c52b2
GIT binary patch
literal 1323
zcmV+`1=RY9P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000E?Nkl<ZXhZFp
zYiM0X5XWauE-@8@82!+G5i1mFB+A{{i^f!JEw)yph)={1Rx7BjPbx?iwJM6JRIt9l
zS1U@3ZI!C1tpS4~^d@Ka1mdGbMMcnxLeUQruH=lY+=O%2^SZe=CkEWFvycC8XLe`y
z9E5q^aGvXjIRhw{%e_GmeA(&-&Ite!od^K$hhexP2!dZ*fhZh+h)w{2w*g=o0DQ#E
z=L0}EQ;0$Vi0EhlcoP6Fj0oP&%xmWhfE9m5jMy#Aym2NFg?gY;sVoe`a5n%9#E4zb
z%+EIqQ7C{FS1y-N_dL&@fyIv4g8*<QGymQUMBxBdoKk8vBJKr%qa3mKGxNj$c>pVr
zh-}P1>4^QU?uBpjLd=#2IsjlYON7>XNJLgT{hns#+q1?_+1m~<Ffh<PF)^_n0Cq6*
zt~4R#a(Siac|&d=5m{o4`6drUTLJ2~%o_l3Zhi49vml7bhLL-P-p0&Z3k9fDDkq0w
zXm?yi7Y@VloFE83NfM*AK1D?A4K&?E<O5^O1%(1Ar5-@U%`uDaXXe#uVu;8Bo*nH|
ztJQkO$H$LkL9{i5QXn=m^OhtrapMs2THp6yD-@u9J=$z~le6#-0I-Ca|B4f2OKZ>b
zzHq{5k1^)*!U1}Fdynbr>e`2hXE}ndGsbL75=2Cw1Hh>f`$1-2S~!4RP$_i{BEIeb
z3>jn2O9`Xhh<I7VKEccj<^-U>zrUwet9=asJ&u6Rq%cxSZAHXeqWwM3TQoX4dN>Ut
z_aW9=zat_905wG1@B99Z88?e9*e;3oDV0hKtJUf+apQ<+697Ewc&*<UbD(8_nD_({
z*=&q?FllnF^&=v3k0Yqp81q%!7^T!&M0_=B3&Zg0AP9E01Q0jz)P$3hlZ(g3#=ehR
zKx=)mh}epAx*_5+-}gUD@W3hn*yq?bG4o?B0VGt7|I8^O+8D!mchnZ4%xn_+Uy6u(
z9NW#z{6b3rN~u9ad^c{Av}{R4PXNGO(Q#=WBck;H@T?PZYm6};wgg}Y6Vb;2u-utE
z^$ZY^4F?+*)2&o09b2td|40a-hXCL{$F`K28|ox?Z0=jgrhCuxP7@JZ=kH3ZGPTyr
zMZ`i!+mFm_zX!!OB6<-3ZipJYySo<*4-ZeY?18ii5_a<?09Y5bA>ysR??00QV8e7U
zVn58xi?Y_v?SZU`rtDhlJ4M7T-2M#1@T9b_a71LElgCHaIl#>QS?jhHfQaml{S>q4
zbIiOUNlg8b-*8w(<X&S;Lt={?-!=duIs*XWvZe*n%=~jo_}B#2@O3Wlv$8D!DenNA
zD=sp|yq6@t{tUI{c4wr|Ff*^n3Lk543xJ(SYyFgn+!0+gtK6`Cl~NlJ(LLP7zlrN&
zUPi?0>kyd_`o6xt<2pM#ZE4X^_va0twt8S{=ao`B5b>?7uMu^x{j1;ufW6GzP{kIW
z2lB*jxm?zs=h@wl#y+GKe6xBB<q;k2qqW{CB3C(Q=5b@p-ObF^wnN;^q6xRwA^X>c
znQcPL-3kXtx^fY5o$vdv<W^qqSSUb}coE6<31v>tKuWUvv{Wh$CY9M)9x2oVG0E;w
zM@Pq+k&%(_vV<nt3k7hJ-H|X1R|P@f&s6-ZB(gkWY_bD@ZN?b)5uayxL!ZJu(6qvg
h0sjNEdq<m{?{DrX1y4jgKDYn?002ovPDHLkV1gGjYPSFY

literal 0
HcmV?d00001

diff --git a/src/jmapNew/shape/Section/ELimitLines.js b/src/jmapNew/shape/Section/ELimitLines.js
index 3143d6ba2..c42947db7 100644
--- a/src/jmapNew/shape/Section/ELimitLines.js
+++ b/src/jmapNew/shape/Section/ELimitLines.js
@@ -23,34 +23,34 @@ export default class ELimitLines extends Group {
             let y = traingle.dricty * (style.Section.speedLimit.distance) * traingle.getCosRate();
             if (x == Infinity) { x = 0; }
             if (y == Infinity) { y = 0; }
-            if (model.switch) {
-                // 上侧临时限速线
-                const speedLimitLeft = this.createLimit({
-                    position: [x, -y],
-                    switch: model.switch,
-                    code: model.code,
-                    isSwitchSection: model.switchSection,
-                    relSwitchCode: model.relSwitchCode,
-                    isCurve: model.curve, // 是否曲线
-                    points: model.points
-                });
+            // if (model.switch) {
+            // 上侧临时限速线
+            const speedLimitLeft = this.createLimit({
+                position: [x, -y],
+                switch: model.switch,
+                code: model.code,
+                isSwitchSection: model.switchSection,
+                relSwitchCode: model.relSwitchCode,
+                isCurve: model.curve, // 是否曲线
+                points: model.points
+            });
                 // 下侧临时限速线
-                const speedLimitRight = this.createLimit({
-                    position: [-x, y],
-                    switch: model.switch,
-                    code: model.code,
-                    isSwitchSection: model.switchSection,
-                    relSwitchCode: model.relSwitchCode,
-                    isCurve: model.curve, // 是否曲线
-                    points: model.points
-                });
-                speedLimitLeft.forEach(item => {
-                    this.add(item);
-                });
-                speedLimitRight.forEach(item => {
-                    this.add(item);
-                });
-            }
+            const speedLimitRight = this.createLimit({
+                position: [-x, y],
+                switch: model.switch,
+                code: model.code,
+                isSwitchSection: model.switchSection,
+                relSwitchCode: model.relSwitchCode,
+                isCurve: model.curve, // 是否曲线
+                points: model.points
+            });
+            speedLimitLeft.forEach(item => {
+                this.add(item);
+            });
+            speedLimitRight.forEach(item => {
+                this.add(item);
+            });
+            // }
         }
     }
 
diff --git a/src/views/newMap/chatView/chatContent.vue b/src/views/newMap/chatView/chatContent.vue
index 4d3cf300f..7a904971d 100644
--- a/src/views/newMap/chatView/chatContent.vue
+++ b/src/views/newMap/chatView/chatContent.vue
@@ -9,8 +9,9 @@
           </div>
           <div class="userBubble" @click="playAudio(baseUrl+chatContent.src)">
             <div class="userMessage">
-              <span class="el-icon-video-play playicon" />
-              <span class="messageText">{{ chatContent.content }}</span>
+              <!-- <span class="el-icon-video-play playicon" /> -->
+              <img :src="yuyin" alt="playicon1">
+              <!-- <span class="messageText">{{ chatContent.content }}</span> -->
             </div>
           </div>
           <audio id="audioPlay" style="display:none" />
@@ -20,7 +21,7 @@
   </div>
 </template>
 <script>
-
+import yuyin from '@/assets/yuyin.png';
 export default {
     props:{
         messageList:{
@@ -68,6 +69,7 @@ export default {
         return {
             chatContentList:[],
             currentAudioList:[],
+            yuyin:yuyin,
             currentAudioIndex:0,
             isPlay:false,
             baseUrl:process.env.VUE_APP_VOICE_API
@@ -176,9 +178,11 @@ export default {
 .userName{font-size: 12px;display:inline-block;margin-right:10px;}
 .userChatTime{font-size: 12px;display:inline-block;}
 .userBubble{
-    max-width: 200px;
     font-size: 12px;
-    padding: 10px;
+    // max-width: 200px;
+    // padding: 10px;
+    padding: 5px 10px 6px 10px;
+    width: 140px;
     background: #ccc;
     border-radius: 5px;
     cursor: pointer;
@@ -188,6 +192,9 @@ export default {
     font-size: 20px;
     vertical-align: top;
 }
+.playicon1{
+    width:17px;
+}
 .textRight{text-align: right;}
 .userMessage{}
 .messageText{line-height: 20px;}