Skip to content

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

Merge branch 'ldx' into dev

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