Skip to content

phsl / client

Go to a project
Commit a4112cbc by 孙美琪
Options

相关提交

parent be297361
Showing with 136 additions and 69 deletions
src/layout/components/Sidebar-custom/index.vue
...@@ -60,7 +60,7 @@ const activeMenu = computed(() => { ...@@ -60,7 +60,7 @@ const activeMenu = computed(() => {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.title { .title {
font-weight: bold; font-weight: bolder !important;
font-size: 18px; font-size: 18px;
color: #303233; color: #303233;
padding: 20px; padding: 20px;
......
src/layout/user-layout.vue
...@@ -202,13 +202,13 @@ function logout() { ...@@ -202,13 +202,13 @@ function logout() {
.el-sub-menu, .el-menu-item { .el-sub-menu, .el-menu-item {
&.is-active { &.is-active {
font-weight: bold; font-weight: bolder;
font-size: 18px !important; font-size: 18px !important;
} }
} }
.el-sub-menu__title, .el-menu-item { .el-sub-menu__title, .el-menu-item {
font-weight: 500; font-weight: bolder;
font-size: 18px !important; font-size: 18px !important;
color: #4e5051; color: #4e5051;
} }
...@@ -229,7 +229,7 @@ function logout() { ...@@ -229,7 +229,7 @@ function logout() {
} }
.user-name, .console { .user-name, .console {
font-weight: 400; font-weight: bolder;
font-size: 18px; font-size: 18px;
color: #303233; color: #303233;
} }
......
src/views/computingResource/shoppingCart.vue
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
<div class="page-main"> <div class="page-main">
<div class="detail-info"> <div class="detail-info">
<el-table :data="tableData" v-if="tableData.length !== 0" row-key="id" @selection-change="tableSelectionChange"> <el-table :data="tableData" v-if="tableData.length !== 0" row-key="id" @selection-change="tableSelectionChange" align="center">
<el-table-column type="selection" reserve-selection/> <el-table-column type="selection" reserve-selection/>
<el-table-column label="资源型号" prop="model"/> <el-table-column label="资源型号" prop="model"/>
<el-table-column label="配置详情" width="150px"> <el-table-column label="配置详情" width="210px">
<template #default="{row}"> <template #default="{row}">
<p>CPU：{{ row.cpu }}</p> <p>CPU：{{ row.cpu }}</p>
<p>GPU：{{ row.gpu }}</p> <p>GPU：{{ row.gpu }}</p>
...@@ -33,14 +33,22 @@ ...@@ -33,14 +33,22 @@
<!-- {{ param[scope.$index][index]['valueName'] }}--> <!-- {{ param[scope.$index][index]['valueName'] }}-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column v-for="(i, index) in headers" :key="index" :label="i.name" :prop="i.name" <!-- <el-table-column v-for="(i, index) in headers" :key="index" :label="i.name" :prop="i.name"-->
:width="i?.name?.length >= 8 ? '150px':''"> <!-- :width="i?.name?.length >= 8 ? '150px':''">-->
<!-- <template v-slot="scope">-->
<!-- {{ getCellValue(scope.row.param, i.name) || '-' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="配置参数" width="300px">
<template v-slot="scope"> <template v-slot="scope">
{{ getCellValue(scope.row.param, i.name) || '-' }} <div v-for="(item, index) in JSON.parse(scope.row.param)" :key="index">
{{ item.name }}：{{ item.valueName }}
</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="申请数量" prop="useNum" width="95px"> <el-table-column label="申请数量" prop="useNum">
<template #default="{row}"> <template #default="{row}">
<el-input-number <el-input-number
v-model="row.useNum" v-model="row.useNum"
......
src/views/console/naturalResources.vue
...@@ -226,7 +226,8 @@ ...@@ -226,7 +226,8 @@
<dict-tag :options="storage_type" :value="scope.row.storage"/> <dict-tag :options="storage_type" :value="scope.row.storage"/>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="算力金额" align="center" prop="price"/>--> <el-table-column label="算力金额" align="center" prop="publicTotalPrice"/>
<el-table-column label="实际金额" align="center" prop="innerTotalPrice"/>
<el-table-column label="资源状态" align="center" prop="sourceStatus"> <el-table-column label="资源状态" align="center" prop="sourceStatus">
<template #default="scope"> <template #default="scope">
<dict-tag :options="source_status" :value="scope.row.sourceStatus"/> <dict-tag :options="source_status" :value="scope.row.sourceStatus"/>
...@@ -240,25 +241,25 @@ ...@@ -240,25 +241,25 @@
<span>{{ parseTime(scope.row.submitTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.submitTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column v-for="(i, index) in headers" :key="index" :label="i.name" :prop="i.name"> <!-- <el-table-column v-for="(i, index) in headers" :key="index" :label="i.name" :prop="i.name">-->
<template v-slot="scope"> <!-- <template v-slot="scope">-->
{{ getCellValue(scope.row.param, i.name) }} <!-- {{ getCellValue(scope.row.param, i.name) }}-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<!-- <el-table-column label="使用人" align="center" prop="applyUser"/>--> <!-- <el-table-column label="使用人" align="center" prop="applyUser"/>-->
<!-- <el-table-column label="承接人" align="center" prop="receiveUser"/>--> <!-- <el-table-column label="承接人" align="center" prop="receiveUser"/>-->
<!-- <el-table-column label="使用期限" align="center" prop="useTime"/>--> <!-- <el-table-column label="使用期限" align="center" prop="useTime"/>-->
<!-- <el-table-column label="备注" align="center" prop="remark"/>--> <!-- <el-table-column label="备注" align="center" prop="remark"/>-->
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">--> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<!-- <template #default="scope">--> <template #default="scope">
<!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"--> <el-button link type="primary" @click="handleUpdate(scope.row,scope.$index)"
<!-- v-hasPermi="['computility:resources:edit']">修改--> v-hasPermi="['computility:resources:edit']">详情
<!-- </el-button>--> </el-button>
<!-- <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"--> <!-- <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['computility:resources:remove']">删除--> <!-- v-hasPermi="['computility:resources:remove']">删除-->
<!-- </el-button>--> <!-- </el-button>-->
<!-- </template>--> </template>
<!-- </el-table-column>--> </el-table-column>
</el-table> </el-table>
<pagination <pagination
...@@ -270,11 +271,16 @@ ...@@ -270,11 +271,16 @@
/> />
<!-- 添加或修改订单管理-用户资源管理对话框 --> <!-- 添加或修改订单管理-用户资源管理对话框 -->
<el-dialog :title="title" v-model="open" width="500px" append-to-body> <el-dialog :title="title" v-model="open" width="800px" append-to-body>
<el-form ref="resourcesRef" :model="form" :rules="rules" label-width="80px"> <el-form ref="resourcesRef" :model="form" :rules="rules" label-width="200px" label-position="top" disabled
style="margin: 0 !important;padding: 0 !important;">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="订单编号" prop="orderNo"> <el-form-item label="订单编号" prop="orderNo">
<el-input v-model="form.orderNo" placeholder="请输入订单编号"/> <el-input v-model="form.orderNo" placeholder="请输入订单编号"/>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="商品类别" prop="category"> <el-form-item label="商品类别" prop="category">
<el-select v-model="form.category" placeholder="请选择商品类别"> <el-select v-model="form.category" placeholder="请选择商品类别">
<el-option <el-option
...@@ -285,6 +291,8 @@ ...@@ -285,6 +291,8 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="型号" prop="model"> <el-form-item label="型号" prop="model">
<el-select v-model="form.model" placeholder="请选择型号"> <el-select v-model="form.model" placeholder="请选择型号">
<el-option <el-option
...@@ -295,6 +303,8 @@ ...@@ -295,6 +303,8 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="CPU" prop="cpu"> <el-form-item label="CPU" prop="cpu">
<el-select v-model="form.cpu" placeholder="请选择CPU"> <el-select v-model="form.cpu" placeholder="请选择CPU">
<el-option <el-option
...@@ -305,6 +315,8 @@ ...@@ -305,6 +315,8 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="GPU" prop="gpu"> <el-form-item label="GPU" prop="gpu">
<el-select v-model="form.gpu" placeholder="请选择GPU"> <el-select v-model="form.gpu" placeholder="请选择GPU">
<el-option <el-option
...@@ -315,6 +327,9 @@ ...@@ -315,6 +327,9 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="内存" prop="memory"> <el-form-item label="内存" prop="memory">
<el-select v-model="form.memory" placeholder="请选择内存"> <el-select v-model="form.memory" placeholder="请选择内存">
<el-option <el-option
...@@ -325,6 +340,8 @@ ...@@ -325,6 +340,8 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="存储硬盘" prop="storage"> <el-form-item label="存储硬盘" prop="storage">
<el-select v-model="form.storage" placeholder="请选择存储硬盘"> <el-select v-model="form.storage" placeholder="请选择存储硬盘">
<el-option <el-option
...@@ -335,28 +352,18 @@ ...@@ -335,28 +352,18 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="算力金额" prop="price"> </el-col>
<el-input v-model="form.price" placeholder="请输入算力金额"/> <el-col :span="12">
<el-form-item label="算力金额" prop="publicTotalPrice">
<el-input v-model="form.publicTotalPrice" placeholder="请输入算力金额"/>
</el-form-item> </el-form-item>
<el-form-item label="资源状态" prop="sourceStatus"> </el-col>
<el-radio-group v-model="form.sourceStatus"> <el-col :span="12">
<el-radio <el-form-item label="实际金额" prop="innerTotalPrice">
v-for="dict in source_status" <el-input v-model="form.innerTotalPrice" placeholder="请输入实际金额"/>
:key="dict.value"
:label="parseInt(dict.value)"
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="网络带宽" prop="networkId">
<el-input v-model="form.networkId" placeholder="请输入网络带宽"/>
</el-form-item>
<el-form-item label="额外IP数量" prop="ipNum">
<el-input v-model="form.ipNum" placeholder="请输入额外IP数量"/>
</el-form-item>
<el-form-item label="虚拟机存储" prop="vmStorage">
<el-input v-model="form.vmStorage" placeholder="请输入虚拟机存储"/>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="申请时间" prop="submitTime"> <el-form-item label="申请时间" prop="submitTime">
<el-date-picker clearable <el-date-picker clearable
v-model="form.submitTime" v-model="form.submitTime"
...@@ -365,32 +372,70 @@ ...@@ -365,32 +372,70 @@
placeholder="请选择申请时间"> placeholder="请选择申请时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="使用人" prop="applyUser"> </el-col>
<el-select v-model="form.applyUser" placeholder="请选择"> <el-col :span="24">
<el-option <el-form-item label="资源状态" prop="sourceStatus">
v-for="item in userOptions" <el-radio-group v-model="form.sourceStatus">
:key="item.userId" <el-radio
:label="item.userName" v-for="dict in source_status"
:value="item.userId" :key="dict.value"
:disabled="item.status == 1" :label="parseInt(dict.value)"
></el-option> >{{ dict.label }}
</el-select> </el-radio>
</el-form-item> </el-radio-group>
<el-form-item label="承接人" prop="receiveUser">
<el-input v-model="form.receiveUser" placeholder="请输入承接人"/>
</el-form-item>
<el-form-item label="使用期限" prop="useTime">
<el-input v-model="form.useTime" placeholder="请输入使用期限"/>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> </el-col>
<el-input v-model="form.remark" placeholder="请输入备注"/> <template v-for="(i,index) in form.param" :key="index">
<el-col :span="12">
<el-form-item :label="i.name">
<el-input v-model="i.valueName" :disabled="true"/>
</el-form-item> </el-form-item>
</el-col>
</template>
<!-- <el-col :span="12" v-for="(i, index) in headers" :key="index">-->
<!-- <el-form-item :label="i.name" prop="submitTime">-->
<!-- <el-input v-model="getCellValue(resourcesList[rowIndex].param, i.name)"/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row>
<!-- <el-form-item label="网络带宽" prop="networkId">-->
<!-- <el-input v-model="form.networkId" placeholder="请输入网络带宽"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="额外IP数量" prop="ipNum">-->
<!-- <el-input v-model="form.ipNum" placeholder="请输入额外IP数量"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="虚拟机存储" prop="vmStorage">-->
<!-- <el-input v-model="form.vmStorage" placeholder="请输入虚拟机存储"/>-->
<!-- </el-form-item>-->
<!-- -->
<!-- <el-form-item label="使用人" prop="applyUser">-->
<!-- <el-select v-model="form.applyUser" placeholder="请选择">-->
<!-- <el-option-->
<!-- v-for="item in userOptions"-->
<!-- :key="item.userId"-->
<!-- :label="item.userName"-->
<!-- :value="item.userId"-->
<!-- :disabled="item.status == 1"-->
<!-- ></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="承接人" prop="receiveUser">-->
<!-- <el-input v-model="form.receiveUser" placeholder="请输入承接人"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="使用期限" prop="useTime">-->
<!-- <el-input v-model="form.useTime" placeholder="请输入使用期限"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="备注" prop="remark">-->
<!-- <el-input v-model="form.remark" placeholder="请输入备注"/>-->
<!-- </el-form-item>-->
</el-form> </el-form>
<template #footer> <template #footer>
<div class="dialog-footer"> <div class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <!-- <el-button type="primary" @click="submitForm">确 定</el-button>-->
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">关闭</el-button>
</div> </div>
</template> </template>
</el-dialog> </el-dialog>
...@@ -443,7 +488,8 @@ const data = reactive({ ...@@ -443,7 +488,8 @@ const data = reactive({
submitTime: null, submitTime: null,
applyUser: null, applyUser: null,
receiveUser: null, receiveUser: null,
useTime: null useTime: null,
rowIndex: 0
}, },
rules: { rules: {
category: [ category: [
...@@ -516,6 +562,12 @@ const getCellValue = (params, headerName) => { ...@@ -516,6 +562,12 @@ const getCellValue = (params, headerName) => {
return param ? param.valueName : ''; return param ? param.valueName : '';
}; };
const getCellValue1 = (params, headerName) => {
const paramsCopy = JSON.parse(params)
const param = paramsCopy.find(item => item.name === headerName);
return param ? param.valueName : '';
};
// 取消按钮 // 取消按钮
function cancel() { function cancel() {
open.value = false open.value = false
...@@ -583,13 +635,15 @@ function handleAdd() { ...@@ -583,13 +635,15 @@ function handleAdd() {
} }
/** 修改按钮操作 */ /** 修改按钮操作 */
function handleUpdate(row) { function handleUpdate(row, index) {
reset() reset()
this.rowIndex = index
const _id = row.id || ids.value const _id = row.id || ids.value
getResources(_id).then(response => { getResources(_id).then(response => {
form.value = response.data form.value = response.data
form.value.param = JSON.parse(response.data.param)
open.value = true open.value = true
title.value = '修改订单管理-用户资源管理' title.value = '查看订单'
}) })
} }
...@@ -647,4 +701,8 @@ getList() ...@@ -647,4 +701,8 @@ getList()
.pagination-container { .pagination-container {
background-color: transparent; background-color: transparent;
} }
.el-select {
width: 100% !important;
}
</style> </style>
src/views/index-copy.vue
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<div class="particulars" v-if="index !== 2"> <div class="particulars" v-if="index !== 2">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col class="resource-col" :span="8" v-for="x in i.assemblyData" :key="i" <el-col class="resource-col" :span="8" v-for="x in i.assemblyData" :key="i"
@click="i.id === 1? $router.push(x.router):openAssembly(x)" @click="i.id === 1? $router.push('/computingResource/resourceList?type=' + x.category):openAssembly(x)"
> >
<!-- style="background: url("@/assets/images/indexImg/resource1.png") no-repeat center center / 100%;"--> <!-- style="background: url("@/assets/images/indexImg/resource1.png") no-repeat center center / 100%;"-->
<div class="resource-box" :style="{background: `url(${index === 0 ?baseUrl+x.image:baseUrl+x.homeImage}) no-repeat center center / 100%`}"> <div class="resource-box" :style="{background: `url(${index === 0 ?baseUrl+x.image:baseUrl+x.homeImage}) no-repeat center center / 100%`}">
...@@ -211,6 +211,7 @@ function getAassemblyList() { ...@@ -211,6 +211,7 @@ function getAassemblyList() {
function getResource() { function getResource() {
informationResourceList().then(res => { informationResourceList().then(res => {
list.value[0].assemblyData = res.data.length > 3 ? res.data.slice(0, 3) : res.data list.value[0].assemblyData = res.data.length > 3 ? res.data.slice(0, 3) : res.data
console.log(list.value[0].assemblyData, 'list.value[0].assemblyData')
}) })
} }
......
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