Skip to content

phsl / client

Go to a project
Commit a46ccc81 by 孙美琪
Options

相关提交

parent 990b4b29
Showing with 114 additions and 277 deletions
src/api/computility/order.js
......@@ -3,7 +3,7 @@ import request from '@/utils/request'
// 查询订单管理-需求单管理列表
export function listOrder (query) {
return request({
url: '/computility/order/list',
url: '/trade/order/page',
method: 'get',
params: query
})
......
src/views/console/myOrder.vue
......@@ -7,14 +7,14 @@
v-show="showSearch"
label-width="68px"
>
<el-form-item label="订单编号" prop="orderNo">
<el-input
v-model="queryParams.orderNo"
placeholder="请输入订单编号"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="订单编号" prop="orderNo">-->
<!-- <el-input-->
<!-- v-model="queryParams.orderNo"-->
<!-- placeholder="请输入订单编号"-->
<!-- clearable-->
<!-- @keyup.enter="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="商品类别" prop="category">
<el-select
v-model="queryParams.category"
......@@ -29,136 +29,58 @@
/>
</el-select>
</el-form-item>
<el-form-item label="型号" prop="model">
<el-select
v-model="queryParams.model"
placeholder="请选择型号"
clearable
>
<el-option
v-for="dict in model"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="CPU" prop="cpu">
<el-select v-model="queryParams.cpu" placeholder="请选择CPU" clearable>
<el-option
v-for="dict in cpu_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="GPU" prop="gpu">
<el-select v-model="queryParams.gpu" placeholder="请选择GPU" clearable>
<el-option
v-for="dict in gpu_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="内存" prop="memory">
<el-select
v-model="queryParams.memory"
placeholder="请选择内存"
clearable
>
<el-option
v-for="dict in memory_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="存储硬盘" prop="storage">-->
<!-- <el-form-item label="型号" prop="model">-->
<!-- <el-select-->
<!-- v-model="queryParams.storage"-->
<!-- placeholder="请选择存储硬盘"-->
<!-- v-model="queryParams.model"-->
<!-- placeholder="请选择型号"-->
<!-- clearable-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="dict in storage_type"-->
<!-- v-for="dict in model"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="算力金额" prop="price">
<el-input
v-model="queryParams.price"
placeholder="请输入算力金额"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="状态" prop="orderStatus">-->
<!-- <el-select-->
<!-- v-model="queryParams.orderStatus"-->
<!-- placeholder="请选择状态"-->
<!-- clearable-->
<!-- >-->
<!-- <el-form-item label="CPU" prop="cpu">-->
<!-- <el-select v-model="queryParams.cpu" placeholder="请选择CPU" clearable>-->
<!-- <el-option-->
<!-- v-for="dict in order_status"-->
<!-- v-for="dict in cpu_type"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="网络带宽" prop="networkId">-->
<!-- <el-input-->
<!-- v-model="queryParams.networkId"-->
<!-- placeholder="请输入网络带宽"-->
<!-- clearable-->
<!-- @keyup.enter="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="额外IP数量" prop="ipNum">-->
<!-- <el-input-->
<!-- v-model="queryParams.ipNum"-->
<!-- placeholder="请输入额外IP数量"-->
<!-- clearable-->
<!-- @keyup.enter="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="虚拟机存储" prop="vmStorage">-->
<!-- <el-input-->
<!-- v-model="queryParams.vmStorage"-->
<!-- placeholder="请输入虚拟机存储"-->
<!-- clearable-->
<!-- @keyup.enter="handleQuery"-->
<!-- />-->
<!-- <el-form-item label="GPU" prop="gpu">-->
<!-- <el-select v-model="queryParams.gpu" placeholder="请选择GPU" clearable>-->
<!-- <el-option-->
<!-- v-for="dict in gpu_type"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="申请时间" prop="submitTime">-->
<!-- <el-date-picker-->
<!-- clearable-->
<!-- v-model="queryParams.submitTime"-->
<!-- type="date"-->
<!-- value-format="YYYY-MM-DD"-->
<!-- placeholder="请选择申请时间"-->
<!-- >-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="应用人" prop="applyUser">-->
<!-- <el-input-->
<!-- v-model="queryParams.applyUser"-->
<!-- placeholder="请输入应用人"-->
<!-- <el-form-item label="内存" prop="memory">-->
<!-- <el-select-->
<!-- v-model="queryParams.memory"-->
<!-- placeholder="请选择内存"-->
<!-- clearable-->
<!-- @keyup.enter="handleQuery"-->
<!-- />-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="dict in memory_type"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="使用期限" prop="useTime">-->
<!-- <el-form-item label="算力金额" prop="price">-->
<!-- <el-input-->
<!-- v-model="queryParams.useTime"-->
<!-- placeholder="请输入使用期限"-->
<!-- v-model="queryParams.price"-->
<!-- placeholder="请输入算力金额"-->
<!-- clearable-->
<!-- @keyup.enter="handleQuery"-->
<!-- />-->
......@@ -172,55 +94,6 @@
</el-form-item>
</el-form>
<!-- <el-row :gutter="10" class="mb8">-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- plain-->
<!-- icon="Plus"-->
<!-- @click="handleAdd"-->
<!-- v-hasPermi="['computility:order:add']"-->
<!-- >新增</el-button-->
<!-- >-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="success"-->
<!-- plain-->
<!-- icon="Edit"-->
<!-- :disabled="single"-->
<!-- @click="handleUpdate"-->
<!-- v-hasPermi="['computility:order:edit']"-->
<!-- >修改</el-button-->
<!-- >-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="danger"-->
<!-- plain-->
<!-- icon="Delete"-->
<!-- :disabled="multiple"-->
<!-- @click="handleDelete"-->
<!-- v-hasPermi="['computility:order:remove']"-->
<!-- >删除</el-button-->
<!-- >-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="warning"-->
<!-- plain-->
<!-- icon="Download"-->
<!-- @click="handleExport"-->
<!-- v-hasPermi="['computility:order:export']"-->
<!-- >导出</el-button-->
<!-- >-->
<!-- </el-col>-->
<!-- <right-toolbar-->
<!-- v-model:showSearch="showSearch"-->
<!-- @queryTable="getList"-->
<!-- ></right-toolbar>-->
<!-- </el-row>-->
<el-table
v-loading="loading"
:data="orderList"
......@@ -228,8 +101,11 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="45" align="center"/>
<el-table-column label="序号" align="center" prop="id"/>
<!--<el-table-column label="序号" align="center" prop="id"/>-->
<el-table-column label="订单编号" align="center" prop="orderNo"/>
<el-table-column label="订单流水号" align="center" prop="no"/>
<el-table-column label="商品数量" align="center" prop="productCount"/>
<el-table-column label="应付金额" align="center" prop="payPrice"/>
<el-table-column label="商品类别" align="center" prop="category">
<template #default="scope">
<dict-tag
......@@ -238,32 +114,16 @@
/>
</template>
</el-table-column>
<el-table-column label="型号" align="center" prop="model">
<template #default="scope">
<dict-tag :options="model" :value="scope.row.model"/>
</template>
</el-table-column>
<el-table-column label="CPU" align="center" prop="cpu">
<template #default="scope">
<dict-tag :options="cpu_type" :value="scope.row.cpu"/>
</template>
</el-table-column>
<el-table-column label="GPU" align="center" prop="gpu">
<template #default="scope">
<dict-tag :options="gpu_type" :value="scope.row.gpu"/>
</template>
</el-table-column>
<el-table-column label="内存" align="center" prop="memory">
<template #default="scope">
<dict-tag :options="memory_type" :value="scope.row.memory"/>
</template>
</el-table-column>
<el-table-column label="存储" align="center" prop="storage">
<template #default="scope">
<dict-tag :options="storage_type" :value="scope.row.storage"/>
<el-table-column
v-for="(item, index) in orderList[0]?.properties.length!==0?orderList[0]?.properties.slice(0,6):orderList[0]?.properties"
:key="index"
:label="item.propertyName"
>
<template #default="{ row }">
{{ row.properties[index].valueName }}
</template>
</el-table-column>
<!-- <el-table-column label="购买方" align="center" prop=""/>-->
<!-- <el-table-column label="购买方" align="center" prop=""/>-->
<el-table-column label="算力金额" align="center" prop="publicTotalPrice"/>
<el-table-column label="实际金额" align="center" prop="innerTotalPrice"/>
<el-table-column label="订单状态" align="center" prop="orderStatus">
......@@ -271,10 +131,7 @@
<dict-tag :options="order_status" :value="scope.row.orderStatus"/>
</template>
</el-table-column>
<el-table-column label="申请时间"
align="center"
prop="submitTime"
width="180">
<el-table-column label="申请时间" align="center" prop="submitTime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.submitTime, '{y}-{m}-{d}') }}</span>
</template>
......@@ -302,31 +159,6 @@
>
取消
</el-button>
<!-- <el-button-->
<!-- link-->
<!-- type="primary"-->
<!-- icon="Edit"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['computility:order:edit']">-->
<!-- 详情-->
<!-- </el-button>-->
<!-- <el-button-->
<!-- link-->
<!-- type="primary"-->
<!-- icon="Delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['computility:order:remove']">-->
<!-- 删除-->
<!-- </el-button>-->
<!-- <el-button-->
<!-- link-->
<!-- type="primary"-->
<!-- icon="Edit"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['computility:order:edit']">-->
<!-- 修改-->
<!-- </el-button>-->
</template>
</el-table-column>
</el-table>
......@@ -589,26 +421,26 @@ import {
cancelOrder,
orderReason
} from '@/api/computility/order'
import { ElMessageBox } from 'element-plus'
import {ElMessageBox} from 'element-plus'
const {proxy} = getCurrentInstance()
const {
memory_type,
cpu_type,
storage_type,
order_status,
model,
application_category,
gpu_type
} = proxy.useDict(
'memory_type',
'cpu_type',
'storage_type',
'order_status',
'model',
'application_category',
'gpu_type'
)
// const {
// memory_type,
// cpu_type,
// storage_type,
// order_status,
// model,
// application_category,
// gpu_type
// } = proxy.useDict(
// 'memory_type',
// 'cpu_type',
// 'storage_type',
// 'order_status',
// 'model',
// 'application_category',
// 'gpu_type'
// )
const orderList = ref([])
const open = ref(false)
......@@ -673,23 +505,23 @@ const data = reactive({
const {queryParams, form, rules} = toRefs(data)
/** 查询订单管理-需求单管理列表 */
function getList () {
function getList() {
loading.value = true
listOrder(queryParams.value).then((response) => {
orderList.value = response.rows
total.value = response.total
orderList.value = response.data.list
total.value = response.data.total
loading.value = false
})
}
// 取消按钮
function cancel () {
function cancel() {
open.value = false
reset()
}
// 表单重置
function reset () {
function reset() {
form.value = {
id: null,
orderNo: null,
......@@ -718,33 +550,33 @@ function reset () {
}
/** 搜索按钮操作 */
function handleQuery () {
function handleQuery() {
queryParams.value.pageNum = 1
getList()
}
/** 重置按钮操作 */
function resetQuery () {
function resetQuery() {
proxy.resetForm('queryRef')
handleQuery()
}
// 多选框选中数据
function handleSelectionChange (selection) {
function handleSelectionChange(selection) {
ids.value = selection.map((item) => item.id)
single.value = selection.length != 1
multiple.value = !selection.length
}
/** 新增按钮操作 */
function handleAdd () {
function handleAdd() {
reset()
open.value = true
title.value = '添加订单管理-需求单管理'
}
/** 修改按钮操作 */
function handleUpdate (row) {
function handleUpdate(row) {
reset()
const _id = row.id || ids.value
getOrder(_id).then((response) => {
......@@ -755,7 +587,7 @@ function handleUpdate (row) {
}
/** 提交按钮 */
function submitForm () {
function submitForm() {
proxy.$refs['orderRef'].validate((valid) => {
if (valid) {
if (form.value.id != null) {
......@@ -776,7 +608,7 @@ function submitForm () {
}
/** 删除按钮操作 */
function handleDelete (row) {
function handleDelete(row) {
const _ids = row.id || ids.value
proxy.$modal
.confirm('是否确认删除订单管理-需求单管理编号为"' + _ids + '"的数据项？')
......@@ -792,7 +624,7 @@ function handleDelete (row) {
}
/** 取消按钮操作 */
function handleCancel (row) {
function handleCancel(row) {
proxy.$modal
.confirm('是否取消该订单申请')
.then(function () {
......@@ -807,7 +639,7 @@ function handleCancel (row) {
}
/** 查看驳回理由按钮操作 */
function handleViewReason (row) {
function handleViewReason(row) {
orderReason(row.id).then(res => {
console.log(res)
ElMessageBox.alert(res.data, '驳回理由', {
......@@ -819,7 +651,7 @@ function handleViewReason (row) {
}
/** 导出按钮操作 */
function handleExport () {
function handleExport() {
proxy.download(
'computility/order/export',
{
......
src/views/console/overview.vue
......@@ -21,21 +21,22 @@
</template>
<div class="flex base-info">
<div class="left">
<el-image :src="baseUrl + infoData.avatar" fit="cover"></el-image>
<el-image :src="infoData.avatar" fit="cover"></el-image>
<el-tag v-if="infoData.status === '审核通过'" type="success">已认证</el-tag>
<el-tag v-else type="warning">未认证</el-tag>
</div>
<el-form label-width="110px" label-position="left">
<el-form-item label="账号昵称：">
<div>{{ infoData.nickName }}</div>
<el-button type="primary" link @click="$router.push('/user/profile?tab=0')" class="ml20">修改</el-button>
<div>{{ infoData.nickname }}</div>
<el-button type="primary" link @click="$router.push('/user/profile?tab=0')" class="ml20">修改
</el-button>
</el-form-item>
<el-form-item label="注册时间：">
<div>{{ infoData.createUserTime }}</div>
</el-form-item>
<el-form-item label="最后登录时间：">
<div>{{ infoData.endLoginUserTime }}</div>
<div>{{ parseTime(infoData.createTime, '{y}-{m}-{d}') }}</div>
</el-form-item>
<!-- <el-form-item label="最后登录时间：">-->
<!-- <div>{{ parseTime(infoData.enterpriseName, '{y}-{m}-{d}') || '-' }}</div>-->
<!-- </el-form-item>-->
</el-form>
</div>
</el-card>
......@@ -51,11 +52,13 @@
<el-form label-width="96px" label-position="left">
<el-form-item label="我的手机号：">
<div>{{ infoData.mobile }}</div>
<el-button type="primary" link @click="$router.push('/user/profile?tab=1')" class="ml20">换绑</el-button>
<el-button type="primary" link @click="$router.push('/user/profile?tab=1')" class="ml20">换绑
</el-button>
</el-form-item>
<el-form-item label="我的密码：">
<div>********</div>
<el-button type="primary" link @click="$router.push('/user/profile?tab=2')" class="ml20">修改密码</el-button>
<el-button type="primary" link @click="$router.push('/user/profile?tab=2')" class="ml20">修改密码
</el-button>
</el-form-item>
</el-form>
</div>
......@@ -71,23 +74,23 @@
<div>
<el-form label-width="110px" label-position="left">
<el-form-item label="企业认证：">
<el-tag v-if="infoData.status === '审核通过'" type="success">已认证</el-tag>
<el-tag v-if="infoData.checkStatus === '审核通过'" type="success">已认证</el-tag>
<el-tag v-else class="mr5" type="warning">未认证</el-tag>
<el-button v-if="!infoData.status || infoData.status === '驳回'"
@click="$router.push('/console/authentication')" type="primary" link class="ml20">去申请
<el-button v-if="!infoData.check_status || infoData.checkStatus === '驳回'"
@click="$router.push('/console/authentication')" type="primary" link class="ml20">去申请
</el-button>
</el-form-item>
<el-form-item label="最后提交时间：">
{{ infoData.submitTime }}
</el-form-item>
<!-- <el-form-item label="最后提交时间：">-->
<!-- {{ infoData.submitTime }}-->
<!-- </el-form-item>-->
<el-form-item label="最后审核结果：">
<el-tag v-if="infoData.status === '驳回'" type="danger" class="mr5">未通过</el-tag>
<el-tag v-if="infoData.status === '待审核'" type="primary" class="mr5">待审核</el-tag>
<el-tag v-if="infoData.status === '审核通过'" type="primary" class="mr5">审核通过</el-tag>
<el-tag v-if="infoData.check_status === '驳回'" type="danger" class="mr5">未通过</el-tag>
<el-tag v-if="infoData.check_status === '待审核'" type="primary" class="mr5">待审核</el-tag>
<el-tag v-if="infoData.check_status === '审核通过'" type="primary" class="mr5">审核通过</el-tag>
<el-button v-if="infoData.status === '驳回'" type="primary" link @click="handleViewReason">
<el-button v-if="infoData.check_status === '驳回'" type="primary" link @click="handleViewReason">
查看驳回理由
</el-button>
</el-form-item>
......@@ -121,15 +124,17 @@
import {auditInfo} from '@/api/console.js'
import {ref} from 'vue'
import {ElMessageBox} from 'element-plus'
import {parseTime} from "../../utils/ruoyi.js";
import {useDict} from "@/utils/dict.js";
import {listData} from "@/api/system/dict/data.js";
const baseUrl = import.meta.env.VITE_APP_BASE_API
const {proxy} = getCurrentInstance();
const {check_status} = proxy.useDict("check_status");
const infoData = ref({})
const handleOpenDialog = ref(false)
function getAuditInfo() {
auditInfo().then(res => {
console.log(res, 'auditInfo')
infoData.value = res.data
})
}
......
src/views/index.vue
......@@ -60,7 +60,7 @@
<div class="swiper-box">
<div class="swiper-list">
<div class="swiper-item"
:style="{ background: 'url(' + i.homeImages[0] + ')',backgroundSize: 'cover' }">
:style="{ background: 'url(' + i.homeImage + ')',backgroundSize: 'cover' }">
<div class="item"><h3 class="title">{{ i.title }}</h3>
<p class="desc" v-html="i.description"></p>
<p class="info flex-justify-end" @click="openAssembly(i)"><span class="btn">{{
......
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