From f5d8ab546c87d04ce93be5e8c1f9f40c3b848644 Mon Sep 17 00:00:00 2001
From: doublekou <951513186@qq.com>
Date: Fri, 24 Nov 2023 17:26:41 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=B1=BB=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customermanagement/customerList/index.ts  |  10 +
 .../customermanagement/customerList/types.ts  |   1 +
 src/assets/iconfont.css                       |  38 ++
 src/assets/images/zanwu.png                   | Bin 0 -> 13135 bytes
 src/components/Message/index.vue              | 455 ++++++++++++++++++
 src/components/Message/messageSearch.vue      |  72 +++
 src/hooks/websocket.ts                        | 125 ++---
 .../RightContent/AvatarDropdown.vue           | 178 +++++--
 src/main.ts                                   |   1 +
 src/views/basic/iframe/iframeSearch.vue       |  69 +++
 src/views/basic/iframe/index.vue              |   3 +
 .../customerList/customerList.vue             |  45 +-
 src/views/login/components/LoginContent.vue   |  19 +
 types/components.d.ts                         |   2 +
 vite.config.ts                                |   4 +-
 15 files changed, 925 insertions(+), 97 deletions(-)
 create mode 100644 src/assets/iconfont.css
 create mode 100644 src/assets/images/zanwu.png
 create mode 100644 src/components/Message/index.vue
 create mode 100644 src/components/Message/messageSearch.vue
 create mode 100644 src/views/basic/iframe/iframeSearch.vue

diff --git a/src/api/customermanagement/customerList/index.ts b/src/api/customermanagement/customerList/index.ts
index 928cedc..6621011 100644
--- a/src/api/customermanagement/customerList/index.ts
+++ b/src/api/customermanagement/customerList/index.ts
@@ -33,3 +33,13 @@ export function updateResource(resourcesDto: resourcesDtoDTO) {
 // export function deleteUser(userId: number) {
 //   return httpClient.delete<ApiResult<void>>(`/system/user/${userId}`)
 // }
+
+/**
+ * 新消息分页查询
+ * @param pageParams 分页参数
+ */
+export function messageAccessLogs(pageParams: SysUserPageParam) {
+  return httpClient.get<ApiResult>('/notify/user-announcement/page', {
+    params: pageParams
+  })
+}
diff --git a/src/api/customermanagement/customerList/types.ts b/src/api/customermanagement/customerList/types.ts
index 6e67763..6b4818d 100644
--- a/src/api/customermanagement/customerList/types.ts
+++ b/src/api/customermanagement/customerList/types.ts
@@ -18,6 +18,7 @@ export type CustomerListQO = {
   startTime?: string
   // 结束时间
   endTime?: string
+  clueId?: string
 }
 /**
  * 我的线索record
diff --git a/src/assets/iconfont.css b/src/assets/iconfont.css
new file mode 100644
index 0000000..1585a12
--- /dev/null
+++ b/src/assets/iconfont.css
@@ -0,0 +1,38 @@
+@font-face {
+  font-family: 'iconfont'; /* Project id 4340011 */
+  src: url('//at.alicdn.com/t/c/font_4340011_rzfq6m1kbn.woff2?t=1700639506016') format('woff2'),
+    url('//at.alicdn.com/t/c/font_4340011_rzfq6m1kbn.woff?t=1700639506016') format('woff'),
+    url('//at.alicdn.com/t/c/font_4340011_rzfq6m1kbn.ttf?t=1700639506016') format('truetype');
+}
+
+.iconfont {
+  font-family: 'iconfont' !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-xin2:before {
+  content: '\e647';
+}
+
+.icon-xin1:before {
+  content: '\e600';
+}
+
+.icon-xin:before {
+  content: '\e6c9';
+}
+
+.icon-xiaoxi1:before {
+  content: '\e611';
+}
+
+.icon-xiaoxizhongxin:before {
+  content: '\e7d9';
+}
+
+.icon-xiaoxi:before {
+  content: '\e6c5';
+}
diff --git a/src/assets/images/zanwu.png b/src/assets/images/zanwu.png
new file mode 100644
index 0000000000000000000000000000000000000000..11806c8376c765537b0379fff129b97dc22b6608
GIT binary patch
literal 13135
zcmV-VGqB8wP)<h;3K|Lk000e1NJLTq0077U0046c1^@s6-BnE}00001b5ch_0Itp)
z=>PyA07*naRCr$PeF>BtS9$LD->P0_l}6HNWZCj2%QmvL7zwW!kTEeB8-uaI5D1AA
z;}=4bcXA%&k(az@P98jxoNOc^8_6LMNMc9=fv~Rz>=-YyB+Co3C2O&^nbGV$y;R-*
zo&Q$d>gww1+0?UHQ_`I7uI1KU{_p<l{V!qZSn7eL9%$GDwA43CJ+RaRjeB6h0c2Mn
zUqv1Yo7d2urGZ=Of%)!%1p|=XgWScQ{wP5WZC*wHbG|!f>HSMRAU&`k0J8HWZ*UZU
zmKiyh>AK5S)9BLhEcL)b=z)0$$m1j2?UeW%0D1`Y@y)B~_ZC9OEY)GD2Nnbe+12NN
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

literal 0
HcmV?d00001

diff --git a/src/components/Message/index.vue b/src/components/Message/index.vue
new file mode 100644
index 0000000..288f8bb
--- /dev/null
+++ b/src/components/Message/index.vue
@@ -0,0 +1,455 @@
+<template>
+  <div class="ms-container">
+    <div class="top-column">
+      <div>消息列表</div>
+      <div class="seeMore" @click="seeMore">查看更多</div>
+    </div>
+    <div class="item-conent frame-style">
+      <div class="center">
+        <!-- <a-list item-layout="horizontal" :data-source="data">
+          <template #renderItem="{ item }">
+            <a-list-item>
+              <a-list-item-meta description="有新线索,请注意跟单">
+                <template #avatar> id：123455666</template>
+              </a-list-item-meta>
+              <template #actions>
+                <a key="list-loadmore-edit" style="margin-right: 8px">确认</a>
+                <a key="list-loadmore-more">定位</a>
+              </template>
+            </a-list-item>
+          </template>
+        </a-list> -->
+        <div v-for="(item, index) in newclueList" :key="index" class="listItem">
+          <div class="listItemTop">
+            <div class="type">
+              【{{ item.type === 1 ? '系统公告' : '导出通知' }}】{{ item.title }}
+            </div>
+            <div class="time">{{ item.createTime }}</div>
+          </div>
+          <div class="listItemCenter">
+            <span class="content" :class="{ expanded: item.show }">{{ item.content }}</span>
+            <div class="iconContainer" @click="toggleShowAll(item)">
+              <div v-if="item.show" class="openOrClose">
+                <span><down-outlined /></span>
+              </div>
+              <div v-else class="openOrClose">
+                <up-outlined />
+              </div>
+            </div>
+          </div>
+
+          <div class="listItemBottom">
+            <a key="list-loadmore-edit" style="margin-right: 8px">{{
+              item.status === 1 ? '已读' : '确认'
+            }}</a>
+            <a
+              key="list-loadmore-more"
+              style="border-left: 1px solid rgba(0, 0, 0, 0.06); padding-left: 8px"
+              @click="positioning(item.messageKey)"
+              >定位</a
+            >
+          </div>
+        </div>
+      </div>
+      <!-- <div class="empty">
+        <a-empty description="暂无数据" :image="zanwu" />
+      </div> -->
+    </div>
+    <!-- 列表弹出框 -->
+    <div>
+      <a-modal
+        v-model:visible="listVisible"
+        title="新线索列表"
+        :mask-closable="false"
+        :width="900"
+        @ok="handleOk"
+      >
+        <!-- 工具栏 -->
+        <message-search :loading="tableRef?.loading" @search="searchTable" />
+        <!-- 底部表格 -->
+        <pro-table
+          ref="tableRef"
+          row-key="userId"
+          :request="tableRequest"
+          :columns="columns"
+          :scroll="{ x: 800 }"
+          :tool-bar-render="false"
+          class="protable"
+          :pagination="{ showQuickJumper: true }"
+        >
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'clueLabelList'">
+              <a-tooltip v-if="record.clueLabelList.length > 0">
+                <template #title
+                  ><a-tag
+                    v-for="(item, index) in record.clueLabelList"
+                    :key="index"
+                    class="tagGroupContentItem"
+                    >{{ item }}</a-tag
+                  ></template
+                >
+                <a-tag v-for="(item, index) in record.clueLabelList" :key="index">{{ item }}</a-tag>
+              </a-tooltip>
+              <span v-else>--</span>
+            </template>
+            <template v-else-if="column.key === 'remark'">
+              <a-tooltip v-if="record.remark">
+                <template #title
+                  ><span>{{ record.remark }}</span></template
+                >
+                <span>{{ record.remark }}</span>
+              </a-tooltip>
+              <span v-else>--</span>
+            </template>
+          </template>
+        </pro-table>
+      </a-modal>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineComponent, ref, watch, onMounted } from 'vue'
+import zanwu from '@/assets/images/zanwu.png'
+//底部表格
+import ProTable from '#/table'
+import type { ProTableInstanceExpose, TableRequest, ProColumns } from '#/table'
+import { mergePageParam } from '@/utils/page-utils'
+import { messageAccessLogs } from '@/api/customermanagement/customerList'
+import type { CustomerListQO } from '@/api/customermanagement/customerList/types'
+import MessageSearch from '@/components/Message/messageSearch.vue'
+import type { DistributeTaskManagementPageParam } from '@/api/controlcenterstation/distributionTaskManagement/types'
+import { doRequest } from '@/utils/axios/request'
+import { pageAccessLogs } from '@/api/customermanagement/customerList'
+import router from '@/router'
+
+//展开、收起
+// const show = ref(false)
+//展开收起
+const toggleShowAll = (itemShow: DataItem) => {
+  itemShow.show = !itemShow.show
+}
+//底部表格
+// 表格组件引用
+const tableRef = ref<ProTableInstanceExpose>()
+// 查询参数
+let searchParams: CustomerListQO = {}
+
+//远程加载表格数据
+const tableRequest: TableRequest = (params, sorter, filter) => {
+  const pageParam = mergePageParam(params, sorter, filter)
+  return messageAccessLogs({ ...pageParam, ...searchParams })
+}
+//刷新表格
+const reloadTable = (resetPageIndex?: boolean) => {
+  tableRef.value?.actionRef?.reload(resetPageIndex)
+}
+//查询表格
+const searchTable = (params: DistributeTaskManagementPageParam) => {
+  searchParams = params
+  reloadTable(true) // 会调用 tableRequest
+}
+const columns: ProColumns[] = [
+  {
+    title: '序号',
+    width: '80px',
+    customRender: function ({ index }) {
+      return `${index + 1}`
+    }
+  },
+  {
+    title: '标题',
+    dataIndex: 'title',
+    width: '120px',
+    customRender: function ({ record }: any) {
+      if (record.nid) {
+        return record.nid
+      } else if (record.nid === '') {
+        return '--'
+      }
+    }
+  },
+  {
+    title: '类型',
+    dataIndex: 'type',
+    width: '100px',
+    ellipsis: true,
+    align: 'center',
+    customRender: function ({ record }: any) {
+      if (record.type === 1) {
+        return '系统公告'
+      } else if (record.type === 2) {
+        return '导出通知'
+      }
+    }
+  },
+  {
+    title: '状态',
+    dataIndex: 'state',
+    width: '100px',
+    ellipsis: true,
+    align: 'center',
+    customRender: function ({ record }: any) {
+      if (record.state === 0) {
+        return '未读'
+      } else if (record.state === 1) {
+        return '已读'
+      }
+    }
+  },
+  // {
+  //   title: '描述',
+  //   dataIndex: 'clueLabelList',
+  //   width: 200,
+  //   ellipsis: true,
+  //   align: 'center',
+  //   onCell: () => {
+  //     return {
+  //       style: {
+  //         maxWidth: 200,
+  //         overflow: 'hidden',
+  //         whiteSpace: 'nowrap',
+  //         textOverflow: 'ellipsis',
+  //         cursor: 'pointer'
+  //       }
+  //     }
+  //   }
+  // },
+  {
+    title: '描述',
+    dataIndex: 'content',
+    ellipsis: true,
+    align: 'center'
+  },
+  // {
+  //   title: '线索日期',
+  //   dataIndex: 'clueTime',
+  //   width: 150,
+  //   align: 'center',
+  //   ellipsis: true
+  // },
+  {
+    title: '创建日期',
+    dataIndex: 'createTime',
+    width: 150,
+    align: 'center',
+    ellipsis: true
+  }
+  // {
+  //   key: 'operate',
+  //   title: '操作',
+  //   width: 100,
+  //   align: 'center',
+  //   fixed: 'right'
+  // }
+  // {
+  //   title: '客户名称',
+  //   dataIndex: 'username'
+  // },
+  // {
+  //   title: '跟进人',
+  //   dataIndex: 'method'
+  // },
+]
+
+defineOptions({ name: 'MessagePage' })
+
+interface DataItem {
+  id: number | undefined
+  type: number
+  createTime: string
+  content: string
+  messageKey: string
+  status: number | undefined
+  title: string
+  show: boolean
+}
+
+const props = defineProps({
+  newclueList: {
+    type: Array as () => DataItem[],
+    required: true,
+    default: () => []
+  }
+  // 其他 props...
+})
+
+// // 监听 props.listVisible 的变化，将其赋值给 visible
+// watch(
+//   () => props.listVisible,
+//   newValue => {
+//     listVisible.value = newValue
+//     console.log(newValue, 'newValue')
+//   }
+// )
+const emits = defineEmits<{
+  (e: 'submit-success'): void
+  (e: 'click-success', isSuccessful: boolean): void
+}>()
+const listVisible = ref<boolean>(false)
+
+const seeMore = () => {
+  emits('submit-success')
+  setTimeout(() => {
+    listVisible.value = true
+  }, 500) // 在 0.5 秒后执行 listVisible.value 的赋值操作
+}
+
+const handleOk = (e: MouseEvent) => {
+  console.log(e)
+  listVisible.value = false
+}
+
+//定位
+const positioning = (messageKey: string) => {
+  emits('click-success', false)
+  router.push({ path: '/task/customerlist', query: { clueId: messageKey } }) // 跳转到 /task/customerlist 页面
+}
+</script>
+<style lang="less" scoped>
+.ms-container {
+  width: 320px;
+}
+.top-column {
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 6px;
+  padding: 10px;
+  & div:nth-child(1) {
+    font-size: 14px;
+    font-weight: 600;
+  }
+  & div:nth-child(2) {
+    font-size: 14px;
+    color: #1890ff;
+    cursor: pointer;
+  }
+}
+.item-conent {
+  overflow: auto;
+  overflow-y: overlay; /* 让滚动条覆盖内容 */
+  overflow-y: auto;
+  padding: 0 10px 10px; /* 为滚动条留出空间 */
+  .item-msg {
+    border: 1px solid #303133;
+    border-radius: 4px;
+    padding: 5px;
+    margin-bottom: 8px;
+  }
+  .iconimg {
+    width: 13px;
+    height: auto;
+    margin-right: 5px;
+  }
+  .topImg {
+    width: 17px;
+    height: auto;
+  }
+  .conent-top {
+    height: 450.96px;
+    padding: 0 10px;
+  }
+  .conent-bot {
+    width: 100%;
+    text-align: center;
+    height: 25px;
+    line-height: 25px;
+    font-size: 14px;
+    color: #1890ff;
+    border-top: 1px solid #e0e0e0;
+  }
+  .empty {
+    margin-top: 30px;
+  }
+}
+.frame-style {
+  height: 480px;
+}
+// ::v-deep .ant-list-item-meta-description {
+//   text-align: right;
+// }
+// .positioning {
+//   padding: 0 0 0 8px !important;
+// ::v-deep .ant-list-item-action > li {
+//   padding: 0 0 0 8px;
+// }
+// }
+.listItem {
+  // display: flex;
+  // justify-content: space-between;
+  border-bottom: 1px solid #f0f0f0;
+  padding: 12px 0;
+}
+.listItemTop {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  // width: 300px;
+  .type {
+    font-weight: 700;
+    width: 130px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: normal; /* 允许溢出内容进行换行 */
+  }
+  .time {
+    color: #c3c3c3;
+    font-size: 12px;
+  }
+}
+.listItemCenter {
+  color: #767575;
+  width: 100%;
+  height: auto;
+  word-wrap: break-word;
+  word-break: break-all;
+  overflow: hidden;
+  white-space: normal !important;
+  margin: 5px 0;
+  font-size: 13px;
+}
+.iconContainer {
+  display: inline-block; /* 让容器内的内容水平排列 */
+  vertical-align: middle; /* 垂直居中对齐 */
+}
+
+.content {
+  white-space: normal; /* 不换行 */
+  overflow: hidden; /* 超出部分隐藏 */
+  text-overflow: clip; /* 超出部分裁剪隐藏 */
+}
+
+.content.expanded {
+  white-space: normal; /* 不换行 */
+  overflow: hidden; /* 超出部分隐藏 */
+  text-overflow: clip; /* 超出部分裁剪隐藏 */
+  display: -webkit-box; /* 将元素作为弹性伸缩盒子模型显示 */
+  -webkit-box-orient: vertical; /* 设置伸缩盒子的子元素垂直排列 */
+  -webkit-line-clamp: 2; /* 设置显示的行数 */
+}
+.openOrClose {
+  display: inline;
+  margin-left: 4px;
+  float: right;
+}
+.listItemBottom {
+  // margin-top: 5px;
+  display: flex;
+  justify-content: flex-end;
+}
+// .listItemLeft {
+//   display: flex;
+//   justify-content: space-between;
+//   width: 210px;
+//   .listItemLeftId {
+//     // width: 50%;
+//     // margin-right: 10px;
+//   }
+//   .listItemLeftMessage {
+//     // width: 50%;
+//   }
+// }
+// .listItemRight {
+//   width: 150px;
+// }
+</style>
diff --git a/src/components/Message/messageSearch.vue b/src/components/Message/messageSearch.vue
new file mode 100644
index 0000000..1cba931
--- /dev/null
+++ b/src/components/Message/messageSearch.vue
@@ -0,0 +1,72 @@
+<template>
+  <a-card :bordered="false" style="margin-bottom: 16px" :body-style="{ paddingBottom: 0 }">
+    <a-form :model="formModel" :label-col="labelCol">
+      <a-row :gutter="16">
+        <a-col :xl="12" :md="12" :sm="24">
+          <a-form-item label="创建时间">
+            <a-range-picker
+              v-model:value="searchTimeValue"
+              show-time
+              format="YYYY-MM-DD HH:mm:ss"
+              style="width: 100%"
+              :ranges="{
+                Today: [dayjs().startOf('date'), dayjs()]
+              }"
+            />
+          </a-form-item>
+        </a-col>
+        <a-col :xl="3" :md="3" :sm="12">
+          <search-actions :loading="props.loading" @search="search" @reset="reset" />
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-card>
+</template>
+
+<script setup lang="ts">
+import { Form } from 'ant-design-vue'
+import type { DistributeTaskManagementSearch } from '@/api/controlcenterstation/distributionTaskManagement/types'
+import dayjs from 'dayjs'
+import type { Dayjs } from 'dayjs'
+
+const useForm = Form.useForm
+
+// 表单 label 全局配置
+const labelCol = { md: { span: 6 } }
+
+const props = withDefaults(
+  defineProps<{
+    loading?: boolean
+  }>(),
+  { loading: false }
+)
+
+const emits = defineEmits<{
+  (e: 'search', params: Record<string, any>): void
+}>()
+
+const searchTimeValue = ref<[Dayjs, Dayjs]>()
+const formModel = reactive<DistributeTaskManagementSearch>({})
+
+const { resetFields } = useForm(formModel)
+
+const search = () => {
+  const param = toRaw(formModel)
+  if (searchTimeValue.value && searchTimeValue.value.length == 2) {
+    param.startTime = searchTimeValue.value[0].format('YYYY-MM-DD HH:mm:ss')
+    param.endTime = searchTimeValue.value[1].format('YYYY-MM-DD HH:mm:ss')
+  } else {
+    param.startTime = ''
+    param.endTime = ''
+  }
+  emits('search', param)
+}
+
+const reset = () => {
+  // 清空表单其他元素
+  resetFields()
+  // 清空时间
+  searchTimeValue.value = undefined
+  search()
+}
+</script>
diff --git a/src/hooks/websocket.ts b/src/hooks/websocket.ts
index aab8883..9b8b5f7 100644
--- a/src/hooks/websocket.ts
+++ b/src/hooks/websocket.ts
@@ -1,57 +1,68 @@
-// import { useWebSocket, type UseWebSocketReturn } from '@vueuse/core'
-// import { useUserStore } from '@/stores/user-store'
-// import { emitter } from '@/hooks/mitt'
-
-// let useWebSocketReturn: UseWebSocketReturn<any> | undefined = undefined
-// const useAdminWebSocket = () => {
-//   if (useWebSocketReturn && useWebSocketReturn.status.value != 'CLOSED') {
-//     return useWebSocketReturn
-//   }
-
-//   const { accessToken } = useUserStore()
-
-//   // ws地址
-//   const baseUri = import.meta.env.VITE_API_URL
-//   const host = window.location.host
-//   const wsUri = `ws://${host}${baseUri}/ws?access_token=${accessToken}`
-
-//   useWebSocketReturn = useWebSocket(wsUri, {
-//     autoReconnect: {
-//       retries: 3,
-//       delay: 1000,
-//       onFailed() {
-//         console.error('Failed to connect WebSocket after 3 retries')
-//       }
-//     },
-//     heartbeat: {
-//       message: '{"type": "ping"}',
-//       interval: 30000
-//     }
-//   })
-
-//   watch(
-//     () => useWebSocketReturn!.data.value,
-//     value => {
-//       let event
-//       let dataMsg
-
-//       try {
-//         dataMsg = JSON.parse(value)
-//         event = dataMsg.type
-//         // 心跳响应跳过发布
-//         if (event === 'pong') {
-//           return
-//         }
-//       } catch (e) {
-//         // 纯文本消息
-//         event = 'plaintext'
-//         dataMsg = value
-//       }
-//       emitter.emit(event, dataMsg)
-//     }
-//   )
-
-//   return useWebSocketReturn
-// }
-
-// export default useAdminWebSocket
+import { useWebSocket, type UseWebSocketReturn } from '@vueuse/core'
+import { useUserStore } from '@/stores/user-store'
+import { emitter } from '@/hooks/mitt'
+
+let useWebSocketReturn: UseWebSocketReturn<any> | undefined = undefined
+//它是一个自定义的Vue hook，用于管理WebSocket连接
+const useAdminWebSocket = () => {
+  //检查是否已经存在WebSocket连接，以及连接状态。如果WebSocket连接存在且状态不是已关闭，则直接返回现有的WebSocket连接。
+  if (useWebSocketReturn && useWebSocketReturn.status.value != 'CLOSED') {
+    return useWebSocketReturn
+  }
+
+  const { accessToken } = useUserStore()
+  console.log(accessToken, 'accessToken')
+
+  // ws地址
+  const baseUri = import.meta.env.VITE_API_URL
+  const host = window.location.host
+  console.log(host, 'host')
+  const wsUri = `ws://${host}${baseUri}/ws?access_token=${accessToken}`
+  console.log(wsUri, 'wsUri')
+
+  //使用useWebSocket函数创建WebSocket连接，并配置自动重连和心跳机制
+  useWebSocketReturn = useWebSocket(wsUri, {
+    autoReconnect: {
+      retries: 3,
+      delay: 1000,
+      onFailed() {
+        console.error('Failed to connect WebSocket after 3 retries')
+      }
+    },
+    heartbeat: {
+      message: '{"type": "ping"}',
+      interval: 30000
+    }
+  })
+
+  //监听WebSocket的数据变化，根据接收到的消息类型进行相应的处理，并通过emitter发布事件或数据。
+  watch(
+    () => useWebSocketReturn!.data.value,
+    value => {
+      let event
+      let dataMsg
+
+      try {
+        dataMsg = JSON.parse(value)
+        event = dataMsg.type
+        // 心跳响应跳过发布
+        if (event === 'pong') {
+          return
+        }
+      } catch (e) {
+        // 纯文本消息
+        event = 'plaintext'
+        dataMsg = value
+      }
+      emitter.emit(event, dataMsg)
+      console.log(dataMsg, 'dataMsg')
+      // Show alert with the received message
+      alert(JSON.stringify(dataMsg))
+    }
+  )
+
+  return useWebSocketReturn
+}
+
+//将创建的WebSocket连接对象返回给调用者
+export default useAdminWebSocket
diff --git a/src/layouts/components/RightContent/AvatarDropdown.vue b/src/layouts/components/RightContent/AvatarDropdown.vue
index b5f59ae..11c3187 100644
--- a/src/layouts/components/RightContent/AvatarDropdown.vue
+++ b/src/layouts/components/RightContent/AvatarDropdown.vue
@@ -2,46 +2,71 @@
   <span v-if="loading" :class="[$style.action, $style.account]">
     <a-spin size="small" style="margin-left: 8px; margin-right: 8px" />
   </span>
-
-  <header-dropdown v-else overlay-class-name="avatar-dropdown">
-    <span :class="[$style.action, $style.account]">
-      <!-- <a-avatar size="small" :class="$style.avatar" :src="currentUser.avatar" alt="avatar" /> -->
-      <a-avatar
-        size="small"
-        :class="$style.avatar"
-        :src="
-          userStore.userInfo?.avatar
-            ? envs.VITE_SERVERURL + '/avatar/' + userStore.userInfo?.avatar
-            : Avatar
-        "
-        alt="avatar"
-      />
-      <span :class="[$style.name, 'anticon']">{{ currentUser.nickname }}</span>
-    </span>
-
-    <template #overlay>
-      <a-menu :class="$style.menu" @click="onMenuClick">
-        <template v-if="props.menu">
-          <router-link to="/system/usercenter">
-            <a-menu-item key="center">
-              <UserOutlined />
-              个人中心
+  <div v-else style="display: flex">
+    <div
+      v-if="userInfoCurrent === 'ROLE_SALESMAN'"
+      ref="container"
+      @mousedown="handleDocumentClick"
+    >
+      <a-dropdown :visible="visible" @click="dropdownClick">
+        <a class="ant-dropdown-link" @click.prevent>
+          <i class="iconfont icon-xiaoxi1" style="font-size: 20px" />
+        </a>
+        <template #overlay>
+          <a-menu>
+            <a-menu-item>
+              <Message
+                :newclue-list="newclueList"
+                @mousedown.stop
+                @submit-success="reloadTable"
+                @click-success="reloadTable"
+              />
             </a-menu-item>
-          </router-link>
-          <!-- <a-menu-item key="settings">
+          </a-menu>
+        </template>
+      </a-dropdown>
+    </div>
+
+    <header-dropdown overlay-class-name="avatar-dropdown">
+      <span :class="[$style.action, $style.account]">
+        <!-- <a-avatar size="small" :class="$style.avatar" :src="currentUser.avatar" alt="avatar" /> -->
+        <a-avatar
+          size="small"
+          :class="$style.avatar"
+          :src="
+            userStore.userInfo?.avatar
+              ? envs.VITE_SERVERURL + '/avatar/' + userStore.userInfo?.avatar
+              : Avatar
+          "
+          alt="avatar"
+        />
+        <span :class="[$style.name, 'anticon']">{{ currentUser.nickname }}</span>
+      </span>
+
+      <template #overlay>
+        <a-menu :class="$style.menu" @click="onMenuClick">
+          <template v-if="props.menu">
+            <router-link to="/system/usercenter">
+              <a-menu-item key="center">
+                <UserOutlined />
+                个人中心
+              </a-menu-item>
+            </router-link>
+            <!-- <a-menu-item key="settings">
             <SettingOutlined />
             个人设置
           </a-menu-item>
           <a-menu-divider style="margin: 4px 0" /> -->
-        </template>
+          </template>
 
-        <a-menu-item key="logout">
-          <LogoutOutlined />
-          退出登录
-        </a-menu-item>
-      </a-menu>
-    </template>
-  </header-dropdown>
+          <a-menu-item key="logout">
+            <LogoutOutlined />
+            退出登录
+          </a-menu-item>
+        </a-menu>
+      </template>
+    </header-dropdown>
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -49,11 +74,48 @@ import HeaderDropdown from '@/layouts/components/HeaderDropdown'
 import type { MenuInfo } from 'ant-design-vue/es/menu/src/interface'
 import { Modal } from 'ant-design-vue'
 import { logout } from '@/api/auth'
-import { useUserStore } from '@/stores/user-store'
+// import { useUserStore } from '@/stores/user-store'
 import { loginPath } from '@/config'
 // import { fileAbsoluteUrl } from '@/utils/file-utils'
 import { useMultiTabStore } from '@/stores/multitab-store'
 import Avatar from '@/assets/images/avatar.png'
+import Message from '@/components/Message/index.vue'
+import { ref, watch, onMounted, onUnmounted } from 'vue'
+import { doRequest } from '@/utils/axios/request'
+import { messageAccessLogs } from '@/api/customermanagement/customerList'
+//获取当前账号角色
+import { useUserStore } from '@/stores/user-store'
+const { userInfo } = useUserStore()
+
+const userInfoCurrent = ref<string | undefined>('')
+onMounted(() => {
+  console.log(userInfo, 'userInfo?.permissions')
+  // userInfoCurrent = userInfo?.roleCodes
+  userInfoCurrent.value = userInfo?.roleCodes?.toLocaleString()
+})
+
+const visible = ref(false)
+const container = ref(null)
+// 新线索列表
+interface DataItem {
+  id: number | undefined
+  type: number
+  createTime: string
+  content: string
+  messageKey: string
+  status: number | undefined
+  title: string
+  show: boolean
+}
+
+const newclueList = ref<DataItem[]>([
+  // {
+  //   id: undefined,
+  //   type: '',
+  //   createTime: '',
+  //   content: ''
+  // }
+])
 
 const multiTabStore = useMultiTabStore()
 
@@ -113,6 +175,52 @@ const onMenuClick = (event: MenuInfo) => {
     loginOut()
   }
 }
+//获取新消息列表
+const getMessageList = () => {
+  doRequest(
+    messageAccessLogs({
+      size: 10,
+      page: 1
+    }),
+    {
+      onSuccess: (res: any) => {
+        newclueList.value = res.data.records
+        newclueList.value.forEach(item => {
+          item.show = true
+        })
+      }
+    }
+  )
+}
+const dropdownClick = async () => {
+  if (!visible.value) {
+    await getMessageList()
+  }
+  visible.value = !visible.value
+}
+const handleDocumentClick = (event: MouseEvent) => {
+  const messageElement = document.querySelector('.message')
+
+  if (
+    visible.value &&
+    container.value &&
+    !(container.value as HTMLElement).contains(event.target as Node)
+  ) {
+    if (!messageElement || !messageElement.contains(event.target as Node)) {
+      visible.value = false
+    }
+  }
+}
+
+document.addEventListener('mousedown', handleDocumentClick)
+
+onUnmounted(() => {
+  document.removeEventListener('mousedown', handleDocumentClick)
+})
+//刷新表格
+const reloadTable = () => {
+  visible.value = false
+}
 </script>
 
 <script lang="ts">
diff --git a/src/main.ts b/src/main.ts
index 15ab25b..423d902 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -13,6 +13,7 @@ import './styles/index.less'
 import App from './App.vue'
 import { enableI18n } from '@/config'
 import { provincesAndCitiesAndAutonomousRegions } from '@/utils/geopolitical-customers'
+import '@/assets/iconfont.css'
 
 // 声明一个全局变量，将数据赋值给它
 declare global {
diff --git a/src/views/basic/iframe/iframeSearch.vue b/src/views/basic/iframe/iframeSearch.vue
new file mode 100644
index 0000000..b1d3f75
--- /dev/null
+++ b/src/views/basic/iframe/iframeSearch.vue
@@ -0,0 +1,69 @@
+<template>
+  <div>
+    <dict-select
+      v-model:value="formModel.httpStatus"
+      style="display: none"
+      dict-code="user_status"
+      allow-clear
+      placeholder="请选择"
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { Form } from 'ant-design-vue'
+import dayjs from 'dayjs'
+import type { Dayjs } from 'dayjs'
+import type { CustomerListSearch } from '@/api/customermanagement/customerList/types'
+
+const useForm = Form.useForm
+
+// 表单 label 全局配置
+const labelCol = { md: { span: 8 } }
+
+const props = withDefaults(
+  defineProps<{
+    loading?: boolean
+  }>(),
+  { loading: false }
+)
+
+const emits = defineEmits<{
+  (e: 'search', params: Record<string, any>): void
+}>()
+
+const searchTimeValue = ref<[Dayjs, Dayjs]>()
+const formModel = reactive<CustomerListSearch>({
+  clueLabelName: '',
+  //线索阶段
+  userId: undefined,
+  //标签
+  httpStatus: undefined,
+  //模糊查询
+  ip: '',
+  //号码
+  nid: ''
+})
+
+const { resetFields } = useForm(formModel)
+
+const search = () => {
+  const param = toRaw(formModel)
+  if (searchTimeValue.value && searchTimeValue.value.length == 2) {
+    param.startTime = searchTimeValue.value[0].format('YYYY-MM-DD HH:mm:ss')
+    param.endTime = searchTimeValue.value[1].format('YYYY-MM-DD HH:mm:ss')
+  } else {
+    param.startTime = ''
+    param.endTime = ''
+  }
+  emits('search', param)
+}
+
+const reset = () => {
+  // 清空表单其他元素
+  resetFields()
+  // 清空时间
+  searchTimeValue.value = undefined
+  search()
+}
+</script>
diff --git a/src/views/basic/iframe/index.vue b/src/views/basic/iframe/index.vue
index e6bd386..91930ab 100644
--- a/src/views/basic/iframe/index.vue
+++ b/src/views/basic/iframe/index.vue
@@ -8,12 +8,15 @@
     <iframe :id="id" ref="iframeRef" :src="url" class="iframe" @load="hideLoading" />
    
   </a-spin> -->
+  <!-- 工具栏 -->
+  <customer-list-search :loading="tableRef?.loading" @search="searchTable" />
   <div class="homeContent">
     <div class="bullshit">努力开发中，敬请期待...</div>
   </div>
 </template>
 
 <script setup lang="ts">
+import CustomerListSearch from '@/views/basic/iframe/iframeSearch.vue'
 // 如果需要被多页签缓存，必须要设置组件名称
 defineOptions({ name: 'IframeView' })
 
diff --git a/src/views/customermanagement/customerList/customerList.vue b/src/views/customermanagement/customerList/customerList.vue
index 3655889..a498980 100644
--- a/src/views/customermanagement/customerList/customerList.vue
+++ b/src/views/customermanagement/customerList/customerList.vue
@@ -52,6 +52,12 @@
         </a-tooltip>
         <span v-else>--</span>
       </template>
+      <!-- <template v-else-if="column.key === 'index'">
+        <span>
+          <i class="iconfont icon-xin" style="font-size: 18px; margin-right: 8px; color: red"></i>
+          {{ index + 1 }}
+        </span>
+      </template> -->
     </template>
   </pro-table>
   <!-- 详情弹窗 -->
@@ -61,7 +67,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue'
+import { ref, onMounted } from 'vue'
 //更多操作
 // import { UserOutlined, DownOutlined } from '@ant-design/icons-vue'
 // import type { MenuProps } from 'ant-design-vue'
@@ -80,9 +86,19 @@ import { pageAccessLogs } from '@/api/customermanagement/customerList'
 import CustomerListSearch from '@/views/customermanagement/customerList/customerListSearch.vue'
 import CustomerListViewModal from '@/views/customermanagement/customerList/customerListModal.vue'
 import CustomerListEditModal from '@/views/customermanagement/customerList/customerListEditModal.vue'
+import { useRoute } from 'vue-router'
 //删除
 // import { doRequest } from '@/utils/axios/request'
 
+const route = useRoute()
+
+onMounted(() => {
+  const customerId = route.query.clueId as string // 使用类型断言将参数转换为字符串
+  if (customerId) {
+    searchTable({ clueId: customerId })
+  }
+})
+
 defineOptions({ name: 'CustomerList' })
 
 //更多操作
@@ -141,9 +157,32 @@ const handleEdit = (record: CustomerListRecord, tabIndex: string) => {
 const columns: ProColumns[] = [
   {
     title: '序号',
+    dataIndex: 'index',
     width: '80px',
-    customRender: function ({ index }) {
-      return `${index + 1}`
+    customRender: function ({ index, record }: { index: number; record: any }) {
+      if (record.clueStageName === '阶段二') {
+        return {
+          children: [
+            h('span', [
+              h('i', {
+                style: 'color: red; margin-right: 4px;',
+                class: 'iconfont icon-xin'
+              }),
+              `${index + 1}`
+            ])
+          ]
+        }
+      } else {
+        return {
+          children: h(
+            'span',
+            {
+              style: 'margin-left: 20px;'
+            },
+            `${index + 1}`
+          )
+        }
+      }
     }
   },
   {
diff --git a/src/views/login/components/LoginContent.vue b/src/views/login/components/LoginContent.vue
index 3a61ecc..cb68558 100644
--- a/src/views/login/components/LoginContent.vue
+++ b/src/views/login/components/LoginContent.vue
@@ -80,6 +80,7 @@ import { projectTitle, projectDesc, enableLoginCaptcha } from '@/config'
 import { SliderCaptcha as LoginCaptcha } from '@/components/Captcha'
 import { useI18n } from 'vue-i18n'
 import { getCodeData } from '@/api/auth'
+import useAdminWebSocket from '@/hooks/websocket'
 
 const { t } = useI18n()
 
@@ -171,6 +172,24 @@ function handleSubmit(captchaId?: string) {
       store(res)
       const nextPath = (router.currentRoute.value.query.redirect as string) || '/'
       router.push(nextPath)
+      // 获取 WebSocket 连接对象
+      const webSocket = useAdminWebSocket()
+
+      // 确保 WebSocket 连接已经建立
+      if (webSocket && webSocket.status.value === 'OPEN') {
+        // 要发送的消息数据
+        const messageData = {
+          type: 'chatMessage',
+          content: 'Hello, WebSocket!'
+        }
+
+        // 发送消息
+        webSocket.send(JSON.stringify(messageData))
+        // 输出发送的消息内容
+        console.log('Sent message:', JSON.stringify(messageData))
+      } else {
+        console.error('WebSocket connection is not open')
+      }
     })
     .catch(err => {
       // console.log(accountLoginFormRef.value, 'accountLoginFormRef')
diff --git a/types/components.d.ts b/types/components.d.ts
index 7494a80..ae7bb3f 100644
--- a/types/components.d.ts
+++ b/types/components.d.ts
@@ -102,6 +102,8 @@ declare module '@vue/runtime-core' {
     LovModal: typeof import('./../src/components/Lov/LovModal.vue')['default']
     LovSearch: typeof import('./../src/components/Lov/LovSearch.vue')['default']
     MailOutlined: typeof import('@ant-design/icons-vue')['MailOutlined']
+    Message: typeof import('./../src/components/Message/index.vue')['default']
+    MessageSearch: typeof import('./../src/components/Message/messageSearch.vue')['default']
     MinusCircleOutlined: typeof import('@ant-design/icons-vue')['MinusCircleOutlined']
     MobileOutlined: typeof import('@ant-design/icons-vue')['MobileOutlined']
     OperationGroup: typeof import('./../src/components/Operation/OperationGroup.vue')['default']
diff --git a/vite.config.ts b/vite.config.ts
index ea408cf..4014482 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -28,12 +28,12 @@ import { antdvStyleDeps } from './src/utils/resolvers'
 //ts
 // export const serverAddress = 'http://172.18.0.228:8000'
 //测试
-// export const serverAddress = 'http://39.100.77.21:8000'
+export const serverAddress = 'http://39.100.77.21:8000'
 
 //线上ip
 // export const serverAddress = 'http://175.27.212.74:80'
 //线上域名,现在用这个
-export const serverAddress = 'https://byffp.top'
+// export const serverAddress = 'https://byffp.top'
 // export const serverAddress = 'http://8.130.96.163:8100'
 // https://vitejs.dev/config/
 // export const serverAddress = process.env.VUE_APP_BASE_API

From ce7f6383d05699d09410b3b1b972568545d4c0e1 Mon Sep 17 00:00:00 2001
From: doublekou <951513186@qq.com>
Date: Mon, 27 Nov 2023 16:44:24 +0800
Subject: [PATCH 2/2] =?UTF-8?q?websocket=E8=BF=9E=E6=8E=A5=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Message/index.vue              | 181 +++++-------------
 src/hooks/websocket.ts                        |  10 +-
 .../RightContent/AvatarDropdown.vue           |  14 +-
 .../customerList/customerList.vue             |   4 +-
 src/views/login/components/LoginContent.vue   |  38 ++--
 vite.config.ts                                |   6 +-
 6 files changed, 94 insertions(+), 159 deletions(-)

diff --git a/src/components/Message/index.vue b/src/components/Message/index.vue
index 288f8bb..348c107 100644
--- a/src/components/Message/index.vue
+++ b/src/components/Message/index.vue
@@ -5,20 +5,7 @@
       <div class="seeMore" @click="seeMore">查看更多</div>
     </div>
     <div class="item-conent frame-style">
-      <div class="center">
-        <!-- <a-list item-layout="horizontal" :data-source="data">
-          <template #renderItem="{ item }">
-            <a-list-item>
-              <a-list-item-meta description="有新线索,请注意跟单">
-                <template #avatar> id：123455666</template>
-              </a-list-item-meta>
-              <template #actions>
-                <a key="list-loadmore-edit" style="margin-right: 8px">确认</a>
-                <a key="list-loadmore-more">定位</a>
-              </template>
-            </a-list-item>
-          </template>
-        </a-list> -->
+      <div v-if="newclueList.length > 0" class="center">
         <div v-for="(item, index) in newclueList" :key="index" class="listItem">
           <div class="listItemTop">
             <div class="type">
@@ -27,7 +14,9 @@
             <div class="time">{{ item.createTime }}</div>
           </div>
           <div class="listItemCenter">
-            <span class="content" :class="{ expanded: item.show }">{{ item.content }}</span>
+            <span ref="contentRef" class="content" :class="{ expanded: item.show }">{{
+              item.content
+            }}</span>
             <div class="iconContainer" @click="toggleShowAll(item)">
               <div v-if="item.show" class="openOrClose">
                 <span><down-outlined /></span>
@@ -40,7 +29,7 @@
 
           <div class="listItemBottom">
             <a key="list-loadmore-edit" style="margin-right: 8px">{{
-              item.status === 1 ? '已读' : '确认'
+              item.state === 1 ? '已读' : '确认'
             }}</a>
             <a
               key="list-loadmore-more"
@@ -51,11 +40,11 @@
           </div>
         </div>
       </div>
-      <!-- <div class="empty">
+      <div v-else class="empty">
         <a-empty description="暂无数据" :image="zanwu" />
-      </div> -->
+      </div>
     </div>
-    <!-- 列表弹出框 -->
+    <!-- 新消息列表弹出框 -->
     <div>
       <a-modal
         v-model:visible="listVisible"
@@ -109,7 +98,7 @@
 </template>
 
 <script setup lang="ts">
-import { defineComponent, ref, watch, onMounted } from 'vue'
+import { ref, watch, onMounted } from 'vue'
 import zanwu from '@/assets/images/zanwu.png'
 //底部表格
 import ProTable from '#/table'
@@ -119,16 +108,43 @@ import { messageAccessLogs } from '@/api/customermanagement/customerList'
 import type { CustomerListQO } from '@/api/customermanagement/customerList/types'
 import MessageSearch from '@/components/Message/messageSearch.vue'
 import type { DistributeTaskManagementPageParam } from '@/api/controlcenterstation/distributionTaskManagement/types'
-import { doRequest } from '@/utils/axios/request'
-import { pageAccessLogs } from '@/api/customermanagement/customerList'
 import router from '@/router'
 
-//展开、收起
-// const show = ref(false)
-//展开收起
-const toggleShowAll = (itemShow: DataItem) => {
-  itemShow.show = !itemShow.show
+defineOptions({ name: 'MessagePage' })
+
+interface DataItem {
+  id: number | undefined
+  type: number
+  createTime: string
+  content: string
+  messageKey: string
+  state: number | undefined
+  title: string
+  show: boolean
 }
+
+const props = defineProps({
+  newclueList: {
+    type: Array as () => DataItem[],
+    required: true,
+    default: () => []
+  }
+  // 其他 props...
+})
+
+// // 监听 props.listVisible 的变化，将其赋值给 visible
+// watch(
+//   () => props.listVisible,
+//   newValue => {
+//     listVisible.value = newValue
+//     console.log(newValue, 'newValue')
+//   }
+// )
+const emits = defineEmits<{
+  (e: 'submit-success'): void
+  (e: 'click-success', isSuccessful: boolean): void
+}>()
+
 //底部表格
 // 表格组件引用
 const tableRef = ref<ProTableInstanceExpose>()
@@ -197,37 +213,12 @@ const columns: ProColumns[] = [
       }
     }
   },
-  // {
-  //   title: '描述',
-  //   dataIndex: 'clueLabelList',
-  //   width: 200,
-  //   ellipsis: true,
-  //   align: 'center',
-  //   onCell: () => {
-  //     return {
-  //       style: {
-  //         maxWidth: 200,
-  //         overflow: 'hidden',
-  //         whiteSpace: 'nowrap',
-  //         textOverflow: 'ellipsis',
-  //         cursor: 'pointer'
-  //       }
-  //     }
-  //   }
-  // },
   {
     title: '描述',
     dataIndex: 'content',
     ellipsis: true,
     align: 'center'
   },
-  // {
-  //   title: '线索日期',
-  //   dataIndex: 'clueTime',
-  //   width: 150,
-  //   align: 'center',
-  //   ellipsis: true
-  // },
   {
     title: '创建日期',
     dataIndex: 'createTime',
@@ -235,57 +226,7 @@ const columns: ProColumns[] = [
     align: 'center',
     ellipsis: true
   }
-  // {
-  //   key: 'operate',
-  //   title: '操作',
-  //   width: 100,
-  //   align: 'center',
-  //   fixed: 'right'
-  // }
-  // {
-  //   title: '客户名称',
-  //   dataIndex: 'username'
-  // },
-  // {
-  //   title: '跟进人',
-  //   dataIndex: 'method'
-  // },
 ]
-
-defineOptions({ name: 'MessagePage' })
-
-interface DataItem {
-  id: number | undefined
-  type: number
-  createTime: string
-  content: string
-  messageKey: string
-  status: number | undefined
-  title: string
-  show: boolean
-}
-
-const props = defineProps({
-  newclueList: {
-    type: Array as () => DataItem[],
-    required: true,
-    default: () => []
-  }
-  // 其他 props...
-})
-
-// // 监听 props.listVisible 的变化，将其赋值给 visible
-// watch(
-//   () => props.listVisible,
-//   newValue => {
-//     listVisible.value = newValue
-//     console.log(newValue, 'newValue')
-//   }
-// )
-const emits = defineEmits<{
-  (e: 'submit-success'): void
-  (e: 'click-success', isSuccessful: boolean): void
-}>()
 const listVisible = ref<boolean>(false)
 
 const seeMore = () => {
@@ -295,6 +236,7 @@ const seeMore = () => {
   }, 500) // 在 0.5 秒后执行 listVisible.value 的赋值操作
 }
 
+//新消息列表弹出框确定点击事件
 const handleOk = (e: MouseEvent) => {
   console.log(e)
   listVisible.value = false
@@ -305,6 +247,11 @@ const positioning = (messageKey: string) => {
   emits('click-success', false)
   router.push({ path: '/task/customerlist', query: { clueId: messageKey } }) // 跳转到 /task/customerlist 页面
 }
+//展开收起
+const toggleShowAll = (itemShow: DataItem) => {
+  itemShow.show = !itemShow.show
+}
+const contentRef = ref<HTMLElement | null>(null)
 </script>
 <style lang="less" scoped>
 .ms-container {
@@ -365,18 +312,7 @@ const positioning = (messageKey: string) => {
 .frame-style {
   height: 480px;
 }
-// ::v-deep .ant-list-item-meta-description {
-//   text-align: right;
-// }
-// .positioning {
-//   padding: 0 0 0 8px !important;
-// ::v-deep .ant-list-item-action > li {
-//   padding: 0 0 0 8px;
-// }
-// }
 .listItem {
-  // display: flex;
-  // justify-content: space-between;
   border-bottom: 1px solid #f0f0f0;
   padding: 12px 0;
 }
@@ -384,7 +320,6 @@ const positioning = (messageKey: string) => {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  // width: 300px;
   .type {
     font-weight: 700;
     width: 130px;
@@ -398,6 +333,8 @@ const positioning = (messageKey: string) => {
   }
 }
 .listItemCenter {
+  display: flex;
+  align-items: end;
   color: #767575;
   width: 100%;
   height: auto;
@@ -433,23 +370,7 @@ const positioning = (messageKey: string) => {
   float: right;
 }
 .listItemBottom {
-  // margin-top: 5px;
   display: flex;
   justify-content: flex-end;
 }
-// .listItemLeft {
-//   display: flex;
-//   justify-content: space-between;
-//   width: 210px;
-//   .listItemLeftId {
-//     // width: 50%;
-//     // margin-right: 10px;
-//   }
-//   .listItemLeftMessage {
-//     // width: 50%;
-//   }
-// }
-// .listItemRight {
-//   width: 150px;
-// }
 </style>
diff --git a/src/hooks/websocket.ts b/src/hooks/websocket.ts
index 9b8b5f7..5f0ae7b 100644
--- a/src/hooks/websocket.ts
+++ b/src/hooks/websocket.ts
@@ -1,6 +1,7 @@
 import { useWebSocket, type UseWebSocketReturn } from '@vueuse/core'
 import { useUserStore } from '@/stores/user-store'
 import { emitter } from '@/hooks/mitt'
+import { message } from 'ant-design-vue'
 
 let useWebSocketReturn: UseWebSocketReturn<any> | undefined = undefined
 //它是一个自定义的Vue hook，用于管理WebSocket连接
@@ -54,10 +55,13 @@ const useAdminWebSocket = () => {
         event = 'plaintext'
         dataMsg = value
       }
-      emitter.emit(event, dataMsg)
-      console.log(dataMsg, 'dataMsg')
+      // emitter.emit(event, dataMsg)
+      // console.log(dataMsg, 'dataMsg')
       // Show alert with the received message
-      alert(JSON.stringify(dataMsg))
+      // alert(JSON.stringify(dataMsg.title) + JSON.stringify(dataMsg.content))
+      message.info(
+        JSON.stringify(dataMsg.title).slice(1, -1) +'：'+ JSON.stringify(dataMsg.content).slice(1, -1)
+      )
     }
   )
 
diff --git a/src/layouts/components/RightContent/AvatarDropdown.vue b/src/layouts/components/RightContent/AvatarDropdown.vue
index 11c3187..5e21dd1 100644
--- a/src/layouts/components/RightContent/AvatarDropdown.vue
+++ b/src/layouts/components/RightContent/AvatarDropdown.vue
@@ -4,7 +4,7 @@
   </span>
   <div v-else style="display: flex">
     <div
-      v-if="userInfoCurrent === 'ROLE_SALESMAN'"
+      v-if="userInfoCurrent === 'ROLE_SALESMAN' || userInfoCurrent === 'ROLE_STORE_SALESMAN'"
       ref="container"
       @mousedown="handleDocumentClick"
     >
@@ -83,15 +83,20 @@ import Message from '@/components/Message/index.vue'
 import { ref, watch, onMounted, onUnmounted } from 'vue'
 import { doRequest } from '@/utils/axios/request'
 import { messageAccessLogs } from '@/api/customermanagement/customerList'
+import useAdminWebSocket from '@/hooks/websocket'
 //获取当前账号角色
 import { useUserStore } from '@/stores/user-store'
 const { userInfo } = useUserStore()
 
 const userInfoCurrent = ref<string | undefined>('')
 onMounted(() => {
-  console.log(userInfo, 'userInfo?.permissions')
-  // userInfoCurrent = userInfo?.roleCodes
   userInfoCurrent.value = userInfo?.roleCodes?.toLocaleString()
+  if (
+    userInfoCurrent.value === 'ROLE_SALESMAN' ||
+    userInfoCurrent.value === 'ROLE_STORE_SALESMAN'
+  ) {
+    useAdminWebSocket()
+  }
 })
 
 const visible = ref(false)
@@ -103,7 +108,7 @@ interface DataItem {
   createTime: string
   content: string
   messageKey: string
-  status: number | undefined
+  state: number | undefined
   title: string
   show: boolean
 }
@@ -185,6 +190,7 @@ const getMessageList = () => {
     {
       onSuccess: (res: any) => {
         newclueList.value = res.data.records
+        console.log(newclueList.value, 'newclueList.value')
         newclueList.value.forEach(item => {
           item.show = true
         })
diff --git a/src/views/customermanagement/customerList/customerList.vue b/src/views/customermanagement/customerList/customerList.vue
index a498980..3477cb0 100644
--- a/src/views/customermanagement/customerList/customerList.vue
+++ b/src/views/customermanagement/customerList/customerList.vue
@@ -87,6 +87,7 @@ import CustomerListSearch from '@/views/customermanagement/customerList/customer
 import CustomerListViewModal from '@/views/customermanagement/customerList/customerListModal.vue'
 import CustomerListEditModal from '@/views/customermanagement/customerList/customerListEditModal.vue'
 import { useRoute } from 'vue-router'
+// import useAdminWebSocket from '@/hooks/websocket'
 //删除
 // import { doRequest } from '@/utils/axios/request'
 
@@ -97,6 +98,7 @@ onMounted(() => {
   if (customerId) {
     searchTable({ clueId: customerId })
   }
+  // useAdminWebSocket()
 })
 
 defineOptions({ name: 'CustomerList' })
@@ -160,7 +162,7 @@ const columns: ProColumns[] = [
     dataIndex: 'index',
     width: '80px',
     customRender: function ({ index, record }: { index: number; record: any }) {
-      if (record.clueStageName === '阶段二') {
+      if (record.isNewClue === true) {
         return {
           children: [
             h('span', [
diff --git a/src/views/login/components/LoginContent.vue b/src/views/login/components/LoginContent.vue
index cb68558..4045a48 100644
--- a/src/views/login/components/LoginContent.vue
+++ b/src/views/login/components/LoginContent.vue
@@ -80,7 +80,7 @@ import { projectTitle, projectDesc, enableLoginCaptcha } from '@/config'
 import { SliderCaptcha as LoginCaptcha } from '@/components/Captcha'
 import { useI18n } from 'vue-i18n'
 import { getCodeData } from '@/api/auth'
-import useAdminWebSocket from '@/hooks/websocket'
+// import useAdminWebSocket from '@/hooks/websocket'
 
 const { t } = useI18n()
 
@@ -172,24 +172,26 @@ function handleSubmit(captchaId?: string) {
       store(res)
       const nextPath = (router.currentRoute.value.query.redirect as string) || '/'
       router.push(nextPath)
+
       // 获取 WebSocket 连接对象
-      const webSocket = useAdminWebSocket()
-
-      // 确保 WebSocket 连接已经建立
-      if (webSocket && webSocket.status.value === 'OPEN') {
-        // 要发送的消息数据
-        const messageData = {
-          type: 'chatMessage',
-          content: 'Hello, WebSocket!'
-        }
-
-        // 发送消息
-        webSocket.send(JSON.stringify(messageData))
-        // 输出发送的消息内容
-        console.log('Sent message:', JSON.stringify(messageData))
-      } else {
-        console.error('WebSocket connection is not open')
-      }
+      // const webSocket =
+      // useAdminWebSocket()
+
+      // // 确保 WebSocket 连接已经建立
+      // if (webSocket && webSocket.status.value === 'OPEN') {
+      //   // 要发送的消息数据
+      //   const messageData = {
+      //     type: 'chatMessage',
+      //     content: 'Hello, WebSocket!'
+      //   }
+
+      //   // 发送消息
+      //   webSocket.send(JSON.stringify(messageData))
+      //   // 输出发送的消息内容
+      //   console.log('Sent message:', JSON.stringify(messageData))
+      // } else {
+      //   console.error('WebSocket connection is not open')
+      // }
     })
     .catch(err => {
       // console.log(accountLoginFormRef.value, 'accountLoginFormRef')
diff --git a/vite.config.ts b/vite.config.ts
index 4014482..9167971 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -26,9 +26,9 @@ import { antdvStyleDeps } from './src/utils/resolvers'
 //jt
 // export const serverAddress = 'http://172.18.1.8:8000'
 //ts
-// export const serverAddress = 'http://172.18.0.228:8000'
+export const serverAddress = 'http://172.18.0.228:8000'
 //测试
-export const serverAddress = 'http://39.100.77.21:8000'
+// export const serverAddress = 'http://39.100.77.21:8000'
 
 //线上ip
 // export const serverAddress = 'http://175.27.212.74:80'
@@ -45,7 +45,7 @@ export default defineConfig({
       '^/api': {
         target: serverAddress,
         changeOrigin: true,
-        // ws: true,
+        ws: true,
         rewrite: path => {
           return path.replace(/^\/api/, '')
         }