Skip to content

A
apaas-ui
Commit a1439c01 authored by 徐一鸣's avatar 徐一鸣
Browse files
Options

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

parents 50ba9faf aa2baa1e
Hide whitespace changes
Inline Side-by-side
Showing with 282 additions and 69 deletions
src/components/e-charts/dashboard.vue
View file @ a1439c01
......@@ -3,6 +3,7 @@
</template>
<script>
import { graphic } from "echarts/lib/export";
export default {
props: {
data: {
......@@ -11,9 +12,10 @@ export default {
}
},
data: () => ({
navList: []
navList: [],
}),
mounted() {},
mounted() {
},
methods: {
dashboard() {
let self = this;
......@@ -51,7 +53,7 @@ export default {
max: 138,
boundaryGap: ["0", "100"],
startAngle: 220,
endAngle: -40,
endAngle: -40
},
radiusAxis: {
type: "category",
......@@ -66,23 +68,30 @@ export default {
}
},
polar: {
radius: "100%"
radius: "110%"
},
series: [
{
type: "bar",
data: [,40],
data: [, 40],
coordinateSystem: "polar",
barMaxWidth: 10,
z: 1,
name: "抢修项目",
name: "B",
roundCap: true,
color: "#1779ee",
itemStyle: {
normal: {
color: new graphic.LinearGradient(0, 0, 0, 1, [
{ offset: 0, color: "#25bdb1" },
{ offset: 1, color: "#e7fdfc" }
])
}
},
barGap: "-100%"
},
{
type: "bar",
data: [,100],
data: [, 100],
z: 0,
silent: true,
coordinateSystem: "polar",
......@@ -94,7 +103,7 @@ export default {
},
{
type: "gauge",
radius: "55%",
radius: "70%",
min: 0, //最小刻度
max: 100, //最大刻度
splitNumber: 10, //刻度数量
......@@ -117,16 +126,16 @@ export default {
show: true,
splitNumber: 5,
lineStyle: {
color: "#468EFD", //用颜色渐变函数不起作用
color: "#a9aec0",
width: 1
},
length: -8
length: 4
}, //刻度样式
splitLine: {
show: true,
length: -10,
length: 6,
lineStyle: {
color: "#468EFD" //用颜色渐变函数不起作用
color: "#a9aec0"
}
}, //分隔线样式
detail: {
......@@ -151,7 +160,7 @@ export default {
}
},
data: [,40]
data: [, 40]
}
]
};
......
src/components/shop-cloud/shop-cloud.vue
View file @ a1439c01
......@@ -95,7 +95,7 @@
<el-form-item class="form_item input_has_right">
<div class="form_item_title">容器组：</div>
<el-input-number
v-model="formNew.containers"
v-model="formNew.containerGroup"
controls-position="right"
:min="0"
:max="24"
......@@ -201,7 +201,6 @@
v-model="formNew.appDuration"
controls-position="right"
:min="0"
:max="10"
></el-input-number>
<el-select
v-model="formNew.durType"
......@@ -452,7 +451,6 @@
v-model="formOld.appDuration"
controls-position="right"
:min="0"
:max="10"
></el-input-number>
<el-select
v-model="formOld.durType"
......@@ -508,7 +506,7 @@
</el-col>
<el-col :span="10">
<span class="dia_item_title">申请类型：</span>
<span class="dia_item_val">{{ diaForm.phone }}</span>
<span class="dia_item_val">{{ activeName == 0 ? "新资源申请" : "已有资源升级" }}</span>
</el-col>
<el-col :span="10" v-if="activeName == '1'">
<span class="dia_item_title">工作区域名称：</span>
......@@ -516,15 +514,14 @@
</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>
<span class="dia_item_val">{{ diaForm.apply_file_name }}</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>
<span class="dia_item_val">{{ diaForm.apply_file_name }}</span>
</el-col>
<el-col :span="24">
<!-- <span class="dia_item_title">原规格：</span> -->
<div class="dia_block">
<div class="dia_block" v-if="activeName == 0">
<span class="dia_item_all_title">基本信息：</span>
<div class="dia_block_item">
<div class="dia_block_item_in">
......@@ -544,7 +541,7 @@
<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>
<span class="dia_block_item_val">{{ diaForm.cpu }}</span>
</div>
<div class="dia_block_item_in">
<span class="dia_block_item_title">内存：</span>
......@@ -552,17 +549,13 @@
</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>
<span class="dia_block_item_val">{{ diaForm.containerGroup }}个</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>
<span
class="dia_block_item_val"
>{{ diaForm.dataDisk }}块，每块{{ diaForm.perDataDisk }}GB</span>
</div>
</div>
<span class="dia_item_all_title">单个容器组规格：</span>
......@@ -570,15 +563,15 @@
<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>
<span class="val_has_2">最高&nbsp;{{ diaForm.perCPUs }}核</span>
<span class="val_has_2">默认&nbsp;{{ diaForm.perCPU }}核</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>
<span class="val_has_2">最高&nbsp;{{ diaForm.perRAMs }}核</span>
<span class="val_has_2">默认&nbsp;{{ diaForm.perRAM }}核</span>
</p>
</div>
</div>
......@@ -586,7 +579,112 @@
<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>
<span
class="dia_block_item_val"
>{{ diaForm.appDuration }}{{ diaForm.durType == 1 ? "个月" : "年" }}</span>
</div>
</div>
</div>
<div v-else>
<span class="dia_item_title margin_top_10">原规格：</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">CPU：</span>
<span class="dia_block_item_val">{{ paramsOld.cpu }}核</span>
</div>
<div class="dia_block_item_in">
<span class="dia_block_item_title">内存：</span>
<span class="dia_block_item_val">{{ paramsOld.memory }}核</span>
</div>
<div class="dia_block_item_in">
<span class="dia_block_item_title">容器组：</span>
<span class="dia_block_item_val">{{ paramsOld.containers }}个</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;{{ paramsOld.perCPUs }}核</span>
<span class="val_has_2">默认&nbsp;{{ paramsOld.perCPU }}核</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;{{ paramsOld.perRAMs }}核</span>
<span class="val_has_2">默认&nbsp;{{ paramsOld.perRAM }}核</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">2020-12-12 12:12:12</span>
</div>
</div>
</div>
<span class="dia_item_title margin_top_10">升级至：</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">CPU：</span>
<span class="dia_block_item_val">{{ diaForm.cpu }}核</span>
</div>
<div class="dia_block_item_in">
<span class="dia_block_item_title">内存：</span>
<span class="dia_block_item_val">{{ diaForm.memory }}核</span>
</div>
<div class="dia_block_item_in">
<span class="dia_block_item_title">容器组：</span>
<span class="dia_block_item_val">{{ diaForm.containerGroup }}个</span>
</div>
<div class="dia_block_item_in">
<span class="dia_block_item_title">新增数据盘：</span>
<span
class="dia_block_item_val"
>{{ diaForm.dataDisk }}块，每块{{ diaForm.perDataDisk }}GB</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;{{ diaForm.perCPUs }}核</span>
<span class="val_has_2">默认&nbsp;{{ diaForm.perCPU }}核</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;{{ diaForm.perRAMs }}核</span>
<span class="val_has_2">默认&nbsp;{{ diaForm.perRAM }}核</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"
>{{ diaForm.appDuration && diaForm.appDuration != 0 ? "是": "否" }}</span>
</div>
<div
class="dia_block_item_in"
v-if="diaForm.appDuration && diaForm.appDuration != 0"
>
<span class="dia_block_item_title">续期时长：</span>
<span
class="dia_block_item_val"
>{{ diaForm.appDuration }}{{ diaForm.durType == 1 ? "个月" : "年" }}</span>
</div>
</div>
</div>
</div>
......@@ -645,8 +743,8 @@ export default {
]
},
durationOptions: [
{ value: "月", label: "月" },
{ value: "年", label: "年" }
{ value: "1", label: "月" },
{ value: "2", label: "年" }
],
workSpace: "",
workSpaceOptions: [],
......@@ -687,6 +785,24 @@ export default {
apply_file: "",
apply_file_name: ""
},
paramsOld: {
namespace: "",
workplace: "",
workplacedesc: "",
cpu: "",
memory: "",
containerGroup: undefined,
dataDisk: undefined,
perDataDisk: undefined,
perCPUs: undefined,
perCPU: undefined,
perRAMs: undefined,
perRAM: undefined,
appDuration: undefined,
durType: "",
apply_file: "",
apply_file_name: ""
},
ruleOld: [],
dialogVisible: false,
diaForm: {}
......@@ -698,17 +814,31 @@ export default {
methods: {
tabClick() {},
getNewList(val) {
this.formNew.apply_file_name = val.name;
this.formNew.apply_file = val.url;
console.log(val);
this.formNew.apply_file_name = val[0].name;
this.formNew.apply_file = val[0].url;
},
getNewListOld() {
this.formOld.apply_file_name = val.name;
this.formOld.apply_file = val.url;
getNewListOld(val) {
this.formOld.apply_file_name = val[0].name;
this.formOld.apply_file = val[0].url;
},
handleChange() {},
getForm(val) {
if (val != "") {
this.formOld = this.workSpaceOptions[val];
if (val !== "") {
let paramsOld = this.workSpaceOptions[val];
this.paramsOld = paramsOld;
this.formOld.namespace = paramsOld.namespace;
this.formOld.workplace = paramsOld.workplace;
this.formOld.workplacedesc = paramsOld.workplacedesc;
this.formOld.cpu = paramsOld.cpu;
this.formOld.memory = paramsOld.memory;
this.formOld.containerGroup = paramsOld.containers;
this.formOld.dataDisk = paramsOld.dataDisk;
this.formOld.perDataDisk = paramsOld.perDataDisk;
this.formOld.perCPUs = paramsOld.one_cpu_max;
this.formOld.perCPU = paramsOld.one_cpu_min;
this.formOld.perRAMs = paramsOld.one_memory_max;
this.formOld.perRAM = paramsOld.one_memory_min;
this.formShow = true;
} else {
this.formShow = false;
......@@ -723,25 +853,70 @@ export default {
}
this.dialogVisible = true;
this.diaForm = Object.assign(formParams, this.form);
console.log(this.diaForm);
console.log(formParams, this.diaForm);
},
determineSubmit() {
console.log(formParams, this.form);
if (this.activeName == 0) {
let query = {
resource_info: {
namespace: this.formNew.namespace,
workplace: this.formNew.workplace,
workplacedesc: this.formNew.workplacedesc
},
resource_apply: {
apply_file: this.formNew.apply_file,
cpu: Number(this.formNew.cpu),
duration: this.formNew.appDuration,
duration_unit: Number(this.formNew.durType),
apply_connect_username: this.form.link_man,
apply_connect_mobile: this.form.phone,
memory: Number(this.formNew.memory),
containers: this.formNew.containerGroup,
disk_num: this.formNew.dataDisk,
disk_cap: this.formNew.perDataDisk,
one_cpu_min: this.formNew.perCPU,
one_cpu_max: this.formNew.perCPUs,
one_memory_min: this.formNew.perRAM,
one_memory_max: this.formNew.perRAMs
}
};
this.$api.serviceShop.applicationCloud(query).then(response => {
console.log(response);
});
} else {
let query = {
resource_id: this.paramsOld.id,
resource_apply: {
apply_file: this.formOld.apply_file,
cpu: Number(this.formOld.cpu),
duration: this.formOld.appDuration,
duration_unit: Number(this.formOld.durType),
apply_connect_username: this.form.link_man,
apply_connect_mobile: this.form.phone,
memory: Number(this.formOld.memory),
containers: this.formOld.containerGroup,
disk_num: this.formOld.dataDisk,
disk_cap: this.formOld.perDataDisk,
one_cpu_min: this.formOld.perCPU,
one_cpu_max: this.formOld.perCPUs,
one_memory_min: this.formOld.perRAM,
one_memory_max: this.formOld.perRAMs
}
};
this.$api.serviceShop.updateCloud(query).then(response => {
console.log(response);
});
}
console.log(this.form);
this.dialogVisible = false;
},
cancel() {
this.dialogVisible = false;
},
getUser() {
this.$api.user.getNowUser().then(response => {
if (response.data.success == 1) {
this.form.department_name = response.data.data.department_name;
this.form.phone = response.data.data.phone;
this.form.link_man = response.data.data.link_man;
} else {
console.log(response.data.console.errMsg);
}
});
this.form.department_name = this.$store.state.userInfo.department_name;
this.form.phone = this.$store.state.userInfo.phone;
this.form.link_man = this.$store.state.userInfo.link_man;
},
getNameSpaceList() {
this.$api.serviceShop.getCloudList().then(response => {
......@@ -924,6 +1099,9 @@ export default {
line-height: 24px;
padding: 0 20px;
}
.margin_top_10 {
margin-top: 10px;
}
.dia_item_val {
display: block;
color: #242c43;
......
src/pages/data-analysis/my-service.vue
View file @ a1439c01
......@@ -10,8 +10,8 @@
<el-row>
<el-col :span="24" class="in_block">
<block-radius class="block left_1">
<dashboard ref="left_1_l" class="left_1_l"></dashboard>
<div ref="left_1_r" class="left_1_r"></div>
<div ref="left_1_l" class="left_1_l"></div>
<dashboard ref="left_1_r" class="left_1_r"></dashboard>
</block-radius>
</el-col>
<el-col :span="24" class="in_block">
......@@ -72,9 +72,7 @@ export default {
data: () => ({
navList: []
}),
mounted() {
},
mounted() {},
methods: {}
};
</script>
......@@ -82,7 +80,7 @@ export default {
.in_analysis {
padding: 0 10px 10px;
height: 100%;
min-width: 1000px;
min-width: 1700px;
}
.in_l {
}
......@@ -91,7 +89,7 @@ export default {
.in_c {
}
.in_block {
height: 300px;
height: 280px;
padding: 10px;
}
.block {
......
src/pages/user/order/order_detail.vue
View file @ a1439c01
......@@ -75,10 +75,15 @@
@click="showMsgBox = false"
>收起评价</el-button>
<el-button
v-if=" orderDetail.approval_second_level == 1 && orderDetail.pay_status != -1"
v-if="orderDetail.approval_second_level == 1 && orderDetail.pay_status != -1"
class="again"
@click="nextApply"
>再次申请</el-button>
<el-button
v-if="orderDetail.approval_first_level == 1 && orderDetail.approval_second_level == 0 && orderDetail.pay_status != -1"
class="again"
@click="cancelDetail"
>取消申请</el-button>
</div>
</div>
<div class="detail_title">{{ orderDetail.order_type == 1 ? "服务" : "应用"}}信息</div>
......@@ -353,6 +358,24 @@ export default {
path: "/shop/shop_car_apply",
query: query
});
},
cancelDetail() {
this.$api.user
.cancelOrder({ order_id: this.orderDetail.order_id })
.then(response => {
if (response.data.success == 1) {
this.$message({
message: "取消订单成功",
type: "success"
});
this.$router.push({ name: "orderList" });
} else {
this.$message({
message: "取消订单失败",
type: "error"
});
}
});
}
}
};
......
src/pages/user/user_info.vue
View file @ a1439c01
......@@ -403,7 +403,10 @@ export default {
input.select();
if (document.execCommand("copy")) {
document.execCommand("copy");
console.log("复制成功");
this.$message({
message: "复制成功",
type: "success"
});
}
document.body.removeChild(input);
},
......
src/pages/workbench/fwzc_fwcs.vue
View file @ a1439c01
......@@ -614,13 +614,13 @@ export default {
let bodys = "";
let contentType = "";
if (this.activeBtn == 0) {
bodys = this.$refs.jsonCodes.getCodesVal();
bodys = this.$refs.jsonCodes ? this.$refs.jsonCodes.getCodesVal() : "";
contentType = this.sjfwQqt;
} else if (this.activeBtn == 4) {
if (this.activeZh == 1) {
contentType = this.zhfwQqt;
if (this.zhfwQqt == "JSON") {
bodys = this.$refs.zhfwJsonCodes.getCodesVal();
bodys = this.$refs.zhfwJsonCodes ? this.$refs.zhfwJsonCodes.getCodesVal() : "";
} else if (this.zhfwQqt == "form-data") {
let request = this.$refs.fwcs_zhfw_qq_form.getTableData().concat();
request.pop();
......@@ -732,11 +732,11 @@ export default {
if (this.cover.length != 0) {
let contentType = "";
if (this.activeBtn == 0) {
bodys = this.$refs.jsonCodes.getCodesVal();
contentType = this.sjfwQqt;
} else if (this.activeBtn == 4) {
if (this.activeZh == 1) {
contentType = this.zhfwQqt;
}
}
let query = {
......
src/request/api/user.js
View file @ a1439c01
......@@ -34,7 +34,9 @@ const user = {
getOrderApproval(params) {
return axios.get(`/apaas/serviceapp/v3/order/approval?apply_id=${params.apply_id}`);
},
cancelOrder(params) {
return axios.get(`/order/cancel?order_id=${params.order_id}`);
},
// user info
getNowUser() {
......
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