diff --git a/src/views/projectAdmin/fourEngin/command/leftFour.vue b/src/views/projectAdmin/fourEngin/command/leftFour.vue index 5f7ef71f..3bad797a 100644 --- a/src/views/projectAdmin/fourEngin/command/leftFour.vue +++ b/src/views/projectAdmin/fourEngin/command/leftFour.vue @@ -5,14 +5,14 @@

{{list.totalEmissionReductions}}kg

-

累计降低二氧化碳排放量

+

累计降低二氧化碳排放量

{{list.totalGenerateElectricity}}kwh

-

太阳能发电节约电量

+

太阳能发电节约电量

diff --git a/src/views/projectAdmin/fourEngin/command/leftThree/index.vue b/src/views/projectAdmin/fourEngin/command/leftThree/index.vue index 7bb551d3..234e1ece 100644 --- a/src/views/projectAdmin/fourEngin/command/leftThree/index.vue +++ b/src/views/projectAdmin/fourEngin/command/leftThree/index.vue @@ -49,37 +49,37 @@ export default { { id: 2, name: "地下室结构施工", - Time: "2023-04-11", + Time: "2023-03-30", }, { id: 3, name: " 地上结构施工", - Time: "2024-04-30", + Time: "2024-01-12", }, { id: 4, name: "幕墙施工", - Time: "2024-12-24", + Time: "2024-04-27", }, { id: 5, name: "机电安装施工", - Time: "2024-12-26", + Time: "2024-06-30", }, { id: 6, name: "精装修施工", - Time: "2025-03-10", + Time: "2024-07-30", }, { id: 7, name: "园林市政施工", - Time: "2024-07-18", + Time: "2024-06-08", }, { id: 8, name: "竣工验收", - Time: "2025-03-05", + Time: "2024-08-18", }, ], list: [ diff --git a/src/views/projectAdmin/fourEngin/command/rightFour.vue b/src/views/projectAdmin/fourEngin/command/rightFour.vue index f069b4e1..16a080fa 100644 --- a/src/views/projectAdmin/fourEngin/command/rightFour.vue +++ b/src/views/projectAdmin/fourEngin/command/rightFour.vue @@ -63,12 +63,25 @@ export default { closeDialog(){ this.isShow=false }, + changeDate() { + this.workerList.sort((a,b) => { + let aTimeString = a.updateTime + let bTimeString = b.updateTime + aTimeString = aTimeString.replace(/-/g,'/') + bTimeString = bTimeString.replace(/-/g,'/') + let aTime = new Date(aTimeString).getTime() + let bTime = new Date(bTimeString).getTime() + return bTime - aTime; + + }) + }, getData(){ getBroadcastingApi({ projectSn:this.$store.state.projectSn }).then(res=>{ console.log('播报信息',res); this.workerList=res.result + this.changeDate() }) } } diff --git a/src/views/projectAdmin/fourEngin/sourse/leftBottom.vue b/src/views/projectAdmin/fourEngin/sourse/leftBottom.vue index 41e132c5..75d689d8 100644 --- a/src/views/projectAdmin/fourEngin/sourse/leftBottom.vue +++ b/src/views/projectAdmin/fourEngin/sourse/leftBottom.vue @@ -1,7 +1,8 @@