Skip to content

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

云资源修改样式及删除数据盘操作

parent 658fc9ab
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 247 deletions
src/components/shop-cloud/shop-cloud.vue
View file @ 51d1b45b
......@@ -53,11 +53,7 @@
<el-col :span="22">
<el-form-item prop="workplacedesc" class="form_item">
<div class="form_item_title">描述信息：</div>
<el-input
type="textarea"
v-model="formNew.workplacedesc"
placeholder="请输入工作区域描述信息"
></el-input>
<el-input type="textarea" v-model="formNew.workplacedesc" placeholder="请输入工作区域描述信息"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
......@@ -67,64 +63,38 @@
<el-form-item class="form_item input_has_right">
<div class="form_item_title">CPU：</div>
<el-select v-model="formNew.cpu" placeholder="请选择CPU使用量">
<el-option
v-for="item in optionsCPU"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
<el-option v-for="item in optionsCPU" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
<div class="input_right">核</div>
<div class="input_right input_right_top">核</div>
</el-form-item>
</el-col>
<el-col :span="22">
<el-form-item class="form_item input_has_right">
<div class="form_item_title">内存：</div>
<el-select v-model="formNew.memory" placeholder="请选择内存使用量">
<el-option
v-for="item in optionsRAM"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
<el-option v-for="item in optionsRAM" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
<div class="input_right">GB</div>
<div class="input_right input_right_top">GB</div>
</el-form-item>
</el-col>
<el-col :span="22">
<el-form-item class="form_item input_has_right">
<div class="form_item_title">容器组：</div>
<el-input-number
v-model="formNew.containerGroup"
controls-position="right"
:min="0"
:max="24"
placeholder="取值范围[0，24]"
></el-input-number>
<el-input-number v-model="formNew.containerGroup" controls-position="right" :min="0" :max="24" placeholder="取值范围[0，24]"></el-input-number>
<div class="input_right">个</div>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item class="form_item input_has_right">
<div class="form_item_title">数据盘（可选）：</div>
<el-input-number
v-model="formNew.dataDisk"
controls-position="right"
:min="0"
placeholder="请选择数量"
></el-input-number>
<el-input-number v-model="formNew.dataDisk" controls-position="right" :min="0" placeholder="请选择数量"></el-input-number>
<div class="input_right">块</div>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item class="form_item input_has_right">
<div class="form_item_title">每块数据盘容量：</div>
<el-input-number
v-model="formNew.perDataDisk"
controls-position="right"
:min="0"
placeholder="请选择容量"
></el-input-number>
<el-input-number v-model="formNew.perDataDisk" controls-position="right" :min="0" placeholder="请选择容量"></el-input-number>
<div class="input_right">GB</div>
</el-form-item>
</el-col>
......@@ -137,26 +107,14 @@
<el-col :span="11">
<el-form-item class="form_item input_has_left_right">
<div class="input_left">最高</div>
<el-input-number
v-model="formNew.perCPUs"
controls-position="right"
:min="0"
:max="10"
placeholder="请选择CPU最高使用量"
></el-input-number>
<el-input-number v-model="formNew.perCPUs" controls-position="right" :min="0" :max="10" placeholder="请选择CPU最高使用量"></el-input-number>
<div class="input_right">核</div>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item class="form_item input_has_left_right">
<div class="input_left">默认</div>
<el-input-number
v-model="formNew.perCPU"
controls-position="right"
:min="0"
:max="10"
placeholder="请选择CPU默认使用量"
></el-input-number>
<el-input-number v-model="formNew.perCPU" controls-position="right" :min="0" :max="10" placeholder="请选择CPU默认使用量"></el-input-number>
<div class="input_right">核</div>
</el-form-item>
</el-col>
......@@ -166,26 +124,14 @@
<el-col :span="11">
<el-form-item class="form_item input_has_left_right">
<div class="input_left">最高</div>
<el-input-number
v-model="formNew.perRAMs"
controls-position="right"
:min="0"
:max="10"
placeholder="请选择内存最高使用量"
></el-input-number>
<el-input-number v-model="formNew.perRAMs" controls-position="right" :min="0" :max="10" placeholder="请选择内存最高使用量"></el-input-number>
<div class="input_right">核</div>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item class="form_item input_has_left_right">
<div class="input_left">默认</div>
<el-input-number
v-model="formNew.perRAM"
controls-position="right"
:min="0"
:max="10"
placeholder="请选择内存默认使用量"
></el-input-number>
<el-input-number v-model="formNew.perRAM" controls-position="right" :min="0" :max="10" placeholder="请选择内存默认使用量"></el-input-number>
<div class="input_right">核</div>
</el-form-item>
</el-col>
......@@ -195,22 +141,9 @@
<el-col :span="22">
<el-form-item class="form_item input_has_right_select">
<div class="form_item_title">申请时长：</div>
<el-input-number
v-model="formNew.appDuration"
controls-position="right"
:min="0"
></el-input-number>
<el-select
v-model="formNew.durType"
class="input_right_select"
placeholder="请选择申请时长"
>
<el-option
v-for="item in durationOptions"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
<el-input-number v-model="formNew.appDuration" controls-position="right" :min="0"></el-input-number>
<el-select v-model="formNew.durType" class="input_right_select" placeholder="请选择申请时长">
<el-option v-for="item in durationOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -218,14 +151,7 @@
<el-form-item class="form_item">
<div class="form_item_title">申请文件：</div>
<info-list :list_arr="docTemplate" class="doc_template"></info-list>
<upload-file
:multiple="false"
:max="1"
type="zip"
:readOnly="false"
:drag="true"
@getNewList="getNewList"
></upload-file>
<upload-file :multiple="false" :max="1" type="zip" :readOnly="false" :drag="true" @getNewList="getNewList"></upload-file>
</el-form-item>
</el-col>
</el-row>
......@@ -239,12 +165,7 @@
<div class="select_title">选择要进行调整的工作区域：</div>
<div class="form_item">
<el-select v-model="workSpace" @change="getForm" placeholder="请选择">
<el-option
v-for="(item, index) in workSpaceOptions"
:key="index"
:label="item.namespace"
:value="index"
></el-option>
<el-option v-for="(item, index) in workSpaceOptions" :key="index" :label="item.namespace" :value="index"></el-option>
</el-select>
</div>
</el-col>
......@@ -260,19 +181,10 @@
<el-col :span="24">
<div class="now_spec">当前规格：</div>
<div class="now_spec_cards">
<div
class="now_spec_card"
v-for="(item, index) in specArr"
:key="index + 'spec'"
>
<img
class="now_spec_card_img"
:src="require('@/assets/imgs/' + item.src + '.png')"
/>
<div class="now_spec_card" v-for="(item, index) in specArr" :key="index + 'spec'">
<img 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_val">{{ item.val + " " + (item.title == "CPU" ? "核" : item.title == "内存" ? "GB" : "个") }}</span>
</div>
</div>
</el-col>
......@@ -280,74 +192,44 @@
<el-form-item class="form_item input_has_right">
<div class="form_item_title">申请CPU调整为：</div>
<el-select v-model="formOld.cpu" placeholder="请选择CPU使用量">
<el-option
v-for="item in optionsCPU"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
<el-option v-for="item in optionsCPU" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
<div class="input_right">核</div>
<div class="input_right input_right_top">核</div>
</el-form-item>
</el-col>
<el-col :span="22">
<el-form-item class="form_item input_has_right">
<div class="form_item_title">申请内存调整为：</div>
<el-select v-model="formOld.memory" placeholder="请选择内存使用量">
<el-option
v-for="item in optionsRAM"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
<el-option v-for="item in optionsRAM" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
<div class="input_right">GB</div>
<div class="input_right input_right_top">GB</div>
</el-form-item>
</el-col>
<el-col :span="22">
<el-form-item class="form_item input_has_right">
<div class="form_item_title">申请容器组调整为：</div>
<el-input-number
v-model="formOld.containerGroup"
controls-position="right"
:min="0"
:max="24"
placeholder="取值范围[0，24]"
></el-input-number>
<el-input-number v-model="formOld.containerGroup" controls-position="right" :min="0" :max="24" placeholder="取值范围[0，24]"></el-input-number>
<div class="input_right">个</div>
</el-form-item>
</el-col>
<el-col :span="22" v-if="dataDiskList.length != 0">
<el-form-item class="form_item input_has_right">
<div class="form_item_title">调整数据盘：</div>
<table-um
ref="apply_service_state_table"
:headers="dataDiskHeaders"
:stripe="true"
:datas="dataDiskList"
@primary-del="delItem"
></table-um>
<table-um ref="apply_service_state_table" :headers="dataDiskHeaders" :stripe="true" :datas="dataDiskList" @primary-del="delItem"></table-um>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item class="form_item input_has_right">
<div class="form_item_title">增加数据盘：</div>
<el-input-number
v-model="formOld.dataDisk"
controls-position="right"
:min="0"
></el-input-number>
<el-input-number v-model="formOld.dataDisk" controls-position="right" :min="0"></el-input-number>
<div class="input_right">块</div>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item class="form_item input_has_right">
<div class="form_item_title">每块数据盘容量：</div>
<el-input-number
v-model="formOld.perDataDisk"
controls-position="right"
:min="0"
></el-input-number>
<el-input-number v-model="formOld.perDataDisk" controls-position="right" :min="0"></el-input-number>
<div class="input_right">GB</div>
</el-form-item>
</el-col>
......@@ -357,24 +239,13 @@
<el-col :span="24">
<div class="now_spec">当前规格：</div>
<div class="now_spec_cards">
<div
class="now_rqz_card"
v-for="(item, index) in rqzArr"
:key="index + 'rqz'"
>
<img
class="now_rqz_card_img"
:src="require('@/assets/imgs/' + item.src + '.png')"
/>
<div class="now_rqz_card" v-for="(item, index) in rqzArr" :key="index + 'rqz'">
<img class="now_rqz_card_img" :src="require('@/assets/imgs/' + item.src + '.png')" />
<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>
......@@ -385,26 +256,14 @@
<el-col :span="11">
<el-form-item class="form_item input_has_left_right">
<div class="input_left">最高</div>
<el-input-number
v-model="formOld.perCPUs"
controls-position="right"
:min="0"
:max="10"
placeholder="请设置CPU最高使用量"
></el-input-number>
<el-input-number v-model="formOld.perCPUs" controls-position="right" :min="0" :max="10" placeholder="请设置CPU最高使用量"></el-input-number>
<div class="input_right">核</div>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item class="form_item input_has_left_right">
<div class="input_left">默认</div>
<el-input-number
v-model="formOld.perCPU"
controls-position="right"
:min="0"
:max="10"
placeholder="请设置CPU默认使用量"
></el-input-number>
<el-input-number v-model="formOld.perCPU" controls-position="right" :min="0" :max="10" placeholder="请设置CPU默认使用量"></el-input-number>
<div class="input_right">核</div>
</el-form-item>
</el-col>
......@@ -414,26 +273,14 @@
<el-col :span="11">
<el-form-item class="form_item input_has_left_right">
<div class="input_left">最高</div>
<el-input-number
v-model="formOld.perRAMs"
controls-position="right"
:min="0"
:max="10"
placeholder="请设置内存最高使用量"
></el-input-number>
<el-input-number v-model="formOld.perRAMs" controls-position="right" :min="0" :max="10" placeholder="请设置内存最高使用量"></el-input-number>
<div class="input_right">核</div>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item class="form_item input_has_left_right">
<div class="input_left">默认</div>
<el-input-number
v-model="formOld.perRAM"
controls-position="right"
:min="0"
:max="10"
placeholder="请设置内存默认使用量"
></el-input-number>
<el-input-number v-model="formOld.perRAM" controls-position="right" :min="0" :max="10" placeholder="请设置内存默认使用量"></el-input-number>
<div class="input_right">核</div>
</el-form-item>
</el-col>
......@@ -443,10 +290,7 @@
<div class="now_spec">当前规格：</div>
<div class="now_spec_card_time">
<div>
<img
class="now_spec_card_time_img"
:src="require('@/assets/imgs/ic_shijian.png')"
/>
<img 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">2020-05-05 08:00:00</span>
</div>
......@@ -456,22 +300,9 @@
<el-col :span="22">
<el-form-item class="form_item input_has_right_select">
<div class="form_item_title">申请续期：</div>
<el-input-number
v-model="formOld.appDuration"
controls-position="right"
:min="0"
></el-input-number>
<el-select
v-model="formOld.durType"
class="input_right_select"
placeholder="请选择续期时长"
>
<el-option
v-for="item in durationOptions"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
<el-input-number v-model="formOld.appDuration" controls-position="right" :min="0"></el-input-number>
<el-select v-model="formOld.durType" class="input_right_select" placeholder="请选择续期时长">
<el-option v-for="item in durationOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -479,14 +310,7 @@
<el-form-item class="form_item">
<div class="form_item_title">申请文件：</div>
<info-list :list_arr="docTemplate" class="doc_template"></info-list>
<upload-file
:multiple="false"
:max="1"
type="zip"
:readOnly="false"
:drag="true"
@getNewList="getNewListOld"
></upload-file>
<upload-file :multiple="false" :max="1" type="zip" :readOnly="false" :drag="true" @getNewList="getNewListOld"></upload-file>
</el-form-item>
</el-col>
</el-row>
......@@ -563,9 +387,7 @@
</div>
<div class="dia_block_item_in">
<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>
<span class="dia_item_all_title">单个容器组规格：</span>
......@@ -589,9 +411,7 @@
<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>
......@@ -656,9 +476,7 @@
</div>
<div class="dia_block_item_in">
<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">
<span class="dia_block_item_title">删除数据盘：</span>
......@@ -686,18 +504,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"
>{{ 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"
>
<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>
......@@ -760,16 +571,10 @@ export default {
{ required: true, message: "请输入联系电话", trigger: "blur" }
]
},
durationOptions: [
{ value: "1", label: "月" },
{ value: "2", label: "年" }
],
durationOptions: [{ value: "1", label: "月" }, { value: "2", label: "年" }],
workSpace: "",
workSpaceOptions: [],
optionsCPU: [
{ value: "8", label: "8" },
{ value: "16", label: "16" }
],
optionsCPU: [{ value: "8", label: "8" }, { value: "16", label: "16" }],
optionsRAM: [
{ value: "8", label: "8" },
{ value: "16", label: "16" },
......@@ -990,10 +795,11 @@ export default {
});
},
delItem(val) {
console.log(val);
this.delDataDiskList.push(val.app);
let this.dataDiskList.find((v) => v.app === val.app);
if ()
let delItem = this.dataDiskList.findIndex(v => v.app === val.app);
if (delItem) {
console.log(delItem);
}
}
}
};
......@@ -1234,6 +1040,9 @@ export default {
border-radius: 0;
color: #242c43;
}
.cloud_form .input_right_top {
top: 41px;
}
.cloud_form .el-select {
width: 100%;
}
......
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