diff --git a/src/assets/i18n/language-zh.js b/src/assets/i18n/language-zh.js index 07d07cf162caa4fda0dbfa6e14d5ebd1e6473d99..1e64e6fe8b7aabb34eb1a1a5e58847a1e9f7f7b0 100644 --- a/src/assets/i18n/language-zh.js +++ b/src/assets/i18n/language-zh.js @@ -23,8 +23,12 @@ export const lang = { // data analysis data_analysis: "运营管控中心", - my_service_data_analysis: "服务分析", - my_application_data_analysis: "应用分析", + operational_analysis: "运营分析", + operation_control: "运行管控", + service_data_analysis: "服务分析", + application_data_analysis: "应用分析", + operation_overview: "运行概况", + service_control: "服务管控", // message message: "消息与推送管理", diff --git a/src/components/e-charts/gkmultiple_circle.vue b/src/components/e-charts/gkmultiple_circle.vue index 5f9619aaa49b2591cbb96aed524819ff96f463b7..bbdf0e658722c6ddb28d3a4573e966aef28ab4d4 100644 --- a/src/components/e-charts/gkmultiple_circle.vue +++ b/src/components/e-charts/gkmultiple_circle.vue @@ -36,7 +36,8 @@ export default { data: { handler() { this.init_yylx_asy(this.data, this.text); - } + }, + deep: true, } }, computed: {}, diff --git a/src/components/e-charts/graph.vue b/src/components/e-charts/graph.vue index 1968cad19decd6eb26b070305a01e97d76f610c6..cdfaddcf8f9350480d5582bc8338133e2d3b2fab 100644 --- a/src/components/e-charts/graph.vue +++ b/src/components/e-charts/graph.vue @@ -25,8 +25,6 @@ export default { methods: { graph() { let self = this; - console.log(this.data.legend.data); - console.log(this.data.data); return { color: ["#274fee", "#ef9433"], legend: { diff --git a/src/components/e-charts/multiple_circle.vue b/src/components/e-charts/multiple_circle.vue index 59a8c6802d2c297d88494352f6df55a2efdf7bdf..ad2d2d994f939132b149e7667f0e11b235bc4978 100644 --- a/src/components/e-charts/multiple_circle.vue +++ b/src/components/e-charts/multiple_circle.vue @@ -48,7 +48,8 @@ export default { data: { handler() { this.init_yylx_asy(this.data, this.text); - } + }, + deep: true, } }, computed: {}, @@ -125,9 +126,10 @@ export default { name: "", type: "pie", clockWise: false, - radius: [65, 68], - center: ["50%", "50%"], + radius: [60, 63], + center: ["50%", "46%"], hoverAnimation: false, + avoidLabelOverlap: true, itemStyle: { normal: { label: { @@ -173,9 +175,9 @@ export default { subtextStyle: { color: "#c9cedd" }, - itemGap: -10, // 主副标题距离 + itemGap: 0, // 主副标题距离 left: "center", - top: "center" + top: "32%" }, color: this.isFwsp ? color2 : color, tooltip: { diff --git a/src/components/e-charts/single_circle.vue b/src/components/e-charts/single_circle.vue index f2ca709fc041efaff17bc751e133fb1c7ed6093f..59549d4dddf227b2eb4fbea5b4b3d0018c04f0d3 100644 --- a/src/components/e-charts/single_circle.vue +++ b/src/components/e-charts/single_circle.vue @@ -13,24 +13,24 @@ export default { return { num: 0, color: "#e15260", - text: "敏感" + text: "敏感", }; - } - } + }, + }, }, components: {}, data() { return { - health: uuidv1() + health: uuidv1(), }; }, watch: { data: { handler(val) { - console.log(val); this.init_health(this.data.num, this.data.color, this.data.text); - } - } + }, + deep: true, + }, }, computed: {}, created() {}, @@ -40,22 +40,22 @@ export default { methods: { init_health(num, color, text) { var options = { - color:[color,'#c9cedd'], + color: [color, "#c9cedd"], title: { text: num + "%", textStyle: { color: "#000", fontSize: 26, - fontWeight: 200 + fontWeight: 200, }, subtext: text, subtextStyle: { color: "#707693", - fontSize: 12 + fontSize: 12, }, itemGap: 0, // 主副标题距离 left: "center", - top: "center" + top: "center", }, angleAxis: { max: 100, // 满分 @@ -63,119 +63,124 @@ export default { startAngle: 90, // 隐藏刻度线 axisLine: { - show: false + show: false, }, axisTick: { - show: false + show: false, }, axisLabel: { - show: false + show: false, }, splitLine: { - show: false - } + show: false, + }, }, radiusAxis: { type: "category", // 隐藏刻度线 axisLine: { - show: false + show: false, }, axisTick: { - show: false + show: false, }, axisLabel: { - show: false + show: false, }, splitLine: { - show: false - } + show: false, + }, }, polar: { center: ["50%", "50%"], - radius: "140%" //图形大小 + radius: "140%", //图形大小 }, series: [ { - type: 'pie', - z:5, - center:['50%','50%'], - radius:['68%','72%'], - silent:true, - label: { - normal: { - show: false + type: "pie", + z: 5, + center: ["50%", "50%"], + radius: ["68%", "72%"], + silent: true, + label: { + normal: { + show: false, + }, + emphasis: { + show: false, + }, }, - emphasis: { - show: false - } - }, - labelLine: { - normal: { - show: false + labelLine: { + normal: { + show: false, + }, + emphasis: { + show: false, + }, }, - emphasis: { - show: false - } - }, - tooltip: { - show: false - }, - data:[{ - name:'', - value:num - },{ - name:'', - value:100 - num - }] - }, + tooltip: { + show: false, + }, + data: [ + { + name: "", + value: num, + }, + { + name: "", + value: 100 - num, + }, + ], + }, { - type:'pie', - z:4, - center:['50%','50%'], - radius:['60%','80%'], - hoverAnimation:false, - avoidLabelOverlap: false, - label: { - normal: { - show: false + type: "pie", + z: 4, + center: ["50%", "50%"], + radius: ["60%", "80%"], + hoverAnimation: false, + avoidLabelOverlap: false, + label: { + normal: { + show: false, + }, + emphasis: { + show: false, + }, }, - emphasis: { - show: false - } - }, - labelLine: { - normal: { - show: false + labelLine: { + normal: { + show: false, + }, + emphasis: { + show: false, + }, + }, + tooltip: { + show: false, + }, + itemStyle: { + normal: { + color: "#f6f7fc", + }, }, emphasis: { - show: false - } - }, - tooltip: { - show: false - }, - itemStyle: { - normal: { - color:'#f6f7fc' - } - }, - emphasis:{ - show:false, - itemStyle:{ - color:'#f6f7fc' - } - }, - data: [{ - value: 1, - }], - } - ] + show: false, + itemStyle: { + color: "#f6f7fc", + }, + }, + data: [ + { + value: 1, + }, + ], + }, + ], }; window[this.health] = echarts.init(document.getElementById(this.health)); window[this.health].setOption(options, true); - } - } + }, + }, }; diff --git a/src/components/menu.vue b/src/components/menu.vue index fdf75df8581f573d8810262959a6dab293a2d5d3..fa90efb3066e65233e9e7b1f5d51d8eebe25c209 100644 --- a/src/components/menu.vue +++ b/src/components/menu.vue @@ -186,7 +186,6 @@ export default { }, navAction(path) { this.now_menu = path; - window.sessionStorage.setItem("menuVisitUrl", path); this.$router.push(path); }, gotoChildPage(v, parent) { @@ -200,7 +199,6 @@ export default { this.$router.push(v.visit_url); } this.now_menu = parent; - window.sessionStorage.setItem("menuVisitUrl", parent); } }, getList() { @@ -218,8 +216,7 @@ export default { }); }, getMenuIndex() { - let visit_url = window.sessionStorage.getItem("menuVisitUrl"); - this.now_menu = visit_url ? visit_url : ""; + this.now_menu = this.$route.path; }, getNowMenu() { this.$api.general.getNowMenu({ teamName: "APAAS3" }).then((response) => { @@ -242,7 +239,6 @@ export default { } else { } this.menu_arr = arr; - console.log(this.user_arr); this.getMenuIndex(); } }); diff --git a/src/components/shop-cloud/shop-cloud.vue b/src/components/shop-cloud/shop-cloud.vue index 92178b419df176267e5d2ee6eca14d7306fd1631..eecc30616695a9d865b2a0eebd32a9d4db2facde 100644 --- a/src/components/shop-cloud/shop-cloud.vue +++ b/src/components/shop-cloud/shop-cloud.vue @@ -7,19 +7,19 @@ - + -
申请部门:
- +
申请组织:
+
- +
部门联系人:
- +
联系电话:
@@ -32,25 +32,25 @@ - +
基本信息
- +
工作区域名称:
- +
中文名称:
- +
描述信息:
工作区域申请规格
- +
CPU:
@@ -77,7 +77,7 @@
- +
内存:
GB
- +
容器组:
- - -
数据盘(可选):
- -
+ +
数据盘(可选):
- + - + GB -
单个容器组规格
- +
CPU:
- + +
内存:
+
+
最高
- +
默认
- -
内存:
-
- +
最高
GB
- +
默认
其他信息
- +
申请时长:
- +
选择要进行调整的工作区域:
@@ -271,7 +260,7 @@
- + @@ -308,7 +297,7 @@
- +
申请CPU调整为:
@@ -322,7 +311,7 @@
- +
申请内存调整为:
GB
- +
申请容器组调整为:
- +
调整数据盘:
- +
增加数据盘:
- + - + - +
CPU:
- + +
内存:
+
+
最高
- +
默认
- -
内存:
-
- +
最高
GB
- +
默认
- +
申请续期:
+
@@ -71,12 +72,32 @@ export default { ], userNav2: [ { - name: "服务分析", + name: "运营分析", path: `/data_analysis/super_service`, + child: [ + { + name: "服务分析", + path: `/data_analysis/super_service`, + }, + { + name: "应用分析", + path: `/data_analysis/super_application`, + }, + ], }, { - name: "应用分析", - path: `/data_analysis/super_application`, + name: "运行管控", + path: `/data_analysis/1`, + child: [ + { + name: "运行概况", + path: `/data_analysis/1`, + }, + { + name: "服务管控", + path: `/data_analysis/1`, + }, + ], }, ], navList: [], @@ -125,4 +146,8 @@ export default { background-color: #f6f7fb; overflow: auto; } +.skeleton { + width: 180px; + background-color: #0d1847; +} diff --git a/src/pages/data-analysis/my-application.vue b/src/pages/data-analysis/my-application.vue index c29ebea12e5972a4f414f20beb6fc682b82c7343..6c63be39455bd49b4922ac3955609e2e49ccdcb2 100644 --- a/src/pages/data-analysis/my-application.vue +++ b/src/pages/data-analysis/my-application.vue @@ -2,7 +2,7 @@
{{ $t("lang.data_analysis") }} - {{ $t("lang.my_application_data_analysis") }} + {{ $t("lang.application_data_analysis") }} diff --git a/src/pages/data-analysis/my-service.vue b/src/pages/data-analysis/my-service.vue index 0765e66081c66d5a36943514687c7f6678917c79..4a5c637dfd1bdd1df0680d965ff963c1fabae237 100644 --- a/src/pages/data-analysis/my-service.vue +++ b/src/pages/data-analysis/my-service.vue @@ -8,7 +8,7 @@ {{ - $t("lang.my_service_data_analysis") + $t("lang.service_data_analysis") }} @@ -71,7 +71,7 @@ @changeButton="changeApplicationFieldBtn" class="block" > - + @@ -635,6 +635,7 @@ export default { } }); }, + getServiceTransfer() {}, detailHotSearch(item) { this.$router.push("/fwgl/0/0/servicedetail/" + item.id); }, @@ -676,7 +677,7 @@ export default { if (index == 0) { this.getServiceHealth(); } else { - this.a(); + this.getServiceTransfer(); } }, }, diff --git a/src/pages/data-analysis/org-application.vue b/src/pages/data-analysis/org-application.vue index b60948f3fa4ff67ddfcb89b45a13f53565a70557..cb9c90092271b84a1d4bbf842ad56b2b2763e3a1 100644 --- a/src/pages/data-analysis/org-application.vue +++ b/src/pages/data-analysis/org-application.vue @@ -2,7 +2,12 @@
{{ $t("lang.data_analysis") }} - {{ $t("lang.my_application_data_analysis") }} + + {{ + $t("lang.operational_analysis") + }} + + {{ $t("lang.application_data_analysis") }} @@ -254,7 +259,7 @@ :show_header="true" title="应用审批状态分析" class="block" - :buttons_arr="['申请状态', '待审批']" + :buttons_arr="['申请状态', '申请类型']" @changeButton="changeAppSpBtn" > ({ isyysp: true, water_polo: [64, 36], overview: { - month_chain: 12, - week_chain: 20, - total: 1324, - day_count: 21 + month_chain: 0, + week_chain: 0, + total: 0, + day_count: 0, }, now_used_count_day: 7, now_app_type: 1, @@ -310,458 +315,216 @@ export default { now_app_count: 14, now_app_deploy: 1, now_app_evalute: 1, + now_app_approval: 0, + now_app_approval_state: 0, mult_data: [ - { name: "基础工具", value: 22 }, - { name: "通用应用", value: 12 }, - { name: "业务应用", value: 10 } + { name: "基础工具", value: 0 }, + { name: "通用应用", value: 0 }, + { name: "业务应用", value: 0 }, ], text: "应用总数", spIndicatorStyles1: false, spRefLineStyles3: { stroke: "#d14", strokeOpacity: 0, - strokeDasharray: "2, 2" + strokeDasharray: "2, 2", }, spCurveStyles2: { stroke: "#274fee", - fill: "#274fee" + fill: "#274fee", }, Yysp_data: [ - { name: "已审批", value: 15 }, - { name: "待审批", value: 45 } + { name: "已审批", value: 0 }, + { name: "待审批", value: 0 }, ], Yysp_text: "应用审批", serviceSpData: { - xAxisData: [ - "07-01", - "07-02", - "07-03", - "07-04", - "07-05", - "07-06", - "07-07", - "07-08", - "07-09", - "07-10", - "07-11", - "07-12", - "07-13", - "07-14" - ], - seriesData: [ - { - name: "已审批", - data: [ - 300, - 400, - 350, - 280, - 480, - 520, - 500, - 460, - 300, - 400, - 350, - 280, - 480, - 520, - 500, - 460 - ] - }, - { - name: "未审批", - data: [ - 300, - 350, - 400, - 280, - 320, - 450, - 400, - 350, - 300, - 350, - 400, - 280, - 320, - 450, - 400, - 350 - ] - } - ] + xAxisData: [], + seriesData: [], }, spCurveStyles3: { stroke: "#e56600", - fill: "#e56600" + fill: "#e56600", }, sparkline1: { - arr: [1, 2, 3, 4, 8, 9, 10, 21], - num: 21, - up: 15.3 + arr: [], + num: 0, + up: 0, }, sparkline2: { - arr: [1, 2, 3, 4, 8, 9, 10, 21], - num: 18, - up: -19.3 + arr: [], + num: 0, + up: 0, }, single_data: { - num: 54, + num: 0, color: "#274fee", - text: "平台应用" + text: "平台应用", }, single_data1: { - num: 56, + num: 0, color: "#e56600", - text: "开发者应用" + text: "开发者应用", }, line_data: { - xAxisData: [ - "07-01", - "07-02", - "07-03", - "07-04", - "07-05", - "07-06", - "07-07", - "07-08", - "07-09", - "07-10", - "07-11", - "07-12", - "07-13", - "07-14" - ], - seriesData: [ - { - name: "开发者应用", - data: [ - 300, - 200, - 150, - 280, - 480, - 520, - 500, - 222, - 300, - 400, - 350, - 280, - 480, - 520, - 500, - 222 - ] - }, - { - name: "平台应用", - data: [ - 300, - 400, - 350, - 280, - 480, - 520, - 500, - 222, - 100, - 200, - 350, - 280, - 260, - 320, - 500, - 222 - ] - }, - { - name: "未上架", - data: [ - 300, - 350, - 366, - 280, - 320, - 450, - 366, - 350, - 300, - 350, - 366, - 280, - 320, - 450, - 366, - 350 - ] - } - ] + xAxisData: [], + seriesData: [], }, bar_data_org: { - legendData: [ - "省公安厅", - "省发改委", - "贵州省公安厅", - "贵州省发改委", - "贵州省公安厅" - ], - seriesData: [322, 454, 266, 399, 222, 167] + legendData: [], + seriesData: [], }, bar_data_area: { - legendData: ["经济建设", "城市建设", "道路交通", "环境资源", "其他"], - seriesData: [322, 454, 566, 399, 222, 167] + legendData: [], + seriesData: [], }, graph_arr: { legend: { - data: ["被调用次数", "调用次数"] + data: ["被调用次数", "调用次数"], }, - data: ["07-01", "07-02", "07-03", "07-04", "07-05", "07-06", "07-07"], + data: [], series: [ - { name: "被调用次数", data: [300, 350, 366, 280, 320, 450, 366] }, - { name: "调用次数", data: [400, 350, 280, 480, 520, 500, 222] } - ] + { name: "被调用次数", data: [] }, + { name: "调用次数", data: [] }, + ], }, toplistData: [ { cover: "/apaas/static/docs/image/image/blob_206e8a81-6698-4946-9988-815d345f7f2f.blob", service_name: "postgresql V11.1", - request_count: 30 + request_count: 30, }, { cover: "/apaas/static/docs/image/image/blob_206e8a81-6698-4946-9988-815d345f7f2f.blob", service_name: "钉钉 V1.0", - request_count: 22 + request_count: 22, }, { cover: "/apaas/static/docs/image/image/blob_206e8a81-6698-4946-9988-815d345f7f2f.blob", service_name: "易智瑞 V11.3", - request_count: 21 + request_count: 21, }, { cover: "/apaas/static/docs/image/image/blob_206e8a81-6698-4946-9988-815d345f7f2f.blob", service_name: "CAS单点登录 V1.0", - request_count: 18 + request_count: 18, }, { cover: "/apaas/static/docs/image/image/blob_206e8a81-6698-4946-9988-815d345f7f2f.blob", service_name: "postgresql V11.1", - request_count: 15 + request_count: 15, }, { cover: "/apaas/static/docs/image/image/blob_206e8a81-6698-4946-9988-815d345f7f2f.blob", service_name: "CAS单点登录 V1.0", - request_count: 12 + request_count: 12, }, { cover: "/apaas/static/docs/image/image/blob_206e8a81-6698-4946-9988-815d345f7f2f.blob", service_name: "postgresql V11.1", - request_count: 10 + request_count: 10, }, { cover: "/apaas/static/docs/image/image/blob_206e8a81-6698-4946-9988-815d345f7f2f.blob", service_name: "CAS单点登录 V1.0", - request_count: 8 + request_count: 8, }, { cover: "/apaas/static/docs/image/image/blob_206e8a81-6698-4946-9988-815d345f7f2f.blob", service_name: "postgresql V11.1", - request_count: 6 + request_count: 6, }, { cover: "/apaas/static/docs/image/image/blob_206e8a81-6698-4946-9988-815d345f7f2f.blob", service_name: "CAS单点登录 V1.0", - request_count: 6 + request_count: 6, }, { cover: "/apaas/static/docs/image/image/blob_206e8a81-6698-4946-9988-815d345f7f2f.blob", service_name: "postgresql V11.1", - request_count: 4 + request_count: 4, }, { cover: "/apaas/static/docs/image/image/blob_206e8a81-6698-4946-9988-815d345f7f2f.blob", service_name: "CAS单点登录 V1.0", - request_count: 2 - } + request_count: 2, + }, ], // 应用部署排名分析 toplistTargetValue: 150, // 应用部署排名分析 目标值 appInfoBtnIndex: 0, - commentlistData: [ - { - picture_path: - "/apaas/static/docs/image/image/blob_206e8a81-6698-4946-9988-815d345f7f2f.blob", - user_name: "孤独的狼", - add_time: "2020-08-01 19:00:00", - score: 4, - message: "这个应用非常实用,可以应用到多个业务领域!" - }, - { - picture_path: - "/apaas/static/docs/image/image/blob_206e8a81-6698-4946-9988-815d345f7f2f.blob", - user_name: "大锤", - add_time: "2020-08-01 19:00:00", - score: 4, - message: "这个应用非常实用,可以应用到多个业务领域!" - }, - { - picture_path: - "/apaas/static/docs/image/image/blob_206e8a81-6698-4946-9988-815d345f7f2f.blob", - user_name: "阿水", - add_time: "2020-08-01 19:00:00", - score: 3, - message: "这个应用非常实用,可以应用到多个业务领域!" - }, - { - picture_path: - "/apaas/static/docs/image/image/blob_206e8a81-6698-4946-9988-815d345f7f2f.blob", - user_name: "孤独的狼", - add_time: "2020-08-01 19:00:00", - score: 4, - message: "这个应用非常实用,可以应用到多个业务领域!" - }, - { - picture_path: - "/apaas/static/docs/image/image/blob_206e8a81-6698-4946-9988-815d345f7f2f.blob", - user_name: "孤独的狼", - add_time: "2020-08-01 19:00:00", - score: 4, - message: "这个应用非常实用,可以应用到多个业务领域!" - } - ], // 应用评价 - starlistData: [ - { - star: 5, - count: 5, - unit: "个" - }, - { - star: 4, - count: 4, - unit: "个" - }, - { - star: 3, - count: 3, - unit: "个" - }, - { - star: 2, - count: 2, - unit: "个" - }, - { - star: 1, - count: 1, - unit: "个" - } - ], // 应用评分 + commentlistData: [], // 应用评价 + starlistData: [], // 应用评分 starlistTotal: 10, hotSearchHeader: [], // 热门搜索 表头 - hotSearchData: [ - { - id: 1, - hotIndex: 1, - name: "地图视频融合服务", - count: 9964, - increases: 568 - }, - { - id: 1, - hotIndex: 2, - name: "消息队列服务", - count: 8964, - increases: 528 - }, - { - id: 1, - hotIndex: 3, - name: "即时通讯服务", - count: 7864, - increases: 89 - }, - { - id: 1, - hotIndex: 4, - name: "即时通讯服务这里最多显示十五字地图视频融合服务", - count: 4964, - increases: -8 - }, - { - id: 1, - hotIndex: 5, - name: "即时通讯服务这里最多显示十五字地图视频融合服务", - count: 3364, - increases: -18 - } - ] // 热门搜索 数据 + hotSearchData: [], // 热门搜索 数据 }), mounted() { - // this.getAppOverview(); - // this.getAppUsedCount(); - // this.getAppType(); - // this.getAppSourceOri(); - // this.getAppUsedArea(); - // this.getAppCount(); - // this.getAppDeployRank(); - // this.getAppEvaluate(); - // this.getAppOnlineState(); - // this.getAppHot(); + this.getAppOverview(); + this.getAppUsedCount(); + this.getAppType(); + this.getAppSourceOri(); + this.getAppUsedArea(); + this.getAppCount(); + this.getAppDeployRank(); + this.getAppEvaluate(); + this.getAppOnlineState(); + this.getAppHot(); + this.getAppApproval(); + this.getAppApprovalState(); this.hotSearchHeader = [ { label: "排名", type: "hot-index", width: 100, - align: "center" + align: "center", }, { label: "应用名称", prop: "name", type: "button", - callback: this.detailHotSearch + callback: this.detailHotSearch, }, { label: "搜索次数", prop: "count", width: 100, - align: "center" + align: "center", }, { label: "日涨幅", prop: "increases", width: 100, sortType: "0", // 0:升序 1:降序 - align: "center" - } + align: "center", + }, ]; }, methods: { getAppOverview() { - this.$api.dataAnalysis.getAppOverview().then(response => { + this.$api.dataAnalysis.getAppOverview().then((response) => { if (response.data.success == 1) { let data = response.data.data; this.overview = { month_chain: parseFloat(data.month_lr), week_chain: parseFloat(data.week_lr), total: data.total, - day_count: data.ave_deploy_count + day_count: data.ave_deploy_count, }; this.water_polo = [ parseFloat(data.developable_ratio), - parseFloat(data.un_developable_ratio) + parseFloat(data.un_developable_ratio), ]; } }); @@ -769,7 +532,7 @@ export default { getAppUsedCount() { this.$api.dataAnalysis .getAppUsedCount({ day: this.now_used_count_day }) - .then(response => { + .then((response) => { if (response.data.success == 1) { let data = response.data.data; this.graph_arr = data; @@ -779,7 +542,7 @@ export default { getAppType() { this.$api.dataAnalysis .getAppType({ type: this.now_app_type }) - .then(response => { + .then((response) => { if (response.data.success == 1) { let data = response.data.data; this.mult_data = data.series[0].data; @@ -787,12 +550,12 @@ export default { }); }, getAppSourceOri() { - this.$api.dataAnalysis.getAppSourceOri().then(response => { + this.$api.dataAnalysis.getAppSourceOri().then((response) => { if (response.data.success == 1) { let data = response.data.data; this.bar_data_org = { legendData: data.xAxis.data, - seriesData: data.series[0].data + seriesData: data.series[0].data, }; } }); @@ -800,12 +563,12 @@ export default { getAppUsedArea() { this.$api.dataAnalysis .getAppUsedArea({ type: this.now_app_used_area }) - .then(response => { + .then((response) => { if (response.data.success == 1) { let data = response.data.data; this.bar_data_area = { legendData: data.xAxis.data, - seriesData: data.series[0].data + seriesData: data.series[0].data, }; } }); @@ -813,12 +576,12 @@ export default { getAppCount() { this.$api.dataAnalysis .getAppCount({ day: this.now_app_count }) - .then(response => { + .then((response) => { if (response.data.success == 1) { let data = response.data.data; this.line_data = { xAxisData: data.data, - seriesData: data.series + seriesData: data.series, }; } }); @@ -826,22 +589,22 @@ export default { getAppDeployRank() { this.$api.dataAnalysis .getAppDeployRank({ type: this.now_app_deploy }) - .then(response => { + .then((response) => { if (response.data.success == 1) { let data = response.data.data; this.toplistData = []; if (data && data.length) { this.toplistTargetValue = data[0].num; - data.forEach(e => { + data.forEach((e) => { this.toplistData.push({ service_name: e.name, request_count: e.num, cover: e.logo, service_id: { id: e.app_id, - source: e.source + source: e.source, }, - data_service_type1: 124 + data_service_type1: 124, }); }); } @@ -851,19 +614,19 @@ export default { getAppEvaluate() { this.$api.dataAnalysis .getAppEvaluate({ type: this.now_app_evalute }) - .then(response => { + .then((response) => { if (response.data.success == 1) { let data = response.data.data; if (this.now_app_evalute == 1) { this.commentlistData = []; if (data && data.length) { - data.forEach(e => { + data.forEach((e) => { this.commentlistData.push({ add_time: e.add_time, message: e.content, picture_path: e.picture_path, score: e.score, - user_name: e.picture_path + user_name: e.picture_path, }); }); } @@ -872,11 +635,11 @@ export default { this.starlistData = []; var temp = []; if (data && data.length) { - data.forEach(e => { + data.forEach((e) => { temp.push(e.num); this.starlistData.push({ star: e.name, - count: e.num + count: e.num, }); }); this.starlistTotal = Math.max(...temp); @@ -886,24 +649,24 @@ export default { }); }, getAppOnlineState() { - this.$api.dataAnalysis.getAppOnlineState().then(response => { + this.$api.dataAnalysis.getAppOnlineState().then((response) => { if (response.data.success == 1) { let data = response.data.data; this.single_data = { num: data.platform, color: "#274fee", - text: "平台应用" + text: "平台应用", }; this.single_data1 = { num: data.develop, color: "#e56600", - text: "开发者应用" + text: "开发者应用", }; } }); }, getAppHot() { - this.$api.dataAnalysis.getAppHot().then(response => { + this.$api.dataAnalysis.getAppHot().then((response) => { if (response.data.success == 1) { let data = response.data.data; let user = data.user || {}; @@ -912,14 +675,14 @@ export default { this.sparkline1 = { arr: user.line_chart ? user.line_chart.series[0].data : [], num: user.today_num ? user.today_num : 0, - up: user.ratio ? parseFloat(user.ratio) : 0 + up: user.ratio ? parseFloat(user.ratio) : 0, }; this.sparkline2 = { arr: ave_search.line_chart ? ave_search.line_chart.series[0].data : [], num: ave_search.today_num ? ave_search.today_num : 0, - up: ave_search.ratio ? parseFloat(ave_search.ratio) : 0 + up: ave_search.ratio ? parseFloat(ave_search.ratio) : 0, }; this.hotSearchData = []; search_app.forEach((e, idx) => { @@ -929,12 +692,38 @@ export default { hotIndex: idx + 1, name: e.name, count: e.num, - increases: parseFloat(e.ratio) + increases: parseFloat(e.ratio), }); }); } }); }, + getAppApproval() { + this.$api.dataAnalysis + .getAppApproval({ day: this.now_app_approval }) + .then((response) => { + if (response.data.success == 1) { + let data = response.data.data; + this.serviceSpData = { + xAxisData: data.data, + seriesData: data.series, + }; + } + }); + }, + getAppApprovalState() { + this.$api.dataAnalysis + .getAppApproval({ day: this.now_app_approval_state }) + .then((response) => { + if (response.data.success == 1) { + let data = response.data.data; + this.serviceSpData = { + xAxisData: data.data, + seriesData: data.series, + }; + } + }); + }, detailHotSearch(item) { console.log("查看热搜详情"); this.$router.push(`/yygl/0/0/detail/${item.id}?source=${item.source}`); @@ -942,769 +731,65 @@ export default { hotSearchSortChange(sortInfo) { console.log("应用热门搜索: " + sortInfo); }, - changeAppSpChangeBtn(val) { - if (val === 0) { - this.serviceSpData = { - xAxisData: [ - "07-01", - "07-02", - "07-03", - "07-04", - "07-05", - "07-06", - "07-07", - "07-08", - "07-09", - "07-10", - "07-11", - "07-12", - "07-13", - "07-14" - ], - seriesData: [ - { - name: "已审批", - data: [ - 300, - 400, - 350, - 280, - 480, - 520, - 500, - 460, - 300, - 400, - 350, - 280, - 480, - 520, - 500, - 460 - ] - }, - { - name: "未审批", - data: [ - 300, - 350, - 400, - 280, - 320, - 450, - 400, - 350, - 300, - 350, - 400, - 280, - 320, - 450, - 400, - 350 - ] - } - ] - }; + changeAppSpChangeBtn(index) { + if (index == 0) { + this.now_app_approval = 14; } else { - this.serviceSpData = { - xAxisData: [ - "07-01", - "07-02", - "07-03", - "07-04", - "07-05", - "07-06", - "07-07", - "07-08", - "07-09", - "07-10", - "07-11", - "07-12", - "07-13", - "07-14", - "07-15", - "07-16", - "07-17", - "07-18", - "07-19", - "07-20", - "07-21", - "07-22", - "07-23", - "07-24", - "07-25", - "07-26", - "07-27", - "07-28", - "07-29", - "07-30" - ], - seriesData: [ - { - name: "已审批", - data: [ - 300, - 400, - 350, - 280, - 480, - 520, - 500, - 460, - 300, - 400, - 350, - 280, - 480, - 520, - 500, - 460, - 300, - 350, - 400, - 280, - 320, - 450, - 400, - 350, - 300, - 350, - 400, - 280, - 320, - 450, - 400, - 350 - ] - }, - { - name: "未审批", - data: [ - 300, - 350, - 400, - 280, - 320, - 450, - 400, - 350, - 300, - 350, - 400, - 280, - 320, - 450, - 400, - 350, - 300, - 400, - 350, - 280, - 480, - 520, - 500, - 460, - 300, - 400, - 350, - 280, - 480, - 520, - 500, - 460 - ] - } - ] - }; + this.now_app_approval = 30; } + this.getAppApproval(); }, - changeAppSpBtn(val) { - if (val === 0) { - this.Yysp_data = [ - { name: "已审批", value: 15 }, - { name: "待审批", value: 45 } - ]; - this.isyysp = true; - } else { - this.Yysp_data = [ - { name: "申请部署", value: 5 }, - { name: "申请开发", value: 15 } - ]; - this.isyysp = false; - } + changeAppSpBtn(index) { + this.now_app_approval_state = index; + this.getAppApprovalState(); }, changeServiceTypeBtn(index) { - if (index === 0) { - this.mult_data = [ - { name: "基础工具", value: 22 }, - { name: "通用应用", value: 12 }, - { name: "业务应用", value: 10 } - ]; + if (index == 0) { + this.now_app_type = 1; } else { - this.mult_data = [ - { name: "基础工具", value: 6 }, - { name: "通用应用", value: 20 }, - { name: "业务应用", value: 14 } - ]; + this.now_app_type = 2; } - // if (index == 0) { - // this.now_app_type = 1; - // } else { - // this.now_app_type = 2; - // } - // this.getAppType(); + this.getAppType(); }, changeAppAreaTypeBtn(index) { - if (index === 0) { - this.bar_data_area = { - legendData: ["经济建设", "城市建设", "道路交通", "环境资源", "其他"], - seriesData: [322, 454, 566, 399, 222, 167] - }; + if (index == 0) { + this.now_app_used_area = 1; } else { - this.bar_data_area = { - legendData: ["经济建设", "城市建设", "道路交通", "环境资源", "其他"], - seriesData: [222, 354, 466, 499, 422, 367] - }; + this.now_app_used_area = 2; } - // if (index == 0) { - // this.now_app_used_area = 1; - // } else { - // this.now_app_used_area = 2; - // } - // this.getAppUsedArea(); + this.getAppUsedArea(); }, changeApplicationFieldBtn(index) { console.log("xxx: " + index); }, changeServiceCellBtn(index) { - if (index === 0) { - this.graph_arr = { - legend: { - data: ["被调用次数", "调用次数"] - }, - data: ["07-01", "07-02", "07-03", "07-04", "07-05", "07-06", "07-07"], - series: [ - { name: "被调用次数", data: [300, 350, 366, 280, 320, 450, 366] }, - { name: "调用次数", data: [400, 350, 280, 480, 520, 500, 222] } - ] - }; + if (index == 0) { + this.now_used_count_day = 7; } else { - this.graph_arr = { - legend: { - data: ["被调用次数", "调用次数"] - }, - data: [ - "07-01", - "07-02", - "07-03", - "07-04", - "07-05", - "07-06", - "07-07", - "07-08", - "07-09", - "07-10", - "07-11", - "07-12", - "07-13", - "07-14", - "07-15", - "07-16", - "07-17", - "07-18", - "07-19", - "07-20", - "07-21", - "07-22", - "07-23", - "07-24", - "07-25", - "07-26", - "07-27", - "07-28", - "07-29", - "07-30" - ], - series: [ - { - name: "被调用次数", - data: [ - 300, - 350, - 366, - 280, - 320, - 450, - 366, - 400, - 350, - 280, - 480, - 520, - 500, - 222, - 300, - 350, - 366, - 280, - 320, - 450, - 366, - 400, - 350, - 280, - 480, - 520, - 500, - 222, - 333, - 444 - ] - }, - { - name: "调用次数", - data: [ - 400, - 350, - 280, - 480, - 520, - 500, - 222, - 300, - 350, - 366, - 280, - 320, - 450, - 366, - 400, - 350, - 280, - 480, - 520, - 500, - 222, - 333, - 444, - 400, - 350, - 280, - 480, - 520, - 500, - 222 - ] - } - ] - }; + this.now_used_count_day = 30; } - // if (index == 0) { - // this.now_used_count_day = 7; - // } else { - // this.now_used_count_day = 30; - // } - // this.getAppUsedCount(); + this.getAppUsedCount(); }, changeServeiceApplyCountBtn(index) { - if (index === 0) { - this.toplistData = [ - { - cover: - "/apaas/static/docs/image/image/blob_206e8a81-6698-4946-9988-815d345f7f2f.blob", - service_name: "postgresql V11.1", - request_count: 30 - }, - { - cover: - "/apaas/static/docs/image/image/blob_206e8a81-6698-4946-9988-815d345f7f2f.blob", - service_name: "钉钉 V1.0", - request_count: 22 - }, - { - cover: - "/apaas/static/docs/image/image/blob_206e8a81-6698-4946-9988-815d345f7f2f.blob", - service_name: "易智瑞 V11.3", - request_count: 21 - }, - { - cover: - "/apaas/static/docs/image/image/blob_206e8a81-6698-4946-9988-815d345f7f2f.blob", - service_name: "CAS单点登录 V1.0", - request_count: 18 - }, - { - cover: - "/apaas/static/docs/image/image/blob_206e8a81-6698-4946-9988-815d345f7f2f.blob", - service_name: "postgresql V11.1", - request_count: 15 - }, - { - cover: - "/apaas/static/docs/image/image/blob_206e8a81-6698-4946-9988-815d345f7f2f.blob", - service_name: "CAS单点登录 V1.0", - request_count: 12 - }, - { - cover: - "/apaas/static/docs/image/image/blob_206e8a81-6698-4946-9988-815d345f7f2f.blob", - service_name: "postgresql V11.1", - request_count: 10 - }, - { - cover: - "/apaas/static/docs/image/image/blob_206e8a81-6698-4946-9988-815d345f7f2f.blob", - service_name: "CAS单点登录 V1.0", - request_count: 8 - }, - { - cover: - "/apaas/static/docs/image/image/blob_206e8a81-6698-4946-9988-815d345f7f2f.blob", - service_name: "postgresql V11.1", - request_count: 6 - }, - { - cover: - "/apaas/static/docs/image/image/blob_206e8a81-6698-4946-9988-815d345f7f2f.blob", - service_name: "CAS单点登录 V1.0", - request_count: 6 - }, - { - cover: - "/apaas/static/docs/image/image/blob_206e8a81-6698-4946-9988-815d345f7f2f.blob", - service_name: "postgresql V11.1", - request_count: 4 - }, - { - cover: - "/apaas/static/docs/image/image/blob_206e8a81-6698-4946-9988-815d345f7f2f.blob", - service_name: "CAS单点登录 V1.0", - request_count: 2 - } - ]; - } else { - this.toplistData = [ - { - cover: - "/apaas/static/docs/image/image/blob_206e8a81-6698-4946-9988-815d345f7f2f.blob", - service_name: "postgresql V11.1", - request_count: 35 - }, - { - cover: - "/apaas/static/docs/image/image/blob_206e8a81-6698-4946-9988-815d345f7f2f.blob", - service_name: "钉钉 V1.0", - request_count: 30 - }, - { - cover: - "/apaas/static/docs/image/image/blob_206e8a81-6698-4946-9988-815d345f7f2f.blob", - service_name: "易智瑞 V11.3", - request_count: 27 - }, - { - cover: - "/apaas/static/docs/image/image/blob_206e8a81-6698-4946-9988-815d345f7f2f.blob", - service_name: "CAS单点登录 V1.0", - request_count: 25 - }, - { - cover: - "/apaas/static/docs/image/image/blob_206e8a81-6698-4946-9988-815d345f7f2f.blob", - service_name: "postgresql V11.1", - request_count: 15 - }, - { - cover: - "/apaas/static/docs/image/image/blob_206e8a81-6698-4946-9988-815d345f7f2f.blob", - service_name: "CAS单点登录 V1.0", - request_count: 12 - }, - { - cover: - "/apaas/static/docs/image/image/blob_206e8a81-6698-4946-9988-815d345f7f2f.blob", - service_name: "postgresql V11.1", - request_count: 11 - }, - { - cover: - "/apaas/static/docs/image/image/blob_206e8a81-6698-4946-9988-815d345f7f2f.blob", - service_name: "CAS单点登录 V1.0", - request_count: 10 - }, - { - cover: - "/apaas/static/docs/image/image/blob_206e8a81-6698-4946-9988-815d345f7f2f.blob", - service_name: "postgresql V11.1", - request_count: 6 - }, - { - cover: - "/apaas/static/docs/image/image/blob_206e8a81-6698-4946-9988-815d345f7f2f.blob", - service_name: "CAS单点登录 V1.0", - request_count: 6 - }, - { - cover: - "/apaas/static/docs/image/image/blob_206e8a81-6698-4946-9988-815d345f7f2f.blob", - service_name: "postgresql V11.1", - request_count: 4 - }, - { - cover: - "/apaas/static/docs/image/image/blob_206e8a81-6698-4946-9988-815d345f7f2f.blob", - service_name: "CAS单点登录 V1.0", - request_count: 2 - } - ]; - } - // console.log("应用部署排名分析: " + index); - // this.now_app_deploy = index + 1; - // this.getAppDeployRank(); + console.log("应用部署排名分析: " + index); + this.now_app_deploy = index + 1; + this.getAppDeployRank(); }, changeAppInfoBtn(index) { this.appInfoBtnIndex = index; this.now_app_evalute = index + 1; - // this.getAppEvaluate(); - // console.log("应用评价及评分: " + index); + this.getAppEvaluate(); + console.log("应用评价及评分: " + index); }, changeAppTotalChangeBtn(index) { - if (index === 0) { - this.line_data = { - xAxisData: [ - "07-01", - "07-02", - "07-03", - "07-04", - "07-05", - "07-06", - "07-07", - "07-08", - "07-09", - "07-10", - "07-11", - "07-12", - "07-13", - "07-14" - ], - seriesData: [ - { - name: "开发者应用", - data: [ - 300, - 200, - 150, - 280, - 480, - 520, - 500, - 222, - 300, - 400, - 350, - 280, - 480, - 520, - 500, - 222 - ] - }, - { - name: "平台应用", - data: [ - 300, - 400, - 350, - 280, - 480, - 520, - 500, - 222, - 100, - 200, - 350, - 280, - 260, - 320, - 500, - 222 - ] - }, - { - name: "未上架", - data: [ - 300, - 350, - 366, - 280, - 320, - 450, - 366, - 350, - 300, - 350, - 366, - 280, - 320, - 450, - 366, - 350 - ] - } - ] - }; + if (index == 0) { + this.now_app_count = 14; } else { - this.line_data = { - xAxisData: [ - "07-01", - "07-02", - "07-03", - "07-04", - "07-05", - "07-06", - "07-07", - "07-08", - "07-09", - "07-10", - "07-11", - "07-12", - "07-13", - "07-14", - "07-15", - "07-16", - "07-17", - "07-18", - "07-19", - "07-20", - "07-21", - "07-22", - "07-23", - "07-24", - "07-25", - "07-26", - "07-27", - "07-28", - "07-29", - "07-30" - ], - seriesData: [ - { - name: "开发者", - data: [ - 300, - 100, - 250, - 280, - 380, - 220, - 300, - 122, - 200, - 300, - 550, - 480, - 380, - 420, - 300, - 122, - 200, - 250, - 266, - 380, - 220, - 350, - 466, - 250, - 400, - 250, - 266, - 380, - 220, - 350 - ] - }, - { - name: "平台应用", - data: [ - 300, - 400, - 350, - 280, - 480, - 520, - 500, - 222, - 300, - 400, - 350, - 280, - 480, - 520, - 500, - 222, - 300, - 350, - 366, - 280, - 320, - 450, - 366, - 350, - 300, - 350, - 366, - 280, - 320, - 450 - ] - }, - { - name: "未上架", - data: [ - 300, - 350, - 366, - 280, - 320, - 450, - 366, - 350, - 300, - 350, - 366, - 280, - 320, - 450, - 366, - 350, - 300, - 400, - 350, - 280, - 480, - 520, - 500, - 222, - 300, - 400, - 350, - 280, - 480, - 520 - ] - } - ] - }; + this.now_app_count = 30; } - // if (index == 0) { - // this.now_app_count = 14; - // } else { - // this.now_app_count = 30; - // } - // this.getAppCount(); - } - } + this.getAppCount(); + }, + }, }; - \ No newline at end of file diff --git a/src/pages/data-analysis/super-service.vue b/src/pages/data-analysis/super-service.vue index 41ad89b538da52f1a8312b5eacc01e226ba0e808..40518cc2210ee254657d177ef1961bb6bebc4be2 100644 --- a/src/pages/data-analysis/super-service.vue +++ b/src/pages/data-analysis/super-service.vue @@ -6,61 +6,831 @@ $t("lang.data_analysis") }} + + {{ + $t("lang.operational_analysis") + }} + {{ - $t("lang.my_service_data_analysis") + $t("lang.service_data_analysis") }} - -
-

开发中,敬请期待!

-

- 如需技术支持 -
请联系管理员 -

-
-
+ + + + + + +
+
+ +
服务总数
+
{{ overview.serviceTotal }}
+
+ +
+
+
+ + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- - \ No newline at end of file diff --git a/src/request/api/data-analysis.js b/src/request/api/data-analysis.js index 58f300084957cbd5410d11eafc17036e4e08e8c0..b66548ff870aebb5f519c03635e18f8c644ea94e 100644 --- a/src/request/api/data-analysis.js +++ b/src/request/api/data-analysis.js @@ -37,6 +37,12 @@ const dataAnalysis = { getServiceHotSearch() { return axios.get(`/apaas/service/v3/statistics/normal/service/search`); }, + getServiceApprovalChanges() { + return axios.get(``); + }, + getServiceApprovalStatus() { + return axios.get(``); + }, //app getAppOverview(){ @@ -69,6 +75,12 @@ const dataAnalysis = { getAppHot(){ return axios.get(`/apaas/hubApi/analysis/appSearch`); }, + getAppApproval(params) { + return axios.get(`/apaas/hubApi/analysis/approvalChanges?day=${params.type}`); + }, + getAppApprovalState(params) { + return axios.get(`/apaas/hubApi/analysis/approvalStatus?style=${params.type}`); + }, } export default dataAnalysis;