From c39d5aea8840fb796978225fb0cbaf8a5e40bfbf Mon Sep 17 00:00:00 2001 From: wangyifeng <812766448@qq.com> Date: Fri, 16 May 2025 17:00:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=85=A5=E6=9F=A5=E8=AF=A2=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E7=94=A8=E6=88=B7=E6=89=80=E5=9C=A8=E7=BE=A4=E8=81=8A?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=B9=B6=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E6=95=B4=E4=B8=AA=E9=80=9A=E8=AE=AF=E5=BD=95=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E7=9A=84=E4=BA=A4=E4=BA=92=E5=92=8C=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=EF=BC=8C=E5=8C=85=E6=8B=AC=E5=91=98=E5=B7=A5=E9=80=9A=E8=AE=AF?= =?UTF-8?q?=E5=BD=95=E5=92=8C=E7=BE=A4=E8=81=8A=E5=88=97=E8=A1=A8=EF=BC=9B?= =?UTF-8?q?=E5=B9=B6=E5=AE=8C=E6=88=90=E5=AF=B9=E5=BA=94=E7=9A=84=E8=81=8A?= =?UTF-8?q?=E5=A4=A9=E4=BC=9A=E8=AF=9D=E8=B7=B3=E8=BD=AC=EF=BC=9B=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=8C=89=E6=9D=A1=E4=BB=B6=E6=90=9C=E7=B4=A2=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E7=AD=89=E5=BE=85=E6=8E=A5=E5=85=A5=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E8=AE=B0=E5=BD=95=E7=9A=84=E6=8C=89=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/search.js | 15 + src/api/user.js | 5 + src/components/group/GroupPanel.vue | 45 +- src/components/search/searchByCondition.vue | 896 ++++++++++++++++++++ src/components/search/searchList.vue | 18 +- src/utils/auth.js | 2 +- src/views/message/inner/IndexContent.vue | 57 +- src/views/message/inner/IndexSider.vue | 114 ++- 8 files changed, 1097 insertions(+), 55 deletions(-) create mode 100644 src/components/search/searchByCondition.vue diff --git a/src/api/search.js b/src/api/search.js index ee3654e..7fa5928 100644 --- a/src/api/search.js +++ b/src/api/search.js @@ -9,3 +9,18 @@ export const ServeSeachQueryAll = (data = {}) => { export const ServeQueryTalkRecord = (data = {}) => { return post('/api/v1/elasticsearch/query-talk-record', data) } + +//查看存在聊天记录的天数 +export const ServeTalkDate = (data) => { + return post('/api/v1/talk/date', data) +} + +//获取会话Id +export const ServeGetSessionId = (data) => { + return post('/api/v1/talk/session/getId', data) +} + +//获取用户所在群聊列表 +export const ServeUserGroupChatList = (data) => { + return post('/api/v1/group/user/list', data) +} diff --git a/src/api/user.js b/src/api/user.js index 76c55b7..17bcd0b 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -29,3 +29,8 @@ export const ServeGetUserDetail = () => { export const ServeGetUserSetting = () => { return get('/api/v1/users/setting') } + +//根据erpUserId查询聊天系统用户详情 +export const getUserInfoByERPUserId = (data) => { + return post('/api/v1/users/info', data) +} diff --git a/src/components/group/GroupPanel.vue b/src/components/group/GroupPanel.vue index a05357a..7e25748 100644 --- a/src/components/group/GroupPanel.vue +++ b/src/components/group/GroupPanel.vue @@ -223,28 +223,6 @@ const showSearchRecordByConditionModal = () => {
-
-
-
-
查找聊天记录
- -
-
- -
-
-
置顶会话
- -
-
- -
-
-
消息免打扰
- -
-
-
@@ -316,6 +294,29 @@ const showSearchRecordByConditionModal = () => {
+
+
+
+
查找聊天记录
+ +
+
+ +
+
+
置顶会话
+ +
+
+ +
+
+
消息免打扰
+ +
+
+
+
diff --git a/src/components/search/searchByCondition.vue b/src/components/search/searchByCondition.vue new file mode 100644 index 0000000..0ded9ab --- /dev/null +++ b/src/components/search/searchByCondition.vue @@ -0,0 +1,896 @@ + + + diff --git a/src/components/search/searchList.vue b/src/components/search/searchList.vue index f1293f6..7c69137 100644 --- a/src/components/search/searchList.vue +++ b/src/components/search/searchList.vue @@ -235,7 +235,10 @@ const inputSearchText = (e) => { } // ES搜索聊天记录-主页搜索什么都有、指定用户、指定群、群与用户概览 -const queryAllSearch = () => { +const queryAllSearch = (doClearSearchResult) => { + if (doClearSearchResult) { + state.searchResult = null + } let params = { key: state.searchText, //关键字 size: props.searchResultPageSize @@ -329,12 +332,9 @@ const queryAllSearch = () => { state.searchResult = data } else { // 加载更多,合并数据 - if ( - paginationKey && - Array.isArray((state?.searchResult && state?.searchResult[paginationKey]) || []) - ) { - data[paginationKey] = state.searchResult[paginationKey].concat(data[paginationKey]) - } + data[paginationKey] = (state.searchResult?.[paginationKey] || []).concat( + data[paginationKey] + ) state.searchResult = data } @@ -513,8 +513,8 @@ const clickSearchItem = (searchResultKey, searchItem) => { } //加载更多数据 -const doLoadMore = () => { - queryAllSearch() +const doLoadMore = (doClearSearchResult) => { + queryAllSearch(doClearSearchResult) } // 暴露doLoadMore方法给父组件 diff --git a/src/utils/auth.js b/src/utils/auth.js index 6d85967..c088ac6 100644 --- a/src/utils/auth.js +++ b/src/utils/auth.js @@ -18,7 +18,7 @@ export function isLoggedIn() { */ export function getAccessToken() { // return storage.get(AccessToken) || '' - return JSON.parse(localStorage.getItem('token'))||'79b5c732d96d2b27a48a99dfd4a5566c43aaa5796242e854ebe3ffc198d6876b9628e7b764d9af65ab5dbb2d517ced88170491b74b048c0ba827c0d3741462cb89dc59ed46653a449af837a8262941caaef1334d640773710f8cd96473bacfb190cba595a5d6a9c87d70f0999a3ebb41147213b31b4bdccffca66a56acf3baab5af0154f0dce360079f37709f78e13711036899344bddb0fb4cf0f2890287cb62c3fcbe33368caa5e213624577be8b8420ab75b1f50775ee16142a4321c5d56995f37354a66a969da98d95ba6e65d142ed097e04b411c1ebad2f62866d0ec7e1838420530a9941dbbcd00490199f8b896fc262d304ff89c0c77d33d884b0d50cb245a5ce4e0a66c9b041b7859ba0c0c9d942cd23551c1e1259cc5b726b936bffd334ead575db2f7cfd9f3316b61487d115c4cf634d764124b986a7dc71dec603' + return JSON.parse(localStorage.getItem('token'))||'79b5c732d96d2b27a48a99dfd4a5566c43aaa5796242e854ebe3ffc198d6876b9628e7b764d9af65ab5dbb2d517ced88170491b74b048c0ba827c0d3741462cb89dc59ed46653a449af837a8262941caaef1334d640773710f8cd96473bacfb190cba595a5d6a9c87d70f0999a3ebb41147213b31b4bdccffca66a56acf3baab5af0154f0dce360079f37709f78e13711036899344bddb0fb4cf0f2890287cb62c3fcbe33368caa5e213624577be8b8420ab75b1f50775ee16142a4321c5d56995f37354a66a969da98d95ba6e65d142ed097e04b411c1ebad2f62866d0ec7e1838420530a9941dbbcd00490199f8b894e81e7367079550f5bfe506cb1d1874de13cb7696a188e09b47b9997c92972e501cbcaf2601dc4d1981a2f9bdbfe2ddef970f3e2d760b94e5947f9fe004528f5214a8cd9a92de884cc64bfa32d716e25' } /** diff --git a/src/views/message/inner/IndexContent.vue b/src/views/message/inner/IndexContent.vue index 7c9260f..8cb091f 100644 --- a/src/views/message/inner/IndexContent.vue +++ b/src/views/message/inner/IndexContent.vue @@ -1,6 +1,6 @@