From 791cf27b4620f56f3e816dae1c0c550e0b174dcd Mon Sep 17 00:00:00 2001
From: Luck-Xiaomi <1569717859@qq.com>
Date: Fri, 16 Sep 2022 17:07:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=BB=BA=E5=9B=9B=E5=B1=80-=E8=BF=9B?=
 =?UTF-8?q?=E5=BA=A6=E7=AE=A1=E7=90=86=EF=BC=9A=E4=BC=98=E5=8C=96=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectAdmin/zjsj/command/rightThree.vue      | 15 ++++++++++-----
 src/views/projectAdmin/zjsj/progress/topRight.vue |  7 +++++--
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/views/projectAdmin/zjsj/command/rightThree.vue b/src/views/projectAdmin/zjsj/command/rightThree.vue
index fc8db1da..dfda693e 100644
--- a/src/views/projectAdmin/zjsj/command/rightThree.vue
+++ b/src/views/projectAdmin/zjsj/command/rightThree.vue
@@ -4,7 +4,7 @@
       <div class="left list">
         <div class="list-item" v-for="(item, key) in leftList" :key="key">
           <div class="image">
-            <img :src="item.image">
+            <img :src="item.image" />
           </div>
           <div class="value">
             <div class="number">{{ item.value }}</div>
@@ -46,9 +46,9 @@ export default {
     return {
       // 左边的列表
       leftList: {
-        'PM2.5': { label: 'PM2.5', value: 68, unit: 'μg/m³', image: require('../assets/images/command-center/icon-pm25.png'), },
-        PM10: { label: 'PM10', value: 36, unit: 'μg/m³', image: require('../assets/images/command-center/icon-pm10.png') },
-        噪音: { label: '噪音', value: 13, unit: '%dB', image: require('../assets/images/command-center/icon-noise.png') }
+        'PM2.5': { label: 'PM2.5', value: 68, unit: 'μg/m³', image: require('../assets/images/command-center/icon-pm25.png') },
+        'PM10': { label: 'PM10', value: 36, unit: 'μg/m³', image: require('../assets/images/command-center/icon-pm10.png') },
+        '噪音': { label: '噪音', value: 13, unit: '%dB', image: require('../assets/images/command-center/icon-noise.png') }
       },
       // 右边的列表
       rightList: {
@@ -77,7 +77,12 @@ export default {
       }
     }
   },
-  methods: {}
+  created() {
+    this.getList()
+  },
+  methods: {
+    getList() {},
+  }
 }
 </script>
 
diff --git a/src/views/projectAdmin/zjsj/progress/topRight.vue b/src/views/projectAdmin/zjsj/progress/topRight.vue
index 933a055e..237e2116 100644
--- a/src/views/projectAdmin/zjsj/progress/topRight.vue
+++ b/src/views/projectAdmin/zjsj/progress/topRight.vue
@@ -50,12 +50,15 @@ export default {
     /** 查询待办事项列表 */
     getList() {
       if (this.activeTab == 0) {
-        listProgressOfTheTask({ projectSn: this.projectSn, isNoStart: true }).then(res => {
+        listProgressOfTheTask({ projectSn: this.projectSn, state: 1 }).then(res => {
           console.log('查询待办事项列表: ', res);
           this.todoList = res.result;
         })
       } else {
-
+        listProgressOfTheTask({ projectSn: this.projectSn, state: 0 }).then(res => {
+          console.log('查询未来提醒列表: ', res);
+          this.todoList = res.result;
+        })
       }
     },
     /** tab点击事件 */