Skip to content

phsl / client

Go to a project
Commit 8b02ad2e by Jony.L
Options

算力资源重构-更换服务器前修改

parent 4091693c
Showing with 130 additions and 63 deletions
src/api/computility/order.js
......@@ -3,7 +3,7 @@ import request from '@/utils/request'
// 查询订单管理-需求单管理列表
export function listOrder (query) {
return request({
url: '/trade/order/page',
url: '/compute/order/page',
method: 'get',
params: query
})
......
src/api/computility/resources.js
import request from '@/utils/request'
// 查询订单管理-用户资源管理列表
// 查询算力资源订单列表
export function listResources(query) {
return request({
url: '/member/resource/page',
url: '/compute/order/page',
method: 'get',
params: query
})
......@@ -19,10 +19,10 @@ export function listApiResources(query) {
})
}
// 查询订单管理-用户资源管理详细
// 查询算力资源订单详细
export function getResources(query) {
return request({
url: '/member/resource/get',
url: '/compute/order/get',
method: 'get',
params: query
})
......
src/api/system/dict/data.js
......@@ -20,8 +20,11 @@ export function getData(dictCode) {
// 根据字典类型查询字典数据信息
export function getDicts(dictType) {
return request({
url: '/system/dict/data/type/' + dictType,
method: 'get'
url: '/system/dict-data/type',
method: 'get',
params: {
type: dictType
}
})
}
......
src/store/modules/dict.js
......@@ -54,4 +54,4 @@ const useDictStore = defineStore(
}
})
export default useDictStore
export default useDictStore
\ No newline at end of file
src/utils/dict.js
......@@ -2,6 +2,34 @@ import useDictStore from '@/store/modules/dict'
import { getDicts } from '@/api/system/dict/data'
import request from "@/utils/request.js";
export const DICT_TYPE = {
TRADE_INVOICE_STATUS: 'trade_invoice_status'
}
/**
* 获取 dictType 对应的数据字典数组
*/
export const getDictOptions = (dictType) => {
const dicts = useDictStore().getDict(dictType);
return dicts || [];
}
export const getIntDictOptions = (dictType) => {
const dictOptions = getDictOptions(dictType);
return dictOptions.map(dict => ({
...dict,
value: parseInt(dict.value)
}));
}
export const getStrDictOptions = (dictType) => {
const dictOptions = getDictOptions(dictType);
return dictOptions.map(dict => ({
...dict,
value: dict.value + ''
}));
}
/**
* 获取字典数据
*/
......@@ -15,7 +43,7 @@ export function useDict(...args) {
res.value[dictType] = dicts;
} else {
getDicts(dictType).then(resp => {
res.value[dictType] = resp.data.map(p => ({ label: p.dictLabel, value: p.dictValue, elTagType: p.listClass, elTagClass: p.cssClass }))
res.value[dictType] = resp.data.map(p => ({ label: p.label, value: p.value, elTagType: p.elTagType, elTagClass: p.elTagClass }))
useDictStore().setDict(dictType, res.value[dictType]);
})
}
......
src/views/console/myOrder.vue
......@@ -104,7 +104,7 @@
<!--<el-table-column type="selection" width="45" align="center"/>-->
<!--<el-table-column label="序号" align="center" prop="id"/>-->
<el-table-column label="商品名称" align="center" prop="spuName"/>
<el-table-column label="订单编号" align="center" prop="no"/>
<el-table-column label="订单编号" align="center" prop="orderNo"/>
<!--<el-table-column label="商品数量" align="center" prop="productCount"/>-->
<el-table-column label="费用" align="center" prop="payPrice">
<template #default="scope">
......@@ -113,25 +113,20 @@
</el-table-column>
<el-table-column label="资源类型" align="center" prop="categoryName"/>
<el-table-column label="商品属性" align="center" width="400">
<template #default="{ row }">
<div class="mt-1 properties-cell" v-if="row.properties && row.properties.length">
<el-tag
v-for="(property, i) in row.properties"
:key="property.propertyId ?? i"
class="mb-1 mr-1"
>
{{ property.propertyName }}: {{ property.valueName }}
</el-tag>
</div>
<span v-else>-</span>
<el-table-column label="CPU" align="center" prop="cpu"/>
<el-table-column label="GPU" align="center" prop="gpu"/>
<el-table-column label="内存" align="center" prop="ram"/>
<el-table-column label="存储" align="center" prop="storage"/>
<el-table-column label="所在地" align="center" prop="location"/>
<el-table-column label="订单状态" align="center" prop="status">
<template #default="scope">
<dict-tag :options="compute_resource_order_status" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="订单状态" align="center" prop="statusName"/>
<!-- <el-table-column label="发票链接" align="center" prop="invoiceUrl"/>-->
<el-table-column label="开票状态" align="center" prop="invoiceStatusName">
<el-table-column label="开票状态" align="center" prop="invoiceStatus">
<template #default="scope">
<!-- <dict-tag :type="invoice_status" :value="scope.row.invoiceStatus" />-->
<dict-tag :options="trade_invoice_status" :value="scope.row.invoiceStatus" />
</template>
</el-table-column>
<el-table-column label="下单时间" align="center" prop="createTime" width="180">
......@@ -200,7 +195,7 @@
</div>
<div class="info-item flex-align-center flex-space-between">
<div class="label">订单编号</div>
<div class="value">{{ form.no }}</div>
<div class="value">{{ form.orderNo }}</div>
</div>
<div class="info-item flex-align-center flex-space-between">
<div class="label">费用</div>
......@@ -215,10 +210,29 @@
</div>
<div class="info-block">
<div class="info-item flex-align-center flex-space-between" v-for="(i,index) in form.properties"
:key="i.index">
<div class="label">{{ i.propertyName }}</div>
<div class="value">{{ i.valueName }}</div>
<div class="info-item flex-align-center flex-space-between">
<div class="label">CPU</div>
<div class="value">{{ form.cpu || '-' }}</div>
</div>
<div class="info-item flex-align-center flex-space-between">
<div class="label">GPU</div>
<div class="value">{{ form.gpu || '-' }}</div>
</div>
<div class="info-item flex-align-center flex-space-between">
<div class="label">内存</div>
<div class="value">{{ form.ram || '-' }}</div>
</div>
<div class="info-item flex-align-center flex-space-between">
<div class="label">存储</div>
<div class="value">{{ form.storage || '-' }}</div>
</div>
<div class="info-item flex-align-center flex-space-between">
<div class="label">服务器IP</div>
<div class="value">{{ form.ip || '-' }}</div>
</div>
<div class="info-item flex-align-center flex-space-between">
<div class="label">服务器所在地</div>
<div class="value">{{ form.location || '-' }}</div>
</div>
</div>
......@@ -252,6 +266,7 @@ import {ElMessage} from "element-plus";
import {InvoiceRequestEnum} from "@/utils/constants.js";
const {proxy} = getCurrentInstance()
const {trade_invoice_status, compute_resource_order_status} = proxy.useDict('trade_invoice_status', 'compute_resource_order_status')
const orderList = ref([])
const open = ref(false)
const sOpen = ref(false)
......
src/views/console/naturalResources.vue
<template>
<div class="app-container">
<el-table v-loading="loading" :data="resourcesList" :max-height="620">
<el-table-column label="订单编号" align="center" prop="tradeOrderNo"/>
<!-- <el-table-column label="商品类别" align="center" prop="categoryName"/>-->
<el-table-column label="资源属性" align="center" width="400">
<template #default="{ row }">
<div class="mt-1 properties-cell" v-if="row.properties && row.properties.length">
<el-tag
v-for="(property, i) in row.properties"
:key="property.propertyId ?? i"
class="mb-1 mr-1"
>
{{ property.propertyName }}: {{ property.valueName }}
</el-tag>
</div>
<span v-else>-</span>
<el-table-column label="订单编号" align="center" prop="orderNo"/>
<el-table-column label="资源名称" align="center" prop="spuName"/>
<el-table-column label="CPU" align="center" prop="cpu"/>
<el-table-column label="GPU" align="center" prop="gpu"/>
<el-table-column label="内存" align="center" prop="ram"/>
<el-table-column label="存储" align="center" prop="storage"/>
<el-table-column label="所在地" align="center" prop="location"/>
<el-table-column label="租期" align="center">
<template #default="scope">
<span>{{ scope.row.skuName }}</span>
</template>
</el-table-column>
<el-table-column label="订单状态" align="center" prop="statusName"/>
<el-table-column label="申请时间" align="center" prop="createTime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="有效期限" align="center" prop="expTime" width="180">
<el-table-column label="租赁结束时间" align="center" prop="rentEndTime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.expTime, '{y}-{m}-{d}') }}</span>
<span>{{ parseTime(scope.row.rentEndTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
......@@ -48,21 +45,45 @@
<div class="info-block">
<div class="info-item flex-align-center flex-space-between">
<div class="label">订单编号</div>
<div class="value">{{ form.tradeOrderNo }}</div>
<div class="value">{{ form.orderNo }}</div>
</div>
<!-- <div class="info-item flex-align-center flex-space-between">-->
<!-- <div class="label">商品类别</div>-->
<!-- <div class="value">{{ form.categoryName }}</div>-->
<!-- </div>-->
</div>
<div class="info-item flex-align-center flex-space-between">
<div class="label">资源名称</div>
<div class="value">{{ form.spuName }}</div>
</div>
<div class="info-block">
<div class="info-item flex-align-center flex-space-between" v-for="(i,index) in form.properties"
:key="i.index">
<div class="label">{{ i.propertyName }}</div>
<div class="value">{{ i.valueName }}</div>
<div class="info-item flex-align-center flex-space-between">
<div class="label">CPU</div>
<div class="value">{{ form.cpu || '-' }}</div>
</div>
<div class="info-item flex-align-center flex-space-between">
<div class="label">GPU</div>
<div class="value">{{ form.gpu || '-' }}</div>
</div>
<div class="info-item flex-align-center flex-space-between">
<div class="label">内存</div>
<div class="value">{{ form.ram || '-' }}</div>
</div>
<div class="info-item flex-align-center flex-space-between">
<div class="label">存储</div>
<div class="value">{{ form.storage || '-' }}</div>
</div>
<div class="info-item flex-align-center flex-space-between">
<div class="label">服务器IP</div>
<div class="value">{{ form.ip || '-' }}</div>
</div>
<div class="info-item flex-align-center flex-space-between">
<div class="label">服务器所在地</div>
<div class="value">{{ form.location || '-' }}</div>
</div>
<div class="info-item flex-align-center flex-space-between">
<div class="label">租期</div>
<div class="value">{{ form.skuName }}</div>
</div>
<div class="info-item flex-align-center flex-space-between">
<div class="label">订单状态</div>
<div class="value">{{ form.statusName }}</div>
</div>
</div>
......@@ -71,13 +92,12 @@
<div class="value">{{ parseTime(form.createTime, '{y}-{m}-{d}') }}</div>
</div>
<div class="info-item flex-align-center flex-space-between">
<div class="label">有效期限</div>
<div class="value">{{ parseTime(form.expTime, '{y}-{m}-{d}') }}</div>
<div class="label">租赁开始时间</div>
<div class="value">{{ parseTime(form.rentStartTime, '{y}-{m}-{d}') }}</div>
</div>
<div class="info-item flex-align-center flex-space-between">
<div class="label">鉴权信息</div>
<div class="value">{{ form.auth}}</div>
<div class="label">租赁结束时间</div>
<div class="value">{{ parseTime(form.rentEndTime, '{y}-{m}-{d}') }}</div>
</div>
</div>
<template #footer>
......
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