Commit f08b4095 authored by 刘殿昕's avatar 刘殿昕

冲突没处理干净

parent 08458d5a
<template> <template>
<div> <div>
<el-breadcrumb separator="/" class="bread_crumb1"> <el-breadcrumb separator="/" class="bread_crumb1">
<el-breadcrumb-item :to="{ path: '/data_analysis' }">{{ <el-breadcrumb-item :to="{ path: '/data_analysis' }">
{{
$t("lang.dataAnalysis") $t("lang.dataAnalysis")
}}</el-breadcrumb-item> }}
<el-breadcrumb-item>{{ </el-breadcrumb-item>
<el-breadcrumb-item>
{{
$t("lang.myServiceDataAnalysis") $t("lang.myServiceDataAnalysis")
}}</el-breadcrumb-item> }}
</el-breadcrumb-item>
</el-breadcrumb> </el-breadcrumb>
<el-row class="in_analysis"> <el-row class="in_analysis">
<!-- 可横向铺满 --> <!-- 可横向铺满 -->
<el-col :span="6" class="in_left"> <el-col :span="6" class="in_left">
<el-row> <el-row>
<el-col :span="24" class="in_block"> <el-col :span="24" class="in_block">
<block-radius <block-radius :show_header="true" title="服务总体概况" class="block">
:show_header="true"
title="服务总体概况"
class="block"
>
<div class="left_1"> <div class="left_1">
<div ref="left_1_l" class="left_1_l"> <div ref="left_1_l" class="left_1_l">
<img :src="require('@/assets/imgs/data_img_service.gif')" class="left_1_img" /> <img :src="require('@/assets/imgs/data_img_service.gif')" class="left_1_img" />
...@@ -80,10 +80,7 @@ ...@@ -80,10 +80,7 @@
@changeButton="changeServeiceApplyCountBtn" @changeButton="changeServeiceApplyCountBtn"
class="block" class="block"
> >
<toplist <toplist class="block-radius-content" :options="toplistData"></toplist>
class="block-radius-content"
:options="toplistData"
></toplist>
</block-radius> </block-radius>
</el-col> </el-col>
<el-col :span="24" class="in_block"> <el-col :span="24" class="in_block">
...@@ -115,11 +112,7 @@ ...@@ -115,11 +112,7 @@
class="block-radius-content" class="block-radius-content"
:data="commentlistData" :data="commentlistData"
></commentlist> ></commentlist>
<starlist <starlist v-else class="block-radius-content" :options="starlistData"></starlist>
v-else
class="block-radius-content"
:options="starlistData"
></starlist>
</block-radius> </block-radius>
</el-col> </el-col>
</el-row> </el-row>
...@@ -132,10 +125,7 @@ ...@@ -132,10 +125,7 @@
</el-col> </el-col>
<el-col :span="18" class="in_block default"> <el-col :span="18" class="in_block default">
<block-radius class="block"> <block-radius class="block">
<img <img :src="require('@/assets/imgs/data_img_default.gif')" class="default_img" />
:src="require('@/assets/imgs/data_img_default.gif')"
class="default_img"
/>
</block-radius> </block-radius>
</el-col> </el-col>
</el-row> </el-row>
...@@ -171,13 +161,13 @@ export default { ...@@ -171,13 +161,13 @@ export default {
mult_data: [ mult_data: [
{ name: "基础工具", value: 40 }, { name: "基础工具", value: 40 },
{ name: "通用应用", value: 0 }, { name: "通用应用", value: 0 },
{ name: "业务应用", value: 2 }, { name: "业务应用", value: 2 }
], ],
text: "应用总数", text: "应用总数",
single_data: { single_data: {
num: 12, num: 12,
color: "#515fe7", color: "#515fe7",
text: "共享", text: "共享"
}, },
line_data: { line_data: {
xaxis: [ xaxis: [
...@@ -188,22 +178,22 @@ export default { ...@@ -188,22 +178,22 @@ export default {
"01-05", "01-05",
"01-06", "01-06",
"01-07", "01-07",
"01-08", "01-08"
], ],
data: [ data: [
{ {
name: "开发者应用", name: "开发者应用",
arr: [100, 120, 130, 150, 160, 120, 110, 100], arr: [100, 120, 130, 150, 160, 120, 110, 100]
}, },
{ {
name: "平台应用", name: "平台应用",
arr: [120, 130, 140, 130, 140, 120, 100, 90], arr: [120, 130, 140, 130, 140, 120, 100, 90]
}, },
{ {
name: "未上架", name: "未上架",
arr: [80, 90, 100, 110, 100, 70, 80, 90], arr: [80, 90, 100, 110, 100, 70, 80, 90]
}, }
], ]
}, },
das_data: { das_data: {
data: 40, data: 40,
...@@ -218,7 +208,7 @@ export default { ...@@ -218,7 +208,7 @@ export default {
"01-05", "01-05",
"01-06", "01-06",
"01-07", "01-07",
"01-08", "01-08"
], ],
data: [100, 120, 130, 150, 160, 120, 110, 100] data: [100, 120, 130, 150, 160, 120, 110, 100]
}, },
...@@ -241,36 +231,36 @@ export default { ...@@ -241,36 +231,36 @@ export default {
value: 2031, value: 2031,
logo: logo:
"https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg", "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
unit: "", unit: ""
}, },
{ {
name: "数据服务", name: "数据服务",
value: 2201, value: 2201,
logo: logo:
"https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg", "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
unit: "", unit: ""
}, },
{ {
name: "消息队列服务", name: "消息队列服务",
value: 1901, value: 1901,
logo: logo:
"https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg", "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
unit: "", unit: ""
}, },
{ {
name: "档案中心服务", name: "档案中心服务",
value: 1400, value: 1400,
logo: logo:
"https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg", "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
unit: "", unit: ""
}, },
{ {
name: "哈哈服务", name: "哈哈服务",
value: 1280, value: 1280,
logo: logo:
"https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg", "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
unit: "", unit: ""
}, }
], // 服务调用排名分析 ], // 服务调用排名分析
serveiceInfoBtnIndex: 0, serveiceInfoBtnIndex: 0,
commentlistData: [ commentlistData: [
...@@ -282,7 +272,7 @@ export default { ...@@ -282,7 +272,7 @@ export default {
"/apaas/static/docs/image/image/blob_cb30e7a3-3184-42dd-9e2f-7e6b69accb0c.blob", "/apaas/static/docs/image/image/blob_cb30e7a3-3184-42dd-9e2f-7e6b69accb0c.blob",
score: 5, score: 5,
service_id: 128, service_id: 128,
user_name: "普通用户lxy", user_name: "普通用户lxy"
}, },
{ {
add_time: "2020-07-14T16:35:40Z", add_time: "2020-07-14T16:35:40Z",
...@@ -292,7 +282,7 @@ export default { ...@@ -292,7 +282,7 @@ export default {
"/apaas/static/docs/image/image/blob_cb30e7a3-3184-42dd-9e2f-7e6b69accb0c.blob", "/apaas/static/docs/image/image/blob_cb30e7a3-3184-42dd-9e2f-7e6b69accb0c.blob",
score: 4, score: 4,
service_id: 128, service_id: 128,
user_name: "普通用户lxy", user_name: "普通用户lxy"
}, },
{ {
add_time: "2020-07-14T16:35:40Z", add_time: "2020-07-14T16:35:40Z",
...@@ -302,7 +292,7 @@ export default { ...@@ -302,7 +292,7 @@ export default {
"/apaas/static/docs/image/image/blob_cb30e7a3-3184-42dd-9e2f-7e6b69accb0c.blob", "/apaas/static/docs/image/image/blob_cb30e7a3-3184-42dd-9e2f-7e6b69accb0c.blob",
score: 3, score: 3,
service_id: 128, service_id: 128,
user_name: "普通用户lxy", user_name: "普通用户lxy"
}, },
{ {
add_time: "2020-07-14T16:35:40Z", add_time: "2020-07-14T16:35:40Z",
...@@ -312,35 +302,35 @@ export default { ...@@ -312,35 +302,35 @@ export default {
"/apaas/static/docs/image/image/blob_cb30e7a3-3184-42dd-9e2f-7e6b69accb0c.blob", "/apaas/static/docs/image/image/blob_cb30e7a3-3184-42dd-9e2f-7e6b69accb0c.blob",
score: 2, score: 2,
service_id: 128, service_id: 128,
user_name: "普通用户lxy", user_name: "普通用户lxy"
}, }
], // 服务评价 ], // 服务评价
starlistData: [ starlistData: [
{ {
star: 5, star: 5,
count: 5, count: 5,
unit: "", unit: ""
}, },
{ {
star: 4, star: 4,
count: 4, count: 4,
unit: "", unit: ""
}, },
{ {
star: 3, star: 3,
count: 3, count: 3,
unit: "", unit: ""
}, },
{ {
star: 2, star: 2,
count: 10002, count: 10002,
unit: "", unit: ""
}, },
{ {
star: 1, star: 1,
count: 1, count: 1,
unit: "", unit: ""
}, }
], // 服务评分 ], // 服务评分
graph_arr: { graph_arr: {
xaxis: [ xaxis: [
...@@ -376,7 +366,6 @@ export default { ...@@ -376,7 +366,6 @@ export default {
console.log(index); console.log(index);
}, // 服务评价及评分 }, // 服务评价及评分
},
changeServiceCellBtn(index) { changeServiceCellBtn(index) {
console.log(index); console.log(index);
} }
......
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