Skip to content

phsl / client

Go to a project
Commit 4091693c by Jony.L
Options

算力资源重构-算力资源客户端展示 以及算力资源订单功能初步修改

parent be708775
Showing with 62 additions and 28 deletions
src/api/computingResource.js
...@@ -12,7 +12,7 @@ export function computilityMenu (query) { ...@@ -12,7 +12,7 @@ export function computilityMenu (query) {
// 获取计算资源菜单 // 获取计算资源菜单
export function categoryMenuNew (query) { export function categoryMenuNew (query) {
return request({ return request({
url: '/product/category/list-computility', url: '/compute/resource-category/list',
method: 'get', method: 'get',
params: query params: query
}) })
...@@ -22,7 +22,7 @@ export function categoryMenuNew (query) { ...@@ -22,7 +22,7 @@ export function categoryMenuNew (query) {
// 根据应用类别返回对应计算机资源列表 // 根据应用类别返回对应计算机资源列表
export function getRListByCategory (query) { export function getRListByCategory (query) {
return request({ return request({
url: '/product/sku/page', url: '/compute/resource-sku/page',
method: 'get', method: 'get',
params: query params: query
}) })
...@@ -32,7 +32,7 @@ export function getRListByCategory (query) { ...@@ -32,7 +32,7 @@ export function getRListByCategory (query) {
// 计算资源详情 // 计算资源详情
export function getRDetail (query) { export function getRDetail (query) {
return request({ return request({
url: '/product/sku/get-detail', url: '/compute/resource-sku/get-detail',
method: 'get', method: 'get',
params: query params: query
}) })
...@@ -58,7 +58,7 @@ export function orderBuy (query) { ...@@ -58,7 +58,7 @@ export function orderBuy (query) {
export function createOrderSubmit(query){ export function createOrderSubmit(query){
return request({ return request({
url: '/trade/order/create', url: '/compute/order/create',
method: 'post', method: 'post',
data: query data: query
}) })
......
src/views/computingResource/resourceList.vue
...@@ -50,18 +50,11 @@ ...@@ -50,18 +50,11 @@
<div v-if="showVersion === 1" class="version-1"> <div v-if="showVersion === 1" class="version-1">
<el-table v-if="tableData.length !== 0" :data="tableData" :max-height="490" style="width: 100%"> <el-table v-if="tableData.length !== 0" :data="tableData" :max-height="490" style="width: 100%">
<el-table-column prop="name" label="型号" width="190px" sortable/> <el-table-column prop="name" label="型号" width="190px" sortable/>
<el-table-column <el-table-column prop="cpu" label="CPU" sortable/>
v-for="(item, index) in tableData[0]?.properties.length!==0?tableData[0]?.properties.slice(0,6):tableData[0]?.properties" <el-table-column prop="gpu" label="GPU" sortable/>
:key="index" <el-table-column prop="ram" label="内存" sortable/>
:label="item.propertyName" <el-table-column prop="storage" label="存储" sortable/>
sortable <el-table-column prop="location" label="所在地" sortable/>
>
<template #default="{ row }">
{{ row.properties?.[index]?.valueName || '-' }}
</template>
</el-table-column>
<!-- 新增的价格列（醒目字体） --> <!-- 新增的价格列（醒目字体） -->
<el-table-column label="价格" width="200px"> <el-table-column label="价格" width="200px">
<template #default="{ row }"> <template #default="{ row }">
...@@ -100,13 +93,34 @@ ...@@ -100,13 +93,34 @@
</div> </div>
<div class="bottom-info"> <div class="bottom-info">
<el-row> <el-row>
<el-col <el-col>
v-for="(i,x) in (item?.properties && item.properties.length!==0 ? item.properties.slice(0,4) : item?.properties || [])" <div class="parameter-item">
:key="x" <div class="label">CPU</div>
> <div class="value">{{ item.cpu || '-' }}</div>
</div>
</el-col>
<el-col>
<div class="parameter-item">
<div class="label">GPU</div>
<div class="value">{{ item.gpu || '-' }}</div>
</div>
</el-col>
<el-col>
<div class="parameter-item">
<div class="label">内存</div>
<div class="value">{{ item.ram || '-' }}</div>
</div>
</el-col>
<el-col>
<div class="parameter-item">
<div class="label">存储</div>
<div class="value">{{ item.storage || '-' }}</div>
</div>
</el-col>
<el-col>
<div class="parameter-item"> <div class="parameter-item">
<div class="label">{{ i?.propertyName || '-' }}</div> <div class="label">所在地</div>
<div class="value">{{ i?.valueName || '-' }}</div> <div class="value">{{ item.location || '-' }}</div>
</div> </div>
</el-col> </el-col>
...@@ -156,9 +170,29 @@ ...@@ -156,9 +170,29 @@
</div> </div>
<div class="info-block"> <div class="info-block">
<div class="info-item flex-align-center flex-space-between" v-for="(i,index) in productDetail.properties"> <div class="info-item flex-align-center flex-space-between">
<div class="label">{{ i.propertyName }}</div> <div class="label">CPU</div>
<div class="value">{{ i.valueName }}</div> <div class="value">{{ productDetail.cpu || '-' }}</div>
</div>
<div class="info-item flex-align-center flex-space-between">
<div class="label">GPU</div>
<div class="value">{{ productDetail.gpu || '-' }}</div>
</div>
<div class="info-item flex-align-center flex-space-between">
<div class="label">内存</div>
<div class="value">{{ productDetail.ram || '-' }}</div>
</div>
<div class="info-item flex-align-center flex-space-between">
<div class="label">存储</div>
<div class="value">{{ productDetail.storage || '-' }}</div>
</div>
<div class="info-item flex-align-center flex-space-between">
<div class="label">服务器IP</div>
<div class="value">{{ productDetail.ip || '-' }}</div>
</div>
<div class="info-item flex-align-center flex-space-between">
<div class="label">服务器所在地</div>
<div class="value">{{ productDetail.location || '-' }}</div>
</div> </div>
</div> </div>
...@@ -378,11 +412,11 @@ function getCreateData() { ...@@ -378,11 +412,11 @@ function getCreateData() {
} }
function create() { function create() {
// 用户点击“确认”时执行 // 用户点击"确认"时执行
const createData = getCreateData(); const createData = getCreateData();
//创建订单 //创建订单
createOrderSubmit({items: [{skuId: createData.skuId, count: 1}]}).then(res => { createOrderSubmit(createData).then(res => {
if (res.data.payOrderId !== '') { if (res.data.payOrderId) {
// 弹出确认对话框 // 弹出确认对话框
ElMessageBox.confirm( ElMessageBox.confirm(
'确定购买吗？', // 对话框提示文字 '确定购买吗？', // 对话框提示文字
......
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 sign in to comment