diff --git a/proxy.conf.js b/proxy.conf.js index c2e27015..1f0027c2 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -30,7 +30,7 @@ module.exports = { // }, '//api': { target: { - host: 'tms-api-dev.eascs.com', + host: 'tms-api-test.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/datatable/components/dataindex/dataindex.component.html b/src/app/routes/datatable/components/dataindex/dataindex.component.html index 55bda674..1ad2da63 100644 --- a/src/app/routes/datatable/components/dataindex/dataindex.component.html +++ b/src/app/routes/datatable/components/dataindex/dataindex.component.html @@ -2,8 +2,14 @@
- + +

+ 客户预存款总额 + 完成率 32.12% +

+
@@ -12,8 +18,14 @@
- + + +

+ 业绩量总额 + 完成率 32.12% +

+
@@ -22,18 +34,28 @@
- - - + +

+ 司机应付总额 +

+
+ +
- + +

+ 附加费总额 +

+
@@ -43,12 +65,12 @@
-
+
-
+
@@ -57,7 +79,7 @@
-
+
diff --git a/src/app/routes/datatable/components/dataindex/dataindex.component.less b/src/app/routes/datatable/components/dataindex/dataindex.component.less index 36153e65..2292b177 100644 --- a/src/app/routes/datatable/components/dataindex/dataindex.component.less +++ b/src/app/routes/datatable/components/dataindex/dataindex.component.less @@ -6,4 +6,44 @@ background-clip : text; -webkit-background-clip: text; position : absolute; +} + + +.mini_area_title { + display : flex; + justify-content: space-between; + + .title { + font-size : 16px; + font-weight: 500; + color : #1D2129; + } + + .subtitle { + font-size : 14px; + font-weight: 400; + color : #575D6C; + text-align : right; + + .percent { + color: #E60012 + } + } +} + +:host::ng-deep { + .g2-card__meta-wrap { + width: 100%; + + .g2-card__total { + font-size : 28px; + font-weight: 500; + color : #1D2129; + margin-top : 8px; + } + } + + .g2-card__footer { + border: 0px; + } } \ No newline at end of file diff --git a/src/app/routes/datatable/components/dataindex/dataindex.component.ts b/src/app/routes/datatable/components/dataindex/dataindex.component.ts index ab6a8528..5a16a165 100644 --- a/src/app/routes/datatable/components/dataindex/dataindex.component.ts +++ b/src/app/routes/datatable/components/dataindex/dataindex.component.ts @@ -126,7 +126,7 @@ export class DatatableDataindexComponent implements OnInit { const chart = new Chart({ container: el, autoFit: true, - height: 400 + height: 380 }); // 新建一个 view 用来单独渲染Annotation const innerView = chart.createView(); @@ -208,21 +208,21 @@ export class DatatableDataindexComponent implements OnInit { position: ['50%', '50%'], content: data[0].item, style: { - fontSize: 20, + fontSize: 14, fill: '#8c8c8c', textAlign: 'center' }, - offsetY: -20 + offsetY: -10 }) .text({ position: ['50%', '50%'], content: data[0].count, style: { - fontSize: 28, + fontSize: 16, fill: '##000', textAlign: 'center' }, - offsetY: 20 + offsetY: 10 }); innerView.render(true); @@ -260,21 +260,21 @@ export class DatatableDataindexComponent implements OnInit { position: ['50%', '50%'], content: data.item, style: { - fontSize: 20, + fontSize: 14, fill: '#8c8c8c', textAlign: 'center' }, - offsetY: -20 + offsetY: -10 }) .text({ position: ['50%', '50%'], content: data.count, style: { - fontSize: 28, + fontSize: 16, fill: '##000', textAlign: 'center' }, - offsetY: 20 + offsetY: 10 }); innerView.render(true); lastItem = data.item; @@ -404,7 +404,7 @@ export class DatatableDataindexComponent implements OnInit { const chart = new Chart({ container: el, autoFit: true, - height: 400 + height: 380 }); chart.data(data); // 设置坐标轴