From f7f8c2d35d96a6fa6f3551887f14b544a196741f Mon Sep 17 00:00:00 2001 From: engigu Date: Thu, 25 Jan 2024 11:38:45 +0800 Subject: [PATCH] chroe: echarts unless import opt --- models/send_tasks_logs.go | 2 +- service/send_message_service/send_message.go | 2 +- web/src/echarts.js | 35 +++++++++++++++++++ web/src/main.js | 2 ++ .../views/tabsTools/statistic/statistic.vue | 8 +++-- 5 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 web/src/echarts.js diff --git a/models/send_tasks_logs.go b/models/send_tasks_logs.go index dc2a198..9b49287 100644 --- a/models/send_tasks_logs.go +++ b/models/send_tasks_logs.go @@ -9,7 +9,7 @@ type SendTasksLogs struct { ID int `gorm:"primary_key" json:"id" ` TaskID string `json:"task_id" gorm:"type:varchar(12) comment '任务id';default:'';index:task_id"` Log string `json:"log" gorm:"type:text comment '日志';"` - Status int `json:"status" gorm:"type:int comment '状态';default:0;"` + Status *int `json:"status" gorm:"type:int comment '状态';default:0;"` CallerIp string `json:"caller_ip" gorm:"type:varchar(256) comment '发送者的ip';default:'';"` CreatedOn util.Time `json:"created_on" gorm:"type:timestamp comment '创建时间';default:current_timestamp;"` diff --git a/service/send_message_service/send_message.go b/service/send_message_service/send_message.go index 679d673..87e3c55 100644 --- a/service/send_message_service/send_message.go +++ b/service/send_message_service/send_message.go @@ -193,7 +193,7 @@ func (sm *SendMessageService) RecordSendLog() { log := models.SendTasksLogs{ Log: strings.Join(sm.LogOutput, "\n"), TaskID: sm.TaskID, - Status: sm.Status, + Status: &sm.Status, CallerIp: sm.CallerIp, } err := log.Add() diff --git a/web/src/echarts.js b/web/src/echarts.js new file mode 100644 index 0000000..2145e68 --- /dev/null +++ b/web/src/echarts.js @@ -0,0 +1,35 @@ +// 引入 echarts 核心模块,核心模块提供了 echarts 使用必须要的接口。 +import * as echarts from "echarts/core"; + +import { PieChart, LineChart } from "echarts/charts"; + +// 引入提示框,标题,直角坐标系,数据集,内置数据转换器组件,组件后缀都为 Component +import { + TitleComponent, + TooltipComponent, + GridComponent, + DatasetComponent, + TransformComponent, +} from "echarts/components"; + +// 标签自动布局,全局过渡动画等特性 +import { LabelLayout, UniversalTransition } from "echarts/features"; + +// 引入 Canvas 渲染器,注意引入 CanvasRenderer 或者 SVGRenderer 是必须的一步 +import { CanvasRenderer } from "echarts/renderers"; + +// 注册必须的组件 +echarts.use([ + TitleComponent, + TooltipComponent, + GridComponent, + DatasetComponent, + TransformComponent, + PieChart, + LabelLayout, + UniversalTransition, + CanvasRenderer, + LineChart, +]); + +export default echarts; \ No newline at end of file diff --git a/web/src/main.js b/web/src/main.js index e8aff25..b58618d 100644 --- a/web/src/main.js +++ b/web/src/main.js @@ -7,6 +7,7 @@ import ElementPlus from 'element-plus' import 'element-plus/dist/index.css' // import './assets/styles/global.css' import pinia from './store'; +import echarts from "./echarts"; const app = createApp(App) @@ -14,6 +15,7 @@ app.use(router) app.use(ElementPlus) app.use(pinia); +app.provide('$echarts', echarts); app.mount('#app') diff --git a/web/src/views/tabsTools/statistic/statistic.vue b/web/src/views/tabsTools/statistic/statistic.vue index 78fac53..a14d57e 100644 --- a/web/src/views/tabsTools/statistic/statistic.vue +++ b/web/src/views/tabsTools/statistic/statistic.vue @@ -56,9 +56,9 @@ // CaretTop, // Warning, // } from '@element-plus/icons-vue' -import { reactive, toRefs, onMounted, onUnmounted } from 'vue' +import { reactive, toRefs, onMounted, onUnmounted ,inject } from 'vue' import { request } from '@/api/api' -import * as echarts from "echarts" +// import * as echarts from "echarts" export default { setup() { @@ -67,7 +67,9 @@ export default { dailyChart: {}, sendCateChart: {}, }); - let echart = echarts; + + const echart = inject('$echarts'); + // let echart = echarts; const getStatisticData = async () => { const rsp = await request.get('/statistic');