Skip to content

A
apaas-ui
Commit 2031552e authored by 刘殿昕's avatar 刘殿昕
Browse files
Options

云服务、购物车、流程编辑

parent 2c8c3e03
Hide whitespace changes
Inline Side-by-side
Showing with 392 additions and 448 deletions
src/assets/i18n/language-zh.js
View file @ 2031552e
......@@ -39,6 +39,7 @@ export const lang = {
process_design: "流程设计",
process_management: "流程管理",
new: "新建",
edit: "编辑",
// technical-support
technical_support: "技术支持"
......
src/components/shop-cloud/shop-cloud.vue
View file @ 2031552e
......@@ -10,29 +10,19 @@
<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>
......@@ -51,19 +41,13 @@
<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">
......@@ -82,10 +66,7 @@
<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"
......@@ -97,14 +78,12 @@
</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="请选择内存使用量"
@change="setContainerGroup(0)"
>
<el-option
v-for="item in optionsRAM"
......@@ -117,10 +96,7 @@
</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"
......@@ -175,10 +151,7 @@
<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"
......@@ -191,10 +164,7 @@
</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"
......@@ -210,10 +180,7 @@
<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"
......@@ -226,10 +193,7 @@
</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"
......@@ -245,10 +209,7 @@
<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"
......@@ -272,10 +233,7 @@
<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"
......@@ -297,11 +255,7 @@
<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"
......@@ -332,31 +286,29 @@
class="now_spec_card_img"
:src="require('@/assets/imgs/' + item.src + '.png')"
/>
<span class="now_spec_card_title">{{
<span class="now_spec_card_title">
{{
item.title
}}</span>
<span class="now_spec_card_val">{{
}}
</span>
<span class="now_spec_card_val">
{{
item.val +
" " +
(item.title == "CPU"
? "核"
: item.title == "内存"
? "GB"
: "个")
}}</span>
" " +
(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"
......@@ -368,14 +320,12 @@
</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="请选择内存使用量"
@change="setContainerGroup(1)"
>
<el-option
v-for="item in optionsRAM"
......@@ -388,10 +338,7 @@
</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"
......@@ -466,21 +413,23 @@
class="now_rqz_card_img"
:src="require('@/assets/imgs/' + item.src + '.png')"
/>
<span class="now_rqz_card_title">{{
<span class="now_rqz_card_title">
{{
item.title
}}</span>
}}
</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>
......@@ -489,10 +438,7 @@
<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"
......@@ -505,10 +451,7 @@
</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"
......@@ -524,10 +467,7 @@
<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"
......@@ -540,10 +480,7 @@
</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"
......@@ -565,14 +502,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">{{
<span class="now_spec_card_time_title">当前工作区域到期时间</span>
<span class="now_spec_card_time_val">
{{
helper.dateStringTransform(
paramsOld.cloud_end_time
paramsOld.cloud_end_time
)
}}</span>
}}
</span>
</div>
</div>
</el-col>
......@@ -602,10 +539,7 @@
<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"
......@@ -628,12 +562,7 @@
<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>
......@@ -649,9 +578,11 @@
</el-col>
<el-col :span="10">
<span class="dia_item_title">申请类型：</span>
<span class="dia_item_val">{{
<span class="dia_item_val">
{{
activeName == 0 ? "新资源申请" : "已有资源升级"
}}</span>
}}
</span>
</el-col>
<el-col :span="10" v-if="activeName == '1'">
<span class="dia_item_title">工作区域名称：</span>
......@@ -661,10 +592,7 @@
<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' && diaForm.apply_file_name"
>
<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>
......@@ -682,9 +610,11 @@
</div>
<div class="dia_block_item_in">
<span class="dia_block_item_title">描述信息：</span>
<span class="dia_block_item_val">{{
<span class="dia_block_item_val">
{{
diaForm.workplacedesc
}}</span>
}}
</span>
</div>
</div>
<span class="dia_item_all_title">工作区域申请规格：</span>
......@@ -699,17 +629,18 @@
</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">
<div
class="dia_block_item_in"
v-if="diaForm.dataDisk && diaForm.perDataDisk && Number(diaForm.dataDisk) != 0 && Number(diaForm.perDataDisk) != 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>
......@@ -721,20 +652,14 @@
<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 }}G</span
>
<span class="val_has_2">最高&nbsp;{{ diaForm.perRAMs }}G</span>
<span class="val_has_2">默认&nbsp;{{ diaForm.perRAM }}G</span>
</p>
</div>
......@@ -743,10 +668,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>
......@@ -761,15 +686,11 @@
</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>
......@@ -777,23 +698,15 @@
<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>
......@@ -801,9 +714,11 @@
<div class="dia_block_item">
<div class="dia_block_item_in">
<span class="dia_block_item_title">到期时间：</span>
<span class="dia_block_item_val">{{
<span class="dia_block_item_val">
{{
helper.dateStringTransform(paramsOld.cloud_end_time)
}}</span>
}}
</span>
</div>
</div>
</div>
......@@ -821,30 +736,30 @@
</div>
<div class="dia_block_item_in">
<span class="dia_block_item_title">容器组：</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.containerGroup }}个</span>
</div>
<div
class="dia_block_item_in"
v-if="delDataDiskList.length != 0"
v-if="diaForm.dataDisk && diaForm.perDataDisk && Number(diaForm.dataDisk) != 0 && Number(diaForm.perDataDisk) != 0"
>
<span class="dia_block_item_title">新增数据盘：</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">
<span class="dia_block_item_title">删除数据盘：</span>
<span class="dia_block_item_val">{{
<span class="dia_block_item_val">
{{
delDataDiskList
.map((item) => {
return item.name;
})
.join("、")
}}</span>
.map((item) => {
return item.name;
})
.join("、")
}}
</span>
</div>
</div>
<span class="dia_item_all_title">单个容器组规格：</span>
......@@ -852,23 +767,15 @@
<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>
......@@ -876,21 +783,23 @@
<div class="dia_block_item">
<div class="dia_block_item_in">
<span class="dia_block_item_title">是否续期：</span>
<span class="dia_block_item_val">{{
<span class="dia_block_item_val">
{{
diaForm.appDuration && diaForm.appDuration != 0
? "是"
: "否"
}}</span>
? "是"
: "否"
}}
</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>
......@@ -902,11 +811,7 @@
<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>
......@@ -918,14 +823,6 @@ import InfoList from "@/components/infoList";
import ApassDialog from "@/components/apass-dialog";
import helper from "@/services/helper.js";
var checkName = (rule, value, callback) => {
if (new RegExp("^[a-z0-9]([0-9]||[a-z]||-)*$").test(value)) {
callback();
} else {
callback(new Error("小写字母或数字开头,可以由小写字母、数字、- 组成"));
}
};
export default {
components: {
BlockRadius,
......@@ -937,189 +834,215 @@ export default {
props: {
name: { type: String, default: "" },
},
data: () => ({
helper,
form: {
department_name: "",
phone: "",
link_man: "",
},
activeName: "0",
formNew: {
namespace: "",
workplace: "",
workplacedesc: "",
cpu: "",
memory: "",
containerGroup: undefined,
dataDisk: undefined,
perDataDisk: undefined,
perCPUs: undefined,
perCPU: undefined,
perRAMs: undefined,
perRAM: undefined,
appDuration: undefined,
durType: 1,
apply_file: "",
apply_file_name: "",
store_type: "nfs-client",
},
ruleNew: {
namespace: [
{ required: true, message: "请输入工作区域名称", trigger: "blur" },
{ max: 16, message: "长度应小于16个字符", trigger: "blur" },
{ validator: checkName, trigger: "blur" },
],
workplace: [
{ required: true, message: "请输入中文名称", trigger: "blur" },
{ max: 16, message: "长度应小于16个字符", trigger: "blur" },
],
workplacedesc: [
{ required: true, message: "请输入描述信息", trigger: "blur" },
{ max: 100, message: "长度应小于100个字符", trigger: "blur" },
],
cpu: [{ required: true, message: "请选择CPU使用量", trigger: "blur" }],
memory: [
{ required: true, message: "请选择内存使用量", trigger: "blur" },
],
containerGroup: [
{ required: true, message: "请输入容器组规格", trigger: "blur" },
],
perCPUs: [
{ required: true, message: "请输入CPU最大使用量", trigger: "blur" },
],
perCPU: [
{ required: true, message: "请输入CPU默认使用量", trigger: "blur" },
],
perRAMs: [
{ required: true, message: "请输入内存最大使用量", trigger: "blur" },
],
perRAM: [
{ required: true, message: "请输入内存默认使用量", trigger: "blur" },
],
appDuration: [
{ required: true, message: "请输入申请时长", trigger: "blur" },
],
},
durationOptions: [
{ value: 1, label: "月" },
{ value: 2, label: "年" },
],
workSpace: "",
workSpaceId: "",
workSpaceOptions: [],
optionsCPU: [
{ value: "8", label: "8" },
{ value: "16", label: "16" },
],
optionsRAM: [
{ value: "8", label: "8" },
{ value: "16", label: "16" },
{ value: "32", label: "32" },
],
options_store_type: [
{ value: "nfs-client", label: "nfs-client" },
{ value: "rook-ceph-block", label: "rook-ceph-block" },
],
formShow: false,
specArr: [
{ title: "CPU", val: "4", src: "ic_CPU" },
{ title: "内存", val: "4", src: "ic_neicun" },
{ title: "容器", val: "4", src: "ic_rongqi" },
],
rqzArr: [
{ title: "CPU", max: "4", default: "2", src: "ic_CPU" },
{ title: "内存", max: "4", default: "2", src: "ic_neicun" },
],
docTemplate: [
{
title: "",
info: "工作区域申请文件标准模板.xlsx",
url: "static/工作区域申请文件模板.xlsx",
type: "down",
data() {
var checkName = (rule, value, callback) => {
let self = this;
console.log(self);
if (new RegExp("^[a-z0-9]([0-9]||[a-z]||-)*$").test(value)) {
console.log(self);
self.$api.serviceShop
.checkNameSpaceCouldUse({ id: value })
.then(({ data }) => {
if (data.success === 1) {
if (data.data === 1) {
callback();
} else if (data.data === -1) {
callback(new Error("命名空间名称已存在"));
}
}
})
.catch((error) => {
console.log(error);
callback(new Error("命名空间名称验证失败"));
});
} else {
callback(new Error("小写字母或数字开头,可以由小写字母、数字、- 组成"));
}
};
return {
helper,
form: {
department_name: "",
phone: "",
link_man: "",
},
],
formOld: {
cpu: "",
memory: "",
containerGroup: undefined,
dataDisk: undefined,
perDataDisk: undefined,
perCPUs: undefined,
perCPU: undefined,
perRAMs: undefined,
perRAM: undefined,
appDuration: undefined,
durType: 1,
apply_file: "",
apply_file_name: "",
store_type: "nfs-client",
},
paramsOld: {},
ruleOld: {
namespace: [
{ required: true, message: "请输入工作区域名称", trigger: "blur" },
],
workplace: [
{ required: true, message: "请输入中文名称", trigger: "blur" },
],
workplacedesc: [
{ required: true, message: "请输入描述信息", trigger: "blur" },
activeName: "0",
formNew: {
namespace: "",
workplace: "",
workplacedesc: "",
cpu: "",
memory: "",
containerGroup: undefined,
dataDisk: undefined,
perDataDisk: undefined,
perCPUs: undefined,
perCPU: undefined,
perRAMs: undefined,
perRAM: undefined,
appDuration: undefined,
durType: 1,
apply_file: "",
apply_file_name: "",
store_type: "nfs-client",
},
ruleNew: {
namespace: [
{ required: true, message: "请输入工作区域名称", trigger: "blur" },
{ max: 16, message: "长度应小于16个字符", trigger: "blur" },
{ validator: checkName, trigger: "blur" },
],
workplace: [
{ required: true, message: "请输入中文名称", trigger: "blur" },
{ max: 16, message: "长度应小于16个字符", trigger: "blur" },
],
workplacedesc: [
{ required: true, message: "请输入描述信息", trigger: "blur" },
{ max: 100, message: "长度应小于100个字符", trigger: "blur" },
],
cpu: [{ required: true, message: "请选择CPU使用量", trigger: "blur" }],
memory: [
{ required: true, message: "请选择内存使用量", trigger: "blur" },
],
containerGroup: [
{ required: true, message: "请输入容器组规格", trigger: "blur" },
],
perCPUs: [
{ required: true, message: "请输入CPU最大使用量", trigger: "blur" },
],
perCPU: [
{ required: true, message: "请输入CPU默认使用量", trigger: "blur" },
],
perRAMs: [
{ required: true, message: "请输入内存最大使用量", trigger: "blur" },
],
perRAM: [
{ required: true, message: "请输入内存默认使用量", trigger: "blur" },
],
appDuration: [
{ required: true, message: "请输入申请时长", trigger: "blur" },
],
},
durationOptions: [
{ value: 1, label: "月" },
{ value: 2, label: "年" },
],
cpu: [{ required: true, message: "请选择CPU使用量", trigger: "blur" }],
memory: [
{ required: true, message: "请选择内存使用量", trigger: "blur" },
workSpace: "",
workSpaceId: "",
workSpaceOptions: [],
optionsCPU: [
{ value: "8", label: "8" },
{ value: "16", label: "16" },
],
containerGroup: [
{ required: true, message: "请输入容器组规格", trigger: "blur" },
optionsRAM: [
{ value: "8", label: "8" },
{ value: "16", label: "16" },
{ value: "32", label: "32" },
],
perCPUs: [
{ required: true, message: "请输入CPU最大使用量", trigger: "blur" },
options_store_type: [
{ value: "nfs-client", label: "nfs-client" },
{ value: "rook-ceph-block", label: "rook-ceph-block" },
],
perCPU: [
{ required: true, message: "请输入CPU默认使用量", trigger: "blur" },
formShow: false,
specArr: [
{ title: "CPU", val: "4", src: "ic_CPU" },
{ title: "内存", val: "4", src: "ic_neicun" },
{ title: "容器", val: "4", src: "ic_rongqi" },
],
perRAMs: [
{ required: true, message: "请输入内存最大使用量", trigger: "blur" },
rqzArr: [
{ title: "CPU", max: "4", default: "2", src: "ic_CPU" },
{ title: "内存", max: "4", default: "2", src: "ic_neicun" },
],
perRAM: [
{ required: true, message: "请输入内存默认使用量", trigger: "blur" },
docTemplate: [
{
title: "",
info: "工作区域申请文件标准模板.xlsx",
url: "static/工作区域申请文件模板.xlsx",
type: "down",
},
],
},
dialogVisible: false,
diaForm: {},
dataDiskHeaders: [
{
label: "磁盘名称",
prop: "name",
align: "center",
},
{
label: "数据盘容量",
prop: "disk_cap",
align: "center",
formOld: {
cpu: "",
memory: "",
containerGroup: undefined,
dataDisk: undefined,
perDataDisk: undefined,
perCPUs: undefined,
perCPU: undefined,
perRAMs: undefined,
perRAM: undefined,
appDuration: undefined,
durType: 1,
apply_file: "",
apply_file_name: "",
store_type: "nfs-client",
},
{
label: "部署的应用",
prop: "app_name",
align: "center",
},
{
label: "操作",
type: "Button",
align: "center",
btnList: [
{
type: "primary-del",
label: "删除",
},
paramsOld: {},
ruleOld: {
namespace: [
{ required: true, message: "请输入工作区域名称", trigger: "blur" },
],
workplace: [
{ required: true, message: "请输入中文名称", trigger: "blur" },
],
workplacedesc: [
{ required: true, message: "请输入描述信息", trigger: "blur" },
],
cpu: [{ required: true, message: "请选择CPU使用量", trigger: "blur" }],
memory: [
{ required: true, message: "请选择内存使用量", trigger: "blur" },
],
containerGroup: [
{ required: true, message: "请输入容器组规格", trigger: "blur" },
],
perCPUs: [
{ required: true, message: "请输入CPU最大使用量", trigger: "blur" },
],
perCPU: [
{ required: true, message: "请输入CPU默认使用量", trigger: "blur" },
],
perRAMs: [
{ required: true, message: "请输入内存最大使用量", trigger: "blur" },
],
perRAM: [
{ required: true, message: "请输入内存默认使用量", trigger: "blur" },
],
},
],
dataDiskList: [],
delDataDiskList: [],
del_item: {},
}),
dialogVisible: false,
diaForm: {},
dataDiskHeaders: [
{
label: "磁盘名称",
prop: "name",
align: "center",
},
{
label: "数据盘容量",
prop: "disk_cap",
align: "center",
},
{
label: "部署的应用",
prop: "app_name",
align: "center",
},
{
label: "操作",
type: "Button",
align: "center",
btnList: [
{
type: "primary-del",
label: "删除",
},
],
},
],
dataDiskList: [],
delDataDiskList: [],
del_item: {},
};
},
mounted() {
this.getUser();
this.getNameSpaceList();
......@@ -1198,10 +1121,8 @@ export default {
}
},
checkNamespace(namespace, cb) {
this.$http
.get("/apaas/service/v3/resource/apply/checkNs", {
params: { namespace },
})
this.$api.serviceShop
.checkNameSpaceCouldUse({ id: namespace })
.then(({ data }) => {
if (data.success === 1) {
if (data.data === 1) {
......@@ -1211,17 +1132,11 @@ export default {
message: `命名空间名称已存在`,
type: "error",
});
} else if (data.data === -1) {
this.$message({
message: `命名空间名称验证失败`,
type: "error",
});
}
}
})
.catch((error) => {
console.log(error);
this.$message({
message: `命名空间名称验证失败`,
type: "error",
......@@ -1267,7 +1182,7 @@ export default {
message: "申请成功",
type: "success",
});
this.$router.push("/services_shop");
this.$router.push("/user/order_list");
} else {
this.$message({
message: `申请失败，${response.data.errMsg}`,
......@@ -1308,7 +1223,7 @@ export default {
message: "申请调整成功",
type: "success",
});
this.$router.push("/services_shop");
this.$router.push("/user/order_list");
} else {
this.$message({
message: `申请调整失败，${response.data.errMsg}`,
......@@ -1346,6 +1261,19 @@ export default {
this.dataDiskList.splice(delIndex, 1);
this.delDataDiskList.push(this.del_item);
},
setContainerGroup(type) {
if (type == 0) {
if (this.formNew.containerGroup && this.formNew.containerGroup != 0) {
} else {
this.formNew.containerGroup = this.formNew.memory * 3;
}
} else if (type == 1) {
if (this.formOld.containerGroup && this.formOld.containerGroup != 0) {
} else {
this.formOld.containerGroup = this.formOld.memory * 3;
}
}
},
},
};
</script>
......@@ -1680,4 +1608,8 @@ export default {
.el-input__suffix {
text-align: right;
}
.cloud_form .el-input-number.is-controls-right .el-input__inner {
padding-left: 15px;
padding-right: 40px;
}
</style>
src/components/shopping-cart/shopping-cart-com.vue
View file @ 2031552e
......@@ -75,7 +75,7 @@
import ShoppingCartList from "@/components/shopping-cart/shopping-cart-list";
export default {
components: {
ShoppingCartList
ShoppingCartList,
},
props: {},
data: () => ({
......@@ -83,7 +83,7 @@ export default {
checkList: [],
checkListIn: [],
list: [],
listIn: []
listIn: [],
}),
mounted() {
this.getList();
......@@ -95,14 +95,14 @@ export default {
0
);
return num;
}
},
},
methods: {
getList() {
this.$api.serviceShop.getShoppingCart().then(response => {
this.$api.serviceShop.getShoppingCart().then((response) => {
if (response.data.success == "1") {
this.list = response.data.data.valid;
this.listIn = response.data.data.invalid;
this.list = response.data.data.valid || [];
this.listIn = response.data.data.invalid || [];
this.checkList = [];
this.checkListIn = [];
for (let index in this.list) {
......@@ -135,7 +135,7 @@ export default {
query.push(this.list[index].id);
}
});
this.$api.serviceShop.delShoppingCart(query).then(response => {
this.$api.serviceShop.delShoppingCart(query).then((response) => {
console.log(response);
this.$store.commit("setMenuCartState");
this.getList();
......@@ -147,7 +147,7 @@ export default {
deleteItem(val) {
console.log(val);
let query = [val.data.id];
this.$api.serviceShop.delShoppingCart(query).then(response => {
this.$api.serviceShop.delShoppingCart(query).then((response) => {
console.log(response);
this.$store.commit("setMenuCartState");
this.getList();
......@@ -168,8 +168,8 @@ export default {
updateList() {
this.$store.commit("setMenuCartState");
this.getList();
}
}
},
},
};
</script>
<style scoped>
......
src/pages/service_shop/shop_car_apply.vue
View file @ 2031552e
......@@ -287,6 +287,7 @@ export default {
.then(response => {
console.log(response);
if (response.data.success) {
this.$store.commit("setMenuCartState");
this.$message.success("申请成功");
this.$router.replace("/shop/service_application_successfully");
} else {
......
src/pages/workbench/component-center/process-management/process-design/edit.vue
View file @ 2031552e
......@@ -4,17 +4,10 @@
<el-breadcrumb-item :to="{ path: '/workplace' }">{{ $t("lang.online_component_tool") }}</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '/progress/designer' }">{{ $t("lang.process_design") }}</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '/progress/designer' }">{{ $t("lang.process_management") }}</el-breadcrumb-item>
<el-breadcrumb-item>{{ $t("lang.new") }}</el-breadcrumb-item>
<el-breadcrumb-item>{{ $t("lang.edit") }}</el-breadcrumb-item>
</el-breadcrumb>
<BlockRadius class="block_item">
<steps
:active-step="step"
:done="done"
:show-done="true"
done-title="保存成功"
done-sub-title="可返回流程管理列表查看该流程，并进行流程的部署和发布。"
class="apaas_steps"
>
<steps :active-step="step" :show-done="true" class="apaas_steps">
<step
title="基本信息"
:step="0"
......@@ -65,13 +58,7 @@
class="apaas_step"
>
<div class="step_in">
<WorkFlow
ref="workFlow"
:node_list="node_list"
:link_list="link_list"
:node_params_list="node_params_list"
class="work_flow"
/>
<WorkFlow ref="workFlow" class="work_flow" />
<div class="btn_footer">
<el-button class="cancel" @click="cancel">取消</el-button>
<div>
......@@ -87,11 +74,27 @@
:step="2"
:active-icon="require('@/assets/imgs/progress_ic_wancheng.png')"
class="apaas_step"
></step>
<template slot="action">
<el-button type="primary" @click="backToList">返回列表</el-button>
</template>
>
<div class="steps_container steps_done">
<div class="steps_done_info">
<div class="left_container">
<img :src="require('@/assets/imgs/steps_done.png')" width="100%" />
</div>
<div class="right_container">
<p>保存成功</p>
<p>可返回流程管理列表查看该流程，并进行流程的部署和发布。</p>
</div>
</div>
<div class="done_action apaas_button">
<slot name="action"></slot>
</div>
<div class="btn_footer_1">
<div>
<el-button class="next" @click="backToList">返回列表</el-button>
</div>
</div>
</div>
</step>
</steps>
</BlockRadius>
</div>
......@@ -264,6 +267,10 @@ export default {
.getProcessDetail({ id: this.$route.params.id })
.then((response) => {
if (response.data.success == 1) {
let data = response.data.data;
this.basic_form.name = data.name;
this.basic_form.workplace = data.workarea;
this.basic_form.desc = data.describe;
this.node_list = [];
this.link_list = [];
this.node_params_list = [];
......
src/request/api/service-shop.js
View file @ 2031552e
......@@ -43,6 +43,9 @@ businessArea=${params.businessArea}&developable=${params.developable}&orgSource=
updateCloud(params) {
return axios.post(`/apaas/serviceapp/v3/resource/apply/up`, params)
},
checkNameSpaceCouldUse(params) {
return axios.get(`/apaas/service/v3/resource/apply/checkNs?namespace=${params.id}`)
},
// shopping cart
addShoppingCart(params) {
......
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