Merge branch 'online_demonstration' of https://bdgit.educoder.net/pgpc5xf4t/hami into online_demonstration

online_demonstration
youys 5 days ago
commit a1dd50beca

@ -48,9 +48,9 @@
<CardList :hideTitle="true" :filters="filters" />
</block-box>
<block-box title="任务列表">
<!-- <block-box title="任务列表">
<TaskList :hideTitle="true" :filters="filters" />
</block-box>
</block-box> -->
</div>
</template>

@ -53,17 +53,17 @@ export default (Layout) => ({
component: () => import('~/vgpu/views/card/admin/Detail.vue'),
name: 'card-admin-detail',
},
{
path: '/admin/vgpu/task/admin',
component: () => import('~/vgpu/views/task/admin/index.vue'),
name: 'task-admin',
meta: { title: '任务管理', icon: 'vgpu-task', noCache: true },
},
{
path: '/admin/vgpu/task/admin/detail',
component: () => import('~/vgpu/views/task/admin/Detail.vue'),
name: 'task-admin-detail',
},
// {
// path: '/admin/vgpu/task/admin',
// component: () => import('~/vgpu/views/task/admin/index.vue'),
// name: 'task-admin',
// meta: { title: '任务管理', icon: 'vgpu-task', noCache: true },
// },
// {
// path: '/admin/vgpu/task/admin/detail',
// component: () => import('~/vgpu/views/task/admin/Detail.vue'),
// name: 'task-admin-detail',
// },
],
},
],

@ -69,7 +69,7 @@
</block-box>
</div>
<block-box title="任务列表">
<!-- <block-box title="任务列表">
<template v-if="detail.isExternal">
<el-alert title="由于显卡未纳管,无法获取到任务数据" show-icon type="warning" :closable="false" />
<el-empty description="暂无任务数据" :image-size="100" />
@ -77,7 +77,7 @@
<template v-else>
<TaskList :hideTitle="true" :filters="{ deviceId: detail.uuid }" />
</template>
</block-box>
</block-box> -->
</div>
</template>

@ -97,7 +97,7 @@
<CardList :hideTitle="true" :filters="{ nodeUid: detail.uid }" />
</block-box>
<block-box title="任务列表">
<!-- <block-box title="任务列表">
<template v-if="detail.isExternal">
<el-alert title="由于节点未纳管,无法获取到任务数据" show-icon type="warning" :closable="false" />
<el-empty description="暂无任务数据" :image-size="100" />
@ -105,7 +105,7 @@
<template v-else>
<TaskList :hideTitle="true" :filters="{ nodeUid: detail.uid }" />
</template>
</block-box>
</block-box> -->
</div>
</template>

@ -50,9 +50,9 @@
<CardList :hideTitle="true" :filters="data" />
</block-box>
<block-box title="任务列表">
<!-- <block-box title="任务列表">
<TaskList :hideTitle="true" :filters="data" />
</block-box>
</block-box> -->
</template>
<script setup lang="jsx">

@ -65,7 +65,8 @@ module.exports = defineConfig({
},
proxy: {
'/api/vgpu': {
target: 'http://172.16.100.14:29999',
// target: 'http://172.16.100.14:29999',
target: 'https://hami.educoder.net',
// target: 'http://192.168.2.99:8000',
changeOrigin: true,
},

Loading…
Cancel
Save