diff --git a/linkwe-mobile/.env.development b/linkwe-mobile/.env.development
index df68a0e5ec4c084b26d6270c34458fce881b0149..248ea8944a28402c5dd45298b81b1b227fb48dda 100644
--- a/linkwe-mobile/.env.development
+++ b/linkwe-mobile/.env.development
@@ -1,12 +1,6 @@
 # 开发环境配置
 ENV = 'development'
 
-# 塬微管理系统/开发环境
-VUE_APP_BASE_API = 'http://146.56.222.200/api'
-# VUE_APP_BASE_API = 'http://3x2d6z.natappfree.cc'
+# 基础api（根据实际情况，自行配置，下为示例）
+VUE_APP_BASE_API =  'http://demo.linkwechat.cn'
 
-# 开发环境IP
-VUE_APP_BASE_URL = 'http://192.168.0.101'
-
-# 路由懒加载
-VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/linkwe-mobile/.env.production b/linkwe-mobile/.env.production
index ef47621b2c62f0345b0030980a22c40b2c1749d2..9344dd8dc3086ab38a4163ecedab1539dfeae3e0 100644
--- a/linkwe-mobile/.env.production
+++ b/linkwe-mobile/.env.production
@@ -1,10 +1,8 @@
 # 生产环境配置
- ENV = 'production'
+ENV = 'production'
 
-# 塬微管理系统/生产环境api
-# VUE_APP_BASE_API = 'http://106.13.201.219'
-VUE_APP_BASE_API = 'http://146.56.222.200/api'
+# 基础api
+VUE_APP_BASE_API =  'http://demo.linkwechat.cn'
 
-# 生产环境IP
-# VUE_APP_BASE_URL = 'http://106.13.201.219'
-VUE_APP_BASE_URL = 'http://146.56.222.200/api'
+# 路由基础路径
+VUE_APP_BASE_URL =  '/'
\ No newline at end of file
diff --git a/linkwe-mobile/package-lock.json b/linkwe-mobile/package-lock.json
index 34e650de3142b9ee417fc36841d3278f5a18674d..9538474dfd81fb2cff654884917cf180333741e0 100644
--- a/linkwe-mobile/package-lock.json
+++ b/linkwe-mobile/package-lock.json
@@ -1036,6 +1036,19 @@
         "to-fast-properties": "^2.0.0"
       }
     },
+    "@fortawesome/fontawesome-common-types": {
+      "version": "0.2.36",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.36.tgz",
+      "integrity": "sha512-a/7BiSgobHAgBWeN7N0w+lAhInrGxksn13uK7231n2m8EDPE3BMCl9NZLTGrj9ZXfCmC6LM0QLqXidIizVQ6yg=="
+    },
+    "@fortawesome/free-solid-svg-icons": {
+      "version": "5.15.4",
+      "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.4.tgz",
+      "integrity": "sha512-JLmQfz6tdtwxoihXLg6lT78BorrFyCf59SAwBM6qV/0zXyVeDygJVb3fk+j5Qat+Yvcxp1buLTY5iDh1ZSAQ8w==",
+      "requires": {
+        "@fortawesome/fontawesome-common-types": "^0.2.36"
+      }
+    },
     "@hapi/address": {
       "version": "2.1.4",
       "resolved": "https://registry.npm.taobao.org/@hapi/address/download/@hapi/address-2.1.4.tgz",
@@ -1732,16 +1745,6 @@
           "integrity": "sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo=",
           "dev": true
         },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
         "big.js": {
           "version": "3.2.0",
           "resolved": "https://registry.npm.taobao.org/big.js/download/big.js-3.2.0.tgz",
@@ -1774,47 +1777,12 @@
             "unique-filename": "^1.1.1"
           }
         },
-        "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true,
-          "optional": true
-        },
         "emojis-list": {
           "version": "2.1.0",
           "resolved": "https://registry.npm.taobao.org/emojis-list/download/emojis-list-2.1.0.tgz",
           "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
           "dev": true
         },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true,
-          "optional": true
-        },
         "html-webpack-plugin": {
           "version": "3.2.0",
           "resolved": "https://registry.npm.taobao.org/html-webpack-plugin/download/html-webpack-plugin-3.2.0.tgz?cache=0&sync_timestamp=1609777842352&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhtml-webpack-plugin%2Fdownload%2Fhtml-webpack-plugin-3.2.0.tgz",
@@ -1864,16 +1832,6 @@
             "minipass": "^3.1.1"
           }
         },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
         "terser-webpack-plugin": {
           "version": "2.3.8",
           "resolved": "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-2.3.8.tgz?cache=0&sync_timestamp=1603881694762&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fterser-webpack-plugin%2Fdownload%2Fterser-webpack-plugin-2.3.8.tgz",
@@ -1900,56 +1858,6 @@
             "define-properties": "^1.1.2",
             "object.getownpropertydescriptors": "^2.0.3"
           }
-        },
-        "vue-loader-v16": {
-          "version": "npm:vue-loader@16.2.0",
-          "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.2.0.tgz",
-          "integrity": "sha512-TitGhqSQ61RJljMmhIGvfWzJ2zk9m1Qug049Ugml6QP3t0e95o0XJjk29roNEiPKJQBEi8Ord5hFuSuELzSp8Q==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "chalk": "^4.1.0",
-            "hash-sum": "^2.0.0",
-            "loader-utils": "^2.0.0"
-          },
-          "dependencies": {
-            "big.js": {
-              "version": "5.2.2",
-              "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-              "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
-              "dev": true,
-              "optional": true
-            },
-            "emojis-list": {
-              "version": "3.0.0",
-              "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-              "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-              "dev": true,
-              "optional": true
-            },
-            "json5": {
-              "version": "2.2.0",
-              "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
-              "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "minimist": "^1.2.5"
-              }
-            },
-            "loader-utils": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-              "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "big.js": "^5.2.2",
-                "emojis-list": "^3.0.0",
-                "json5": "^2.1.2"
-              }
-            }
-          }
         }
       }
     },
@@ -3665,6 +3573,11 @@
       "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
       "dev": true
     },
+    "cookie-storage": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/cookie-storage/-/cookie-storage-6.1.0.tgz",
+      "integrity": "sha512-HeVqbVy8BjXhAAuFtL6MTG+witHoLbxfky2jgVh9FmxmyL6IKa9gSSyPNjevXCCCxPu6Tzd9J8+eXTRQzYU/cg=="
+    },
     "copy-anything": {
       "version": "2.0.1",
       "resolved": "https://registry.npm.taobao.org/copy-anything/download/copy-anything-2.0.1.tgz",
@@ -3694,6 +3607,11 @@
       "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
       "dev": true
     },
+    "copy-text-to-clipboard": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/copy-text-to-clipboard/-/copy-text-to-clipboard-3.0.1.tgz",
+      "integrity": "sha512-rvVsHrpFcL4F2P8ihsoLdFHmd404+CMg71S756oRSeQgqk51U3kicGdnvfkrxva0xXH92SjGS62B0XIJsbh+9Q=="
+    },
     "copy-webpack-plugin": {
       "version": "5.1.2",
       "resolved": "https://registry.npm.taobao.org/copy-webpack-plugin/download/copy-webpack-plugin-5.1.2.tgz",
@@ -10592,6 +10510,11 @@
         "has-flag": "^3.0.0"
       }
     },
+    "svelte-fa": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/svelte-fa/-/svelte-fa-2.2.1.tgz",
+      "integrity": "sha512-zSMwI7P9654VSFDXUVsJ748QwKRcWHrb5ZW1FVLiD/9X81hpY2QSXcDtDgqtTyulvXQcl/2khFfk0CNMRYLlNA=="
+    },
     "svg-tags": {
       "version": "1.0.0",
       "resolved": "https://registry.npm.taobao.org/svg-tags/download/svg-tags-1.0.0.tgz",
@@ -10952,11 +10875,6 @@
         "punycode": "^2.1.1"
       }
     },
-    "transitionEnd": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/transitionEnd/-/transitionEnd-1.0.2.tgz",
-      "integrity": "sha1-GRTbW0Wn79w0oBr2koWjppOHFjM="
-    },
     "tryer": {
       "version": "1.0.1",
       "resolved": "https://registry.npm.taobao.org/tryer/download/tryer-1.0.1.tgz",
@@ -11360,12 +11278,23 @@
       "dev": true
     },
     "vconsole": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/vconsole/-/vconsole-3.4.0.tgz",
-      "integrity": "sha512-N9py7Ch9M9nzsigYf8T/WHIOood7jq2MNtUWDqicnrCsPsOZj8Z3NsmFgBmDA3bPKwnzace11HXHxYKPfwV32A==",
-      "requires": {
+      "version": "3.9.1",
+      "resolved": "https://registry.npmjs.org/vconsole/-/vconsole-3.9.1.tgz",
+      "integrity": "sha512-pAqWMsRtxxmXRzTGAG9AT/qfzmQ9Df0UPuQ0ut1aSUiwvK5Hki3IrxurE9iFkFsJX8cGmSjYEAQf7fRc86VBhA==",
+      "requires": {
+        "@fortawesome/free-solid-svg-icons": "^5.15.3",
+        "cookie-storage": "^6.1.0",
+        "copy-text-to-clipboard": "^3.0.1",
+        "core-js": "^3.11.0",
         "mutation-observer": "^1.0.3",
-        "transitionEnd": "^1.0.2"
+        "svelte-fa": "^2.2.1"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "3.16.2",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.16.2.tgz",
+          "integrity": "sha512-P0KPukO6OjMpjBtHSceAZEWlDD1M2Cpzpg6dBbrjFqFhBHe/BwhxaP820xKOjRn/lZRQirrCusIpLS/n2sgXLQ=="
+        }
       }
     },
     "vendors": {
@@ -11460,6 +11389,87 @@
         }
       }
     },
+    "vue-loader-v16": {
+      "version": "npm:vue-loader@16.5.0",
+      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.5.0.tgz",
+      "integrity": "sha512-WXh+7AgFxGTgb5QAkQtFeUcHNIEq3PGVQ8WskY5ZiFbWBkOwcCPRs4w/2tVyTbh2q6TVRlO3xfvIukUtjsu62A==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "chalk": "^4.1.0",
+        "hash-sum": "^2.0.0",
+        "loader-utils": "^2.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true,
+          "optional": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true,
+          "optional": true
+        },
+        "loader-utils": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
     "vue-router": {
       "version": "3.4.9",
       "resolved": "https://registry.npm.taobao.org/vue-router/download/vue-router-3.4.9.tgz?cache=0&sync_timestamp=1609110108136&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.4.9.tgz",
diff --git a/linkwe-mobile/package.json b/linkwe-mobile/package.json
index 33d5fd7f2b40be856c13a1ff28df935a33493b61..09f76dd4fe58b360fe89cac1fd06a92ef576e47b 100644
--- a/linkwe-mobile/package.json
+++ b/linkwe-mobile/package.json
@@ -14,7 +14,7 @@
     "core-js": "^3.6.5",
     "normalize.css": "^8.0.1",
     "vant": "^2.12.2",
-    "vconsole": "^3.4.0",
+    "vconsole": "^3.9.1",
     "vue": "^2.6.11",
     "vue-router": "^3.2.0",
     "vuex": "^3.4.0"
diff --git a/linkwe-mobile/public/index.html b/linkwe-mobile/public/index.html
index facf68127e4cbef9a5db72bb573e7ce6dfee1695..c9eadb7b65274cf4b20f502cec7be5ac5c6cbd54 100644
--- a/linkwe-mobile/public/index.html
+++ b/linkwe-mobile/public/index.html
@@ -3,10 +3,13 @@
 
 <head>
   <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width,initial-scale=1.0">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+  <meta name="renderer" content="webkit">
+  <meta name="viewport" content="width=device-width,initial-scale=1.0, maximum-scale=1, user-scalable=no">
   <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-  <title><%= htmlWebpackPlugin.options.title %></title>
+  <title>
+    <%= htmlWebpackPlugin.options.title %>
+  </title>
   <script src="http://res.wx.qq.com/open/js/jweixin-1.2.0.js"></script>
   <script src="https://open.work.weixin.qq.com/wwopen/js/jwxwork-1.0.0.js"></script>
 </head>
@@ -14,7 +17,7 @@
 <body>
   <noscript>
     <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled.
-      Please enable it to continue.</strong>
+        Please enable it to continue.</strong>
   </noscript>
   <div id="app"></div>
   <!-- built files will be auto injected -->
diff --git a/linkwe-mobile/src/components/StepList.vue b/linkwe-mobile/src/components/StepList.vue
index ce9110a1bf700468155d93acb96da3d7671830d5..246c22d44cf02f4540f245025e0f3b1941517412 100644
--- a/linkwe-mobile/src/components/StepList.vue
+++ b/linkwe-mobile/src/components/StepList.vue
@@ -7,11 +7,10 @@
       loading-text="上划加载更多"
     >
       <van-cell v-for="(item, index) in wList" :key="index">
-        <!-- {{item[0].createDate}} -->
         <!-- 时间 -->
         <p class="f12" style="position:relative; ">
-          {{ getTime1(item[0].createDate) }}
-          {{ getTime3(getTime1(item[0].createDate)) }}
+          {{ dateFormat(item[0].createTime, 'yyyy-MM-dd') }}
+          {{ dateFormat(item[0].createTime, 'ww') }}
           <!-- {{item1.trajectoryType}} -->
         </p>
         <!-- <van-cell> -->
@@ -24,7 +23,7 @@
         >
           <van-step class="msg">
             <span class="f12 po">
-              {{ getTime2(getTime1(item1.createDate)) }}</span
+              {{ dateFormat(item[0].createTime, 'hh:mm') }}</span
             >
             <span class="fs14">{{ chargeType(item1.trajectoryType) }}</span>
             <span class="finish-box">
@@ -47,13 +46,14 @@
         </van-step> -->
         </van-steps>
       </van-cell>
-      <van-divider />
+      <!-- <van-divider /> -->
     </van-list>
   </div>
 </template>
 
 <script>
 import { removeTrajectory, handleWait } from '@/api/portrait'
+import { dateFormat } from '@/utils'
 export default {
   props: ['stepList'],
   inject: ['reload'],
@@ -63,9 +63,6 @@ export default {
       active: -1,
       //   轨迹外层按时间
       wlist: [],
-      // 轨迹内层
-      nlist: [],
-      oldele: [],
       content: '',
       type: 0,
       wList: [],
@@ -76,54 +73,49 @@ export default {
   watch: {
     stepList(newVal, oldVal) {
       //   console.log(newVal, oldVal);
-      if (newVal != oldVal) {
-        //   debugger
-        this.wlist = []
-        this.wList = []
-        this.oldele = []
-        this.nlist = []
-      }
+      this.wList = []
+      let dayList = []
 
       newVal.forEach((ele) => {
-        this.oldele.push(parseInt(this.getTime(ele.createDate)))
-        // console.log(parseInt(this.getTime(ele.createDate)));
+        let date = this.dateFormat(ele.createTime, 'yyyyMMdd')
+        dayList.includes(date) || dayList.push(date)
       })
-      //   console.log(this.oldele);
-      this.oldele = this.newArr(this.oldele).sort(this.f)
-      //   console.log(this.oldele);
-      for (let i = 0; i < this.oldele.length; i++) {
+      dayList.sort((a, b) => b - a)
+      for (let i = 0; i < dayList.length; i++) {
+        let timeList = []
         for (let j = 0; j < newVal.length; j++) {
-          // console.log(newVal[j].createDate);
-          if (this.oldele[i] == this.getTime(newVal[j].createDate)) {
-            this.nlist.push(newVal[j])
-            // console.log(this.nlist);
+          // console.log(newVal[j].createTime);
+          if (dayList[i] == this.dateFormat(newVal[j].createTime, 'yyyyMMdd')) {
+            timeList.push(newVal[j])
           }
         }
-        this.wlist.push(this.nlist)
-        this.nlist = []
+        this.wList.push(timeList)
       }
+      this.loading = false
+      this.finished = true
+
       // console.log(this.wlist);
-      this.onLoad()
+      // this.onLoad()
     }
   },
   methods: {
     onLoad() {
-      // 异步更新数据
-      // setTimeout 仅做示例，真实场景中一般为 ajax 请求
-      setTimeout(() => {
-        //   debugger
-        let total = this.wlist.length > 10 ? 10 : this.wlist.length
-        for (let i = 0; i < total; i++) {
-          this.wList.push(this.wlist[i])
-        }
-        // 加载状态结束
-        this.loading = false
-
-        // 数据全部加载完成
-        if (this.wList.length >= this.wlist.length) {
-          this.finished = true
-        }
-      }, 1000)
+      // // 异步更新数据
+      // // setTimeout 仅做示例，真实场景中一般为 ajax 请求
+      // setTimeout(() => {
+      //   //   debugger
+      //   let total = this.wlist.length > 10 ? 10 : this.wlist.length
+      //   for (let i = 0; i < total; i++) {
+      //     this.wList.push(this.wlist[i])
+      //   }
+      //   console.log(this.wList)
+      //   // 加载状态结束
+      //   this.loading = false
+      //   // 数据全部加载完成
+      //   if (this.wList.length >= this.wlist.length) {
+      //     this.finished = true
+      //   }
+      // }, 1000)
     },
     //   根据数字判断类型
     chargeType(num) {
@@ -137,85 +129,34 @@ export default {
         return (this.type = '待办动态')
       }
     },
-    //   数组去重
-    newArr(arr) {
-      return Array.from(new Set(arr))
-    },
-    // 数组由大到小排序
-    f(a, b) {
-      //排序函数
-      return -(a - b) //取反并返回比较参数
-    },
-    // 时间处理器
-    getTime(data) {
-      const date = new Date(data)
-      // console.log(timer.getFullYear());
-      var Y = date.getFullYear()
-      var M =
-        date.getMonth() + 1 < 10
-          ? '0' + (date.getMonth() + 1)
-          : date.getMonth() + 1
-      var D = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
-      return Y + M + D
-    },
-    getTime1(data) {
-      const date = new Date(data)
-      // console.log(timer.getFullYear());
-      var Y = date.getFullYear() + '-'
-      var M =
-        (date.getMonth() + 1 < 10
-          ? '0' + (date.getMonth() + 1)
-          : date.getMonth() + 1) + '-'
-      var D = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
-      return Y + M + D
-    },
-    getTime2(data) {
-      const date = new Date(data)
-      // console.log(timer.getFullYear());
-      var h =
-        (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':'
-      var m =
-        date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
-      return h + m
-    },
-    // 处理星期几
-    getTime3(time) {
-      var dateArray = time.split('-')
-      var date = new Date(
-        dateArray[0],
-        parseInt(dateArray[1] - 1),
-        dateArray[2]
-      )
-      var week = '星期' + '日一二三四五六'.charAt(date.getDay())
-      return week
+    dateFormat(data, format) {
+      return dateFormat(new Date(data), format)
     },
+
     // 删除轨迹
     delDynamic(id) {
-      removeTrajectory(id)
+      this.$dialog
+        .confirm({
+          title: '警告',
+          message: '确定要删除吗？'
+        })
+        .then(() => {
+          return removeTrajectory(id)
+        })
         .then((data) => {
-          //   console.log(data.code);
-          if (data.code == 200) {
-            //   提示删除成功
-            // this.msgSuccess("删除成功");
-            // debugger
-            // location.reload();
-            this.$toast.success('删除成功')
-            this.reload()
-            // 重新获取全部数据
-          }
+          this.$toast.success('删除成功')
+          // 重新获取全部数据
+          this.$emit('reload')
         })
-        .catch((err) => {
-          console.log(err)
+        .catch(() => {
+          // on cancel
         })
     },
     // 点击完成
     finDynamic(id) {
       handleWait(id)
         .then((data) => {
-          if (data.code == 200) {
-            // this.delDynamic(id);
-            this.reload()
-          }
+          this.$emit('reload')
         })
         .catch((err) => {
           console.log(err)
@@ -250,17 +191,15 @@ export default {
   color: #9c9c9c;
   font-size: 12px;
   font-weight: 600;
-  margin-right: 16px;
 }
 .con {
   left: 51px;
   margin-top: 20px;
 }
 .finish-box {
-  display: inline-block;
+  float: right;
   position: relative;
-  left: 100px;
-  width: 25%;
+  width: 80px;
 }
 .finish {
   position: absolute;
diff --git a/linkwe-mobile/src/styles/common.css b/linkwe-mobile/src/styles/common.css
index 299f5316a093bcca9588153b60d1898d0f97ced4..b750a940aa358f96cd5dd838d56a2d78600768c4 100644
--- a/linkwe-mobile/src/styles/common.css
+++ b/linkwe-mobile/src/styles/common.css
@@ -310,18 +310,6 @@ ais {
 .pt5 {
   padding-top: 5px;
 }
-.pb5 {
-  padding-bottom: 5px;
-}
-.pt10 {
-  padding-top: 10px;
-}
-.pt15 {
-  padding-top: 15px;
-}
-.pt20 {
-  padding-top: 20px;
-}
 
 .pr5 {
   padding-right: 5px;
@@ -335,6 +323,16 @@ ais {
   padding-left: 5px;
 }
 
+.pt10 {
+  padding-top: 10px;
+}
+.pt15 {
+  padding-top: 15px;
+}
+.pt20 {
+  padding-top: 20px;
+}
+
 .mt5 {
   margin-top: 5px;
 }
@@ -347,14 +345,14 @@ ais {
   margin-bottom: 5px;
 }
 
-.mb8 {
-  margin-bottom: 8px;
-}
-
 .ml5 {
   margin-left: 5px;
 }
 
+.mb8 {
+  margin-bottom: 8px;
+}
+
 .mt10 {
   margin-top: 10px;
 }
diff --git a/linkwe-mobile/src/utils/index.js b/linkwe-mobile/src/utils/index.js
index f1d33ace159a35ef876e49b7835591ecb34cdd45..3ba001d58d3b7598c5ea58adce6c2134bc765b3a 100644
--- a/linkwe-mobile/src/utils/index.js
+++ b/linkwe-mobile/src/utils/index.js
@@ -19,3 +19,35 @@ export function param2Obj(url) {
       '"}'
   )
 }
+
+// 日期时间格式化
+export function dateFormat(date = new Date(), fmt = 'yyyy-MM-dd hh:mm:ss') {
+  var o = {
+    'M+': date.getMonth() + 1, //月份
+    'd+': date.getDate(), //日
+    'h+': date.getHours(), //小时
+    'm+': date.getMinutes(), //分
+    's+': date.getSeconds(), //秒
+    'q+': Math.floor((date.getMonth() + 3) / 3), //季度
+    'S+': date.getMilliseconds(), //毫秒
+    'w+': '星期' + '日一二三四五六'.charAt(date.getDay()) //星期
+  }
+
+  if (/(y+)/.test(fmt)) {
+    fmt = fmt.replace(
+      RegExp.$1,
+      (date.getFullYear() + '').substr(4 - RegExp.$1.length)
+    )
+  }
+
+  for (var k in o) {
+    if (new RegExp('(' + k + ')').test(fmt)) {
+      fmt = fmt.replace(
+        RegExp.$1,
+        RegExp.$1.length == 1 ? o[k] : ('00' + o[k]).substr(('' + o[k]).length)
+      )
+    }
+  }
+
+  return fmt
+}
diff --git a/linkwe-mobile/src/views/portrait/index.vue b/linkwe-mobile/src/views/portrait/index.vue
index 1076942285af14e9a064566a3a1d455eda2b8305..b80082d148c357b30418f92949b409aa6378580c 100644
--- a/linkwe-mobile/src/views/portrait/index.vue
+++ b/linkwe-mobile/src/views/portrait/index.vue
@@ -70,27 +70,17 @@
         <div>客户标签</div>
         <div class="data" is-link @click="labelEdit">编辑</div>
       </div>
-      <van-row v-if="form.weTagGroupList" gutter="10" class="labelstyle mt15">
-        <van-col
-          span="4.5"
-          v-for="(item, index) in form.weTagGroupList"
-          :key="index"
-        >
+      <div v-if="form.weTagGroupList" class="labelstyle mt10">
+        <template v-for="item in form.weTagGroupList">
           <div
             class="label"
-            v-for="(item1, index1) in item.weTags"
-            :key="index1"
+            v-for="(unit, unique) in item.weTags"
+            :key="unique"
           >
-            {{ item1.name }}
+            {{ unit.name }}
           </div>
-        </van-col>
-        <!-- <van-col span="4.5"> <div class="label">标签1</div></van-col>
-        <van-col span="4.5"> <div class="label">标签1</div></van-col>
-        <van-col span="4.5"> <div class="label">标签1</div></van-col>
-        <van-col span="4.5"> <div class="label">标签1</div></van-col>
-        <van-col span="4.5"> <div class="label">标签1</div></van-col>
-        <van-col span="4.5"> <div class="label">标签1</div></van-col> -->
-      </van-row>
+        </template>
+      </div>
     </div>
     <div class="divider"></div>
 
@@ -129,48 +119,13 @@
         <van-tab :name="3" title="活动动态"></van-tab>
         <van-tab :name="4" title="待办动态"></van-tab>
       </van-tabs>
-      <!-- <van-row gutter="8" class="labelstyle">
-        <van-col span="6">
-          <div
-            class="label1"
-            @click="changeInfo('information')"
-            :style="styleActive1"
-          >
-            信息动态
-          </div></van-col
-        >
-        <van-col span="6">
-          <div
-            class="label1"
-            @click="changeInfo('socialContact')"
-            :style="styleActive2"
-          >
-            社交动态
-          </div></van-col
-        >
-        <van-col span="6">
-          <div
-            class="label1"
-            @click="changeInfo('activity')"
-            :style="styleActive3"
-          >
-            活动动态
-          </div></van-col
-        >
-        <van-col span="6">
-          <div
-            class="label1"
-            @click="changeInfo('dealtWith')"
-            :style="styleActive4"
-          >
-            待办动态
-          </div></van-col
-        >
-      </van-row> -->
 
       <!-- 步骤条 -->
 
-      <StepList :stepList="list"></StepList>
+      <div class="ac">
+        <van-loading v-if="loadingStep" type="spinner" />
+      </div>
+      <StepList :stepList="list" @reload="changeInfo()"></StepList>
     </div>
 
     <!-- 点击客户标签里的编辑触发弹出框开始 -->
@@ -275,7 +230,7 @@
           />
         </van-action-sheet>
         <!-- 保存 -->
-        <div style="margin: 30px;">
+        <div style="margin: 30px">
           <van-button
             round
             block
@@ -337,8 +292,9 @@ export default {
       // 待办动态
       todonewsshow: false,
       // 接口开始
-      // externalUserid: 'wmiGuBCgAAoCBD1frD3hRplbsXoBLx6g', // 客户Id
-      // externalUserid: 'wmiGuBCgAAgeijfvvpJ62cBfwrB-c4kw',
+      externalUserid: '',
+      // externalUserid: 'wmiGuBCgAAoCBD1frD3hRplbsXoBLx6g', // 客户IdwmiGuBCgAAoCBD1frD3hRplbsXoBLx6g
+      // externalUserid: 'wmiGuBCgAAsQVuCR_zoXfnQsnCGG25rQ',
       form: {
         name: '', // 昵称
         remarkMobiles: '', // 手机号
@@ -376,7 +332,8 @@ export default {
       loading: false,
       finished: false,
       list: [],
-      agentId: ''
+      agentId: '', // 1000012,
+      loadingStep: false
     }
   },
   watch: {
@@ -411,7 +368,7 @@ export default {
     let hash = param2Obj(window.location.hash)
     query = Object.assign(query, hash)
     this.agentId = query.agentId
-    // console.log(agentId)
+    console.log(agentId)
 
     // this.findAddaddEmployes()
     // this.findAddGroupNum()
@@ -492,6 +449,8 @@ export default {
         .then((data) => {
           //  重新获取列表
           this.findAddaddEmployes()
+          this.findTrajectory()
+
           if (data.code == 200) {
             this.$toast.success('保存成功')
             this.usershow = false
@@ -503,6 +462,7 @@ export default {
     },
     //   获取轨迹信息
     findTrajectory(page) {
+      this.loadingStep = true
       let query = {
         pageNum: page,
         pageSize: 10,
@@ -510,14 +470,15 @@ export default {
         externalUserid: this.externalUserid
       }
       Object.assign(query, this.query)
-      page && (query.page = page)
       findTrajectory(query)
         .then((data) => {
           //   console.log(data.total);
           this.list = data.rows
+          this.loadingStep = false
         })
         .catch((err) => {
           console.log(err)
+          this.loadingStep = false
         })
     },
     // 点击信息动态
@@ -532,9 +493,9 @@ export default {
         userId: this.userId,
         externalUserid: this.externalUserid,
         content: this.conagency,
-        createDate: new Date(this.dateagency),
-        startTime: new Date(this.startTime),
-        endTime: new Date(this.endTime),
+        createDate: this.dateagency,
+        startTime: `${this.dateagency} ${this.startTime}:00`,
+        endTime: `${this.dateagency} ${this.endTime}:00`,
         status: 1,
         agentId: this.agentId
       }
@@ -544,8 +505,6 @@ export default {
       this.dateagency = ''
       this.startTime = ''
       this.endTime = ''
-      // 重新获取列表
-      this.findTrajectory()
     },
     // 待办日期
     formatDate(dateagency) {
@@ -638,7 +597,7 @@ export default {
       this.show = true
       if (this.form.weTagGroupList) {
         this.form.weTagGroupList.forEach((ele) => {
-          this.addTag.push(...ele.weTags[0])
+          this.addTag.push(...ele.weTags)
         })
       }
       // 获取用户当前的lable,将当前用户的lable与所有lable进行对比，相同的弹框内蓝色展示
@@ -765,8 +724,7 @@ export default {
   display: flex;
   flex-wrap: wrap;
   align-items: center;
-  .label,
-  .label1 {
+  .label {
     display: inline-block;
     min-width: 45px;
     font-size: 12px;
diff --git a/linkwe-ui/src/api/conversation/content.js b/linkwe-ui/src/api/conversation/content.js
index 1ae0fa5a1dd0b684694e63eb596ae8642cdde302..b8f7d2c25c1434be52996a15cd914a8726bd216c 100644
--- a/linkwe-ui/src/api/conversation/content.js
+++ b/linkwe-ui/src/api/conversation/content.js
@@ -1,41 +1,45 @@
 import request from '@/utils/request'
-const getExternalChatList = (params) => {
+
+// 外部联系人 会话列表
+const getExternalChatList = (fromId) => {
   return request({
-    url: '/chat/msg/selectExternalChatList/'+ params.fromId,
+    url: '/chat/msg/selectExternalChatList/' + fromId,
     method: 'get'
   })
 }
 
+// 单聊 会话列表
 const selectAloneChatList = (params) => {
   return request({
-    url: '/chat/msg/selectAloneChatList\n/',
+    url: '/chat/msg/selectAloneChatList',
     method: 'get',
     params
   })
 }
 
-
-const getInternalChatList = (params) => {
+// 内部联系人列表
+const getInternalChatList = (fromId) => {
   return request({
-    url: '/chat/msg/selectInternalChatList/'+ params.fromId,
+    url: '/chat/msg/selectInternalChatList/' + fromId,
     method: 'get'
   })
 }
 
-const getGroupChatList = (params) => {
+const getGroupChatList = (fromId) => {
   return request({
-    url: '/chat/msg/selectGroupChatList/'+ params.fromId,
+    url: '/chat/msg/selectGroupChatList/' + fromId,
     method: 'get'
   })
 }
 
-const chatList = (params) => {
-  return request({
-    url: '/chat/msg/list',
-    method: 'get',
-    params,
-  })
-}
+// const chatList = (params) => {
+//   return request({
+//     url: '/chat/msg/list',
+//     method: 'get',
+//     params
+//   })
+// }
+
 const indexTable = () => {
   return request({
     url: '/wecom/page/getCorpBasicData',
@@ -49,18 +53,22 @@ const indexEchart = () => {
   })
 }
 
-const listByCustomer = (params) => {
+// 全文检索 会话列表
+export const getChatList = (params) => {
   return request({
-    url: '/wecom/customer/list',
+    url: '/chat/msg/selectFullSearchChatList',
     method: 'get',
-    params,
+    params
   })
 }
-const getFullSearchChatList = (params) => {
+
+// 全文检索 导出列表
+export const exportList = (params) => {
   return request({
-    url: '/chat/msg/selectFullSearchChatList',
+    url: '/chat/msg/selectFullSearchChatList/export',
     method: 'get',
-    params,
+    params
+    // responseType: 'blob'
   })
 }
 //
@@ -71,7 +79,8 @@ export const content = {
   selectAloneChatList,
   getInternalChatList,
   getGroupChatList,
-  chatList,
-  listByCustomer,
-  getFullSearchChatList
+  // chatList,
+  getChatList
 }
+
+export default content
diff --git a/linkwe-ui/src/components/ChatContent.vue b/linkwe-ui/src/components/ChatContent.vue
new file mode 100644
index 0000000000000000000000000000000000000000..44dc201bd45ed6ae78da323380918128d93de7e6
--- /dev/null
+++ b/linkwe-ui/src/components/ChatContent.vue
@@ -0,0 +1,254 @@
+<script>
+// import { AMapManager } from 'vue-amap'
+// import Video from 'video.js'
+export default {
+  name: 'ChatContent',
+  props: {
+    message: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  components: {},
+  data() {
+    return {
+      dialogVisible: false,
+      audioSrc: []
+    }
+  },
+  computed: {
+    content() {
+      let typeDict = {
+        text: 'content',
+        image: 'attachment',
+        emotion: 'attachment',
+        file: 'filename',
+        docmsg: 'title',
+        video: 'attachment',
+        voice: 'attachment',
+        location: 'address',
+        weapp: 'title',
+        card: 'corpname'
+      }
+      return JSON.parse(this.message.contact)[typeDict[this.message.msgType]]
+    }
+  },
+  watch: {},
+  created() {},
+  mounted() {},
+  methods: {
+    close() {
+      this.dialogVisible = false
+      const mp3 = this.$refs.AudioPlayer
+      mp3.pause()
+    },
+    playAudio(type) {
+      this.audioSrc = [JSON.parse(this.message.contact)[type]]
+      this.dialogVisible = true
+    },
+    onBeforePlay(next) {
+      next() // 开始播放
+    },
+    play(e) {
+      this.dia = true
+      const player = this.$refs.videoPlayer.player
+      this.playerOptions['sources'][0]['src'] = e.attachment
+      player.play()
+    }
+  }
+}
+</script>
+
+<template>
+  <div class="message">
+    <template v-if="message.msgType === 'text'">
+      {{ content }}
+    </template>
+    <template v-else-if="'image,emotion'.includes(message.msgType)">
+      <el-image
+        style="width: 100px; height: 100px"
+        :src="content"
+        fit="fit"
+        :preview-src-list="[content]"
+      >
+      </el-image>
+    </template>
+    <a
+      v-else-if="'file'.includes(message.msgType)"
+      class="msgtypefile"
+      :href="JSON.parse(this.message.contact).attachment"
+      target="balnk"
+    >
+      {{ content }}
+    </a>
+    <a
+      v-else-if="'docmsg'.includes(message.msgType)"
+      class="msgtypefile"
+      :href="JSON.parse(this.message.contact).link_url"
+      target="balnk"
+    >
+      {{ content }}
+    </a>
+    <div v-else-if="message.msgType === 'voice'">
+      <i
+        class="el-icon-microphone"
+        style=" font-size: 40px; color: #199ed8;"
+        @click="playAudio('attachment')"
+      ></i>
+    </div>
+    <template v-else-if="message.msgType === 'video'">
+      <video
+        id="video"
+        class="video-js vjs-default-skin vjs-big-play-centered"
+        controls
+        webkit-playsinline="true"
+        playsinline="true"
+        :autoplay="false"
+        preload="none"
+      >
+        <source :src="content" type="video/mp4" />
+      </video>
+      <!-- <video-player
+        class="video-player vjs-custom-skin"
+        ref="videoPlayer"
+        style="width: 150px;"
+        :playsinline="true"
+        :options="{
+          playbackRates: [0.7, 1.0, 1.5, 2.0], //播放速度
+          autoplay: false, //如果true,浏览器准备好时开始回放。
+          controls: true, //控制条
+          preload: 'none', //视频预加载
+          muted: false, //默认情况下将会消除任何音频。
+          loop: false, //导致视频一结束就重新开始。
+          language: 'zh-CN',
+          aspectRatio: '16:9', // 将播放器置于流畅模式，并在计算播放器的动态大小时使用该值。值应该代表一个比例 - 用冒号分隔的两个数字（
+          fluid: true,
+          sources: [
+            {
+              type: 'video/mp4',
+              src: content
+            }
+          ],
+          poster: '',
+          width: '175',
+          height: '75',
+          notSupportedMessage: '此视频暂无法播放，请稍后再试'
+        }"
+      ></video-player> -->
+    </template>
+    <div v-else-if="message.msgType === 'location'" class="msgtypecard">
+      <div class="card_name">
+        <el-amap
+          ref="map"
+          vid="amapDemo"
+          :center="[
+            JSON.parse(message.contact).longitude,
+            JSON.parse(message.contact).latitude
+          ]"
+          :zoom="15"
+          class="amap-demo"
+          style="pointer-events: none;"
+        >
+          <el-amap-marker
+            :position="[
+              JSON.parse(message.contact).longitude,
+              JSON.parse(message.contact).latitude
+            ]"
+          ></el-amap-marker>
+        </el-amap>
+      </div>
+      <div class="card_foot">{{ content }}</div>
+    </div>
+    <div v-else-if="message.msgType === 'weapp'" class="msgtypecard">
+      <div class="card_name">{{ content }}</div>
+      <div class="card_foot">小程序</div>
+    </div>
+    <div v-else-if="message.msgType === 'card'" class="msgtypecard ">
+      <div class="card_name">{{ content }}</div>
+      <div class="card_foot">个人名片</div>
+    </div>
+    <div v-else>不支持的消息类型：{{ message.msgType }}</div>
+
+    <el-dialog
+      v-if="audioSrc[0]"
+      :visible.sync="dialogVisible"
+      width="30%"
+      @close="close"
+    >
+      <div class="shabowboxvidoe shabowboxaudio">
+        <!-- <AudioPlayer
+          :audio-list="audioSrc"
+          ref="AudioPlayer"
+          :before-play="onBeforePlay"
+        /> -->
+        <audio controls>
+          <source :src="audioSrc[0]" type="audio/mpeg" />
+        </audio>
+      </div>
+      <span slot="footer" class="dialog-footer"> </span>
+    </el-dialog>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.message {
+  position: relative;
+  padding: 10px;
+  line-height: 14px;
+  border-radius: 5px;
+  background: $blue;
+  color: #fff;
+  display: inline-block;
+  &::before {
+    content: '';
+    display: inline-block;
+    position: absolute;
+    left: -13px;
+    width: 0;
+    height: 0;
+    border: 7px solid transparent;
+    border-right-color: $blue;
+  }
+}
+.msgtypefile {
+  margin: 5px;
+  width: 200px;
+  display: inline-block;
+  line-height: 30px;
+  cursor: pointer;
+  color: #199ed8;
+  // text-indent: 10px;
+  // box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.2), 0 1px 4px 0 rgba(0, 0, 0, 0.19);
+}
+
+.msgtypecard {
+  width: 320px;
+  height: 140px;
+  margin: 10px 5px;
+  border-radius: 8px;
+  -webkit-box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2),
+    0 6px 8px 0 rgba(0, 0, 0, 0.19);
+  box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 8px 0 rgba(0, 0, 0, 0.19);
+  position: relative;
+  background: #f8f8f8;
+  overflow: hidden;
+
+  .card_name {
+    width: 320px;
+    height: 105px;
+    line-height: 80px;
+    text-indent: 10px;
+  }
+  .card_foot {
+    position: absolute;
+    height: 20px;
+    border-top: 1px solid #efefef;
+    text-align: left;
+    bottom: 15px;
+    padding: 10px;
+    color: #333;
+    font-weight: bold;
+    width: 100%;
+  }
+}
+</style>
diff --git a/linkwe-ui/src/components/SelectMaterial/index.vue b/linkwe-ui/src/components/SelectMaterial/index.vue
index 9a28e8ad8b25265874b06462b8e97bf6336b8229..2d1f652f47738315898b99e07836dc733c7ebbe9 100644
--- a/linkwe-ui/src/components/SelectMaterial/index.vue
+++ b/linkwe-ui/src/components/SelectMaterial/index.vue
@@ -8,7 +8,7 @@ export default {
     // 添加标签显隐
     visible: {
       type: Boolean,
-      default: false,
+      default: false
     },
     // title: {
     //   type: String,
@@ -17,19 +17,19 @@ export default {
     // 素材类型  0:'文本', 1：'图片'
     type: {
       type: String,
-      default: '0',
+      default: '0'
     },
     // 显示哪些素材类型标签
     showArr: {
       type: Array,
-      default: () => [0, 1],
-    },
+      default: () => [0, 1]
+    }
   },
   data() {
     return {
       text: {},
       image: {},
-      file: {},
+      file: {}
     }
   },
   watch: {},
@@ -40,7 +40,7 @@ export default {
       },
       set(val) {
         this.$emit('update:visible', val)
-      },
+      }
     },
     Ptype: {
       get() {
@@ -48,8 +48,8 @@ export default {
       },
       set(val) {
         this.$emit('update:type', val)
-      },
-    },
+      }
+    }
   },
   created() {},
   mounted() {},
@@ -63,13 +63,18 @@ export default {
     },
     changeImage(data) {
       this.image = data
-    },
-  },
+    }
+  }
 }
 </script>
 
 <template>
-  <el-dialog title="选择素材" :visible.sync="Pvisible" width="650px" append-to-body>
+  <el-dialog
+    title="选择素材"
+    :visible.sync="Pvisible"
+    width="680px"
+    append-to-body
+  >
     <div>
       <el-tabs v-model="Ptype">
         <el-tab-pane name="0" v-if="showArr.includes(0)">
@@ -111,4 +116,10 @@ export default {
 .mr30 {
   margin-right: 30px;
 }
+
+/deep/.el-dialog__body {
+  padding: 5px 20px;
+  height: 76vh;
+  overflow: auto;
+}
 </style>
diff --git a/linkwe-ui/src/components/SelectMaterial/list.vue b/linkwe-ui/src/components/SelectMaterial/list.vue
index 6715f2cd180a381591ac5a60564c7152f7189441..2af373da27554472fa2f010d90282e2ec9bc99e9 100644
--- a/linkwe-ui/src/components/SelectMaterial/list.vue
+++ b/linkwe-ui/src/components/SelectMaterial/list.vue
@@ -79,7 +79,7 @@ export default {
 
 <template>
   <div>
-    <el-form ref="form" :model="query" label-width="80px">
+    <el-form ref="form" :model="query" label-width="70px">
       <el-form-item label="选择分组">
         <el-cascader
           v-model="query.categoryId"
@@ -143,7 +143,9 @@ export default {
               alt
             />
           </el-card>
-          <div class="mt10 toe">{{ item.materialName }}</div>
+          <div class="mt10 toe" :title="item.materialName">
+            {{ item.materialName }}
+          </div>
         </div>
       </el-radio>
     </el-radio-group>
diff --git a/linkwe-ui/src/utils/common.js b/linkwe-ui/src/utils/common.js
index 9eb5e3c7da157262a52656ed3b04c13c02c25437..6406a3cb1353239cec1ddb5fd61f62e2b408755b 100644
--- a/linkwe-ui/src/utils/common.js
+++ b/linkwe-ui/src/utils/common.js
@@ -54,19 +54,6 @@ export function resetForm(refName) {
   }
 }
 
-//年月日格式
-export function yearMouthDay(data) {
-  var time = new Date(data)
-  var year = time.getFullYear()
-  var month = time.getMonth() + 1
-  var date = time.getDate()
-  console.log(year + '-' + add0(month) + '-' + add0(date))
-  return year + '-' + add0(month) + '-' + add0(date)
-}
-function add0(m) {
-  return m < 10 ? '0' + m : m
-}
-
 // 添加日期范围
 export function addDateRange(params, dateRange) {
   var search = params
diff --git a/linkwe-ui/src/views/contacts/organization.vue b/linkwe-ui/src/views/contacts/organization.vue
index c1b0c329f5e03ce2723b22c9722a468d5b827136..873fa1e56ddb1d4e3c90cfef0097e5410e94ef78 100644
--- a/linkwe-ui/src/views/contacts/organization.vue
+++ b/linkwe-ui/src/views/contacts/organization.vue
@@ -1,9 +1,10 @@
 <script>
 import * as api from '@/api/organization'
+import SelectMaterial from '@/components/SelectMaterial/index'
 
 export default {
   name: 'Organization',
-  components: {},
+  components: { SelectMaterial },
   props: {},
   data() {
     return {
@@ -11,7 +12,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         isActivate: '',
-        department: '',
+        department: ''
       },
       dateRange: [],
       treeData: [],
@@ -19,19 +20,19 @@ export default {
       status: {
         0: '启用',
         1: '禁用',
-        6: '离职',
+        6: '离职'
       },
       statusActivate: {
         1: '已激活',
         2: '已禁用',
         4: '未激活',
         5: '退出企业',
-        6: '删除',
+        6: '删除'
       },
       total: 0,
       defaultProps: {
         label: 'name',
-        children: 'children',
+        children: 'children'
       },
       form: {},
       dialogVisible: false,
@@ -43,7 +44,7 @@ export default {
       dialogVisibleAvatar: false,
       queryImg: {
         pageNum: 1,
-        pageSize: 20,
+        pageSize: 20
       },
       totalImg: 0,
       // 表单校验
@@ -58,18 +59,18 @@ export default {
           {
             type: 'email',
             message: "'请输入正确的邮箱地址",
-            trigger: ['blur', 'change'],
-          },
+            trigger: ['blur', 'change']
+          }
         ],
         mobile: [
           { required: true, message: '必填项', trigger: 'blur' },
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
             message: '请输入正确的手机号码',
-            trigger: 'blur',
-          },
-        ],
-      }),
+            trigger: 'blur'
+          }
+        ]
+      })
     }
   },
   watch: {},
@@ -139,7 +140,7 @@ export default {
       // 0: 启用，1：禁用
       let params = {
         userId: data.userId,
-        enable: data.enable == 1 ? 0 : 1,
+        enable: data.enable == 1 ? 0 : 1
       }
       api.startOrStop(params).then(() => {
         this.msgSuccess('操作成功')
@@ -150,7 +151,7 @@ export default {
     remove(id) {
       // const operIds = id || this.ids + "";
       this.$confirm('是否确认删除吗?', '警告', {
-        type: 'warning',
+        type: 'warning'
       })
         .then(function() {
           return api.remove(id)
@@ -168,7 +169,7 @@ export default {
         lock: true,
         text: 'Loading',
         spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.7)',
+        background: 'rgba(0, 0, 0, 0.7)'
       })
       api.syncUser().then(() => {
         loading.close()
@@ -186,7 +187,7 @@ export default {
     },
     departRemove(id) {
       this.$confirm('是否确认删除吗?', '警告', {
-        type: 'warning',
+        type: 'warning'
       })
         .then(function() {
           return api.removeDepart(id)
@@ -209,15 +210,13 @@ export default {
     },
     showAvatarDialog() {
       this.dialogVisibleAvatar = true
-      this.getImgList(1)
-    },
-    getImgList() {
-      // todo get imgage list
     },
-    submitAvatar() {
-      this.form.avatarMediaid = g
-    },
-  },
+    // 选择素材确认按钮
+    submitSelectMaterial(text, image, file) {
+      this.form.headImageUrl = image.materialUrl
+      // this.form.imageMessage._materialName = image.materialName
+    }
+  }
 }
 </script>
 
@@ -293,6 +292,7 @@ export default {
             :props="defaultProps"
             :expand-on-click-node="false"
             ref="tree"
+            highlight-current
             default-expand-all
             @node-click="handleNodeClick"
           >
@@ -416,14 +416,14 @@ export default {
       <el-row :gutter="10">
         <el-col :span="8">
           <!-- <el-upload action :show-file-list="false" :on-success="d" :before-upload="d">
-            <img v-if="form.avatarMediaid" :src="form.avatarMediaid" />
+            <img v-if="form.headImageUrl" :src="form.headImageUrl" />
             <i v-else class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>-->
           <div class="avatar-wrap ac" @click="showAvatarDialog">
             <img
               class="avatar"
-              v-if="form.avatarMediaid"
-              :src="form.avatarMediaid"
+              v-if="form.headImageUrl"
+              :src="form.headImageUrl"
             />
             <i v-else class="el-icon-plus avatar-uploader-icon cc"></i>
           </div>
@@ -478,7 +478,7 @@ export default {
                   checkStrictly: true,
                   /** multiple: true,*/ emitPath: false,
                   value: 'id',
-                  label: 'name',
+                  label: 'name'
                 }"
               ></el-cascader>
             </el-form-item>
@@ -551,7 +551,7 @@ export default {
     </el-dialog>
 
     <!-- 选择头像弹窗 -->
-    <el-dialog :visible.sync="dialogVisibleAvatar">
+    <!-- <el-dialog :visible.sync="dialogVisibleAvatar">
       <div slot="title" class="fxbw aic">
         <span>选择头像</span>
         <el-pagination
@@ -563,7 +563,7 @@ export default {
           :total="totalImg"
         ></el-pagination>
       </div>
-      <el-radio-group class="img-wrap" v-model="form.avatarMediaid">
+      <el-radio-group class="img-wrap" v-model="form.headImageUrl">
         <el-radio :label="3" v-for="(item, index) in 20" :key="index">
           <img class="img-li" src="~@/assets/image/login-background.png" alt />
         </el-radio>
@@ -572,7 +572,14 @@ export default {
         <el-button @click="dialogVisibleAvatar = false">取 消</el-button>
         <el-button type="primary" @click="submitAvatar">确 定</el-button>
       </div>
-    </el-dialog>
+    </el-dialog> -->
+
+    <SelectMaterial
+      :visible.sync="dialogVisibleAvatar"
+      type="1"
+      :showArr="[1]"
+      @success="submitSelectMaterial"
+    ></SelectMaterial>
   </div>
 </template>
 
diff --git a/linkwe-ui/src/views/conversation/component/chat.vue b/linkwe-ui/src/views/conversation/component/chat.vue
deleted file mode 100644
index bc514f6cc456791c001c17307fe17cfbf9d987b7..0000000000000000000000000000000000000000
--- a/linkwe-ui/src/views/conversation/component/chat.vue
+++ /dev/null
@@ -1,331 +0,0 @@
-<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">{{ item.name }}</span>
-          <span
-            :style="{ color: item.action == 'send' ? '#199ed8' : '#999' }"
-            >{{ item.msgTime }}</span
-          >
-        </div>
-        <div v-if="item.msgType == 'text'" class="msgtypetext">
-          {{ JSON.parse(item.contact).content }}
-        </div>
-        <div v-else-if="item.msgType == 'image'" class="msgtypeimg">
-          <img :src="JSON.parse(item.contact).attachment" @click="showImg(JSON.parse(item.contact))" />
-        </div>
-        <div
-          v-else-if="item.msgType == 'file'"
-          class="msgtypefile"
-          @click="down(JSON.parse(item.contact))"
-        >
-          {{ JSON.parse(item.contact).fileName }}
-        </div>
-        <div v-else-if="item.msgType == 'voice'" class="msgtypevoice">
-          <i
-            class="el-icon-microphone"
-            style=" font-size: 40px; color: #199ed8;"
-            @click="playVideo(JSON.parse(item.contact))"
-          ></i>
-        </div>
-        <div v-else-if="item.msgType == 'emotion'" class="msgtypeimg">
-          <img :src="JSON.parse(item.contact).attachment" @click="showImg(item)" />
-        </div>
-        <div v-else-if="item.msgType == 'video'" class="msgtypevideo">
-          <i
-            class="el-icon-video-play"
-            style=" font-size: 40px;  color: #199ed8;"
-            @click="play(JSON.parse(item.contact), 'video')"
-          ></i>
-        </div>
-        <div v-else-if="item.msgType == 'location'" class="msgtypecard">
-          <div class="card_name">
-            <el-amap
-              ref="map"
-              vid="amapDemo"
-              :center="[JSON.parse(item.contact).longitude, JSON.parse(item.contact).latitude]"
-              :zoom="zoom"
-              class="amap-demo"
-              style="pointer-events: none;"
-            >
-              <el-amap-marker
-                :position="[JSON.parse(item.contact).longitude, iJSON.parse(item.contact).latitude]"
-              ></el-amap-marker>
-            </el-amap>
-          </div>
-          <div class="card_foot">{{ JSON.parse(item.contact).address }}</div>
-        </div>
-        <div v-else-if="item.msgType == 'weapp'" class="msgtypecard">
-          <div class="card_name">{{ JSON.parse(item.contact).title }}</div>
-          <div class="card_foot">小程序</div>
-        </div>
-        <div v-else-if="item.msgType == 'card'" class="msgtypecard ">
-          <div class="card_name">{{ JSON.parse(item.contact).corpName }}</div>
-          <div class="card_foot">个人名片</div>
-        </div>
-      </li>
-    </ul>
-
-    <div class="shabowbox" v-show="dia">
-      <div class="close" @click="dia = false">
-        <i class="el-icon-circle-close"></i>
-      </div>
-      <div class="shabowboxvidoe">
-        <video-player
-          class="video-player vjs-custom-skin"
-          ref="videoPlayer"
-          id="videoPlayer"
-          :playsinline="true"
-          :options="playerOptions"
-        ></video-player>
-      </div>
-    </div>
-    <div class="shabowbox" v-show="diavioce">
-      <div class="close" @click="vioceClose">
-        <i class="el-icon-circle-close"></i>
-      </div>
-      <div class="shabowboxvidoe shabowboxaudio">
-        <AudioPlayer
-          :audio-list="vioceSrc"
-          ref="AudioPlayer"
-          :before-play="onBeforePlay"
-        />
-      </div>
-    </div>
-    <el-dialog :visible.sync="dialogVisible" width="30%">
-      <img :src="imgSrc" style="width:100%;max-height:600px" />
-      <span slot="footer" class="dialog-footer"> </span>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { AMapManager } from 'vue-amap'
-import 'video.js/dist/video-js.css'
-import 'vue-video-player/src/custom-theme.css'
-
-import { parseTime, yearMouthDay } from '@/utils/common.js'
-export default {
-  components: {
-    AMapManager
-  },
-  props: {
-    allChat: {
-      type: Array,
-      defluat: () => []
-    }
-  },
-  mounted() {},
-  data() {
-    return {
-      dia: false,
-      diavioce: false,
-      dialogVisible: false,
-      imgSrc: '',
-      vioceSrc: [],
-      playerOptions: {
-        playbackRates: [0.7, 1.0, 1.5, 2.0], //播放速度
-        autoplay: false, //如果true,浏览器准备好时开始回放。
-        controls: true, //控制条
-        preload: 'auto', //视频预加载
-        muted: false, //默认情况下将会消除任何音频。
-        loop: false, //导致视频一结束就重新开始。
-        language: 'zh-CN',
-        aspectRatio: '16:9', // 将播放器置于流畅模式，并在计算播放器的动态大小时使用该值。值应该代表一个比例 - 用冒号分隔的两个数字（例如"16:9"或"4:3"）
-        fluid: true, // 当true时，Video.js player将拥有流体大小。换句话说，它将按比例缩放以适应其容器。
-        sources: [
-          {
-            type: 'video/mp4',
-            src: 'https://v-cdn.zjol.com.cn/280443.mp4' //你所放置的视频的地址，最好是放在服务器上
-          }
-        ],
-        poster: '', //你的封面地址（覆盖在视频上面的图片）
-        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: {
-    vioceClose() {
-      this.diavioce = false
-      const mp3 = this.$refs.AudioPlayer
-      mp3.pause()
-    },
-    playVideo(e) {
-      this.vioceSrc = [e.attachment]
-      this.diavioce = true
-    },
-    onBeforePlay(next) {
-      next() // 开始播放
-    },
-    showImg(e) {
-      this.imgSrc = e.attachment
-      this.dialogVisible = true
-    },
-    play(e) {
-      this.dia = true
-      const player = this.$refs.videoPlayer.player
-      this.playerOptions['sources'][0]['src'] = e.attachment
-      player.play()
-    },
-    down(e) {
-      const url = window.URL.createObjectURL(
-        new Blob([e.attachment], {
-          type:
-            'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8'
-        })
-      )
-      const link = document.createElement('a')
-      link.href = url
-      link.setAttribute('download', e.filename) // 下载文件的名称及文件类型后缀
-      document.body.appendChild(link)
-      link.click()
-      document.body.removeChild(link) // 下载完成移除元素
-      window.URL.revokeObjectURL(url) // 释放掉blob对象
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-#videoPlayer /deep/ .vjs-tech {
-  height: 450px;
-}
-
-.shabowbox {
-  position: fixed;
-  width: 100%;
-  height: 100%;
-  background: rgba(0, 0, 0, 0.4);
-  left: 0;
-  top: 0;
-  z-index: 2000;
-}
-
-.shabowboxvidoe {
-  position: fixed;
-  width: 800px;
-  height: 475px;
-  left: 50%;
-  margin-left: -400px;
-  top: 50%;
-  margin-top: -235px;
-  z-index: 2001;
-  background: #fff;
-}
-
-.shabowboxaudio {
-  height: 125px;
-  padding: 12px;
-}
-
-.close {
-  position: fixed;
-  width: 50px;
-  height: 50px;
-  right: 10px;
-  z-index: 2012;
-  top: 10px;
-  text-align: center;
-  line-height: 50px;
-  font-size: 20px;
-  color: #fff;
-  cursor: pointer;
-  font-size: 43px;
-}
-
-.takecontent {
-  text-align: left;
-  width: 100%;
-  height: 600px;
-  overflow-y: scroll;
-
-  ::-webkit-scrollbar {
-    display: none;
-  }
-
-  ul li {
-    padding: 8px;
-  }
-
-  .msgtypetext {
-    padding: 10px 0;
-  }
-
-  .msgtypevoice {
-    margin: 10px;
-  }
-
-  .msgtypefile {
-    margin: 10px;
-    width: 200px;
-    height: 40px;
-    line-height: 40px;
-    cursor: pointer;
-    color: #199ed8;
-    text-indent: 10px;
-    box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.2), 0 1px 4px 0 rgba(0, 0, 0, 0.19);
-  }
-
-  .card_name {
-    width: 320px;
-    height: 105px;
-    line-height: 80px;
-    text-indent: 10px;
-  }
-
-  .msgtypevideo {
-    margin: 10px;
-
-    cursor: pointer;
-
-    border-radius: 8px;
-  }
-
-  .msgtypeimg {
-    width: 100px;
-    height: 80px;
-    margin: 10px;
-
-    img {
-      width: 100px;
-      height: 80px;
-    }
-  }
-
-  .msgtypecard {
-    width: 320px;
-    height: 140px;
-    margin: 10px;
-    border-radius: 8px;
-    -webkit-box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2),
-      0 6px 8px 0 rgba(0, 0, 0, 0.19);
-    box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 8px 0 rgba(0, 0, 0, 0.19);
-    position: relative;
-
-    .card_foot {
-      position: absolute;
-      height: 20px;
-      border-top: 1px solid #efefef;
-      text-align: left;
-      bottom: 15px;
-      padding: 10px;
-      color: #333;
-      font-weight: bold;
-      width: 100%;
-    }
-  }
-}
-</style>
diff --git a/linkwe-ui/src/views/conversation/component/curList.vue b/linkwe-ui/src/views/conversation/component/curList.vue
deleted file mode 100644
index 0556d89560bd628173022065667cadc138815a5b..0000000000000000000000000000000000000000
--- a/linkwe-ui/src/views/conversation/component/curList.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<template>
-  <div class="list" v-loading="loading">
-    <div v-if="personList.length >= 1">
-      <ul>
-        <li
-          v-for="(item, index) in personList"
-          :key="index"
-          @click="liClick(item)"
-        >
-          <el-row style="padding:10px">
-            <span class="fl">
-              <img :src="item.finalChatContext.fromInfo.avatar"
-            /></span>
-            <span class="fl" style="margin-left:8px;">
-              <p>
-                {{ item.roomInfo.groupName }}
-                <span class="fr gray">{{
-                  parseTime(item.finalChatContext.msgtime)
-                }}</span>
-              </p>
-              <p class="gray " v-if="item.finalChatContext.text">
-                {{ item.finalChatContext.text.content }}
-              </p>
-            </span>
-          </el-row>
-        </li>
-      </ul>
-    </div>
-    <div v-else></div>
-  </div>
-</template>
-<script>
-import { parseTime } from '@/utils/common.js'
-export default {
-  props: {
-    personList: {
-      type: Array,
-      defluat: () => []
-    },
-    loading: {
-      type: Boolean,
-      defluat: false
-    }
-  },
-
-  data() {
-    return {
-      loadings: true
-    }
-  },
-  methods: {
-    liClick(e) {
-      this.$emit('chatFn', e)
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.list {
-  overflow-y: scroll;
-  height: 652px;
-  ::-webkit-scrollbar {
-    display: none;
-  }
-
-  /deep/ .el-loading-spinner {
-    margin-top: 20px;
-  }
-  .gray {
-    color: #999;
-  }
-  .padt10 {
-    padding-top: 10px;
-  }
-  ul li {
-    overflow: hidden;
-    border-bottom: 1px solid #efefef;
-    cursor: pointer;
-    p {
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-    }
-    :hover {
-      background: #efefef;
-    }
-    img {
-      width: 40px;
-      height: 40px;
-      float: left;
-    }
-  }
-}
-</style>
diff --git a/linkwe-ui/src/views/conversation/component/cusChat.vue b/linkwe-ui/src/views/conversation/component/cusChat.vue
deleted file mode 100644
index ad0998114e9314f434d3b2435fff246f418eaf09..0000000000000000000000000000000000000000
--- a/linkwe-ui/src/views/conversation/component/cusChat.vue
+++ /dev/null
@@ -1,151 +0,0 @@
-<template>
-  <div class="takecontent">
-    <ul>
-      <li v-for="(item, index) in allChat" :key="index">
-        <div :style="{ color: item.action == 'send' ? '#199ed8' : '#999' }">
-          {{ item.from }}
-          <span
-            :style="{ color: item.action == 'send' ? '#199ed8' : '#999' }"
-            >{{ parseTime(item.msgtime) }}</span
-          >
-        </div>
-        <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" />
-        </div>
-        <div
-          v-else-if="item.msgtype == 'file'"
-          class="msgtypefile"
-          @click="down(item.file)"
-        >
-          {{ item.file.filename }}
-        </div>
-        <div v-else-if="item.msgtype == 'voice'" class="msgtypevoice">
-          <i class="el-icon-video-play" @click="play(item, 'voice')"></i>
-        </div>
-        <div v-else-if="item.msgtype == 'video'" class="msgtypevideo">
-          <i class="el-icon-video-play" @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>
-        <div v-else-if="item.msgtype == 'weapp'" class="msgtypecard ">
-          <div class="card_name"></div>
-          <div class="card_foot">小程序</div>
-        </div>
-        <div v-else-if="item.msgtype == 'card'" class="msgtypecard ">
-          <div class="card_name">{{ item.card.corpname }}</div>
-          <div class="card_foot">个人名片</div>
-        </div>
-      </li>
-    </ul>
-    <el-dialog :visible.sync="dia" :show-close="false">
-      <p>播放</p>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { parseTime, yearMouthDay } from '@/utils/common.js'
-export default {
-  props: {
-    allChat: {
-      type: Array,
-      defluat: () => []
-    }
-  },
-
-  data() {
-    return {
-      dia: false
-    }
-  },
-  methods: {
-    play() {
-      this.dia = true
-    },
-    down(e) {
-      //下载文件
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.takecontent {
-  text-align: left;
-  width: 100%;
-  height: 600px;
-  overflow-y: scroll;
-
-  ::-webkit-scrollbar {
-    display: none;
-  }
-
-  ul li {
-    padding: 8px;
-  }
-
-  .msgtypetext {
-    padding: 10px 0;
-  }
-
-  .msgtypevoice {
-    margin: 10px;
-  }
-
-  .msgtypefile {
-    margin: 10px;
-    width: 200px;
-    height: 40px;
-    line-height: 40px;
-    cursor: pointer;
-    color: #199ed8;
-    text-indent: 10px;
-    box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.2), 0 1px 4px 0 rgba(0, 0, 0, 0.19);
-  }
-  .card_name {
-    line-height: 80px;
-    text-indent: 10px;
-  }
-  .msgtypevideo {
-    margin: 10px;
-    font-size: 40px;
-    cursor: pointer;
-    color: #199ed8;
-    border-radius: 8px;
-  }
-
-  .msgtypeimg {
-    width: 100px;
-    height: 80px;
-    margin: 10px;
-  }
-
-  .msgtypecard {
-    width: 300px;
-    height: 140px;
-    margin: 10px;
-    border-radius: 8px;
-    -webkit-box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2),
-      0 6px 8px 0 rgba(0, 0, 0, 0.19);
-    box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 8px 0 rgba(0, 0, 0, 0.19);
-    position: relative;
-
-    .card_foot {
-      position: absolute;
-      height: 20px;
-      border-top: 1px solid #efefef;
-      text-align: left;
-      bottom: 15px;
-      padding: 10px;
-      color: #333;
-      font-weight: bold;
-      width: 100%;
-    }
-  }
-}
-</style>
diff --git a/linkwe-ui/src/views/conversation/component/customerList.vue b/linkwe-ui/src/views/conversation/component/customerList.vue
deleted file mode 100644
index a0b057e32f6232bf6e19cd56a4600f26ef8daf0f..0000000000000000000000000000000000000000
--- a/linkwe-ui/src/views/conversation/component/customerList.vue
+++ /dev/null
@@ -1,95 +0,0 @@
-<template>
-  <div class="list" v-loading="loading">
-    <div v-if="personList.length >= 1">
-      <ul>
-        <li
-          v-for="(item, index) in personList"
-          :key="index"
-          @click="liClick(item)"
-        >
-          <el-row style="padding:10px">
-            <el-col :span="3"
-              ><img :src="item.avatar"
-            /></el-col>
-            <el-col :span="21">
-              <p>
-                {{ item.name }}
-                <span class="fr gray">{{
-                    item.msgTime
-                }}</span>
-              </p>
-              <p class="gray padt10" v-if="item.contact">
-                {{ JSON.parse(item.contact).content }}
-              </p>
-            </el-col>
-          </el-row>
-        </li>
-      </ul>
-    </div>
-    <div v-else></div>
-  </div>
-</template>
-<script>
-import { parseTime } from '@/utils/common.js'
-export default {
-  props: {
-    personList: {
-      type: Array,
-      defluat: () => []
-    },
-    loading: {
-      type: Boolean,
-      defluat: false
-    }
-  },
-
-  data() {
-    return {
-      loadings: true
-    }
-  },
-  methods: {
-    liClick(e) {
-      this.$emit('chatFn', e)
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.list {
-  overflow-y: scroll;
-  height: 651px;
-  ::-webkit-scrollbar {
-    display: none;
-  }
-
-  /deep/ .el-loading-spinner {
-    margin-top: 20px;
-  }
-  .gray {
-    color: #999;
-  }
-  .padt10 {
-    padding-top: 10px;
-  }
-  ul li {
-    padding: 10px;
-    overflow: hidden;
-    border-bottom: 1px solid #efefef;
-    cursor: pointer;
-    p {
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-    }
-    :hover {
-      background: #efefef;
-    }
-    img {
-      width: 40px;
-      height: 40px;
-      float: left;
-    }
-  }
-}
-</style>
diff --git a/linkwe-ui/src/views/conversation/component/list.vue b/linkwe-ui/src/views/conversation/component/list.vue
deleted file mode 100644
index f14290749c9ab699baae141786be869a54c501c5..0000000000000000000000000000000000000000
--- a/linkwe-ui/src/views/conversation/component/list.vue
+++ /dev/null
@@ -1,97 +0,0 @@
-<template>
-  <div class="list" v-loading="loading">
-    <div v-if="personList.length >= 1">
-      <ul>
-        <li
-          v-for="(item, index) in personList"
-          :key="index"
-          @click="liClick(item)"
-        >
-          <el-row style="padding:10px">
-            <span class="fl"> <img :src="item.avatar"/></span>
-            <span class="fl" style="margin-left:8px">
-              <p>{{ item.name }}</p>
-            </span>
-            <span class="fl">
-              <p>{{ item.contact }}</p>
-            </span>
-          </el-row>
-        </li>
-      </ul>
-    </div>
-    <div v-else></div>
-  </div>
-</template>
-<script>
-import { parseTime } from '@/utils/common.js'
-export default {
-  props: {
-    personList: {
-      type: Array,
-      defluat: () => []
-    },
-    loading: {
-      type: Boolean,
-      defluat: false
-    }
-  },
-  data() {
-    return {
-      loadings: true
-    }
-  },
-  methods: {
-    liClick(e) {
-      console.log(e, 'liClick')
-      this.$emit('chatFn', e)
-    },
-    msgContentType(type,msg){
-      console.log(type,msg, 'msgContentType')
-      //消息获取
-      /*case msg = JSON.parse(msg);
-      switch (type){
-        case "text":
-      }*/
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.list {
-  overflow-y: scroll;
-  height: 708px;
-  ::-webkit-scrollbar {
-    display: none;
-  }
-
-  /deep/ .el-loading-spinner {
-    margin-top: 20px;
-  }
-  .gray {
-    color: #999;
-  }
-  .padt10 {
-    padding-top: 10px;
-  }
-  ul li {
-    padding: 10px;
-    overflow: hidden;
-    border-bottom: 1px solid #efefef;
-    cursor: pointer;
-    p {
-      white-space: nowrap;
-      overflow: hidden;
-      line-height: 40px;
-      text-overflow: ellipsis;
-    }
-    :hover {
-      background: #efefef;
-    }
-    img {
-      width: 40px;
-      height: 40px;
-      float: left;
-    }
-  }
-}
-</style>
diff --git a/linkwe-ui/src/views/conversation/content/component/chatList.vue b/linkwe-ui/src/views/conversation/content/component/chatList.vue
new file mode 100644
index 0000000000000000000000000000000000000000..14c2ea0c404ea4e3d428a8e22894f6666929b629
--- /dev/null
+++ b/linkwe-ui/src/views/conversation/content/component/chatList.vue
@@ -0,0 +1,99 @@
+<template>
+  <div class="takecontent">
+    <ul>
+      <li v-for="(item, index) in data" :key="index">
+        <!-- <span v-if="item.fromInfo.name">{{item.fromInfo.name}}</span> -->
+        <div class="mb15">
+          <span class="mr20">{{ item.name }}</span>
+          <span
+            :style="{ color: item.action == 'send' ? '#199ed8' : '#999' }"
+            >{{ item.msgTime }}</span
+          >
+        </div>
+
+        <ChatContent :message="item"></ChatContent>
+      </li>
+    </ul>
+  </div>
+</template>
+
+<script>
+import ChatContent from '@/components/ChatContent'
+export default {
+  components: {
+    ChatContent
+  },
+  props: {
+    data: {
+      type: Array,
+      defluat: () => []
+    }
+  },
+  mounted() {},
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+<style lang="scss" scoped>
+#videoPlayer /deep/ .vjs-tech {
+  height: 450px;
+}
+
+.shabowbox {
+  position: fixed;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  left: 0;
+  top: 0;
+  z-index: 2000;
+}
+
+.shabowboxvidoe {
+  position: fixed;
+  width: 800px;
+  height: 475px;
+  left: 50%;
+  margin-left: -400px;
+  top: 50%;
+  margin-top: -235px;
+  z-index: 2001;
+  background: #fff;
+}
+
+.shabowboxaudio {
+  height: 125px;
+  padding: 12px;
+}
+
+.close {
+  position: fixed;
+  width: 50px;
+  height: 50px;
+  right: 10px;
+  z-index: 2012;
+  top: 10px;
+  text-align: center;
+  line-height: 50px;
+  font-size: 20px;
+  color: #fff;
+  cursor: pointer;
+  font-size: 43px;
+}
+
+.takecontent {
+  text-align: left;
+  width: 100%;
+  overflow-y: scroll;
+
+  ::-webkit-scrollbar {
+    display: none;
+  }
+
+  ul li {
+    padding: 10px;
+  }
+}
+</style>
diff --git a/linkwe-ui/src/views/conversation/content/component/chatListClass.vue b/linkwe-ui/src/views/conversation/content/component/chatListClass.vue
new file mode 100644
index 0000000000000000000000000000000000000000..131f59a8b65f90cfb9862dee9738f8576288418f
--- /dev/null
+++ b/linkwe-ui/src/views/conversation/content/component/chatListClass.vue
@@ -0,0 +1,112 @@
+<template>
+  <div>
+    <div class="top">
+      <div class="name">
+        <span v-if="queryChat"> 与{{ queryChat.receiveName }}的聊天</span>
+        <span class="fr download" @click="exportList()">下载会话</span>
+      </div>
+    </div>
+    <el-tabs
+      v-model="activeTab"
+      @tab-click="(v) => opened.includes(v.name) || opened.push(v.name)"
+    >
+      <el-tab-pane
+        v-for="(item, index) of list"
+        :key="index"
+        :label="item.label"
+        :name="item.type"
+      >
+        <chatListClassTab
+          v-if="opened.includes(item.type)"
+          :queryChat="queryChat"
+          :type="item.type"
+        ></chatListClassTab>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import chatListClassTab from './chatListClassTab.vue'
+import api from '@/api/conversation/content.js'
+export default {
+  components: { chatListClassTab },
+  props: {
+    queryChat: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  data() {
+    return {
+      activeTab: 'all',
+      opened: ['all'],
+      list: [
+        {
+          label: '全部',
+          type: 'all'
+        },
+        {
+          label: '图片及视频',
+          type: 'image'
+        },
+        {
+          label: '文件',
+          type: 'file'
+        },
+        {
+          label: '链接',
+          type: 'link'
+        },
+        {
+          label: '语音通话',
+          type: 'voice'
+        }
+      ]
+    }
+  },
+  watch: {
+    queryChat() {
+      this.opened = ['all']
+    }
+  },
+  mounted() {},
+  methods: {
+    exportList() {
+      this.$confirm('是否确认导出所有数据项?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          return api.exportList(this.queryChat)
+        })
+        .then((response) => {
+          this.download(response.msg)
+        })
+        .catch(function() {})
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+/deep/ .el-tabs__header {
+  margin: 0;
+}
+
+.top {
+  padding: 15px;
+}
+
+.name {
+  font-size: 18px;
+  min-height: 20px;
+}
+
+.download {
+  color: #199ed8;
+  text-align: right;
+  font-size: 16px;
+  cursor: pointer;
+}
+</style>
diff --git a/linkwe-ui/src/views/conversation/content/component/chatListClassTab.vue b/linkwe-ui/src/views/conversation/content/component/chatListClassTab.vue
new file mode 100644
index 0000000000000000000000000000000000000000..041b623d7352d89382fff4706dc5f66086a42b55
--- /dev/null
+++ b/linkwe-ui/src/views/conversation/content/component/chatListClassTab.vue
@@ -0,0 +1,225 @@
+<template>
+  <div class="chatListClassTab" v-loading="loading">
+    <el-date-picker
+      v-model="dateRange"
+      type="daterange"
+      format="yyyy-MM-dd"
+      value-format="yyyy-MM-dd"
+      range-separator="至"
+      start-placeholder="开始日期"
+      end-placeholder="结束日期"
+      align="right"
+      @change="getList(1)"
+    >
+    </el-date-picker>
+    <div class="list">
+      <template v-if="list.length">
+        <chatList
+          v-if="'all,image,link'.includes(type)"
+          :data="list"
+        ></chatList>
+
+        <el-table
+          v-else-if="type == 'file'"
+          :data="list"
+          stripe
+          style="width: 100%"
+          :header-cell-style="{ background: '#fff' }"
+        >
+          <el-table-column prop="msgtype" label="类型"> </el-table-column>
+          <el-table-column label="名称">
+            <template slot-scope="{ row }">
+              {{ JSON.parse(row.contact).filename }}
+            </template>
+          </el-table-column>
+          <el-table-column label="大小">
+            <template slot-scope="{ row }">
+              {{ filterSize(JSON.parse(row.contact).filesize) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="来源">
+            <template slot-scope="{ row }">
+              {{ row.name }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="action" label="操作">
+            <template slot-scope="{ row }">
+              <el-button type="text" size="small" @click="downloadFile(row)"
+                >下载</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <el-table
+          v-else-if="type == 'voice'"
+          :data="list"
+          stripe
+          :header-cell-style="{ background: '#fff' }"
+        >
+          <el-table-column prop="date" label="发起人">
+            <template slot-scope="{ row }">
+              {{ row.name }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="name" label="通话时间">
+            <template slot-scope="{ row }">
+              {{ row.msgTime }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="address" label="时长" min-width="50">
+            <template slot-scope="{ row }">
+              {{ JSON.parse(row.contact).play_length }}s
+            </template>
+          </el-table-column>
+          <el-table-column prop="address" min-width="150" label="操作">
+            <template slot-scope="{ row }">
+              <!-- <el-button
+                type="text"
+                size="small"
+                @click="voiceLook(JSON.parse(row.contact))"
+                >查看</el-button
+              > -->
+              <!-- <AudioPlayer
+                :audio-list="[JSON.parse(row.contact).attachment]"
+                ref="AudioPlayer"
+              /> -->
+              <audio controls>
+                <source
+                  :src="JSON.parse(row.contact).attachment"
+                  type="audio/mpeg"
+                />
+              </audio>
+            </template>
+          </el-table-column>
+        </el-table>
+      </template>
+
+      <el-empty v-else :image-size="100"></el-empty>
+    </div>
+
+    <el-pagination
+      v-if="total"
+      layout="prev, pager, next"
+      :current-page.sync="currentPage"
+      @current-change="getList"
+      :total="total"
+    />
+  </div>
+</template>
+
+<script>
+import chatList from './chatList.vue'
+import api from '@/api/conversation/content.js'
+export default {
+  name: '',
+  components: { chatList },
+  props: {
+    // 消息收发者
+    queryChat: {
+      type: Object,
+      default: () => ({})
+    },
+    // 消息类型
+    type: {
+      type: String | Number,
+      default: 0
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      currentPage: 1,
+      dateRange: [],
+      list: [],
+      total: 0
+    }
+  },
+  computed: {},
+  watch: {
+    queryChat() {
+      this.getList(1)
+    }
+  },
+  created() {
+    this.getList(1)
+  },
+  mounted() {},
+  methods: {
+    getList(page) {
+      // if (!this.queryChat.fromId) {
+      //   return //没有选择人
+      // }
+      this.loading = true
+      let query = {
+        msgType: this.type == 'all' ? '' : this.type,
+        pageSize: '10'
+        // orderByColumn: 'msg_time',
+        // isAsc: 'asc'
+      }
+      if (this.dateRange) {
+        query.beginTime = this.dateRange[0]
+        query.endTime = this.dateRange[1]
+      } else {
+        query.beginTime = ''
+        query.endTime = ''
+      }
+      page && (query.pageNum = this.currentPage = page)
+      Object.assign(query, this.queryChat)
+      api
+        .getChatList(query)
+        .then((res) => {
+          this.total = ~~res.total
+          this.list = res.rows
+          this.loading = false
+        })
+        .catch((err) => {
+          this.loading = false
+        })
+    },
+    filterSize(size) {
+      if (!size) return ''
+      if (size < pow1024(1)) return size + ' B'
+      if (size < pow1024(2)) return (size / pow1024(1)).toFixed(2) + ' KB'
+      if (size < pow1024(3)) return (size / pow1024(2)).toFixed(2) + ' MB'
+      if (size < pow1024(4)) return (size / pow1024(3)).toFixed(2) + ' GB'
+      return (size / pow1024(4)).toFixed(2) + ' TB'
+
+      function pow1024(num) {
+        return Math.pow(1024, num)
+      }
+    },
+    downloadFile(row) {
+      this.$confirm('是否确认下载该文件?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then((response) => {
+          this.download(JSON.parse(row.contact).attachment)
+        })
+        .catch(function() {})
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.list {
+  height: calc(100vh - 370px);
+  margin-top: 10px;
+  background: white;
+  overflow-y: scroll;
+  border-bottom: 1px solid #efefef;
+  color: #999;
+  text-align: center;
+
+  ::-webkit-scrollbar {
+    display: none;
+  }
+}
+.chatListClassTab {
+  padding: 10px 10px 0;
+  background: #fff;
+}
+</style>
diff --git a/linkwe-ui/src/views/conversation/component/groupList.vue b/linkwe-ui/src/views/conversation/content/component/groupList.vue
similarity index 51%
rename from linkwe-ui/src/views/conversation/component/groupList.vue
rename to linkwe-ui/src/views/conversation/content/component/groupList.vue
index 855076263130a3edea9dd2d57d3b11336b29fc9d..f70b79ab6b1b8e8a2d0c56c0426577906fe0d9b7 100644
--- a/linkwe-ui/src/views/conversation/component/groupList.vue
+++ b/linkwe-ui/src/views/conversation/content/component/groupList.vue
@@ -1,40 +1,36 @@
 <template>
-  <div class="list" v-loading="loading">
-    <div v-if="personList">
-      <ul>
-        <li
-          v-for="(item, index) in personList"
-          :key="index"
-          @click="liClick(item)"
-        >
-          <el-row style="padding:10px" v-if="item.msgType == 'text'">
-            <span class="fl">
-              <div class="ninebox">
-                <ul v-if="item.avatar">
-                  <li
-                    v-for="(a, i) in item.avatar.split(',')"
-                    :key="i"
-                  >
-                    <img :src="a" />
-                  </li>
-                </ul>
-              </div>
-            </span>
-            <span class="fl" style="margin-left:8px;line-height:60px">
-              <p>
-                {{ item.name }}
-                <span class="fr gray">{{
-                    item.msgTime
-                }}</span>
-              </p>
-              <p class="gray" v-if="item">
-                {{ item.name }}:{{
-                  item.content
-                }}
-              </p>
-            </span>
-          </el-row>
-          <!-- <el-row style="padding:10px" v-if="item.finalChatContext.msgtype=='file'">
+  <div class="groupList" v-loading="loading">
+    <ul v-if="personList.length">
+      <li
+        v-for="(item, index) in personList"
+        :key="index"
+        :class="{ active: index == active }"
+        @click="liClick(item, index)"
+      >
+        <el-row type="flex" align="middle">
+          <div class="ninebox">
+            <ul v-if="item.avatar">
+              <li v-for="(a, i) in item.avatar.split(',')" :key="i">
+                <img :src="a" />
+              </li>
+            </ul>
+          </div>
+          <div
+            style="margin-left:8px;line-height:60px"
+            class="toe"
+            :title="item.name"
+          >
+            {{ item.name }}
+            <!-- <p>
+              <span class="fr gray">{{ item.msgTime }}</span>
+            </p> -->
+            <!-- <p class="gray" v-if="item">
+                {{ item.name }}:
+                {{ item.content }}
+              </p> -->
+          </div>
+        </el-row>
+        <!-- <el-row style="padding:10px" v-if="item.finalChatContext.msgtype=='file'">
                 <el-col :span="3">&nbsp;</el-col>
                 <el-col :span="21">
                    <p><span class="fr gray">{{parseTime(item.finalChatContext.msgtime)}}</span></p>
@@ -43,10 +39,9 @@
                        </p>
                 </el-col>
                 </el-row>   -->
-        </li>
-      </ul>
-    </div>
-    <div v-else></div>
+      </li>
+    </ul>
+    <el-empty v-else :image-size="100"></el-empty>
   </div>
 </template>
 <script>
@@ -65,21 +60,25 @@ export default {
 
   data() {
     return {
-      loadings: true
+      loadings: true,
+      active: undefined
     }
   },
   methods: {
-    liClick(e) {
-      this.$emit('groupFn', e)
+    liClick(data, index) {
+      this.active = index
+      this.$emit('groupFn', data)
     }
   }
 }
 </script>
 <style lang="scss" scoped>
 .ninebox {
+  flex: none;
   width: 54px;
   height: 52px;
   border: 1px solid #199ed8;
+  overflow: hidden;
   ul li {
     float: left;
     width: 15px;
@@ -88,8 +87,9 @@ export default {
     margin: 1px 1px 1px 1px;
   }
 }
-.list {
-  overflow-y: scroll;
+.groupList {
+  overflow-y: auto;
+  height: calc(100vh - 328px);
 
   ::-webkit-scrollbar {
     display: none;
@@ -115,9 +115,12 @@ export default {
       overflow: hidden;
       text-overflow: ellipsis;
     }
-    :hover {
+    &:hover {
       background: #efefef;
     }
+    &.active {
+      background: #ebf4fc;
+    }
     img {
       width: 100%;
       height: 100%;
diff --git a/linkwe-ui/src/views/conversation/component/insideList.vue b/linkwe-ui/src/views/conversation/content/component/userList.vue
similarity index 48%
rename from linkwe-ui/src/views/conversation/component/insideList.vue
rename to linkwe-ui/src/views/conversation/content/component/userList.vue
index e98f7c930b6b25d8a877e42f9d09ce0eff61bb69..81566b14c5c1b57088b5a2f54f5d084d30c27bfc 100644
--- a/linkwe-ui/src/views/conversation/component/insideList.vue
+++ b/linkwe-ui/src/views/conversation/content/component/userList.vue
@@ -1,28 +1,23 @@
 <template>
-  <div class="list" v-loading="loading">
-    <div v-if="personList.length >= 1">
-      <ul>
-        <li
-          v-for="(item, index) in personList"
-          :key="index"
-          @click="liClick(item)"
-        >
-          <el-row style="padding:10px">
-            <span class="fl">
-              <img :src="item.avatar"
-            /></span>
-            <span class="fl" style="margin-left:8px">
-              <p>{{ item.name }}</p>
-            </span>
-          </el-row>
-        </li>
-      </ul>
-    </div>
-    <div v-else></div>
+  <div class="userList" v-loading="loading">
+    <ul v-if="personList.length">
+      <li
+        v-for="(item, index) in personList"
+        class="list"
+        :class="{ active: index == active }"
+        :key="index"
+        @click="liClick(item, index)"
+      >
+        <img class="fl mr10" :src="item.avatar" />
+        <div class="name" :title="item.name">
+          {{ item.name }}
+        </div>
+      </li>
+    </ul>
+    <el-empty v-else :image-size="100"></el-empty>
   </div>
 </template>
 <script>
-import { parseTime } from '@/utils/common.js'
 export default {
   props: {
     personList: {
@@ -37,21 +32,23 @@ export default {
 
   data() {
     return {
-      loadings: true
+      loadings: true,
+      active: undefined
     }
   },
   methods: {
-    liClick(e) {
-      console.log(e)
-      this.$emit('chatFn', e)
+    liClick(data, index) {
+      this.active = index
+      this.$emit('chatFn', data)
     }
   }
 }
 </script>
 <style lang="scss" scoped>
-.list {
-  overflow-y: scroll;
-  height: 708px;
+.userList {
+  overflow-y: auto;
+  height: calc(100vh - 288px);
+
   ::-webkit-scrollbar {
     display: none;
   }
@@ -63,22 +60,24 @@ export default {
   .gray {
     color: #999;
   }
-  .padt10 {
-    padding-top: 10px;
-  }
-  ul li {
+  .list {
+    padding: 10px;
     overflow: hidden;
     border-bottom: 1px solid #efefef;
     cursor: pointer;
-    p {
+    text-align: left;
+    .name {
       white-space: nowrap;
       overflow: hidden;
       line-height: 40px;
       text-overflow: ellipsis;
     }
-    :hover {
+    &:hover {
       background: #efefef;
     }
+    &.active {
+      background: #ebf4fc;
+    }
     img {
       width: 40px;
       height: 40px;
diff --git a/linkwe-ui/src/views/conversation/content/customer.vue b/linkwe-ui/src/views/conversation/content/customer.vue
new file mode 100644
index 0000000000000000000000000000000000000000..952fa85853070d966d6ba53980e8b9711ea1b9fd
--- /dev/null
+++ b/linkwe-ui/src/views/conversation/content/customer.vue
@@ -0,0 +1,286 @@
+<template>
+  <div class="customer">
+    <el-row type="flex">
+      <el-col :span="6" class="borderRight">
+        <div class="name pd15">客户列表（{{ customerTotal }}）</div>
+        <el-input
+          class="mb5"
+          placeholder="搜索客户"
+          prefix-icon="el-icon-search"
+          v-model="customerQuery.name"
+          @keyup.enter.native="getCustomerList(1)"
+        >
+        </el-input>
+        <div v-loading="customerLoading">
+          <ul v-infinite-scroll="getCustomerList" class="customer-wrap">
+            <template v-if="customerList.length">
+              <el-row
+                v-for="(item, index) in customerList"
+                :key="index"
+                tag="li"
+                @click.native="choiceCustomer(item, index)"
+                class="customer-li"
+                :class="{ active: index == personIndex }"
+                :gutter="20"
+                type="flex"
+                align="middle"
+              >
+                <el-col :span="4">
+                  <img v-if="item.avatar" :src="item.avatar" alt="头像" />
+                </el-col>
+                <el-col :span="10" v-if="item" class="toe">
+                  <span style="line-height:40px">{{ item.name }}</span>
+                </el-col>
+                <el-col :span="10" class="ar">
+                  <span
+                    :style="{ color: item.type === 1 ? '#4bde03' : '#f9a90b' }"
+                    >{{ { 1: '@微信', 2: '@企业微信' }[item.type] }}
+                  </span>
+                  <i
+                    :class="[
+                      'el-icon-s-custom',
+                      { 1: 'man', 2: 'woman' }[item.gender]
+                    ]"
+                  ></i>
+                </el-col>
+              </el-row>
+
+              <div class="ac mt10 mb15">
+                {{
+                  customerList.length != customerTotal
+                    ? '下拉加载更多'
+                    : '看到底了～'
+                }}
+              </div>
+            </template>
+            <el-empty v-else :image-size="100"></el-empty>
+          </ul>
+        </div>
+      </el-col>
+      <el-col :span="6" class="borderRight">
+        <template v-if="talkName">
+          <div class="name pd15">{{ talkName }}</div>
+          <el-input
+            class="mb5"
+            placeholder="搜索联系人"
+            prefix-icon="el-icon-search"
+            v-model="chatContent"
+            @keyup.enter.native="getChatList()"
+          >
+          </el-input>
+          <el-tabs v-model="activeName" @tab-click="getChatList()">
+            <el-tab-pane label="单聊" name="0">
+              <userList
+                v-if="activeName == 0"
+                :personList="personList"
+                :loading="loading"
+                @chatFn="chatFn"
+              >
+              </userList>
+            </el-tab-pane>
+            <el-tab-pane label="群聊" name="2">
+              <grouplist
+                v-if="activeName == 2"
+                :personList="personList"
+                :loading="loading"
+                @groupFn="groupFn"
+              >
+              </grouplist>
+            </el-tab-pane>
+          </el-tabs>
+        </template>
+
+        <el-empty v-else :image-size="100" description="请选择客户"></el-empty>
+      </el-col>
+      <el-col :span="12">
+        <chatListClass
+          v-show="queryChat.receiveName"
+          :queryChat="queryChat"
+        ></chatListClass>
+
+        <el-empty
+          v-if="!queryChat.receiveName"
+          :image-size="100"
+          description="请选择联系人"
+        ></el-empty>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+<script>
+import chatListClass from './component/chatListClass.vue'
+import userList from './component/userList.vue'
+import grouplist from './component/groupList.vue'
+import api from '@/api/conversation/content.js'
+import * as apiCustomer from '@/api/customer/index'
+export default {
+  components: {
+    userList,
+    grouplist,
+    chatListClass
+  },
+  data() {
+    return {
+      customerLoading: false,
+      customerQuery: {
+        pageNum: 1,
+        pageSize: 10,
+        name: ''
+      },
+      customerList: [],
+      customerTotal: 0,
+
+      talkName: '',
+      chatContent: '',
+      personIndex: undefined,
+      activeName: '0',
+      personList: [],
+      loading: false,
+      fromId: '',
+
+      queryChat: {}
+    }
+  },
+  created() {
+    // this.customerList()
+  },
+  methods: {
+    chatFn(data) {
+      this.queryChat = {
+        fromId: this.fromId,
+        receiveName: data.name,
+        toList: data.receiver
+      }
+    },
+    groupFn(data) {
+      this.queryChat = {
+        fromId: this.fromId,
+        receiveName: data.name,
+        roomId: data.receiver
+      }
+    },
+    choiceCustomer(data, index) {
+      this.personIndex = index
+      this.talkName = data.name
+      this.fromId = data.externalUserid
+      this.getChatList()
+    },
+    getChatList(flag) {
+      if (!this.fromId) {
+        return
+      }
+      if (flag) {
+        this.loading = true
+      }
+      this.personList = []
+      if (this.activeName == '0') {
+        api
+          .selectAloneChatList({
+            fromId: this.fromId,
+            contact: this.chatContent
+          })
+          .then(({ data }) => {
+            this.loading = false
+            this.personList = data
+          })
+          .catch((err) => {
+            this.loading = false
+          })
+      } else {
+        api
+          .getGroupChatList(this.fromId)
+          .then(({ data }) => {
+            this.loading = false
+            this.personList = data
+          })
+          .catch((err) => {
+            this.loading = false
+          })
+      }
+    },
+    getCustomerList(page) {
+      this.customerLoading = true
+      if (page) {
+        this.customerQuery.pageNum = page
+        this.customerList = []
+      }
+      page && (this.customerQuery.pageNum = page)
+      apiCustomer.getList(this.customerQuery).then((res) => {
+        this.customerList.push(...res.rows)
+        this.customerTotal = ~~res.total
+        this.customerQuery.pageNum++
+        this.customerLoading = false
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+/deep/.el-tabs__nav-scroll {
+  padding-left: 15px;
+}
+
+.borderRight {
+  border-right: 2px solid #ccc;
+}
+
+.customer {
+  background: #f6f6f9;
+
+  .el-tabs {
+    background: #fff;
+  }
+  /deep/ .el-tabs__header {
+    margin: 0;
+  }
+
+  .name {
+    font-size: 18px;
+    min-height: 20px;
+  }
+
+  .customer-wrap {
+    position: relative;
+    height: calc(100vh - 288px);
+    background: white;
+    border-bottom: 1px solid #efefef;
+    overflow-y: auto;
+    overflow-x: hidden;
+    color: #999;
+    text-align: center;
+    .customer-li {
+      padding: 10px;
+      text-align: left;
+      cursor: pointer;
+      border-bottom: 1px solid #efefef;
+
+      &:hover {
+        background: #efefef;
+      }
+
+      img {
+        width: 40px;
+      }
+      &.active {
+        background: #ebf4fc;
+      }
+    }
+  }
+}
+
+.el-icon-s-custom {
+  font-size: 16px;
+  margin-left: 4px;
+  color: #999;
+  &.man {
+    color: #13a2e8;
+  }
+  &.woman {
+    color: #f753b2;
+  }
+}
+
+.userList {
+  height: calc(100vh - 328px);
+}
+</style>
diff --git a/linkwe-ui/src/views/conversation/content/employee.vue b/linkwe-ui/src/views/conversation/content/employee.vue
new file mode 100644
index 0000000000000000000000000000000000000000..9bb562d1ee01b587080b9f3bacb90ca57eb1bc8f
--- /dev/null
+++ b/linkwe-ui/src/views/conversation/content/employee.vue
@@ -0,0 +1,247 @@
+<template>
+  <div class="employ">
+    <el-row type="flex">
+      <el-col :span="6" class="borderR">
+        <!-- <div class="hd_box">
+          <div class="name">成员（{{employAmount}}）</div>
+          <div class="paddingT10">
+            <el-input placeholder="请输入内容" prefix-icon="el-icon-search" v-model="employName">
+            </el-input>
+          </div>
+        </div> -->
+        <div class="ct_box ct_boxFirst" style="height: calc(100vh - 197px)">
+          <el-tree
+            ref="tree"
+            class="filter-tree"
+            :data="treeData"
+            :props="defaultProps"
+            :filter-node-method="filterNode"
+            highlight-current
+            @node-click="handleNodeClick"
+            :default-expand-all="true"
+          >
+          </el-tree>
+        </div>
+      </el-col>
+      <el-col :span="6" class="borderR">
+        <template v-if="talkName">
+          <div class="name pd15">{{ talkName }}</div>
+          <el-tabs v-model="activeName" @tab-click="tabClick(true)">
+            <el-tab-pane label="内部联系人" name="0">
+              <userList
+                v-if="activeName == 0"
+                :personList="personList"
+                :loading="loading"
+                @chatFn="chatFn"
+              >
+              </userList>
+            </el-tab-pane>
+            <el-tab-pane label="外部联系人" name="1">
+              <userList
+                v-if="activeName == 1"
+                :personList="personList"
+                :loading="loading"
+                @chatFn="chatFn"
+              >
+              </userList>
+            </el-tab-pane>
+            <el-tab-pane label="群聊" name="2">
+              <grouplist
+                class="ct_box"
+                v-if="activeName == 2"
+                :personList="personList"
+                :loading="loading"
+                @groupFn="groupFn"
+              >
+              </grouplist>
+            </el-tab-pane>
+          </el-tabs>
+        </template>
+
+        <el-empty v-else :image-size="100" description="请选择员工"></el-empty>
+      </el-col>
+      <el-col :span="12">
+        <chatListClass
+          v-show="queryChat.receiveName"
+          :queryChat="queryChat"
+        ></chatListClass>
+
+        <el-empty
+          v-if="!queryChat.receiveName"
+          description="请选择联系人"
+          :image-size="100"
+        ></el-empty>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+<script>
+import chatListClass from './component/chatListClass.vue'
+import userList from './component/userList.vue'
+import grouplist from './component/groupList.vue'
+import * as apiOrg from '@/api/organization'
+import api from '@/api/conversation/content.js'
+
+export default {
+  components: {
+    grouplist,
+    userList,
+    chatListClass
+  },
+  data() {
+    return {
+      employAmount: 1,
+      fromId: '',
+      // employName: '',
+      talkName: '',
+      treeData: [],
+      defaultProps: {
+        label: 'name',
+        children: 'children'
+      },
+      activeName: '0',
+      chat: {},
+
+      personList: [],
+      loading: false,
+      queryChat: {}
+    }
+  },
+  watch: {
+    // employName(val) {
+    //   this.$refs.tree.filter(val)
+    // }
+  },
+  mounted() {
+    this.getTree()
+    //this.getAmount()
+  },
+  methods: {
+    chatFn(data) {
+      this.queryChat = {
+        fromId: this.fromId,
+        receiveName: data.name,
+        toList: data.receiver
+      }
+    },
+    groupFn(data) {
+      this.queryChat = {
+        // fromId: this.fromId,
+        receiveName: data.name,
+        roomId: data.receiver
+      }
+    },
+    getTree() {
+      apiOrg.getTree().then(({ data }) => {
+        this.treeData = this.handleTree(data)
+        this.handleNodeClick(this.treeData[0], true)
+      })
+    },
+    tabClick(flag) {
+      this.personList = []
+      if (!this.fromId) {
+        return
+      }
+      if (flag) {
+        this.loading = true
+      }
+      if (this.activeName == 0) {
+        api
+          .getInternalChatList(this.fromId)
+          .then(({ data }) => {
+            this.loading = false
+            this.personList = data
+          })
+          .catch((err) => {
+            this.loading = false
+          })
+      } else if (this.activeName == 1) {
+        api
+          .getExternalChatList(this.fromId)
+          .then(({ data }) => {
+            this.loading = false
+            this.personList = data
+          })
+          .catch((err) => {
+            this.loading = false
+          })
+      } else {
+        api
+          .getGroupChatList(this.fromId)
+          .then(({ data }) => {
+            this.loading = false
+            this.personList = data
+          })
+          .catch((err) => {
+            this.loading = false
+          })
+      }
+    },
+    filterNode(value, data) {
+      console.log(value, data)
+      if (!value) return true
+      return data.name.indexOf(value) !== -1
+    },
+
+    handleNodeClick(data, add) {
+      if (!data.userId) {
+        let querys = {
+          pageNum: '1',
+          pageSize: '999',
+          department: data.id
+        }
+        apiOrg.getList(querys).then(({ rows }) => {
+          this.$set(data, 'children', [])
+
+          data.children = rows
+        })
+      } else {
+        this.talkName = data.name
+        this.fromId = data.userId
+        this.tabClick()
+
+        this.queryChat = {
+          fromId: data.userId
+        }
+      }
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+/deep/.el-tabs__nav-scroll {
+  padding-left: 15px;
+}
+
+.borderR {
+  border-right: 2px solid #ccc;
+}
+/deep/ .el-tabs__header {
+  margin: 0;
+}
+.employ {
+  background: #f6f6f9;
+
+  .el-tabs {
+    background: #fff;
+  }
+
+  .name {
+    font-size: 18px;
+    min-height: 20px;
+  }
+  .ct_box {
+    background: white;
+    height: calc(100vh - 286px);
+    padding: 0 10px;
+    overflow-y: auto;
+    border-bottom: 1px solid #efefef;
+    color: #999;
+    text-align: center;
+
+    ::-webkit-scrollbar {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/linkwe-ui/src/views/conversation/content/global.vue b/linkwe-ui/src/views/conversation/content/global.vue
new file mode 100644
index 0000000000000000000000000000000000000000..7275b88849e38c3c927c609536fc748b0dab4f58
--- /dev/null
+++ b/linkwe-ui/src/views/conversation/content/global.vue
@@ -0,0 +1,294 @@
+<template>
+  <div>
+    <el-form :inline="true" :model="query" class="top-serach">
+      <el-form-item label="员工名称">
+        <el-input
+          v-model="query.userName"
+          clearable
+          placeholder="客户名称"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="客户名称">
+        <el-input
+          v-model="query.customerName"
+          clearable
+          placeholder="客户名称"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="查找内容">
+        <el-input
+          v-model="query.contact"
+          clearable
+          placeholder="查找内容"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="时间范围">
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          align="right"
+          :picker-options="pickerOptions"
+        >
+        </el-date-picker>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button type="primary" @click="getList(1)">查询</el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="exportList()">导出列表</el-button>
+      </el-form-item>
+    </el-form>
+    <div>
+      <el-table
+        v-loading="loading"
+        :data="fileData"
+        :header-cell-style="{ background: '#fff' }"
+      >
+        <el-table-column prop="date" label="发送者" width="180">
+          <template slot-scope="scope">
+            <p v-if="scope.row">{{ scope.row.name }}</p>
+          </template>
+        </el-table-column>
+        <el-table-column prop="name" label=" 内容">
+          <template slot-scope="{ row }">
+            <ChatContent :message="row"></ChatContent>
+          </template>
+        </el-table-column>
+        <el-table-column label="消息状态" width="200">
+          <template slot="header">
+            {{ floorRange }}
+            <el-select
+              size="mini"
+              v-model="floorRange"
+              class="noborder"
+              @change="chechName(floorRange)"
+            >
+              <el-option
+                v-for="item in displayOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </template>
+          <template slot-scope="scope">
+            <div class="pers">
+              <span v-if="scope.row.action == ''"> </span>
+              <span v-else-if="scope.row.action == 'send'">
+                <span class="green"></span>
+                已发送
+              </span>
+              <span v-else-if="scope.row.action == 'recall'">
+                <span class="red"></span>
+                已撤回
+              </span>
+              <span v-else-if="scope.row.action == 'switch'">
+                <span class="gay"></span>
+                企业日志
+              </span>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="address" label="发送时间" width="200">
+          <template slot-scope="scope">
+            {{ scope.row.msgTime }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        background
+        class="pagination"
+        layout="prev, pager, next"
+        :total="total"
+        @current-change="getList"
+        :current-page.sync="query.pageNum"
+      >
+      </el-pagination>
+    </div>
+  </div>
+</template>
+<script>
+import { getChatList, exportList } from '@/api/conversation/content.js'
+import ChatContent from '@/components/ChatContent'
+export default {
+  components: { ChatContent },
+  data() {
+    return {
+      query: {
+        userName: '',
+        customerName: '',
+        contact: '',
+        beginTime: '',
+        endTime: '',
+        pageNum: 1,
+        pageSize: 10
+      },
+      dateRange: [],
+      total: 0,
+      ac: '',
+      fileData: [],
+      floorRange: '全部',
+      displayOptions: [
+        {
+          value: '',
+          label: '全部'
+        },
+        {
+          value: 'send',
+          label: '已发送'
+        },
+        {
+          value: 'recall',
+          label: '已撤回'
+        },
+        {
+          value: 'switch',
+          label: '切回企业日志'
+        }
+      ],
+      loading: false
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    getList(page) {
+      if (this.dateRange) {
+        this.query.beginTime = this.dateRange[0]
+        this.query.endTime = this.dateRange[1]
+      } else {
+        this.query.beginTime = ''
+        this.query.endTime = ''
+      }
+      page && (this.query.pageNum = page)
+      this.loading = true
+      // let query = {
+      //   name: this.form.userName,
+      //   customerName: this.form.customerName,
+      //   contact: this.form.contact,
+      //   beginTime: this.form.Stime ? yearMouthDay(this.form.Stime[0]) : '',
+      //   endTime: this.form.Stime ? yearMouthDay(this.form.Stime[1]) : '',
+      //   pageNum: this.query.pageNum,
+      //   pageSize: 10,
+      //   action: this.ac,
+      //   orderByColumn: 'msg_time',
+      //   isAsc: 'desc'
+      // }
+
+      getChatList(this.query)
+        .then((res) => {
+          this.fileData = res.rows
+          this.total = ~~res.total
+          this.loading = false
+        })
+        .catch(() => {
+          this.loading = false
+        })
+    },
+    chechName(e) {
+      if (e == '') {
+        this.floorRange = '全部'
+        this.ac = ''
+      } else if (e == 'send') {
+        this.floorRange = '已发送'
+        this.ac = 'send'
+      } else if (e == 'recall') {
+        this.floorRange = '已撤回'
+        this.ac = 'recall'
+      } else {
+        this.floorRange = '切回企业日志'
+        this.ac = 'switch'
+      }
+      console.log(e, this.ac)
+      this.getList()
+    },
+    parseMesContent(data, type) {
+      let contact = JSON.parse(data)
+      let typeDict = {
+        text: 'content',
+        image: 'attachment',
+        text: 'content'
+      }
+      return contact[type]
+    },
+    exportList() {
+      this.$confirm('是否确认导出所有数据项?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          return exportList(this.query)
+        })
+        .then((response) => {
+          this.download(response.msg)
+        })
+        .catch(function() {})
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.demo-form-inline {
+  background: #f1f1f1;
+  padding: 18px 10px 0 10px;
+}
+
+.content {
+  margin-top: 15px;
+  padding: 10px;
+}
+
+.pers {
+  position: relative;
+
+  .green {
+    background: greenyellow;
+    position: absolute;
+    width: 6px;
+    height: 6px;
+    border-radius: 50%;
+    top: 10px;
+    left: -8px;
+  }
+
+  .red {
+    background: red;
+    position: absolute;
+    width: 6px;
+    height: 6px;
+    border-radius: 50%;
+    top: 10px;
+    left: -8px;
+  }
+
+  .gay {
+    background: gray;
+    position: absolute;
+    width: 6px;
+    height: 6px;
+    border-radius: 50%;
+    top: 10px;
+    left: -8px;
+  }
+}
+
+.noborder {
+  /deep/ .el-input--mini .el-input__inner {
+    width: 2px;
+    border: none;
+  }
+}
+
+.emcode /deep/ em {
+  color: #ff0000;
+}
+</style>
diff --git a/linkwe-ui/src/views/conversation/content.vue b/linkwe-ui/src/views/conversation/content/index.vue
similarity index 70%
rename from linkwe-ui/src/views/conversation/content.vue
rename to linkwe-ui/src/views/conversation/content/index.vue
index 846e327fcdafa83c152db136218df87eed7a35a9..ad4a2dfec39cc2f38398c0d40d02cc6da7f400db 100644
--- a/linkwe-ui/src/views/conversation/content.vue
+++ b/linkwe-ui/src/views/conversation/content/index.vue
@@ -8,17 +8,17 @@
         <user v-if="activeName == 2"></user>
       </el-tab-pane>
       <el-tab-pane label="全局检索" name="3">
-        <role v-if="activeName == 3"></role>
+        <global v-if="activeName == 3"></global>
       </el-tab-pane>
     </el-tabs>
   </div>
 </template>
 <script>
-import employee from './page/employeeTest.vue'
-import user from './page/userTest.vue'
-import role from './page/roleTest.vue'
+import employee from './employee.vue'
+import user from './customer.vue'
+import global from './global.vue'
 export default {
-  components: { employee, user, role },
+  components: { employee, user, global },
   data() {
     return {
       activeName: '1'
@@ -31,6 +31,8 @@ export default {
   }
 }
 </script>
-<style scoped>
-/* *{margin: 0;padding: 0;} */
+<style lang="scss" scoped>
+/deep/.pd15 {
+  padding: 15px;
+}
 </style>
diff --git a/linkwe-ui/src/views/conversation/page/employeeTest.vue b/linkwe-ui/src/views/conversation/page/employeeTest.vue
deleted file mode 100644
index 855e0e31c4d23f66aad080f548e1623988731084..0000000000000000000000000000000000000000
--- a/linkwe-ui/src/views/conversation/page/employeeTest.vue
+++ /dev/null
@@ -1,593 +0,0 @@
-<template>
-  <div class="employ">
-    <el-row>
-      <el-col :span="6" class="borderR">
-        <!-- <div class="hd_box">
-          <div class="hd_name">成员（{{employAmount}}）</div>
-          <div class="paddingT10">
-            <el-input placeholder="请输入内容" prefix-icon="el-icon-search" v-model="employName">
-            </el-input>
-          </div>
-        </div> -->
-        <div class="ct_box ct_boxFirst">
-          <el-tree
-            class="filter-tree"
-            :data="treeData"
-            :props="defaultProps"
-            :filter-node-method="filterNode"
-            ref="tree"
-            @node-click="handleNodeClick"
-            :default-expand-all="true"
-          >
-          </el-tree>
-        </div>
-      </el-col>
-      <el-col :span="6" class="borderR">
-        <div class="hd_box">
-          <div class="hd_name">{{ talkName }}</div>
-        </div>
-        <div class="hd_tabs">
-          <el-tabs v-model="activeName" @tab-click="tabClick(true)">
-            <el-tab-pane label="内部联系人" name="0">
-              <div class="ct_box">
-                <insideList
-                  v-if="activeName == 0"
-                  :personList="personList"
-                  :loading="loading"
-                  @chatFn="chatFn"
-                >
-                </insideList>
-              </div>
-            </el-tab-pane>
-            <el-tab-pane label="外部联系人" name="1">
-              <list
-                v-if="activeName == 1"
-                :personList="personList"
-                :loading="loading"
-                @chatFn="chatFn"
-              >
-              </list>
-            </el-tab-pane>
-            <el-tab-pane label="群聊" name="2">
-              <grouplist
-                v-if="activeName == 2"
-                :personList="personList"
-                :loading="loading"
-                @groupFn="groupFn"
-              >
-              </grouplist>
-            </el-tab-pane>
-          </el-tabs>
-        </div>
-      </el-col>
-      <el-col :span="12">
-        <div class="hd_box">
-          <div class="hd_name">
-            <span v-if="chat.receiveWeCustomer">
-              与{{ chat.receiveWeCustomer.name }}的聊天</span
-            >
-            <span class="fr hd_nameRi">下载会话</span>
-          </div>
-        </div>
-        <div class=" hd_tabthree">
-          <el-tabs
-            v-model="activeNameThree"
-            @tab-click="activeNameThreeClick()"
-          >
-            <el-tab-pane label="全部" name="0">
-              <div class="ct_box">
-                <div class="hds_time">
-                  <el-date-picker
-                    v-model="takeTime"
-                    type="datetimerange"
-                    format="yyyy-MM-dd"
-                    range-separator="至"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                    align="right"
-                    @change="activeNameThreeClick"
-                  >
-                  </el-date-picker>
-                </div>
-                <chat
-                  :allChat="allChat"
-                  v-if="allChat && allChat.length >= 1"
-                ></chat>
-                <el-pagination
-                  background
-                  v-if="allChat && allChat.length >= 1"
-                  layout="prev, pager, next"
-                  class="pagination"
-                  :current-page="currentPage"
-                  @current-change="currentChange"
-                  :total="total"
-                >
-                </el-pagination>
-              </div>
-            </el-tab-pane>
-            <el-tab-pane label="图片及视频" name="1">
-              <div class="ct_box">
-                <div class="hds_time">
-                  <el-date-picker
-                    v-model="takeTime"
-                    type="datetimerange"
-                    format="yyyy-MM-dd"
-                    range-separator="至"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                    align="right"
-                    @change="activeNameThreeClick"
-                  >
-                  </el-date-picker>
-                </div>
-                <chat
-                  :allChat="allChatImg"
-                  v-if="allChatImg && allChatImg.length >= 1"
-                ></chat>
-                <el-pagination
-                  background
-                  v-if="allChatImg && allChatImg.length >= 1"
-                  class="pagination"
-                  layout="prev, pager, next"
-                  :total="total"
-                  @current-change="currentChange"
-                  :current-page="currentPage"
-                >
-                </el-pagination>
-              </div>
-            </el-tab-pane>
-            <el-tab-pane label="文件" name="2">
-              <div class="ct_box">
-                <div class="hds_time">
-                  <el-date-picker
-                    v-model="takeTime"
-                    type="datetimerange"
-                    format="yyyy-MM-dd"
-                    range-separator="至"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                    align="right"
-                    @change="activeNameThreeClick"
-                  >
-                  </el-date-picker>
-                </div>
-                <el-table
-                  :data="allFile"
-                  stripe
-                  style="width: 100%"
-                  :header-cell-style="{ background: '#fff' }"
-                >
-                  <el-table-column prop="msgtype" label="类型">
-                  </el-table-column>
-                  <el-table-column label="名称">
-                    <template slot-scope="scope">
-                      {{ scope.row.file.filename }}
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="大小">
-                    <template slot-scope="scope">
-                      {{ filterSize(scope.row.file.filesize) }}
-                    </template>
-                  </el-table-column>
-                  <el-table-column prop="action" label="来源">
-                    <template slot-scope="scope">
-                      {{ scope.row.tolist[0] }}
-                    </template>
-                  </el-table-column>
-                  <el-table-column prop="action" label="操作">
-                    <template slot-scope="scope">
-                      <el-button
-                        type="text"
-                        size="small"
-                        @click="downloadFile(scope.row)"
-                        >下载</el-button
-                      >
-                    </template>
-                  </el-table-column>
-                </el-table>
-              </div>
-            </el-tab-pane>
-            <el-tab-pane label="链接" name="3">
-              <div class="ct_box">
-                <div class="hds_time">
-                  <el-date-picker
-                    v-model="takeTime"
-                    type="datetimerange"
-                    format="yyyy-MM-dd"
-                    range-separator="至"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                    align="right"
-                    @change="activeNameThreeClick"
-                  >
-                  </el-date-picker>
-                </div>
-              </div>
-            </el-tab-pane>
-            <el-tab-pane label="语音通话" name="4">
-              <div class="ct_box">
-                <div class="hds_time">
-                  <el-date-picker
-                    v-model="takeTime"
-                    type="datetimerange"
-                    format="yyyy-MM-dd"
-                    range-separator="至"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                    align="right"
-                    @change="activeNameThreeClick"
-                  >
-                  </el-date-picker>
-                </div>
-                <el-table
-                  :data="allVoice"
-                  stripe
-                  style="width: 100%"
-                  :header-cell-style="{ background: '#fff' }"
-                >
-                  <el-table-column prop="date" label="发起人">
-                    <template slot-scope="scope">
-                      {{ scope.row.name }}
-                    </template>
-                  </el-table-column>
-                  <el-table-column prop="name" label="通话时间">
-                    <template slot-scope="scope">
-                      {{ scope.row.msgTime }}
-                    </template>
-                  </el-table-column>
-                  <el-table-column prop="address" label="时长">
-                    <template slot-scope="scope">
-                      {{ JSON.parse(scope.row.contact).play_length }}s
-                    </template>
-                  </el-table-column>
-                  <el-table-column prop="address" label="操作">
-                    <template slot-scope="scope">
-                      <el-button
-                        type="text"
-                        size="small"
-                        @click="voiceLook(JSON.parse(scope.row.contact))"
-                        >查看</el-button
-                      >
-                    </template>
-                  </el-table-column>
-                </el-table>
-              </div>
-            </el-tab-pane>
-          </el-tabs>
-        </div>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-<script>
-import list from '../component/list.vue'
-import chat from '../component/chat.vue'
-import insideList from '../component/insideList.vue'
-import grouplist from '../component/groupList.vue'
-import * as api from '@/api/organization'
-import { content } from '@/api/conversation/content.js'
-import { yearMouthDay, parseTime } from '@/utils/common.js'
-
-export default {
-  components: {
-    list,
-    grouplist,
-    insideList,
-    chat
-  },
-  data() {
-    return {
-      employAmount: 1,
-      fromId: '',
-      employName: '',
-      talkName: '',
-      treeData: [],
-      defaultProps: {
-        label: 'name',
-        children: 'children'
-      },
-      activeName: '1',
-      activeNameThree: '0',
-      takeTime: '',
-      fileData: [],
-      chat: {},
-
-      personList: [],
-      loading: false,
-      allChat: [], //全部聊天记录
-      allChatImg: [], //图片，
-      allVoice: [],
-      allFile: [],
-      allLInk: [],
-      //分页
-      total: '',
-      currentPage: ''
-    }
-  },
-  watch: {
-    employName(val) {
-      this.$refs.tree.filter(val)
-    }
-  },
-  mounted() {
-    this.getTree()
-    //this.getAmount()
-  },
-  methods: {
-    voiceLook(e) {
-      const url = window.URL.createObjectURL(new Blob([e.attachment]))
-      const link = document.createElement('a')
-      link.href = url
-      link.setAttribute('download', 'yuyin') // 下载文件的名称及文件类型后缀
-      document.body.appendChild(link)
-      link.click()
-      document.body.removeChild(link) // 下载完成移除元素
-      window.URL.revokeObjectURL(url) // 释放掉blob对象
-    },
-    downloadFile(e) {
-      const url = window.URL.createObjectURL(
-        new Blob([e.file.attachment], {
-          type:
-            'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8'
-        })
-      )
-      const link = document.createElement('a')
-      link.href = url
-      link.setAttribute('download', e.file.filename) // 下载文件的名称及文件类型后缀
-      document.body.appendChild(link)
-      link.click()
-      document.body.removeChild(link) // 下载完成移除元素
-      window.URL.revokeObjectURL(url) // 释放掉blob对象
-    },
-    filterSize(size) {
-      if (!size) return ''
-      if (size < this.pow1024(1)) return size + ' B'
-      if (size < this.pow1024(2))
-        return (size / this.pow1024(1)).toFixed(2) + ' KB'
-      if (size < this.pow1024(3))
-        return (size / this.pow1024(2)).toFixed(2) + ' MB'
-      if (size < this.pow1024(4))
-        return (size / this.pow1024(3)).toFixed(2) + ' GB'
-      return (size / pow1024(4)).toFixed(2) + ' TB'
-    },
-    pow1024(num) {
-      return Math.pow(1024, num)
-    },
-    currentChange(e) {
-      this.currentPage = e
-      if (this.activeName == '2') {
-        return this.activeNameThreeClick(true, true)
-      }
-
-      this.activeNameThreeClick(true)
-    },
-    activeNameThreeClick(page, group) {
-      console.log(this.chat.receiver,this.fromId, 'this.chat.id')
-      if (!!!this.chat.receiver) {
-        return //没有选择人
-      }
-      if (!!!page) {
-        this.currentPage = 1
-      }
-      if (this.chat) {
-        let msgType = ''
-        if (this.activeNameThree == 0) {
-          msgType = ''
-        } else if (this.activeNameThree == 1) {
-          msgType = 'image'
-        } else if (this.activeNameThree == 2) {
-          msgType = 'file'
-        } else if (this.activeNameThree == 3) {
-          msgType = 'link'
-        } else if (this.activeNameThree == 4) {
-          msgType = 'voice'
-        }
-        let query = {
-          msgType,
-          pageSize: '10',
-          pageNum: this.currentPage,
-          orderByColumn: "msg_time",
-          isAsc: "asc",
-          beginTime: this.takeTime ? yearMouthDay(this.takeTime[0]) : '',
-          endTime: this.takeTime ? yearMouthDay(this.takeTime[1]) : ''
-        }
-        if (this.activeName != '2') {
-          query.fromId = this.fromId
-          query.toList =  this.chat.receiver
-        }else {
-          query.roomId =  this.chat.receiver
-        }
-        content.chatList(query).then((res) => {
-          console.log(res.rows, 'ssss')
-          this.total = Number(res.total)
-          this.resortData(res)
-        })
-      }
-    },
-    resortData(res) {
-      if (this.activeNameThree == 0) {
-        return (this.allChat = res.rows)
-      }
-      if (this.activeNameThree == 1) {
-        return (this.allChatImg = res.rows)
-      }
-      if (this.activeNameThree == 2) {
-        return (this.allFile = res.rows)
-      }
-      if (this.activeNameThree == 3) {
-        return (this.allLInk = res.rows)
-      }
-      if (this.activeNameThree == 4) {
-        return (this.allVoice = res.rows)
-      }
-    },
-    chatFn(data) {
-      this.chat = data
-      if (data) {
-        this.activeNameThreeClick()
-      }
-    },
-    groupFn(data) {
-      this.chat = data
-      this.chat.receiveWeCustomer = 'a'
-      this.activeNameThreeClick('', true)
-    },
-    getTree() {
-      api.getTree().then(({ data }) => {
-        this.treeData = this.handleTree(data)
-        this.handleNodeClick(this.treeData[0], true)
-      })
-    },
-    tabClick(flag) {
-      this.personList = []
-      if (!this.fromId) {
-        return
-      }
-      if (flag) {
-        this.loading = true
-      }
-      if(this.activeName == 0){
-        content
-          .getInternalChatList({
-            fromId: this.fromId
-          })
-          .then(({ data }) => {
-            this.loading = false
-            this.personList = data
-          })
-          .catch((err) => {
-            this.loading = false
-          })
-      }else if(this.activeName == 1){
-        content
-          .getExternalChatList({
-            fromId: this.fromId
-          })
-          .then(({ data }) => {
-            this.loading = false
-            this.personList = data
-          })
-          .catch((err) => {
-            this.loading = false
-          })
-      }else {
-        content
-          .getGroupChatList({
-            fromId: this.fromId
-          })
-          .then(({ data }) => {
-            this.loading = false
-            this.personList = data
-          })
-          .catch((err) => {
-            this.loading = false
-          })
-      }
-
-    },
-    filterNode(value, data) {
-      console.log(value, data)
-      if (!value) return true
-      return data.name.indexOf(value) !== -1
-    },
-
-    handleNodeClick(data, add) {
-      if (!data.userId) {
-        let querys = {
-          pageNum: '1',
-          pageSize: '999',
-          department: data.id
-        }
-        api.getList(querys).then(({ rows }) => {
-          this.$set(data, 'children', [])
-
-          data.children = rows
-        })
-      } else {
-        this.talkName = data.name
-        this.fromId = data.userId
-        this.tabClick()
-      }
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-/deep/.el-tabs__nav-scroll {
-  padding-left: 15px;
-}
-
-.borderR {
-  border-right: 2px solid #ccc;
-}
-
-.paddingT10 {
-  padding-top: 10px;
-}
-
-.employ {
-  background: #f6f6f9;
-  min-height: 800px;
-
-  .hd_tabs {
-    background: #fff;
-
-    /deep/ .el-tabs__header {
-      margin: 0;
-    }
-  }
-
-  .hd_tabthree {
-    /deep/ .el-tabs__header {
-      margin: 0;
-    }
-  }
-
-  .hd_box {
-    padding: 15px;
-  }
-
-  .hd_name {
-    font-size: 18px;
-    min-height: 20px;
-  }
-
-  .hd_nameRi {
-    color: #199ed8;
-    text-align: right;
-    font-size: 16px;
-    cursor: pointer;
-  }
-
-  .ct_boxFirst {
-    height: 800px !important;
-  }
-
-  .ct_box {
-    background: white;
-    height: 710px;
-    padding: 10px;
-    overflow-y: scroll;
-    border-bottom: 1px solid #efefef;
-    color: #999;
-    text-align: center;
-
-    ::-webkit-scrollbar {
-      display: none;
-    }
-
-    .hds_time {
-      text-align: left;
-      width: 100%;
-      padding: 10px 0;
-    }
-  }
-}
-
-.pagination {
-  padding: 10px 0;
-  height: 30px;
-
-  float: left;
-}
-</style>
diff --git a/linkwe-ui/src/views/conversation/page/roleTest.vue b/linkwe-ui/src/views/conversation/page/roleTest.vue
deleted file mode 100644
index 2f029e83c173c938247d08573f0fb28056bce161..0000000000000000000000000000000000000000
--- a/linkwe-ui/src/views/conversation/page/roleTest.vue
+++ /dev/null
@@ -1,230 +0,0 @@
-<template>
-  <div>
-    <el-form :inline="true" :model="form" class="demo-form-inline">
-      <el-row>
-        <el-form-item label="员工名称">
-          <el-input v-model="form.Ename" placeholder="客户名称" style="width:300px"></el-input>
-        </el-form-item>
-        <el-form-item label="客户名称">
-          <el-input v-model="form.Cname" placeholder="客户名称" style="width:300px"></el-input>
-        </el-form-item>
-      </el-row>
-      <el-row>
-        <el-form-item label="查找内容">
-          <el-input v-model="form.Scontent" placeholder="查找内容" style="width:300px"></el-input>
-        </el-form-item>
-        <el-form-item label="时间范围">
-          <el-date-picker v-model="form.Stime" type="datetimerange" format='yyyy-MM-dd' range-separator="至"
-            start-placeholder="开始日期" end-placeholder="结束日期" align="right">
-          </el-date-picker>
-        </el-form-item>
-      </el-row>
-      <el-row>
-        <el-form-item>
-          <el-button type="primary" @click="init">查询</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button>导出列表</el-button>
-        </el-form-item>
-      </el-row>
-    </el-form>
-    <div class="content">
-      <el-table :data="fileData" stripe style="width: 100%" :header-cell-style="{background:'#fff'}">
-        <el-table-column prop="date" label="发送者" width="180">
-          <template slot-scope="scope">
-            <p v-if="scope.row">{{scope.row.name}}</p>
-          </template>
-        </el-table-column>
-        <el-table-column prop="name" label=" 内容">
-          <template slot-scope="scope">
-            <p v-if="!!scope.row.contact" class="emcode" v-html="scope.row.contact"></p>
-            <p v-else-if="!!!scope.row.contact&&scope.row.text">{{JSON.parse(scope.row.contact).content}}</p>
-          </template>
-        </el-table-column>
-        <el-table-column label="消息状态" width="200">
-          <template slot="header">
-            {{floorRange}}
-            <el-select size="mini" v-model="floorRange" class="noborder" @change="chechName(floorRange)">
-              <el-option v-for="item in displayOptions" :key="item.value" :label="item.label" :value="item.value">
-              </el-option>
-            </el-select>
-          </template>
-          <template slot-scope="scope">
-            <div class="pers">
-              <span v-if="scope.row.action==''">
-              </span>
-              <span v-else-if="scope.row.action=='send'">
-                <span class="green"></span>
-                已发送
-              </span>
-              <span v-else-if="scope.row.action=='recall'">
-                <span class="red"></span>
-                已撤回
-              </span>
-              <span v-else-if="scope.row.action=='switch'">
-                <span class="gay"></span>
-                企业日志
-              </span>
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="address" label="发送时间" width="200">
-          <template slot-scope="scope">
-            {{ scope.row.msgTime }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination background class="pagination" layout="prev, pager, next" :total="total"
-        @current-change="currentChange" :current-page="currentPage">
-      </el-pagination>
-    </div>
-  </div>
-</template>
-<script>
-  import {
-    content
-  } from '@/api/conversation/content.js'
-  import {
-    yearMouthDay,
-    parseTime
-  } from '@/utils/common.js'
-  export default {
-    data() {
-      return {
-        form: {
-          Ename: "",
-          Cname: '',
-          Scontent: '',
-          Stime: ''
-        },
-        currentPage: 1,
-        total: 0,
-        ac: '',
-        fileData: [],
-        floorRange: '全部',
-        displayOptions: [{
-            value: "",
-            label: "全部"
-          },
-          {
-            value: "send",
-            label: "已发送"
-          },
-          {
-            value: "recall",
-            label: "已撤回"
-          },
-          {
-            value: "switch",
-            label: "切回企业日志"
-          }
-        ]
-      }
-    },
-    mounted() {
-      this.init()
-    },
-    methods: {
-      currentChange(e) {
-        this.currentPage = e
-        this.init(true)
-      },
-      init(flag) {
-        if (!!!flag) {
-          this.currentPage = 1
-        }
-        let query = {
-          name: this.form.Ename,
-          customerName: this.form.Cname,
-          contact: this.form.Scontent,
-          beginTime: this.form.Stime ? yearMouthDay(this.form.Stime[0]) : "",
-          endTime: this.form.Stime ? yearMouthDay(this.form.Stime[1]) : "",
-          pageNum: this.currentPage,
-          action: this.ac,
-          orderByColumn: "msg_time",
-          isAsc: "desc"
-        }
-        content.getFullSearchChatList(query).then(res => {
-          this.fileData = res.rows;
-          this.total = Number(res.total)
-        })
-      },
-      chechName(e) {
-        if (e == '') {
-          this.floorRange = '全部'
-          this.ac = ''
-        } else if (e == 'send') {
-          this.floorRange = '已发送'
-          this.ac = 'send'
-        } else if (e == 'recall') {
-          this.floorRange = '已撤回'
-          this.ac = 'recall'
-        } else {
-          this.floorRange = '切回企业日志'
-          this.ac = 'switch'
-        }
-        console.log(e,this.ac)
-     this.init()
-      }
-    }
-  }
-
-</script>
-<style lang="scss" scoped>
-  .demo-form-inline {
-    background: #f1f1f1;
-    padding: 18px 10px 0 10px;
-  }
-
-  .content {
-    margin-top: 15px;
-    padding: 10px;
-  }
-
-  .pers {
-    position: relative;
-
-    .green {
-      background: greenyellow;
-      position: absolute;
-      width: 6px;
-      height: 6px;
-      border-radius: 50%;
-      top: 10px;
-      left: -8px;
-    }
-
-    .red {
-      background: red;
-      position: absolute;
-      width: 6px;
-      height: 6px;
-      border-radius: 50%;
-      top: 10px;
-      left: -8px;
-    }
-
-    .gay {
-      background: gray;
-      position: absolute;
-      width: 6px;
-      height: 6px;
-      border-radius: 50%;
-      top: 10px;
-      left: -8px;
-    }
-  }
-
-
-  .noborder {
-    /deep/ .el-input--mini .el-input__inner {
-      width: 2px;
-      border: none
-    }
-  }
-
-  .emcode /deep/ em {
-    color: #ff0000;
-  }
-
-</style>
diff --git a/linkwe-ui/src/views/conversation/page/userTest.vue b/linkwe-ui/src/views/conversation/page/userTest.vue
deleted file mode 100644
index 32f9d8abad97fcd232791d8d3416bcf66d7b9729..0000000000000000000000000000000000000000
--- a/linkwe-ui/src/views/conversation/page/userTest.vue
+++ /dev/null
@@ -1,528 +0,0 @@
-<template>
-  <div class="employ">
-    <el-row>
-      <el-col :span="6" class="borderR">
-        <div class="hd_box">
-          <div class="hd_name">客户列表（{{ employAmount }}）</div>
-          <div class="paddingT10">
-            <el-input
-              placeholder="搜索客户"
-              prefix-icon="el-icon-search"
-              v-model="employName"
-              @keyup.enter.native="customerList"
-            >
-            </el-input>
-          </div>
-        </div>
-        <div class="ct_box ct_boxFirst">
-          <ul>
-            <li
-              v-for="(i, t) in CList"
-              :key="t"
-              @click="personCheck(i, t)"
-              :class="{ liActive: t == personIndex }"
-            >
-              <el-row :gutter="20" style="   padding: 10px 0;margin:0">
-                <el-col :span="4">
-                  <img v-if="i.avatar" :src="i.avatar" alt="头像" />
-                </el-col>
-                <el-col :span="20" v-if="i"
-                  ><span style="line-height:40px">{{ i.name }}</span></el-col
-                >
-              </el-row>
-            </li>
-          </ul>
-        </div>
-      </el-col>
-      <el-col :span="6" class="borderR">
-        <div class="hd_box">
-          <div class="hd_name">{{ talkName }}</div>
-          <div class="paddingT10">
-            <el-input
-              placeholder="搜索聊天记录"
-              prefix-icon="el-icon-search"
-              v-model="chatContent"
-              @keyup.enter.native="chatMsgList"
-            >
-            </el-input>
-          </div>
-        </div>
-        <div class="hd_tabs">
-          <el-tabs v-model="activeName" @tab-click="getChatList()">
-            <el-tab-pane label="单聊" name="0">
-              <div class="hd_tabs_content">
-                <list
-                  v-if="activeName == 0"
-                  :personList="personList"
-                  :loading="loading"
-                  @chatFn="chatFn"
-                >
-                </list>
-              </div>
-            </el-tab-pane>
-            <el-tab-pane label="群聊" name="2">
-              <grouplist
-                v-if="activeName == 2"
-                :personList="personList"
-                :loading="loading"
-                @groupFn="groupFn"
-              >
-              </grouplist>
-            </el-tab-pane>
-          </el-tabs>
-        </div>
-      </el-col>
-      <el-col :span="12">
-        <div class="hd_box">
-          <div class="hd_name">
-            <!-- <span
-              v-if="chatData&&chatData.finalChatContext">与{{chatData.finalChatContext.fromInfo.name}} 的聊天</span> -->
-            <!-- 判断 activeName-->
-            <span class="fr hd_nameRi">下载会话</span>
-          </div>
-        </div>
-        <div class=" hd_tabthree">
-          <el-tabs
-            v-model="activeNameThree"
-            @tab-click="activeNameThreeClick()"
-          >
-            <el-tab-pane label="全部" name="0">
-              <div class="ct_box">
-                <div class="hds_time">
-                  <el-date-picker
-                    v-model="takeTime"
-                    type="datetimerange"
-                    format="yyyy-MM-dd"
-                    range-separator="至"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                    align="right"
-                    @change="activeNameThreeClick"
-                  >
-                  </el-date-picker>
-                </div>
-                ~
-                <chats :allChat="allChat" v-if="allChat.length >= 1"></chats>
-                <el-pagination
-                  background
-                  v-if="allChat.length >= 1"
-                  layout="prev, pager, next"
-                  class="pagination"
-                  :current-page="currentPage"
-                  @current-change="currentChange"
-                  :total="total"
-                >
-                </el-pagination>
-              </div>
-            </el-tab-pane>
-            <el-tab-pane label="图片及视频" name="1">
-              <div class="ct_box">
-                <div class="hds_time">
-                  <el-date-picker
-                    v-model="takeTime"
-                    type="datetimerange"
-                    format="yyyy-MM-dd"
-                    range-separator="至"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                    align="right"
-                    @change="activeNameThreeClick"
-                  >
-                  </el-date-picker>
-                </div>
-                <!-- <chat :allChat="allChatImg" v-if="allChatImg.length>=1"></chat> -->
-                <el-pagination
-                  background
-                  v-if="allChatImg.length >= 1"
-                  class="pagination"
-                  layout="prev, pager, next"
-                  :total="total"
-                  @current-change="currentChange"
-                  :current-page="currentPage"
-                >
-                </el-pagination>
-              </div>
-            </el-tab-pane>
-            <el-tab-pane label="文件" name="2">
-              <div class="ct_box">
-                <div class="hds_time">
-                  <el-date-picker
-                    v-model="takeTime"
-                    type="datetimerange"
-                    format="yyyy-MM-dd"
-                    range-separator="至"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                    align="right"
-                    @change="activeNameThreeClick"
-                  >
-                  </el-date-picker>
-                </div>
-                <el-table
-                  :data="allFile"
-                  stripe
-                  style="width: 100%"
-                  :header-cell-style="{ background: '#fff' }"
-                >
-                  <el-table-column prop="msgtype" label="类型">
-                  </el-table-column>
-                  <el-table-column label="名称">
-                    <template slot-scope="scope">
-                      {{ scope.row.file.filename }}
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="大小">
-                    <template slot-scope="scope">
-                      {{ filterSize(scope.row.file.filesize) }}
-                    </template>
-                  </el-table-column>
-                  <el-table-column prop="action" label="来源">
-                    <template slot-scope="scope">
-                      {{ scope.row.tolist[0] }}
-                    </template>
-                  </el-table-column>
-                  <el-table-column prop="action" label="操作">
-                    <template>
-                      <el-button type="text" size="small">下载</el-button>
-                      <el-button type="text" size="small">查看</el-button>
-                    </template>
-                  </el-table-column>
-                </el-table>
-              </div>
-            </el-tab-pane>
-            <el-tab-pane label="链接" name="3">
-              <div class="ct_box">
-                <div class="hds_time">
-                  <el-date-picker
-                    v-model="takeTime"
-                    type="datetimerange"
-                    format="yyyy-MM-dd"
-                    range-separator="至"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                    align="right"
-                    @change="activeNameThreeClick"
-                  >
-                  </el-date-picker>
-                </div>
-              </div>
-            </el-tab-pane>
-            <el-tab-pane label="语音通话" name="4">
-              <div class="ct_box">
-                <div class="hds_time">
-                  <el-date-picker
-                    v-model="takeTime"
-                    type="datetimerange"
-                    format="yyyy-MM-dd"
-                    range-separator="至"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                    align="right"
-                    @change="activeNameThreeClick"
-                  >
-                  </el-date-picker>
-                </div>
-                <el-table
-                  :data="fileData"
-                  stripe
-                  style="width: 100%"
-                  :header-cell-style="{ background: '#fff' }"
-                >
-                  <el-table-column prop="date" label="发起人">
-                  </el-table-column>
-                  <el-table-column prop="name" label="通话时间">
-                  </el-table-column>
-                  <el-table-column prop="address" label="时长">
-                  </el-table-column>
-                  <el-table-column prop="address" label="操作">
-                  </el-table-column>
-                </el-table>
-              </div>
-            </el-tab-pane>
-          </el-tabs>
-        </div>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-<script>
-import list from '../component/customerList.vue'
-import chats from '../component/chat.vue'
-
-import grouplist from '../component/groupList.vue'
-import { content } from '@/api/conversation/content.js'
-import { yearMouthDay } from '@/utils/common.js'
-export default {
-  components: {
-    list,
-    chats,
-    grouplist
-  },
-  data() {
-    return {
-      employAmount: 1,
-      employName: '',
-      talkName: '',
-      chatContent: '',
-      personIndex: '-1',
-      activeName: '0',
-      activeNameThree: '0',
-      takeTime: '',
-      fileData: [],
-      CList: [],
-      personList: [],
-      loading: false,
-      fromId: '',
-      chatData: {},
-
-      allChat: [],
-      allChatImg: [],
-      allFile: [],
-      allLInk: [],
-      allVoice: [],
-      //分页
-      currentPage: 1,
-      total: 0
-    }
-  },
-
-  methods: {
-    chatFn(data) {
-      this.chatData = data
-      console.log(data,"<><><><>><")
-      this.activeNameThreeClick()
-    },
-    groupFn(data) {
-      this.chatData = data
-      this.activeNameThreeClick('', true)
-    },
-    currentChange(e) {
-      this.currentPage = e
-      if (this.activeName == '2') {
-        return this.activeNameThreeClick(true, true)
-      }
-      this.activeNameThreeClick(true)
-    },
-    personCheck(data, e) {
-      this.personIndex = e
-      this.talkName = data.name
-      this.fromId = data.externalUserid
-      this.getChatList()
-    },
-    getChatList(flag) {
-      if (!this.fromId) {
-        return
-      }
-      if (flag) {
-        this.loading = true
-      }
-      this.personList = []
-      if(this.activeName == '0'){
-        content
-          .selectAloneChatList({
-            fromId: this.fromId,
-            contact: this.chatContent
-          })
-          .then(({ data }) => {
-            this.loading = false
-            this.personList = data
-          })
-          .catch((err) => {
-            this.loading = false
-          })
-      }else {
-        content
-          .getGroupChatList({
-            fromId: this.fromId
-          })
-          .then(({ data }) => {
-            this.loading = false
-            this.personList = data
-          })
-          .catch((err) => {
-            this.loading = false
-          })
-      }
-    },
-    activeNameThreeClick(page, group) {
-      if (!!!page) {
-        this.currentPage = 1
-      }
-      let msgType = ''
-      if (this.activeNameThree == 0) {
-        msgType = ''
-      } else if (this.activeNameThree == 1) {
-        msgType = 'image'
-      } else if (this.activeNameThree == 2) {
-        msgType = 'file'
-      } else if (this.activeNameThree == 3) {
-        msgType = 'link'
-      } else if (this.activeNameThree == 4) {
-        msgType = 'voice'
-      }
-
-      let query = {
-        msgType,
-        pageSize: '10',
-        pageNum: this.currentPage,
-        beginTime: this.takeTime ? yearMouthDay(this.takeTime[0]) : '',
-        endTime: this.takeTime ? yearMouthDay(this.takeTime[1]) : ''
-      }
-      if (group) {
-        query.roomId = this.chatData.receiver
-      } else {
-        query.fromId = this.fromId
-        query.toList = this.chatData.receiver
-      }
-      if (group) {
-        content.chatList(query).then((res) => {
-          this.total = Number(res.total)
-          this.resortData(res)
-        })
-      } else {
-        content.chatList(query).then((res) => {
-          this.total = Number(res.total)
-          this.resortData(res)
-        })
-      }
-    },
-    resortData(res) {
-      if (this.activeNameThree == 0) {
-        return (this.allChat = res.rows)
-      }
-      if (this.activeNameThree == 1) {
-        return (this.allChatImg = res.rows)
-      }
-      if (this.activeNameThree == 2) {
-        return (this.allFile = res.rows)
-      }
-      if (this.activeNameThree == 3) {
-        return (this.allLInk = res.rows)
-      }
-      if (this.activeNameThree == 4) {
-        return (this.allVoice = res.rows)
-      }
-    },
-    customerList() {
-      let querys = {
-        pageNum: 1,
-        pageSize: 999,
-        name: this.employName,
-        isOpenChat: '1'
-      }
-      content.listByCustomer(querys).then((res) => {
-        console.log(res, 'rows')
-        this.CList = res.rows
-        this.employAmount = res.total
-      })
-    },
-    chatMsgList() {
-      this.getChatList();
-    }
-  },
-  mounted() {
-    this.customerList()
-  }
-}
-</script>
-<style lang="scss" scoped>
-/deep/.el-tabs__nav-scroll {
-  padding-left: 15px;
-}
-
-.borderR {
-  border-right: 2px solid #ccc;
-}
-
-.paddingT10 {
-  padding-top: 10px;
-}
-
-.employ {
-  background: #f6f6f9;
-  min-height: 800px;
-
-  .hd_tabs {
-    background: #fff;
-  }
-  /deep/ .el-tabs__header {
-    margin: 0;
-  }
-
-  .hd_box {
-    padding: 15px;
-  }
-
-  .hd_name {
-    font-size: 18px;
-    min-height: 20px;
-  }
-
-  .hd_tabs_content {
-    width: 100%;
-    min-height: 653px;
-    border-bottom: 1px solid #efefef;
-  }
-
-  .hd_nameRi {
-    color: #199ed8;
-    text-align: right;
-    font-size: 16px;
-    cursor: pointer;
-  }
-
-  .ct_boxFirst {
-    height: 700px;
-  }
-
-  .ct_box {
-    background: white;
-    border-bottom: 1px solid #efefef;
-    min-height: 709px;
-    padding: 10px;
-    overflow-y: scroll;
-    color: #999;
-    text-align: center;
-
-    ::-webkit-scrollbar {
-      display: none;
-    }
-
-    ul {
-      margin: 0;
-      padding: 0;
-    }
-
-    ul li {
-      text-align: left;
-      cursor: pointer;
-      border-bottom: 1px solid #efefef;
-
-      :hover {
-        background: #efefef;
-      }
-
-      img {
-        width: 40px;
-      }
-    }
-
-    .liActive {
-      background: lightblue !important;
-      color: #199ed8;
-    }
-
-    .hds_time {
-      text-align: left;
-      width: 100%;
-      padding: 10px 0;
-    }
-  }
-}
-
-.pagination {
-  padding: 10px 0;
-  height: 30px;
-  float: left;
-}
-</style>
diff --git a/linkwe-ui/src/views/conversation/securityPage/alarmingSensitive.vue b/linkwe-ui/src/views/conversation/security/alarmingSensitive.vue
similarity index 100%
rename from linkwe-ui/src/views/conversation/securityPage/alarmingSensitive.vue
rename to linkwe-ui/src/views/conversation/security/alarmingSensitive.vue
diff --git a/linkwe-ui/src/views/conversation/security.vue b/linkwe-ui/src/views/conversation/security/index.vue
similarity index 75%
rename from linkwe-ui/src/views/conversation/security.vue
rename to linkwe-ui/src/views/conversation/security/index.vue
index df634ce77508d210d94899b68501f39de280ec05..ad753cc4388fdf8b2ffe3425cf47a7a0393afc72 100644
--- a/linkwe-ui/src/views/conversation/security.vue
+++ b/linkwe-ui/src/views/conversation/security/index.vue
@@ -14,9 +14,9 @@
   </div>
 </template>
 <script>
-import alarmingSensitive from './securityPage/alarmingSensitive.vue'
-import sensitiveList from './securityPage/sensitiveList.vue'
-import setSensitiveWord from './securityPage/setSensitiveWord'
+import alarmingSensitive from './alarmingSensitive.vue'
+import sensitiveList from './sensitiveList.vue'
+import setSensitiveWord from './setSensitiveWord'
 export default {
   components: {
     sensitiveList,
diff --git a/linkwe-ui/src/views/conversation/securityPage/sensitiveList.vue b/linkwe-ui/src/views/conversation/security/sensitiveList.vue
similarity index 100%
rename from linkwe-ui/src/views/conversation/securityPage/sensitiveList.vue
rename to linkwe-ui/src/views/conversation/security/sensitiveList.vue
diff --git a/linkwe-ui/src/views/conversation/securityPage/setSensitiveWord.vue b/linkwe-ui/src/views/conversation/security/setSensitiveWord.vue
similarity index 100%
rename from linkwe-ui/src/views/conversation/securityPage/setSensitiveWord.vue
rename to linkwe-ui/src/views/conversation/security/setSensitiveWord.vue
diff --git a/linkwe-ui/src/views/customerManage/groupDetail.vue b/linkwe-ui/src/views/customerManage/groupDetail.vue
index 3101eefb6e8e0dea3835d9d7b859cd67028d6125..23c1b7c0cb73b67f22dcd62dd93f2ab9ea709540 100644
--- a/linkwe-ui/src/views/customerManage/groupDetail.vue
+++ b/linkwe-ui/src/views/customerManage/groupDetail.vue
@@ -22,7 +22,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         groupId: undefined,
-        memberName: undefined,
+        name: undefined,
       },
       joinScene: {
         1: '由成员邀请入群（直接邀请入群）',
@@ -81,7 +81,7 @@ export default {
     <el-input
       size="normal"
       placeholder="请输入群成员"
-      v-model="query.memberName"
+      v-model="query.name"
       class
     >
       <el-button type="primary" slot="append" @click="getList(1)">
@@ -96,7 +96,7 @@ export default {
       <el-table-column width="55" />
       <el-table-column label="群成员" prop="name">
         <template slot-scope="scope">
-          {{ scope.row.memberName }}
+          {{ scope.row.name }}
           <!-- <span
             :style="{color: scope.row.joinType == 1 ? '#4bde03' : '#f9a90b'}"
           >{{ ({1: '@微信', 2: '@企业微信'})[scope.row.joinType] }}</span>-->
diff --git a/linkwe-ui/src/views/system/user/index.vue b/linkwe-ui/src/views/system/user/index.vue
index 493d510d962b9eac93f9248eab75bd585db4c169..3e9c549952f171a9bc6b9a87fb8e159a4554cf63 100644
--- a/linkwe-ui/src/views/system/user/index.vue
+++ b/linkwe-ui/src/views/system/user/index.vue
@@ -4,81 +4,251 @@
       <!--部门数据-->
       <el-col :span="4" :xs="24">
         <div class="head-container">
-          <el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search" style="margin-bottom: 20px" />
+          <el-input
+            v-model="deptName"
+            placeholder="请输入部门名称"
+            clearable
+            size="small"
+            prefix-icon="el-icon-search"
+            style="margin-bottom: 20px"
+          />
         </div>
         <div class="head-container">
-          <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false" :filter-node-method="filterNode" ref="tree" default-expand-all @node-click="handleNodeClick" />
+          <el-tree
+            :data="deptOptions"
+            :props="defaultProps"
+            :expand-on-click-node="false"
+            :filter-node-method="filterNode"
+            ref="tree"
+            default-expand-all
+            @node-click="handleNodeClick"
+          />
         </div>
       </el-col>
       <!--用户数据-->
       <el-col :span="20" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form
+          :model="queryParams"
+          ref="queryForm"
+          :inline="true"
+          v-show="showSearch"
+          label-width="68px"
+        >
           <el-form-item label="用户名称" prop="userName">
-            <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable size="small" style="width: 240px" @keyup.enter.native="handleQuery" />
+            <el-input
+              v-model="queryParams.userName"
+              placeholder="请输入用户名称"
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
           </el-form-item>
           <el-form-item label="手机号码" prop="phonenumber">
-            <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable size="small" style="width: 240px" @keyup.enter.native="handleQuery" />
+            <el-input
+              v-model="queryParams.phonenumber"
+              placeholder="请输入手机号码"
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
           </el-form-item>
           <el-form-item label="状态" prop="status">
-            <el-select v-model="queryParams.status" placeholder="用户状态" clearable size="small" style="width: 240px">
-              <el-option v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
+            <el-select
+              v-model="queryParams.status"
+              placeholder="用户状态"
+              clearable
+              size="small"
+              style="width: 240px"
+            >
+              <el-option
+                v-for="dict in statusOptions"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="dict.dictValue"
+              />
             </el-select>
           </el-form-item>
           <el-form-item label="创建时间">
-            <el-date-picker v-model="dateRange" size="small" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+            <el-date-picker
+              v-model="dateRange"
+              size="small"
+              style="width: 240px"
+              value-format="yyyy-MM-dd"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
           </el-form-item>
           <el-form-item>
-            <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            <el-button
+              type="cyan"
+              icon="el-icon-search"
+              size="mini"
+              @click="handleQuery"
+              >搜索</el-button
+            >
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+              >重置</el-button
+            >
           </el-form-item>
         </el-form>
 
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:user:add']">新增</el-button>
+            <el-button
+              type="primary"
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleAdd"
+              v-hasPermi="['system:user:add']"
+              >新增</el-button
+            >
           </el-col>
           <el-col :span="1.5">
-            <el-button type="success" icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" v-hasPermi="['system:user:edit']">修改</el-button>
+            <el-button
+              type="success"
+              icon="el-icon-edit"
+              size="mini"
+              :disabled="single"
+              @click="handleUpdate"
+              v-hasPermi="['system:user:edit']"
+              >修改</el-button
+            >
           </el-col>
           <el-col :span="1.5">
-            <el-button type="danger" icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['system:user:remove']">删除</el-button>
+            <el-button
+              type="danger"
+              icon="el-icon-delete"
+              size="mini"
+              :disabled="multiple"
+              @click="handleDelete"
+              v-hasPermi="['system:user:remove']"
+              >删除</el-button
+            >
           </el-col>
           <el-col :span="1.5">
-            <el-button type="info" icon="el-icon-upload2" size="mini" @click="handleImport" v-hasPermi="['system:user:import']">导入</el-button>
+            <el-button
+              type="info"
+              icon="el-icon-upload2"
+              size="mini"
+              @click="handleImport"
+              v-hasPermi="['system:user:import']"
+              >导入</el-button
+            >
           </el-col>
           <el-col :span="1.5">
-            <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['system:user:export']">导出</el-button>
+            <el-button
+              type="warning"
+              icon="el-icon-download"
+              size="mini"
+              @click="handleExport"
+              v-hasPermi="['system:user:export']"
+              >导出</el-button
+            >
           </el-col>
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+          <right-toolbar
+            :showSearch.sync="showSearch"
+            @queryTable="getList"
+          ></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+        <el-table
+          v-loading="loading"
+          :data="userList"
+          @selection-change="handleSelectionChange"
+        >
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="用户编号" align="center" prop="userId" />
-          <el-table-column label="用户名称" align="center" prop="userName" :show-overflow-tooltip="true" />
-          <el-table-column label="用户昵称" align="center" prop="nickName" :show-overflow-tooltip="true" />
-          <el-table-column label="部门" align="center" prop="dept.deptName" :show-overflow-tooltip="true" />
-          <el-table-column label="手机号码" align="center" prop="phonenumber" width="120" />
+          <el-table-column
+            label="用户名称"
+            align="center"
+            prop="userName"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="用户昵称"
+            align="center"
+            prop="nickName"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="部门"
+            align="center"
+            prop="dept.deptName"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="手机号码"
+            align="center"
+            prop="phonenumber"
+            width="120"
+          />
           <el-table-column label="状态" align="center">
             <template slot-scope="scope">
-              <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
+              <el-switch
+                v-model="scope.row.status"
+                active-value="0"
+                inactive-value="1"
+                @change="handleStatusChange(scope.row)"
+              ></el-switch>
             </template>
           </el-table-column>
-          <el-table-column label="创建时间" align="center" prop="createTime" width="160">
+          <el-table-column
+            label="创建时间"
+            align="center"
+            prop="createTime"
+            width="160"
+          >
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width">
+          <el-table-column
+            label="操作"
+            align="center"
+            width="180"
+            class-name="small-padding fixed-width"
+          >
             <template slot-scope="scope">
-              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:user:edit']">修改</el-button>
-              <el-button v-if="scope.row.userId !== 1" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']">删除</el-button>
-              <el-button size="mini" type="text" icon="el-icon-key" @click="handleResetPwd(scope.row)" v-hasPermi="['system:user:resetPwd']">重置</el-button>
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['system:user:edit']"
+                >修改</el-button
+              >
+              <el-button
+                v-if="scope.row.userId !== 1"
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['system:user:remove']"
+                >删除</el-button
+              >
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-key"
+                @click="handleResetPwd(scope.row)"
+                v-hasPermi="['system:user:resetPwd']"
+                >重置</el-button
+              >
             </template>
           </el-table-column>
         </el-table>
 
-        <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+        <pagination
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
       </el-col>
     </el-row>
 
@@ -93,31 +263,57 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :disable-branch-nodes="true" :show-count="true" placeholder="请选择归属部门" />
+              <treeselect
+                v-model="form.deptId"
+                :options="deptOptions"
+                :disable-branch-nodes="true"
+                :show-count="true"
+                placeholder="请选择归属部门"
+              />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="手机号码" prop="phonenumber">
-              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
+              <el-input
+                v-model="form.phonenumber"
+                placeholder="请输入手机号码"
+                maxlength="11"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="邮箱" prop="email">
-              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
+              <el-input
+                v-model="form.email"
+                placeholder="请输入邮箱"
+                maxlength="50"
+              />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
+            <el-form-item
+              v-if="form.userId == undefined"
+              label="用户名称"
+              prop="userName"
+            >
               <el-input v-model="form.userName" placeholder="请输入用户名称" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
-              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" />
+            <el-form-item
+              v-if="form.userId == undefined"
+              label="用户密码"
+              prop="password"
+            >
+              <el-input
+                v-model="form.password"
+                placeholder="请输入用户密码"
+                type="password"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -125,14 +321,24 @@
           <el-col :span="12">
             <el-form-item label="用户性别">
               <el-select v-model="form.sex" placeholder="请选择">
-                <el-option v-for="dict in sexOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue"></el-option>
+                <el-option
+                  v-for="dict in sexOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="状态">
               <el-radio-group v-model="form.status">
-                <el-radio v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictValue">{{dict.dictLabel}}</el-radio>
+                <el-radio
+                  v-for="dict in statusOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictValue"
+                  >{{ dict.dictLabel }}</el-radio
+                >
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -141,14 +347,26 @@
           <el-col :span="12">
             <el-form-item label="岗位">
               <el-select v-model="form.postIds" multiple placeholder="请选择">
-                <el-option v-for="item in postOptions" :key="item.postId" :label="item.postName" :value="item.postId" :disabled="item.status == 1"></el-option>
+                <el-option
+                  v-for="item in postOptions"
+                  :key="item.postId"
+                  :label="item.postName"
+                  :value="item.postId"
+                  :disabled="item.status == 1"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="角色">
               <el-select v-model="form.roleIds" multiple placeholder="请选择">
-                <el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName" :value="item.roleId" :disabled="item.status == 1"></el-option>
+                <el-option
+                  v-for="item in roleOptions"
+                  :key="item.roleId"
+                  :label="item.roleName"
+                  :value="item.roleId"
+                  :disabled="item.status == 1"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -156,7 +374,11 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+              <el-input
+                v-model="form.remark"
+                type="textarea"
+                placeholder="请输入内容"
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -168,18 +390,40 @@
     </el-dialog>
 
     <!-- 用户导入对话框 -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-      <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
+    <el-dialog
+      :title="upload.title"
+      :visible.sync="upload.open"
+      width="400px"
+      append-to-body
+    >
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">
           将文件拖到此处，或
           <em>点击上传</em>
         </div>
         <div class="el-upload__tip" slot="tip">
-          <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
-          <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
+          <el-checkbox
+            v-model="upload.updateSupport"
+          />是否更新已经存在的用户数据
+          <el-link type="info" style="font-size:12px" @click="importTemplate"
+            >下载模板</el-link
+          >
+        </div>
+        <div class="el-upload__tip" style="color:red" slot="tip">
+          提示：仅允许导入“xls”或“xlsx”格式文件！
         </div>
-        <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitFileForm">确 定</el-button>
@@ -199,15 +443,15 @@ import {
   exportUser,
   resetUserPwd,
   changeUserStatus,
-  importTemplate,
-} from "@/api/system/user";
-import { getToken } from "@/utils/auth";
-import { treeselect } from "@/api/system/dept";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+  importTemplate
+} from '@/api/system/user'
+import { getToken } from '@/utils/auth'
+import { treeselect } from '@/api/system/dept'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 
 export default {
-  name: "User",
+  name: 'User',
   components: { Treeselect },
   data() {
     return {
@@ -226,7 +470,7 @@ export default {
       // 用户表格数据
       userList: null,
       // 弹出层标题
-      title: "",
+      title: '',
       // 部门树选项
       deptOptions: undefined,
       // 是否显示弹出层
@@ -248,23 +492,23 @@ export default {
       // 表单参数
       form: {},
       defaultProps: {
-        children: "children",
-        label: "label",
+        children: 'children',
+        label: 'label'
       },
       // 用户导入参数
       upload: {
         // 是否显示弹出层（用户导入）
         open: false,
         // 弹出层标题（用户导入）
-        title: "",
+        title: '',
         // 是否禁用上传
         isUploading: false,
         // 是否更新已经存在的用户数据
         updateSupport: 0,
         // 设置上传的请求头部
-        headers: { Authorization: "Bearer " + getToken() },
+        headers: { Authorization: 'Bearer ' + getToken() },
         // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/system/user/importData",
+        url: process.env.VUE_APP_BASE_API + '/system/user/importData'
       },
       // 查询参数
       queryParams: {
@@ -273,114 +517,114 @@ export default {
         userName: undefined,
         phonenumber: undefined,
         status: undefined,
-        deptId: undefined,
+        deptId: undefined
       },
       // 表单校验
       rules: {
         userName: [
-          { required: true, message: "用户名称不能为空", trigger: "blur" },
+          { required: true, message: '用户名称不能为空', trigger: 'blur' }
         ],
         nickName: [
-          { required: true, message: "用户昵称不能为空", trigger: "blur" },
+          { required: true, message: '用户昵称不能为空', trigger: 'blur' }
         ],
         deptId: [
-          { required: true, message: "归属部门不能为空", trigger: "blur" },
+          { required: true, message: '归属部门不能为空', trigger: 'blur' }
         ],
         password: [
-          { required: true, message: "用户密码不能为空", trigger: "blur" },
+          { required: true, message: '用户密码不能为空', trigger: 'blur' }
         ],
         email: [
-          { required: true, message: "邮箱地址不能为空", trigger: "blur" },
+          { required: true, message: '邮箱地址不能为空', trigger: 'blur' },
           {
-            type: "email",
+            type: 'email',
             message: "'请输入正确的邮箱地址",
-            trigger: ["blur", "change"],
-          },
+            trigger: ['blur', 'change']
+          }
         ],
         phonenumber: [
-          { required: true, message: "手机号码不能为空", trigger: "blur" },
+          { required: true, message: '手机号码不能为空', trigger: 'blur' },
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: "请输入正确的手机号码",
-            trigger: "blur",
-          },
-        ],
-      },
-    };
+            message: '请输入正确的手机号码',
+            trigger: 'blur'
+          }
+        ]
+      }
+    }
   },
   watch: {
     // 根据名称筛选部门树
     deptName(val) {
-      this.$refs.tree.filter(val);
-    },
+      this.$refs.tree.filter(val)
+    }
   },
   created() {
-    this.getList();
-    this.getTreeselect();
-    this.getDicts("sys_normal_disable").then((response) => {
-      this.statusOptions = response.data;
-    });
-    this.getDicts("sys_user_sex").then((response) => {
-      this.sexOptions = response.data;
-    });
-    this.getConfigKey("sys.user.initPassword").then((response) => {
-      this.initPassword = response.msg;
-    });
+    this.getList()
+    this.getTreeselect()
+    this.getDicts('sys_normal_disable').then((response) => {
+      this.statusOptions = response.data
+    })
+    this.getDicts('sys_user_sex').then((response) => {
+      this.sexOptions = response.data
+    })
+    this.getConfigKey('sys.user.initPassword').then((response) => {
+      this.initPassword = response.msg
+    })
   },
   methods: {
     /** 查询用户列表 */
     getList() {
-      this.loading = true;
+      this.loading = true
       listUser(this.addDateRange(this.queryParams, this.dateRange)).then(
         (response) => {
-          this.userList = response.rows;
-          this.total = response.total;
-          this.loading = false;
+          this.userList = response.rows
+          this.total = response.total
+          this.loading = false
         }
-      );
+      )
     },
     /** 查询部门下拉树结构 */
     getTreeselect() {
       treeselect().then((response) => {
-        this.deptOptions = response.data;
-      });
+        this.deptOptions = response.data
+      })
     },
     // 筛选节点
     filterNode(value, data) {
-      if (!value) return true;
-      return data.label.indexOf(value) !== -1;
+      if (!value) return true
+      return data.label.indexOf(value) !== -1
     },
     // 节点单击事件
     handleNodeClick(data) {
-      this.queryParams.deptId = data.id;
-      this.getList();
+      this.queryParams.deptId = data.id
+      this.getList()
     },
     // 用户状态修改
     handleStatusChange(row) {
-      let text = row.status === "0" ? "启用" : "停用";
+      let text = row.status === '0' ? '启用' : '停用'
       this.$confirm(
         '确认要"' + text + '""' + row.userName + '"用户吗?',
-        "警告",
+        '警告',
         {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
         }
       )
-        .then(function () {
-          return changeUserStatus(row.userId, row.status);
+        .then(function() {
+          return changeUserStatus(row.userId, row.status)
         })
         .then(() => {
-          this.msgSuccess(text + "成功");
+          this.msgSuccess(text + '成功')
+        })
+        .catch(function() {
+          row.status = row.status === '0' ? '1' : '0'
         })
-        .catch(function () {
-          row.status = row.status === "0" ? "1" : "0";
-        });
     },
     // 取消按钮
     cancel() {
-      this.open = false;
-      this.reset();
+      this.open = false
+      this.reset()
     },
     // 表单重置
     reset() {
@@ -393,161 +637,161 @@ export default {
         phonenumber: undefined,
         email: undefined,
         sex: undefined,
-        status: "0",
+        status: '0',
         remark: undefined,
         postIds: [],
-        roleIds: [],
-      };
-      this.resetForm("form");
+        roleIds: []
+      }
+      this.resetForm('form')
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.page = 1;
-      this.getList();
+      this.queryParams.page = 1
+      this.getList()
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.handleQuery();
+      this.dateRange = []
+      this.resetForm('queryForm')
+      this.handleQuery()
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.userId);
-      this.single = selection.length != 1;
-      this.multiple = !selection.length;
+      this.ids = selection.map((item) => item.userId)
+      this.single = selection.length != 1
+      this.multiple = !selection.length
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset();
-      this.getTreeselect();
+      this.reset()
+      this.getTreeselect()
       getUser().then((response) => {
-        this.postOptions = response.posts;
-        this.roleOptions = response.roles;
-        this.open = true;
-        this.title = "添加用户";
-        this.form.password = this.initPassword;
-      });
+        this.postOptions = response.posts
+        this.roleOptions = response.roles
+        this.open = true
+        this.title = '添加用户'
+        this.form.password = this.initPassword
+      })
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset();
-      this.getTreeselect();
-      const userId = row.userId || this.ids;
+      this.reset()
+      this.getTreeselect()
+      const userId = row.userId || this.ids
       getUser(userId).then((response) => {
-        this.form = response.data;
-        this.postOptions = response.posts;
-        this.roleOptions = response.roles;
-        this.form.postIds = response.postIds;
-        this.form.roleIds = response.roleIds;
-        this.open = true;
-        this.title = "修改用户";
-        this.form.password = "";
-      });
+        this.form = response.data
+        this.postOptions = response.posts
+        this.roleOptions = response.roles
+        this.form.postIds = response.postIds.map((e) => String(e))
+        this.form.roleIds = response.roleIds.map((e) => String(e))
+        this.open = true
+        this.title = '修改用户'
+        this.form.password = ''
+      })
     },
     /** 重置密码按钮操作 */
     handleResetPwd(row) {
-      this.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
+      this.$prompt('请输入"' + row.userName + '"的新密码', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消'
       })
         .then(({ value }) => {
           resetUserPwd(row.userId, value).then((response) => {
             if (response.code === 200) {
-              this.msgSuccess("修改成功，新密码是：" + value);
+              this.msgSuccess('修改成功，新密码是：' + value)
             }
-          });
+          })
         })
-        .catch(() => {});
+        .catch(() => {})
     },
     /** 提交按钮 */
-    submitForm: function () {
-      this.$refs["form"].validate((valid) => {
+    submitForm: function() {
+      this.$refs['form'].validate((valid) => {
         if (valid) {
           if (this.form.userId != undefined) {
             updateUser(this.form).then((response) => {
               if (response.code === 200) {
-                this.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
+                this.msgSuccess('修改成功')
+                this.open = false
+                this.getList()
               }
-            });
+            })
           } else {
             addUser(this.form).then((response) => {
               if (response.code === 200) {
-                this.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
+                this.msgSuccess('新增成功')
+                this.open = false
+                this.getList()
               }
-            });
+            })
           }
         }
-      });
+      })
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const userIds = row.userId || this.ids;
+      const userIds = row.userId || this.ids
       this.$confirm(
         '是否确认删除用户编号为"' + userIds + '"的数据项?',
-        "警告",
+        '警告',
         {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
         }
       )
-        .then(function () {
-          return delUser(userIds);
+        .then(function() {
+          return delUser(userIds)
         })
         .then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
+          this.getList()
+          this.msgSuccess('删除成功')
         })
-        .catch(function () {});
+        .catch(function() {})
     },
     /** 导出按钮操作 */
     handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm("是否确认导出所有用户数据项?", "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+      const queryParams = this.queryParams
+      this.$confirm('是否确认导出所有用户数据项?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
-        .then(function () {
-          return exportUser(queryParams);
+        .then(function() {
+          return exportUser(queryParams)
         })
         .then((response) => {
-          this.download(response.msg);
+          this.download(response.msg)
         })
-        .catch(function () {});
+        .catch(function() {})
     },
     /** 导入按钮操作 */
     handleImport() {
-      this.upload.title = "用户导入";
-      this.upload.open = true;
+      this.upload.title = '用户导入'
+      this.upload.open = true
     },
     /** 下载模板操作 */
     importTemplate() {
       importTemplate().then((response) => {
-        this.download(response.msg);
-      });
+        this.download(response.msg)
+      })
     },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {
-      this.upload.isUploading = true;
+      this.upload.isUploading = true
     },
     // 文件上传成功处理
     handleFileSuccess(response, file, fileList) {
-      this.upload.open = false;
-      this.upload.isUploading = false;
-      this.$refs.upload.clearFiles();
-      this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
-      this.getList();
+      this.upload.open = false
+      this.upload.isUploading = false
+      this.$refs.upload.clearFiles()
+      this.$alert(response.msg, '导入结果', { dangerouslyUseHTMLString: true })
+      this.getList()
     },
     // 提交上传文件
     submitFileForm() {
-      this.$refs.upload.submit();
-    },
-  },
-};
-</script>
\ No newline at end of file
+      this.$refs.upload.submit()
+    }
+  }
+}
+</script>