diff --git a/linkwe-ui/package.json b/linkwe-ui/package.json
index 910c47ca242a94aef7889937b4682e72d65dc9d7..baee17a8178b9eca37f18bc03686f447e764378e 100644
--- a/linkwe-ui/package.json
+++ b/linkwe-ui/package.json
@@ -66,6 +66,7 @@
     "video.js": "^7.11.4",
     "videojs-contrib-hls": "^5.15.0",
     "vue": "2.6.10",
+    "vue-amap": "^0.5.10",
     "vue-count-to": "1.0.13",
     "vue-cropper": "0.4.9",
     "vue-quill-editor": "3.0.6",
diff --git a/linkwe-ui/public/index.html b/linkwe-ui/public/index.html
index 153ef254cb71e0f3290cd35c3a9a33d90964226f..f93e94f486287a0d39f032bc626319967f4a839e 100644
--- a/linkwe-ui/public/index.html
+++ b/linkwe-ui/public/index.html
@@ -7,6 +7,7 @@
   <meta name="renderer" content="webkit">
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
   <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+  <script type="text/javascript" src="//api.map.baidu.com/api?v=2.0&ak=wI3zLlyN01Ej3ZD6ZD4WiuoE8N6AC6Lm"></script>
   <title><%= VUE_APP_TITLE %></title>
   <style>
     html,
diff --git a/linkwe-ui/src/main.js b/linkwe-ui/src/main.js
index a14467c22038e99bbeb9533d625a1d9b74313383..746e14ccdb240869a71cfa55fe84bf07da58fcec 100644
--- a/linkwe-ui/src/main.js
+++ b/linkwe-ui/src/main.js
@@ -72,6 +72,15 @@ import VideoPlayer from 'vue-video-player'
 import '@liripeng/vue-audio-player/lib/vue-audio-player.css'
 
 Vue.use(AudioPlayer)
+import VueAMap from 'vue-amap';
+
+Vue.use(VueAMap);
+
+VueAMap.initAMapApiLoader({
+  key: '32396af00cd726deed804cf5b63ed2d8',
+  plugin: ['AMap.Autocomplete', 'AMap.PlaceSearch', 'AMap.Scale', 'AMap.OverView', 'AMap.ToolBar', 'AMap.MapType', 'AMap.PolyEditor', 'AMap.CircleEditor'],
+  v: '1.4.4'
+});
 // 全局组件挂载
 Vue.component('Pagination', Pagination)
 Vue.component('RightToolbar', RightToolbar)
diff --git a/linkwe-ui/src/views/conversation/component/chat.vue b/linkwe-ui/src/views/conversation/component/chat.vue
index 9f73e4c077e0d4148de5c386c6c005fd97d43bd4..17fcf40fe0435261933dccf8dde926d85cf69743 100644
--- a/linkwe-ui/src/views/conversation/component/chat.vue
+++ b/linkwe-ui/src/views/conversation/component/chat.vue
@@ -1,13 +1,15 @@
 <template>
   <div class="takecontent">
     <ul>
+  
       <li v-for="(item,index) in allChat" :key="index">
         <!-- <span v-if="item.fromInfo.name">{{item.fromInfo.name}}</span> -->
         <div :style="{'color':item.action=='send'?'#199ed8':'#999'}"><span v-if="item.fromInfo">{{item.fromInfo.name}}</span>  <span
             :style="{'color':item.action=='send'?'#199ed8':'#999'}">{{parseTime(item.msgtime)}}</span></div>
-        <div v-if="item.msgtype=='text'" class="msgtypetext">
+        <div v-if="item.msgtype=='text'" class="msgtypetext"  >
           {{item.text.content}}
         </div>
+        
         <div v-else-if="item.msgtype=='image'" class="msgtypeimg">
           <img :src="item.image.attachment" @click="showImg(item)">
         </div>
@@ -24,12 +26,15 @@
         <div v-else-if="item.msgtype=='video'" class="msgtypevideo">
           <i class="el-icon-video-play" style=" font-size: 40px;  color: #199ed8;" @click="play(item,'video')"></i>
         </div>
-
-        <div v-else-if="item.msgtype=='location'" class="msgtypecard ">
-          <div class="card_name"></div>
-          <div class="card_foot">{{item.location.address}}</div>
+        <div v-else-if="item.msgtype=='location'" class="msgtypecard" >
+          <div class="card_name">
+            <el-amap ref="map" vid="amapDemo"  :center="[item.location.longitude, item.location.latitude]" :zoom="zoom"  class="amap-demo" style="pointer-events: none;">
+             <el-amap-marker :position="[item.location.longitude, item.location.latitude]"></el-amap-marker>
+           </el-amap>
+          </div>
+          <div class="card_foot" >{{item.location.address}}</div>
         </div>
-        <div v-else-if="item.msgtype=='weapp'" class="msgtypecard ">
+        <div v-else-if="item.msgtype=='weapp'" class="msgtypecard">
           <div class="card_name"></div>
           <div class="card_foot">小程序</div>
         </div>
@@ -69,7 +74,7 @@
 
 <script>
 
-
+    import { AMapManager } from 'vue-amap';
   import 'video.js/dist/video-js.css'
   import 'vue-video-player/src/custom-theme.css'
   
@@ -78,14 +83,16 @@
     yearMouthDay
   } from '@/utils/common.js'
   export default {
-  
+  components:{AMapManager},
     props: {
       allChat: {
         type: Array,
         defluat: () => []
       }
     },
-
+  mounted(){
+   
+  },
     data() {
       return {
         dia: false,
@@ -111,10 +118,28 @@
           width: document.documentElement.clientWidth,
           height:'475',
           notSupportedMessage: '此视频暂无法播放，请稍后再试' //允许覆盖Video.js无法播放媒体源时显示的默认信息。
-        }
+        },
+        
+        
+           zoom: 15,
+           center: [117.148118, 36.660223],
+            markers: [
+            {
+              position: [117.148118, 36.660223],
+              visible: false,
+              draggable: false,
+             
+            }
+          ]
+        
+         
+        
+    
       }
     },
     methods: {
+       
+     
       playVideo(e){
          this.vioceSrc=[e.voice.attachment]
          this.diavioce=true;
@@ -184,6 +209,8 @@
     }
 
     .card_name {
+      width: 320px;
+      height: 105px;
       line-height: 80px;
       text-indent: 10px;
     }
@@ -208,7 +235,7 @@
     }
 
     .msgtypecard {
-      width: 300px;
+      width: 320px;
       height: 140px;
       margin: 10px;
       border-radius: 8px;
diff --git a/linkwe-ui/src/views/conversation/page/employeeTest.vue b/linkwe-ui/src/views/conversation/page/employeeTest.vue
index 4d04a8d6c222c0723c63c4d84b3e49b794fa5483..7bd0cea5a826134be445a6e181664ffbfbc05fda 100644
--- a/linkwe-ui/src/views/conversation/page/employeeTest.vue
+++ b/linkwe-ui/src/views/conversation/page/employeeTest.vue
@@ -280,7 +280,6 @@
       chatFn(data) {
         this.chat = data;
         if (data) {
-          console.log(122132)
             this.activeNameThreeClick()
         }
       },