diff --git a/yanzhu-bigscreen/src/views/safety/aiWarning.vue b/yanzhu-bigscreen/src/views/safety/aiWarning.vue index 2361edd5..0d14eef1 100644 --- a/yanzhu-bigscreen/src/views/safety/aiWarning.vue +++ b/yanzhu-bigscreen/src/views/safety/aiWarning.vue @@ -366,11 +366,12 @@ export default { daysTrendView() { this.$api.aiWarning.getDaysTrendView(this.selProject.id).then((response) => { if (response.data) { + response.data.reverse(); let _data1 = []; let _date8 = []; response.data.forEach((datum) => { _data1.push(datum.total); - _date8.push(datum.dayStr); + _date8.push(datum.create_time); }); let _lineData = []; _lineData.push(_data1); diff --git a/yanzhu-bigscreen/src/views/schedule/planSchedule.vue b/yanzhu-bigscreen/src/views/schedule/planSchedule.vue index 78e1e060..d8cae171 100644 --- a/yanzhu-bigscreen/src/views/schedule/planSchedule.vue +++ b/yanzhu-bigscreen/src/views/schedule/planSchedule.vue @@ -105,36 +105,9 @@
-

任务数

-
1
-
- - - -
-
- - - -
-
-

已完成

+

{{ overviewDatas[0].name }}

- 2 + {{ overviewDatas[0].value }}
@@ -161,9 +134,38 @@
-

完成率

+

{{ overviewDatas[1].name }}

- 3 + {{ overviewDatas[1].value }} +
+
+ + + +
+
+ + + +
+
+

{{ overviewDatas[2].name }}

+
+ {{ overviewDatas[2].value }} %
@@ -192,42 +194,9 @@
-

进行中

-
4
-
- - - -
-
- - - - -
-
-

已滞后

+

{{ overviewDatas[3].name }}

- 5 + {{ overviewDatas[3].value }}
@@ -260,9 +229,44 @@
-

滞后率

+

{{ overviewDatas[4].name }}

- 6 + {{ overviewDatas[4].value }} +
+
+ + + +
+
+ + + + +
+
+

{{ overviewDatas[5].name }}

+
+ {{ overviewDatas[5].value }} %
@@ -421,10 +425,10 @@ export default { value: ((_yzhjhs.length / res.data.length) * 100).toFixed(2), }); this.overviewTask = []; - (this.overviewJxzjh = _jxzjhs), - (this.overviewYwcjh = _ywcjhs), - (this.overviewYzhjh = _yzhjhs), - (this.overviewMonthjh = _nowMonth); + this.overviewJxzjh = _jxzjhs; + this.overviewYwcjh = _ywcjhs; + this.overviewYzhjh = _yzhjhs; + this.overviewMonthjh = _nowMonth; }); }, initScheduleNodes() { diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/DevAiProjectDataMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/DevAiProjectDataMapper.xml index 4820a24a..dd88a142 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/DevAiProjectDataMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/DevAiProjectDataMapper.xml @@ -142,6 +142,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and is_del='0' group by date(create_time) + order by date(create_time) desc + limit 8