Hass/xiaozhi-esp32-server
1
0
Fork 0
mirror of https://github.com/xinnan-tech/xiaozhi-esp32-server.git synced 2026-07-28 10:03:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

update:设置接口读取方式

Browse Source
This commit is contained in:
hrz
2025-04-05 20:16:02 +08:00
parent 52187daafa
commit d255edfd5f
8 changed files with 90 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/manager-web/.env.development
+4 -1
View File
@@ -1 +1,4 @@
VUE_APP_API_BASE_URL=https://2662r3426b.vicp.fun # 暂时使用群主的接口
VUE_APP_API_BASE_URL=https://2662r3426b.vicp.fun/xiaozhi-esp32-api
# 如果本地开发，请使用以下接口
# VUE_APP_API_BASE_URL=http://localhost:8002/xiaozhi-esp32-api
main/manager-web/.env.production
+1 -1
View File
@@ -1 +1 @@
VUE_APP_API_BASE_URL=https://2662r3426b.vicp.fun VUE_APP_API_BASE_URL=/xiaozhi-esp32-api
main/manager-web/src/apis/api.js
+3 -8
View File
@@ -1,22 +1,17 @@
// 引入各个模块的请求 // 引入各个模块的请求
import user from './module/user.js' import user from './module/user.js'
import admin from './module/admin.js'
/** /**
* 接口地址 * 接口地址
* 当前8002端口接口还没开发完成，暂时用 apifoxmock 接口代替 * 开发时自动读取使用.env.development文件
* 如果你想调用8002端口，就用'/xiaozhi-esp32-api/api/v1'，请与vue.config.js的devServer配置相结合，方便跨域请求 * 编译时自动读取使用.env.production文件
*
*/ */
const DEV_API_SERVICE = 'https://2662r3426b.vicp.fun/xiaozhi-esp32-api' const DEV_API_SERVICE = process.env.VUE_APP_API_BASE_URL
// 8002开发完成完成后使用这个
// const DEV_API_SERVICE = '/xiaozhi-esp32-api'
/** /**
* 根据开发环境返回接口url * 根据开发环境返回接口url
* @returns {string} * @returns {string}
*/ */
export function getServiceUrl() { export function getServiceUrl() {
// return '/xiaozhi-esp32-api'
return DEV_API_SERVICE return DEV_API_SERVICE
} }
main/manager-web/src/components/HeaderBar.vue
+8 -10
View File
@@ -13,14 +13,14 @@
<img loading="lazy" alt="" src="@/assets/header/robot.png" :style="{ filter: $route.path === '/home' ? 'brightness(0) invert(1)' : 'None' }"/> <img loading="lazy" alt="" src="@/assets/header/robot.png" :style="{ filter: $route.path === '/home' ? 'brightness(0) invert(1)' : 'None' }"/>
智能体管理 智能体管理
</div> </div>
<div v-if="isSuperAdmin" class="equipment-management" :class="{ 'active-tab': $route.path === '/user-management' }" @click="goUserManagement">
<img loading="lazy" alt="" src="@/assets/header/user_management.png" :style="{ filter: $route.path === '/user-management' ? 'brightness(0) invert(1)' : 'None' }"/>
用户管理
</div>
<div v-if="isSuperAdmin" class="equipment-management" :class="{ 'active-tab': $route.path === '/model-config' }" @click="goModelConfig"> <div v-if="isSuperAdmin" class="equipment-management" :class="{ 'active-tab': $route.path === '/model-config' }" @click="goModelConfig">
<img loading="lazy" alt="" src="@/assets/header/model_config.png" :style="{ filter: $route.path === '/model-config' ? 'brightness(0) invert(1)' : 'None' }"/> <img loading="lazy" alt="" src="@/assets/header/model_config.png" :style="{ filter: $route.path === '/model-config' ? 'brightness(0) invert(1)' : 'None' }"/>
模型配置 模型配置
</div> </div>
<div v-if="isSuperAdmin" class="equipment-management" :class="{ 'active-tab': $route.path === '/user-management' }" @click="goUserManagement">
<img loading="lazy" alt="" src="@/assets/header/user_management.png" :style="{ filter: $route.path === '/user-management' ? 'brightness(0) invert(1)' : 'None' }"/>
用户管理
</div>
</div> </div>
<!-- 右侧元素 --> <!-- 右侧元素 -->
@@ -41,9 +41,8 @@
{{ userInfo.username || '加载中...' }}<i class="el-icon-arrow-down el-icon--right"></i> {{ userInfo.username || '加载中...' }}<i class="el-icon-arrow-down el-icon--right"></i>
</span> </span>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item icon="el-icon-plus" @click.native="">个人中心</el-dropdown-item> <el-dropdown-item @click.native="showChangePasswordDialog">修改密码</el-dropdown-item>
<el-dropdown-item icon="el-icon-circle-plus" @click.native="showChangePasswordDialog">修改密码</el-dropdown-item> <el-dropdown-item @click.native="handleLogout">退出登录</el-dropdown-item>
<el-dropdown-item icon="el-icon-circle-plus-outline" @click.native="handleLogout">退出登录</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </div>
@@ -56,8 +55,8 @@
<script> <script>
import userApi from '@/apis/module/user'; import userApi from '@/apis/module/user';
import ChangePasswordDialog from './ChangePasswordDialog.vue'; // 引入修改密码弹窗组件
import { mapActions, mapGetters } from 'vuex'; import { mapActions, mapGetters } from 'vuex';
import ChangePasswordDialog from './ChangePasswordDialog.vue'; // 引入修改密码弹窗组件
export default { export default {
@@ -187,8 +186,7 @@ export default {
} }
.brand-img { .brand-img {
width: 58px; height: 18px;
height: 12px;
} }
.header-center { .header-center {
main/manager-web/src/views/DeviceManagement.vue
+19 -22
View File
@@ -15,7 +15,8 @@
<el-table-column label="最近对话" prop="lastConversation" width="140"></el-table-column> <el-table-column label="最近对话" prop="lastConversation" width="140"></el-table-column>
<el-table-column label="备注" width="180"> <el-table-column label="备注" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="scope.row.isEdit" v-model="scope.row.remark" size="mini" @blur="stopEditRemark(scope.$index)"></el-input> <el-input v-if="scope.row.isEdit" v-model="scope.row.remark" size="mini"
@blur="stopEditRemark(scope.$index)"></el-input>
<span v-else> <span v-else>
<i v-if="!scope.row.remark" class="el-icon-edit" @click="startEditRemark(scope.$index, scope.row)"></i> <i v-if="!scope.row.remark" class="el-icon-edit" @click="startEditRemark(scope.$index, scope.row)"></i>
<span v-else @click="startEditRemark(scope.$index, scope.row)"> <span v-else @click="startEditRemark(scope.$index, scope.row)">
@@ -26,7 +27,8 @@
</el-table-column> </el-table-column>
<el-table-column label="OTA升级" width="120"> <el-table-column label="OTA升级" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch v-model="scope.row.otaSwitch" size="mini" active-color="#13ce66" inactive-color="#ff4949"></el-switch> <el-switch v-model="scope.row.otaSwitch" size="mini" active-color="#13ce66"
inactive-color="#ff4949"></el-switch>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="80"> <el-table-column label="操作" width="80">
@@ -37,31 +39,25 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination <el-pagination class="pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange"
class="pagination" :current-page="currentPage" :page-sizes="[5, 10, 20, 50]" :page-size="pageSize"
@size-change="handleSizeChange" layout="total, sizes, prev, pager, next, jumper" :total="deviceList.length"></el-pagination>
@current-change="handleCurrentChange"
:current-page="currentPage"
:page-sizes="[5, 10, 20, 50]"
:page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="deviceList.length"
></el-pagination>
</div> </div>
<div class="copyright"> <div class="copyright">
©2025 xiaozhi-esp32-server ©2025 xiaozhi-esp32-server
</div> </div>
<AddDeviceDialog :visible.sync="addDeviceDialogVisible" :agent-id="currentAgentId" @refresh="fetchBindDevices(currentAgentId)" /> <AddDeviceDialog :visible.sync="addDeviceDialogVisible" :agent-id="currentAgentId"
@refresh="fetchBindDevices(currentAgentId)" />
</el-main> </el-main>
</div> </div>
</template> </template>
<script> <script>
import HeaderBar from "@/components/HeaderBar.vue";
import AddDeviceDialog from "@/components/AddDeviceDialog.vue"; import AddDeviceDialog from "@/components/AddDeviceDialog.vue";
import HeaderBar from "@/components/HeaderBar.vue";
export default { export default {
components: {HeaderBar, AddDeviceDialog }, components: { HeaderBar, AddDeviceDialog },
data() { data() {
return { return {
addDeviceDialogVisible: false, addDeviceDialogVisible: false,
@@ -112,14 +108,14 @@ export default {
this.deviceApi.unbindDevice(device_id, ({ data }) => { this.deviceApi.unbindDevice(device_id, ({ data }) => {
if (data.code === 0) { if (data.code === 0) {
this.$message.success({ this.$message.success({
message: '设备解绑成功', message: '设备解绑成功',
showClose: true showClose: true
}); });
this.fetchBindDevices(this.$route.query.agentId); this.fetchBindDevices(this.$route.query.agentId);
} else { } else {
this.$message.error({ this.$message.error({
message: data.msg || '设备解绑失败', message: data.msg || '设备解绑失败',
showClose: true showClose: true
}); });
} }
}); });
@@ -141,7 +137,7 @@ export default {
this.deviceList = data.data.map(device => { this.deviceList = data.data.map(device => {
// 格式化绑定时间 // 格式化绑定时间
const bindDate = new Date(device.createDate); const bindDate = new Date(device.createDate);
const formattedBindTime = `${bindDate.getFullYear()}-${(bindDate.getMonth()+1).toString().padStart(2, '0')}-${bindDate.getDate().toString().padStart(2, '0')} ${bindDate.getHours().toString().padStart(2, '0')}:${bindDate.getMinutes().toString().padStart(2, '0')}:${bindDate.getSeconds().toString().padStart(2, '0')}`; const formattedBindTime = `${bindDate.getFullYear()}-${(bindDate.getMonth() + 1).toString().padStart(2, '0')}-${bindDate.getDate().toString().padStart(2, '0')} ${bindDate.getHours().toString().padStart(2, '0')}:${bindDate.getMinutes().toString().padStart(2, '0')}:${bindDate.getSeconds().toString().padStart(2, '0')}`;
return { return {
device_id: device.id, device_id: device.id,
model: device.board, model: device.board,
@@ -156,8 +152,8 @@ export default {
rawBindTime: new Date(device.createDate).getTime() rawBindTime: new Date(device.createDate).getTime()
}; };
}) })
// 按照绑定时间降序排序 // 按照绑定时间降序排序
.sort((a, b) => a.rawBindTime - b.rawBindTime); .sort((a, b) => a.rawBindTime - b.rawBindTime);
} else { } else {
this.$message.error(data.msg || '获取设备列表失败'); this.$message.error(data.msg || '获取设备列表失败');
} }
@@ -207,6 +203,7 @@ export default {
font-size: 14px; font-size: 14px;
gap: 8px; gap: 8px;
margin-bottom: 15px; margin-bottom: 15px;
&:hover { &:hover {
background: #3a8ee6; background: #3a8ee6;
} }
main/manager-web/src/views/home.vue
+49 -50
View File
@@ -1,55 +1,52 @@
<template> <template>
<div class="welcome"> <div class="welcome">
<!-- 公共头部 --> <!-- 公共头部 -->
<HeaderBar :devices="devices" @search="handleSearch" @search-reset="handleSearchReset" /> <HeaderBar :devices="devices" @search="handleSearch" @search-reset="handleSearchReset" />
<el-main style="padding: 20px;display: flex;flex-direction: column;"> <el-main style="padding: 20px;display: flex;flex-direction: column;">
<div> <div>
<!-- 首页内容 --> <!-- 首页内容 -->
<div class="add-device"> <div class="add-device">
<div class="add-device-bg"> <div class="add-device-bg">
<div class="hellow-text" style="margin-top: 30px;"> <div class="hellow-text" style="margin-top: 30px;">
您好，小智 你好，小智
</div>
<div class="hellow-text">
让我们度过
<div style="display: inline-block;color: #5778FF;">
美好的一天！
</div> </div>
<div class="hellow-text"> </div>
让我们度过 <div class="hi-hint">
<div style="display: inline-block;color: #5778FF;"> Hello, Let's have a wonderful day!
美好的一天！ </div>
</div> <div class="add-device-btn" @click="showAddDialog">
<div class="left-add">
添加智能体
</div> </div>
<div class="hi-hint"> <div style="width: 23px;height: 13px;background: #5778ff;margin-left: -10px;" />
Hello, Let's have a wonderful day! <div class="right-add">
</div> <i class="el-icon-right" style="font-size: 20px;color: #fff;" />
<div class="add-device-btn" @click="showAddDialog">
<div class="left-add">
添加智能体
</div>
<div style="width: 23px;height: 13px;background: #5778ff;margin-left: -10px;" />
<div class="right-add">
<i class="el-icon-right" style="font-size: 20px;color: #fff;" />
</div>
</div> </div>
</div> </div>
</div> </div>
<div class="device-list-container">
<DeviceItem v-for="(item,index) in devices" :key="index" :device="item"
@configure="goToRoleConfig"
@deviceManage="handleDeviceManage"
@delete="handleDeleteAgent"
/>
</div>
</div> </div>
<div class="copyright"> <div class="device-list-container">
©2025 xiaozhi-esp32-server <DeviceItem v-for="(item, index) in devices" :key="index" :device="item" @configure="goToRoleConfig"
@deviceManage="handleDeviceManage" @delete="handleDeleteAgent" />
</div> </div>
<AddWisdomBodyDialog :visible.sync="addDeviceDialogVisible" @confirm="handleWisdomBodyAdded" /> </div>
</el-main> <div class="copyright">
©2025 xiaozhi-esp32-server
</div>
<AddWisdomBodyDialog :visible.sync="addDeviceDialogVisible" @confirm="handleWisdomBodyAdded" />
</el-main>
</div> </div>
</template> </template>
<script> <script>
import DeviceItem from '@/components/DeviceItem.vue'
import AddWisdomBodyDialog from '@/components/AddWisdomBodyDialog.vue' import AddWisdomBodyDialog from '@/components/AddWisdomBodyDialog.vue'
import DeviceItem from '@/components/DeviceItem.vue'
import HeaderBar from '@/components/HeaderBar.vue' import HeaderBar from '@/components/HeaderBar.vue'
export default { export default {
@@ -112,7 +109,7 @@ export default {
// 获取智能体列表 // 获取智能体列表
fetchAgentList() { fetchAgentList() {
import('@/apis/module/agent').then(({ default: userApi }) => { import('@/apis/module/agent').then(({ default: userApi }) => {
userApi.getAgentList(({data}) => { userApi.getAgentList(({ data }) => {
this.originalDevices = data.data.map(item => ({ this.originalDevices = data.data.map(item => ({
...item, ...item,
agentId: item.id // 字段映射 agentId: item.id // 字段映射
@@ -132,19 +129,19 @@ export default {
userApi.deleteAgent(agentId, (res) => { userApi.deleteAgent(agentId, (res) => {
if (res.data.code === 0) { if (res.data.code === 0) {
this.$message.success({ this.$message.success({
message: '删除成功', message: '删除成功',
showClose: true showClose: true
}); });
this.fetchAgentList(); // 刷新列表 this.fetchAgentList(); // 刷新列表
} else { } else {
this.$message.error({ this.$message.error({
message: res.data.msg || '删除失败', message: res.data.msg || '删除失败',
showClose: true showClose: true
}); });
} }
}); });
}); });
}).catch(() => {}); }).catch(() => { });
} }
} }
} }
@@ -167,18 +164,18 @@ export default {
-o-background-size: cover; -o-background-size: cover;
/* 兼容老版本Opera浏览器 */ /* 兼容老版本Opera浏览器 */
} }
.add-device { .add-device {
height: 195px; height: 195px;
border-radius: 15px; border-radius: 15px;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
background: linear-gradient( background: linear-gradient(269.62deg,
269.62deg,
#e0e6fd 0%, #e0e6fd 0%,
#cce7ff 49.69%, #cce7ff 49.69%,
#d3d3fe 100% #d3d3fe 100%);
);
} }
.add-device-bg { .add-device-bg {
width: 100%; width: 100%;
height: 100%; height: 100%;
@@ -193,6 +190,7 @@ export default {
/* 兼容老版本WebKit浏览器 */ /* 兼容老版本WebKit浏览器 */
-o-background-size: cover; -o-background-size: cover;
box-sizing: border-box; box-sizing: border-box;
/* 兼容老版本Opera浏览器 */ /* 兼容老版本Opera浏览器 */
.hellow-text { .hellow-text {
margin-left: 75px; margin-left: 75px;
@@ -252,7 +250,8 @@ export default {
/* 在 DeviceItem.vue 的样式中 */ /* 在 DeviceItem.vue 的样式中 */
.device-item { .device-item {
margin: 0 !important; /* 避免冲突 */ margin: 0 !important;
/* 避免冲突 */
width: auto !important; width: auto !important;
} }
@@ -262,7 +261,7 @@ export default {
margin-top: auto; margin-top: auto;
padding-top: 30px; padding-top: 30px;
color: #979db1; color: #979db1;
text-align: center; /* 居中显示 */ text-align: center;
/* 居中显示 */
} }
</style> </style>
main/manager-web/src/views/login.vue
+2 -2
View File
@@ -5,7 +5,7 @@
<div <div
style="display: flex;align-items: center;margin-top: 15px;margin-left: 10px;gap: 10px;"> style="display: flex;align-items: center;margin-top: 15px;margin-left: 10px;gap: 10px;">
<img loading="lazy" alt="" src="@/assets/xiaozhi-logo.png" style="width: 45px;height: 45px;"/> <img loading="lazy" alt="" src="@/assets/xiaozhi-logo.png" style="width: 45px;height: 45px;"/>
<img loading="lazy" alt="" src="@/assets/xiaozhi-ai.png" style="width: 70px;height: 13px;"/> <img loading="lazy" alt="" src="@/assets/xiaozhi-ai.png" style="height: 18px;"/>
</div> </div>
</el-header> </el-header>
<div class="login-person"> <div class="login-person">
@@ -66,8 +66,8 @@
</template> </template>
<script> <script>
import {getUUID, goToPage, showDanger, showSuccess} from '@/utils'
import Api from '@/apis/api'; import Api from '@/apis/api';
import { getUUID, goToPage, showDanger, showSuccess } from '@/utils';
export default { export default {
main/manager-web/vue.config.js
-7
View File
@@ -15,13 +15,6 @@ module.exports = defineConfig({
devServer: { devServer: {
port: 8001, // 指定端口为 8001 port: 8001, // 指定端口为 8001
proxy: { proxy: {
'/xiaozhi-esp32-api': {
target: process.env.VUE_APP_API_BASE_URL, // 后端 API 的基础 URL
changeOrigin: true, // 允许跨域
pathRewrite: {
'^/xiaozhi-esp32-api': '/xiaozhi-esp32-api',
},
},
}, },
client: { client: {
overlay: false, // 不显示 webpack 错误覆盖层 overlay: false, // 不显示 webpack 错误覆盖层