diff --git a/src/app/routes/datatable/components/datascreen/curve/curve.component.ts b/src/app/routes/datatable/components/datascreen/curve/curve.component.ts
index dc30343e..b6cd6e92 100644
--- a/src/app/routes/datatable/components/datascreen/curve/curve.component.ts
+++ b/src/app/routes/datatable/components/datascreen/curve/curve.component.ts
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-04-07 17:57:23
* @LastEditors : Shiming
- * @LastEditTime : 2022-04-07 19:28:24
+ * @LastEditTime : 2022-04-13 10:22:35
* @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\curve\\curve.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@@ -75,7 +75,7 @@ export class DatatableCustomindexCurveMinComponent implements OnInit,OnChanges {
this.chart = new Chart({
container: el,
autoFit: true,
- height: 200,
+ height: 320,
});
let value: any = []
this.service.request(this.service.$api_getTradingTrend).subscribe((res: any) => {
diff --git a/src/app/routes/datatable/components/datascreen/datascreen.component.html b/src/app/routes/datatable/components/datascreen/datascreen.component.html
index ee417920..1813a271 100644
--- a/src/app/routes/datatable/components/datascreen/datascreen.component.html
+++ b/src/app/routes/datatable/components/datascreen/datascreen.component.html
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-04-06 10:57:56
* @LastEditors : Shiming
- * @LastEditTime : 2022-04-07 19:51:32
+ * @LastEditTime : 2022-04-13 10:33:08
* @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@@ -47,11 +47,11 @@
- {{ index }}
+ {{ index + 1 }}
{{ item.weight ? item.weight + '吨' : '' }}
@@ -86,10 +86,10 @@
-
+
-
+
@@ -157,7 +157,7 @@
#st
multiSort
bordered
- [scroll]="{y: '300px'}"
+ [scroll]="{y: '290px'}"
[columns]="orderColumns"
[data]="service.$api_getRealTimeWaybillRiskControl"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqOrderParams }"
diff --git a/src/app/routes/datatable/components/datascreen/datascreen.component.ts b/src/app/routes/datatable/components/datascreen/datascreen.component.ts
index 08babea1..128e3f9e 100644
--- a/src/app/routes/datatable/components/datascreen/datascreen.component.ts
+++ b/src/app/routes/datatable/components/datascreen/datascreen.component.ts
@@ -5,7 +5,7 @@ import { map } from 'rxjs/operators';
* @Author : Shiming
* @Date : 2022-04-06 10:57:56
* @LastEditors : Shiming
- * @LastEditTime : 2022-04-07 19:48:19
+ * @LastEditTime : 2022-04-13 10:25:50
* @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@@ -127,7 +127,7 @@ export class DatatableDatascreenComponent implements OnInit {
*/
initST() {
this.columns = [
- { title: '序号', render: 'index', className: 'text-center', width: '70px' },
+ { title: '序号', render: 'index', className: 'text-center', width: '70px', },
{ title: '发货地', index: 'loadAddress', className: 'text-center', width: '90px' },
{ title: '卸货地', index: 'dischargeAddress', className: 'text-center', width: '90px' },
{ title: '货物', index: 'goodsName', className: 'text-center', width: '90px' },
@@ -138,7 +138,7 @@ export class DatatableDatascreenComponent implements OnInit {
this.orderColumns = [
{ title: '运单号', index: 'wayCode', className: 'text-center', width: '150px' },
{ title: '司机/车辆', index: 'carNo', className: 'text-center', width: '120px' },
- { title: '货主', index: 'shipperName', className: 'text-center', width: '70px' },
+ { title: '货主', index: 'shipperName', className: 'text-center', width: '200px' },
{ title: '时间', index: 'createTime', className: 'text-center', width: '200px' },
{ title: '异常预警', index: 'warningTypeLabel', className: 'text-center', width: '120px' }
];
diff --git a/src/app/routes/datatable/components/datascreen/map/map.component.html b/src/app/routes/datatable/components/datascreen/map/map.component.html
index 99a40aa8..f82fc220 100644
--- a/src/app/routes/datatable/components/datascreen/map/map.component.html
+++ b/src/app/routes/datatable/components/datascreen/map/map.component.html
@@ -4,8 +4,8 @@
* @Author : Shiming
* @Date : 2022-04-06 17:57:07
* @LastEditors : Shiming
- * @LastEditTime : 2022-04-07 19:44:32
+ * @LastEditTime : 2022-04-13 10:17:44
* @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\map\\map.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/app/routes/datatable/components/datascreen/map/map.component.ts b/src/app/routes/datatable/components/datascreen/map/map.component.ts
index 66c3a677..4df67fe2 100644
--- a/src/app/routes/datatable/components/datascreen/map/map.component.ts
+++ b/src/app/routes/datatable/components/datascreen/map/map.component.ts
@@ -49,7 +49,6 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges {
this.chart = new Chart({
container: el,
autoFit: true,
- height: 680,
padding: [0, 0]
});
this.chart.tooltip({
@@ -108,6 +107,10 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges {
});
console.log(value);
this.userData = value
+
+if (!(this.userData instanceof Array) || this.userData.length === 0) {
+ return;
+ }
this.userDv = this.ds.createView().source(this.userData).transform({
geoDataView: this.worldMap,
field: 'name',
diff --git a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html
index d48b1b26..eee013ee 100644
--- a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html
+++ b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html
@@ -34,7 +34,7 @@
{{item?.verifyStatusLabel}}
- {{item?.verifyStatusLabel}}
+ {{item?.verifyStatusLabel}}
{{item?.orderCode}}
diff --git a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts
index 1157fdd7..8e443762 100644
--- a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts
+++ b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts
@@ -163,9 +163,9 @@ export class DatatableFundReportingComponent implements OnInit {
title: '本地校验',
type: 'string',
enum: [
- { label: '校验中', value: 0 },
- { label: '通过', value: 1 },
- { label: '不通过', value: 2 }
+ { label: '校验中', value: '0' },
+ { label: '通过', value: '1' },
+ { label: '不通过', value: '2' }
],
ui: {
placeholder: '请选择',