Skip to content

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

Merge branch 'ldx' into dev

parents d50935f0 b3a267a4
Show whitespace changes
Inline Side-by-side
Showing with 659 additions and 632 deletions
src/assets/css/index.css
View file @ 6ef70bf8
...@@ -261,15 +261,15 @@ div { ...@@ -261,15 +261,15 @@ div {
} }
.el-tabs__item { .el-tabs__item {
font-size: 16px; font-size: 14px;
color: #8890a7; color: #8890a7;
line-height: 24px !important; line-height: 14px !important;
font-weight: bold; font-weight: bold;
} }
.el-tabs__nav-scroll .el-tabs__item { .el-tabs__nav-scroll .el-tabs__item {
line-height: 38px !important; line-height: 14px !important;
height: 44px !important; height: 38px !important;
} }
.el-tabs__item:hover { .el-tabs__item:hover {
...@@ -499,7 +499,7 @@ border-radius:8px; ...@@ -499,7 +499,7 @@ border-radius:8px;
margin-left: 35px; margin-left: 35px;
} */ } */
.el-input__inner { .el-input__inner {
border-radius: 8px; border-radius: 6px;
} }
.el-input-group__append, .el-input-group__append,
......
src/components/general/block-radius.vue
View file @ 6ef70bf8
<template> <template>
<div class="block_radius" :style="'border-radius:' + borRadius + 'px'"> <div class="block_radius" :style="'border-radius:' + borRadius + 'px;padding:' + paddingNum + 'px;'">
<div v-if="show_header" class="block_header"> <div v-if="show_header" class="block_header">
<div class="block_header_title">{{ title }}</div> <div class="block_header_title">{{ title }}</div>
<div class="block_header_button_group"> <div class="block_header_button_group">
...@@ -36,6 +36,10 @@ export default { ...@@ -36,6 +36,10 @@ export default {
borRadius: { borRadius: {
type: Number, type: Number,
default: 10, default: 10,
},
paddingNum: {
type: Number,
default: 20,
} }
}, },
components: {}, components: {},
......
src/components/infoList.vue
View file @ 6ef70bf8
...@@ -93,10 +93,10 @@ a { ...@@ -93,10 +93,10 @@ a {
text-align: center; text-align: center;
color: #e6ebfe; color: #e6ebfe;
background-color: #515fe7; background-color: #515fe7;
border-radius: 8px; border-radius: 6px;
display: inline-block; display: inline-block;
font-size: 14px; font-size: 14px;
margin-left: 20px; margin-left: 8px;
cursor: pointer; cursor: pointer;
} }
</style> </style>
src/components/service-list/commodity-card.vue
View file @ 6ef70bf8
...@@ -87,14 +87,14 @@ export default { ...@@ -87,14 +87,14 @@ export default {
height: 208px; height: 208px;
background-color: #ffffff; background-color: #ffffff;
box-shadow: 0px 3px 6px 0px rgba(15, 19, 65, 0.04); box-shadow: 0px 3px 6px 0px rgba(15, 19, 65, 0.04);
border-radius: 12px 12px 8px 8px; border-radius: 8px;
border: solid 1px #e3e4ef; border: solid 1px #e3e4ef;
margin-bottom: 16px; margin-bottom: 24px;
} }
.com_cell_up { .com_cell_up {
height: 88px; height: 88px;
background-color: #f9fafc; background-color: #f9fafc;
border-radius: 12px 12px 0px 0px; border-radius: 8px 8px 0px 0px;
padding: 16px; padding: 16px;
display: flex; display: flex;
position: relative; position: relative;
...@@ -186,7 +186,7 @@ export default { ...@@ -186,7 +186,7 @@ export default {
color: #e15260; color: #e15260;
} }
.com_cell_down { .com_cell_down {
padding: 12px 16px 16px; padding: 12px 16px 0 16px;
} }
.com_detail { .com_detail {
color: #8890a7; color: #8890a7;
......
src/components/service-list/commodity-cell.vue
View file @ 6ef70bf8
...@@ -100,7 +100,7 @@ export default { ...@@ -100,7 +100,7 @@ export default {
box-shadow: 0px 3px 6px 0px rgba(15, 19, 65, 0.04); box-shadow: 0px 3px 6px 0px rgba(15, 19, 65, 0.04);
border-radius: 12px 12px 8px 8px; border-radius: 12px 12px 8px 8px;
border: solid 1px #e3e4ef; border: solid 1px #e3e4ef;
margin-bottom: 16px; margin-bottom: 24px;
} }
.com_cell_up { .com_cell_up {
height: 88px; height: 88px;
...@@ -197,7 +197,7 @@ export default { ...@@ -197,7 +197,7 @@ export default {
color: #e15260; color: #e15260;
} }
.com_cell_down { .com_cell_down {
padding: 12px 16px 16px; padding: 12px 16px 0 16px;
} }
.com_detail { .com_detail {
color: #8890a7; color: #8890a7;
......
src/components/service-list/service_list.vue
View file @ 6ef70bf8
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
class="classification_line_if" class="classification_line_if"
v-if="item.childDomains && item.childDomains.length != 0" v-if="item.childDomains && item.childDomains.length != 0"
> >
<div class="classification_line_title">{{ item.name }}：</div> <div class="classification_line_title">{{ item.name }}<span class="maohao">：</span></div>
<!-- <div <!-- <div
:class=" :class="
index == filterLists.length - 1 index == filterLists.length - 1
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
@click="clickOpen(index)" @click="clickOpen(index)"
> >
<span v-if="openList[index] == 'down'">收起</span> <span v-if="openList[index] == 'down'">收起</span>
<span v-if="openList[index] == 'up'">展开</span> <span v-if="openList[index] == 'up'">更多</span>
<i <i
v-if="openList[index] == 'down'" v-if="openList[index] == 'down'"
class="el-icon-caret-top" class="el-icon-caret-top"
...@@ -666,10 +666,11 @@ export default { ...@@ -666,10 +666,11 @@ export default {
} }
.classification_line_title { .classification_line_title {
display: inline-block; display: inline-block;
width: 130px; width: 90px;
padding: 15px 0; padding: 15px 0;
text-align: right; text-align: left;
color: #8890a7; color: #8890a7;
font-size: 12px;
} }
.classification_line_items { .classification_line_items {
width: calc(100% - 130px); width: calc(100% - 130px);
...@@ -678,7 +679,7 @@ export default { ...@@ -678,7 +679,7 @@ export default {
border-bottom: 1px #e9ecf3 solid; border-bottom: 1px #e9ecf3 solid;
} }
.classification_line_hid { .classification_line_hid {
height: 50px; height: 46px;
width: 100%; width: 100%;
overflow: hidden; overflow: hidden;
display: inline-flex; display: inline-flex;
...@@ -697,7 +698,7 @@ export default { ...@@ -697,7 +698,7 @@ export default {
.classification_line_items_li { .classification_line_items_li {
display: inline-block; display: inline-block;
padding: 15px 20px; padding: 15px 20px;
font-size: 14px; font-size: 12px;
} }
.classification_line_items_li_act { .classification_line_items_li_act {
background-color: #fbfbfb; background-color: #fbfbfb;
...@@ -730,6 +731,7 @@ export default { ...@@ -730,6 +731,7 @@ export default {
width: 60px; width: 60px;
padding: 15px 0; padding: 15px 0;
cursor: pointer; cursor: pointer;
font-size: 12px;
} }
.classification_children_ul { .classification_children_ul {
display: inline-block; display: inline-block;
......
src/components/service-list/service_shop_menu.vue
View file @ 6ef70bf8
...@@ -121,18 +121,24 @@ export default { ...@@ -121,18 +121,24 @@ export default {
border-radius: 8px; border-radius: 8px;
} }
.service_shop_menu_list > li { .service_shop_menu_list > li {
padding: 16px 10px 8px 22px; box-sizing: border-box;
height: 40px;
padding: 8px 0 0 22px;
margin-bottom: 16px;
font-size: 15px; font-size: 15px;
line-height: 24px; line-height: 24px;
cursor: pointer; cursor: pointer;
} }
.service_shop_menu_list > li:nth-last-child(1) {
margin-bottom: 0;
}
.service_shop_menu_list > li:hover, .service_shop_menu_list > li:hover,
.service_shop_menu_list > li.current { .service_shop_menu_list > li.current {
background-color: rgba(242, 246, 253, 0.4); background-color: rgba(242, 246, 253, 0.4);
color: #515fe7; color: #515fe7;
} }
.menu_img { .menu_img {
width: 25px; width: 24px;
margin-right: 6px; margin-right: 6px;
} }
.menu_item { .menu_item {
......
src/components/shop-cloud/shop-cloud.vue
View file @ 6ef70bf8
<template> <template>
<div> <div class="shop_cloud">
<el-breadcrumb separator="/" class="bread_crumb1 bread_left"> <el-breadcrumb separator="/" class="bread_crumb1 bread_left">
<el-breadcrumb-item :to="{ path: '/shop' }">服务超市</el-breadcrumb-item> <el-breadcrumb-item :to="{ path: '/shop' }">服务超市</el-breadcrumb-item>
<el-breadcrumb-item>{{ name }}</el-breadcrumb-item> <el-breadcrumb-item>{{ name }}</el-breadcrumb-item>
</el-breadcrumb> </el-breadcrumb>
<block-radius> <block-radius :paddingNum="24">
<el-form <el-form
ref="form" ref="form"
:inline="true" :inline="true"
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
:model="form" :model="form"
class="form_block" class="form_block"
> >
<el-row> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="24">
<el-form-item class="form_item"> <el-form-item class="form_item">
<div class="form_item_title">申请组织：</div> <div class="form_item_title">申请组织：</div>
<el-input <el-input
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item class="form_item" prop="link_man"> <el-form-item class="form_item nobottom" prop="link_man">
<div class="form_item_title">部门联系人：</div> <div class="form_item_title">部门联系人：</div>
<el-input <el-input
v-model="form.link_man" v-model="form.link_man"
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item class="form_item" prop="phone"> <el-form-item class="form_item nobottom" prop="phone">
<div class="form_item_title">联系电话：</div> <div class="form_item_title">联系电话：</div>
<el-input <el-input
v-model="form.phone" v-model="form.phone"
...@@ -44,13 +44,11 @@ ...@@ -44,13 +44,11 @@
</el-row> </el-row>
</el-form> </el-form>
</block-radius> </block-radius>
<block-radius> <block-radius :paddingNum="24">
<el-tabs v-model="activeName" class="cloud_form" @tab-click="tabClick"> <el-tabs v-model="activeName" class="cloud_form" @tab-click="tabClick">
<el-tab-pane label="申请新的工作区域" name="0"> <el-tab-pane label="申请新的工作区域" name="0">
<el-row>
<el-col :span="24">
<el-form ref="formNew" :model="formNew" :rules="ruleNew"> <el-form ref="formNew" :model="formNew" :rules="ruleNew">
<el-row> <el-row :gutter="24">
<el-col :span="24"> <el-col :span="24">
<div class="form_title">基本信息</div> <div class="form_title">基本信息</div>
</el-col> </el-col>
...@@ -72,8 +70,8 @@ ...@@ -72,8 +70,8 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="24">
<el-form-item prop="workplacedesc" class="form_item"> <el-form-item prop="workplacedesc" class="form_item nobottom">
<div class="form_item_title">描述信息：</div> <div class="form_item_title">描述信息：</div>
<el-input <el-input
type="textarea" type="textarea"
...@@ -85,7 +83,7 @@ ...@@ -85,7 +83,7 @@
<el-col :span="24"> <el-col :span="24">
<div class="form_title">工作区域申请规格</div> <div class="form_title">工作区域申请规格</div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<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> <div class="form_item_title">CPU：</div>
<el-select <el-select
...@@ -103,11 +101,8 @@ ...@@ -103,11 +101,8 @@
<div class="input_right input_right_top">核</div> <div class="input_right input_right_top">核</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item <el-form-item prop="memory" class="form_item input_has_right">
prop="memory"
class="form_item input_has_right"
>
<div class="form_item_title">内存：</div> <div class="form_item_title">内存：</div>
<el-select <el-select
v-model="formNew.memory" v-model="formNew.memory"
...@@ -124,7 +119,7 @@ ...@@ -124,7 +119,7 @@
<div class="input_right input_right_top">GB</div> <div class="input_right input_right_top">GB</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item <el-form-item
prop="containerGroup" prop="containerGroup"
class="form_item input_has_right" class="form_item input_has_right"
...@@ -143,8 +138,8 @@ ...@@ -143,8 +138,8 @@
<el-col :span="24"> <el-col :span="24">
<div class="form_item_title">数据盘（可选）：</div> <div class="form_item_title">数据盘（可选）：</div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item class="form_item input_has_right"> <el-form-item class="form_item input_has_right nobottom">
<el-input-number <el-input-number
v-model="formNew.dataDisk" v-model="formNew.dataDisk"
controls-position="right" controls-position="right"
...@@ -155,8 +150,8 @@ ...@@ -155,8 +150,8 @@
<div class="input_right">块</div> <div class="input_right">块</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item class="form_item input_has_right"> <el-form-item class="form_item input_has_right nobottom">
<el-input-number <el-input-number
v-model="formNew.perDataDisk" v-model="formNew.perDataDisk"
controls-position="right" controls-position="right"
...@@ -170,13 +165,10 @@ ...@@ -170,13 +165,10 @@
<el-col :span="24"> <el-col :span="24">
<div class="form_title">单个容器组规格</div> <div class="form_title">单个容器组规格</div>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="24">
<div class="form_item_title">CPU：</div> <div class="form_item_title">CPU：</div>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="8">
<div class="form_item_title">内存：</div>
</el-col>
<el-col :span="6">
<el-form-item <el-form-item
prop="perCPUs" prop="perCPUs"
class="form_item input_has_left_right" class="form_item input_has_left_right"
...@@ -187,12 +179,12 @@ ...@@ -187,12 +179,12 @@
controls-position="right" controls-position="right"
:min="0" :min="0"
:max="10" :max="10"
placeholder="请选择CPU最高使用量" placeholder="CPU最高使用量"
></el-input-number> ></el-input-number>
<div class="input_right">核</div> <div class="input_right">核</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item <el-form-item
prop="perCPU" prop="perCPU"
class="form_item input_has_left_right" class="form_item input_has_left_right"
...@@ -203,15 +195,18 @@ ...@@ -203,15 +195,18 @@
controls-position="right" controls-position="right"
:min="0" :min="0"
:max="10" :max="10"
placeholder="请选择CPU默认使用量" placeholder="CPU默认使用量"
></el-input-number> ></el-input-number>
<div class="input_right">核</div> <div class="input_right">核</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="24">
<div class="form_item_title">内存：</div>
</el-col>
<el-col :span="8">
<el-form-item <el-form-item
prop="perRAMs" prop="perRAMs"
class="form_item input_has_left_right" class="form_item input_has_left_right nobottom"
> >
<div class="input_left">最高</div> <div class="input_left">最高</div>
<el-input-number <el-input-number
...@@ -219,15 +214,15 @@ ...@@ -219,15 +214,15 @@
controls-position="right" controls-position="right"
:min="0" :min="0"
:max="10" :max="10"
placeholder="请选择内存最高使用量" placeholder="内存最高使用量"
></el-input-number> ></el-input-number>
<div class="input_right">GB</div> <div class="input_right">GB</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item <el-form-item
prop="perRAM" prop="perRAM"
class="form_item input_has_left_right" class="form_item input_has_left_right nobottom"
> >
<div class="input_left">默认</div> <div class="input_left">默认</div>
<el-input-number <el-input-number
...@@ -235,7 +230,7 @@ ...@@ -235,7 +230,7 @@
controls-position="right" controls-position="right"
:min="0" :min="0"
:max="10" :max="10"
placeholder="请选择内存默认使用量" placeholder="内存默认使用量"
></el-input-number> ></el-input-number>
<div class="input_right">GB</div> <div class="input_right">GB</div>
</el-form-item> </el-form-item>
...@@ -243,7 +238,7 @@ ...@@ -243,7 +238,7 @@
<el-col :span="24"> <el-col :span="24">
<div class="form_title">其他信息</div> <div class="form_title">其他信息</div>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="16">
<el-form-item <el-form-item
prop="appDuration" prop="appDuration"
class="form_item input_has_right" class="form_item input_has_right"
...@@ -291,12 +286,10 @@ ...@@ -291,12 +286,10 @@
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
</el-col>
</el-row>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="调整现有工作区域" name="1"> <el-tab-pane label="调整现有工作区域" name="1">
<el-row> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="16">
<div class="select_title">选择要进行调整的工作区域：</div> <div class="select_title">选择要进行调整的工作区域：</div>
<div class="form_item"> <div class="form_item">
<el-select <el-select
...@@ -315,10 +308,8 @@ ...@@ -315,10 +308,8 @@
</el-col> </el-col>
</el-row> </el-row>
<div v-show="formShow"> <div v-show="formShow">
<el-row>
<el-col :span="24">
<el-form ref="formOld" :model="formOld" :rules="ruleOld"> <el-form ref="formOld" :model="formOld" :rules="ruleOld">
<el-row> <el-row :gutter="24">
<el-col :span="24"> <el-col :span="24">
<div class="form_title">工作区域规格调整</div> <div class="form_title">工作区域规格调整</div>
</el-col> </el-col>
...@@ -351,11 +342,8 @@ ...@@ -351,11 +342,8 @@
</div> </div>
</div> </div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item <el-form-item prop="cpu" class="form_item input_has_right">
prop="cpu"
class="form_item input_has_right"
>
<div class="form_item_title">申请CPU调整为：</div> <div class="form_item_title">申请CPU调整为：</div>
<el-select <el-select
v-model="formOld.cpu" v-model="formOld.cpu"
...@@ -371,11 +359,8 @@ ...@@ -371,11 +359,8 @@
<div class="input_right input_right_top">核</div> <div class="input_right input_right_top">核</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item <el-form-item prop="memory" class="form_item input_has_right">
prop="memory"
class="form_item input_has_right"
>
<div class="form_item_title">申请内存调整为：</div> <div class="form_item_title">申请内存调整为：</div>
<el-select <el-select
v-model="formOld.memory" v-model="formOld.memory"
...@@ -392,7 +377,7 @@ ...@@ -392,7 +377,7 @@
<div class="input_right input_right_top">GB</div> <div class="input_right input_right_top">GB</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item <el-form-item
prop="containerGroup" prop="containerGroup"
class="form_item input_has_right" class="form_item input_has_right"
...@@ -408,9 +393,9 @@ ...@@ -408,9 +393,9 @@
<div class="input_right">个</div> <div class="input_right">个</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" v-if="dataDiskList.length != 0"> <el-col :span="24" v-if="dataDiskList.length != 0">
<el-form-item class="form_item input_has_right"> <el-form-item class="form_item input_has_right">
<div class="form_item_title">调整数据盘：</div> <div class="form_item_title_1">调整数据盘：</div>
<table-um <table-um
ref="apply_service_state_table" ref="apply_service_state_table"
:headers="dataDiskHeaders" :headers="dataDiskHeaders"
...@@ -418,11 +403,13 @@ ...@@ -418,11 +403,13 @@
:datas="dataDiskList" :datas="dataDiskList"
@primary-del="delItem" @primary-del="delItem"
:maxheight="260" :maxheight="260"
size="small"
class="disk__table"
></table-um> ></table-um>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item class="form_item"> <el-form-item class="form_item nobottom">
<div class="form_item_title">增加数据盘：</div> <div class="form_item_title">增加数据盘：</div>
<!-- <el-select v-model="formOld.store_type" placeholder="请选择数据盘类型"> <!-- <el-select v-model="formOld.store_type" placeholder="请选择数据盘类型">
<el-option <el-option
...@@ -434,8 +421,8 @@ ...@@ -434,8 +421,8 @@
</el-select>--> </el-select>-->
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item class="form_item input_has_right"> <el-form-item class="form_item input_has_right nobottom">
<el-input-number <el-input-number
v-model="formOld.dataDisk" v-model="formOld.dataDisk"
controls-position="right" controls-position="right"
...@@ -446,8 +433,8 @@ ...@@ -446,8 +433,8 @@
<div class="input_right">块</div> <div class="input_right">块</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item class="form_item input_has_right"> <el-form-item class="form_item input_has_right nobottom">
<el-input-number <el-input-number
v-model="formOld.perDataDisk" v-model="formOld.perDataDisk"
controls-position="right" controls-position="right"
...@@ -481,8 +468,8 @@ ...@@ -481,8 +468,8 @@
最高&nbsp;{{ item.max }}&nbsp;{{ 最高&nbsp;{{ item.max }}&nbsp;{{
item.title == "CPU" ? "核" : "GB" item.title == "CPU" ? "核" : "GB"
}} }}
&nbsp;&nbsp;&nbsp;&nbsp;
</span> </span>
<br />
<span class="now_rqz_card_val"> <span class="now_rqz_card_val">
默认&nbsp;{{ item.default }}&nbsp;{{ 默认&nbsp;{{ item.default }}&nbsp;{{
item.title == "CPU" ? "核" : "GB" item.title == "CPU" ? "核" : "GB"
...@@ -492,13 +479,10 @@ ...@@ -492,13 +479,10 @@
</div> </div>
</div> </div>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="24">
<div class="form_item_title">CPU：</div> <div class="form_item_title">CPU：</div>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="8">
<div class="form_item_title">内存：</div>
</el-col>
<el-col :span="6">
<el-form-item <el-form-item
prop="perCPUs" prop="perCPUs"
class="form_item input_has_left_right" class="form_item input_has_left_right"
...@@ -514,7 +498,7 @@ ...@@ -514,7 +498,7 @@
<div class="input_right">核</div> <div class="input_right">核</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item <el-form-item
prop="perCPU" prop="perCPU"
class="form_item input_has_left_right" class="form_item input_has_left_right"
...@@ -530,10 +514,13 @@ ...@@ -530,10 +514,13 @@
<div class="input_right">核</div> <div class="input_right">核</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="24">
<div class="form_item_title">内存：</div>
</el-col>
<el-col :span="8">
<el-form-item <el-form-item
prop="perRAMs" prop="perRAMs"
class="form_item input_has_left_right" class="form_item input_has_left_right nobottom"
> >
<div class="input_left">最高</div> <div class="input_left">最高</div>
<el-input-number <el-input-number
...@@ -546,10 +533,10 @@ ...@@ -546,10 +533,10 @@
<div class="input_right">GB</div> <div class="input_right">GB</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item <el-form-item
prop="perRAM" prop="perRAM"
class="form_item input_has_left_right" class="form_item input_has_left_right nobottom"
> >
<div class="input_left">默认</div> <div class="input_left">默认</div>
<el-input-number <el-input-number
...@@ -564,6 +551,7 @@ ...@@ -564,6 +551,7 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<div class="form_title">其他信息</div> <div class="form_title">其他信息</div>
</el-col>
<el-col :span="24"> <el-col :span="24">
<div class="now_spec">当前规格：</div> <div class="now_spec">当前规格：</div>
<div class="now_spec_card_time"> <div class="now_spec_card_time">
...@@ -577,17 +565,14 @@ ...@@ -577,17 +565,14 @@
> >
<span class="now_spec_card_time_val"> <span class="now_spec_card_time_val">
{{ {{
helper.dateStringTransform( helper.dateStringTransform(paramsOld.cloud_end_time)
paramsOld.cloud_end_time
)
}} }}
</span> </span>
</div> </div>
</div> </div>
</el-col> </el-col>
</el-col> <el-col :span="16">
<el-col :span="12"> <el-form-item class="form_item input_has_right">
<el-form-item class="form_item input_has_right_select">
<div class="form_item_title">申请续期：</div> <div class="form_item_title">申请续期：</div>
<el-input-number <el-input-number
v-model="formOld.appDuration" v-model="formOld.appDuration"
...@@ -595,18 +580,7 @@ ...@@ -595,18 +580,7 @@
:min="1" :min="1"
:max="1000" :max="1000"
></el-input-number> ></el-input-number>
<el-select <div class="input_right">月</div>
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-form-item>
</el-col> </el-col>
<el-col :span="22"> <el-col :span="22">
...@@ -624,13 +598,12 @@ ...@@ -624,13 +598,12 @@
:readOnly="false" :readOnly="false"
:drag="true" :drag="true"
@getNewList="getNewListOld" @getNewList="getNewListOld"
class="up_f"
></upload-file> ></upload-file>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
</el-col>
</el-row>
</div> </div>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
...@@ -1254,7 +1227,7 @@ export default { ...@@ -1254,7 +1227,7 @@ export default {
}, },
], ],
}, },
activeName: "0", activeName: "1",
formNew: { formNew: {
namespace: "", namespace: "",
workplace: "", workplace: "",
...@@ -1849,8 +1822,9 @@ export default { ...@@ -1849,8 +1822,9 @@ export default {
} }
.form_title { .form_title {
font-size: 16px; font-size: 16px;
line-height: 16px;
font-weight: bold; font-weight: bold;
margin: 10px 0; margin: 32px 0 24px;
padding: 0 0 0 15px; padding: 0 0 0 15px;
position: relative; position: relative;
color: #58617a; color: #58617a;
...@@ -1863,14 +1837,22 @@ export default { ...@@ -1863,14 +1837,22 @@ export default {
background-color: #515fe7; background-color: #515fe7;
border-radius: 2px; border-radius: 2px;
left: 0; left: 0;
top: 2px; top: -1px;
} }
.form_item { .form_item {
width: calc(100% - 20px); width: calc(100%);
} }
.form_item_title { .form_item_title {
padding: 0 15px; margin: 0 0 12px;
line-height: 40px; line-height: 14px;
font-size: 14px;
color: #58617a;
}
.form_item_title_1 {
margin: 0;
line-height: 14px;
font-size: 14px;
color: #58617a;
} }
.input_has_right { .input_has_right {
position: relative; position: relative;
...@@ -1883,7 +1865,7 @@ export default { ...@@ -1883,7 +1865,7 @@ export default {
background-color: #edeef4; background-color: #edeef4;
border: 1px #e3e5ef solid; border: 1px #e3e5ef solid;
color: #8890a7; color: #8890a7;
border-radius: 0 8px 8px 0; border-radius: 0 6px 6px 0;
position: absolute; position: absolute;
right: 0; right: 0;
} }
...@@ -1898,7 +1880,7 @@ export default { ...@@ -1898,7 +1880,7 @@ export default {
background-color: #edeef4; background-color: #edeef4;
border: 1px #e3e5ef solid; border: 1px #e3e5ef solid;
color: #8890a7; color: #8890a7;
border-radius: 8px 0 0 8px; border-radius: 6px 0 0 6px;
position: absolute; position: absolute;
left: 0; left: 0;
} }
...@@ -1910,26 +1892,28 @@ export default { ...@@ -1910,26 +1892,28 @@ export default {
right: 0; right: 0;
} }
.select_title { .select_title {
padding: 20px 15px; padding: 32px 0 12px;
font-size: 16px; font-size: 16px;
line-height: 16px;
font-weight: bold; font-weight: bold;
color: #242c43; color: #58617a;
} }
.now_spec { .now_spec {
padding: 10px 15px; padding: 0 0 12px;
} }
.now_spec_cards { .now_spec_cards {
margin-bottom: 24px;
} }
.now_spec_card { .now_spec_card {
display: inline-block; display: inline-block;
width: 165px; width: 194px;
height: 50px; height: 40px;
background-color: #f7f8f9; background-color: #f7f8f9;
border-radius: 8px; border-radius: 6px;
line-height: 50px; line-height: 40px;
padding: 0 20px; padding: 0 20px;
position: relative; position: relative;
margin-right: 20px; margin-right: 24px;
} }
.now_spec_card_title { .now_spec_card_title {
color: #6573ae; color: #6573ae;
...@@ -1943,15 +1927,15 @@ export default { ...@@ -1943,15 +1927,15 @@ export default {
} }
.now_spec_card_img { .now_spec_card_img {
position: relative; position: relative;
top: 2px; top: 1px;
} }
.now_rqz_card { .now_rqz_card {
display: inline-block; display: inline-block;
width: 193px; width: 304px;
height: 78px; height: 40px;
background-color: #f7f8f9; background-color: #f7f8f9;
border-radius: 8px; border-radius: 6px;
line-height: 78px; line-height: 40px;
padding: 0 20px; padding: 0 20px;
position: relative; position: relative;
margin-right: 20px; margin-right: 20px;
...@@ -1963,28 +1947,29 @@ export default { ...@@ -1963,28 +1947,29 @@ export default {
.now_rqz_card_val_div { .now_rqz_card_val_div {
color: #0d1847; color: #0d1847;
position: absolute; position: absolute;
line-height: 30px; line-height: 40px;
right: 20px; right: 20px;
top: 9px; top: 0;
} }
.now_rqz_card_val { .now_rqz_card_val {
} }
.now_rqz_card_img { .now_rqz_card_img {
position: relative; position: relative;
top: 2px; top: 1px;
} }
.now_spec_card_time { .now_spec_card_time {
width: 381px; width: 381px;
height: 50px; height: 40px;
background-color: #f7f8f9; background-color: #f7f8f9;
border-radius: 8px; border-radius: 6px;
line-height: 50px; line-height: 40px;
padding: 0 20px; padding: 0 20px;
position: relative; position: relative;
margin-bottom: 24px;
} }
.now_spec_card_time_img { .now_spec_card_time_img {
position: relative; position: relative;
top: 2px; top: 1px;
} }
.now_spec_card_time_title { .now_spec_card_time_title {
color: #6573ae; color: #6573ae;
...@@ -2070,7 +2055,7 @@ export default { ...@@ -2070,7 +2055,7 @@ export default {
margin-right: 20px; margin-right: 20px;
} }
.doc_template { .doc_template {
margin: 0 0 10px 20px; margin: 0 0 12px;
} }
.up_f { .up_f {
width: calc(50% - 10px); width: calc(50% - 10px);
...@@ -2204,6 +2189,9 @@ export default { ...@@ -2204,6 +2189,9 @@ export default {
.clear_xxx { .clear_xxx {
clear: both; clear: both;
} }
.disk__table {
margin-bottom: 0;
}
</style> </style>
<style> <style>
.form_block .el-input .el-input__inner { .form_block .el-input .el-input__inner {
...@@ -2225,7 +2213,7 @@ export default { ...@@ -2225,7 +2213,7 @@ export default {
color: #242c43; color: #242c43;
} }
.cloud_form .input_right_top { .cloud_form .input_right_top {
top: 40px; top: 26px;
} }
.cloud_form .el-select { .cloud_form .el-select {
width: 100%; width: 100%;
...@@ -2253,17 +2241,20 @@ export default { ...@@ -2253,17 +2241,20 @@ export default {
} }
.cloud_form .el-textarea .el-textarea__inner { .cloud_form .el-textarea .el-textarea__inner {
background-color: #f7f8f9; background-color: #f7f8f9;
border-radius: 8px; border-radius: 6px;
color: #242c43; color: #242c43;
} }
.form_item .el-form-item__content { .form_item .el-form-item__content {
width: 100%; width: 100%;
} }
.form_item.el-form-item { .form_item.el-form-item {
margin-bottom: 12px; margin-bottom: 24px;
}
.form_item.el-form-item.nobottom {
margin-bottom: 0;
} }
.input_has_right .el-input__inner { .input_has_right .el-input__inner {
border-radius: 8px 0 0 8px; border-radius: 6px 0 0 6px;
color: #242c43; color: #242c43;
} }
.cloud_form .input_has_right_select .el-input-number { .cloud_form .input_has_right_select .el-input-number {
...@@ -2279,20 +2270,20 @@ export default { ...@@ -2279,20 +2270,20 @@ export default {
border-color: #0f2683; border-color: #0f2683;
} }
.input_has_right_select .el-input__inner { .input_has_right_select .el-input__inner {
border-radius: 8px 0 0 8px; border-radius: 6px 0 0 6px;
color: #242c43; color: #242c43;
} }
.input_has_right_select .input_right_select.el-select .el-input { .input_has_right_select .input_right_select.el-select .el-input {
width: 100px; width: 100px;
background-color: #0f2683; background-color: #0f2683;
color: #ffffff; color: #ffffff;
border-radius: 0 8px 8px 0; border-radius: 0 6px 6px 0;
} }
.input_has_right_select .input_has_right_select
.input_right_select.el-select .input_right_select.el-select
.el-input .el-input
.el-input__inner { .el-input__inner {
border-radius: 0 8px 8px 0; border-radius: 0 6px 6px 0;
color: #ffffff; color: #ffffff;
} }
.input_right_select .el-input .el-input__inner { .input_right_select .el-input .el-input__inner {
...@@ -2303,7 +2294,7 @@ export default { ...@@ -2303,7 +2294,7 @@ export default {
.cloud_form .el-input-number .el-input-number__decrease { .cloud_form .el-input-number .el-input-number__decrease {
border-bottom: 0; border-bottom: 0;
border-left: 0; border-left: 0;
width: 40px; width: 29px;
} }
.cloud_dia .el-dialog__header { .cloud_dia .el-dialog__header {
border-bottom: 1px solid #edf0ff; border-bottom: 1px solid #edf0ff;
...@@ -2318,10 +2309,11 @@ export default { ...@@ -2318,10 +2309,11 @@ export default {
.cloud_form .el-input__prefix, .cloud_form .el-input__prefix,
.el-input__suffix { .el-input__suffix {
text-align: right; text-align: right;
right: 2px;
} }
.cloud_form .el-input-number.is-controls-right .el-input__inner { .cloud_form .el-input-number.is-controls-right .el-input__inner {
padding-left: 15px; padding-left: 15px;
padding-right: 40px; padding-right: 32px;
} }
.up_f .el-upload { .up_f .el-upload {
width: 100%; width: 100%;
...@@ -2329,4 +2321,7 @@ export default { ...@@ -2329,4 +2321,7 @@ export default {
.up_f .el-upload-dragger { .up_f .el-upload-dragger {
width: 100%; width: 100%;
} }
.shop_cloud .el-tabs__header {
margin: 0;
}
</style> </style>
src/pages/service_shop/shop_cloud.vue
View file @ 6ef70bf8
<template> <template>
<div> <div class="shop_list_cont">
<el-container> <el-container>
<el-aside width="180px"> <el-aside width="176px">
<service-shop-menu></service-shop-menu> <service-shop-menu></service-shop-menu>
</el-aside> </el-aside>
<el-main> <el-main class="main_init">
<shop-cloud name="云资源服务"></shop-cloud> <shop-cloud name="云资源服务"></shop-cloud>
</el-main> </el-main>
</el-container> </el-container>
...@@ -25,4 +25,12 @@ export default { ...@@ -25,4 +25,12 @@ export default {
}; };
</script> </script>
<style scoped> <style scoped>
.shop_list_cont {
width: 1200px;
margin: 0 auto;
position: relative;
}
.main_init {
padding: 2px 0 16px 16px;
}
</style> </style>
\ No newline at end of file
src/pages/workbench/fwzc_fwcs.vue
View file @ 6ef70bf8
...@@ -417,14 +417,16 @@ ...@@ -417,14 +417,16 @@
class="reset" class="reset"
v-if="activeBtn == 0 && resSuccess" v-if="activeBtn == 0 && resSuccess"
@click="resetSjfw" @click="resetSjfw"
>重置</el-button
> >
重置
</el-button>
<el-button <el-button
:disabled="!resSuccess" :disabled="!resSuccess"
:class="resSuccess ? 'next' : ''" :class="resSuccess ? 'next' : ''"
@click="nextJcxx" @click="nextJcxx"
>下一步</el-button
> >
下一步
</el-button>
</div> </div>
</block-radius> </block-radius>
<div v-if="activeBtn == 4 && zhyyVal == 24"> <div v-if="activeBtn == 4 && zhyyVal == 24">
...@@ -1058,7 +1060,7 @@ export default { ...@@ -1058,7 +1060,7 @@ export default {
this.jkwds = []; this.jkwds = [];
}, },
getUrl(enUrl) { getUrl(enUrl) {
enUrl = enUrl.replace(/\s*/g,""); enUrl = enUrl.replace(/\s*/g, "");
let url = decodeURI(enUrl); let url = decodeURI(enUrl);
let arr = []; let arr = [];
if (url.indexOf("?") != -1) { if (url.indexOf("?") != -1) {
...@@ -1227,6 +1229,15 @@ export default { ...@@ -1227,6 +1229,15 @@ export default {
) { ) {
if (this.jkwds.length == 0) { if (this.jkwds.length == 0) {
this.$message.error("请上传接口文档"); this.$message.error("请上传接口文档");
} else {
if (
this.activeBtn == 2 ||
(this.activeBtn == 4 && this.zhyyVal == 22)
) {
this.request_fields = [];
this.response_fields = [];
this.jcxxtx = true;
this.getOrganization();
} else { } else {
let requestData = this.$refs.fwcs_sjfw_qqcs.getTableData(); let requestData = this.$refs.fwcs_sjfw_qqcs.getTableData();
let responseData = this.$refs.fwcs_sjfw_fhcs.getTableData(); let responseData = this.$refs.fwcs_sjfw_fhcs.getTableData();
...@@ -1245,6 +1256,7 @@ export default { ...@@ -1245,6 +1256,7 @@ export default {
this.$message.error("请完善返回参数信息中的字段名称"); this.$message.error("请完善返回参数信息中的字段名称");
} }
} }
}
} else { } else {
let requestData = this.$refs.fwcs_sjfw_qqcs.getTableData(); let requestData = this.$refs.fwcs_sjfw_qqcs.getTableData();
let responseData = this.$refs.fwcs_sjfw_fhcs.getTableData(); let responseData = this.$refs.fwcs_sjfw_fhcs.getTableData();
...@@ -1865,7 +1877,7 @@ export default { ...@@ -1865,7 +1877,7 @@ export default {
}); });
}, },
getUrlOne(enUrl, indexOne) { getUrlOne(enUrl, indexOne) {
enUrl = enUrl.replace(/\s*/g,""); enUrl = enUrl.replace(/\s*/g, "");
let url = decodeURI(enUrl); let url = decodeURI(enUrl);
let arr = []; let arr = [];
if (url.indexOf("?") != -1) { if (url.indexOf("?") != -1) {
......
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