diff --git a/.env.production b/.env.production index aef6883..8625d21 100644 --- a/.env.production +++ b/.env.production @@ -16,7 +16,7 @@ VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false VITE_GLOB_API_URL=/jeecgboot #后台接口全路径地址(必填) -VITE_GLOB_DOMAIN_URL=http://jeecg-boot-system:8080/jeecg-boot +VITE_GLOB_DOMAIN_URL=http://zh.blxinchuang.com/jeecg-boot # 接口父路径前缀 VITE_GLOB_API_URL_PREFIX= diff --git a/src/components/chart/Bar.vue b/src/components/chart/Bar.vue index 43e4d70..2ce645f 100644 --- a/src/components/chart/Bar.vue +++ b/src/components/chart/Bar.vue @@ -24,6 +24,14 @@ type: String as PropType, default: 'calc(100vh - 78px)', }, + itemStyleLabel: { + type: Boolean as PropType, + default: true, + }, + seriesName: { + type: String as PropType, + default: 'bar', + }, // update-begin--author:liaozhiyang---date:20240407---for:【QQYUN-8762】首页默认及echars颜色调整 seriesColor: { type: String, @@ -54,10 +62,11 @@ }, series: [ { - name: 'bar', + name: props.seriesName, type: 'bar', data: [], color: props.seriesColor, + itemStyle : { normal: {label : {show: props.itemStyleLabel, position: 'inside'}}}, }, ], }); @@ -78,7 +87,9 @@ }); option.series[0].data = seriesData; // 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; // update-end--author:liaozhiyang---date:20240407---for:【QQYUN-8762】首页默认及echars颜色调整 option.xAxis.data = xAxisData; setOptions(option); diff --git a/src/views/zh/hy/zc/hy.api.ts b/src/views/zh/hy/zc/hy.api.ts new file mode 100644 index 0000000..4ef393c --- /dev/null +++ b/src/views/zh/hy/zc/hy.api.ts @@ -0,0 +1,11 @@ +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 new file mode 100644 index 0000000..daf080d --- /dev/null +++ b/src/views/zh/hy/zc/index.vue @@ -0,0 +1,56 @@ + + + diff --git a/src/views/zh/monitor/index.vue b/src/views/zh/monitor/index.vue new file mode 100644 index 0000000..c741e7d --- /dev/null +++ b/src/views/zh/monitor/index.vue @@ -0,0 +1,80 @@ + + + diff --git a/tests/server/ecosystem.config.js b/tests/server/ecosystem.config.js index a31e457..4844c8b 100644 --- a/tests/server/ecosystem.config.js +++ b/tests/server/ecosystem.config.js @@ -11,7 +11,7 @@ module.exports = { watch: true, env_production: { NODE_ENV: 'production', - PORT: 8080, + PORT: 8050, }, }, ],