Skip to content

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

order,commodity,cloud,menus,user_info,fwzc

parent c5d39f66
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 405 additions and 272 deletions
src/components/order-list/order-list-cell.vue
View file @ a1d3e3c1
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
@click="viewDetail(cellItem.order_id)" @click="viewDetail(cellItem.order_id)"
>查看详情</el-button> >查看详情</el-button>
<div <div
v-if="cellItem.approval_second_level == 1 && cellItem.pay_status != -1" v-if="cellItem.approval_second_level == 1 && cellItem.pay_status != -1 || cellItem.pay_status == -1"
class="cell_option_spec" class="cell_option_spec"
@click="nextApply" @click="nextApply"
>再次申请</div> >再次申请</div>
...@@ -140,9 +140,7 @@ ...@@ -140,9 +140,7 @@
<el-rate <el-rate
v-model="message.score" v-model="message.score"
disabled disabled
show-score :colors="colors"
text-color="#ff9900"
score-template="{value}"
></el-rate> ></el-rate>
</div> </div>
<div class="msg_title">评价详情：</div> <div class="msg_title">评价详情：</div>
...@@ -174,6 +172,13 @@ export default { ...@@ -174,6 +172,13 @@ export default {
helper: helper, helper: helper,
message: {}, message: {},
}), }),
watch: {
cellItem: {
handler() {
this.showMsgBox = false;
}
}
},
methods: { methods: {
addEvaluation() { addEvaluation() {
if (this.textarea == "" && this.serviceRate == null) { if (this.textarea == "" && this.serviceRate == null) {
...@@ -274,7 +279,7 @@ export default { ...@@ -274,7 +279,7 @@ export default {
path: "/shop/shop_car_apply", path: "/shop/shop_car_apply",
query: query, query: query,
}); });
} else if (this.cellItem.order_type == 2) { } else if (this.cellItem.order_type == 3) {
this.$router.push({ this.$router.push({
path: "/shop/shop_cloud", path: "/shop/shop_cloud",
}); });
...@@ -512,10 +517,10 @@ export default { ...@@ -512,10 +517,10 @@ export default {
margin: 0 0 10px; margin: 0 0 10px;
} }
.msg_rate { .msg_rate {
margin: 0 0 10px 20px; margin: 0 0 20px 0;
} }
.msg_text { .msg_text {
margin-left: 20px; /* margin-left: 20px; */
color: #242c43; color: #242c43;
} }
</style> </style>
......
src/components/order-list/order-list-com.vue
View file @ a1d3e3c1
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
import OrderList from "@/components/order-list/order-list-list"; import OrderList from "@/components/order-list/order-list-list";
export default { export default {
components: { components: {
OrderList OrderList,
}, },
data: () => ({ data: () => ({
stateList: [ stateList: [
...@@ -89,7 +89,7 @@ export default { ...@@ -89,7 +89,7 @@ export default {
{ value: "2", label: "审核中" }, { value: "2", label: "审核中" },
{ value: "3", label: "已获取" }, { value: "3", label: "已获取" },
{ value: "4", label: "未通过" }, { value: "4", label: "未通过" },
{ value: "5", label: "已取消" } { value: "5", label: "已取消" },
], ],
activeName: "0", activeName: "0",
buttonList: [], buttonList: [],
...@@ -97,23 +97,23 @@ export default { ...@@ -97,23 +97,23 @@ export default {
pagination: { pagination: {
rowsPerPage: 10, rowsPerPage: 10,
page: 1, page: 1,
total: 0 total: 0,
}, },
pageOptions: [ pageOptions: [
{ {
value: "10", value: "10",
label: "10" label: "10",
}, },
{ {
value: "20", value: "20",
label: "20" label: "20",
}, },
{ {
value: "50", value: "50",
label: "50" label: "50",
} },
], ],
datas: [] datas: [],
}), }),
mounted() { mounted() {
this.getBtns(); this.getBtns();
...@@ -121,13 +121,13 @@ export default { ...@@ -121,13 +121,13 @@ export default {
}, },
methods: { methods: {
getBtns() { getBtns() {
this.$api.user.getOrderBtnTypes().then(response => { this.$api.user.getOrderBtnTypes().then((response) => {
if (response.data.success == 1) { if (response.data.success == 1) {
let buttonList = response.data.data; let buttonList = response.data.data;
buttonList.forEach(item => { buttonList.forEach((item) => {
item.state = false; item.state = false;
}); });
buttonList.unshift({ id: "", name: "全部", state: false }); buttonList.unshift({ id: 0, name: "全部", state: false });
buttonList.push({ id: "cloud", name: "云资源", state: false }); buttonList.push({ id: "cloud", name: "云资源", state: false });
buttonList.push({ id: "app", name: "应用镜像", state: false }); buttonList.push({ id: "app", name: "应用镜像", state: false });
this.buttonList = buttonList; this.buttonList = buttonList;
...@@ -147,12 +147,14 @@ export default { ...@@ -147,12 +147,14 @@ export default {
} }
this.buttonList[0].state = !this.buttonList[0].state; this.buttonList[0].state = !this.buttonList[0].state;
} }
this.pagination.page = 1;
this.getData(); this.getData();
}, },
// search debonce 500ms // search debonce 500ms
searchVal() { searchVal() {
if (this.times !== null) clearTimeout(this.times); if (this.times !== null) clearTimeout(this.times);
this.times = setTimeout(() => { this.times = setTimeout(() => {
this.pagination.page = 1;
this.getData(); this.getData();
}, 500); }, 500);
}, },
...@@ -161,9 +163,13 @@ export default { ...@@ -161,9 +163,13 @@ export default {
let service = 0; let service = 0;
let app = 0; let app = 0;
let resource = 0; let resource = 0;
this.buttonList.forEach(item => { this.buttonList.forEach((item) => {
if (item.state == true) { if (item.state == true) {
if (item.id == "cloud") { if (item.id == 0) {
resource = 1;
app = 1;
service = 1;
} else if (item.id == "cloud") {
resource = 1; resource = 1;
} else if (item.id == "app") { } else if (item.id == "app") {
app = 1; app = 1;
...@@ -186,9 +192,10 @@ export default { ...@@ -186,9 +192,10 @@ export default {
types: arr, types: arr,
service: service, service: service,
app: app, app: app,
resource: resource resource: resource,
}; };
this.$api.user.orderList(params).then(response => { this.$api.user.orderList(params).then((response) => {
this.datas = [];
this.datas = response.data.data; this.datas = response.data.data;
this.pagination.total = response.data.total; this.pagination.total = response.data.total;
}); });
...@@ -203,8 +210,8 @@ export default { ...@@ -203,8 +210,8 @@ export default {
}, },
updateList() { updateList() {
this.getData(); this.getData();
} },
} },
}; };
</script> </script>
<style scoped> <style scoped>
...@@ -301,20 +308,20 @@ export default { ...@@ -301,20 +308,20 @@ export default {
.order_block .el-tabs--border-card > .el-tabs__content { .order_block .el-tabs--border-card > .el-tabs__content {
padding: 0; padding: 0;
} }
.input_right .el-input__inner { .order_block .input_right .el-input__inner {
border-radius: 20px; border-radius: 20px;
} }
.input_right .el-input--prefix .el-input__inner { .order_block .input_right .el-input--prefix .el-input__inner {
padding-left: 40px; padding-left: 40px;
} }
.input_right .el-input__prefix, .order_block .input_right .el-input__prefix,
.el-input__suffix { .el-input__suffix {
left: 10px; left: 10px;
} }
.input_right .el-input--prefix .el-input__inner { .order_block .input_right .el-input--prefix .el-input__inner {
outline: none; outline: none;
} }
.input_right .el-input__inner:focus-within { .order_block .input_right .el-input__inner:focus-within {
border: 1px solid #626de9; border: 1px solid #626de9;
} }
.order_page_control .el-button { .order_page_control .el-button {
......
src/components/order-list/order-list-list.vue
View file @ a1d3e3c1
...@@ -30,7 +30,7 @@ export default { ...@@ -30,7 +30,7 @@ export default {
mounted() {}, mounted() {},
methods: { methods: {
updateList() { updateList() {
this.emit("updateList"); this.$emit("updateList");
} }
} }
}; };
......
src/components/service-list/commodity-card.vue
View file @ a1d3e3c1
...@@ -138,13 +138,16 @@ export default { ...@@ -138,13 +138,16 @@ export default {
.com_card_msg_num1 { .com_card_msg_num1 {
color: #242c43; color: #242c43;
font-size: 16px; font-size: 16px;
font-weight: bold;
} }
.com_card_btn { .com_card_btn {
margin-top: 35px; margin-top: 35px;
display: flex; display: flex;
justify-content: space-around; justify-content: space-between;
} }
.btn_1 { .btn_1 {
width: 110px;
padding: 10px;
background-color: #d0d5e7; background-color: #d0d5e7;
border: solid 2px #a5afd6; border: solid 2px #a5afd6;
color: #0f2683; color: #0f2683;
...@@ -155,6 +158,8 @@ export default { ...@@ -155,6 +158,8 @@ export default {
color: #0f2683; color: #0f2683;
} }
.btn_2 { .btn_2 {
width: 110px;
padding: 10px;
background-color: #0f2683; background-color: #0f2683;
color: #f8f9fd; color: #f8f9fd;
} }
......
src/components/service-list/commodity-cell.vue
View file @ a1d3e3c1
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<div class="com_cell_message"> <div class="com_cell_message">
<div class="com_cell_msg_title"> <div class="com_cell_msg_title">
{{ cellData.name }} {{ cellData.name }}
<span v-if="cellData.mapService" class="tags map_service">mapService</span> <span v-if="cellData.data_service_type1 == 6" class="tags map_service">mapService</span>
<span v-if="cellData.openness == 1" class="tags shared">共享</span> <span v-if="cellData.openness == 1" class="tags shared">共享</span>
<span v-else-if="cellData.openness == 2" class="tags restricted">受限</span> <span v-else-if="cellData.openness == 2" class="tags restricted">受限</span>
<span v-else class="tags sensitive">敏感</span> <span v-else class="tags sensitive">敏感</span>
......
src/components/service-list/service_list.vue
View file @ a1d3e3c1
...@@ -688,31 +688,31 @@ export default { ...@@ -688,31 +688,31 @@ export default {
} }
</style> </style>
<style> <style>
.input_right .el-input__inner { .head_flex .input_right .el-input__inner {
border-radius: 20px; border-radius: 20px;
} }
.input_right .el-input--prefix .el-input__inner { .head_flex .input_right .el-input--prefix .el-input__inner {
padding-left: 40px; padding-left: 40px;
} }
.input_right .el-input__prefix, .head_flex .input_right .el-input__prefix,
.el-input__suffix { .el-input__suffix {
left: 10px; left: 10px;
} }
.input_right .el-input--prefix .el-input__inner { .head_flex .input_right .el-input--prefix .el-input__inner {
outline: none; outline: none;
} }
.input_right .el-input__inner:focus-within { .head_flex .input_right .el-input__inner:focus-within {
border: 1px solid #626de9; border: 1px solid #626de9;
} }
.btn_right_check .el-checkbox__input.is-checked .el-checkbox__inner, .head_flex .btn_right_check .el-checkbox__input.is-checked .el-checkbox__inner,
.el-checkbox__input.is-indeterminate .el-checkbox__inner { .el-checkbox__input.is-indeterminate .el-checkbox__inner {
background-color: #626de9; background-color: #626de9;
border-color: #626de9; border-color: #626de9;
} }
.btn_right_check .el-checkbox__input.is-checked + .el-checkbox__label { .head_flex .btn_right_check .el-checkbox__input.is-checked + .el-checkbox__label {
color: #626de9; color: #626de9;
} }
.btn_right_check .el-checkbox__input.is-focus .el-checkbox__inner { .head_flex .btn_right_check .el-checkbox__input.is-focus .el-checkbox__inner {
border-color: #626de9; border-color: #626de9;
} }
</style> </style>
src/components/shop-cloud/shop-cloud.vue
View file @ a1d3e3c1
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<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" class="form_block"> <el-form ref="form" :inline="true" :rules="ruleBasis" :model="form" class="form_block">
<el-row> <el-row>
<el-col :span="11"> <el-col :span="11">
<el-form-item class="form_item"> <el-form-item class="form_item">
...@@ -14,13 +14,13 @@ ...@@ -14,13 +14,13 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11" :offset="1"> <el-col :span="11" :offset="1">
<el-form-item class="form_item"> <el-form-item class="form_item" prop="link_man">
<div class="form_item_title">部门联系人：</div> <div class="form_item_title">部门联系人：</div>
<el-input v-model="form.link_man" placeholder="请输入联系人姓名"></el-input> <el-input v-model="form.link_man" placeholder="请输入联系人姓名"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11"> <el-col :span="11">
<el-form-item class="form_item"> <el-form-item class="form_item" prop="phone">
<div class="form_item_title">联系电话：</div> <div class="form_item_title">联系电话：</div>
<el-input v-model="form.phone" placeholder="请输入联系人电话"></el-input> <el-input v-model="form.phone" placeholder="请输入联系人电话"></el-input>
</el-form-item> </el-form-item>
...@@ -127,6 +127,7 @@ ...@@ -127,6 +127,7 @@
v-model="formNew.dataDisk" v-model="formNew.dataDisk"
controls-position="right" controls-position="right"
:min="0" :min="0"
:max="1000"
placeholder="请选择增加数据盘的数量" placeholder="请选择增加数据盘的数量"
></el-input-number> ></el-input-number>
<div class="input_right">块</div> <div class="input_right">块</div>
...@@ -138,6 +139,7 @@ ...@@ -138,6 +139,7 @@
v-model="formNew.perDataDisk" v-model="formNew.perDataDisk"
controls-position="right" controls-position="right"
:min="0" :min="0"
:max="1000"
placeholder="请选择每块数据盘的容量" placeholder="请选择每块数据盘的容量"
></el-input-number> ></el-input-number>
<div class="input_right">GB</div> <div class="input_right">GB</div>
...@@ -215,6 +217,7 @@ ...@@ -215,6 +217,7 @@
v-model="formNew.appDuration" v-model="formNew.appDuration"
controls-position="right" controls-position="right"
:min="0" :min="0"
:max="1000"
></el-input-number> ></el-input-number>
<el-select <el-select
v-model="formNew.durType" v-model="formNew.durType"
...@@ -382,6 +385,7 @@ ...@@ -382,6 +385,7 @@
v-model="formOld.dataDisk" v-model="formOld.dataDisk"
controls-position="right" controls-position="right"
:min="0" :min="0"
:max="1000"
placeholder="请选择增加数据盘的数量" placeholder="请选择增加数据盘的数量"
></el-input-number> ></el-input-number>
<div class="input_right">块</div> <div class="input_right">块</div>
...@@ -393,6 +397,7 @@ ...@@ -393,6 +397,7 @@
v-model="formOld.perDataDisk" v-model="formOld.perDataDisk"
controls-position="right" controls-position="right"
:min="0" :min="0"
:max="1000"
placeholder="请选择每块数据盘的容量" placeholder="请选择每块数据盘的容量"
></el-input-number> ></el-input-number>
<div class="input_right">GB</div> <div class="input_right">GB</div>
...@@ -521,6 +526,7 @@ ...@@ -521,6 +526,7 @@
v-model="formOld.appDuration" v-model="formOld.appDuration"
controls-position="right" controls-position="right"
:min="0" :min="0"
:max="1000"
></el-input-number> ></el-input-number>
<el-select <el-select
v-model="formOld.durType" v-model="formOld.durType"
...@@ -866,6 +872,19 @@ export default { ...@@ -866,6 +872,19 @@ export default {
phone: "", phone: "",
link_man: "", link_man: "",
}, },
ruleBasis: {
link_man: [
{ required: true, message: "请输入部门联系人", trigger: "blur" },
{ max: 6, message: "长度应小于6个字符", trigger: "blur" },
],
phone: [
{ required: true, message: "请输入手机号码", trigger: "blur" },
{
pattern: /^(?:(?:\+|00)86)?1[3-9]\d{9}$/,
message: "请输入正确的手机号码",
},
],
},
activeName: "0", activeName: "0",
formNew: { formNew: {
namespace: "", namespace: "",
...@@ -1282,7 +1301,8 @@ export default { ...@@ -1282,7 +1301,8 @@ export default {
.cloud_form { .cloud_form {
} }
.form_title { .form_title {
font-size: 18px; font-size: 16px;
font-weight: bold;
margin: 10px 0; margin: 10px 0;
padding: 0 0 0 15px; padding: 0 0 0 15px;
position: relative; position: relative;
...@@ -1296,7 +1316,7 @@ export default { ...@@ -1296,7 +1316,7 @@ export default {
background-color: #515fe7; background-color: #515fe7;
border-radius: 2px; border-radius: 2px;
left: 0; left: 0;
top: 4px; top: 2px;
} }
.form_item { .form_item {
width: calc(100% - 20px); width: calc(100% - 20px);
...@@ -1344,7 +1364,9 @@ export default { ...@@ -1344,7 +1364,9 @@ export default {
} }
.select_title { .select_title {
padding: 20px 15px; padding: 20px 15px;
font-weight: 700; font-size: 16px;
font-weight: bold;
color: #242c43;
} }
.now_spec { .now_spec {
padding: 10px 15px; padding: 10px 15px;
...@@ -1610,6 +1632,6 @@ export default { ...@@ -1610,6 +1632,6 @@ export default {
} }
.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: 40px;
} }
</style> </style>
src/components/table/table-um.vue
View file @ a1d3e3c1
...@@ -473,7 +473,6 @@ export default { ...@@ -473,7 +473,6 @@ export default {
}, },
// get data // get data
getDataFromApiSync() { getDataFromApiSync() {
console.log("get data >>>");
this.getDataFromApi().then( this.getDataFromApi().then(
data => { data => {
this.selectedTabsPage = JSON.parse(JSON.stringify(data.newArr)); this.selectedTabsPage = JSON.parse(JSON.stringify(data.newArr));
......
src/pages/authority/menu/menus.vue
View file @ a1d3e3c1
This diff is collapsed.
src/pages/user/order/order_detail.vue
View file @ a1d3e3c1
This diff is collapsed.
src/pages/user/user_info.vue
View file @ a1d3e3c1
This diff is collapsed.
src/pages/workbench/fwgl/cloud-detail.vue
View file @ a1d3e3c1
...@@ -165,9 +165,14 @@ ...@@ -165,9 +165,14 @@
</div> </div>
<div ref="ApplyDesc" slot="ApplyDesc" class="params_apply_desc">{{ desc }}</div> <div ref="ApplyDesc" slot="ApplyDesc" class="params_apply_desc">{{ desc }}</div>
<div ref="ResourceOverview" slot="ResourceOverview" class="params_resource_overview"> <div ref="ResourceOverview" slot="ResourceOverview" class="params_resource_overview">
<div v-if="now_user == 0"> <div v-if="now_user == 0 && use_uid != ''">
当您觉得使用空间不足时，可以选择至服务超市- 当您觉得使用空间不足时，可以选择至服务超市-
<span @click="goto('/shop/cloud')" class="link_span">云资源服务页面</span>的升级现有工作区域来完成配置扩容操作。 <span
v-if="apploy_msg.first_level == -1 || (apploy_msg.first_level == 1 && apploy_msg.second_level != 0)"
@click="goto('/shop/cloud')"
class="link_span"
>云资源服务页面</span>
<span v-else>云资源服务页面</span>的升级现有工作区域来完成配置扩容操作。
</div> </div>
<el-row class="params_charts"> <el-row class="params_charts">
<el-col :span="8" class="params_col"> <el-col :span="8" class="params_col">
......
src/pages/workbench/fwzc_fwcs.vue
View file @ a1d3e3c1
...@@ -24,7 +24,19 @@ ...@@ -24,7 +24,19 @@
:key="item.id" :key="item.id"
@click="clickBtn(index)" @click="clickBtn(index)"
:class="activeBtn == index ? 'fwcs_btn_act':'fwcs_btn_dis'" :class="activeBtn == index ? 'fwcs_btn_act':'fwcs_btn_dis'"
>{{ item.name }}</el-button> >
<img
v-if="activeBtn == index"
:src="require('../../assets/imgs/' + item.active + '.png')"
class="fwcs_btn_img"
/>
<img
v-else
:src="require('../../assets/imgs/' + item.default + '.png')"
class="fwcs_btn_img"
/>
{{ item.name }}
</el-button>
</el-row> </el-row>
<div class="gray_line"></div> <div class="gray_line"></div>
<div v-if="activeBtn == 4"> <div v-if="activeBtn == 4">
...@@ -1005,6 +1017,32 @@ export default { ...@@ -1005,6 +1017,32 @@ export default {
this.$api.workbench.getServiceTypeList().then((response) => { this.$api.workbench.getServiceTypeList().then((response) => {
if (response.data.success == 1) { if (response.data.success == 1) {
this.btnList = response.data.data; this.btnList = response.data.data;
this.btnList.forEach((item) => {
switch (item.id) {
case 5:
item.default = "nav_ic_shujufw";
item.active = "nav_ic_shujufw_sel";
break;
case 6:
item.default = "nav_ic_shikongfw";
item.active = "nav_ic_shikongfw_sel";
break;
case 7:
item.default = "nav_ic_shipinfw";
item.active = "nav_ic_shipinfw_sel";
break;
case 10:
item.default = "nav_ic_ganzhifw";
item.active = "nav_ic_ganzhifw_sel";
break;
case 21:
item.default = "nav_ic_zonghefw";
item.active = "nav_ic_zonghefw_sel";
break;
default:
break;
}
});
let skfwRadios = this.btnList[1].childDomains; let skfwRadios = this.btnList[1].childDomains;
skfwRadios.splice(2, 1); skfwRadios.splice(2, 1);
this.skfwRadios = skfwRadios; this.skfwRadios = skfwRadios;
...@@ -1157,6 +1195,11 @@ export default { ...@@ -1157,6 +1195,11 @@ export default {
background-color: #e3e5ef; background-color: #e3e5ef;
color: #8890a7; color: #8890a7;
} }
.fwcs_btn_img {
position: relative;
top: 2px;
margin-right: 4px;
}
.gray_line { .gray_line {
width: 100%; width: 100%;
margin: 20px auto; margin: 20px auto;
......
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