From c197962851be820469bf2e8624f9b6edd37b13e1 Mon Sep 17 00:00:00 2001 From: fengzai6 Date: Tue, 27 Feb 2024 15:02:58 +0800 Subject: [PATCH 1/5] fix: No history message attached when for gemini-pro-vision --- app/components/chat.tsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/components/chat.tsx b/app/components/chat.tsx index 9144f9a5f..32431c693 100644 --- a/app/components/chat.tsx +++ b/app/components/chat.tsx @@ -459,6 +459,10 @@ export function ChatActions(props: { if (!show) { props.setAttachImages([]); props.setUploading(false); + } else { + // 为visionModel时不附带历史消息 + const newModelConfig = chatStore.currentSession().mask.modelConfig; + newModelConfig.historyMessageCount = 0; } // if current model is not available From 5348d570574b6c1e3bb829df66fed696d9549e28 Mon Sep 17 00:00:00 2001 From: fengzai6 Date: Thu, 7 Mar 2024 15:36:19 +0800 Subject: [PATCH 2/5] Fix EmojiPicker mobile width adaptation and update avatar clicking behavior --- app/components/emoji.tsx | 1 + app/components/settings.tsx | 4 +++- app/components/ui-lib.module.scss | 9 ++++++++- app/components/ui-lib.tsx | 8 ++++---- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/app/components/emoji.tsx b/app/components/emoji.tsx index b24349307..3b1f5e751 100644 --- a/app/components/emoji.tsx +++ b/app/components/emoji.tsx @@ -21,6 +21,7 @@ export function AvatarPicker(props: { }) { return (
setShowEmojiPicker(true)} + onClick={() => { + setShowEmojiPicker(!showEmojiPicker); + }} >
diff --git a/app/components/ui-lib.module.scss b/app/components/ui-lib.module.scss index c67d352be..83c02f92a 100644 --- a/app/components/ui-lib.module.scss +++ b/app/components/ui-lib.module.scss @@ -14,17 +14,24 @@ .popover-content { position: absolute; + width: 350px; animation: slide-in 0.3s ease; right: 0; top: calc(100% + 10px); } - +@media screen and (max-width: 600px) { + .popover-content { + width: auto; + } +} .popover-mask { position: fixed; top: 0; left: 0; width: 100vw; height: 100vh; + background-color: rgba(0, 0, 0, 0.3); + backdrop-filter: blur(5px); } .list-item { diff --git a/app/components/ui-lib.tsx b/app/components/ui-lib.tsx index f7e326fd3..da700c0fb 100644 --- a/app/components/ui-lib.tsx +++ b/app/components/ui-lib.tsx @@ -26,10 +26,10 @@ export function Popover(props: {
{props.children} {props.open && ( -
-
- {props.content} -
+
+ )} + {props.open && ( +
{props.content}
)}
); From c22153a4eb3c663fb87ec9a1d77cda69946309a5 Mon Sep 17 00:00:00 2001 From: fengzai6 Date: Thu, 7 Mar 2024 15:46:13 +0800 Subject: [PATCH 3/5] Revert "fix: No history message attached when for gemini-pro-vision" This reverts commit c197962851be820469bf2e8624f9b6edd37b13e1. --- app/components/chat.tsx | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/components/chat.tsx b/app/components/chat.tsx index 42ceff093..bcd0e605d 100644 --- a/app/components/chat.tsx +++ b/app/components/chat.tsx @@ -459,10 +459,6 @@ export function ChatActions(props: { if (!show) { props.setAttachImages([]); props.setUploading(false); - } else { - // 为visionModel时不附带历史消息 - const newModelConfig = chatStore.currentSession().mask.modelConfig; - newModelConfig.historyMessageCount = 0; } // if current model is not available From ad10a119032b039c0341994ea1a480eb62d5c30e Mon Sep 17 00:00:00 2001 From: fengzai6 Date: Thu, 7 Mar 2024 15:51:58 +0800 Subject: [PATCH 4/5] Add z-index to avatar --- app/components/settings.module.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/components/settings.module.scss b/app/components/settings.module.scss index 1eac17c16..c6aec4203 100644 --- a/app/components/settings.module.scss +++ b/app/components/settings.module.scss @@ -5,6 +5,8 @@ .avatar { cursor: pointer; + position: relative; + z-index: 1; } .edit-prompt-modal { From f80024a6ab3a0e186aa6704198296acf0fe6c20f Mon Sep 17 00:00:00 2001 From: sijinhui Date: Wed, 13 Mar 2024 15:14:01 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dechart=20map=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/app/(admin)/admin/ana/page.tsx | 17 +- app/app/(admin)/admin/ana/user-by-map.tsx | 650 ++++++++++++++++++++++ app/app/(admin)/admin/page.tsx | 1 - app/app/(admin)/components/sidebar.tsx | 13 +- app/app/(admin)/layout.tsx | 1 + 5 files changed, 666 insertions(+), 16 deletions(-) create mode 100644 app/app/(admin)/admin/ana/user-by-map.tsx diff --git a/app/app/(admin)/admin/ana/page.tsx b/app/app/(admin)/admin/ana/page.tsx index eb6414360..54cbb4ac7 100644 --- a/app/app/(admin)/admin/ana/page.tsx +++ b/app/app/(admin)/admin/ana/page.tsx @@ -1,8 +1,10 @@ import { Grid, Col } from "@tremor/react"; import UsageByModel from "./usage-by-model-chart"; +import UserByMap from "./user-by-map"; import { getSession } from "@/lib/auth"; import { isName, ADMIN_LIST } from "@/lib/auth_list"; import { redirect } from "next/navigation"; +import { Flex } from "antd"; export default async function AdminPage() { const session = await getSession(); @@ -13,17 +15,10 @@ export default async function AdminPage() { return ( <> - - - {/**/} - {/**/} - {/**/} - {/**/} - - - - - + + + + ); } diff --git a/app/app/(admin)/admin/ana/user-by-map.tsx b/app/app/(admin)/admin/ana/user-by-map.tsx new file mode 100644 index 000000000..f7490eeb9 --- /dev/null +++ b/app/app/(admin)/admin/ana/user-by-map.tsx @@ -0,0 +1,650 @@ +"use client"; + +import React, { + useEffect, + useState, + useCallback, + Dispatch, + SetStateAction, + useRef, +} from "react"; +import Script from "next/script"; + +import * as echarts from "echarts"; +// var echarts = require('echarts'); +require("echarts"); +require("echarts/extension/bmap/bmap"); + +interface DataItem { + name: string; + value: number; +} + +export default function UserByMap() { + const data: DataItem[] = [ + { name: "海门", value: 9 }, + { name: "鄂尔多斯", value: 12 }, + { name: "招远", value: 12 }, + { name: "舟山", value: 12 }, + { name: "齐齐哈尔", value: 14 }, + { name: "盐城", value: 15 }, + { name: "赤峰", value: 16 }, + { name: "青岛", value: 18 }, + { name: "乳山", value: 18 }, + { name: "金昌", value: 19 }, + { name: "泉州", value: 21 }, + { name: "莱西", value: 21 }, + { name: "日照", value: 21 }, + { name: "胶南", value: 22 }, + { name: "南通", value: 23 }, + { name: "拉萨", value: 24 }, + { name: "云浮", value: 24 }, + { name: "梅州", value: 25 }, + { name: "文登", value: 25 }, + { name: "上海", value: 25 }, + { name: "攀枝花", value: 25 }, + { name: "威海", value: 25 }, + { name: "承德", value: 25 }, + { name: "厦门", value: 26 }, + { name: "汕尾", value: 26 }, + { name: "潮州", value: 26 }, + { name: "丹东", value: 27 }, + { name: "太仓", value: 27 }, + { name: "曲靖", value: 27 }, + { name: "烟台", value: 28 }, + { name: "福州", value: 29 }, + { name: "瓦房店", value: 30 }, + { name: "即墨", value: 30 }, + { name: "抚顺", value: 31 }, + { name: "玉溪", value: 31 }, + { name: "张家口", value: 31 }, + { name: "阳泉", value: 31 }, + { name: "莱州", value: 32 }, + { name: "湖州", value: 32 }, + { name: "汕头", value: 32 }, + { name: "昆山", value: 33 }, + { name: "宁波", value: 33 }, + { name: "湛江", value: 33 }, + { name: "揭阳", value: 34 }, + { name: "荣成", value: 34 }, + { name: "连云港", value: 35 }, + { name: "葫芦岛", value: 35 }, + { name: "常熟", value: 36 }, + { name: "东莞", value: 36 }, + { name: "河源", value: 36 }, + { name: "淮安", value: 36 }, + { name: "泰州", value: 36 }, + { name: "南宁", value: 37 }, + { name: "营口", value: 37 }, + { name: "惠州", value: 37 }, + { name: "江阴", value: 37 }, + { name: "蓬莱", value: 37 }, + { name: "韶关", value: 38 }, + { name: "嘉峪关", value: 38 }, + { name: "广州", value: 38 }, + { name: "延安", value: 38 }, + { name: "太原", value: 39 }, + { name: "清远", value: 39 }, + { name: "中山", value: 39 }, + { name: "昆明", value: 39 }, + { name: "寿光", value: 40 }, + { name: "盘锦", value: 40 }, + { name: "长治", value: 41 }, + { name: "深圳", value: 41 }, + { name: "珠海", value: 42 }, + { name: "宿迁", value: 43 }, + { name: "咸阳", value: 43 }, + { name: "铜川", value: 44 }, + { name: "平度", value: 44 }, + { name: "佛山", value: 44 }, + { name: "海口", value: 44 }, + { name: "江门", value: 45 }, + { name: "章丘", value: 45 }, + { name: "肇庆", value: 46 }, + { name: "大连", value: 47 }, + { name: "临汾", value: 47 }, + { name: "吴江", value: 47 }, + { name: "石嘴山", value: 49 }, + { name: "沈阳", value: 50 }, + { name: "苏州", value: 50 }, + { name: "茂名", value: 50 }, + { name: "嘉兴", value: 51 }, + { name: "长春", value: 51 }, + { name: "胶州", value: 52 }, + { name: "银川", value: 52 }, + { name: "张家港", value: 52 }, + { name: "三门峡", value: 53 }, + { name: "锦州", value: 54 }, + { name: "南昌", value: 54 }, + { name: "柳州", value: 54 }, + { name: "三亚", value: 54 }, + { name: "自贡", value: 56 }, + { name: "吉林", value: 56 }, + { name: "阳江", value: 57 }, + { name: "泸州", value: 57 }, + { name: "西宁", value: 57 }, + { name: "宜宾", value: 58 }, + { name: "呼和浩特", value: 58 }, + { name: "成都", value: 58 }, + { name: "大同", value: 58 }, + { name: "镇江", value: 59 }, + { name: "桂林", value: 59 }, + { name: "张家界", value: 59 }, + { name: "宜兴", value: 59 }, + { name: "北海", value: 60 }, + { name: "西安", value: 61 }, + { name: "金坛", value: 62 }, + { name: "东营", value: 62 }, + { name: "牡丹江", value: 63 }, + { name: "遵义", value: 63 }, + { name: "绍兴", value: 63 }, + { name: "扬州", value: 64 }, + { name: "常州", value: 64 }, + { name: "潍坊", value: 65 }, + { name: "重庆", value: 66 }, + { name: "台州", value: 67 }, + { name: "南京", value: 67 }, + { name: "滨州", value: 70 }, + { name: "贵阳", value: 71 }, + { name: "无锡", value: 71 }, + { name: "本溪", value: 71 }, + { name: "克拉玛依", value: 72 }, + { name: "渭南", value: 72 }, + { name: "马鞍山", value: 72 }, + { name: "宝鸡", value: 72 }, + { name: "焦作", value: 75 }, + { name: "句容", value: 75 }, + { name: "北京", value: 79 }, + { name: "徐州", value: 79 }, + { name: "衡水", value: 80 }, + { name: "包头", value: 80 }, + { name: "绵阳", value: 80 }, + { name: "乌鲁木齐", value: 84 }, + { name: "枣庄", value: 84 }, + { name: "杭州", value: 84 }, + { name: "淄博", value: 85 }, + { name: "鞍山", value: 86 }, + { name: "溧阳", value: 86 }, + { name: "库尔勒", value: 86 }, + { name: "安阳", value: 90 }, + { name: "开封", value: 90 }, + { name: "济南", value: 92 }, + { name: "德阳", value: 93 }, + { name: "温州", value: 95 }, + { name: "九江", value: 96 }, + { name: "邯郸", value: 98 }, + { name: "临安", value: 99 }, + { name: "兰州", value: 99 }, + { name: "沧州", value: 100 }, + { name: "临沂", value: 103 }, + { name: "南充", value: 104 }, + { name: "天津", value: 105 }, + { name: "富阳", value: 106 }, + { name: "泰安", value: 112 }, + { name: "诸暨", value: 112 }, + { name: "郑州", value: 113 }, + { name: "哈尔滨", value: 114 }, + { name: "聊城", value: 116 }, + { name: "芜湖", value: 117 }, + { name: "唐山", value: 119 }, + { name: "平顶山", value: 119 }, + { name: "邢台", value: 119 }, + { name: "德州", value: 120 }, + { name: "济宁", value: 120 }, + { name: "荆州", value: 127 }, + { name: "宜昌", value: 130 }, + { name: "义乌", value: 132 }, + { name: "丽水", value: 133 }, + { name: "洛阳", value: 134 }, + { name: "秦皇岛", value: 136 }, + { name: "株洲", value: 143 }, + { name: "石家庄", value: 147 }, + { name: "莱芜", value: 148 }, + { name: "常德", value: 152 }, + { name: "保定", value: 153 }, + { name: "湘潭", value: 154 }, + { name: "金华", value: 157 }, + { name: "岳阳", value: 169 }, + { name: "长沙", value: 175 }, + { name: "衢州", value: 177 }, + { name: "廊坊", value: 193 }, + { name: "菏泽", value: 194 }, + { name: "合肥", value: 229 }, + { name: "武汉", value: 273 }, + { name: "大庆", value: 279 }, + ]; + const geoCoordMap: Record = { + 海门: [121.15, 31.89], + 鄂尔多斯: [109.781327, 39.608266], + 招远: [120.38, 37.35], + 舟山: [122.207216, 29.985295], + 齐齐哈尔: [123.97, 47.33], + 盐城: [120.13, 33.38], + 赤峰: [118.87, 42.28], + 青岛: [120.33, 36.07], + 乳山: [121.52, 36.89], + 金昌: [102.188043, 38.520089], + 泉州: [118.58, 24.93], + 莱西: [120.53, 36.86], + 日照: [119.46, 35.42], + 胶南: [119.97, 35.88], + 南通: [121.05, 32.08], + 拉萨: [91.11, 29.97], + 云浮: [112.02, 22.93], + 梅州: [116.1, 24.55], + 文登: [122.05, 37.2], + 上海: [121.48, 31.22], + 攀枝花: [101.718637, 26.582347], + 威海: [122.1, 37.5], + 承德: [117.93, 40.97], + 厦门: [118.1, 24.46], + 汕尾: [115.375279, 22.786211], + 潮州: [116.63, 23.68], + 丹东: [124.37, 40.13], + 太仓: [121.1, 31.45], + 曲靖: [103.79, 25.51], + 烟台: [121.39, 37.52], + 福州: [119.3, 26.08], + 瓦房店: [121.979603, 39.627114], + 即墨: [120.45, 36.38], + 抚顺: [123.97, 41.97], + 玉溪: [102.52, 24.35], + 张家口: [114.87, 40.82], + 阳泉: [113.57, 37.85], + 莱州: [119.942327, 37.177017], + 湖州: [120.1, 30.86], + 汕头: [116.69, 23.39], + 昆山: [120.95, 31.39], + 宁波: [121.56, 29.86], + 湛江: [110.359377, 21.270708], + 揭阳: [116.35, 23.55], + 荣成: [122.41, 37.16], + 连云港: [119.16, 34.59], + 葫芦岛: [120.836932, 40.711052], + 常熟: [120.74, 31.64], + 东莞: [113.75, 23.04], + 河源: [114.68, 23.73], + 淮安: [119.15, 33.5], + 泰州: [119.9, 32.49], + 南宁: [108.33, 22.84], + 营口: [122.18, 40.65], + 惠州: [114.4, 23.09], + 江阴: [120.26, 31.91], + 蓬莱: [120.75, 37.8], + 韶关: [113.62, 24.84], + 嘉峪关: [98.289152, 39.77313], + 广州: [113.23, 23.16], + 延安: [109.47, 36.6], + 太原: [112.53, 37.87], + 清远: [113.01, 23.7], + 中山: [113.38, 22.52], + 昆明: [102.73, 25.04], + 寿光: [118.73, 36.86], + 盘锦: [122.070714, 41.119997], + 长治: [113.08, 36.18], + 深圳: [114.07, 22.62], + 珠海: [113.52, 22.3], + 宿迁: [118.3, 33.96], + 咸阳: [108.72, 34.36], + 铜川: [109.11, 35.09], + 平度: [119.97, 36.77], + 佛山: [113.11, 23.05], + 海口: [110.35, 20.02], + 江门: [113.06, 22.61], + 章丘: [117.53, 36.72], + 肇庆: [112.44, 23.05], + 大连: [121.62, 38.92], + 临汾: [111.5, 36.08], + 吴江: [120.63, 31.16], + 石嘴山: [106.39, 39.04], + 沈阳: [123.38, 41.8], + 苏州: [120.62, 31.32], + 茂名: [110.88, 21.68], + 嘉兴: [120.76, 30.77], + 长春: [125.35, 43.88], + 胶州: [120.03336, 36.264622], + 银川: [106.27, 38.47], + 张家港: [120.555821, 31.875428], + 三门峡: [111.19, 34.76], + 锦州: [121.15, 41.13], + 南昌: [115.89, 28.68], + 柳州: [109.4, 24.33], + 三亚: [109.511909, 18.252847], + 自贡: [104.778442, 29.33903], + 吉林: [126.57, 43.87], + 阳江: [111.95, 21.85], + 泸州: [105.39, 28.91], + 西宁: [101.74, 36.56], + 宜宾: [104.56, 29.77], + 呼和浩特: [111.65, 40.82], + 成都: [104.06, 30.67], + 大同: [113.3, 40.12], + 镇江: [119.44, 32.2], + 桂林: [110.28, 25.29], + 张家界: [110.479191, 29.117096], + 宜兴: [119.82, 31.36], + 北海: [109.12, 21.49], + 西安: [108.95, 34.27], + 金坛: [119.56, 31.74], + 东营: [118.49, 37.46], + 牡丹江: [129.58, 44.6], + 遵义: [106.9, 27.7], + 绍兴: [120.58, 30.01], + 扬州: [119.42, 32.39], + 常州: [119.95, 31.79], + 潍坊: [119.1, 36.62], + 重庆: [106.54, 29.59], + 台州: [121.420757, 28.656386], + 南京: [118.78, 32.04], + 滨州: [118.03, 37.36], + 贵阳: [106.71, 26.57], + 无锡: [120.29, 31.59], + 本溪: [123.73, 41.3], + 克拉玛依: [84.77, 45.59], + 渭南: [109.5, 34.52], + 马鞍山: [118.48, 31.56], + 宝鸡: [107.15, 34.38], + 焦作: [113.21, 35.24], + 句容: [119.16, 31.95], + 北京: [116.46, 39.92], + 徐州: [117.2, 34.26], + 衡水: [115.72, 37.72], + 包头: [110, 40.58], + 绵阳: [104.73, 31.48], + 乌鲁木齐: [87.68, 43.77], + 枣庄: [117.57, 34.86], + 杭州: [120.19, 30.26], + 淄博: [118.05, 36.78], + 鞍山: [122.85, 41.12], + 溧阳: [119.48, 31.43], + 库尔勒: [86.06, 41.68], + 安阳: [114.35, 36.1], + 开封: [114.35, 34.79], + 济南: [117, 36.65], + 德阳: [104.37, 31.13], + 温州: [120.65, 28.01], + 九江: [115.97, 29.71], + 邯郸: [114.47, 36.6], + 临安: [119.72, 30.23], + 兰州: [103.73, 36.03], + 沧州: [116.83, 38.33], + 临沂: [118.35, 35.05], + 南充: [106.110698, 30.837793], + 天津: [117.2, 39.13], + 富阳: [119.95, 30.07], + 泰安: [117.13, 36.18], + 诸暨: [120.23, 29.71], + 郑州: [113.65, 34.76], + 哈尔滨: [126.63, 45.75], + 聊城: [115.97, 36.45], + 芜湖: [118.38, 31.33], + 唐山: [118.02, 39.63], + 平顶山: [113.29, 33.75], + 邢台: [114.48, 37.05], + 德州: [116.29, 37.45], + 济宁: [116.59, 35.38], + 荆州: [112.239741, 30.335165], + 宜昌: [111.3, 30.7], + 义乌: [120.06, 29.32], + 丽水: [119.92, 28.45], + 洛阳: [112.44, 34.7], + 秦皇岛: [119.57, 39.95], + 株洲: [113.16, 27.83], + 石家庄: [114.48, 38.03], + 莱芜: [117.67, 36.19], + 常德: [111.69, 29.05], + 保定: [115.48, 38.85], + 湘潭: [112.91, 27.87], + 金华: [119.64, 29.12], + 岳阳: [113.09, 29.37], + 长沙: [113, 28.21], + 衢州: [118.88, 28.97], + 廊坊: [116.7, 39.53], + 菏泽: [115.480656, 35.23375], + 合肥: [117.27, 31.86], + 武汉: [114.31, 30.52], + 大庆: [125.03, 46.58], + }; + const convertData = function (data: DataItem[]) { + var res = []; + for (var i = 0; i < data.length; i++) { + var geoCoord = geoCoordMap[data[i].name]; + if (geoCoord) { + res.push({ + name: data[i].name, + value: geoCoord.concat(data[i].value), + }); + } + } + return res; + }; + const option: echarts.EChartsOption = { + title: { + text: "全国主要城市空气质量 - 百度地图", + subtext: "data from PM25.in", + sublink: "http://www.pm25.in", + left: "center", + }, + tooltip: { + trigger: "item", + }, + bmap: { + center: [104.114129, 37.550339], + zoom: 5, + roam: true, + mapStyle: { + styleJson: [ + { + featureType: "water", + elementType: "all", + stylers: { + color: "#d1d1d1", + }, + }, + { + featureType: "land", + elementType: "all", + stylers: { + color: "#f3f3f3", + }, + }, + { + featureType: "railway", + elementType: "all", + stylers: { + visibility: "off", + }, + }, + { + featureType: "highway", + elementType: "all", + stylers: { + color: "#fdfdfd", + }, + }, + { + featureType: "highway", + elementType: "labels", + stylers: { + visibility: "off", + }, + }, + { + featureType: "arterial", + elementType: "geometry", + stylers: { + color: "#fefefe", + }, + }, + { + featureType: "arterial", + elementType: "geometry.fill", + stylers: { + color: "#fefefe", + }, + }, + { + featureType: "poi", + elementType: "all", + stylers: { + visibility: "off", + }, + }, + { + featureType: "green", + elementType: "all", + stylers: { + visibility: "off", + }, + }, + { + featureType: "subway", + elementType: "all", + stylers: { + visibility: "off", + }, + }, + { + featureType: "manmade", + elementType: "all", + stylers: { + color: "#d1d1d1", + }, + }, + { + featureType: "local", + elementType: "all", + stylers: { + color: "#d1d1d1", + }, + }, + { + featureType: "arterial", + elementType: "labels", + stylers: { + visibility: "off", + }, + }, + { + featureType: "boundary", + elementType: "all", + stylers: { + color: "#fefefe", + }, + }, + { + featureType: "building", + elementType: "all", + stylers: { + color: "#d1d1d1", + }, + }, + { + featureType: "label", + elementType: "labels.text.fill", + stylers: { + color: "#999999", + }, + }, + ], + }, + }, + series: [ + { + name: "pm2.5", + type: "scatter", + coordinateSystem: "bmap", + data: convertData(data), + symbolSize: function (val) { + return val[2] / 10; + }, + encode: { + value: 2, + }, + label: { + formatter: "{b}", + position: "right", + show: false, + }, + emphasis: { + label: { + show: true, + }, + }, + }, + { + name: "Top 5", + type: "effectScatter", + coordinateSystem: "bmap", + data: convertData( + data + .sort(function (a, b) { + return b.value - a.value; + }) + .slice(0, 6), + ), + symbolSize: function (val) { + return val[2] / 10; + }, + encode: { + value: 2, + }, + showEffectOn: "render", + rippleEffect: { + brushType: "stroke", + }, + label: { + formatter: "{b}", + position: "right", + show: true, + }, + itemStyle: { + shadowBlur: 10, + shadowColor: "#333", + }, + emphasis: { + scale: true, + }, + zlevel: 1, + }, + ], + }; + useEffect(() => { + const loadEcharts = () => { + let chartDom = document.getElementById("userByMapChart"); + let myChart = echarts.init(chartDom, "default", { + renderer: "canvas", + useDirtyRect: false, + }); + option && myChart.setOption(option); + }; + + loadEcharts(); + }, [option]); + + return ( +
+ {/*'); diff --git a/app/app/(admin)/admin/page.tsx b/app/app/(admin)/admin/page.tsx index a06fceb86..0775d6be9 100644 --- a/app/app/(admin)/admin/page.tsx +++ b/app/app/(admin)/admin/page.tsx @@ -7,7 +7,6 @@ import { SettingOutlined, } from "@ant-design/icons"; import type { MenuProps, MenuTheme } from "antd"; -import { Menu, Switch } from "antd"; type MenuItem = Required["items"][number]; diff --git a/app/app/(admin)/components/sidebar.tsx b/app/app/(admin)/components/sidebar.tsx index 841e06d32..195f419bf 100644 --- a/app/app/(admin)/components/sidebar.tsx +++ b/app/app/(admin)/components/sidebar.tsx @@ -2,7 +2,7 @@ import React, { useEffect, useState } from "react"; import Link from "next/link"; -import { useRouter } from "next/navigation"; +import { useRouter, usePathname } from "next/navigation"; import { AppstoreOutlined, @@ -55,10 +55,10 @@ const items: MenuItem[] = [ const SideBar: React.FC = () => { const [theme, setTheme] = useState("dark"); - const [current, setCurrent] = useState("1"); + const [current, setCurrent] = useState("/admin/ana"); const router = useRouter(); const [loading, setLoading] = useState(false); - + const pathname = usePathname(); // const changeTheme = (value: boolean) => { // setTheme(value ? 'dark' : 'light'); // }; @@ -68,7 +68,12 @@ const SideBar: React.FC = () => { setCurrent(e.key); router.push(e.key); }; - + useEffect(() => { + // 如果按钮和路径不相等，那其实应该跳转到按钮的网址 + if (current != pathname) { + router.push(current); + } + }, []); // useEffect(() => { // const handleStart = () => setLoading(true) // const handleComplete = () => setLoading(false); diff --git a/app/app/(admin)/layout.tsx b/app/app/(admin)/layout.tsx index 93262fdab..e17e6a7b8 100644 --- a/app/app/(admin)/layout.tsx +++ b/app/app/(admin)/layout.tsx @@ -2,6 +2,7 @@ import "@/app/app/login.scss"; import { Metadata } from "next"; import { ReactNode } from "react"; import { AntdRegistry } from "@ant-design/nextjs-registry"; +// import Head from "next/head"; export const metadata: Metadata = { title: "Admin | 管理页面",