Skip to content

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

fix-table,云资源样式，购物车，菜单

parent e515b59c
Hide whitespace changes
Inline Side-by-side
Showing with 623 additions and 603 deletions
src/components/shop-cloud/shop-cloud.vue
View file @ 0432854f
......@@ -7,19 +7,19 @@
<block-radius>
<el-form ref="form" :inline="true" :model="form" class="form_block">
<el-row>
<el-col :span="12">
<el-col :span="11">
<el-form-item class="form_item">
<div class="form_item_title">申请部门：</div>
<el-input v-model="form.department" placeholder="请输入申请部门"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="11" :offset="1">
<el-form-item class="form_item">
<div class="form_item_title">部门联系人：</div>
<el-input v-model="form.name" placeholder="请输入联系人姓名"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="11">
<el-form-item class="form_item">
<div class="form_item_title">联系电话：</div>
<el-input v-model="form.tel" placeholder="请输入联系人电话"></el-input>
......@@ -31,205 +31,213 @@
<block-radius>
<el-tabs v-model="activeName" class="cloud_form" @tab-click="tabClick">
<el-tab-pane label="申请新的工作区域" name="0">
<el-form ref="formNew" :model="formNew">
<el-row>
<el-col :span="24">
<div class="form_title">基本信息</div>
</el-col>
<el-col :span="18">
<el-form-item class="form_item">
<div class="form_item_title">工作区域名称：</div>
<el-input v-model="formNew.workAreaName" placeholder="请输入工作区域英文名称"></el-input>
</el-form-item>
</el-col>
<el-col :span="18">
<el-form-item class="form_item">
<div class="form_item_title">中文名称：</div>
<el-input v-model="formNew.cnName" placeholder="请输入工作区域中文名称"></el-input>
</el-form-item>
</el-col>
<el-col :span="18">
<el-form-item class="form_item">
<div class="form_item_title">描述信息：</div>
<el-input type="textarea" v-model="formNew.description" placeholder="请输入工作区域描述信息"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<div class="form_title">工作区域申请规格</div>
</el-col>
<el-col :span="18">
<el-form-item class="form_item input_has_right">
<div class="form_item_title">CPU：</div>
<el-select v-model="formNew.CPUs" placeholder="请选择CPU使用量">
<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>
</el-form-item>
</el-col>
<el-col :span="18">
<el-form-item class="form_item input_has_right">
<div class="form_item_title">内存：</div>
<el-select v-model="formNew.RAMs" placeholder="请选择内存使用量">
<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>
</el-form-item>
</el-col>
<el-col :span="18">
<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="10"
placeholder="取值范围[0，24]"
></el-input-number>
<div class="input_right">个</div>
</el-form-item>
</el-col>
<el-col :span="9">
<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"
:max="10"
placeholder="请选择数量"
></el-input-number>
<div class="input_right">块</div>
</el-form-item>
</el-col>
<el-col :span="9">
<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"
:max="10"
placeholder="请选择容量"
></el-input-number>
<div class="input_right">GB</div>
</el-form-item>
</el-col>
<el-col :span="24">
<div class="form_title">单个容器组规格</div>
</el-col>
<el-col :span="24">
<div class="form_item_title">CPU：</div>
</el-col>
<el-col :span="9">
<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>
<div class="input_right">核</div>
</el-form-item>
</el-col>
<el-col :span="9">
<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>
<div class="input_right">核</div>
</el-form-item>
</el-col>
<el-col :span="24">
<div class="form_item_title">内存：</div>
</el-col>
<el-col :span="9">
<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>
<div class="input_right">核</div>
</el-form-item>
</el-col>
<el-col :span="9">
<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>
<div class="input_right">核</div>
</el-form-item>
</el-col>
<el-col :span="24">
<div class="form_title">其他信息</div>
</el-col>
<el-col :span="18">
<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"
:max="10"
></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>
<el-col :span="18">
<el-form-item class="form_item">
<div class="form_item_title">申请文件：</div>
<upload-file
:multiple="false"
:max="1"
type="zip"
:readOnly="false"
:drag="true"
@getNewList="getNewList"
></upload-file>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-row>
<el-col :span="12">
<el-form ref="formNew" :model="formNew">
<el-row>
<el-col :span="24">
<div class="form_title">基本信息</div>
</el-col>
<el-col :span="22">
<el-form-item class="form_item">
<div class="form_item_title">工作区域名称：</div>
<el-input v-model="formNew.workAreaName" placeholder="请输入工作区域英文名称"></el-input>
</el-form-item>
</el-col>
<el-col :span="22">
<el-form-item class="form_item">
<div class="form_item_title">中文名称：</div>
<el-input v-model="formNew.cnName" placeholder="请输入工作区域中文名称"></el-input>
</el-form-item>
</el-col>
<el-col :span="22">
<el-form-item class="form_item">
<div class="form_item_title">描述信息：</div>
<el-input
type="textarea"
v-model="formNew.description"
placeholder="请输入工作区域描述信息"
></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<div class="form_title">工作区域申请规格</div>
</el-col>
<el-col :span="22">
<el-form-item class="form_item input_has_right">
<div class="form_item_title">CPU：</div>
<el-select v-model="formNew.CPUs" placeholder="请选择CPU使用量">
<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>
</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.RAMs" placeholder="请选择内存使用量">
<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>
</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="10"
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"
: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_right">
<div class="form_item_title">每块数据盘容量：</div>
<el-input-number
v-model="formNew.perDataDisk"
controls-position="right"
:min="0"
:max="10"
placeholder="请选择容量"
></el-input-number>
<div class="input_right">GB</div>
</el-form-item>
</el-col>
<el-col :span="24">
<div class="form_title">单个容器组规格</div>
</el-col>
<el-col :span="24">
<div class="form_item_title">CPU：</div>
</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.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>
<div class="input_right">核</div>
</el-form-item>
</el-col>
<el-col :span="24">
<div class="form_item_title">内存：</div>
</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.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>
<div class="input_right">核</div>
</el-form-item>
</el-col>
<el-col :span="24">
<div class="form_title">其他信息</div>
</el-col>
<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"
:max="10"
></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>
<el-col :span="22">
<el-form-item class="form_item">
<div class="form_item_title">申请文件：</div>
<upload-file
:multiple="false"
:max="1"
type="zip"
:readOnly="false"
:drag="true"
@getNewList="getNewList"
></upload-file>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-col>
</el-row>
</el-tab-pane>
<el-tab-pane label="升级现有工作区域" name="1">
<el-row>
<el-col :span="18">
<el-col :span="11">
<div class="select_title">选择要进行升级的工作区域：</div>
<div class="form_item">
<el-select v-model="workSpace" @change="getForm" placeholder="请选择">
......@@ -244,231 +252,239 @@
</el-col>
</el-row>
<div v-if="formShow">
<el-form ref="formNew" :model="formOld">
<el-row>
<el-col :span="24">
<div class="form_title">工作区域升级规格</div>
</el-col>
<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')"
/>
<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="18">
<el-form-item class="form_item input_has_right">
<div class="form_item_title">申请CPU升级至：</div>
<el-select v-model="formOld.CPUs" placeholder="请选择CPU使用量">
<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>
</el-form-item>
</el-col>
<el-col :span="18">
<el-form-item class="form_item input_has_right">
<div class="form_item_title">申请内存升级至：</div>
<el-select v-model="formOld.RAMs" placeholder="请选择内存使用量">
<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>
</el-form-item>
</el-col>
<el-col :span="18">
<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="10"
placeholder="取值范围[0，24]"
></el-input-number>
<div class="input_right">个</div>
</el-form-item>
</el-col>
<el-col :span="9">
<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"
:max="10"
></el-input-number>
<div class="input_right">块</div>
</el-form-item>
</el-col>
<el-col :span="9">
<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"
:max="10"
></el-input-number>
<div class="input_right">GB</div>
</el-form-item>
</el-col>
<el-col :span="24">
<div class="form_title">单个容器组规格设定</div>
</el-col>
<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')"
/>
<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>
<br />
<span
class="now_rqz_card_val"
>默认&nbsp;{{ item.default }}&nbsp;{{ item.title == "CPU" ? "核" : "GB" }}</span>
<el-row>
<el-col :span="12">
<el-form ref="formNew" :model="formOld">
<el-row>
<el-col :span="24">
<div class="form_title">工作区域升级规格</div>
</el-col>
<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')"
/>
<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>
</div>
</div>
</el-col>
<el-col :span="24">
<div class="form_item_title">CPU：</div>
</el-col>
<el-col :span="9">
<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>
<div class="input_right">核</div>
</el-form-item>
</el-col>
<el-col :span="9">
<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>
<div class="input_right">核</div>
</el-form-item>
</el-col>
<el-col :span="24">
<div class="form_item_title">内存：</div>
</el-col>
<el-col :span="9">
<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>
<div class="input_right">核</div>
</el-form-item>
</el-col>
<el-col :span="9">
<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>
<div class="input_right">核</div>
</el-form-item>
</el-col>
<el-col :span="24">
<div class="form_title">其他信息</div>
<el-col :span="24">
<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')"
/>
<span class="now_spec_card_time_title">当前工作区域到期时间</span>
<span class="now_spec_card_time_val">2020-05-05 08:00:00</span>
</el-col>
<el-col :span="22">
<el-form-item class="form_item input_has_right">
<div class="form_item_title">申请CPU升级至：</div>
<el-select v-model="formOld.CPUs" placeholder="请选择CPU使用量">
<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>
</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.RAMs" placeholder="请选择内存使用量">
<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>
</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="10"
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="formOld.dataDisk"
controls-position="right"
:min="0"
:max="10"
></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"
:max="10"
></el-input-number>
<div class="input_right">GB</div>
</el-form-item>
</el-col>
<el-col :span="24">
<div class="form_title">单个容器组规格设定</div>
</el-col>
<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')"
/>
<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>
<br />
<span
class="now_rqz_card_val"
>默认&nbsp;{{ item.default }}&nbsp;{{ item.title == "CPU" ? "核" : "GB" }}</span>
</div>
</div>
</div>
</div>
</el-col>
</el-col>
<el-col :span="18">
<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"
:max="10"
></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>
<el-col :span="18">
<el-form-item class="form_item">
<div class="form_item_title">申请文件：</div>
<upload-file
:multiple="false"
:max="1"
type="zip"
:readOnly="false"
:drag="true"
@getNewList="getNewListOld"
></upload-file>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-col>
<el-col :span="24">
<div class="form_item_title">CPU：</div>
</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.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>
<div class="input_right">核</div>
</el-form-item>
</el-col>
<el-col :span="24">
<div class="form_item_title">内存：</div>
</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.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>
<div class="input_right">核</div>
</el-form-item>
</el-col>
<el-col :span="24">
<div class="form_title">其他信息</div>
<el-col :span="24">
<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')"
/>
<span class="now_spec_card_time_title">当前工作区域到期时间</span>
<span class="now_spec_card_time_val">2020-05-05 08:00:00</span>
</div>
</div>
</el-col>
</el-col>
<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"
:max="10"
></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>
<el-col :span="22">
<el-form-item class="form_item">
<div class="form_item_title">申请文件：</div>
<upload-file
:multiple="false"
:max="1"
type="zip"
:readOnly="false"
:drag="true"
@getNewList="getNewListOld"
></upload-file>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-col>
</el-row>
</div>
</el-tab-pane>
</el-tabs>
......@@ -611,14 +627,14 @@ export default {
description: "",
CPUs: "",
RAMs: "",
containerGroup: "",
dataDisk: "",
perDataDisk: "",
perCPUs: "",
perCPU: "",
perRAMs: "",
perRAM: "",
appDuration: "",
containerGroup: undefined,
dataDisk: undefined,
perDataDisk: undefined,
perCPUs: undefined,
perCPU: undefined,
perRAMs: undefined,
perRAM: undefined,
appDuration: undefined,
durType: ""
},
durationOptions: [
......@@ -655,14 +671,14 @@ export default {
description: "",
CPUs: "",
RAMs: "",
containerGroup: "",
dataDisk: "",
perDataDisk: "",
perCPUs: "",
perCPU: "",
perRAMs: "",
perRAM: "",
appDuration: "",
containerGroup: undefined,
dataDisk: undefined,
perDataDisk: undefined,
perCPUs: undefined,
perCPU: undefined,
perRAMs: undefined,
perRAM: undefined,
appDuration: undefined,
durType: ""
},
dialogVisible: false
......@@ -676,7 +692,7 @@ export default {
if (val != "") {
this.formShow = true;
Object.keys(this.formOld).forEach(item => {
this.formOld[item] = "";
this.formOld[item] = undefined;
});
} else {
this.formShow = false;
......@@ -726,9 +742,6 @@ export default {
.form_item {
width: calc(100% - 20px);
}
.form_block .el-input {
width: 90%;
}
.form_item_title {
padding: 0 15px;
line-height: 40px;
......
src/components/shopping-cart/shopping-cart-com.vue
View file @ 0432854f
......@@ -73,44 +73,8 @@ export default {
props: {},
data: () => ({
checkShopAll: false,
checkList: [false, false, false],
list: [
{
id: 0,
name: "水路货物周转量情况",
type: "基础数据服务",
creator: "贵州省交通运输厅0",
state: 1,
mapService: 1,
num: 2,
checkedSubscription: false,
specification: 1,
specificationApplication: 2
},
{
id: 1,
name: "水路货物周转量情况水路货物周水路货物周转量情况水路货物周",
type: "基础数据服务",
creator: "贵州省交通运输厅1",
state: 1,
num: 2,
checkedSubscription: false,
specification: 1,
specificationApplication: 2
},
{
id: 2,
name: "水路货物周转量情况水路货物周水路货物周转量情况水路货物周",
type: "基础数据服务",
creator: "贵州省交通运输厅2",
state: 1,
mapService: 1,
num: 2,
checkedSubscription: true,
specification: 1,
specificationApplication: 2
}
]
checkList: [],
list: []
}),
mounted() {
this.getList();
......@@ -128,8 +92,12 @@ export default {
getList() {
this.$api.serviceShop.getShoppingCart().then(response => {
if (response.data.success == "1") {
console.log(response.data.data)
console.log(response.data.data);
this.list = response.data.data;
for (const index in this.list) {
this.checkList.push(false);
}
console.log(this.checkList);
} else {
console.log(response.data.message);
}
......@@ -141,6 +109,7 @@ export default {
changeState(val) {
console.log(val);
this.$set(this.checkList, val.index, val.state);
console.log(this.checkList);
if (this.checkList.indexOf(false) == -1) {
this.checkShopAll = true;
} else {
......
src/components/table-um.vue
View file @ 0432854f
......@@ -268,21 +268,12 @@ export default {
loading: { type: Boolean, default: false },
// 表格数据
headers: { type: Array, default: () => [] },
// 表格列配置
// tableData: { type: Array, default: () => [] },
// 是否显示表格复选框
isSelection: { type: Boolean, default: false },
defaultSelections: { type: [Array, Object], default: () => null },
// 是否显示表格索引
isIndex: { type: Boolean, default: false },
indexLabel: { type: String, default: "序号" },
// 是否显示分页
// isPagination: { type: Boolean, default: true },
// // 分页数据
// pagination: {
// type: Object,
// default: () => ({ pageSize: 10, pageNum: 1, total: 0 })
// },
searchShow: {
type: Boolean,
default: false
......@@ -368,11 +359,14 @@ export default {
getSelectBtn: {
type: Boolean,
default: false
},
params: {
type: Object,
default: () => {}
}
},
data() {
return {
all_url: "",
pagination: {
rowsPerPage: 10,
page: 1,
......@@ -424,6 +418,12 @@ export default {
this.getDataFromApiSync();
},
deep: true
},
params: {
handler(val) {
this.getDataFromApiSync();
},
deep: true
}
},
methods: {
......@@ -479,13 +479,20 @@ export default {
let total = newArr.length;
resolve({ newArr, total });
} else {
this.all_url = `/static/data.json`;
this.$http
.get(this.all_url)
let query = this.params;
query.Page = this.pagination.page;
query.Size = this.pagination.rowsPerPage;
let arr = this.url.split(".");
let obj = this.$api;
arr.forEach(item => {
obj = obj[item];
});
console.log(query);
obj(query)
.then(response => {
let newArr = response.data.data[this.url];
let newArr = response.data.data;
// if it is true url, total is response's total
let total = newArr.length;
let total = response.data.total;
resolve({ newArr, total });
})
.catch(function(response) {
......@@ -502,6 +509,7 @@ export default {
searchVal() {
if (this.times !== null) clearTimeout(this.times);
this.times = setTimeout(() => {
this.resetPageNumber();
this.getDataFromApiSync();
}, 500);
},
......@@ -651,9 +659,9 @@ export default {
let newRow = {};
let arr = this.headers;
arr.forEach(item => {
newRow[item.prop] = ""
})
newRow.flag = true //新增标记
newRow[item.prop] = "";
});
newRow.flag = true; //新增标记
newRow.id =
parseInt(Math.random() * 100000, 10) +
"" +
......@@ -665,6 +673,7 @@ export default {
return this.selectedTabsPage;
},
filterChange(filter) {
this.resetPageNumber();
console.log(filter);
},
// 上传文件事件
......@@ -695,6 +704,10 @@ export default {
self.changeUp(arr[i].children, id, input, header);
}
}
},
// 重置页码
resetPageNumber() {
this.pagination.page = 1;
}
}
};
......
src/pages/authority/menus.vue
View file @ 0432854f
......@@ -13,7 +13,7 @@
<div class="tree_station">
<el-tree
class="filter-tree"
node-key="id"
node-key="menu_id"
:expand-on-click-node="false"
@node-click="nodeClick"
:data="treeData"
......@@ -46,7 +46,11 @@
<button v-else class="btn btn_act2" @click="nodePosition(1)">
<i class="el-icon-bottom"></i>&nbsp;下移
</button>
<button v-if="mcHold&&ymHold" class="btn btn_act1" @click="saveNode()">
<button
v-if="mcHold&&ymHold"
class="btn btn_act1"
@click="saveNode()"
>
<i class="el-icon-check"></i>&nbsp;保存
</button>
<button v-else class="btn btn_dis">
......@@ -67,33 +71,33 @@
</div>
<div class="line"></div>
<el-form class="form_station" :model="formDetail" :rules="rules">
<el-form-item prop="menuName">
<el-form-item prop="menu_name">
<div class="form_item_title">菜单名称：</div>
<el-input v-model="formDetail.menu_name"></el-input>
</el-form-item>
<el-form-item prop="pageUrl">
<el-form-item prop="visit_url">
<div class="form_item_title">菜单访问地址：</div>
<el-input v-model="formDetail.visit_url"></el-input>
</el-form-item>
<el-form-item prop="describe">
<el-form-item prop="team_name">
<div class="form_item_title">菜单组别：</div>
<el-input v-model="formDetail.team_name"></el-input>
</el-form-item>
<el-form-item prop="describe">
<el-form-item prop="detail">
<div class="form_item_title">菜单描述：</div>
<el-input v-model="formDetail.detail"></el-input>
</el-form-item>
<el-form-item prop="describe">
<el-form-item prop="menu_order">
<div class="form_item_title">菜单排序：</div>
<el-input v-model="formDetail.sort" disabled></el-input>
<el-input v-model="formDetail.menu_order" disabled></el-input>
</el-form-item>
<el-form-item>
<div class="form_item_title">创建人：</div>
<el-input v-model="formDetail.founder" disabled></el-input>
<el-input v-model="formDetail.create_user" disabled></el-input>
</el-form-item>
<el-form-item>
<div class="form_item_title">创建时间：</div>
<el-input v-model="formDetail.createTime" disabled></el-input>
<el-input v-model="formDetail.create_date" disabled></el-input>
</el-form-item>
</el-form>
</div>
......@@ -107,121 +111,91 @@
export default {
data() {
var validateMenuName = (rule, value, callback) => {
if (value != this.formContrast.mcHold) {
if (value != this.formContrast.menu_name) {
this.reset = true;
}
console.log(value);
if (value == "") {
this.mcHold = false;
callback(new Error("请填写菜单名称"));
} else if (value.length > 8) {
this.mcHold = false;
callback(new Error("菜单名称不超过8位"));
} else {
this.mcHold = true;
callback();
}
};
var validatePageUrl = (rule, value, callback) => {
if (value != this.formContrast.pageUrl) {
if (value != this.formContrast.visit_url) {
this.reset = true;
}
if (value == "") {
this.ymHold = false;
callback(new Error("请填写运行页面"));
callback(new Error("请填写菜单访问地址"));
} else {
this.ymHold = true;
callback();
}
};
var validateDescribe = (rule, value, callback) => {
if (value != this.formContrast.describe) {
if (value != this.formContrast.detail) {
this.reset = true;
}
callback();
};
var validateTeamName = (rule, value, callback) => {
if (value != this.formContrast.team_name) {
this.reset = true;
}
callback();
};
var validateMenuOrder = (rule, value, callback) => {
if (value != this.formContrast.menu_order) {
this.reset = true;
}
callback();
};
return {
checkText: "",
treeData: [
{
id: 1,
label: "一级 2",
children: [
{
id: 3,
label: "二级 2-1",
children: [
{
id: 4,
label: "三级 3-1-1",
children: [
{
id: 5,
label: "三级 3-1-2",
disabled: true
}
]
},
{
id: 5,
label: "三级 3-1-2",
disabled: true
}
]
},
{
id: 2,
label: "二级 2-2",
disabled: true,
children: [
{
id: 6,
label: "三级 3-2-1"
},
{
id: 7,
label: "三级 3-2-2",
disabled: true
}
]
}
]
}
],
treeData: [],
defaultProps: {
children: "children",
label: "label"
children: "Child",
label: "menu_name"
},
formDetail: {
menu_name: "",
visit_url: "",
team_name: "",
detail: "",
sort: "",
creatTime: ""
menu_order: "",
create_user: "",
create_date: ""
},
formYs: {
menu_name: "",
visit_url: "",
team_name: "",
detail: "",
sort: "",
creatTime: ""
menu_order: "",
create_user: "",
create_date: ""
},
formContrast: {
menu_name: "",
visit_url: "",
team_name: "",
detail: "",
sort: "",
creatTime: ""
menu_order: "",
create_user: "",
create_date: ""
},
rules: {
menuName: [
{ required: true, message: "请填写菜单名称", trigger: "blur" },
{ validator: validateMenuName, trigger: "blur" }
],
pageUrl: [
{ required: true, message: "请填写运行页面", trigger: "blur" },
{ validator: validatePageUrl, trigger: "blur" }
],
describe: [{ validator: validateDescribe, trigger: "blur" }]
menu_name: [{ validator: validateMenuName, trigger: "blur" }],
visit_url: [{ validator: validatePageUrl, trigger: "blur" }],
team_name: [{ validator: validateTeamName, trigger: "blur" }],
detail: [{ validator: validateDescribe, trigger: "blur" }],
menu_order: [{ validator: validateMenuOrder, trigger: "blur" }]
},
nodeId: "",
previousSibling: false,
......@@ -238,7 +212,7 @@ export default {
}
},
mounted() {
// this.getTree();
this.getTree();
},
methods: {
checkNode(value, data) {
......@@ -246,7 +220,7 @@ export default {
return data.label.indexOf(value) !== -1;
},
nodeClick(data, node) {
this.nodeId = data.id;
this.nodeId = data.menu_id;
if (node.previousSibling != undefined) {
this.previousSibling = true;
} else {
......@@ -257,7 +231,7 @@ export default {
} else {
this.nextSibling = false;
}
let cid = String(data.id);
let cid = String(data.menu_id);
if (cid.indexOf("new") > -1) {
this.formDetail = this.formYs;
} else {
......@@ -268,23 +242,31 @@ export default {
if (response.data.success == 1) {
this.formDetail = response.data.data;
this.formContrast = response.data.data;
callback();
} else {
this.ruleFormIcon.username = false;
callback(new Error(response.data.errMsg));
this.message({
message: response.data.errMsg,
type: "error"
});
}
});
}
},
appendNode() {
let newChild = { id: "new" + this.newI, label: "新菜单", children: [] };
let newChild = {
menu_id: "new" + this.newI,
menu_name: "新菜单",
Child: []
};
this.newI++;
let data = this.nodeData;
this.$refs.tree.append(newChild, this.nodeId);
this.$refs.tree.setCurrentKey(newChild.id);
let node = this.$refs.tree.getNode(newChild.id);
this.$refs.tree.setCurrentKey(newChild.menu_id);
let node = this.$refs.tree.getNode(newChild.menu_id);
console.log(node);
this.nodeClick(newChild, node);
this.formDetail.sort = node.parent.childNodes.length;
this.formDetail.menu_order = node.parent.childNodes.length;
this.formDetail.menu_name = newChild.menu_name;
this.mcHold = true;
},
resetForm() {
this.formDetail = this.formContrast;
......@@ -292,7 +274,7 @@ export default {
getTree() {
this.$api.authority.getMenuList().then(response => {
console.log(response);
this.treeData = response.data.spec;
this.treeData = response.data.data;
});
},
saveNode() {
......@@ -304,13 +286,34 @@ export default {
visit_url: this.formDetail.visit_url,
team_name: this.formDetail.team_name
};
this.$api.authority.editMenu(query).then(response => {
if (response.data.success == 1) {
this.getTree();
} else {
console.log(response.data.errMsg);
}
});
if (this.nodeId.substring(0, 3) == "new") {
let node = this.$refs.tree.getNode(this.nodeId);
console.log(node.parent);
query.parent_id = node.parent.data.menu_id;
this.$api.authority.addMenu(query).then(response => {
if (response.data.success == 1) {
this.message({
message: "插入菜单成功",
type: "success"
});
this.getTree();
} else {
console.log(response.data.errMsg);
}
});
} else {
this.$api.authority.editMenu(query).then(response => {
if (response.data.success == 1) {
this.message({
message: "修改菜单成功",
type: "success"
});
this.getTree();
} else {
console.log(response.data.errMsg);
}
});
}
},
deleteNode() {
let params = {
......@@ -318,6 +321,10 @@ export default {
};
this.$api.authority.delMenu(params).then(response => {
if (response.data.success == 1) {
this.message({
message: "删除菜单成功",
type: "success"
});
this.getTree();
} else {
console.log(response.data.errMsg);
......@@ -334,12 +341,12 @@ export default {
let params = {
data: [
{
id: node.data.id,
sort: nodeNext.data.sort
id: node.data.menu_id,
sort: nodeNext.data.menu_order
},
{
id: nodeNext.data.id,
sort: node.data.sort
id: nodeNext.data.menu_id,
sort: node.data.menu_order
}
]
};
......
src/pages/example/example_table.vue
View file @ 0432854f
......@@ -7,7 +7,7 @@
size="mini"
:border="false"
:headers="headers"
url="tableData"
url="serviceShop.getServiceShopList"
:searchShow="true"
:addRowBtn="addRowBtn"
:autoAdd="false"
......@@ -24,6 +24,7 @@
:pageSizeShow="true"
:filterList="filterList"
cellClassName="cell_width"
:params="params"
></ces-table>
<h3>可编辑表格，供服务测试用</h3>
<ces-table
......@@ -31,7 +32,7 @@
size="mini"
:border="true"
:headers="headers1"
url="tableData"
url="serviceShop.getServiceShopList"
:searchShow="false"
:addRowBtn="false"
:autoAdd="true"
......@@ -46,6 +47,7 @@
:stripe="false"
:paginationShow="false"
:pageSizeShow="false"
:params="params"
></ces-table>
<h3>带树结构表格，供服务测试用</h3>
<ces-table
......@@ -53,7 +55,7 @@
size="mini"
:border="true"
:headers="headers2"
url="tableData1"
url="serviceShop.getServiceShopList"
:searchShow="false"
:addRowBtn="true"
:autoAdd="false"
......@@ -69,6 +71,7 @@
:pageSizeShow="false"
headerCellClassName="th_pink"
:getSelectBtn="true"
:params="params"
></ces-table>
</div>
</template>
......@@ -118,7 +121,13 @@ export default {
],
headers1: [
{ label: "服务url", prop: "date", type: "input", align: "left" },
{ label: "服务名称", prop: "ssss", type: "upload", align: "center", uploadKey: "type" },
{
label: "服务名称",
prop: "ssss",
type: "upload",
align: "center",
uploadKey: "type"
},
{
label: "文件类型",
prop: "type",
......@@ -169,7 +178,16 @@ export default {
prop: "fwzt",
data: ["数据服务", "时空服务", "视频服务", "感知服务", "综合服务"]
}
]
],
params: {
serviceName: 1,
serviceType1: 1,
serviceType2s: 1,
serviceType3s: 1,
dataDomains: 1,
organizeIds: 1,
orderBy: 1,
}
}),
components: {
cesTable
......
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