From e75eea4e7403f4a70a1fa3be19781e6af6f02e83 Mon Sep 17 00:00:00 2001 From: liudianxin Date: Tue, 14 Jul 2020 16:41:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=93=E6=89=91=E5=9B=BE=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=EF=BC=8C=E8=A3=81=E5=89=AA=E5=8A=9F=E8=83=BD=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=80=BC=E6=94=B9=E4=B8=BA=E5=AF=B9=E8=B1=A1=E6=95=B0=E7=BB=84?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=B4=AD=E7=89=A9=E8=BD=A6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=9C=8D=E5=8A=A1=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E9=87=8D=E7=BD=AE=E6=8C=89=E9=92=AE=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/e-charts/dashboard.vue | 28 ++++-- src/components/general/upload_file.vue | 2 +- src/components/shop-cloud/shop-cloud.vue | 17 +++- .../shopping-cart/shopping-cart-cell.vue | 23 ++++- src/components/topology.vue | 37 ++++---- .../organization/organizationedit.vue | 2 +- src/pages/user/user_info.vue | 6 +- src/pages/workbench/app_build.vue | 2 +- src/pages/workbench/fwgl/cloud-detail.vue | 90 +++++++++---------- src/pages/workbench/fwzc_fwcs.vue | 4 +- 10 files changed, 123 insertions(+), 88 deletions(-) diff --git a/src/components/e-charts/dashboard.vue b/src/components/e-charts/dashboard.vue index 405facf..8b24401 100644 --- a/src/components/e-charts/dashboard.vue +++ b/src/components/e-charts/dashboard.vue @@ -102,21 +102,35 @@ export default { itemStyle: { normal: { color: new graphic.LinearGradient(0, 0, 1, 0, [ - { offset: 0, color: "#fff" }, + { + offset: 0, + color: + self.dangerousValue == "high" + ? self.data.data >= 80 + ? "#f7f1d5" + : "#d5f7e8" + : self.data.data > 75 + ? "f7f1d5" + : self.data.data > 50 + ? "#ffd98f" + : self.data.data > 25 + ? "#d5f7e8" + : "#d5f7e8" + }, { offset: 1, color: self.dangerousValue == "high" ? self.data.data >= 80 - ? "#e15260" - : "#515fe7" + ? "#da4251" // red + : "#00beb2" //green : self.data.data > 75 - ? "#00cfc6" + ? "#da4251" //red : self.data.data > 50 - ? "#54cefd" + ? "#ff7200" //yellow : self.data.data > 25 - ? "#54cefd" - : "#25bdb1" + ? "#00beb2" //green + : "#00beb2" //green } ]) } diff --git a/src/components/general/upload_file.vue b/src/components/general/upload_file.vue index fb54bd2..829eb90 100644 --- a/src/components/general/upload_file.vue +++ b/src/components/general/upload_file.vue @@ -191,7 +191,7 @@ export default { },1000) }, getNewUrl(val) { - let fileObj = { name: val, url: val }; + let fileObj = [{ name: val, url: val }]; this.$emit("getNewList", fileObj); } } diff --git a/src/components/shop-cloud/shop-cloud.vue b/src/components/shop-cloud/shop-cloud.vue index 29bf92c..6c79b7d 100644 --- a/src/components/shop-cloud/shop-cloud.vue +++ b/src/components/shop-cloud/shop-cloud.vue @@ -1031,7 +1031,18 @@ export default { ] }; this.$api.serviceShop.applicationCloud(query).then(response => { - console.log(response); + if (response.data.success == 1) { + this.$message({ + message: "申请成功", + type: "success" + }); + this.$router.push("/services_shop"); + } else { + this.$message({ + message: "申请失败", + type: "error" + }); + } }); } else { let query = { @@ -1061,13 +1072,13 @@ export default { this.$api.serviceShop.updateCloud(query).then(response => { if (response.data.success == 1) { this.$message({ - message: "申请成功", + message: "申请调整成功", type: "success" }); this.$router.push("/services_shop"); } else { this.$message({ - message: "申请失败", + message: "申请调整失败", type: "error" }); } diff --git a/src/components/shopping-cart/shopping-cart-cell.vue b/src/components/shopping-cart/shopping-cart-cell.vue index 379e353..be5320b 100644 --- a/src/components/shopping-cart/shopping-cart-cell.vue +++ b/src/components/shopping-cart/shopping-cart-cell.vue @@ -169,6 +169,7 @@ export default { immediate: true, // 这句重要 handler(val) { this.cellItems = val; + this.cellItems.is_subscribe = this.cellItems.is_subscribe == 1 ? true : false; if (this.cellIsService) { if (this.cellItems.service.buy_method == 1) { this.specificationApplicationBtns = [{ id: 1, value: "按月" }]; @@ -245,6 +246,7 @@ export default { this.cellItems.duration_method = this.specificationApplicationPop; this.visible = false; this.changeCellItem(); + this.updateShoppingCart(); }, setSpecificationPop() { this.specificationPop = this.cellItems.spec_id; @@ -252,9 +254,11 @@ export default { }, changeSubscription(val) { this.changeCellItem(); + this.updateShoppingCart(); }, changeNum(val) { this.changeCellItem(); + this.updateShoppingCart(); }, changeCellItem() { this.$emit("changeCellMsg", { @@ -265,8 +269,8 @@ export default { delCellItem() { this.$api.serviceShop .delShoppingCart([this.cellItems.id]) - .then(request => { - if (request.data.success == 1) { + .then(response => { + if (response.data.success == 1) { this.$message({ message: this.cellIsService ? "删除该服务成功" : "删除该应用成功", type: "success" @@ -279,6 +283,21 @@ export default { }); } }); + }, + updateShoppingCart() { + let query = { + id: this.cellItems.id, + duration: this.cellItems.duration, + spec_id: this.cellItems.spec_id, + duration_method: this.cellItems.duration_method, + is_subscribe: Number(this.cellItems.is_subscribe) + }; + this.$api.serviceShop.updateShoppingCart(query).then(response => { + if (response.data.success == 1) { + } else { + console.log(response.data.errMsg); + } + }); } } }; diff --git a/src/components/topology.vue b/src/components/topology.vue index 1df78ea..4ba94fc 100644 --- a/src/components/topology.vue +++ b/src/components/topology.vue @@ -42,44 +42,45 @@ export default { let self = this; self.datas.nodes.map(node => { node.id = node.data.id; - switch (node.data.nodeType) { - case "workload": + switch (node.data.svcType) { + case "数据服务": node.type = "image"; node.img = require("@/assets/svg/topology_ic_shujufw.svg"); node.size = [15, 15]; break; - case "app": + case "时空服务": node.type = "image"; - node.img = require("@/assets/svg/topology_ic_shujufw.svg"); + node.img = require("@/assets/svg/topology_ic_shikongfw.svg"); node.size = [15, 15]; break; - case "unknow source": + case "视频服务": node.type = "image"; - node.img = require("@/assets/svg/topology_ic_shujufw.svg"); + node.img = require("@/assets/svg/topology_ic_shipinfw.svg"); node.size = [15, 15]; break; - case "service": + case "感知服务": node.type = "image"; - node.img = require("@/assets/svg/topology_ic_shujufw.svg"); + node.img = require("@/assets/svg/topology_ic_ganzhifw.svg"); node.size = [15, 15]; break; - case "service entry": + case "综合应用": node.type = "image"; - node.img = require("@/assets/svg/topology_ic_shujufw.svg"); + node.img = require("@/assets/svg/topology_ic_zonghefw.svg"); node.size = [15, 15]; break; default: node.type = "image"; - node.img = require("@/assets/svg/topology_ic_ganzhifw.svg"); + node.img = require("@/assets/svg/topology_ic_shujufw.svg"); node.size = [15, 15]; break; } - if (node.data.namespace != self.namespace) { - node.label = - node.data[node.data.nodeType] + "\n(" + node.data.namespace + ")"; - } else { - node.label = node.data[node.data.nodeType]; - } + node.label = node.data.svcAlias; + // if (node.data.namespace != self.namespace) { + // node.label = + // node.data[node.data.nodeType] + "\n(" + node.data.namespace + ")"; + // } else { + // node.label = node.data[node.data.nodeType]; + // } node.labelCfg = { style: { fill: "#333", @@ -416,7 +417,7 @@ export default {