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

Merge branch 'dev'

parents 4de6c1b1 cc65b1a3
...@@ -126,7 +126,7 @@ export default { ...@@ -126,7 +126,7 @@ export default {
name: "", name: "",
type: "pie", type: "pie",
clockWise: false, clockWise: false,
radius: [60, 63], radius: [50, 53],
center: ["50%", "46%"], center: ["50%", "46%"],
hoverAnimation: false, hoverAnimation: false,
avoidLabelOverlap: true, avoidLabelOverlap: true,
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<div class="main_container-left" v-if="data.cover"> <div class="main_container-left" v-if="data.cover">
<img :src="data.cover" width="100%" v-if="data.type !== 'workflow'" /> <img :src="data.cover" width="100%" v-if="data.type !== 'workflow'" />
<workflows-view <workflows-view
:zoom="0.6" :isShop="true"
:id="parseInt(data.workflows_id)" :id="parseInt(data.workflows_id)"
:hideDetail="true" :hideDetail="true"
v-if="data.type == 'workflow'" v-if="data.type == 'workflow'"
...@@ -381,8 +381,8 @@ export default { ...@@ -381,8 +381,8 @@ export default {
} }
.main_container-left > .map_view { .main_container-left > .map_view {
position: absolute; position: absolute;
right: 3px; right: 1px;
bottom: 3px; bottom: 2px;
} }
.main_container-right { .main_container-right {
width: 896px; width: 896px;
......
<template> <template>
<div class="workflows-view" ref="flowContainer" :style="{ zoom: zoom, height: Number(max_height + 180) + 'px' }"> <div class="workflows-view" ref="flowContainer" :style="{ zoom: isShop ? maxParentHeight / Number(max_height + 180) : zoom, height: Number(max_height + 180) + 'px' }">
<super-flow <super-flow
ref="superFlow" ref="superFlow"
:node-list="nodeList" :node-list="nodeList"
...@@ -80,6 +80,14 @@ export default { ...@@ -80,6 +80,14 @@ export default {
type: Number, type: Number,
default: 1, default: 1,
}, },
maxParentHeight: {
type: Number,
default: 200,
},
isShop: {
type: Boolean,
default: false,
}
}, },
data() { data() {
return { return {
......
...@@ -49,7 +49,6 @@ ...@@ -49,7 +49,6 @@
class="block-radius-content" class="block-radius-content"
:data="mult_data_state" :data="mult_data_state"
:show_center_data="false" :show_center_data="false"
:bar_width="10"
></multiple-circle> ></multiple-circle>
<starlist <starlist
v-else v-else
...@@ -72,6 +71,15 @@ ...@@ -72,6 +71,15 @@
class="block-radius-content" class="block-radius-content"
:data="mult_data" :data="mult_data"
:text="text" :text="text"
:color="[
'#27bfee',
'#f56b4c',
'#435290',
'#597ec0',
'#e56600',
'#a5937b',
'#8210c5',
]"
></multiple-circle> ></multiple-circle>
</block-radius> </block-radius>
</el-col> </el-col>
...@@ -741,7 +749,7 @@ export default { ...@@ -741,7 +749,7 @@ export default {
data.score3 + data.score3 +
data.score2 + data.score2 +
data.score1; data.score1;
console.log(this.starlistData, this.starlistTotal) console.log(this.starlistData, this.starlistTotal);
} }
} }
}); });
......
...@@ -2,19 +2,13 @@ ...@@ -2,19 +2,13 @@
<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.data_analysis") }}
$t("lang.data_analysis")
}}
</el-breadcrumb-item> </el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '/data_analysis/org_service' }"> <el-breadcrumb-item :to="{ path: '/data_analysis/org_service' }">
{{ {{ $t("lang.operational_analysis") }}
$t("lang.operational_analysis")
}}
</el-breadcrumb-item> </el-breadcrumb-item>
<el-breadcrumb-item> <el-breadcrumb-item>
{{ {{ $t("lang.service_data_analysis") }}
$t("lang.service_data_analysis")
}}
</el-breadcrumb-item> </el-breadcrumb-item>
</el-breadcrumb> </el-breadcrumb>
<el-row class="in_analysis"> <el-row class="in_analysis">
...@@ -22,14 +16,26 @@ ...@@ -22,14 +16,26 @@
<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 :show_header="true" title="服务总体概况" class="block"> <block-radius
: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"
/>
<div class="left_1_title">服务总数</div> <div class="left_1_title">服务总数</div>
<div class="left_1_num">{{ overview.serviceTotal }}</div> <div class="left_1_num">{{ overview.serviceTotal }}</div>
</div> </div>
<dashboard ref="left_1_r" :data="das_data" :is_word="true" class="left_1_r"></dashboard> <dashboard
ref="left_1_r"
:data="das_data"
:is_word="true"
class="left_1_r"
></dashboard>
</div> </div>
</block-radius> </block-radius>
</el-col> </el-col>
...@@ -47,14 +53,13 @@ ...@@ -47,14 +53,13 @@
:data="mult_data_state" :data="mult_data_state"
:isPercent="false" :isPercent="false"
:show_center_data="false" :show_center_data="false"
:bar_width="10 "
></multiple-circle> ></multiple-circle>
<starlist <starlist
v-else v-else
class="block-radius-content" class="block-radius-content"
:options="linelistData" :options="linelistData"
:show_star="false" :show_star="false"
style="margin-top: 30px;height: calc(100% - 51px);" style="margin-top: 30px; height: calc(100% - 51px)"
></starlist> ></starlist>
</block-radius> </block-radius>
</el-col> </el-col>
...@@ -66,7 +71,20 @@ ...@@ -66,7 +71,20 @@
@changeButton="changeServiceTypeBtn" @changeButton="changeServiceTypeBtn"
class="block" class="block"
> >
<multiple-circle class="block-radius-content" :data="mult_data" :text="text"></multiple-circle> <multiple-circle
class="block-radius-content"
:data="mult_data"
:text="text"
:color="[
'#27bfee',
'#f56b4c',
'#435290',
'#597ec0',
'#e56600',
'#a5937b',
'#8210c5',
]"
></multiple-circle>
</block-radius> </block-radius>
</el-col> </el-col>
<el-col :span="24" class="in_block"> <el-col :span="24" class="in_block">
...@@ -90,7 +108,11 @@ ...@@ -90,7 +108,11 @@
</block-radius> </block-radius>
</el-col> </el-col>
<el-col :span="24" class="in_block"> <el-col :span="24" class="in_block">
<block-radius :show_header="true" title="服务热门搜索" class="block"> <block-radius
:show_header="true"
title="服务热门搜索"
class="block"
>
<div class="block-radius-content service-hot-search"> <div class="block-radius-content service-hot-search">
<div class="left-content"> <div class="left-content">
<div class="hot-line"> <div class="hot-line">
...@@ -98,20 +120,36 @@ ...@@ -98,20 +120,36 @@
<div class="hot-line-chart"> <div class="hot-line-chart">
<!-- 折线图 --> <!-- 折线图 -->
<p class="sparkline-text"> <p class="sparkline-text">
<span>{{sparkline1.num}}</span> <span>{{ sparkline1.num }}</span>
<span <span
:style="sparkline1.up>0?{backgroundColor:'#e7fdfc',color:'#25bdb1'}:{backgroundColor:'#fbe8e8',color:'#e15260'}" :style="
sparkline1.up > 0
? { backgroundColor: '#e7fdfc', color: '#25bdb1' }
: { backgroundColor: '#fbe8e8', color: '#e15260' }
"
> >
{{sparkline1.up>0?sparkline1.up:0-sparkline1.up}}% {{
sparkline1.up > 0
? sparkline1.up
: 0 - sparkline1.up
}}%
<img <img
v-if="sparkline1.up>0" v-if="sparkline1.up > 0"
src="../../assets/imgs/icon_up.png" src="../../assets/imgs/icon_up.png"
alt alt
/> />
<img v-if="sparkline1.up<0" src="../../assets/imgs/icon_down.png" alt /> <img
v-if="sparkline1.up < 0"
src="../../assets/imgs/icon_down.png"
alt
/>
</span> </span>
</p> </p>
<sparkline :indicatorStyles="spIndicatorStyles1" width="220" height="42"> <sparkline
:indicatorStyles="spIndicatorStyles1"
width="220"
height="42"
>
<sparklineCurve <sparklineCurve
:refLineStyles="spRefLineStyles3" :refLineStyles="spRefLineStyles3"
:refLineType="false" :refLineType="false"
...@@ -127,20 +165,36 @@ ...@@ -127,20 +165,36 @@
<div class="hot-line-chart"> <div class="hot-line-chart">
<!-- 折线图 --> <!-- 折线图 -->
<p class="sparkline-text sparkline-text-user"> <p class="sparkline-text sparkline-text-user">
<span>{{sparkline2.num}}</span> <span>{{ sparkline2.num }}</span>
<span <span
:style="sparkline2.up>0?{backgroundColor:'#e7fdfc',color:'#25bdb1'}:{backgroundColor:'#fbe8e8',color:'#e15260'}" :style="
sparkline2.up > 0
? { backgroundColor: '#e7fdfc', color: '#25bdb1' }
: { backgroundColor: '#fbe8e8', color: '#e15260' }
"
> >
{{sparkline2.up>0?sparkline2.up:0-sparkline2.up}}% {{
sparkline2.up > 0
? sparkline2.up
: 0 - sparkline2.up
}}%
<img <img
v-if="sparkline2.up>0" v-if="sparkline2.up > 0"
src="../../assets/imgs/icon_up.png" src="../../assets/imgs/icon_up.png"
alt alt
/> />
<img v-if="sparkline2.up<0" src="../../assets/imgs/icon_down.png" alt /> <img
v-if="sparkline2.up < 0"
src="../../assets/imgs/icon_down.png"
alt
/>
</span> </span>
</p> </p>
<sparkline :indicatorStyles="spIndicatorStyles1" width="220" height="42"> <sparkline
:indicatorStyles="spIndicatorStyles1"
width="220"
height="42"
>
<sparklineCurve <sparklineCurve
:refLineStyles="spRefLineStyles3" :refLineStyles="spRefLineStyles3"
:refLineType="false" :refLineType="false"
...@@ -171,7 +225,11 @@ ...@@ -171,7 +225,11 @@
:buttons_arr="['近14天', '近30天']" :buttons_arr="['近14天', '近30天']"
@changeButton="changeServeiceTotalChangeBtn" @changeButton="changeServeiceTotalChangeBtn"
> >
<line-chart class="block-radius-content" :zzfw="true" :data="line_data"></line-chart> <line-chart
class="block-radius-content"
:zzfw="true"
:data="line_data"
></line-chart>
</block-radius> </block-radius>
</el-col> </el-col>
</el-row> </el-row>
...@@ -212,9 +270,18 @@ ...@@ -212,9 +270,18 @@
@changeButton="changeOpenessBtnindex" @changeButton="changeOpenessBtnindex"
class="block" class="block"
> >
<single-circle class="block-radius-content single-charts" :data="single_data"></single-circle> <single-circle
<single-circle class="block-radius-content single-charts" :data="single_data1"></single-circle> class="block-radius-content single-charts"
<single-circle class="block-radius-content single-charts" :data="single_data2"></single-circle> :data="single_data"
></single-circle>
<single-circle
class="block-radius-content single-charts"
:data="single_data1"
></single-circle>
<single-circle
class="block-radius-content single-charts"
:data="single_data2"
></single-circle>
</block-radius> </block-radius>
</el-col> </el-col>
<el-col :span="24" class="in_block"> <el-col :span="24" class="in_block">
...@@ -235,7 +302,7 @@ ...@@ -235,7 +302,7 @@
class="block-radius-content" class="block-radius-content"
:options="starlistData" :options="starlistData"
:total="starlistTotal" :total="starlistTotal"
style="margin-top: 30px;height: calc(100% - 51px);" style="margin-top: 30px; height: calc(100% - 51px)"
></starlist> ></starlist>
</block-radius> </block-radius>
</el-col> </el-col>
...@@ -243,8 +310,16 @@ ...@@ -243,8 +310,16 @@
</el-col> </el-col>
<!-- 不可横向铺满,一般为最后一行 --> <!-- 不可横向铺满,一般为最后一行 -->
<el-col :span="6" class="in_block"> <el-col :span="6" class="in_block">
<block-radius :show_header="true" title="服务来源机构分析" class="block"> <block-radius
<BarChart :data="bar_data_org" :x_router="30" :colors="['#e56600', '#e56600']" /> :show_header="true"
title="服务来源机构分析"
class="block"
>
<BarChart
:data="bar_data_org"
:x_router="30"
:colors="['#e56600', '#e56600']"
/>
</block-radius> </block-radius>
</el-col> </el-col>
<el-col :span="12" class="in_block"> <el-col :span="12" class="in_block">
...@@ -255,11 +330,19 @@ ...@@ -255,11 +330,19 @@
:buttons_arr="['近14天', '近30天']" :buttons_arr="['近14天', '近30天']"
@changeButton="changeServeiceSpChangeBtn" @changeButton="changeServeiceSpChangeBtn"
> >
<line-chart class="block-radius-content" :zzfw="true" :data="serviceSpData"></line-chart> <line-chart
class="block-radius-content"
:zzfw="true"
:data="serviceSpData"
></line-chart>
</block-radius> </block-radius>
</el-col> </el-col>
<el-col :span="6" class="in_block"> <el-col :span="6" class="in_block">
<block-radius :show_header="true" title="服务审批状态分析" class="block"> <block-radius
:show_header="true"
title="服务审批状态分析"
class="block"
>
<multiple-circle <multiple-circle
class="block-radius-content" class="block-radius-content"
:data="fwsp_data" :data="fwsp_data"
...@@ -653,7 +736,7 @@ export default { ...@@ -653,7 +736,7 @@ export default {
data.score3 + data.score3 +
data.score2 + data.score2 +
data.score1; data.score1;
console.log(this.starlistData, this.starlistTotal) console.log(this.starlistData, this.starlistTotal);
} }
} }
}); });
......
...@@ -2,19 +2,13 @@ ...@@ -2,19 +2,13 @@
<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.data_analysis") }}
$t("lang.data_analysis")
}}
</el-breadcrumb-item> </el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '/data_analysis/super_service' }"> <el-breadcrumb-item :to="{ path: '/data_analysis/super_service' }">
{{ {{ $t("lang.operational_analysis") }}
$t("lang.operational_analysis")
}}
</el-breadcrumb-item> </el-breadcrumb-item>
<el-breadcrumb-item> <el-breadcrumb-item>
{{ {{ $t("lang.service_data_analysis") }}
$t("lang.service_data_analysis")
}}
</el-breadcrumb-item> </el-breadcrumb-item>
</el-breadcrumb> </el-breadcrumb>
<el-row class="in_analysis"> <el-row class="in_analysis">
...@@ -22,14 +16,26 @@ ...@@ -22,14 +16,26 @@
<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 :show_header="true" title="服务总体概况" class="block"> <block-radius
: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"
/>
<div class="left_1_title">服务总数</div> <div class="left_1_title">服务总数</div>
<div class="left_1_num">{{ overview.serviceTotal }}</div> <div class="left_1_num">{{ overview.serviceTotal }}</div>
</div> </div>
<dashboard ref="left_1_r" :data="das_data" :is_word="true" class="left_1_r"></dashboard> <dashboard
ref="left_1_r"
:data="das_data"
:is_word="true"
class="left_1_r"
></dashboard>
</div> </div>
</block-radius> </block-radius>
</el-col> </el-col>
...@@ -47,14 +53,13 @@ ...@@ -47,14 +53,13 @@
:data="mult_data_state" :data="mult_data_state"
:isPercent="false" :isPercent="false"
:show_center_data="false" :show_center_data="false"
:bar_width="10 "
></multiple-circle> ></multiple-circle>
<starlist <starlist
v-else v-else
class="block-radius-content" class="block-radius-content"
:options="linelistData" :options="linelistData"
:show_star="false" :show_star="false"
style="margin-top: 30px;height: calc(100% - 51px);" style="margin-top: 30px; height: calc(100% - 51px)"
></starlist> ></starlist>
</block-radius> </block-radius>
</el-col> </el-col>
...@@ -66,7 +71,20 @@ ...@@ -66,7 +71,20 @@
@changeButton="changeServiceTypeBtn" @changeButton="changeServiceTypeBtn"
class="block" class="block"
> >
<multiple-circle class="block-radius-content" :data="mult_data" :text="text"></multiple-circle> <multiple-circle
class="block-radius-content"
:data="mult_data"
:text="text"
:color="[
'#27bfee',
'#f56b4c',
'#435290',
'#597ec0',
'#e56600',
'#a5937b',
'#8210c5',
]"
></multiple-circle>
</block-radius> </block-radius>
</el-col> </el-col>
<el-col :span="24" class="in_block"> <el-col :span="24" class="in_block">
...@@ -90,7 +108,11 @@ ...@@ -90,7 +108,11 @@
</block-radius> </block-radius>
</el-col> </el-col>
<el-col :span="24" class="in_block"> <el-col :span="24" class="in_block">
<block-radius :show_header="true" title="服务热门搜索" class="block"> <block-radius
:show_header="true"
title="服务热门搜索"
class="block"
>
<div class="block-radius-content service-hot-search"> <div class="block-radius-content service-hot-search">
<div class="left-content"> <div class="left-content">
<div class="hot-line"> <div class="hot-line">
...@@ -98,20 +120,36 @@ ...@@ -98,20 +120,36 @@
<div class="hot-line-chart"> <div class="hot-line-chart">
<!-- 折线图 --> <!-- 折线图 -->
<p class="sparkline-text"> <p class="sparkline-text">
<span>{{sparkline1.num}}</span> <span>{{ sparkline1.num }}</span>
<span <span
:style="sparkline1.up>0?{backgroundColor:'#e7fdfc',color:'#25bdb1'}:{backgroundColor:'#fbe8e8',color:'#e15260'}" :style="
sparkline1.up > 0
? { backgroundColor: '#e7fdfc', color: '#25bdb1' }
: { backgroundColor: '#fbe8e8', color: '#e15260' }
"
> >
{{sparkline1.up>0?sparkline1.up:0-sparkline1.up}}% {{
sparkline1.up > 0
? sparkline1.up
: 0 - sparkline1.up
}}%
<img <img
v-if="sparkline1.up>0" v-if="sparkline1.up > 0"
src="../../assets/imgs/icon_up.png" src="../../assets/imgs/icon_up.png"
alt alt
/> />
<img v-if="sparkline1.up<0" src="../../assets/imgs/icon_down.png" alt /> <img
v-if="sparkline1.up < 0"
src="../../assets/imgs/icon_down.png"
alt
/>
</span> </span>
</p> </p>
<sparkline :indicatorStyles="spIndicatorStyles1" width="220" height="42"> <sparkline
:indicatorStyles="spIndicatorStyles1"
width="220"
height="42"
>
<sparklineCurve <sparklineCurve
:refLineStyles="spRefLineStyles3" :refLineStyles="spRefLineStyles3"
:refLineType="false" :refLineType="false"
...@@ -127,20 +165,36 @@ ...@@ -127,20 +165,36 @@
<div class="hot-line-chart"> <div class="hot-line-chart">
<!-- 折线图 --> <!-- 折线图 -->
<p class="sparkline-text sparkline-text-user"> <p class="sparkline-text sparkline-text-user">
<span>{{sparkline2.num}}</span> <span>{{ sparkline2.num }}</span>
<span <span
:style="sparkline2.up>0?{backgroundColor:'#e7fdfc',color:'#25bdb1'}:{backgroundColor:'#fbe8e8',color:'#e15260'}" :style="
sparkline2.up > 0
? { backgroundColor: '#e7fdfc', color: '#25bdb1' }
: { backgroundColor: '#fbe8e8', color: '#e15260' }
"
> >
{{sparkline2.up>0?sparkline2.up:0-sparkline2.up}}% {{
sparkline2.up > 0
? sparkline2.up
: 0 - sparkline2.up
}}%
<img <img
v-if="sparkline2.up>0" v-if="sparkline2.up > 0"
src="../../assets/imgs/icon_up.png" src="../../assets/imgs/icon_up.png"
alt alt
/> />
<img v-if="sparkline2.up<0" src="../../assets/imgs/icon_down.png" alt /> <img
v-if="sparkline2.up < 0"
src="../../assets/imgs/icon_down.png"
alt
/>
</span> </span>
</p> </p>
<sparkline :indicatorStyles="spIndicatorStyles1" width="220" height="42"> <sparkline
:indicatorStyles="spIndicatorStyles1"
width="220"
height="42"
>
<sparklineCurve <sparklineCurve
:refLineStyles="spRefLineStyles3" :refLineStyles="spRefLineStyles3"
:refLineType="false" :refLineType="false"
...@@ -171,7 +225,11 @@ ...@@ -171,7 +225,11 @@
:buttons_arr="['近14天', '近30天']" :buttons_arr="['近14天', '近30天']"
@changeButton="changeServeiceTotalChangeBtn" @changeButton="changeServeiceTotalChangeBtn"
> >
<line-chart class="block-radius-content" :zzfw="true" :data="line_data"></line-chart> <line-chart
class="block-radius-content"
:zzfw="true"
:data="line_data"
></line-chart>
</block-radius> </block-radius>
</el-col> </el-col>
</el-row> </el-row>
...@@ -179,7 +237,11 @@ ...@@ -179,7 +237,11 @@
<el-col :span="6" class="in_right"> <el-col :span="6" class="in_right">
<el-row> <el-row>
<el-col :span="24" class="in_block"> <el-col :span="24" class="in_block">
<block-radius :show_header="true" title="服务调用排名分析" class="block"> <block-radius
:show_header="true"
title="服务调用排名分析"
class="block"
>
<toplist <toplist
class="block-radius-content" class="block-radius-content"
:options="toplistData" :options="toplistData"
...@@ -206,9 +268,18 @@ ...@@ -206,9 +268,18 @@
@changeButton="changeOpenessBtnindex" @changeButton="changeOpenessBtnindex"
class="block" class="block"
> >
<single-circle class="block-radius-content single-charts" :data="single_data"></single-circle> <single-circle
<single-circle class="block-radius-content single-charts" :data="single_data1"></single-circle> class="block-radius-content single-charts"
<single-circle class="block-radius-content single-charts" :data="single_data2"></single-circle> :data="single_data"
></single-circle>
<single-circle
class="block-radius-content single-charts"
:data="single_data1"
></single-circle>
<single-circle
class="block-radius-content single-charts"
:data="single_data2"
></single-circle>
</block-radius> </block-radius>
</el-col> </el-col>
<el-col :span="24" class="in_block"> <el-col :span="24" class="in_block">
...@@ -229,7 +300,7 @@ ...@@ -229,7 +300,7 @@
class="block-radius-content" class="block-radius-content"
:options="starlistData" :options="starlistData"
:total="starlistTotal" :total="starlistTotal"
style="margin-top: 30px;height: calc(100% - 51px);" style="margin-top: 30px; height: calc(100% - 51px)"
></starlist> ></starlist>
</block-radius> </block-radius>
</el-col> </el-col>
...@@ -237,8 +308,16 @@ ...@@ -237,8 +308,16 @@
</el-col> </el-col>
<!-- 不可横向铺满,一般为最后一行 --> <!-- 不可横向铺满,一般为最后一行 -->
<el-col :span="6" class="in_block"> <el-col :span="6" class="in_block">
<block-radius :show_header="true" title="服务来源机构分析" class="block"> <block-radius
<BarChart :data="bar_data_org" :x_router="30" :colors="['#e56600', '#e56600']" /> :show_header="true"
title="服务来源机构分析"
class="block"
>
<BarChart
:data="bar_data_org"
:x_router="30"
:colors="['#e56600', '#e56600']"
/>
</block-radius> </block-radius>
</el-col> </el-col>
<el-col :span="12" class="in_block"> <el-col :span="12" class="in_block">
...@@ -249,11 +328,19 @@ ...@@ -249,11 +328,19 @@
:buttons_arr="['近14天', '近30天']" :buttons_arr="['近14天', '近30天']"
@changeButton="changeServeiceSpChangeBtn" @changeButton="changeServeiceSpChangeBtn"
> >
<line-chart class="block-radius-content" :zzfw="true" :data="serviceSpData"></line-chart> <line-chart
class="block-radius-content"
:zzfw="true"
:data="serviceSpData"
></line-chart>
</block-radius> </block-radius>
</el-col> </el-col>
<el-col :span="6" class="in_block"> <el-col :span="6" class="in_block">
<block-radius :show_header="true" title="服务审批状态分析" class="block"> <block-radius
:show_header="true"
title="服务审批状态分析"
class="block"
>
<multiple-circle <multiple-circle
class="block-radius-content" class="block-radius-content"
:data="fwsp_data" :data="fwsp_data"
...@@ -647,7 +734,7 @@ export default { ...@@ -647,7 +734,7 @@ export default {
data.score3 + data.score3 +
data.score2 + data.score2 +
data.score1; data.score1;
console.log(this.starlistData, this.starlistTotal) console.log(this.starlistData, this.starlistTotal);
} }
} }
}); });
......
...@@ -485,7 +485,7 @@ export default { ...@@ -485,7 +485,7 @@ export default {
}, },
public1(item){ public1(item){
this.dialogInfo.title = "提示"; this.dialogInfo.title = "提示";
this.dialogInfo.msg = `发布流程后,流程将部署到工作区域并上架到服务超市,是否发布该流程?`; this.dialogInfo.msg = `发布流程后,流程将部署到工作区域并上架到服务超市,是否发布该流程?`;
this.dialogInfo.cancelText = "取消"; this.dialogInfo.cancelText = "取消";
this.dialogInfo.sunbmitText = "发布"; this.dialogInfo.sunbmitText = "发布";
this.dialogInfo.submit = () => { this.dialogInfo.submit = () => {
......
...@@ -297,7 +297,7 @@ export default { ...@@ -297,7 +297,7 @@ export default {
}, },
publishItem(item) { publishItem(item) {
this.dialogInfo.title = "提示"; this.dialogInfo.title = "提示";
this.dialogInfo.msg = `发布流程后,流程将部署到工作区域并上架到服务超市,是否发布该流程?`; this.dialogInfo.msg = `发布流程后,流程将部署到工作区域并上架到服务超市,是否发布该流程?`;
this.dialogInfo.cancelText = "取消"; this.dialogInfo.cancelText = "取消";
this.dialogInfo.sunbmitText = "发布"; this.dialogInfo.sunbmitText = "发布";
this.dialogInfo.submit = () => { this.dialogInfo.submit = () => {
......
...@@ -1628,7 +1628,7 @@ export default { ...@@ -1628,7 +1628,7 @@ export default {
} }
}; };
var data = []; var data = [];
var color = ["#515fe7", "#36a5ec", "#da9f2a", "#23b2a7", "#d46002"]; var color = ["#515fe7", "#36a5ec", "#da9f2a", "#23b2a7", "#d46002", "#44a072"];
var legendarr = []; var legendarr = [];
var temp2_data = 0; var temp2_data = 0;
data_val.forEach(e => { data_val.forEach(e => {
...@@ -1661,8 +1661,8 @@ export default { ...@@ -1661,8 +1661,8 @@ export default {
name: "", name: "",
type: "pie", type: "pie",
clockWise: false, clockWise: false,
radius: [52, 54], radius: [44, 46],
center: ["51%", "45%"], center: ["50%", "45%"],
z:5, z:5,
hoverAnimation: false, hoverAnimation: false,
itemStyle: { itemStyle: {
...@@ -1693,8 +1693,8 @@ export default { ...@@ -1693,8 +1693,8 @@ export default {
{ {
type:'pie', type:'pie',
z:4, z:4,
center:['51%','45%'], center:['50%','45%'],
radius:['43%','63%'], radius:['36%','54%'],
hoverAnimation:false, hoverAnimation:false,
avoidLabelOverlap: false, avoidLabelOverlap: false,
label: { label: {
......
...@@ -252,8 +252,9 @@ export default { ...@@ -252,8 +252,9 @@ export default {
}, },
get_list_pod(){ get_list_pod(){
console.log(this.pod_name);
this.$http this.$http
.get(`/apaas/hubApi/cloud/podList/${this.formInline.area}?itemsPerPage=${this.pageSize}&page=${this.currentPage}&label=${this.formInline.name}&filterBy=${this.pod_name}`) .get(`/apaas/hubApi/cloud/podList/${this.formInline.area}?itemsPerPage=${this.pageSize}&page=${this.currentPage}&label=${this.formInline.name}&filterBy=${this.pod_name != "" ? "name," : ""}${this.pod_name}`)
.then(response => { .then(response => {
if(response.data.success){ if(response.data.success){
this.listTotal = response.data.data.listMeta.totalItems this.listTotal = response.data.data.listMeta.totalItems
......
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