From bf7411c57390fec13864dc0f1fdc250a8e1f60b2 Mon Sep 17 00:00:00 2001
From: xjs <1294405880@qq.com>
Date: Sun, 6 Mar 2022 00:02:08 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8D=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E6=A0=91=E7=8A=B6=E5=9B=BE=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=E4=BE=9D=E8=B5=96=E5=B1=80=E9=83=A8=E5=BC=95?=
 =?UTF-8?q?=E5=85=A5=E9=94=99=E8=AF=AF=202=E3=80=81=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=80=A7=E8=83=BD=E7=9B=91=E6=8E=A7=E5=9B=BE=E6=A0=87=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98,props=E5=B1=9E=E6=80=A7opt?=
 =?UTF-8?q?ions=E6=94=B9=E4=B8=BAoption?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/monitor/performance/index.vue    | 14 +++---
 .../statistics/apistatistics/index.vue        | 45 ++++++++++---------
 .../statistics/weatherstatistics/index.vue    | 16 ++++---
 3 files changed, 41 insertions(+), 34 deletions(-)

diff --git a/ruoyi-ui/src/views/business/monitor/performance/index.vue b/ruoyi-ui/src/views/business/monitor/performance/index.vue
index 773a841e..9b6c6268 100644
--- a/ruoyi-ui/src/views/business/monitor/performance/index.vue
+++ b/ruoyi-ui/src/views/business/monitor/performance/index.vue
@@ -106,15 +106,15 @@
         </div>
       </el-card>
 
-<!--      <div>
+      <div>
         <el-row :gutter="6">
           <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12" style="margin-bottom: 10px">
             <el-card class="box-card">
               <div slot="header" class="clearfix">
                 <span style="font-weight: bold;color: #666;font-size: 15px">CPU使用率监控</span>
               </div>
-              <div style="height: 400px;width: 400px">
-                <v-chart :options="cpuInfo" />
+              <div style="height: 350px;">
+                <v-chart :option="cpuInfo" />
               </div>
             </el-card>
           </el-col>
@@ -123,19 +123,21 @@
               <div slot="header" class="clearfix">
                 <span style="font-weight: bold;color: #666;font-size: 15px">内存使用率监控</span>
               </div>
-              <div style="height: 400px;width: 400px">
-                <v-chart :options="memoryInfo" />
+              <div style="height: 350px;">
+                <v-chart :option="memoryInfo" />
               </div>
             </el-card>
           </el-col>
         </el-row>
-      </div>-->
+      </div>
     </div>
   </div>
 </template>
 
 <script>
 import ECharts from 'vue-echarts'
+import * as echarts from 'echarts';
+
 import { getPerformance } from '@/api/business/monitor/performance/performancemonitor'
 export default {
   name: 'Performance',
diff --git a/ruoyi-ui/src/views/business/statistics/apistatistics/index.vue b/ruoyi-ui/src/views/business/statistics/apistatistics/index.vue
index f15fb267..07911e17 100644
--- a/ruoyi-ui/src/views/business/statistics/apistatistics/index.vue
+++ b/ruoyi-ui/src/views/business/statistics/apistatistics/index.vue
@@ -20,13 +20,16 @@
 
 import {getStatisticsHistoryApi, getStatisticsTodayApi} from "@/api/business/statistics/apistatistics";
 
-// 引入 ECharts 主模块
-var echarts = require('echarts/lib/echarts');
-// 引入柱状图
-require('echarts/lib/chart/bar');
-// 引入提示框和标题组件
-require('echarts/lib/component/tooltip');
-require('echarts/lib/component/title');
+
+import * as echarts from 'echarts/core';
+import {GridComponent} from 'echarts/components';
+import {LineChart} from 'echarts/charts';
+import {UniversalTransition} from 'echarts/features';
+import {CanvasRenderer} from 'echarts/renderers';
+import {TitleComponent} from 'echarts/components';
+import {BarChart} from 'echarts/charts';
+import { TooltipComponent } from 'echarts/components';
+echarts.use([GridComponent, LineChart, CanvasRenderer, UniversalTransition, TitleComponent, BarChart,TooltipComponent]);
 
 export default {
   name: "ApiStatistics",
@@ -57,12 +60,12 @@ export default {
       historyChart.setOption({
         title: {
           text: '总计API调用次数',
-          textStyle:{
+          textStyle: {
             color: '#541264',
-            fontWeight:'1000',
-            align:'center',
+            fontWeight: '1000',
+            align: 'center',
           },
-          left:"center",
+          left: "center",
         },
         tooltip: {},
         xAxis: {
@@ -70,7 +73,7 @@ export default {
         },
         yAxis: {
           splitNumber: 10,
-          max:2000,
+          max: 2000,
         },
         series: [{
           name: '次数',
@@ -86,12 +89,12 @@ export default {
       todayChart.setOption({
         title: {
           text: '今日API调用次数',
-          textStyle:{
+          textStyle: {
             color: '#541264',
-            fontWeight:'1000',
-            align:'center',
+            fontWeight: '1000',
+            align: 'center',
           },
-          left:"center",
+          left: "center",
         },
         tooltip: {},
         xAxis: {
@@ -99,7 +102,7 @@ export default {
         },
         yAxis: {
           splitNumber: 10,
-          max:60,
+          max: 60,
         },
         series: [{
           name: '次数',
@@ -120,13 +123,13 @@ export default {
 
     //查询API当天记录统计
     getStatisticsTodayApi() {
-      this.loading=true
+      this.loading = true
       getStatisticsTodayApi().then(res => {
-        this.loading=false
+        this.loading = false
         this.todayApiData = res.data
         this.initToday()
-      }).catch(err =>{
-        this.loading=false
+      }).catch(err => {
+        this.loading = false
       })
     },
 
diff --git a/ruoyi-ui/src/views/business/statistics/weatherstatistics/index.vue b/ruoyi-ui/src/views/business/statistics/weatherstatistics/index.vue
index d9f01b4c..e0ff83e4 100644
--- a/ruoyi-ui/src/views/business/statistics/weatherstatistics/index.vue
+++ b/ruoyi-ui/src/views/business/statistics/weatherstatistics/index.vue
@@ -40,13 +40,15 @@
 import {getHistoryWeather, getFutureWeather} from "@/api/business/statistics/weatherstatistics";
 import {pickerOptions} from "@/layout/mixin/PickerOptions";
 
-// 引入 ECharts 主模块
-var echarts = require('echarts/lib/echarts');
-// 引入柱状图
-require('echarts/lib/chart/line');
-// 引入提示框和标题组件
-require('echarts/lib/component/tooltip');
-require('echarts/lib/component/title');
+import * as echarts from 'echarts/core';
+import {GridComponent} from 'echarts/components';
+import {LineChart} from 'echarts/charts';
+import {UniversalTransition} from 'echarts/features';
+import {CanvasRenderer} from 'echarts/renderers';
+import {TitleComponent} from 'echarts/components';
+import {BarChart} from 'echarts/charts';
+import { TooltipComponent } from 'echarts/components';
+echarts.use([GridComponent, LineChart, CanvasRenderer, UniversalTransition, TitleComponent, BarChart,TooltipComponent]);
 
 export default {
   name: "WeatherStatistics",