diff --git a/src/components/chart/Bar.vue b/src/components/chart/Bar.vue index 2ce645f..796330f 100644 --- a/src/components/chart/Bar.vue +++ b/src/components/chart/Bar.vue @@ -24,9 +24,9 @@ type: String as PropType, default: 'calc(100vh - 78px)', }, - itemStyleLabel: { - type: Boolean as PropType, - default: true, + itemStyle: { + type: Object, + default: () => ({ normal: {label : {show: false, position: 'inside'}}}), }, seriesName: { type: String as PropType, @@ -49,7 +49,7 @@ type: 'shadow', label: { show: true, - backgroundColor: '#333', + backgroundColor: '#6a7985', }, }, }, @@ -64,9 +64,9 @@ { name: props.seriesName, type: 'bar', - data: [], color: props.seriesColor, - itemStyle : { normal: {label : {show: props.itemStyleLabel, position: 'inside'}}}, + itemStyle : props.itemStyle, + data: [], }, ], }); @@ -89,7 +89,7 @@ // update-begin--author:liaozhiyang---date:20240407---for:【QQYUN-8762】首页默认及echars颜色调整 option.series[0].name = props.seriesName; option.series[0].color = props.seriesColor; - option.series[0].itemStyle.normal.label.show = props.itemStyleLabel; + option.series[0].itemStyle = props.itemStyle; // update-end--author:liaozhiyang---date:20240407---for:【QQYUN-8762】首页默认及echars颜色调整 option.xAxis.data = xAxisData; setOptions(option); diff --git a/src/components/chart/BaseAreaLine.vue b/src/components/chart/BaseAreaLine.vue new file mode 100644 index 0000000..3bd6f6e --- /dev/null +++ b/src/components/chart/BaseAreaLine.vue @@ -0,0 +1,102 @@ + + diff --git a/src/views/zh/hy/hy.api.ts b/src/views/zh/hy/hy.api.ts new file mode 100644 index 0000000..089c894 --- /dev/null +++ b/src/views/zh/hy/hy.api.ts @@ -0,0 +1,29 @@ +import { defHttp } from '/@/utils/http/axios'; + +enum Api { + housingestateList = '/zh/hy/queryHousingestateList', + registerList = '/zh/hy/queryHyRegisterList', + xzList = '/zh/hy/queryHyXzList', + tdcsList = '/zh/hy/queryHyTdcsList', +} + +/** + * 获取小区 + * @param params + */ +export const housingestateList = (params) => defHttp.get({ url: Api.housingestateList, params }); +/** + * 会员注册时间段统计 + * @param params + */ +export const registerList = (params) => defHttp.get({ url: Api.registerList, params }); +/** + * 新增会员统计 + * @param params + */ +export const xzList = (params) => defHttp.get({ url: Api.xzList, params }); +/** + * 会员投递次数排行榜 + * @param params + */ +export const tdcsList = (params) => defHttp.get({ url: Api.tdcsList, params }); diff --git a/src/views/zh/hy/tdcs/index.vue b/src/views/zh/hy/tdcs/index.vue new file mode 100644 index 0000000..13f72ee --- /dev/null +++ b/src/views/zh/hy/tdcs/index.vue @@ -0,0 +1,106 @@ + + + diff --git a/src/views/zh/hy/tdzl/index.vue b/src/views/zh/hy/tdzl/index.vue new file mode 100644 index 0000000..13f72ee --- /dev/null +++ b/src/views/zh/hy/tdzl/index.vue @@ -0,0 +1,106 @@ + + + diff --git a/src/views/zh/hy/xz/index.vue b/src/views/zh/hy/xz/index.vue new file mode 100644 index 0000000..eb134b3 --- /dev/null +++ b/src/views/zh/hy/xz/index.vue @@ -0,0 +1,92 @@ + + + diff --git a/src/views/zh/hy/zc/hy.api.ts b/src/views/zh/hy/zc/hy.api.ts deleted file mode 100644 index 4ef393c..0000000 --- a/src/views/zh/hy/zc/hy.api.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { defHttp } from '/@/utils/http/axios'; - -enum Api { - registerList = '/zh/hy/queryPageList', -} - -/** - * 会员注册时间段统计 - * @param params - */ -export const registerList = (params) => defHttp.get({ url: Api.registerList, params }); diff --git a/src/views/zh/hy/zc/index.vue b/src/views/zh/hy/zc/index.vue index daf080d..692ec2c 100644 --- a/src/views/zh/hy/zc/index.vue +++ b/src/views/zh/hy/zc/index.vue @@ -4,9 +4,17 @@ + + 全部 + {{item.housingestateName}} + - + @@ -14,11 +22,16 @@