diff --git a/dist.zip b/dist.zip
index 8403531a..05251a43 100644
Binary files a/dist.zip and b/dist.zip differ
diff --git a/src/views/projectAdmin/zjsj/carbon/leftTop.vue b/src/views/projectAdmin/zjsj/carbon/leftTop.vue
index ec67417f..fa2b4c95 100644
--- a/src/views/projectAdmin/zjsj/carbon/leftTop.vue
+++ b/src/views/projectAdmin/zjsj/carbon/leftTop.vue
@@ -51,11 +51,11 @@ export default {
     color: #c5c7cc;
     .num1 {
       position: absolute;
-      top: 46%;
+      top: 45%;
       left: 43%;
     }
     .text {
-      margin-top: 10%;
+      margin-top: 5%;
       font-size: 14px;
       width: 100%;
       text-align: center;
diff --git a/src/views/projectFront/deepFoundationPitManage/monitorData.vue b/src/views/projectFront/deepFoundationPitManage/monitorData.vue
index 73693676..3f121984 100644
--- a/src/views/projectFront/deepFoundationPitManage/monitorData.vue
+++ b/src/views/projectFront/deepFoundationPitManage/monitorData.vue
@@ -267,7 +267,11 @@
                   </template>
                 </el-table-column>
                 <!-- 警情 -->
-                <el-table-column :label="$t('message.deepFoundConfig.sirens')">
+                <el-table-column
+                  :label="$t('message.deepFoundConfig.sirens')"
+                  align="center"
+                  width="60"
+                >
                   <template slot-scope="scope">
                     <!-- '报警':'正常' -->
                     <span>{{scope.row.alarmType == 1? $t('message.deepFoundConfig.alarm'):$t('message.deepFoundConfig.normal')}}</span>
@@ -277,14 +281,20 @@
                 <el-table-column
                   prop="measurePointNum"
                   :label="$t('message.deepFoundConfig.pointCount')"
+                  align="center"
+                  width="100"
                 ></el-table-column>
-                <!-- 近7天预警数 -->
+                <!-- 近七天超控制数 -->
                 <el-table-column
-                  prop="warningNum"
-                  :label="$t('message.deepFoundConfig.warningNum7')"
+                  prop="superControlNumber"
+                  width="130"
+                  label="近七天超控制数"
+                  align="center"
                 ></el-table-column>
-                <!-- 近7天报警数 -->
-                <el-table-column prop="alarmNum" :label="$t('message.deepFoundConfig.alarmNum7')"></el-table-column>
+                <!-- 近七天超报警数 -->
+                <el-table-column prop="superAlarmNumber" label="近七天超报警数" width="130" align="center"></el-table-column>
+                <!-- 近7天超速率数 -->
+                <el-table-column prop="rateAlarmNumber" width="130" align="center" label="近7天超速率数"></el-table-column>
               </el-table>
               <!-- <el-pagination
                             class="pagerBox"
@@ -573,7 +583,8 @@ export default {
       option1: {},
       echartData: [
         { value: 0, name: "超出控制值" },
-        { value: 0, name: "超出报警值" }
+        { value: 0, name: "超出报警值" },
+        { value: 0, name: "超出速率值" }
       ],
       chart2: Object,
       option2: {},
@@ -804,12 +815,16 @@ export default {
         if (res.code == 200 && res.result) {
           this.echartData[0].value = 0;
           this.echartData[1].value = 0;
+          this.echartData[2].value = 0;
           res.result.forEach(item => {
-            this.echartData[0].value += item.controlNum;
-            this.echartData[1].value += item.alarmNum;
+            this.echartData[0].value += item.superControlNumber; // 超控制
+            this.echartData[1].value += item.superAlarmNumber; // 超报警
+            this.echartData[2].value += item.rateAlarmNumber; // 超速率
           });
           this.echartDataTotal =
-            this.echartData[0].value + this.echartData[1].value;
+            this.echartData[0].value +
+            this.echartData[1].value +
+            this.echartData[2].value;
         }
         this.createdEchart1();
       });
@@ -980,6 +995,11 @@ export default {
               // 超出报警值
               name: this.$t("message.deepFoundConfig.overAlarmNum"),
               icon: "circle"
+            },
+            {
+              // 超出速率值
+              name: "超出速率值",
+              icon: "circle"
             }
           ],
           formatter: name => {
@@ -1499,118 +1519,118 @@ export default {
       chart6.setOption(this.option6);
     },
     createdEchart7() {
-        if(this.tableData2.length != 0){
-      let chart7 = echarts.init(this.$refs["echart7"]);
-      this.chart7 = chart7;
-      chart7.clear();
-      this.option7 = {
-        tooltip: {
-          trigger: "axis"
-        },
-        legend: {
-          show: false
-        },
-        grid: {
-          top: "30px",
-          left: "60px",
-          right: "35px",
-          bottom: "30px"
-        },
-        xAxis: {
-          type: "category",
-          boundaryGap: false,
-          data: this.echartData7.xAxis,
-          axisLine: {
+      if (this.tableData2.length != 0) {
+        let chart7 = echarts.init(this.$refs["echart7"]);
+        this.chart7 = chart7;
+        chart7.clear();
+        this.option7 = {
+          tooltip: {
+            trigger: "axis"
+          },
+          legend: {
+            show: false
+          },
+          grid: {
+            top: "30px",
+            left: "60px",
+            right: "35px",
+            bottom: "30px"
+          },
+          xAxis: {
+            type: "category",
+            boundaryGap: false,
+            data: this.echartData7.xAxis,
+            axisLine: {
+              lineStyle: {
+                color: "#F4F5F8",
+                type: "solid"
+              }
+            },
+            axisTick: {
+              show: false
+            },
+            axisLabel: {
+              color: "#7F8694"
+            }
+          },
+          yAxis: {
+            type: "value",
+            name: this.echartData7.unit,
+            splitLine: {
+              lineStyle: {
+                color: "#F4F5F8",
+                type: "solid"
+              }
+            },
+            axisTick: {
+              show: false
+            },
+            axisLine: {
+              show: false
+            },
+            axisLabel: {
+              color: "#7F8694"
+            }
+          },
+          axisPointer: {
             lineStyle: {
               color: "#F4F5F8",
-              type: "solid"
+              type: "solid",
+              width: "0"
             }
           },
-          axisTick: {
-            show: false
-          },
-          axisLabel: {
-            color: "#7F8694"
-          }
-        },
-        yAxis: {
-          type: "value",
-          name: this.echartData7.unit,
-          splitLine: {
-            lineStyle: {
-              color: "#F4F5F8",
-              type: "solid"
+          series: [
+            {
+              // '报警值'
+              name: this.$t("message.deepFoundConfig.alarmNum"),
+              type: "line",
+              smooth: true,
+              symbol: "circle",
+              showSymbol: false,
+              data: this.echartData7.data,
+              areaStyle: {
+                opacity: 0.8,
+                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                  {
+                    offset: 0,
+                    color: "rgba(58, 123, 255, 0.5)"
+                  },
+                  {
+                    offset: 1,
+                    color: "rgba(58, 123, 255, 0.1)"
+                  }
+                ])
+              },
+              lineStyle: {
+                color: "#3A7BFF"
+              },
+              itemStyle: {
+                color: "#3A7BFF"
+              }
+              // markLine:{
+              //     data:[{
+              //         symbol: 'none',
+              //         yAxis: 100,
+              //     }],
+              //     lineStyle:{
+              //         color: '#F92A08'
+              //     },
+              //     label:{
+              //         position: 'insideStartTop',
+              //         formatter: '{f|报警值: 100}',
+              //         rich:{
+              //             f:{
+              //                 backgroundColor: 'rgba(249, 42, 8, 0.7)',
+              //                 color: '#fff',
+              //                 padding: [4, 60, 8, 8],
+              //             }
+              //         }
+              //     },
+              // }
             }
-          },
-          axisTick: {
-            show: false
-          },
-          axisLine: {
-            show: false
-          },
-          axisLabel: {
-            color: "#7F8694"
-          }
-        },
-        axisPointer: {
-          lineStyle: {
-            color: "#F4F5F8",
-            type: "solid",
-            width: "0"
-          }
-        },
-        series: [
-          {
-            // '报警值'
-            name: this.$t("message.deepFoundConfig.alarmNum"),
-            type: "line",
-            smooth: true,
-            symbol: "circle",
-            showSymbol: false,
-            data: this.echartData7.data,
-            areaStyle: {
-              opacity: 0.8,
-              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                {
-                  offset: 0,
-                  color: "rgba(58, 123, 255, 0.5)"
-                },
-                {
-                  offset: 1,
-                  color: "rgba(58, 123, 255, 0.1)"
-                }
-              ])
-            },
-            lineStyle: {
-              color: "#3A7BFF"
-            },
-            itemStyle: {
-              color: "#3A7BFF"
-            }
-            // markLine:{
-            //     data:[{
-            //         symbol: 'none',
-            //         yAxis: 100,
-            //     }],
-            //     lineStyle:{
-            //         color: '#F92A08'
-            //     },
-            //     label:{
-            //         position: 'insideStartTop',
-            //         formatter: '{f|报警值: 100}',
-            //         rich:{
-            //             f:{
-            //                 backgroundColor: 'rgba(249, 42, 8, 0.7)',
-            //                 color: '#fff',
-            //                 padding: [4, 60, 8, 8],
-            //             }
-            //         }
-            //     },
-            // }
-          }
-        ]
-      };
-      chart7.setOption(this.option7);
+          ]
+        };
+        chart7.setOption(this.option7);
       }
     },
     // 获取当前时间 返回YYYY-MM-DD HH:mm:ss
@@ -1644,7 +1664,7 @@ export default {
     },
     showDetail(val) {
       this.visibleDialog = true;
-    //   console.log("当前点击行的值", val);
+      //   console.log("当前点击行的值", val);
       this.relaId = val.id;
       this.checkList = "";
       this.checkList2 = "";
@@ -1752,7 +1772,7 @@ export default {
     },
     // 第二个选择
     getEchartsData(val) {
-    //   console.log("第二个选择", val);
+      //   console.log("第二个选择", val);
       selectDeepExcavationCurrentDataListApi({
         measurePointNumber: this.checkList,
         relaId: this.relaId,
@@ -1778,8 +1798,8 @@ export default {
             this.echartData7.data.push(item.data);
           });
           this.$nextTick(() => {
-              this.createdEchart7();
-            });
+            this.createdEchart7();
+          });
         }
       });
     },