Skip to content

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

Merge branch 'ldx' into dev

parents 61618199 ce4c8d29
Hide whitespace changes
Inline Side-by-side
Showing with 1538 additions and 189 deletions
src/components/codes.vue
View file @ 8755cec3
...@@ -69,15 +69,15 @@ export default { ...@@ -69,15 +69,15 @@ export default {
} }
</style> </style>
<style> <style>
.ace-container /deep/ .ace-editor { .ace-container .ace-editor {
width: 100% !important; width: 100% !important;
height: 430px !important; height: 430px !important;
} }
.ace-container /deep/ .ace_content { .ace-container .ace_content {
/* width: 100% !important; */ /* width: 100% !important; */
height: 430px !important; height: 430px !important;
} }
.ace-container /deep/ .ace_text-layer { .ace-container .ace_text-layer {
/* width: 100% !important; */ /* width: 100% !important; */
word-break: break-all; word-break: break-all;
/* background:yellowgreen; */ /* background:yellowgreen; */
......
src/components/order-list/order-list-cell.vue
View file @ 8755cec3
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
v-model="textarea" v-model="textarea"
maxlength="200" maxlength="200"
show-word-limit show-word-limit
:autosize="{ minRows: 4, maxRows: 10 }" :autosize="{ minRows: 6, maxRows: 10 }"
></el-input> ></el-input>
</div> </div>
<div class="pop_btn_group"> <div class="pop_btn_group">
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
</el-col> </el-col>
<el-col :span="4" class="cell_option"> <el-col :span="4" class="cell_option">
<div> <div>
<el-button size="madium" class="cell_option_btn">查看详情</el-button> <el-button size="madium" class="cell_option_btn" @click="viewDetail(cellItem.id)">查看详情</el-button>
<div class="cell_option_spec">再次申请</div> <div class="cell_option_spec">再次申请</div>
</div> </div>
</el-col> </el-col>
...@@ -128,6 +128,9 @@ export default { ...@@ -128,6 +128,9 @@ export default {
addEvaluation() { addEvaluation() {
console.log(this.serviceRate, this.textarea); console.log(this.serviceRate, this.textarea);
this.visible = false; this.visible = false;
},
viewDetail(val) {
this.$router.push("/user/order_detail/" + val)
} }
} }
}; };
......
src/components/order-list/order-list-com.vue
View file @ 8755cec3
...@@ -223,7 +223,7 @@ export default { ...@@ -223,7 +223,7 @@ export default {
padding: 17px 10px; padding: 17px 10px;
} }
.btn_actice { .btn_actice {
background-color: blue; background-color: #515fe7;
color: #fff; color: #fff;
} }
.input_right { .input_right {
......
src/components/shop-cloud/shop-cloud.vue
View file @ 8755cec3
...@@ -5,181 +5,585 @@ ...@@ -5,181 +5,585 @@
<el-breadcrumb-item>{{ name }}</el-breadcrumb-item> <el-breadcrumb-item>{{ name }}</el-breadcrumb-item>
</el-breadcrumb> </el-breadcrumb>
<block-radius> <block-radius>
<el-form ref="form" :inline="true" :model="form" label-width="100px"> <el-form ref="form" :inline="true" :model="form" class="form_block">
<el-form-item label="申请部门"> <el-row>
<el-input v-model="form.department"></el-input> <el-col :span="12">
</el-form-item> <el-form-item class="form_item">
<el-form-item label="部门联系人"> <div class="form_item_title">申请部门：</div>
<el-input v-model="form.name"></el-input> <el-input v-model="form.department" placeholder="请输入申请部门"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="联系电话"> </el-col>
<el-input v-model="form.tel"></el-input> <el-col :span="12">
</el-form-item> <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-form-item class="form_item">
<div class="form_item_title">联系电话：</div>
<el-input v-model="form.tel" placeholder="请输入联系人电话"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
</block-radius> </block-radius>
<block-radius> <block-radius>
<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-form ref="formNew" :model="formNew" label-width="120px"> <el-form ref="formNew" :model="formNew">
<div class="form_title">基本信息</div> <el-row>
<el-form-item label="工作区域名称"> <el-col :span="24">
<el-input v-model="formNew.workAreaName"></el-input> <div class="form_title">基本信息</div>
</el-form-item> </el-col>
<el-form-item label="中文名称"> <el-col :span="18">
<el-input v-model="formNew.cnName"></el-input> <el-form-item class="form_item">
</el-form-item> <div class="form_item_title">工作区域名称：</div>
<el-form-item label="描述信息"> <el-input v-model="formNew.workAreaName" placeholder="请输入工作区域英文名称"></el-input>
<el-input type="textarea" v-model="formNew.description"></el-input> </el-form-item>
</el-form-item> </el-col>
<div class="form_title">工作区域申请规格</div> <el-col :span="18">
<el-form-item label="CPU"> <el-form-item class="form_item">
<el-input v-model="formNew.CPUs"></el-input> <div class="form_item_title">中文名称：</div>
</el-form-item> <el-input v-model="formNew.cnName" placeholder="请输入工作区域中文名称"></el-input>
<el-form-item label="内存"> </el-form-item>
<el-input v-model="formNew.RAMs"></el-input> </el-col>
</el-form-item> <el-col :span="18">
<el-form-item label="容器组"> <el-form-item class="form_item">
<el-input type="textarea" v-model="formNew.containerGroup"></el-input> <div class="form_item_title">描述信息：</div>
</el-form-item> <el-input type="textarea" v-model="formNew.description" placeholder="请输入工作区域描述信息"></el-input>
<el-form-item label="数据盘（可选）"> </el-form-item>
<el-input-number v-model="formNew.dataDisk" controls-position="right" @change="handleChange" :min="1" :max="10"></el-input-number>块，每块 </el-col>
<el-input-number <el-col :span="24">
v-model="formNew.perDataDisk" <div class="form_title">工作区域申请规格</div>
controls-position="right" </el-col>
@change="handleChange" <el-col :span="18">
:min="1" <el-form-item class="form_item input_has_right">
:max="10" <div class="form_item_title">CPU：</div>
></el-input-number>GB <el-select v-model="formNew.CPUs" placeholder="请选择CPU使用量">
</el-form-item> <el-option
<div class="form_title">单个容器组规格</div> v-for="item in optionsCPU"
<div>CPU</div> :key="item.value"
<el-form-item label="最高"> :label="item.label"
<el-input v-model="formNew.perCPUs"></el-input>核 :value="item.value"
</el-form-item> ></el-option>
<el-form-item label="默认"> </el-select>
<el-input v-model="formNew.perCPU"></el-input>核 <div class="input_right">核</div>
</el-form-item> </el-form-item>
<div>内存</div> </el-col>
<el-form-item label="最高"> <el-col :span="18">
<el-input v-model="formNew.perRAMs"></el-input>GB <el-form-item class="form_item input_has_right">
</el-form-item> <div class="form_item_title">内存：</div>
<el-form-item label="默认"> <el-select v-model="formNew.RAMs" placeholder="请选择内存使用量">
<el-input v-model="formNew.perRAM"></el-input>GB <el-option
</el-form-item> v-for="item in optionsRAM"
<div class="form_title">其他信息</div> :key="item.value"
<el-form-item label="申请时长"> :label="item.label"
<el-input v-model="formNew.appDuration"></el-input> :value="item.value"
<el-select v-model="formNew.durType" placeholder="请选择"> ></el-option>
<el-option </el-select>
v-for="item in durationOptions" <div class="input_right">GB</div>
:key="item.value" </el-form-item>
:label="item.label" </el-col>
:value="item.value" <el-col :span="18">
></el-option> <el-form-item class="form_item input_has_right">
</el-select> <div class="form_item_title">容器组：</div>
</el-form-item> <el-input-number
<el-form-item label="申请文件"> v-model="formNew.containerGroup"
<upload-file controls-position="right"
:multiple="false" :min="1"
:max="1" :max="10"
type="zip" placeholder="取值范围[0，24]"
:readOnly="false" ></el-input-number>
:drag="true" <div class="input_right">个</div>
@getNewList="getNewList" </el-form-item>
></upload-file> </el-col>
</el-form-item> <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="1"
: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="1"
: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="1"
: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="1"
: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="1"
: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="1"
: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="1"
: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-form>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="升级现有工作区域" name="1"> <el-tab-pane label="升级现有工作区域" name="1">
选择要进行升级的工作区域 <el-row>
<el-select v-model="workSpace" @change="getForm" placeholder="请选择"> <el-col :span="18">
<el-option <div class="select_title">选择要进行升级的工作区域：</div>
v-for="item in workSpaceOptions" <div class="form_item">
:key="item.value" <el-select v-model="workSpace" @change="getForm" placeholder="请选择">
:label="item.label"
:value="item.value"
></el-option>
</el-select>
<div v-if="formShow">
<el-form ref="formNew" :model="formNew" label-width="120px">
<div class="form_title">基本信息</div>
<el-form-item label="工作区域名称">
<el-input v-model="formNew.workAreaName"></el-input>
</el-form-item>
<el-form-item label="中文名称">
<el-input v-model="formNew.cnName"></el-input>
</el-form-item>
<el-form-item label="描述信息">
<el-input type="textarea" v-model="formNew.description"></el-input>
</el-form-item>
<div class="form_title">工作区域申请规格</div>
<el-form-item label="CPU">
<el-input v-model="formNew.CPUs"></el-input>
</el-form-item>
<el-form-item label="内存">
<el-input v-model="formNew.RAMs"></el-input>
</el-form-item>
<el-form-item label="容器组">
<el-input type="textarea" v-model="formNew.containerGroup"></el-input>
</el-form-item>
<el-form-item label="数据盘（可选）">
<el-input-number
v-model="formNew.dataDisk"
@change="handleChange"
controls-position="right"
:min="1"
:max="10"
></el-input-number>块，每块
<el-input-number
v-model="formNew.perDataDisk"
@change="handleChange"
controls-position="right"
:min="1"
:max="10"
></el-input-number>GB
</el-form-item>
<div class="form_title">单个容器组规格</div>
<div>CPU</div>
<el-form-item label="最高">
<el-input v-model="formNew.perCPUs"></el-input>核
</el-form-item>
<el-form-item label="默认">
<el-input v-model="formNew.perCPU"></el-input>核
</el-form-item>
<div>内存</div>
<el-form-item label="最高">
<el-input v-model="formNew.perRAMs"></el-input>GB
</el-form-item>
<el-form-item label="默认">
<el-input v-model="formNew.perRAM"></el-input>GB
</el-form-item>
<div class="form_title">其他信息</div>
<el-form-item label="申请时长">
<el-input v-model="formNew.appDuration"></el-input>
<el-select v-model="formNew.durType" placeholder="请选择">
<el-option <el-option
v-for="item in durationOptions" v-for="item in workSpaceOptions"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </div>
<el-form-item label="申请文件"> </el-col>
<upload-file </el-row>
:multiple="false" <div v-if="formShow">
:max="1" <el-form ref="formNew" :model="formOld">
type="zip" <el-row>
:readOnly="false" <el-col :span="24">
:drag="true" <div class="form_title">工作区域升级规格</div>
@getNewList="getNewList" </el-col>
></upload-file> <el-col :span="24">
</el-form-item> <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="1"
: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="1"
: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="1"
: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>
</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="1"
: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="1"
: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="1"
: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="1"
: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="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="1"
: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-form>
</div> </div>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<div class="btn_footer">
<el-button class="submit" @click="submitApp">提交申请</el-button>
</div>
</block-radius> </block-radius>
<el-dialog title="申请信息确认" :visible.sync="dialogVisible" width="580px" class="cloud_dia">
<el-row>
<el-col :span="24">
<span class="dia_item_title">申请组织：</span>
<span class="dia_item_val">贵州省交通运输厅运输厅贵州省交通运输厅运输厅</span>
</el-col>
<el-col :span="10">
<span class="dia_item_title">组织联系人：</span>
<span class="dia_item_val">张三</span>
</el-col>
<el-col :span="10">
<span class="dia_item_title">联系电话：</span>
<span class="dia_item_val">13523232333</span>
</el-col>
<el-col :span="10">
<span class="dia_item_title">申请类型：</span>
<span class="dia_item_val">新资源申请</span>
</el-col>
<el-col :span="10" v-if="activeName == '1'">
<span class="dia_item_title">工作区域名称：</span>
<span class="dia_item_val">BD-aPaaSaPaaSaSaPV4.0.html</span>
</el-col>
<el-col :span="14" v-if="activeName == '0'">
<span class="dia_item_title">上传申请文件：</span>
<span class="dia_item_val">云资源申请修改意见V2.0审批审批函.pdf</span>
</el-col>
<el-col :span="24" v-else-if="activeName == '1'">
<span class="dia_item_title">上传申请文件：</span>
<span class="dia_item_val">云资源申请修改意见V2.0审批审批函.pdf</span>
</el-col>
<el-col :span="24">
<!-- <span class="dia_item_title">原规格：</span> -->
<div class="dia_block">
<span class="dia_item_all_title">基本信息：</span>
<div class="dia_block_item">
<div class="dia_block_item_in">
<span class="dia_block_item_title">工作区域名称：</span>
<span class="dia_block_item_val">BD-aPaaSaPaaSaSaPV4.0.html</span>
</div>
<div class="dia_block_item_in">
<span class="dia_block_item_title">中文名称：</span>
<span class="dia_block_item_val">aPaaS平台V3.0</span>
</div>
<div class="dia_block_item_in">
<span class="dia_block_item_title">描述信息：</span>
<span class="dia_block_item_val">
用于部署运行aPaaS平台V3.0用于部署运行aPaaS平台V3.0用于
部署运行aPaaS平台V3.0
</span>
</div>
</div>
<span class="dia_item_all_title">工作区域申请规格：</span>
<div class="dia_block_item">
<div class="dia_block_item_in">
<span class="dia_block_item_title">CPU：</span>
<span class="dia_block_item_val">aPaaS-V3.0</span>
</div>
<div class="dia_block_item_in">
<span class="dia_block_item_title">内存：</span>
<span class="dia_block_item_val">aPaaS平台V3.0</span>
</div>
<div class="dia_block_item_in">
<span class="dia_block_item_title">容器组：</span>
<span class="dia_block_item_val">
用于部署运行aPaaS平台V3.0用于部署运行aPaaS平台V3.0用于
部署运行aPaaS平台V3.0
</span>
</div>
<div class="dia_block_item_in">
<span class="dia_block_item_title">数据盘：</span>
<span class="dia_block_item_val">
用于部署运行aPaaS平台V3.0用于部署运行aPaaS平台V3.0用于
部署运行aPaaS平台V3.0
</span>
</div>
</div>
<span class="dia_item_all_title">单个容器组规格：</span>
<div class="dia_block_item">
<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;2核</span>
<span class="val_has_2">默认&nbsp;2核</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;2核</span>
<span class="val_has_2">默认&nbsp;2核</span>
</p>
</div>
</div>
<span class="dia_item_all_title">申请时长：</span>
<div class="dia_block_item">
<div class="dia_block_item_in">
<span class="dia_block_item_title">申请时长</span>
<span class="dia_block_item_val">6个月</span>
</div>
</div>
</div>
</el-col>
</el-row>
<div class="btn_footer">
<el-button class="cancel" @click="cancel">取消</el-button>
<el-button class="submit" @click="determineSubmit">确定提交</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
...@@ -226,11 +630,47 @@ export default { ...@@ -226,11 +630,47 @@ export default {
{ value: "aaaaaaaaaa工作空间", label: "aaaaaaaaaa工作空间" }, { value: "aaaaaaaaaa工作空间", label: "aaaaaaaaaa工作空间" },
{ value: "wwwwwwwwww工作空间", label: "wwwwwwwwww工作空间" } { value: "wwwwwwwwww工作空间", label: "wwwwwwwwww工作空间" }
], ],
formShow: false optionsCPU: [
{ value: "8", label: "8" },
{ value: "16", label: "16" }
],
optionsRAM: [
{ value: "8", label: "8" },
{ value: "16", label: "16" },
{ value: "32", label: "32" }
],
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" }
],
formOld: {
workAreaName: "",
cnName: "",
description: "",
CPUs: "",
RAMs: "",
containerGroup: "",
dataDisk: "",
perDataDisk: "",
perCPUs: "",
perCPU: "",
perRAMs: "",
perRAM: "",
appDuration: "",
durType: ""
},
dialogVisible: false
}), }),
methods: { methods: {
tabClick() {}, tabClick() {},
getNewList() {}, getNewList() {},
getNewListOld() {},
handleChange() {}, handleChange() {},
getForm(val) { getForm(val) {
if (val != "") { if (val != "") {
...@@ -238,6 +678,23 @@ export default { ...@@ -238,6 +678,23 @@ export default {
} else { } else {
this.formShow = false; this.formShow = false;
} }
},
submitApp() {
let formParams = {};
if (this.activeName == 0) {
formParams = this.formNew;
} else if (this.activeName == 1) {
formParams = this.formOld;
}
this.dialogVisible = true;
console.log(formParams, this.form);
},
determineSubmit() {
console.log(formParams, this.form);
this.dialogVisible = false;
},
cancel() {
this.dialogVisible = false;
} }
} }
}; };
...@@ -249,27 +706,310 @@ export default { ...@@ -249,27 +706,310 @@ export default {
.form_title { .form_title {
font-size: 18px; font-size: 18px;
margin: 10px 0; margin: 10px 0;
padding: 0 0 0 20px; padding: 0 0 0 15px;
position: relative; position: relative;
color: #58617a;
} }
.form_title::before { .form_title::before {
position: absolute; position: absolute;
content: ""; content: "";
width: 4px; width: 4px;
height: 16px; height: 18px;
background-color: blue; background-color: #515fe7;
border-radius: 2px;
left: 0; left: 0;
top: 4px; top: 4px;
} }
.form_item {
width: calc(100% - 20px);
}
.form_block .el-input {
width: 90%;
}
.form_item_title {
padding: 0 15px;
line-height: 40px;
}
.input_has_right {
position: relative;
}
.input_right {
display: inline-block;
width: 60px;
height: 40px;
padding: 0 0 0 15px;
background-color: #edeef4;
border: 1px #e3e5ef solid;
color: #8890a7;
border-radius: 0 8px 8px 0;
position: absolute;
right: 0;
}
.input_has_left_right {
position: relative;
}
.input_left {
display: inline-block;
width: 60px;
height: 40px;
padding: 0 0 0 15px;
background-color: #edeef4;
border: 1px #e3e5ef solid;
color: #8890a7;
border-radius: 8px 0 0 8px;
position: absolute;
left: 0;
}
.input_has_right_select {
position: relative;
}
.input_right_select {
position: absolute;
right: 0;
}
.select_title {
padding: 20px 15px;
font-weight: 700;
}
.now_spec {
padding: 10px 15px;
}
.now_spec_cards {
}
.now_spec_card {
display: inline-block;
width: 165px;
height: 50px;
background-color: #f7f8f9;
border-radius: 8px;
line-height: 50px;
padding: 0 20px;
position: relative;
margin-right: 20px;
}
.now_spec_card_title {
color: #6573ae;
margin-left: 10px;
}
.now_spec_card_val {
color: #0d1847;
position: absolute;
right: 20px;
top: 0;
}
.now_spec_card_img {
position: relative;
top: 2px;
}
.now_rqz_card {
display: inline-block;
width: 193px;
height: 78px;
background-color: #f7f8f9;
border-radius: 8px;
line-height: 78px;
padding: 0 20px;
position: relative;
margin-right: 20px;
}
.now_rqz_card_title {
color: #6573ae;
margin-left: 10px;
}
.now_rqz_card_val_div {
color: #0d1847;
position: absolute;
line-height: 30px;
right: 20px;
top: 9px;
}
.now_rqz_card_val {
}
.now_rqz_card_img {
position: relative;
top: 2px;
}
.now_spec_card_time {
width: 381px;
height: 50px;
background-color: #f7f8f9;
border-radius: 8px;
line-height: 50px;
padding: 0 20px;
position: relative;
}
.now_spec_card_time_img {
position: relative;
top: 2px;
}
.now_spec_card_time_title {
color: #6573ae;
margin-left: 10px;
}
.now_spec_card_time_val {
color: #0d1847;
position: absolute;
right: 20px;
top: 0;
}
.btn_footer {
display: flex;
justify-content: flex-end;
margin: 40px 20px 10px;
}
.btn_footer .submit {
width: 100px;
background-color: #0f2683;
color: #f8f9fd;
}
.cancel {
width: 100px;
background-color: #c3caf8;
color: #0f2683;
}
.dia_item_title {
display: block;
color: #8890a7;
line-height: 24px;
padding: 0 20px;
}
.dia_item_val {
display: block;
color: #242c43;
line-height: 24px;
margin-bottom: 10px;
width: 90%;
padding: 0 20px;
}
.dia_block {
background-color: #f8f9fd;
border-radius: 8px;
margin: 10px 0;
padding: 20px;
font-size: 14px;
line-height: 22px;
}
.dia_item_all_title {
color: #242c43;
}
.dia_block_item {
padding: 10px 0 0 20px;
}
.dia_block_item_in {
display: flex;
justify-content: space-between;
margin-bottom: 5px;
}
.dia_block_item_title {
color: #8890a7;
width: 120px;
text-align: right;
}
.dia_block_item_val {
color: #242c43;
width: calc(100% - 130px);
}
.val_has_2 {
margin-right: 20px;
}
</style> </style>
<style> <style>
.form_block .el-input .el-input__inner {
background-color: #f7f8f9;
}
.cloud_form .el-input { .cloud_form .el-input {
width: 400px; width: 100%;
}
.cloud_form .input_has_right .el-input {
width: calc(100% - 60px);
}
.cloud_form .input_has_left_right .el-input {
width: calc(100% - 120px);
margin-left: 60px;
}
.cloud_form .input_has_left_right .el-input__inner {
border-radius: 0;
}
.cloud_form .el-select {
width: 100%;
}
.cloud_form .el-input .el-input__inner {
background-color: #f7f8f9;
}
.cloud_form .el-input-number {
width: calc(100% - 60px);
} }
.cloud_form .el-input-number .el-input { .cloud_form .el-input-number .el-input {
width: 180px; width: 100%;
}
.cloud_form .input_has_left_right .el-input-number .el-input {
width: calc(100% - 60px);
margin-left: 60px;
}
.cloud_form .el-input-number .el-input__inner {
text-align: left;
} }
.cloud_form .el-textarea { .cloud_form .el-textarea {
width: 400px; width: 100%;
}
.cloud_form .el-textarea .el-textarea__inner {
background-color: #f7f8f9;
border-radius: 8px;
}
.form_item .el-form-item__content {
width: 100%;
}
.form_item.el-form-item {
margin-bottom: 12px;
}
.input_has_right .el-input__inner {
border-radius: 8px 0 0 8px;
}
.cloud_form .input_has_right_select .el-input-number {
width: calc(100% - 100px);
}
.input_has_right_select .el-select {
width: 100px;
}
.input_has_right_select .el-select .el-input.is-focus .el-input__inner {
border-color: #0f2683;
}
.input_has_right_select .el-select .el-input__inner:focus {
border-color: #0f2683;
}
.input_has_right_select .el-input__inner {
border-radius: 8px 0 0 8px;
}
.input_has_right_select .input_right_select.el-select .el-input {
width: 100px;
background-color: #0f2683;
color: #ffffff;
border-radius: 0 8px 8px 0;
}
.input_has_right_select
.input_right_select.el-select
.el-input
.el-input__inner {
border-radius: 0 8px 8px 0;
color: #ffffff;
}
.input_right_select .el-input .el-input__inner {
background-color: #0f2683;
}
.cloud_form .el-input-number .el-input-number__increase,
.cloud_form .el-input-number .el-input-number__decrease {
border-bottom: 0;
border-left: 0;
width: 40px;
}
.cloud_dia .el-dialog__header {
border-bottom: 1px solid #edf0ff;
}
.cloud_dia .el-dialog__title {
font-weight: 700;
}
.cloud_dia .el-dialog__body {
text-align: left;
font-size: 14px;
} }
</style> </style>
\ No newline at end of file
src/components/table-um.vue
View file @ 8755cec3
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
:id="scope.row.id" :id="scope.row.id"
:name="scope.row.name" :name="scope.row.name"
:rowId="scope.$index" :rowId="scope.$index"
:type="scope.row.type ? scope.row.type : ''" :type="scope.row[item.uploadKey] ? scope.row[item.uploadKey] : ''"
:typeHead="item.type" :typeHead="item.type"
:couldNotEdit="couldNotEdit" :couldNotEdit="couldNotEdit"
@changeInputValue="changeInputValue" @changeInputValue="changeInputValue"
......
src/pages/example/example_table.vue
View file @ 8755cec3
...@@ -118,7 +118,7 @@ export default { ...@@ -118,7 +118,7 @@ export default {
], ],
headers1: [ headers1: [
{ label: "服务url", prop: "date", type: "input", align: "left" }, { label: "服务url", prop: "date", type: "input", align: "left" },
{ label: "服务名称", prop: "ssss", type: "upload", align: "center" }, { label: "服务名称", prop: "ssss", type: "upload", align: "center", uploadKey: "type" },
{ {
label: "文件类型", label: "文件类型",
prop: "type", prop: "type",
...@@ -126,8 +126,8 @@ export default { ...@@ -126,8 +126,8 @@ export default {
align: "center", align: "center",
width: 100, width: 100,
selectArr: [ selectArr: [
{ label: "Text", value: "Text" }, { label: "text", value: "text" },
{ label: "File", value: "File" } { label: "file", value: "file" }
] ]
} }
], ],
......
src/pages/service_shop/service_application_successfully.vue 0 → 100644
View file @ 8755cec3
<template>
<div>
<block-radius class="success_block">
<div class="success_in">
<div class="step_block">
<div class="success">
<i class="el-icon-success"></i>
</div>
<div class="line"></div>
<div class="next"></div>
</div>
<div class="step_text">
<div class="step_text_1">服务申请提交成功</div>
<div class="step_text_2">您的申请已提交进入审核，审核通过后即可获取相应服务</div>
</div>
</div>
<div class="btn_footer">
<el-button class="cancel" @click="goto('/services_shop')">进入首页</el-button>
<el-button class="submit" @click="goto('/user/order_list')">查看订单</el-button>
</div>
</block-radius>
</div>
</template>
<script>
import BlockRadius from "@/components/block-radius";
export default {
components: {
BlockRadius
},
data: () => ({}),
mounted() {},
methods: {
goto(url) {
this.$router.push(url);
}
}
};
</script>
<style scoped>
.success_block {
width: 1200px;
height: 560px;
margin: 130px auto 0;
}
.success_in {
width: 460px;
display: flex;
justify-content: space-around;
margin: 120px auto 0;
}
.step_block {
position: relative;
}
.success {
font-size: 36px;
color: #25bdb1;
}
.line {
height: 100px;
width: 2px;
background-color: #d3d7e3;
position: absolute;
left: 17px;
top: 36px;
}
.line::after {
content: "";
position: absolute;
height: 50px;
width: 2px;
background-color: #25bdb1;
top: 0;
}
.next {
width: 20px;
height: 20px;
border-radius: 10px;
background-color: #d3d7e3;
position: absolute;
left: 8px;
top: 136px;
}
.step_text {
width: 380px;
height: 150px;
}
.step_text_1 {
color: #25bdb1;
margin-top: 16px;
margin-bottom: 102px;
}
.step_text_2 {
color: #8890a7;
}
.btn_footer {
width: 460px;
margin: 80px auto;
display: flex;
justify-content: space-between;
}
.submit {
width: 200px;
background-color: #0f2683;
color: #f8f9fd;
}
.cancel {
width: 200px;
background-color: #c3caf8;
color: #0f2683;
}
</style>
\ No newline at end of file
src/pages/user/order/order_detail.vue 0 → 100644
View file @ 8755cec3
<template>
<div>
<el-breadcrumb separator="/" class="bread_crumb1">
<el-breadcrumb-item :to="{ path: '/user' }">个人中心</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '/user/order_list' }">订单管理</el-breadcrumb-item>
<el-breadcrumb-item>订单详情</el-breadcrumb-item>
</el-breadcrumb>
<block-radius class="detail">
<div class="detail_head">
<div class="detail_head_cell detail_head_status border_right">
<p class="detail_head_cell_title">申请状态</p>
<p class="detail_head_cell_val blue">已获取</p>
</div>
<div class="detail_head_cell detail_head_no border_right">
<p class="detail_head_cell_title">订单编号</p>
<p class="detail_head_cell_val">202004241502000001</p>
</div>
<div class="detail_head_cell detail_head_time">
<p class="detail_head_cell_title">申请时间</p>
<p class="detail_head_cell_val">2020-04-24 15:02:00</p>
</div>
<div class="btn_group">
<el-popover placement="right-start" width="300" v-model="visible" trigger="click">
<p>服务评价：</p>
<div class="pop_rate">
<el-rate
v-model="serviceRate"
:colors="colors"
allow-half
show-score
score-template="{value}"
></el-rate>
</div>
<p>填写评价：</p>
<div class="evaluation_text">
<el-input
type="textarea"
placeholder="请输入内容"
v-model="textarea"
maxlength="200"
show-word-limit
:autosize="{ minRows: 6, maxRows: 10 }"
></el-input>
</div>
<div class="pop_btn_group">
<el-button size="small" class="pop_cancel" type="text" @click="visible = false">取消</el-button>
<el-button type="primary" class="pop_submit" size="small" @click="addEvaluation">确定提交</el-button>
</div>
<el-button class="evaluation" slot="reference">服务评价</el-button>
</el-popover>
<el-button class="again" @click="goto('/user/order_list')">再次申请</el-button>
</div>
</div>
<div class="detail_title">服务信息</div>
<div class="detail_service">
<el-row class="detail_service_row">
<el-col :span="10" class="detail_service_msg">
<img
src="https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg"
class="detail_service_msg_img"
/>
<div class="detail_service_msg_right">
<div class="detail_service_name">
<span>水路货物周转量情况</span>
<!-- <span v-if="cellItem.mapService" class="tags map_service">mapService</span>
<span v-if="cellItem.state == 1" class="tags shared">共享</span>
<span v-else-if="cellItem.state == 2" class="tags restricted">受限</span>
<span v-else class="tags sensitive">敏感</span>-->
</div>
<div class="detail_service_msg_other">
<div class="detail_service_type">基础数据服务</div>
<div class="detail_service_creator">贵州省交通运输厅</div>
</div>
</div>
</el-col>
<el-col :span="8" class="detail_service_specification">
<div>
<div>
<span class="detail_service_specification_gg">规格：</span>
<span class="detail_service_specification_val">访问次数：200/日，访问量：10000/日</span>
</div>
<div>
<span class="detail_service_specification_type">申请方式：</span>
<span class="detail_service_specification_val">按月</span>
</div>
</div>
</el-col>
<el-col :span="6" class="detail_service_time">
<div>
<span class="detail_service_time_title">申请时长：</span>
<span class="detail_service_specification_val">5年</span>
</div>
</el-col>
</el-row>
</div>
<div class="detail_s_title">应用场景：</div>
<div
class="detail_app_scence"
>用于展示车辆位置，用于展示车辆位置，用于展示车辆位置，用于展示车辆位置，用于展示车辆位置，用于展示车辆位置，用于展示车辆位置，用于展示车辆位置，用于展示车辆位置。</div>
<div class="detail_s_title">申请内容：</div>
<table-um :headers="header_arr" url="min_service_params_arr"></table-um>
<div class="detail_title">申请人信息</div>
<info-list @download="download" :list_arr="list_arr" class="detail_s_val"></info-list>
<process-card :data="approval_arr1" class="detail_s_val"></process-card>
</block-radius>
</div>
</template>
<script>
import BlockRadius from "@/components/block-radius";
import ProcessCard from "@/components/process-card";
import TableUm from "@/components/table-um";
import InfoList from "@/components/infoList";
export default {
components: {
BlockRadius,
ProcessCard,
TableUm,
InfoList
},
data: () => ({
visible: false,
colors: ["#99A9BF", "#F7BA2A", "#FF9900"],
serviceRate: 0,
textarea: "",
approval_arr1: [
{
title: "一级审批",
result: "审批通过",
arr: [
{
title: "审批时间：",
info: "2020-02-28 15:23:45"
},
{
title: "审批单位：",
info: "某某某城管局"
},
{
title: "审批人：",
info: "张先生"
},
{
title: "审批意见：",
info: "同意"
}
]
},
{
title: "二级审批",
result: "审批通过",
arr: [
{
title: "审批时间：",
info: "2020-02-28 15:23:45"
},
{
title: "审批单位：",
info: "某某某城管局"
},
{
title: "审批人：",
info: "张先生"
},
{
title: "审批意见：",
info: "同意"
}
]
},
{
title: "三级审批",
result: "审批未通过",
arr: [
{
title: "审批时间：",
info: "2020-02-28 15:23:45"
},
{
title: "审批单位：",
info: "某某某城管局"
},
{
title: "审批人：",
info: "张先生"
},
{
title: "审批意见：",
info: "不同意，驳回。"
}
]
}
],
header_arr: [
{
prop: "wfwmc",
label: "微服务名称",
minWidth: "20%",
align: "left"
},
{
prop: "jkzt",
label: "健康状态",
width: "120px",
align: "center"
},
{
prop: "jklj",
label: "接口链接",
minWidth: "40%",
align: "center"
},
{
prop: "wfwms",
label: "微服务描述",
minWidth: "40%",
align: "left"
}
],
list_arr: [
{
title: "申请人：",
info: "李子维"
},
{
title: "联系方式：",
info: "18342803360"
},
{
title: "申请单位：",
info: "北京比格大数据有限公司"
},
{
title: "申请文件：",
info: "xxxx文件名称.txt",
url: "www.baidu.com",
type: "down"
},
]
}),
mounted() {},
methods: {
addEvaluation() {
console.log(this.serviceRate, this.textarea);
this.visible = false;
},
download() {}
}
};
</script>
<style scoped>
.detail {
margin: 0 20px;
}
.detail_head {
width: 100%;
background-color: #f6f7fb;
border-radius: 8px;
border: solid 2px #e3e5ef;
padding: 22px 20px;
position: relative;
margin-bottom: 20px;
}
.detail_head_cell {
display: inline-block;
height: 50px;
text-align: center;
}
.detail_head_status {
width: 180px;
}
.detail_head_no {
width: 240px;
}
.detail_head_time {
width: 240px;
}
.border_right {
border-right: 1px #e3e5ef solid;
}
.detail_head_cell_title {
font-size: 14px;
color: #8890a7;
line-height: 22px;
}
.detail_head_cell_val {
font-size: 16px;
font-weight: 700;
line-height: 28px;
color: #242c43;
}
.blue {
color: #515fe7;
}
.btn_group {
position: absolute;
right: 20px;
top: 26px;
}
.evaluation {
width: 100px;
background-color: #c3caf8;
color: #0f2683;
margin-right: 20px;
}
.again {
width: 100px;
background-color: #0f2683;
color: #f8f9fd;
}
.pop_rate {
padding: 0 0 0 50px;
margin: 15px 0;
}
.evaluation_text {
padding: 15px 4px;
}
.pop_cancel {
color: #58617a;
margin-right: 20px;
}
.pop_submit {
background-color: #e56600;
border: 0;
}
.pop_btn_group {
margin-top: 10px;
text-align: center;
}
.detail_title {
font-size: 18px;
margin: 10px 0 20px;
padding: 0 0 0 15px;
position: relative;
color: #58617a;
}
.detail_title::before {
position: absolute;
content: "";
width: 4px;
height: 18px;
background-color: #515fe7;
border-radius: 2px;
left: 0;
top: 4px;
}
.detail_service {
width: 100%;
height: 100%;
background-color: #ffffff;
border-radius: 8px;
border: solid 1px #ededed;
}
.detail_service_msg {
height: 162px;
padding: 20px 10px 20px 20px;
display: flex;
justify-content: space-between;
border-right: 1px #ededed solid;
}
.detail_service_msg_img {
width: 118px;
height: 118px;
border-radius: 8px;
}
.detail_service_msg_right {
width: calc(100% - 140px);
margin: 0 0 0 10px;
position: relative;
}
.detail_service_name {
width: 100%;
line-height: 24px;
text-overflow: -o-ellipsis-lastline;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
line-clamp: 2;
-webkit-box-orient: vertical;
font-size: 16px;
}
.detail_service_msg_other {
position: absolute;
bottom: 2px;
}
.detail_service_type {
color: #8890a7;
font-size: 14px;
line-height: 22px;
}
.detail_service_creator {
color: #8890a7;
font-size: 14px;
line-height: 22px;
}
.tags {
display: inline-block;
margin-left: 10px;
padding: 1px 8px 2px;
font-size: 12px;
font-weight: 500;
line-height: 12px;
border-radius: 4px;
position: relative;
top: -2px;
}
.map_service {
background-color: #626de9;
border: solid 1px #626de9;
color: #fff;
}
.shared {
background-color: #e7fdfc;
border: solid 1px #8bd6d0;
color: #25bdb1;
}
.restricted {
background-color: #fffee8;
border: solid 1px #e4c884;
color: #ef9433;
}
.sensitive {
background-color: #ffefef;
border: solid 1px #d7a4a9;
color: #e15260;
}
.detail_service_specification {
height: 162px;
color: #8890a7;
display: flex;
justify-content: center;
align-items: center;
line-height: 30px;
padding: 22px 20px;
border-right: 1px #ededed solid;
}
.detail_service_specification_val {
color: #242c43;
}
.detail_service_time {
text-align: center;
height: 162px;
display: flex;
justify-content: center;
align-items: center;
}
.detail_service_time_title {
color: #8890a7;
}
.detail_s_title {
color: #8890a7;
margin: 20px 0 10px;
padding: 0 0 0 20px;
}
.detail_app_scence {
padding: 0 0 0 20px;
color: #242c43;
font-size: 14px;
line-height: 22px;
}
.detail_s_val {
padding: 0 0 0 20px;
}
</style>
<style>
.pop_rate .el-rate__icon {
font-size: 24px;
}
.pop_rate .el-rate__text {
font-size: 20px;
margin-left: 20px;
position: relative;
top: 1px;
color: #58617a !important;
}
.evaluation_text .el-textarea__inner {
border-radius: 8px;
}
</style>
\ No newline at end of file
src/pages/workbench/fwzc_fwcs.vue
View file @ 8755cec3
...@@ -461,11 +461,11 @@ export default { ...@@ -461,11 +461,11 @@ export default {
align: "center", align: "center",
width: 100, width: 100,
selectArr: [ selectArr: [
{ label: "Text", value: "text" }, { label: "text", value: "text" },
{ label: "File", value: "file" } { label: "file", value: "file" }
] ]
}, },
{ label: "请求值", prop: "val", type: "upload", align: "center" }, { label: "请求值", prop: "val", type: "upload", align: "center", uploadKey: "field_type" },
{ {
label: "操作", label: "操作",
type: "Button", type: "Button",
...@@ -745,7 +745,6 @@ export default { ...@@ -745,7 +745,6 @@ export default {
request_fields: this.request_fields, request_fields: this.request_fields,
response_fields: this.response_fields response_fields: this.response_fields
}; };
let url = `/apaas/service/v3/service/manager`;
this.$api.workbench.serviceAdd(query).then(response => { this.$api.workbench.serviceAdd(query).then(response => {
if (response.data.success == 1) { if (response.data.success == 1) {
this.$message.success("服务注册成功"); this.$message.success("服务注册成功");
......
src/request/http.js
View file @ 8755cec3
...@@ -30,6 +30,7 @@ const toLogin = () => { ...@@ -30,6 +30,7 @@ const toLogin = () => {
const errorHandle = (status, other) => { const errorHandle = (status, other) => {
// 状态码判断 // 状态码判断
switch (status) { switch (status) {
case 400: tip('请求错误(400)'); break;
// 401: 未登录状态，跳转登录页 // 401: 未登录状态，跳转登录页
case 401: case 401:
toLogin(); toLogin();
...@@ -44,12 +45,15 @@ const errorHandle = (status, other) => { ...@@ -44,12 +45,15 @@ const errorHandle = (status, other) => {
toLogin(); toLogin();
}, 1000); }, 1000);
break; break;
// 404请求不存在 case 404: tip('请求的资源不存在'); break;
case 404: case 408: tip('请求超时(408)');
tip('请求的资源不存在'); case 500: tip('服务器错误(500)');
break; case 501: tip('服务未实现(501)');
default: case 502: tip('网络错误(502)');
console.log(other); case 503: tip('服务不可用(503)');
case 504: tip('网络超时(504)');
case 505: tip('HTTP版本不受支持(505)');
default: tip(`连接出错,${other}`);
} }
} }
...@@ -78,7 +82,7 @@ instance.interceptors.response.use( ...@@ -78,7 +82,7 @@ instance.interceptors.response.use(
const { response } = error; const { response } = error;
if (response) { if (response) {
// 请求已发出，但是不在2xx的范围 // 请求已发出，但是不在2xx的范围
errorHandle(response.status, response.data.message); errorHandle(response.status, response.data.errmessage);
return Promise.reject(response); return Promise.reject(response);
} }
}); });
......
src/router/index.js
View file @ 8755cec3
...@@ -142,6 +142,11 @@ export default new Router({ ...@@ -142,6 +142,11 @@ export default new Router({
name: "shopCloud", name: "shopCloud",
component: () => import("@/pages/service_shop/shop_cloud"), component: () => import("@/pages/service_shop/shop_cloud"),
}, },
{
path: "/shop/service_application_successfully", // 云资源服务
name: "shopSuccess",
component: () => import("@/pages/service_shop/service_application_successfully"),
},
{ {
path: "/shop/app_store_list", // 应用商店列表页 path: "/shop/app_store_list", // 应用商店列表页
name: "shopAppStoreList", name: "shopAppStoreList",
...@@ -213,7 +218,12 @@ export default new Router({ ...@@ -213,7 +218,12 @@ export default new Router({
{ {
path: "/user/order_list", // 订单管理页 path: "/user/order_list", // 订单管理页
name: "orderList", name: "orderList",
component: () => import("@/pages/user/order_list"), component: () => import("@/pages/user/order/order_list"),
},
{
path: "/user/order_detail/:id", // 订单管理页
name: "orderDetail",
component: () => import("@/pages/user/order/order_detail"),
}, },
], ],
}, // 个人中心 }, // 个人中心
......
static/data.json
View file @ 8755cec3
...@@ -4,28 +4,28 @@ ...@@ -4,28 +4,28 @@
{ {
"date": "2016-05-02", "date": "2016-05-02",
"name": "王小虎", "name": "王小虎",
"type": "File", "type": "file",
"id": "ssss2722", "id": "ssss2722",
"state": 0 "state": 0
}, },
{ {
"date": "2016-05-04", "date": "2016-05-04",
"name": "王小虎", "name": "王小虎",
"type": "Text", "type": "text",
"id": "ssss2224", "id": "ssss2224",
"state": 0 "state": 0
}, },
{ {
"date": "2016-05-01", "date": "2016-05-01",
"name": "王小虎", "name": "王小虎",
"type": "Text", "type": "text",
"id": "ssss222", "id": "ssss222",
"state": 1 "state": 1
}, },
{ {
"date": "2016-05-03", "date": "2016-05-03",
"name": "王小虎", "name": "王小虎",
"type": "File", "type": "file",
"id": "ssss22", "id": "ssss22",
"state": 2 "state": 2
} }
......
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