From c84c8090a6b0fdbe4d226974826cd2baaf4cb8a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com>
Date: Mon, 22 Aug 2022 17:15:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B9=96=E9=87=8C=E5=A4=A7=E5=B1=8F(=E8=BF=9B?=
 =?UTF-8?q?=E5=BA=A6=E8=AE=A1=E5=88=92):=E8=B4=A8=E9=87=8F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E6=9B=B4=E6=94=B9=E4=B8=BA=E8=BF=9B=E5=BA=A6=E9=A2=84?=
 =?UTF-8?q?=E8=AD=A6=E4=BB=A5=E5=8F=8A=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectAdmin/jlw/planProgress/index.vue   |   2 +-
 .../jlw/planProgress/leftBottom.vue           | 141 +++++++++++++++++-
 .../deepFoundationPitManage/monitorData.vue   |   9 +-
 3 files changed, 142 insertions(+), 10 deletions(-)

diff --git a/src/views/projectAdmin/jlw/planProgress/index.vue b/src/views/projectAdmin/jlw/planProgress/index.vue
index d1fa67f1..c310a158 100644
--- a/src/views/projectAdmin/jlw/planProgress/index.vue
+++ b/src/views/projectAdmin/jlw/planProgress/index.vue
@@ -9,7 +9,7 @@
             <leftCenter title="状态统计" />
       </div>
       <div class="leftBottom">
-            <leftBottom title="质量问题" />
+            <leftBottom title="进度预警" />
       </div>
     </div>
     <div class="centerBox">
diff --git a/src/views/projectAdmin/jlw/planProgress/leftBottom.vue b/src/views/projectAdmin/jlw/planProgress/leftBottom.vue
index bd509cf9..65d4d2a3 100644
--- a/src/views/projectAdmin/jlw/planProgress/leftBottom.vue
+++ b/src/views/projectAdmin/jlw/planProgress/leftBottom.vue
@@ -1,13 +1,87 @@
 <template>
-  <!-- 质量问题 -->
-  <Card :title="title">
-    <JNestedRingChart :title="{ text: 654, subTitle: '本周总任务' ,y:'35%' }" :series="series" />
+  <!-- 进度预警 -->
+ <Card :title="title">
+    <!-- <JNestedRingChart :title="{ text: 654, subTitle: '本周总任务' ,y:'35%' }" :series="series" /> -->
+     <div class="containerBox">
+      <div class="content">
+        <!-- 进度预警 -->
+        <!-- {{$t('message.dataBoard.progressAlarm')}} -->
+        <el-select v-model="alarmType" size="mini" class="alarmTypeBox" @change="changeAlarmType">
+          <!-- 按人员 -->
+          <el-option :value="1" :label="$t('message.dataBoard.accordingtoPeople')"></el-option>
+          <!-- 按任务 -->
+          <el-option :value="2" :label="$t('message.dataBoard.accordingtoTask')"></el-option>
+        </el-select>
+      </div>
+      <div class="blockContent">
+        <vue-scroll>
+          <table class="greenTable" v-show="alarmType==1">
+            <thead>
+              <tr>
+                <th>
+                  <!-- 人员姓名 -->
+                  {{$t('message.dataBoard.peopleName')}}
+                </th>
+                <th>
+                  <!-- 超期任务数 -->
+                  {{$t('message.dataBoard.extendedTaskNum')}}
+                </th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr v-for="(item, index) in alarmList" :key="index">
+                <td>{{ item.personChargeName }}</td>
+                <td>{{ item.num }}</td>
+              </tr>
+            </tbody>
+          </table>
+          <table class="greenTable" v-show="alarmType==2">
+            <thead>
+              <tr>
+                <th>
+                  <!-- 任务 -->
+                  {{$t('message.dataBoard.task')}}
+                </th>
+                <th>
+                  <!-- 负责人 -->
+                  {{$t('message.dataBoard.principal')}}
+                </th>
+                <th>
+                  <!-- 超期天数 -->
+                  {{$t('message.dataBoard.extendedDays')}}
+                </th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr v-for="(item, index) in alarmList" :key="index">
+                <td>{{ item.subitemProjectName }}</td>
+                <td>{{ item.personChargeName }}</td>
+                <td>{{ item.overdueDayNum }}</td>
+              </tr>
+            </tbody>
+          </table>
+          <div class="noData" v-if="alarmList.length == 0">
+            <img src="@/assets/images/noData3.png" alt srcset />
+            <p>
+              <!-- 暂无数据 -->
+              {{$t('message.dataBoard.nodata')}}
+            </p>
+          </div>
+        </vue-scroll>
+      </div>
+    </div>
+
   </Card>
+
 </template>
 
 <script>
 import Card from "../components/Card.vue";
 import JNestedRingChart from "../jChart/pie/JNestedRingChart.vue";
+import {
+  selectProgressItemOverdueListApi,
+  selectPersonOverdueProgressItemNumListApi
+} from "@/assets/js/api/dataBoard.js";
 export default {
   components: { Card, JNestedRingChart },
   props: {
@@ -18,6 +92,8 @@ export default {
   },
   data() {
     return {
+      alarmType: 1,
+      alarmList: [],
       series: [
         {
           color: ["#3cabfd", "#57ec72", "#f294c6", "#f43a8d", "#6ee4f0"],
@@ -37,9 +113,66 @@ export default {
         }
       ]
     };
+  },
+  mounted() {
+    this.getData2()
+    this.getData3()
+  },
+  methods: {
+    changeAlarmType() {
+      if (this.alarmType == 1) {
+        this.getData3();
+      } else {
+        this.getData2();
+      }
+    },
+    getData2() {
+      selectProgressItemOverdueListApi({
+        projectSn: this.$store.state.projectSn
+      }).then(res => {
+        this.alarmList = res.result;
+      });
+    },
+    getData3() {
+      selectPersonOverdueProgressItemNumListApi({
+        projectSn: this.$store.state.projectSn
+      }).then(res => {
+        this.alarmList = res.result;
+      });
+    }
   }
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.containerBox{
+  .content{
+    .alarmTypeBox{
+      margin-left: 300px;
+      width: 100px;
+      margin-bottom: 10px;
+    }
+  }
+  .noData{
+    margin-left: 200px;
+  }
+  .greenTable{
+        font-size: 13px;
+        width: 100%;
+        border-spacing: 0px;
+        margin-bottom: 10px;
+        th{
+            color: rgba(255, 255, 255, 0.8);
+            border-bottom: 1px solid #142428;
+            padding-bottom: 5px;
+            font-weight: normal;
+        }
+        td{
+            color: rgba(255, 255, 255, 0.6);
+            text-align: center;
+            line-height: 20px;
+        }
+    }
+}
+</style>
 
diff --git a/src/views/projectFront/deepFoundationPitManage/monitorData.vue b/src/views/projectFront/deepFoundationPitManage/monitorData.vue
index 33acbb33..25e62c31 100644
--- a/src/views/projectFront/deepFoundationPitManage/monitorData.vue
+++ b/src/views/projectFront/deepFoundationPitManage/monitorData.vue
@@ -542,14 +542,13 @@ export default {
             }).then(res=>{
                 console.log(res)
                 if(res.code == 200 && res.result){
-                    console.log('下面的数据',res)
+                    // console.log('下面的数据',res)
                     this.tableData2 = res.result.records
                     this.echartData7={
                         xAxis: [],
                         data: []
                     }
                     this.detailData.tableHeader.forEach(item=>{
-                        console.log('----item---',item)
                         if(item.key == 'data'){
                             this.echartData7.unit = '('+item.keyName.split('(')[1]
                         }
@@ -569,7 +568,7 @@ export default {
                 deepExcavationId: this.deepExcavation,
                 relaId: this.relaId
             }).then(res=>{
-                console.log('列表查询测点',res)
+                // console.log('列表查询测点',res)
                 if(res.code == 200 && res.result){
                     this.options = res.result
                     let arr = []
@@ -691,7 +690,7 @@ export default {
                         item.pointData = arr
                     })
                     this.pointList = res.result
-                    // console.log(this.pointList)
+                    // console.log('左边的下面',this.pointList)
                 }
             })
         },
@@ -712,7 +711,7 @@ export default {
                 deepExcavationId: this.deepExcavation,
                 projectSn: this.projectSn
             }).then(res=>{
-                console.log(res.result,"平面图列表")
+                console.log("平面图列表",res.result)
                 if(res.code == 200 && res.result){
                     this.mapList = res.result
                     this.mapId = ""