Update Nacos configuration, adjust dependency versions, and refine parent project version

shaofan
1 parent d9137486
Showing 5 changed files with 48 additions and 48 deletions
Readme.md
project-slwl-admin-vue/.env.development
project-slwl-admin-vue/src/layout/components/Sidebar/SidebarItem.vue
project-slwl-admin-vue/src/views/dashboard/index.vue
project-slwl-admin-vue/vue.config.js
@@ -548,7 +548,7 @@ spring:
     nacos:
       username: nacos
       password: nacos
-      server-addr: 192.168.150.101:8848
+      server-addr: nacos.diligrp.com:8848
       discovery:
         namespace: ecae68ba-7b43-4473-a980-4ddeb6157bdc
         ip: 192.168.150.1
@@ -5,8 +5,8 @@ NODE_ENV = development
 VUE_APP_NODE_ENV=dev
  
 # base api
-VUE_APP_BASE_URL = 'http://god-express-gateway-t.itheima.net/manager'
-VUE_APP_URL = 'http://god-express-gateway-t.itheima.net/manager'
+VUE_APP_BASE_URL = '/manager'
+VUE_APP_URL = 'http://10.28.3.3:9527/manager'
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.
 # It only does one thing by converting all import() to require().
@@ -8,7 +8,7 @@
       "
     >
       <app-link
-        v-if="onlyOneChild.meta"
+        v-if="onlyOneChild"
         :to="resolvePath(onlyOneChild.path)"
       >
         <el-menu-item
@@ -21,7 +21,7 @@
           />
           <item
  
-            :title="onlyOneChild.meta.title"
+            :title="onlyOneChild.name"
           />
         </el-menu-item>
       </app-link>
@@ -37,8 +37,8 @@
         <!-- <div>图标</div> -->
         <img :src="item.icon" />
         <item
-          v-if="item.meta"
-          :title="item.meta.title"
+          v-if="item"
+          :title="item.name"
         />
       </template>
       <sidebar-item
@@ -737,44 +737,44 @@ export default {
     },
     // 获取页面数据
     getPageData () {
-      dashboardData().then((res) => {
-        this.organOverview = res.data.organOverview
-        this.todayData = res.data.todayData
-        this.addNumber(0, res.data.todayData.orderAmount, 'my-number1', 25)
-        this.addNumber(0, res.data.todayData.orderNumber, 'my-number2', 2)
-        this.addNumber(
-          0,
-          res.data.todayData.transportTaskNumber,
-          'my-number3',
-          1
-        )
-        this.dealWithBacklogChartData(res)
-        this.dealWithTaskingListData(res)
-        this.transportTaskListData = res.data.transportTaskList // 运输任务
-        this.notChangeTransportTaskListData = res.data.transportTaskList
-        this.orderAccountTitleData = res.data.orderLineChart // 近期订单总量
-        // 对订单总量折线图Y轴数据接受的数据进行处理，使其显示正确的数据
-        this.orderAccountChartY = res.data.orderLineChart.monthlyOrderList.map(
-          (item) => {
-            return item.dateTime
-          }
-        )
-        // 对订单总量折线图X轴数据接受的数据进行处理，使其显示正确的数据
-        this.orderAccountChartX = res.data.orderLineChart.monthlyOrderList.map(
-          (item) => {
-            return item.orderNumber
-          }
-        )
-        // 等待数据更新完成后再执行
-        this.$nextTick(() => {
-          this.$refs.ballChart.initial()
-          this.$refs.ballChartIng.initial()
-          this.$refs.lineManageChart.initial()
-          this.$refs.orderAccountChart.initial()
-          this.$refs.orderDistributeChart.initial()
-          this.tableActionFun()
-        })
-      })
+      // dashboardData().then((res) => {
+      //   this.organOverview = res.data.organOverview
+      //   this.todayData = res.data.todayData
+      //   this.addNumber(0, res.data.todayData.orderAmount, 'my-number1', 25)
+      //   this.addNumber(0, res.data.todayData.orderNumber, 'my-number2', 2)
+      //   this.addNumber(
+      //     0,
+      //     res.data.todayData.transportTaskNumber,
+      //     'my-number3',
+      //     1
+      //   )
+      //   this.dealWithBacklogChartData(res)
+      //   this.dealWithTaskingListData(res)
+      //   this.transportTaskListData = res.data.transportTaskList // 运输任务
+      //   this.notChangeTransportTaskListData = res.data.transportTaskList
+      //   this.orderAccountTitleData = res.data.orderLineChart // 近期订单总量
+      //   // 对订单总量折线图Y轴数据接受的数据进行处理，使其显示正确的数据
+      //   this.orderAccountChartY = res.data.orderLineChart.monthlyOrderList.map(
+      //     (item) => {
+      //       return item.dateTime
+      //     }
+      //   )
+      //   // 对订单总量折线图X轴数据接受的数据进行处理，使其显示正确的数据
+      //   this.orderAccountChartX = res.data.orderLineChart.monthlyOrderList.map(
+      //     (item) => {
+      //       return item.orderNumber
+      //     }
+      //   )
+      //   // 等待数据更新完成后再执行
+      //   this.$nextTick(() => {
+      //     this.$refs.ballChart.initial()
+      //     this.$refs.ballChartIng.initial()
+      //     this.$refs.lineManageChart.initial()
+      //     this.$refs.orderAccountChart.initial()
+      //     this.$refs.orderDistributeChart.initial()
+      //     this.tableActionFun()
+      //   })
+      // })
     },
     // 跳转到运输任务列表
     handleToTransportTask () {
@@ -34,7 +34,7 @@ module.exports = {
       '/api1/apiLogin': {
         //   target: 'http://canzg-wsl.itheima.net/enterpise',
         // target: 'http://172.17.2.120:8080',
-        target: 'http://172.17.0.60:8760/api',
+        target: 'http://10.28.3.3:8760/api',
         ws: true,
         secure: false,
         changeOrigin: true,
@@ -42,7 +42,7 @@ module.exports = {
           '^/api1/apiLogin': ''
         }
       },
-      '/api1': {
+      '/manager': {
         //   target: 'http://canzg-wsl.itheima.net/enterpise',
         // target: 'http://172.16.43.24:18093', // 家乐
         // target: 'http://slwl-geteway-t.itheima.net/manager', // 测试环境
@@ -52,7 +52,7 @@ module.exports = {
         secure: false,
         changeOrigin: true,
         pathRewrite: {
-          '^/api1': ''
+          '^/manager': ''
         }
       }
       // '/web-manager': {