解决冲突

RuoYi-Vue-Oracle/src/main/resources/application.yml

@@ -73,15 +73,15 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 192.168.31.105
-    #host: 127.0.0.1
+   # host: 192.168.31.105
+    host: 127.0.0.1
     # 端口，默认为6379
     port: 6379
     # 数据库索引
     database: 0
     # 密码
-    #password: 123456
-    password: admin123!
+    password: 123456
+    #password: admin123!
     # 连接超时时间
     timeout: 10s
     lettuce:

ruoyi-ui/src/views/dataStatistics/monthData/index.vue

@@ -0,0 +1,60 @@
+<template>
+
+  <div class="month-data">
+    <el-tabs v-model="activeTab" @tab-click="handleTabClick">
+      <el-tab-pane
+        v-for="tab in tabs"
+        :key="tab.cpn"
+        :label="tab.label"
+        :name="tab.cpn"
+      >
+        <component :is="tab.cpn" />
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import CreateReport from "./create-report.vue";
+import DataOverview from "./data-overview.vue";
+import DataDetail from "./data-detail.vue";
+export default {
+  name: "MonthData",
+  components: {
+    CreateReport,
+    DataOverview,
+    DataDetail,
+  },
+  data() {
+    return {
+      activeTab: "CreateReport",
+      tabs: [
+        {
+          label: "报表生成",
+          cpn: "CreateReport",
+        },
+        {
+          label: "数据总览",
+          cpn: "DataOverview",
+        },
+        {
+          label: "数据详情",
+          cpn: "DataDetail",
+        },
+      ],
+    };
+  },
+  created() {},
+  methods: {
+    handleTabClick(tab) {
+      this.activeTab = tab.name;
+    },
+  },
+};
+</script>
+
+<style scoped>
+.month-data {
+  padding: 10px 20px;
+}
+</style>

ruoyi-ui/vue.config.js

@@ -35,7 +35,9 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:8080`,
+       // target: `http://localhost:8080`,
+        target: `http://218.58.79.146:13081/prod-api/`,
+        //target: `http://218.58.79.146:13080/prod-api/`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''