Skip to content

A
apaas-ui
"src/components/table/table-um.vue" did not exist on "0da35cd055177c78cd4009d545ef1d4951abeec9"
Commit e3d25bf2 authored by 徐一鸣's avatar 徐一鸣
Browse files
Options

云资源申请弹窗信息优化

parent 99e32f8e
Hide whitespace changes
Inline Side-by-side
Showing with 248 additions and 89 deletions
src/components/shop-cloud/shop-cloud.vue
View file @ e3d25bf2
<template>
<template>
<div>
<el-breadcrumb separator="/" class="bread_crumb1 bread_left">
<el-breadcrumb-item :to="{ path: '/shop' }">服务超市</el-breadcrumb-item>
......@@ -10,19 +10,29 @@
<el-col :span="11">
<el-form-item class="form_item">
<div class="form_item_title">申请部门：</div>
<el-input v-model="form.department_name" :disabled="true" placeholder="请输入申请部门"></el-input>
<el-input
v-model="form.department_name"
:disabled="true"
placeholder="请输入申请部门"
></el-input>
</el-form-item>
</el-col>
<el-col :span="11" :offset="1">
<el-form-item class="form_item">
<div class="form_item_title">部门联系人：</div>
<el-input v-model="form.link_man" placeholder="请输入联系人姓名"></el-input>
<el-input
v-model="form.link_man"
placeholder="请输入联系人姓名"
></el-input>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item class="form_item">
<div class="form_item_title">联系电话：</div>
<el-input v-model="form.phone" placeholder="请输入联系人电话"></el-input>
<el-input
v-model="form.phone"
placeholder="请输入联系人电话"
></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -41,13 +51,19 @@
<el-col :span="22">
<el-form-item prop="namespace" class="form_item">
<div class="form_item_title">工作区域名称：</div>
<el-input v-model="formNew.namespace" placeholder="请输入工作区域英文名称"></el-input>
<el-input
v-model="formNew.namespace"
placeholder="请输入工作区域英文名称"
></el-input>
</el-form-item>
</el-col>
<el-col :span="22">
<el-form-item prop="workplace" class="form_item">
<div class="form_item_title">中文名称：</div>
<el-input v-model="formNew.workplace" placeholder="请输入工作区域中文名称"></el-input>
<el-input
v-model="formNew.workplace"
placeholder="请输入工作区域中文名称"
></el-input>
</el-form-item>
</el-col>
<el-col :span="22">
......@@ -66,7 +82,10 @@
<el-col :span="22">
<el-form-item prop="cpu" class="form_item input_has_right">
<div class="form_item_title">CPU：</div>
<el-select v-model="formNew.cpu" placeholder="请选择CPU使用量">
<el-select
v-model="formNew.cpu"
placeholder="请选择CPU使用量"
>
<el-option
v-for="item in optionsCPU"
:key="item.value"
......@@ -78,9 +97,15 @@
</el-form-item>
</el-col>
<el-col :span="22">
<el-form-item prop="memory" class="form_item input_has_right">
<el-form-item
prop="memory"
class="form_item input_has_right"
>
<div class="form_item_title">内存：</div>
<el-select v-model="formNew.memory" placeholder="请选择内存使用量">
<el-select
v-model="formNew.memory"
placeholder="请选择内存使用量"
>
<el-option
v-for="item in optionsRAM"
:key="item.value"
......@@ -92,7 +117,10 @@
</el-form-item>
</el-col>
<el-col :span="22">
<el-form-item prop="containerGroup" class="form_item input_has_right">
<el-form-item
prop="containerGroup"
class="form_item input_has_right"
>
<div class="form_item_title">容器组：</div>
<el-input-number
v-model="formNew.containerGroup"
......@@ -147,7 +175,10 @@
<div class="form_item_title">CPU：</div>
</el-col>
<el-col :span="11">
<el-form-item prop="perCPUs" class="form_item input_has_left_right">
<el-form-item
prop="perCPUs"
class="form_item input_has_left_right"
>
<div class="input_left">最高</div>
<el-input-number
v-model="formNew.perCPUs"
......@@ -160,7 +191,10 @@
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item prop="perCPU" class="form_item input_has_left_right">
<el-form-item
prop="perCPU"
class="form_item input_has_left_right"
>
<div class="input_left">默认</div>
<el-input-number
v-model="formNew.perCPU"
......@@ -176,7 +210,10 @@
<div class="form_item_title">内存：</div>
</el-col>
<el-col :span="11">
<el-form-item prop="perRAMs" class="form_item input_has_left_right">
<el-form-item
prop="perRAMs"
class="form_item input_has_left_right"
>
<div class="input_left">最高</div>
<el-input-number
v-model="formNew.perRAMs"
......@@ -189,7 +226,10 @@
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item prop="perRAM" class="form_item input_has_left_right">
<el-form-item
prop="perRAM"
class="form_item input_has_left_right"
>
<div class="input_left">默认</div>
<el-input-number
v-model="formNew.perRAM"
......@@ -205,7 +245,10 @@
<div class="form_title">其他信息</div>
</el-col>
<el-col :span="22">
<el-form-item prop="appDuration" class="form_item input_has_right_select">
<el-form-item
prop="appDuration"
class="form_item input_has_right_select"
>
<div class="form_item_title">申请时长：</div>
<el-input-number
v-model="formNew.appDuration"
......@@ -229,7 +272,10 @@
<el-col :span="22">
<el-form-item class="form_item">
<div class="form_item_title">申请文件：</div>
<info-list :list_arr="docTemplate" class="doc_template"></info-list>
<info-list
:list_arr="docTemplate"
class="doc_template"
></info-list>
<upload-file
:multiple="false"
:unique="false"
......@@ -251,7 +297,11 @@
<el-col :span="11">
<div class="select_title">选择要进行调整的工作区域：</div>
<div class="form_item">
<el-select v-model="workSpace" @change="getForm" placeholder="请选择">
<el-select
v-model="workSpace"
@change="getForm"
placeholder="请选择"
>
<el-option
v-for="(item, index) in workSpaceOptions"
:key="index"
......@@ -282,17 +332,31 @@
class="now_spec_card_img"
:src="require('@/assets/imgs/' + item.src + '.png')"
/>
<span class="now_spec_card_title">{{ item.title }}</span>
<span
class="now_spec_card_val"
>{{ item.val + " " + (item.title == "CPU" ? "核" : item.title == "内存" ? "GB" : "个") }}</span>
<span class="now_spec_card_title">{{
item.title
}}</span>
<span class="now_spec_card_val">{{
item.val +
" " +
(item.title == "CPU"
? "核"
: item.title == "内存"
? "GB"
: "个")
}}</span>
</div>
</div>
</el-col>
<el-col :span="22">
<el-form-item prop="cpu" class="form_item input_has_right">
<el-form-item
prop="cpu"
class="form_item input_has_right"
>
<div class="form_item_title">申请CPU调整为：</div>
<el-select v-model="formOld.cpu" placeholder="请选择CPU使用量">
<el-select
v-model="formOld.cpu"
placeholder="请选择CPU使用量"
>
<el-option
v-for="item in optionsCPU"
:key="item.value"
......@@ -304,9 +368,15 @@
</el-form-item>
</el-col>
<el-col :span="22">
<el-form-item prop="memory" class="form_item input_has_right">
<el-form-item
prop="memory"
class="form_item input_has_right"
>
<div class="form_item_title">申请内存调整为：</div>
<el-select v-model="formOld.memory" placeholder="请选择内存使用量">
<el-select
v-model="formOld.memory"
placeholder="请选择内存使用量"
>
<el-option
v-for="item in optionsRAM"
:key="item.value"
......@@ -318,7 +388,10 @@
</el-form-item>
</el-col>
<el-col :span="22">
<el-form-item prop="containerGroup" class="form_item input_has_right">
<el-form-item
prop="containerGroup"
class="form_item input_has_right"
>
<div class="form_item_title">申请容器组调整为：</div>
<el-input-number
v-model="formOld.containerGroup"
......@@ -393,15 +466,21 @@
class="now_rqz_card_img"
:src="require('@/assets/imgs/' + item.src + '.png')"
/>
<span class="now_rqz_card_title">{{ item.title }}</span>
<span class="now_rqz_card_title">{{
item.title
}}</span>
<div class="now_rqz_card_val_div">
<span
class="now_rqz_card_val"
>最高&nbsp;{{ item.max }}&nbsp;{{ item.title == "CPU" ? "核" : "GB" }}</span>
<span class="now_rqz_card_val"
>最高&nbsp;{{ item.max }}&nbsp;{{
item.title == "CPU" ? "核" : "GB"
}}</span
>
<br />
<span
class="now_rqz_card_val"
>默认&nbsp;{{ item.default }}&nbsp;{{ item.title == "CPU" ? "核" : "GB" }}</span>
<span class="now_rqz_card_val"
>默认&nbsp;{{ item.default }}&nbsp;{{
item.title == "CPU" ? "核" : "GB"
}}</span
>
</div>
</div>
</div>
......@@ -410,7 +489,10 @@
<div class="form_item_title">CPU：</div>
</el-col>
<el-col :span="11">
<el-form-item prop="perCPUs" class="form_item input_has_left_right">
<el-form-item
prop="perCPUs"
class="form_item input_has_left_right"
>
<div class="input_left">最高</div>
<el-input-number
v-model="formOld.perCPUs"
......@@ -423,7 +505,10 @@
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item prop="perCPU" class="form_item input_has_left_right">
<el-form-item
prop="perCPU"
class="form_item input_has_left_right"
>
<div class="input_left">默认</div>
<el-input-number
v-model="formOld.perCPU"
......@@ -439,7 +524,10 @@
<div class="form_item_title">内存：</div>
</el-col>
<el-col :span="11">
<el-form-item prop="perRAMs" class="form_item input_has_left_right">
<el-form-item
prop="perRAMs"
class="form_item input_has_left_right"
>
<div class="input_left">最高</div>
<el-input-number
v-model="formOld.perRAMs"
......@@ -452,7 +540,10 @@
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item prop="perRAM" class="form_item input_has_left_right">
<el-form-item
prop="perRAM"
class="form_item input_has_left_right"
>
<div class="input_left">默认</div>
<el-input-number
v-model="formOld.perRAM"
......@@ -474,10 +565,14 @@
class="now_spec_card_time_img"
:src="require('@/assets/imgs/ic_shijian.png')"
/>
<span class="now_spec_card_time_title">当前工作区域到期时间</span>
<span
class="now_spec_card_time_val"
>{{ helper.dateStringTransform(paramsOld.cloud_end_time) }}</span>
<span class="now_spec_card_time_title"
>当前工作区域到期时间</span
>
<span class="now_spec_card_time_val">{{
helper.dateStringTransform(
paramsOld.cloud_end_time
)
}}</span>
</div>
</div>
</el-col>
......@@ -507,7 +602,10 @@
<el-col :span="22">
<el-form-item class="form_item">
<div class="form_item_title">申请文件：</div>
<info-list :list_arr="docTemplate" class="doc_template"></info-list>
<info-list
:list_arr="docTemplate"
class="doc_template"
></info-list>
<upload-file
:multiple="false"
:unique="false"
......@@ -530,33 +628,43 @@
<el-button class="submit" @click="submitApp">提交申请</el-button>
</div>
</block-radius>
<el-dialog title="申请信息确认" :visible.sync="dialogVisible" width="580px" class="cloud_dia">
<el-dialog
title="申请信息确认"
:visible.sync="dialogVisible"
width="580px"
class="cloud_dia"
>
<el-row>
<el-col :span="24">
<span class="dia_item_title">申请组织：</span>
<span class="dia_item_val">{{ diaForm.department_name }}</span>
</el-col>
<el-col :span="10">
<el-col :span="10" v-if="diaForm.link_man">
<span class="dia_item_title">组织联系人：</span>
<span class="dia_item_val">{{ diaForm.link_man }}</span>
</el-col>
<el-col :span="10">
<el-col :span="10" v-if="diaForm.phone">
<span class="dia_item_title">联系电话：</span>
<span class="dia_item_val">{{ diaForm.phone }}</span>
</el-col>
<el-col :span="10">
<span class="dia_item_title">申请类型：</span>
<span class="dia_item_val">{{ activeName == 0 ? "新资源申请" : "已有资源升级" }}</span>
<span class="dia_item_val">{{
activeName == 0 ? "新资源申请" : "已有资源升级"
}}</span>
</el-col>
<el-col :span="10" v-if="activeName == '1'">
<span class="dia_item_title">工作区域名称：</span>
<span class="dia_item_val">{{ diaForm.namespace }}</span>
</el-col>
<el-col :span="14" v-if="activeName == '0'">
<el-col :span="14" v-if="activeName == '0' && diaForm.apply_file_name">
<span class="dia_item_title">上传申请文件：</span>
<span class="dia_item_val">{{ diaForm.apply_file_name }}</span>
</el-col>
<el-col :span="24" v-else-if="activeName == '1'">
<el-col
:span="24"
v-else-if="activeName == '1' && diaForm.apply_file_name"
>
<span class="dia_item_title">上传申请文件：</span>
<span class="dia_item_val">{{ diaForm.apply_file_name }}</span>
</el-col>
......@@ -574,7 +682,9 @@
</div>
<div class="dia_block_item_in">
<span class="dia_block_item_title">描述信息：</span>
<span class="dia_block_item_val">{{ diaForm.workplacedesc }}</span>
<span class="dia_block_item_val">{{
diaForm.workplacedesc
}}</span>
</div>
</div>
<span class="dia_item_all_title">工作区域申请规格：</span>
......@@ -589,13 +699,17 @@
</div>
<div class="dia_block_item_in">
<span class="dia_block_item_title">容器组：</span>
<span class="dia_block_item_val">{{ diaForm.containerGroup }}个</span>
<span class="dia_block_item_val"
>{{ diaForm.containerGroup }}个</span
>
</div>
<div class="dia_block_item_in" v-if="diaForm.dataDisk != 0">
<span class="dia_block_item_title">数据盘：</span>
<span
class="dia_block_item_val"
>{{ diaForm.dataDisk }}块，每块{{ diaForm.perDataDisk }}GB</span>
<span class="dia_block_item_val"
>{{ diaForm.dataDisk }}块，每块{{
diaForm.perDataDisk
}}GB</span
>
</div>
<!-- <div class="dia_block_item_in" v-if="diaForm.dataDisk != 0">
<span class="dia_block_item_title">数据盘类型：</span>
......@@ -607,15 +721,21 @@
<div class="dia_block_item_in">
<span class="dia_block_item_title">CPU：</span>
<p class="dia_block_item_val">
<span class="val_has_2">最高&nbsp;{{ diaForm.perCPUs }}核</span>
<span class="val_has_2">默认&nbsp;{{ diaForm.perCPU }}核</span>
<span class="val_has_2"
>最高&nbsp;{{ diaForm.perCPUs }}核</span
>
<span class="val_has_2"
>默认&nbsp;{{ diaForm.perCPU }}核</span
>
</p>
</div>
<div class="dia_block_item_in">
<span class="dia_block_item_title">内存：</span>
<p class="dia_block_item_val">
<span class="val_has_2">最高&nbsp;{{ diaForm.perRAMs }}核</span>
<span class="val_has_2">默认&nbsp;{{ diaForm.perRAM }}核</span>
<span class="val_has_2"
>最高&nbsp;{{ diaForm.perRAMs }}G</span
>
<span class="val_has_2">默认&nbsp;{{ diaForm.perRAM }}G</span>
</p>
</div>
</div>
......@@ -623,9 +743,10 @@
<div class="dia_block_item">
<div class="dia_block_item_in">
<span class="dia_block_item_title">申请时长</span>
<span
class="dia_block_item_val"
>{{ diaForm.appDuration }}{{ diaForm.durType == 1 ? "个月" : "年" }}</span>
<span class="dia_block_item_val"
>{{ diaForm.appDuration
}}{{ diaForm.durType == 1 ? "个月" : "年" }}</span
>
</div>
</div>
</div>
......@@ -640,11 +761,15 @@
</div>
<div class="dia_block_item_in">
<span class="dia_block_item_title">内存：</span>
<span class="dia_block_item_val">{{ paramsOld.memory }}核</span>
<span class="dia_block_item_val"
>{{ paramsOld.memory }}核</span
>
</div>
<div class="dia_block_item_in">
<span class="dia_block_item_title">容器组：</span>
<span class="dia_block_item_val">{{ paramsOld.containers }}个</span>
<span class="dia_block_item_val"
>{{ paramsOld.containers }}个</span
>
</div>
</div>
<span class="dia_item_all_title">单个容器组规格：</span>
......@@ -652,15 +777,23 @@
<div class="dia_block_item_in">
<span class="dia_block_item_title">CPU：</span>
<p class="dia_block_item_val">
<span class="val_has_2">最高&nbsp;{{ paramsOld.one_cpu_max }}核</span>
<span class="val_has_2">默认&nbsp;{{ paramsOld.one_cpu_min }}核</span>
<span class="val_has_2"
>最高&nbsp;{{ paramsOld.one_cpu_max }}核</span
>
<span class="val_has_2"
>默认&nbsp;{{ paramsOld.one_cpu_min }}核</span
>
</p>
</div>
<div class="dia_block_item_in">
<span class="dia_block_item_title">内存：</span>
<p class="dia_block_item_val">
<span class="val_has_2">最高&nbsp;{{ paramsOld.one_memory_max }}核</span>
<span class="val_has_2">默认&nbsp;{{ paramsOld.one_memory_min }}核</span>
<span class="val_has_2"
>最高&nbsp;{{ paramsOld.one_memory_max }}核</span
>
<span class="val_has_2"
>默认&nbsp;{{ paramsOld.one_memory_min }}核</span
>
</p>
</div>
</div>
......@@ -668,9 +801,9 @@
<div class="dia_block_item">
<div class="dia_block_item_in">
<span class="dia_block_item_title">到期时间：</span>
<span
class="dia_block_item_val"
>{{ helper.dateStringTransform(paramsOld.cloud_end_time) }}</span>
<span class="dia_block_item_val">{{
helper.dateStringTransform(paramsOld.cloud_end_time)
}}</span>
</div>
</div>
</div>
......@@ -688,19 +821,30 @@
</div>
<div class="dia_block_item_in">
<span class="dia_block_item_title">容器组：</span>
<span class="dia_block_item_val">{{ diaForm.containerGroup }}个</span>
<span class="dia_block_item_val"
>{{ diaForm.containerGroup }}个</span
>
</div>
<div class="dia_block_item_in" v-if="diaForm.dataDisk != 0">
<span class="dia_block_item_title">新增数据盘：</span>
<span
class="dia_block_item_val"
>{{ diaForm.dataDisk }}块，每块{{ diaForm.perDataDisk }}GB</span>
<span class="dia_block_item_val"
>{{ diaForm.dataDisk }}块，每块{{
diaForm.perDataDisk
}}GB</span
>
</div>
<div class="dia_block_item_in" v-if="delDataDiskList.length != 0">
<div
class="dia_block_item_in"
v-if="delDataDiskList.length != 0"
>
<span class="dia_block_item_title">删除数据盘：</span>
<span
class="dia_block_item_val"
>{{ delDataDiskList.map(item => {return item.name}).join("、") }}</span>
<span class="dia_block_item_val">{{
delDataDiskList
.map((item) => {
return item.name;
})
.join("、")
}}</span>
</div>
</div>
<span class="dia_item_all_title">单个容器组规格：</span>
......@@ -708,15 +852,23 @@
<div class="dia_block_item_in">
<span class="dia_block_item_title">CPU：</span>
<p class="dia_block_item_val">
<span class="val_has_2">最高&nbsp;{{ diaForm.perCPUs }}核</span>
<span class="val_has_2">默认&nbsp;{{ diaForm.perCPU }}核</span>
<span class="val_has_2"
>最高&nbsp;{{ diaForm.perCPUs }}核</span
>
<span class="val_has_2"
>默认&nbsp;{{ diaForm.perCPU }}核</span
>
</p>
</div>
<div class="dia_block_item_in">
<span class="dia_block_item_title">内存：</span>
<p class="dia_block_item_val">
<span class="val_has_2">最高&nbsp;{{ diaForm.perRAMs }}核</span>
<span class="val_has_2">默认&nbsp;{{ diaForm.perRAM }}核</span>
<span class="val_has_2"
>最高&nbsp;{{ diaForm.perRAMs }}核</span
>
<span class="val_has_2"
>默认&nbsp;{{ diaForm.perRAM }}核</span
>
</p>
</div>
</div>
......@@ -724,18 +876,21 @@
<div class="dia_block_item">
<div class="dia_block_item_in">
<span class="dia_block_item_title">是否续期：</span>
<span
class="dia_block_item_val"
>{{ diaForm.appDuration && diaForm.appDuration != 0 ? "是": "否" }}</span>
<span class="dia_block_item_val">{{
diaForm.appDuration && diaForm.appDuration != 0
? "是"
: "否"
}}</span>
</div>
<div
class="dia_block_item_in"
v-if="diaForm.appDuration && diaForm.appDuration != 0"
>
<span class="dia_block_item_title">续期时长：</span>
<span
class="dia_block_item_val"
>{{ diaForm.appDuration }}{{ diaForm.durType == 1 ? "个月" : "年" }}</span>
<span class="dia_block_item_val"
>{{ diaForm.appDuration
}}{{ diaForm.durType == 1 ? "个月" : "年" }}</span
>
</div>
</div>
</div>
......@@ -747,7 +902,11 @@
<el-button class="submit" @click="determineSubmit">确定提交</el-button>
</div>
</el-dialog>
<ApassDialog ref="dialog" msg="确认删除该数据盘吗？" :submit="dialogSubmit"></ApassDialog>
<ApassDialog
ref="dialog"
msg="确认删除该数据盘吗？"
:submit="dialogSubmit"
></ApassDialog>
</div>
</template>
......@@ -1475,4 +1634,4 @@ export default {
.el-input__suffix {
text-align: right;
}
</style>
\ No newline at end of file
</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