From 6606d2ca767b61d8555f120741b0af79258c565a Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Sat, 28 Dec 2024 23:28:23 +0800
Subject: [PATCH] =?UTF-8?q?:hammer:=20=E5=B7=A5=E4=BD=9C=E5=8F=B0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 orion-visor-ui/src/assets/style/global.less          |  5 +++++
 orion-visor-ui/src/components/view/chart/index.vue   | 12 +++---------
 .../workplace/components/workplace-statistics.vue    | 12 +++---------
 sql/init-4-data.sql                                  |  2 +-
 4 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/orion-visor-ui/src/assets/style/global.less b/orion-visor-ui/src/assets/style/global.less
index a42bcc6b..03c2cd50 100644
--- a/orion-visor-ui/src/assets/style/global.less
+++ b/orion-visor-ui/src/assets/style/global.less
@@ -72,6 +72,11 @@ body {
   align-items: center;
 }
 
+.flex-content-end {
+  display: flex;
+  justify-content: flex-end;
+}
+
 // -- click-icon
 .click-icon-wrapper {
   display: flex;
diff --git a/orion-visor-ui/src/components/view/chart/index.vue b/orion-visor-ui/src/components/view/chart/index.vue
index 0d11c724..1a04608b 100644
--- a/orion-visor-ui/src/components/view/chart/index.vue
+++ b/orion-visor-ui/src/components/view/chart/index.vue
@@ -7,16 +7,16 @@
 
 <script lang="ts" setup>
   import type { EChartsOption } from 'echarts';
-  import { computed, nextTick, ref } from 'vue';
+  import { nextTick, ref } from 'vue';
   import { useAppStore } from '@/store';
   import VCharts from 'vue-echarts';
 
-  const props = withDefaults(defineProps<{
+  const props = withDefaults(defineProps<Partial<{
     options: EChartsOption,
     autoResize: boolean,
     width: string,
     height: string,
-  }>(), {
+  }>>(), {
     options: () => {
       return {};
     },
@@ -27,12 +27,6 @@
 
   const appStore = useAppStore();
 
-  // 监听暗色模式
-  const theme = computed(() => {
-    if (appStore.theme === 'dark') return 'dark';
-    return '';
-  });
-
   const renderChart = ref(false);
 
   nextTick(() => {
diff --git a/orion-visor-ui/src/views/dashboard/workplace/components/workplace-statistics.vue b/orion-visor-ui/src/views/dashboard/workplace/components/workplace-statistics.vue
index df218a77..eaf0ffa3 100644
--- a/orion-visor-ui/src/views/dashboard/workplace/components/workplace-statistics.vue
+++ b/orion-visor-ui/src/views/dashboard/workplace/components/workplace-statistics.vue
@@ -142,6 +142,7 @@
       },
       xAxis: {
         type: 'category',
+        data: props.data.asset?.terminalConnectChart?.x || [],
         show: false,
       },
       yAxis: {
@@ -150,18 +151,13 @@
       tooltip: {
         show: true,
         trigger: 'axis',
-        formatter: (p: any) => {
-          return p[0].data.x + ' ' + p[0].data.value + ' 次';
-        }
       },
       series: {
         name: '连接次数',
         data: !props.data.asset?.terminalConnectChart
           ? []
-          : props.data.asset?.terminalConnectChart.data.map((s, index) => {
-            const x = props.data.asset?.terminalConnectChart.x;
+          : props.data.asset?.terminalConnectChart.data.map(s => {
             return {
-              x: x[index],
               value: s,
             };
           }),
@@ -187,6 +183,7 @@
       },
       xAxis: {
         type: 'category',
+        data: props.data.asset?.execCommandChart?.x || [],
         show: false,
       },
       yAxis: {
@@ -195,9 +192,6 @@
       tooltip: {
         show: true,
         trigger: 'axis',
-        formatter: (p: any) => {
-          return p[0].data.x + ' ' + p[0].data.value + '次';
-        }
       },
       series: {
         name: '执行次数',
diff --git a/sql/init-4-data.sql b/sql/init-4-data.sql
index 1da4cade..0a9bcb1e 100644
--- a/sql/init-4-data.sql
+++ b/sql/init-4-data.sql
@@ -327,7 +327,7 @@ INSERT INTO `dict_value` VALUES (432, 2, 'operatorLogType', 'exec-job:update-exe
 INSERT INTO `system_menu` VALUES (1, 0, '仪表盘', NULL, 1, 10, 1, 1, 1, 0, 'IconDashboard', NULL, 'dashboard', '2023-07-28 10:51:50', '2024-08-11 00:05:44', '1', '1', 0);
 INSERT INTO `system_menu` VALUES (2, 1, '工作台', NULL, 2, 10, 1, 1, 1, 0, 'IconComputer', NULL, 'workplace', '2023-07-28 10:51:50', '2024-08-11 00:05:44', '1', '1', 0);
 INSERT INTO `system_menu` VALUES (5, 0, '用户管理', NULL, 1, 700, 1, 1, 1, 0, 'icon-user', NULL, 'userModule', '2023-07-28 10:55:38', '2024-06-17 20:45:29', '1', '1', 0);
-INSERT INTO `system_menu` VALUES (8, 0, '项目地址', NULL, 1, 1000, 1, 1, 1, 0, 'icon-link', 'https://visor.dromara.org', '', '2023-07-28 11:04:59', '2024-08-29 18:10:57', '1', '1', 0);
+INSERT INTO `system_menu` VALUES (8, 0, '项目地址', NULL, 1, 1000, 1, 1, 1, 0, 'icon-link', 'https://visor.orionsec.cn', '', '2023-07-28 11:04:59', '2024-08-29 18:10:57', '1', '1', 0);
 INSERT INTO `system_menu` VALUES (10, 5, '角色管理', NULL, 2, 10, 1, 1, 1, 0, 'IconUserGroup', '', 'role', '2023-07-28 10:55:52', '2024-03-07 19:10:13', '1', '1', 0);
 INSERT INTO `system_menu` VALUES (12, 0, '系统管理', NULL, 1, 800, 1, 1, 1, 0, 'icon-tool', NULL, 'systemModule', '2023-08-02 18:24:24', '2024-06-17 20:45:39', '1', '1', 0);
 INSERT INTO `system_menu` VALUES (13, 12, '系统菜单', '', 2, 10, 1, 1, 1, 0, 'icon-menu', NULL, 'systemMenu', '2023-08-02 18:29:01', '2024-03-07 22:25:00', '1', '1', 0);