From fdf3a2de6ac2787f844184a3ba3ec8be52eff8f1 Mon Sep 17 00:00:00 2001
From: xjs <1294405880@qq.com>
Date: Wed, 9 Mar 2022 11:01:18 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=89=8D=E7=AB=AF=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E5=BE=AE=E8=B0=83=202=E3=80=81pom=E6=96=87=E4=BB=B6=E5=BE=AE?=
 =?UTF-8?q?=E8=B0=83=203=E3=80=81=E6=96=B0=E5=A2=9E=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../job/task/{openapi => }/WarningTask.java   |  2 +-
 ruoyi-ui/.env.production                      |  5 +++-
 .../statistics/weatherstatistics/index.vue    |  8 ++++--
 xjs-business/pom.xml                          |  1 +
 xjs-business/xjs-learn/pom.xml                | 26 +++++++++++++++++++
 5 files changed, 38 insertions(+), 4 deletions(-)
 rename ruoyi-modules/ruoyi-job/src/main/java/com/xjs/job/task/{openapi => }/WarningTask.java (98%)
 create mode 100644 xjs-business/xjs-learn/pom.xml

diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/xjs/job/task/openapi/WarningTask.java b/ruoyi-modules/ruoyi-job/src/main/java/com/xjs/job/task/WarningTask.java
similarity index 98%
rename from ruoyi-modules/ruoyi-job/src/main/java/com/xjs/job/task/openapi/WarningTask.java
rename to ruoyi-modules/ruoyi-job/src/main/java/com/xjs/job/task/WarningTask.java
index 37b60b1c..dd98d010 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/xjs/job/task/openapi/WarningTask.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/xjs/job/task/WarningTask.java
@@ -1,4 +1,4 @@
-package com.xjs.job.task.openapi;
+package com.xjs.job.task;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUnit;
diff --git a/ruoyi-ui/.env.production b/ruoyi-ui/.env.production
index ba2336bf..4613d96e 100644
--- a/ruoyi-ui/.env.production
+++ b/ruoyi-ui/.env.production
@@ -5,4 +5,7 @@ VUE_APP_TITLE = 管理平台
 ENV = 'production'
 
 # 若依管理系统/生产环境
-VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = 'http://localhost:8080'
+
+# 路由懒加载
+VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/ruoyi-ui/src/views/business/statistics/weatherstatistics/index.vue b/ruoyi-ui/src/views/business/statistics/weatherstatistics/index.vue
index e0ff83e4..9a7727ac 100644
--- a/ruoyi-ui/src/views/business/statistics/weatherstatistics/index.vue
+++ b/ruoyi-ui/src/views/business/statistics/weatherstatistics/index.vue
@@ -48,7 +48,8 @@ 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]);
+import { LegendComponent } from 'echarts/components';
+echarts.use([GridComponent, LineChart, CanvasRenderer, UniversalTransition, TitleComponent, BarChart,TooltipComponent,LegendComponent]);
 
 export default {
   name: "WeatherStatistics",
@@ -126,7 +127,10 @@ export default {
         tooltip: {
           trigger: 'axis'
         },
-        legend: {},
+        legend: {
+          left: '79%'
+
+        },
 
         xAxis: {
           type: 'category',
diff --git a/xjs-business/pom.xml b/xjs-business/pom.xml
index 5f822c5b..b5726d3a 100644
--- a/xjs-business/pom.xml
+++ b/xjs-business/pom.xml
@@ -25,6 +25,7 @@
         <module>xjs-business-webmagic</module>
         <module>xjs-business-blog</module>
         <module>xjs-business-srb</module>
+        <module>xjs-learn</module>
     </modules>
 
     <properties>
diff --git a/xjs-business/xjs-learn/pom.xml b/xjs-business/xjs-learn/pom.xml
new file mode 100644
index 00000000..9a4ed6b9
--- /dev/null
+++ b/xjs-business/xjs-learn/pom.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>xjs-business</artifactId>
+        <groupId>com.xjs</groupId>
+        <version>3.3.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>xjs-learn</artifactId>
+
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-all</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file