Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.env
#	src/views/Home/mychart/MyAChart.vue

.env

@@ -21,8 +21,12 @@ VITE_APP_BAIDU_CODE = a1ff8825baa73c3a78eb96aa40325abc
 
 
 #AI路径
+; VITE_AI_URL = http://192.168.1.25:8000
 VITE_AI_URL = http://140.143.164.40:9002
 
+#Onlyoffice相关
+VITE_ONLY_URL = http://140.143.164.40:48080
+
 #Onlyoffice相关
 VITE_ONLY_URL = http://140.143.164.40:48080
 ; VITE_ONLY_URL = http://192.168.1.15:48080

.env.dev

@@ -4,14 +4,14 @@ NODE_ENV=production
 VITE_DEV=true
 
 # 请求路径
-VITE_BASE_URL='http://api-dashboard.yudao.iocoder.cn'
-# VITE_BASE_URL='http://140.143.164.40:48080'
+# VITE_BASE_URL='http://api-dashboard.yudao.iocoder.cn'
+VITE_BASE_URL='http://140.143.164.40:48080'
 
 # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持S3服务
 VITE_UPLOAD_TYPE=server
 # 上传路径
-VITE_UPLOAD_URL='http://api-dashboard.yudao.iocoder.cn/admin-api/infra/file/upload'
-# VITE_UPLOAD_URL='http://140.143.164.40:48080/admin-api/infra/file/upload'
+# VITE_UPLOAD_URL='http://api-dashboard.yudao.iocoder.cn/admin-api/infra/file/upload'
+VITE_UPLOAD_URL='http://140.143.164.40:48080/admin-api/infra/file/upload'
 
 # 接口地址
 VITE_API_URL=/admin-api

src/views/Home/mychart/MyAChart.vue

@@ -4,7 +4,6 @@
 
 <script>
 import * as echarts from 'echarts';
-// import { listInfo } from '@/api/des/info';
 export default {
   name: 'MyAChart',
   data() {