Skip to content

A
apaas-ui
Commit 9a4f3652 authored by 张俊's avatar 张俊
Browse files
Options

Merge branch 'dev' of cloud.wodcloud.com:apaas/apaas-v3-ui into dev

parents 225b17c6 22cafe81
Hide whitespace changes
Inline Side-by-side
Showing with 150 additions and 174 deletions
src/components/infoList.vue
View file @ 9a4f3652
......@@ -12,7 +12,7 @@
</span>
<span v-else v-html="item.info" style="white-space:pre-wrap;"></span>
<span
v-if="item.type && item.type == 'down'"
v-if="item.type && item.type == 'down' && item.url != ''"
class="filebtn"
@click="download(item.url)"
>下载文件</span>
......
src/pages/user/order/order_detail.vue
View file @ 9a4f3652
......@@ -80,7 +80,7 @@
@click="nextApply"
>再次申请</el-button>
<el-button
v-if="orderDetail.approval_first_level == 1 && orderDetail.approval_second_level == 0 && orderDetail.pay_status != -1"
v-if="(orderDetail.approval_first_level == 0 && orderDetail.pay_status != -1) || (orderDetail.approval_first_level == 1 && orderDetail.approval_second_level == 0 && orderDetail.pay_status != -1)"
class="again"
@click="cancelDetail"
>取消申请</el-button>
......@@ -121,7 +121,7 @@
<img :src="require('@/assets/imgs/img_yunziyuan.png')" class="detail_service_msg_img" />
<div class="detail_service_msg_right">
<div class="detail_service_name_cloud">
<span>{{ orderDetail.namespace }}（云资源申请）</span>
<span>{{ orderDetail.namespace }}（{{ orderDetail.workplace }}）</span>
</div>
</div>
</el-col>
......@@ -382,7 +382,10 @@ export default {
.then(response => {
if (response.data.success == 1) {
this.orderDetail = response.data.data;
this.data = JSON.parse(this.orderDetail.res_fields);
if (this.orderDetail.res_fields != "") {
this.data = JSON.parse(this.orderDetail.res_fields);
}
console.log(this.data);
this.getOrderUser();
this.getOrderApproval();
} else {
......@@ -407,7 +410,10 @@ export default {
},
getOrderApproval() {
this.$api.user
.getOrderApproval({ apply_id: this.orderDetail.apply_id })
.getOrderApproval({
apply_id: this.orderDetail.apply_id,
kind: this.orderDetail.order_type
})
.then(response => {
if (response.data.success == 1) {
let data = response.data.data;
......
src/pages/workbench/fwgl/cloud-detail.vue
View file @ 9a4f3652
......@@ -243,7 +243,7 @@
<el-button
v-if="now_user == 1 && apploy_msg.first_level == 0"
class="submit"
@click="submit"
@click="pass"
>提交资源申请</el-button>
<el-button
v-if="now_user == 0 && apploy_msg.second_level != 0"
......@@ -418,43 +418,10 @@ export default {
align: "center"
}
],
appList: [
{
id: "123",
app_name: "单文件啊"
},
{
id: "1223",
app_name: "单文件啊"
},
{
id: "1313",
app_name: "单文件啊"
},
{
id: "124563",
app_name: "单文件啊"
},
{
id: "126783",
app_name: "单文件啊"
},
{
id: "1225673",
app_name: "单文件啊"
},
{
id: "13134563",
app_name: "单文件啊"
},
{
id: "12234563",
app_name: "单文件啊"
}
],
appList: [],
now_user: "",
activeName: null,
tabShow: true,
tabShow: false,
cloudData: {
namespace: "",
workplace: "",
......@@ -519,10 +486,7 @@ export default {
this.user_id = this.$route.query.user_id || "";
this.apply_type = this.$route.query.apply_type || 0;
this.use_uid = this.$route.query.use_uid || "";
this.id = this.$route.query.id || "";
if (this.use_uid != "") {
this.getCloudApplication();
}
this.id = this.$route.params.id || "";
},
getUrl() {
return this.$route.path.substring(0, 9);
......@@ -543,22 +507,7 @@ export default {
this.$router.push("/shop/cloud");
},
distribution() {
this.$api.workbench
.setCloudAllocation({ id: this.id, userId: this.user_id })
.then(response => {
if (response.data.success == 1) {
this.$message({
message: "分配成功",
type: "success"
});
this.$router.push(this.getUrl());
} else {
this.$message({
message: "分配失败",
type: "error"
});
}
});
this.$refs.allotConfirm.getDetail(this.apply_id);
},
refuse() {
let query = {
......@@ -615,17 +564,17 @@ export default {
})
.then(response => {
if (response.data.success == 1) {
this.$message({
message: "该资源已删除",
type: "success"
});
this.$router.push(this.getUrl());
} else {
this.$message({
message: "资源删除失败",
type: "error"
});
}
this.$message({
message: "该资源已删除",
type: "success"
});
this.$router.push(this.getUrl());
} else {
this.$message({
message: "资源删除失败",
type: "error"
});
}
});
},
getCurrentUser() {
......@@ -638,55 +587,66 @@ export default {
}
});
},
submit() {
this.$refs.allotConfirm.getDetail(this.apply_id);
},
clickTab() {},
// 根据列表参数来判断显示什么
setListWithRole() {
console.log(this.now_user + ".." + this.apply_type);
if (this.now_user == 0) {
// 普通用户
if (this.apply_type == 0) {
// 申请类型0
if (this.use_uid == "") {
// 没分配
let index = this.list_arr.findIndex(
item => item.title == "资源使用情况："
);
this.list_arr.splice(index);
this.tabShow = false;
}
if (this.apply_type == 0) {
// 申请类型0
this.list_arr.splice(2, 1);
} else if (this.apply_type != 0) {
// 申请类型1
this.tabShow = false;
}
this.tabShow = false;
this.activeName = "0";
} else if (this.now_user == 1) {
// 组织
if (this.apply_type == 0) {
// 申请类型
if (this.use_uid == "") {
// 没分配
let index = this.list_arr.findIndex(
item => item.title == "资源使用情况："
);
this.list_arr.splice(index);
}
if (this.apply_type == 0) {
// 申请类型0
this.list_arr.splice(2, 1);
} else if (this.apply_type != 0) {
}
if (this.apploy_msg.first_level == 0) {
// 没分配
// 没审批
this.tabShow = false;
} else if (this.apploy_msg.first_level != 0) {
// 分配
// 组织审批了
this.tabShow = true;
}
this.activeName = "0";
} else if (this.now_user == 2) {
// 超管
if (this.apply_type == 0) {
if (this.use_uid == "") {
// 没分配
let index = this.list_arr.findIndex(
item => item.title == "资源使用情况："
);
this.list_arr.splice(index);
this.tabShow = false;
}
if (this.apply_type == 0) {
// 申请类型0
this.list_arr.splice(2, 1);
} else if (this.apply_type != 0) {
this.tabShow = false;
}
this.tabShow = false;
this.activeName = "0";
}
this.activeName = "0";
},
getCloudDetail() {
let query = {
......@@ -696,65 +656,72 @@ export default {
};
this.$api.workbench.getCloudDetail(query).then(response => {
let data = response.data.data;
console.log(data);
this.list_arr[3].info = helper.downloadFileFormat(
data.apply_file ? data.apply_file : ""
); // application file name
this.list_arr[3].url = data.apply_file; // application file url
this.list_arr[6].info = data.bgn_time; // get time
this.list_arr[7].info = data.time_remaining; // remaining days
this.list_arr[8].info = data.end_time; // maturity time
this.list_arr_my[0].info = data.first_level_time; // submit application time
this.list_arr_my[1].info = data.second_level_time; // super get time
this.super_status = data.second_leve; // super status
this.desc = data.workplacedesc; // workplace description
let count = data.cloud_resource_count; // resource usage
if (count) {
this.data1.total = count.cpu_total;
this.data1.remaining = count.cpu_total - count.cpu_use;
this.data1.data = Math.round((count.cpu_total / count.cpu_use) * 100);
this.data2.total = count.memory_total;
this.data2.remaining = count.memory_total - count.memory_use;
this.data2.data = Math.round(
(count.memory_total / count.memory_use) * 100
);
this.data3.total = count.disk_total;
this.data3.remaining = count.disk_total - count.disk_use;
this.data3.data = Math.round(
(count.disk_total / count.disk_use) * 100
);
this.data4.total = count.containers_total;
this.data4.remaining = count.containers_total - count.containers_use;
this.data4.data = Math.round(
(count.containers_total / count.containers_use) * 100
);
if (data) {
this.list_arr[3].info = helper.downloadFileFormat(
data.apply_file ? data.apply_file : ""
); // application file name
this.list_arr[3].url = data.apply_file; // application file url
this.list_arr[6].info = data.bgn_time; // get time
this.list_arr[7].info = data.time_remaining; // remaining days
this.list_arr[8].info = data.end_time; // maturity time
this.list_arr_my[0].info = data.first_level_time; // submit application time
this.list_arr_my[1].info = data.second_level_time; // super get time
this.super_status = data.second_leve; // super status
this.desc = data.workplacedesc; // workplace description
let count = data.cloud_resource_count; // resource usage
if (count) {
this.data1.total = count.cpu_total;
this.data1.remaining = count.cpu_total - count.cpu_use;
this.data1.data = Math.round(
(count.cpu_total / count.cpu_use) * 100
);
this.data2.total = count.memory_total;
this.data2.remaining = count.memory_total - count.memory_use;
this.data2.data = Math.round(
(count.memory_total / count.memory_use) * 100
);
this.data3.total = count.disk_total;
this.data3.remaining = count.disk_total - count.disk_use;
this.data3.data = Math.round(
(count.disk_total / count.disk_use) * 100
);
this.data4.total = count.containers_total;
this.data4.remaining =
count.containers_total - count.containers_use;
this.data4.data = Math.round(
(count.containers_total / count.containers_use) * 100
);
}
this.cloudDteail.containers = data.containers;
this.cloudDteail.cpu = data.cpu;
this.cloudDteail.disk = data.disk;
this.cloudDteail.memory = data.memory;
this.cloudDteail.apply_duration_time = data.apply_duration_time;
this.cloudDteail.one_cpu_max = data.one_cpu_max;
this.cloudDteail.one_cpu_min = data.one_cpu_min;
this.cloudDteail.one_memory_max = data.one_memory_max;
this.cloudDteail.one_memory_min = data.one_memory_min;
this.cloudDetailNew.adjust_containers = data.adjust_containers;
this.cloudDetailNew.adjust_cpu = data.adjust_cpu;
this.cloudDetailNew.adjust_disk = data.adjust_disk;
this.cloudDetailNew.adjust_memory = data.adjust_memory;
this.cloudDteail.adjust_duration_time = data.adjust_duration_time;
this.cloudDteail.adjust_one_cpu_max = data.adjust_one_cpu_max;
this.cloudDteail.adjust_one_cpu_min = data.adjust_one_cpu_min;
this.cloudDteail.adjust_one_memory_max = data.adjust_one_memory_max;
this.cloudDteail.adjust_one_memory_min = data.adjust_one_memory_min;
this.apploy_msg.first_level = data.first_level;
this.apploy_msg.second_level = data.second_level;
this.cloudData.namespace = data.namespace;
this.cloudData.workplace = data.workplace;
this.cloudData.user_name = data.user_name;
this.cloudData.phone = data.phone;
this.cloudData.apply_time = data.apply_time;
this.cloudData.system_name = data.system_name;
}
if (this.use_uid != "") {
this.getCloudApplication();
}
this.cloudDteail.containers = data.containers;
this.cloudDteail.cpu = data.cpu;
this.cloudDteail.disk = data.disk;
this.cloudDteail.memory = data.memory;
this.cloudDteail.apply_duration_time = data.apply_duration_time;
this.cloudDteail.one_cpu_max = data.one_cpu_max;
this.cloudDteail.one_cpu_min = data.one_cpu_min;
this.cloudDteail.one_memory_max = data.one_memory_max;
this.cloudDteail.one_memory_min = data.one_memory_min;
this.cloudDetailNew.adjust_containers = data.adjust_containers;
this.cloudDetailNew.adjust_cpu = data.adjust_cpu;
this.cloudDetailNew.adjust_disk = data.adjust_disk;
this.cloudDetailNew.adjust_memory = data.adjust_memory;
this.cloudDteail.adjust_duration_time = data.adjust_duration_time;
this.cloudDteail.adjust_one_cpu_max = data.adjust_one_cpu_max;
this.cloudDteail.adjust_one_cpu_min = data.adjust_one_cpu_min;
this.cloudDteail.adjust_one_memory_max = data.adjust_one_memory_max;
this.cloudDteail.adjust_one_memory_min = data.adjust_one_memory_min;
this.apploy_msg.first_level = data.first_level;
this.apploy_msg.second_level = data.second_level;
this.cloudData.namespace = data.namespace;
this.cloudData.workplace = data.workplace;
this.cloudData.user_name = data.user_name;
this.cloudData.phone = data.phone;
this.cloudData.apply_time = data.apply_time;
this.cloudData.system_name = data.system_name;
this.setListWithRole();
});
}
......
src/pages/workbench/fwgl/fwglList.vue
View file @ 9a4f3652
......@@ -1205,39 +1205,42 @@ export default {
if (this.type == 2) {
const cloud = data.data.cloud_resource_count;
if (this.level == 1) {
if (this.level != 2) {
this.listTotal = data.total;
this.listData = data.data.cloud_apply_list;
this.cloud_zuzhi = {
count_zy: cloud.count_zy,
dashboard_list: [
{
name: "CPU使用量",
value: cloud.cpu_use,
total: cloud.cpu_total,
unit: "（核）",
},
{
name: "内存使用量",
value: cloud.memory_use,
total: cloud.memory_total,
unit: "（GB）",
},
/* {
if (this.level == 1) {
this.cloud_zuzhi = {
count_zy: cloud.count_zy,
dashboard_list: [
{
name: "CPU使用量",
value: cloud.cpu_use,
total: cloud.cpu_total,
unit: "（核）",
},
{
name: "内存使用量",
value: cloud.memory_use,
total: cloud.memory_total,
unit: "（GB）",
},
/* {
name: "数据盘使用量",
value: cloud.disk_use,
total: cloud.disk_total,
unit: "（GB）",
}, */
{
name: "容器组使用量",
value: cloud.containers_use,
total: cloud.containers_total,
unit: "（个）",
},
],
};
} else if (this.level == 2) {
{
name: "容器组使用量",
value: cloud.containers_use,
total: cloud.containers_total,
unit: "（个）",
},
],
};
}
} else {
this.cloud_admin = {
dashboard_list: [
{
......
src/pages/workbench/yygl/yyglList.vue
View file @ 9a4f3652
......@@ -450,7 +450,7 @@ export default {
align: "center",
},
{
label: "部署区域",
label: "工作区域",
prop: "namespace",
align: "center",
},
......@@ -757,7 +757,7 @@ export default {
align: "center",
},
{
label: "部署区域",
label: "工作区域",
prop: "namespace",
align: "center",
},
......
src/request/api/user.js
View file @ 9a4f3652
......@@ -32,7 +32,7 @@ const user = {
return axios.get(`/apaas/serviceapp/v3/order/applyInfo?order_id=${params.order_id}`);
},
getOrderApproval(params) {
return axios.get(`/apaas/serviceapp/v3/order/approval?apply_id=${params.apply_id}`);
return axios.get(`/apaas/serviceapp/v3/order/approval?apply_id=${params.apply_id}&kind=${params.kind}`);
},
cancelOrder(params) {
return axios.get(`/order/cancel?order_id=${params.order_id}`);
......
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