Skip to content

I
intelligent_station_web
Commit 47405bc7 authored by 张伯涛's avatar 张伯涛
Browse files
Options

修改

parent bacc3777
Show whitespace changes
Inline Side-by-side
Showing with 23 additions and 79 deletions
src/views/containerManage/containerManage/index.vue
View file @ 47405bc7
<template>
<div class="app-container">
<div v-if="themeType === '8'" class="tableTitle">用户管理列表</div>
<div v-if="themeType === '8'" class="tableTitle">容器管理列表</div>
<el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
<el-form-item label="容器名称" prop="dockerName">
<el-input
......@@ -134,7 +134,6 @@
</el-form>
<div class="placeholder" />
<div style="padding:5px 10px">
<div class="mb12 font-small-bold">容器实例列表</div>
<el-table v-loading="loading" border :data="resContainerInstanceList">
<el-table-column type="index" label="序号" fixed="left" width="55" align="center" />
<el-table-column label="容器名称" fixed="left" prop="dockerName" width="130" :show-overflow-tooltip="true">
......@@ -172,37 +171,22 @@
{{ scope.row.dockerMemory || '-' }}
</template>
</el-table-column>
<el-table-column label="硬盘" prop="dockerDisk" width="60" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.dockerDisk || '-' }}
</template>
</el-table-column>
<el-table-column label="GPU" prop="dockerGpu" width="60" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.dockerGpu || '-' }}
</template>
</el-table-column>
<el-table-column label="容器宿主机" prop="dockerHostId" width="130" :show-overflow-tooltip="true">
<el-table-column label="容器宿主机" prop="dockerHostId" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.hostName || '-' }}
</template>
</el-table-column>
<el-table-column label="容器镜像" prop="dockerImageId" width="130" :show-overflow-tooltip="true">
<el-table-column label="容器镜像" prop="dockerImageId" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.imageName || '-' }}
</template>
</el-table-column>
<el-table-column width="70" label="状态" prop="dockerStatus">
<template slot-scope="scope">
<el-switch
v-model="scope.row.dockerStatus"
class="switchDisabledStyle"
inactive-value="0"
active-value="1"
@click.native="handleStatusChange(scope.row)"
/>
</template>
</el-table-column>
<el-table-column label="备注" prop="remarks" width="150" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.remarks || '-' }}
......@@ -231,7 +215,7 @@
:type="commonField.typeParent"
:size="commonField.size"
@click="handleDelete(scope.row)"
>删除</el-button>
>关机</el-button>
</template>
</el-table-column>
</el-table>
......@@ -582,7 +566,7 @@ export default {
}).then(() => {
this.getList()
this.$message({
message: '删除成功',
message: '关机成功',
type: 'success'
})
}).catch(function() {
......@@ -617,10 +601,5 @@ export default {
font-size: 18px;
padding: 0;
.placeholder {
height: 1.3vh;
background-color: #F4F4F4;
margin-bottom: 10px
}
}
</style>
src/views/containerManage/operationRecords/index.vue
View file @ 47405bc7
<template>
<div class="app-container">
<div v-if="themeType === '8'" class="tableTitle">用户管理列表</div>
<div v-if="themeType === '8'" class="tableTitle">运行记录管理列表</div>
<el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
<el-form-item label="容器名称" prop="dockerName">
<el-input
......@@ -116,7 +116,6 @@
</el-form>
<div class="placeholder" />
<div style="padding:5px 10px">
<div class="mb12 font-small-bold">运行记录列表</div>
<el-table v-loading="loading" border :data="resContainerInstanceList">
<el-table-column type="index" label="序号" fixed="left" width="55" align="center" />
<el-table-column label="容器名称" fixed="left" prop="dockerName" width="130" :show-overflow-tooltip="true">
......@@ -154,11 +153,6 @@
{{ scope.row.dockerMemory || '-' }}
</template>
</el-table-column>
<el-table-column label="硬盘" prop="dockerDisk" width="60" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.dockerDisk || '-' }}
</template>
</el-table-column>
<el-table-column label="GPU" prop="dockerGpu" width="60" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.dockerGpu || '-' }}
......@@ -174,17 +168,6 @@
{{ scope.row.imageName || '-' }}
</template>
</el-table-column>
<el-table-column width="70" label="状态" prop="dockerStatus">
<template slot-scope="scope">
<el-switch
v-model="scope.row.dockerStatus"
class="switchDisabledStyle"
inactive-value="0"
active-value="1"
@click.native="handleStatusChange(scope.row)"
/>
</template>
</el-table-column>
<el-table-column label="备注" prop="remarks" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.remarks || '-' }}
......@@ -195,17 +178,13 @@
<span>{{ scope.row.createName }}</span>
</template>
</el-table-column>
<el-table-column label="创建时间" prop="createDate" width="160" :show-overflow-tooltip="true">
<el-table-column label="创建时间" prop="createDate" width="210" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
</template>
</el-table-column>
<el-table-column label="上线时间" prop="createDate" width="160" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.onlineDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
</template>
</el-table-column>
<el-table-column label="下线时间" prop="createDate" width="160" :show-overflow-tooltip="true">
<el-table-column label="回收时间" prop="createDate" width="210" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.offlineDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
</template>
......@@ -218,12 +197,6 @@
:size="commonField.size"
@click="handleDetails(scope.row)"
>详情</el-button>
<el-button
:class="commonField.delClass"
:type="commonField.typeParent"
:size="commonField.size"
@click="handleDelete(scope.row)"
>删除</el-button>
</template>
</el-table-column>
</el-table>
......@@ -261,8 +234,8 @@ export default {
total: 0,
// 容器实例表格数据
resContainerInstanceList: [
{dockerName: 'test_nginx',dockerLabel: '1',superiName: '学生1',dockerCpu: '11',dockerMemory: '12',dockerDisk: '32',dockerGpu: '22',hostName: '主机1',imageName: '通义-文本生成图像大模型-中英文-通用领域',dockerStatus: '1',remarks: '-',createName:'管理员',createDate: '2024-08-27 14:21',onlineDate: '2024-08-27 14:21',offlineDate: '2024-08-27 14:21'},
{dockerName: 'test_nginx2',dockerLabel: '1',superiName: '学生2',dockerCpu: '32',dockerMemory: '43',dockerDisk: '2',dockerGpu: '16',hostName: '主机2',imageName: '通义-文本生成图像大模型-中英文-通用领域',dockerStatus: '1',remarks: '-',createName:'管理员',createDate: '2024-08-27 14:21',onlineDate: '2024-08-27 14:21',offlineDate: '2024-08-27 14:21'}
{dockerName: 'test_nginx',dockerLabel: '1',superiName: '学生1',dockerCpu: '11',dockerMemory: '12',dockerDisk: '32',dockerGpu: '22',hostName: '主机1',imageName: '通义-文本生成图像大模型-中英文-通用领域',dockerStatus: '1',remarks: '-',createName:'管理员',createDate: '2024-08-27 14:21',onlineDate: '2024-08-27 14:21',offlineDate: '2024-09-12 21:21'},
{dockerName: 'test_nginx2',dockerLabel: '1',superiName: '学生2',dockerCpu: '32',dockerMemory: '43',dockerDisk: '2',dockerGpu: '16',hostName: '主机2',imageName: '通义-文本生成图像大模型-中英文-通用领域',dockerStatus: '1',remarks: '-',createName:'管理员',createDate: '2024-08-27 14:21',onlineDate: '2024-08-27 14:21',offlineDate: '2024-08-30 7:09'}
],
// 负责人数据
superintendentList: [],
......@@ -527,10 +500,5 @@ export default {
font-size: 18px;
padding: 0;
.placeholder {
height: 1.3vh;
background-color: #F4F4F4;
margin-bottom: 10px
}
}
</style>
src/views/homePage/index.vue
View file @ 47405bc7
......@@ -240,7 +240,7 @@ export default {
GpuImg: require('@/assets/image/GPU.png'),
averageLoadImg: require('@/assets/image/fuzailv.png'),
dateLists: ['10:16','10:18','10:20','10:22','10:24','10:26','10:28','10:30','10:32','10:34','10:36','10:38',],
commitLists: [null,null,'100','100', '100', '100', '100', '100', '100', '100', '100', '100'],
commitLists: ['16','31','25','41', '11', '39', '61', '54', '32', '21', '38', '11'],
passLists: [null,null,'0','0', '0', '0', '0', '0', '0', '0', '0', '0'],
oneMeterList: ['0','100','190','180','170','200','140','88','90','193','100','174'],
fiveMeterList: ['100','190','90','160','200','380','214','120','110','203','218','262'],
......@@ -396,6 +396,9 @@ export default {
fontWeight: 'bold', // 标题文字加粗
},
},
tooltip: {
trigger: 'axis'
},
grid: {
left: '10%', // 内容区域距离左边的距离
right: '10%', // 内容区域距离右边的距离
......@@ -414,7 +417,7 @@ export default {
},
},
series: [{
name: '',
name: 'cpu使用率',
showSymbol: false,
data: this.commitLists,
type: 'line',
......@@ -423,12 +426,12 @@ export default {
}
},
{
name: '',
showSymbol: false,
data: this.passLists,
type: 'line'
}
// {
// name: '',
// showSymbol: false,
// data: this.passLists,
// type: 'line'
// }
]
}
myChartRegistrationTime.setOption(options)
......
src/views/resContainerInstance/index.vue
View file @ 47405bc7
......@@ -704,11 +704,5 @@ export default {
.app-container {
font-size: 18px;
padding: 0;
.placeholder {
height: 1.3vh;
background-color: #F4F4F4;
margin-bottom: 10px
}
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment