yudao-team/yudao_ui
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	.env
#	src/views/Home/mychart/MyAChart.vue
This commit is contained in:
XaoLi717 2024-10-18 15:05:55 +08:00
commit 814135b75a
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env
View File

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

8
.env.dev
View File

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

1
src/views/Home/mychart/MyAChart.vue
View File

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