diff --git a/pom.xml b/pom.xml index 76cfe75..a2157ab 100644 --- a/pom.xml +++ b/pom.xml @@ -168,6 +168,11 @@ lombok true + + + org.springframework.boot + spring-boot-starter-test + diff --git a/screen-vue/public/assets/icon/erp-expense.svg b/screen-vue/public/assets/icon/erp-expense.svg new file mode 100644 index 0000000..9197be3 --- /dev/null +++ b/screen-vue/public/assets/icon/erp-expense.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/screen-vue/public/assets/icon/erp-fencheng.svg b/screen-vue/public/assets/icon/erp-fencheng.svg new file mode 100644 index 0000000..47faa5f --- /dev/null +++ b/screen-vue/public/assets/icon/erp-fencheng.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/screen-vue/public/assets/icon/erp-income.svg b/screen-vue/public/assets/icon/erp-income.svg new file mode 100644 index 0000000..6a9b3f8 --- /dev/null +++ b/screen-vue/public/assets/icon/erp-income.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/screen-vue/public/assets/icon/erp-jiaoyizhichu.svg b/screen-vue/public/assets/icon/erp-jiaoyizhichu.svg new file mode 100644 index 0000000..9318e49 --- /dev/null +++ b/screen-vue/public/assets/icon/erp-jiaoyizhichu.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/screen-vue/public/assets/icon/erp-jinglirun.svg b/screen-vue/public/assets/icon/erp-jinglirun.svg new file mode 100644 index 0000000..7d3e878 --- /dev/null +++ b/screen-vue/public/assets/icon/erp-jinglirun.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/screen-vue/public/assets/icon/erp-lirunfenxi.svg b/screen-vue/public/assets/icon/erp-lirunfenxi.svg new file mode 100644 index 0000000..8836ed0 --- /dev/null +++ b/screen-vue/public/assets/icon/erp-lirunfenxi.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/screen-vue/public/assets/icon/erp-shouru.svg b/screen-vue/public/assets/icon/erp-shouru.svg new file mode 100644 index 0000000..1ea57b7 --- /dev/null +++ b/screen-vue/public/assets/icon/erp-shouru.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/screen-vue/public/assets/icon/erp-zhichu.svg b/screen-vue/public/assets/icon/erp-zhichu.svg new file mode 100644 index 0000000..24d7197 --- /dev/null +++ b/screen-vue/public/assets/icon/erp-zhichu.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/screen-vue/public/assets/icon/erp-zongshouru.svg b/screen-vue/public/assets/icon/erp-zongshouru.svg new file mode 100644 index 0000000..816a8b7 --- /dev/null +++ b/screen-vue/public/assets/icon/erp-zongshouru.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/screen-vue/src/api/bizApi.js b/screen-vue/src/api/bizApi.js index aedac8c..0e5d186 100644 --- a/screen-vue/src/api/bizApi.js +++ b/screen-vue/src/api/bizApi.js @@ -22,6 +22,17 @@ export function getItemInfoList(params) { }) } +/** + * 获取指标信息列表 + */ +export function getIndexInfoList(params) { + return request({ + url: '/biz/indexInfo/list', + method: 'get', + params: params + }) +} + /** * 获取账号信息列表 */ @@ -53,4 +64,4 @@ export function getErpTransactionFlowList(params) { method: 'get', params: params }) -} \ No newline at end of file +} diff --git a/screen-vue/src/views/screen/Erp/components/ChartTop.vue b/screen-vue/src/views/screen/Erp/components/ChartTop.vue index c437fdc..ce3c94a 100644 --- a/screen-vue/src/views/screen/Erp/components/ChartTop.vue +++ b/screen-vue/src/views/screen/Erp/components/ChartTop.vue @@ -5,14 +5,13 @@
icon
{{ item.module }}
-
{{ item.desc }}
+
{{ item.title }}
@@ -25,49 +24,21 @@