Merge remote-tracking branch 'origin/main'

5 months ago · 1d085285b5
parent c2f478f6d4 b06b8e7f90
commit 1d085285b5
3 changed files with 264 additions and 200 deletions
--- a/src/config.js
+++ b/src/config.js
@ -21,7 +21,7 @@ export const EMAIL_HOST = 'https://p9axztuwd7x8a7.mycht.cn/mail-server/service-m
 export const API_HOST = 'https://p9axztuwd7x8a7.mycht.cn/whatsapp_server/v2';
 export const WS_URL = 'wss://p9axztuwd7x8a7.mycht.cn/whatsapp_server'; // prod:
 export const VONAGE_URL = 'https://p9axztuwd7x8a7.mycht.cn/vonage-server'; // 语音和视频接口:
-export const HT3 =  process.env.NODE_ENV === 'production' ? 'https://p9axztuwd7x8a7.mycht.cn/ht3' : 'http://127.0.0.1:8000';
+export const HT3 =  process.env.NODE_ENV === 'production' ? 'https://p9axztuwd7x8a7.mycht.cn/ht3' : 'https://p9axztuwd7x8a7.mycht.cn/ht3';

 export const DATE_FORMAT = 'YYYY-MM-DD';
 export const DATETIME_FORMAT = 'YYYY-MM-DD HH:mm:ss';
--- a/src/stores/AuthStore.js
+++ b/src/stores/AuthStore.js
@ -3,7 +3,7 @@ import { devtools } from 'zustand/middleware'
 import { fetchJSON } from '@/utils/request'
 import { isEmpty, isNotEmpty } from '@/utils/commons'
 import { API_HOST, BUILD_VERSION } from '@/config'
-import { usingStorage } from '@/utils/usingStorage';
+import { usingStorage } from '@/utils/usingStorage'

 export const PERM_MERGE_CONVERSATION = 'merge-conversation'
 export const PERM_ASSIGN_NEW_CONVERSATION = 'assign-new-conversation'
@ -13,7 +13,9 @@ export const PERM_IMPORT_EMAIL = 'import-email'

 const WAI_SERVER_KEY = 'G-STR:WAI_SERVER'

-const useAuthStore = create(devtools((set, get) => ({
+const useAuthStore = create(
+  devtools(
+    (set, get) => ({
      loginUser: {
        userId: -1,
        userIdStr: '-1',
@ -39,7 +41,7 @@ const useAuthStore = create(devtools((set, get) => ({
        }

        if (perm === PERM_USE_EMAL) {
-      return true//['501', '466', '599', '495', '143', '370', '639', '513', '654', '404', '383', '227'].includes(loginUser.userId)
+          return true //['501', '466', '599', '495', '143', '370', '639', '513', '654', '404', '383', '227'].includes(loginUser.userId)
        }

        // 导入邮件消息，需要配置才能使用
@ -64,10 +66,7 @@ const useAuthStore = create(devtools((set, get) => ({

        setLoginStatus(200)

-    const json = await fetchJSON(
-      'https://p9axztuwd7x8a7.mycht.cn/dingtalk/dingtalkwork/WhatsAppAuth',
-      { authCode },
-    )
+        const json = await fetchJSON('https://p9axztuwd7x8a7.mycht.cn/dingtalk/dingtalkwork/WhatsAppAuth', { authCode })

        if (json.errcode === 0 && isNotEmpty(json.result.opisn)) {
          // TODO：保存个人 WhatsApp 服务器地址
@ -81,7 +80,7 @@ const useAuthStore = create(devtools((set, get) => ({
                  return acc.OPI_SN
                })
                .join(','),
-          emailList: json.result?.emaillist.map(item => {
+              emailList: json.result?.emaillist.map((item) => {
                return {
                  opi_sn: item.opi_sn,
                  mat_sn: item.mat_sn,
@ -111,14 +110,14 @@ const useAuthStore = create(devtools((set, get) => ({
      getPrimaryEmail: () => {
        const { loginUser } = get()

-    const defaultList = loginUser.emailList.filter(email => {
+        const defaultList = loginUser.emailList.filter((email) => {
          return email.default
        })

        if (defaultList.length > 0) {
          return defaultList[0].email
        } else {
-      const backupList = loginUser.emailList.filter(email => {
+          const backupList = loginUser.emailList.filter((email) => {
            return email.backup
          })

@ -157,8 +156,10 @@ const useAuthStore = create(devtools((set, get) => ({
      },

      loadUserSession: () => {
-    let sessionData = window.sessionStorage.getItem('GLOBAL_SALES_LOGIN_USER')
-    // let sessionData ='{"userId":"155","userIdStr":"155","emailList":[],"whatsAppBusiness":"+8617607730395","whatsAppNo":null,"username":"尹诚诚","avatarUrl":"https://static-legacy.dingtalk.com/media/lADPBE1XYG_HAcDNAgDNAgA_512_512.jpg","mobile":"+86-18507832160","email":"ycc@hainatravel.com","openId":"K8BNXMf8ESSr1DzLVUrX7wiEiE","accountList":[{"OPI_SN":155,"OPI_Code":"YCC","OPI_NameCN":"尹诚诚","OPI_DEI_SN":1,"OPI_NameEN":"Yin Chengcheng"}]}'
+        let sessionData =
+          import.meta.env.PROD === 'production'
+            ? window.sessionStorage.getItem('GLOBAL_SALES_LOGIN_USER')
+            : '{"userId":"155","userIdStr":"155","emailList":[],"whatsAppBusiness":"+8617607730395","whatsAppNo":null,"username":"尹诚诚","avatarUrl":"https://static-legacy.dingtalk.com/media/lADPBE1XYG_HAcDNAgDNAgA_512_512.jpg","mobile":"+86-18507832160","email":"ycc@hainatravel.com","openId":"K8BNXMf8ESSr1DzLVUrX7wiEiE","accountList":[{"OPI_SN":155,"OPI_Code":"YCC","OPI_NameCN":"尹诚诚","OPI_DEI_SN":1,"OPI_NameEN":"Yin Chengcheng"}]}'

        // if (window.location.hostname === '202.103.68.93' && window.location.port === '4173' && isEmpty(sessionData)) {
        //   sessionData = `{"userId":"383","userIdStr":"383,609","emailList":[{"opi_sn":383,"mat_sn":760,"email":"lyj@asiahighlights.com","default":false,"backup":false},{"opi_sn":383,"mat_sn":759,"email":"lyj@chinahighlights.com","default":true,"backup":false},{"opi_sn":383,"mat_sn":758,"email":"lyj@hainatravel.com","default":false,"backup":false}],"username":"廖一军","avatarUrl":"https://static-legacy.dingtalk.com/media/lALPBDDrhXr716HNAoDNAoA_640_640.png","mobile":"+86-18777396951","email":"lyj@hainatravel.com","whatsAppBusiness":"8617458471254","openId":"iioljiPmZ4RPoOYpkFiSn7IKAiEiE","accountList":[{"OPI_SN":383,"OPI_Code":"LYJ","OPI_NameCN":"廖一军","OPI_DEI_SN":7,"OPI_NameEN":"Jimmy Liow"},{"OPI_SN":609,"OPI_Code":"LYJAH","OPI_NameCN":"廖一军（ah）","OPI_DEI_SN":28,"OPI_NameEN":"Jimmy Liow"}]}`
@ -179,27 +180,23 @@ const useAuthStore = create(devtools((set, get) => ({

      saveUserSession: () => {
        const { loginUser } = get()
-    window.sessionStorage.setItem(
-      'GLOBAL_SALES_LOGIN_USER',
-      JSON.stringify(loginUser),
-    )
+        window.sessionStorage.setItem('GLOBAL_SALES_LOGIN_USER', JSON.stringify(loginUser))
      },

      setWhatsAppProfile: async (userId, whatsAppBusiness, whatsAppNo) => {
        const { loginUser, saveUserSession } = get()
        const postWABAUrl = `${API_HOST}/v2/set_whatsapp_info`

-    const params = {opi_sn: userId, whatsapp_waba: whatsAppBusiness, whatsapp_wa: whatsAppNo.replace(/\D/g, '')};
+        const params = { opi_sn: userId, whatsapp_waba: whatsAppBusiness, whatsapp_wa: whatsAppNo.replace(/\D/g, '') }

-    return fetchJSON(postWABAUrl, params)
-      .then(json => {
+        return fetchJSON(postWABAUrl, params).then((json) => {
          if (json.errcode === 0) {
            set(() => ({
              loginUser: {
                ...loginUser,
                whatsAppNo: whatsAppNo,
                whatsAppBusiness: whatsAppBusiness,
-            }
+              },
            }))
            saveUserSession()
          } else {
@ -215,11 +212,10 @@ const useAuthStore = create(devtools((set, get) => ({
        const params = {
          groupid: 'cidFtzcIzNwNoiaGU9Q795CIg==',
          msgTitle: '有人求助',
-      msgText: loginUser.username + '上传了销售平台' + BUILD_VERSION + '的日志'
-    };
+          msgText: loginUser.username + '上传了销售平台' + BUILD_VERSION + '的日志',
+        }

-    return fetchJSON(notifyUrl, params)
-      .then(json => {
+        return fetchJSON(notifyUrl, params).then((json) => {
          if (json.errcode === 0) {
            console.info('发送通知成功')
          } else {
@ -227,6 +223,9 @@ const useAuthStore = create(devtools((set, get) => ({
          }
        })
      },
-}), { name: 'authStore' }))
+    }),
+    { name: 'authStore' },
+  ),
+)

 export default useAuthStore
--- a/src/views/customer_relation/index.jsx
+++ b/src/views/customer_relation/index.jsx
@ -1,7 +1,7 @@
 import { Link } from 'react-router-dom'
 import { Form, Input, Button, DatePicker, Select, Table } from 'antd'
 import dayjs from 'dayjs'
-import { ReadIcon, DeliverIcon, SentIcon ,WaitingIcon,FailedIcon} from '@/components/Icons'
+import { ReadIcon, DeliverIcon, SentIcon, WaitingIcon, FailedIcon } from '@/components/Icons'
 import useCustomerRelationStore from '@/stores/CustomerRelationStore'

 const { RangePicker } = DatePicker
@ -14,7 +14,7 @@ const statusIconMap = {
  sent: <SentIcon title='sent' />,
  failed: <FailedIcon title='failed' />,
  accepted: <WaitingIcon title='accepted' />,
-  default: <WaitingIcon title='waiting' />
+  default: <WaitingIcon title='waiting' />,
 }

 const Index = () => {
@ -37,6 +37,71 @@ const Index = () => {
    fetchSearchTasks(formattedValues)
  }

+  // 按 crt_template 分组并统计每个非空 msg_status 的数量
+  const templateStatusCount = {}
+  tasksList.forEach((item) => {
+    const { crt_template, msg_status } = item
+    if (msg_status !== null && msg_status !== undefined) {
+      if (!templateStatusCount[crt_template]) {
+        templateStatusCount[crt_template] = {}
+      }
+      if (!templateStatusCount[crt_template][msg_status]) {
+        templateStatusCount[crt_template][msg_status] = 0
+      }
+      templateStatusCount[crt_template][msg_status]++
+    }
+  })
+
+  // 计算分组后的百分比并添加计数
+  const groupedResult = {}
+  for (const template in templateStatusCount) {
+    const total = Object.values(templateStatusCount[template]).reduce((acc, val) => acc + val, 0)
+    groupedResult[template] = {}
+    for (const status in templateStatusCount[template]) {
+      const count = templateStatusCount[template][status]
+      const percentage = ((count / total) * 100).toFixed(2)
+      groupedResult[template][`${status}_count`] = count
+      groupedResult[template][`${status}_percentage`] = `${percentage}%`
+    }
+  }
+
+  // 将 groupedResult 转换为表格可用的数据格式
+  const groupedData = Object.entries(groupedResult).map(([template, stats]) => {
+    return {
+      key: template,
+      crt_template: template,
+      ...stats,
+    }
+  })
+
+  // 动态生成表格列
+  const groupedColumns = []
+  groupedColumns.push({
+    title: '模板名称',
+    dataIndex: 'crt_template',
+    key: 'crt_template',
+  })
+
+  const allStatuses = new Set()
+  tasksList.forEach((item) => {
+    if (item.msg_status !== null && item.msg_status !== undefined) {
+      allStatuses.add(item.msg_status)
+    }
+  })
+
+  allStatuses.forEach((status) => {
+    groupedColumns.push({
+      title: `${status} 计数`,
+      dataIndex: `${status}_count`,
+      key: `${status}_count`,
+    })
+    groupedColumns.push({
+      title: `${status} 百分比`,
+      dataIndex: `${status}_percentage`,
+      key: `${status}_percentage`,
+    })
+  })
+
  const DATE_RANGE_PRESETS = [
    {
      label: '本周',
@ -127,11 +192,11 @@ const Index = () => {
        </Form.Item>
      </Form>

-      {/* 搜索结果 */}
-
      <span>搜索结果总数: {tasksList && tasksList.length}</span>

      <Table dataSource={tasksList} columns={columns} pagination={false} rowKey='crt_sn' loading={loading} />
+      <h2>统计结果</h2>
+      <Table dataSource={groupedData} columns={groupedColumns} pagination={false} loading={loading} />
    </>
  )
 }