diff --git a/src/views/projectAdmin/fourEngin/carbon/image/img2.png b/src/views/projectAdmin/fourEngin/carbon/image/img2.png
index ee308ccb..883c9887 100644
Binary files a/src/views/projectAdmin/fourEngin/carbon/image/img2.png and b/src/views/projectAdmin/fourEngin/carbon/image/img2.png differ
diff --git a/src/views/projectAdmin/fourEngin/carbon/leftCenter.vue b/src/views/projectAdmin/fourEngin/carbon/leftCenter.vue
index 9cdd03bd..1a5531a2 100644
--- a/src/views/projectAdmin/fourEngin/carbon/leftCenter.vue
+++ b/src/views/projectAdmin/fourEngin/carbon/leftCenter.vue
@@ -1,5 +1,5 @@
 <template>
-  <Card title="总碳排放曲线图">
+  <Card title="用水用电碳排放图">
     <div class="containerBox">
       <img src="./image/img2.png" alt="">
     </div>
@@ -296,9 +296,11 @@ export default {
   width: 103%;
   height: 320px;
   img{
-    width: 96%;
-    height: 98%;
-    margin-top: 10px;
+    width: 72%;
+    height: 81%;
+    margin-top: 40px;
+    margin-left: 73px;
+
   }
   .titleTxt {
     font-size: 18px;
diff --git a/src/views/projectAdmin/fourEngin/command/leftThree/index.vue b/src/views/projectAdmin/fourEngin/command/leftThree/index.vue
index 234e1ece..6c0aaa36 100644
--- a/src/views/projectAdmin/fourEngin/command/leftThree/index.vue
+++ b/src/views/projectAdmin/fourEngin/command/leftThree/index.vue
@@ -49,17 +49,17 @@ export default {
         {
           id: 2,
           name: "地下室结构施工",
-          Time: "2023-03-30",
+          Time: "2023-03-25",
         },
         {
           id: 3,
-          name: " 地上结构施工",
-          Time: "2024-01-12",
+          name: " 核心筒结构施工",
+          Time: "2023-10-31",
         },
         {
           id: 4,
           name: "幕墙施工",
-          Time: "2024-04-27",
+          Time: "2024-03-29",
         },
         {
           id: 5,
@@ -69,7 +69,7 @@ export default {
         {
           id: 6,
           name: "精装修施工",
-          Time: "2024-07-30",
+          Time: "2024-08-21",
         },
         {
           id: 7,
diff --git a/src/views/projectAdmin/fourEngin/command/rightOne.vue b/src/views/projectAdmin/fourEngin/command/rightOne.vue
index 0306458c..0e90eea7 100644
--- a/src/views/projectAdmin/fourEngin/command/rightOne.vue
+++ b/src/views/projectAdmin/fourEngin/command/rightOne.vue
@@ -6,17 +6,17 @@
         <div class="lw">
           <p>今日出勤</p>
           <!-- <p class="number">{{ list.todayAtte||0}}</p> -->
-          <p class="number">186</p>
+          <p class="number">198</p>
         </div>
         <div class="cq">
           <p>在场</p>
           <!-- <p class="number">{{ list.bePresent||0 }}</p> -->
-          <p class="number">342</p>
+          <p class="number">364</p>
         </div>
         <div class="tc">
           <p>今日出勤率</p>
           <!-- <p class="number">{{ list.atteRatio ||0}}%</p> -->
-          <p class="number">54.39%</p>
+          <p class="number">54.4%</p>
         </div>
        
       </div>
@@ -24,7 +24,7 @@
         <div class="lw">
           <p>现场</p>
           <!-- <p class="number">{{ list.scene||0 }}</p> -->
-          <p class="number">162</p>
+          <p class="number">179</p>
         </div>
         <div class="cq">
           <p>今日进场</p>
@@ -34,7 +34,7 @@
         <div class="tc">
           <p>今日退场</p>
           <!-- <p class="number">{{ list.todayExit||0}}</p> -->
-          <p class="number">0</p>
+          <p class="number">21</p>
         </div>
        
       </div>
diff --git a/src/views/projectAdmin/fourEngin/govComp/Col2.vue b/src/views/projectAdmin/fourEngin/govComp/Col2.vue
index 6e542406..5f676b0f 100644
--- a/src/views/projectAdmin/fourEngin/govComp/Col2.vue
+++ b/src/views/projectAdmin/fourEngin/govComp/Col2.vue
@@ -42,135 +42,96 @@ export default {
   components: { Card },
   data() {
     return {
-      contentList: [
-        {
-          time: "2022-12-24",
+      contentList: [{
+          time: "2022-12-28",
           question: 1,
           utils: "中国建筑第四工程局有限公司",
-          safe: "谢文乐、陈鑫华",
-          type: "质量",
-          position: "首块地板",
+          safe: "王斌",
+          type: "安全",
+          position: "基坑",
           change: "是"
         },
         {
-          time: "2022-11-2",
+          time: "2022-12-05",
           question: 1,
           utils: "中国建筑第四工程局有限公司",
-          safe: "唐鹏程、陈鑫华",
-          type: "质量",
-          position: "人工挖空终孔",
-          change: "否"
+          safe: "王章浩、陈伟斌",
+          type: "安全",
+          position: "基坑",
+          change: "是"
         },
         {
-          time: "2022-10-18",
+          time: "2022-11-01",
           question: 1,
           utils: "中国建筑第四工程局有限公司",
-          safe: "周凌杰、唐鹏程",
-          type: "质量",
-          position: "天然地基",
-          change: "否"
+          safe: "王章浩、陈伟斌",
+          type: "安全",
+          position: "基坑",
+          change: "是"
+        },
+        {
+          time: "2022-10-24",
+          question: 1,
+          utils: "中国建筑第四工程局有限公司",
+          safe: "王章浩、王斌",
+          type: "安全",
+          position: "基坑",
+          change: "是"
         },
         {
           time: "2022-10-11",
           question: 1,
           utils: "中国建筑第四工程局有限公司",
-          safe: "陈鑫华、唐鹏程",
+          safe: "徐军、陈伟斌",
           type: "安全",
-          position: "基坑承台垫层",
-          change: "否"
-        },
-        {
-          time: "2022-09-24",
-          question: 2,
-          utils: "中国建筑第四工程局有限公司",
-          safe: "唐鹏程、谢文乐",
-          type: "安全",
-          position: "16号桩",
+          position: "人工挖孔桩",
           change: "是"
         },
         {
-          time: "2022-09-12",
-          question: 2,
+          time: "2022-09-29",
+          question: 1,
           utils: "中国建筑第四工程局有限公司",
-          safe: "唐鹏程、谢文乐",
+          safe: "王斌",
           type: "安全",
-          position: "14号桩",
-          change: "否"
+          position: "人工挖孔桩",
+          change: "是"
         },
         {
-          time: "2022-08-27",
-          question: 2,
+          time: "2022-08-29",
+          question: 1,
           utils: "中国建筑第四工程局有限公司",
-          safe: "谢文乐、周凌杰",
+          safe: "王章浩",
           type: "安全",
-          position: "抗拔实验基础",
-          change: "否"
+          position: "基坑",
+          change: "是"
         },
         {
-          time: "2022-08-13",
-          question: 2,
+          time: "2022-08-15",
+          question: 1,
           utils: "中国建筑第四工程局有限公司",
-          safe: "陈鑫华、周凌杰",
+          safe: "王章浩、陈伟斌",
           type: "安全",
-          position: "25号桩",
-          change: "否"
+          position: "基坑",
+          change: "是"
         },
         {
-          time: "2022-07-22",
-          question: 2,
+          time: "2022-07-19",
+          question: 1,
           utils: "中国建筑第四工程局有限公司",
-          safe: "周凌杰、谢文乐",
+          safe: "王昊、余锋",
           type: "安全",
-          position: "20号桩",
-          change: "否"
+          position: "施工路面",
+          change: "是"
         },
         {
-          time: "2022-07-18",
-          question: 2,
+          time: "2022-06-20",
+          question: 1,
           utils: "中国建筑第四工程局有限公司",
-          safe: "周凌杰、唐鹏程",
+          safe: "王章浩",
           type: "安全",
-          position: "5号桩",
-          change: "否"
-        },
-        {
-          time: "2022-06-25",
-          question: 2,
-          utils: "中国建筑第四工程局有限公司",
-          safe: "唐鹏程、陈鑫华",
-          type: "安全",
-          position: "21号桩",
-          change: "否"
-        },
-        {
-          time: "2022-06-11",
-          question: 2,
-          utils: "中国建筑第四工程局有限公司",
-          safe: "唐鹏程、陈鑫华",
-          type: "安全",
-          position: "三级沉淀池垫层",
-          change: "否"
-        },
-        {
-          
-          time: "2022-05-20",
-          question: 2,
-          utils: "中国建筑第四工程局有限公司",
-          safe: "谢文乐、周凌杰",
-          type: "安全",
-          position: "4号桩",
-          change: "否"
-        },
-        {
-          
-          time: "2022-05-9",
-          question: 2,
-          utils: "中国建筑第四工程局有限公司",
-          safe: "谢文乐、陈鑫华",
-          type: "安全",
-          position: "25号桩",
-          change: "否"
-        },
+          position: "基坑",
+          change: "是"
+        }
       ]
     };
   }
diff --git a/src/views/projectAdmin/fourEngin/govComp/leftMiddle.vue b/src/views/projectAdmin/fourEngin/govComp/leftMiddle.vue
index e1c1b077..a908ca53 100644
--- a/src/views/projectAdmin/fourEngin/govComp/leftMiddle.vue
+++ b/src/views/projectAdmin/fourEngin/govComp/leftMiddle.vue
@@ -3,22 +3,23 @@
     <div class="contentBox">
       <div>监督员</div>
       <div class="person">
-        <span>谢文乐</span>
-        <span>唐鹏程</span>
-        <span>周凌杰</span>
+        <span>冯发娟</span>
+        <span>王斌</span>
+        <span>王章浩</span>
+        <span>陈伟斌</span>
         <span>陈鑫华</span>
       </div>
       <div class="carbonEmission">
       <div class="photovoltaicOne">
-        <div class="textKwh" style="margin-left:70px">2</div>
+        <div class="textKwh" style="margin-left:62px">13</div>
         <div class="textBottom">下发整改通知书</div>
       </div>
       <div class="photovoltaicTwo">
-        <div class="textKwh">112</div>
+        <div class="textKwh">46</div>
         <div class="textBottom">累计监督签到人数</div>
       </div>
       <div class="photovoltaicThree">
-        <div class="textKwh" style="margin-left:70px">2</div>
+        <div class="textKwh" style="margin-left:62px">13</div>
         <div class="textBottom" style="margin-left:50px">已整改</div>
       </div>
       <div class="photovoltaicFour">
@@ -125,7 +126,7 @@ export default {
     span {
       margin: 5px 5px 10px 0px;
       display: inline-block;
-      width: 88px;
+      width: 84px;
       height: 40px;
       text-align: center;
       line-height: 40px;
diff --git a/src/views/projectAdmin/fourEngin/progress/leftOne.vue b/src/views/projectAdmin/fourEngin/progress/leftOne.vue
index af738f06..9d0ae1ac 100644
--- a/src/views/projectAdmin/fourEngin/progress/leftOne.vue
+++ b/src/views/projectAdmin/fourEngin/progress/leftOne.vue
@@ -9,9 +9,9 @@
         @node-click="handleNodeClick"
       >
         <span class="custom-tree-node" slot-scope="{ node, data }">
-          <span>{{ node.label }}</span>
+          <span :title="node.label">{{ node.label }}</span>
           <span>
-            <div class="dtae">{{ data.startDate }}-{{ data.finishDate }}</div>
+            <div class="dtae" :title="node.label">{{ data.startDate }}-{{ data.finishDate }}</div>
           </span>
         </span>
       </el-tree>
@@ -67,14 +67,14 @@ export default {
 }
 .dtae {
   width: 140px;
-    position: initial;
-    font-size: 10px;
-    float: right;
-    margin-top: -17px;
-    margin-left: 205px;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    overflow: hidden;
+  position: absolute;
+  font-size: 10px;
+  float: right;
+  margin-top: -17px;
+  margin-left: 205px;      
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;   
 }
 .down-tree {
   height: 840px;
@@ -166,4 +166,10 @@ export default {
   font-weight: bold;
   background-color: #66d4d9 !important;
 }
+.custom-tree-node {
+  width: 206px;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
 </style>
diff --git a/src/views/projectAdmin/fourEngin/progress/topRight.vue b/src/views/projectAdmin/fourEngin/progress/topRight.vue
index d473b757..abe9cc20 100644
--- a/src/views/projectAdmin/fourEngin/progress/topRight.vue
+++ b/src/views/projectAdmin/fourEngin/progress/topRight.vue
@@ -75,7 +75,7 @@
               alt=""
             />
             <span class="grey">计划结束时间：</span
-            ><span class="blue">2023-01-25</span>
+            ><span class="blue">2023-01-15</span>
           </div>
           <div class="endTime">
             <img
diff --git a/src/views/projectAdmin/fourEngin/security/leftCenter.vue b/src/views/projectAdmin/fourEngin/security/leftCenter.vue
index ece256ea..affe1a38 100644
--- a/src/views/projectAdmin/fourEngin/security/leftCenter.vue
+++ b/src/views/projectAdmin/fourEngin/security/leftCenter.vue
@@ -5,24 +5,24 @@
         <div class="lw">
           <p>今日出勤</p>
           <!-- <p class="number">{{ list.todayAtte||0 }}</p> -->
-          <p class="number">186</p>
+          <p class="number">198</p>
         </div>
         <div class="cq">
           <p>在场</p>
           <!-- <p class="number">{{ list.bePresent||0 }}</p> -->
-          <p class="number">342</p>
+          <p class="number">364</p>
         </div>
         <div class="tc">
           <p>今日出勤率</p>
           <!-- <p class="number">{{ list.atteRatio||0  }}%</p> -->
-          <p class="number">54.39%</p>
+          <p class="number">54.4%</p>
         </div>
       </div>
       <div class="contentbut">
         <div class="lw">
           <p>现场</p>
           <!-- <p class="number">{{ list.scene||0  }}</p> -->
-          <p class="number">162</p>
+          <p class="number">179</p>
         </div>
         <div class="cq">
           <p>今日进场</p>
@@ -31,7 +31,7 @@
         </div>
         <div class="tc">
           <p>今日退场</p>
-          <p class="number">0</p>
+          <p class="number">21</p>
           <!-- <p class="number">{{ list.todayExit||0  }}</p> -->
         </div>
       </div>
diff --git a/src/views/projectAdmin/fourEngin/sourse/leftBottom.vue b/src/views/projectAdmin/fourEngin/sourse/leftBottom.vue
index 75d689d8..442cec93 100644
--- a/src/views/projectAdmin/fourEngin/sourse/leftBottom.vue
+++ b/src/views/projectAdmin/fourEngin/sourse/leftBottom.vue
@@ -1,6 +1,6 @@
 <template>
   <Card title="监控录像">
-    <VideoModule  class="playVideoBox"
+    <!-- <VideoModule  class="playVideoBox"
     style="height:200px;width:600px"
     :type="'1x1'"
         :value="selectList"
@@ -11,46 +11,388 @@
         :showControl="false"
         :showPlayback="false"
         :xxx="7"
-      ></VideoModule>
+      ></VideoModule> -->
+    <div class="box">
+      <div class="security-list">
+        <div class="thead">
+          <div class="row">
+            <div class="td">材料类型</div>
+            <div class="td" style="margin-left: 100px">进场时间</div>
+            <div class="td">进场量</div>
+          </div>
+        </div>
+        <div class="tbody">
+          <vue-scroll style="width: 95%; height: 160px">
+            <div
+              class="row"
+              v-for="(item, index) in tableData"
+              :key="index"
+              @click="showBtn(index)"
+              @mouseleave="mouseLeave"
+              :class="{ active: nowIndex == index }"
+            >
+              <div class="td">{{ item.nameType }}</div>
+              <div class="td" style="margin-left: 100px">
+                {{ item.dateTime }}
+              </div>
+              <div class="td" style="margin-left: 20px">
+                {{ item.mobilization }}
+              </div>
+            </div>
+            <div class="row" v-if="tableData.length == 0">
+              <div
+                style="
+                  font-size: 14px;
+                  color: #999;
+                  text-align: center;
+                  width: 100%;
+                  line-height: 200px;
+                "
+              >
+                暂无数据
+              </div>
+            </div>
+          </vue-scroll>
+        </div>
+      </div>
+    </div>
+
+    <!-- 列表点击弹框 -->
+    <div class="informationDialog" v-show="isShow">
+      <div class="titleText" >
+        材料进场记录
+      </div>
+      <div class="content">
+        <div>进场时间：{{tableDataTest.showTime}}</div>
+       <div>材料类型：{{tableDataTest.showType}}</div>
+       <div>生产厂家：{{tableDataTest.showManufactor}}</div>
+       <div>进场量：{{tableDataTest.showVolume}}</div>
+       <div>车牌号：{{tableDataTest.showLicensePlate}}</div>
+      </div>
+       
+    </div>
   </Card>
 </template>
 
 <script>
 import Card from "../components/Card.vue";
-import { getReceiptOrIssueRecord } from '@/assets/js/api/markingRoom'
-import { getComapnyStatisticsListApi, getComapnyVideoListApi, getComapnyParentNameApi } from '@/assets/js/api/company/project'
-import VideoModule from "@/components/videoModule/videoModule.vue";
+import { getReceiptOrIssueRecord } from "@/assets/js/api/markingRoom";
+import {
+  getComapnyStatisticsListApi,
+  getComapnyVideoListApi,
+  getComapnyParentNameApi,
+} from "@/assets/js/api/company/project";
+// import VideoModule from "@/components/videoModule/videoModule.vue";
 export default {
-  components: { Card,VideoModule },
+  components: {
+    Card,
+    // VideoModule
+  },
   data() {
     return {
-      typeList:{
-        1:"入库",
-        2:"出库",
-        3:"出库"
+      typeList: {
+        1: "入库",
+        2: "出库",
+        3: "出库",
       },
-      sn:'',
-      carList:[],
-      selectList:[],
-        value1:'2',
-        typeList: [{
-          value: '1',
-          label: '2屏'
-        }, {
-          value: '2',
-          label: '4屏'
-        }, {
-          value: '3',
-          label: '9屏'
-        }],
+      sn: "",
+      carList: [],
+      selectList: [],
+      value1: "2",
+      typeList: [
+        {
+          value: "1",
+          label: "2屏",
+        },
+        {
+          value: "2",
+          label: "4屏",
+        },
+        {
+          value: "3",
+          label: "9屏",
+        },
+      ],
+      tableData: [
+        {
+          nameType: "韶钢 HRB400E 螺纹钢",
+          dateTime: "2023-01-10",
+          mobilization: 10.87,
+        },
+        {
+          nameType: "韶钢 HRB400E 螺纹钢",
+          dateTime: "2023-01-10",
+          mobilization: 21.94,
+        },
+        {
+          nameType: "韶钢 HRB400E 螺纹钢",
+          dateTime: "2023-01-10",
+          mobilization: 32.36,
+        },
+        {
+          nameType: "桂鑫 HRB400E 螺纹钢",
+          dateTime: "2023-01-07",
+          mobilization: 11.34,
+        },
+        {
+          nameType: "桂鑫 HRB400E 螺纹钢",
+          dateTime: "2023-01-07",
+          mobilization: 9.21,
+        },
+        {
+          nameType: "桂鑫 HRB400E 螺纹钢",
+          dateTime: "2023-01-07",
+          mobilization: 5.66,
+        },
+        {
+          nameType: "桂鑫 HRB400E 螺纹钢",
+          dateTime: "2023-01-07",
+          mobilization: 7.01,
+        },
+        {
+          nameType: "西林 HRB400E 螺纹钢",
+          dateTime: "2023-01-06",
+          mobilization: 34.65,
+        },
+        {
+          nameType: "西林 HRB400E 螺纹钢",
+          dateTime: "2023-01-06",
+          mobilization: 34.6,
+        },
+        {
+          nameType: "西林 HRB400E 螺纹钢",
+          dateTime: "2023-01-05",
+          mobilization: 11.69,
+        },
+        {
+          nameType: "西林 HRB400E 螺纹钢",
+          dateTime: "2023-01-05",
+          mobilization: 10.06,
+        },
+        {
+          nameType: "西林 HRB400E 螺纹钢",
+          dateTime: "2023-01-05",
+          mobilization: 10.59,
+        },
+        {
+          nameType: "西林 HRB400E 螺纹钢",
+          dateTime: "2023-01-04",
+          mobilization: 32.12,
+        },
+        {
+          nameType: "西林 HRB400E 螺纹钢",
+          dateTime: "2023-01-04",
+          mobilization: 13.89,
+        },
+        {
+          nameType: "西林 HRB400E 螺纹钢",
+          dateTime: "2023-01-04",
+          mobilization: 17.46,
+        },
+        {
+          nameType: "桂万 HRB400E 螺纹钢",
+          dateTime: "2023-01-02",
+          mobilization: 32.8,
+        },
+        {
+          nameType: "桂万 HRB400E 螺纹钢",
+          dateTime: "2023-01-02",
+          mobilization: 25.54,
+        },
+        {
+          nameType: "桂万 HRB400E 螺纹钢",
+          dateTime: "2023-01-02",
+          mobilization: 7.64,
+        },
+        {
+          nameType: "桂万 HRB400E 螺纹钢",
+          dateTime: "2023-01-01",
+          mobilization: 32.53,
+        },
+        {
+          nameType: "桂万 HRB400E 螺纹钢",
+          dateTime: "2023-01-01",
+          mobilization: 32.45,
+        },
+        {
+          nameType: "桂万 HRB400E 螺纹钢",
+          dateTime: "2023-01-01",
+          mobilization: 33.11,
+        },
+      ],
+      nowIndex: -1,
+      isShow:false,
+      tableDataTest: {},
+      tableDataShow:[
+        {
+          showTime:'2023-01-10',
+          showType:'韶钢 HRB400E 螺纹钢',
+          showManufactor:'广东韶钢松山股份有限公司',
+          showVolume:10.87,
+          showLicensePlate:'粤F99916',
+        },
+        {
+          showTime:'2023-01-10',
+          showType:'韶钢 HRB400E 螺纹钢',
+          showManufactor:'广东韶钢松山股份有限公司',
+          showVolume:21.94,
+          showLicensePlate:'粤F26801',
+        },
+        {
+          showTime:'2023-01-10',
+          showType:'韶钢 HRB400E 螺纹钢',
+          showManufactor:'广东韶钢松山股份有限公司',
+          showVolume:32.36,
+          showLicensePlate:'桂BG6735',
+        },
+        {
+          showTime:'2023-01-07',
+          showType:'桂鑫 HRB400E 螺纹钢',
+          showManufactor:'广西桂鑫钢铁集团有限公司',
+          showVolume:11.34,
+          showLicensePlate:'桂J27861',
+        },
+        {
+          showTime:'2023-01-07',
+          showType:'桂鑫 HRB400E 螺纹钢',
+          showManufactor:'广西桂鑫钢铁集团有限公司',
+          showVolume:9.21,
+          showLicensePlate:'桂J27861',
+        },
+        {
+          showTime:'2023-01-07',
+          showType:'桂鑫 HRB400E 螺纹钢',
+          showManufactor:'广西桂鑫钢铁集团有限公司',
+          showVolume:5.66,
+          showLicensePlate:'桂J27861',
+        },
+        {
+          showTime:'2023-01-07',
+          showType:'桂鑫 HRB400E 螺纹钢',
+          showManufactor:'广西桂鑫钢铁集团有限公司',
+          showVolume:7.01,
+          showLicensePlate:'桂J27861',
+        },
+        {
+          showTime:'2023-01-06',
+          showType:'西林 HRB400E 螺纹钢',
+          showManufactor:'建龙西林钢铁有限公司',
+          showVolume:34.65,
+          showLicensePlate:'桂BY5369',
+        },
+        {
+          showTime:'2023-01-06',
+          showType:'西林 HRB400E 螺纹钢',
+          showManufactor:'建龙西林钢铁有限公司',
+          showVolume:34.60,
+          showLicensePlate:'桂BY2375',
+        },
+        {
+          showTime:'2023-01-05',
+          showType:'西林 HRB400E 螺纹钢',
+          showManufactor:'建龙西林钢铁有限公司',
+          showVolume:11.69,
+          showLicensePlate:'粤AFP290',
+        },
+        {
+          showTime:'2023-01-05',
+          showType:'西林 HRB400E 螺纹钢',
+          showManufactor:'建龙西林钢铁有限公司',
+          showVolume:10.06,
+          showLicensePlate:'粤AFP290',
+        },
+        {
+          showTime:'2023-01-05',
+          showType:'西林 HRB400E 螺纹钢',
+          showManufactor:'建龙西林钢铁有限公司',
+          showVolume:10.59,
+          showLicensePlate:'粤AFP290',
+        },
+        {
+          showTime:'2023-01-04',
+          showType:'西林 HRB400E 螺纹钢',
+          showManufactor:'建龙西林钢铁有限公司',
+          showVolume:32.12,
+          showLicensePlate:'粤AFP290',
+        },
+        {
+          showTime:'2023-01-04',
+          showType:'西林 HRB400E 螺纹钢',
+          showManufactor:'建龙西林钢铁有限公司',
+          showVolume:13.89,
+          showLicensePlate:'粤ABW785',
+        },
+        {
+          showTime:'2023-01-04',
+          showType:'西林 HRB400E 螺纹钢',
+          showManufactor:'建龙西林钢铁有限公司',
+          showVolume:17.46,
+          showLicensePlate:'粤ABW785',
+        },
+        {
+          showTime:'2023-01-02',
+          showType:'桂万 HRB400E 螺纹钢',
+          showManufactor:'广西盛隆冶金有限公司',
+          showVolume:32.80,
+          showLicensePlate:'粤AHN951',
+        },
+
+        {
+          showTime:'2023-01-02',
+          showType:'桂万 HRB400E 螺纹钢',
+          showManufactor:'广西盛隆冶金有限公司',
+          showVolume:25.54,
+          showLicensePlate:'粤AFD410',
+        },
+        {
+          showTime:'2023-01-02',
+          showType:'桂万 HRB400E 螺纹钢',
+          showManufactor:'广西盛隆冶金有限公司',
+          showVolume:7.64,
+          showLicensePlate:'粤AFD410',
+        },
+        {
+          showTime:'2023-01-01',
+          showType:'桂万 HRB400E 螺纹钢',
+          showManufactor:'广西盛隆冶金有限公司',
+          showVolume:32.53,
+          showLicensePlate:'粤BLU118',
+        },
+        {
+          showTime:'2023-01-01',
+          showType:'桂万 HRB400E 螺纹钢',
+          showManufactor:'广西盛隆冶金有限公司',
+          showVolume:32.45,
+          showLicensePlate:'粤BLM700',
+        },
+        {
+          showTime:'2023-01-01',
+          showType:'桂万 HRB400E 螺纹钢',
+          showManufactor:'广西盛隆冶金有限公司',
+          showVolume:33.11,
+          showLicensePlate:'粤BMT161',
+        },
+      ]
     };
   },
-  mounted(){
-    this.getList()
+  mounted() {
+    // this.getList()
   },
-  methods:{
-    getList(){
-      this.sn = this.$store.state.projectSn
+  methods: {
+    //点击列表
+    showBtn(index) {
+      this.nowIndex = index;
+      this.isShow=true
+       this.tableDataTest = this.tableDataShow[index]
+    },
+     //鼠标移出关闭弹框
+     mouseLeave(){
+      this.isShow=false
+    },
+
+    //查询监控
+    getList() {
+      this.sn = this.$store.state.projectSn;
       // getReceiptOrIssueRecord({ projectSn: this.sn }).then(res => {
       //   this.selectList = res.result
       //   console.log('this.carList ',this.selectList);
@@ -59,31 +401,112 @@ export default {
       getComapnyStatisticsListApi({
         sn: this.sn,
         videoType: 1,
-        standardType:  1 
-      }).then(res => {
-        
+        standardType: 1,
+      }).then((res) => {
         this.treeData = res.result.companyList
           ? res.result.companyList
           : res.result.projectList
           ? res.result.projectList
-          : res.result.videoList
-          this.treeData.forEach(element => {
-            if(element.serialNumber == "c857ef822c014c7cbd40ad463ff84da7") {
-              this.selectList = [element]
-            }
-          });
-          console.log('-----tree',this.treeData)
-  
-      })
-    }
-    
-  }
+          : res.result.videoList;
+        this.treeData.forEach((element) => {
+          if (element.serialNumber == "c857ef822c014c7cbd40ad463ff84da7") {
+            this.selectList = [element];
+          }
+        });
+        console.log("-----tree", this.treeData);
+      });
+    },
+  },
 };
 </script>
 
 <style lang="less" scoped>
-.playVideoBox{
-    box-sizing: border-box;
-    padding-top: 20px;
+.playVideoBox {
+  box-sizing: border-box;
+  padding-top: 20px;
+}
+.security-list {
+  // margin-top: -4%;
+  height: 108%;
+  color: #fff;
+  margin-left: 15px;
+  margin-top: 20px;
+  .thead {
+    color: #6ae3eb;
+    margin-bottom: 5px;
+    margin-right: 20px;
+  }
+
+  .tbody {
+    height: calc(100% - 70px);
+    font-size: 12px;
+  }
+
+  .row {
+    display: flex;
+    align-items: center;
+
+    &:not(:last-child) {
+      // margin-bottom: 12px;
+      height: 30px;
+    }
+
+    div {
+      text-align: center;
+
+      &:last-child {
+        flex: 1;
+        margin: 0px 0 0 33px;
+      }
+
+      &:first-child {
+        width: 100px;
+      }
+
+      &:not(:last-child) {
+        width: 120px;
+        text-overflow: ellipsis;
+
+        overflow: hidden;
+
+        white-space: nowrap;
+        margin: 0px 0 0 0;
+      }
+
+      img {
+        width: 80px;
+        height: 50px;
+      }
+    }
+    .person {
+      margin-top: 4%;
+      margin-left: 37%;
+      height: 20px;
+      line-height: 25px;
+      display: flex;
+    }
+  }
+}
+.active {
+  background-color: #6ae3eb;
+}
+.informationDialog{
+  width: 22%;
+    height: 32%;
+    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAuQAAAJGCAYAAAATcJCAAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAzZSURBVHgB7doxq9ZlGIDx5//6ejwqLqdjdSoSpxApoSgoMlv7CIo4NPgZ/AgthWtDi0sfw4ZwCQqhCBwEDbTIHKLO8XT0PWVLs5DnepHfb3l4tpt7uoZ7On9r8/KYxqmxpBaLxbeP5vPPBwAAPKH9Ozvnxr59Z8aS2h3ju/njGH+0tf3B5t37W2MJ/Xnz7on73/z40QAAgCd09PQb66svrR8aS+jQxtrBfasHduePP5t3fnvwwydXbg8AAHiG/H7zp3tjGU3TOHnpwqtHjm+M2QAAADKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQtP525tXr3184cMBAADsqfe+uHJ1vjubfbpx+uyxX65dfzAAAICnb5rGC++eWtndN/ts9nCMG1s/3xfjAACwZ3bHPw2+/XB7+4YbcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAICXIAAAgJcgAACAlyAAAIzeZjcXHt7RNrAwAA2CPTOPr+68/vX1k5O5sW463Dx188MgAAgD2z+vL6wbHYPeNkBQAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAEKCHAAAQoIcAABCghwAAELzAQDA8pgG/6slXej032T/BvmhV9YPnLx04dhYQlt37m3e+/r7XwcAwLNpd/DUrL3z2nOHj28cGUvo4Mba6uN3Onfrj8uzaXZqLKtp+mrnr50vBwDAM0OD74lpGvOVlYvTo8WbY0ktxuL63/V9aEpH1mjPAAAAAElFTkSuQmCC);
+    background-size: 100% 100%;
+    position: absolute;
+    margin: -36% 0px 0px 41%;
+  .titleText{
+    font-size: 18px;
+    margin: 25px 0 0 150px;
+  }
+  .content{
+    margin: 61px 0 0 80px;
+    div{
+      margin-bottom: 15px;
+    }
+  }
+  
 }
 </style>
diff --git a/src/views/projectAdmin/fourEngin/sourse/leftCenter.vue b/src/views/projectAdmin/fourEngin/sourse/leftCenter.vue
index fb00a9fb..29dff193 100644
--- a/src/views/projectAdmin/fourEngin/sourse/leftCenter.vue
+++ b/src/views/projectAdmin/fourEngin/sourse/leftCenter.vue
@@ -65,10 +65,10 @@ export default {
         for(let i = 1; i <= res.result.length; i++) {
            if(i <= LeftLength) {
             this.gridNameLeft.push(res.result[i-1].typeName)
-           this.gridNameLeftData.push(res.result[i-1].deviationRatio)
+           this.gridNameLeftData.push(Math.abs(res.result[i-1].deviationRatio))
            }else{
             this.gridNameRight.push(res.result[i-1].typeName)
-           this.gridNameRightData.push(res.result[i-1].deviationRatio)
+           this.gridNameRightData.push(Math.abs(res.result[i-1].deviationRatio))
            }
           }
         }
diff --git a/src/views/projectAdmin/fourEngin/sourse/leftTop.vue b/src/views/projectAdmin/fourEngin/sourse/leftTop.vue
index b9432feb..d85ed015 100644
--- a/src/views/projectAdmin/fourEngin/sourse/leftTop.vue
+++ b/src/views/projectAdmin/fourEngin/sourse/leftTop.vue
@@ -22,19 +22,19 @@
       </div>
       <div class="carbonEmission">
       <div class="photovoltaicOne">
-        <div class="textKwh">{{messageList.planValue||0}}t</div>
+        <div class="textKwh">{{messageList.planValue||0}}</div>
         <div class="textBottom">计划用量</div>
       </div>
       <div class="photovoltaicTwo">
-        <div class="textKwh">{{messageList.passValue||0}}t</div>
+        <div class="textKwh">{{messageList.passValue||0}}</div>
         <div class="textBottom">进场量</div>
       </div>
       <div class="photovoltaicThree">
-        <div class="textKwh">{{messageList.consumeValue||0}}t</div>
+        <div class="textKwh">{{messageList.consumeValue||0}}</div>
         <div class="textBottom">消耗量</div>
       </div>
       <div class="photovoltaicFour">
-        <div class="textKwh">{{messageList.stockValue||0}}t</div>
+        <div class="textKwh">{{messageList.stockValue||0}}</div>
         <div class="textBottom">库存量</div>
       </div>
     </div>
@@ -76,7 +76,12 @@ export default {
       getMaterialTypeApi({ projectSn: this.sn }).then(res => {
         this.typesList = res.result
         if(res.result.length >= 1) {
-          this.typeId=res.result[2].id
+          res.result.forEach(element => {
+            if(element.name === "钢筋(t)") {
+              this.typeId=element.id
+            }
+          });
+          
           this.checkDate = "2023-01"
           this.getData()
         }
diff --git a/src/views/projectAdmin/fourEngin/sourse/rightTop.vue b/src/views/projectAdmin/fourEngin/sourse/rightTop.vue
index ca5ad577..c8b1c359 100644
--- a/src/views/projectAdmin/fourEngin/sourse/rightTop.vue
+++ b/src/views/projectAdmin/fourEngin/sourse/rightTop.vue
@@ -161,9 +161,9 @@ export default {
     var str = params[0].name + '<br>'
     for(let item of params) {
       if(item.seriesName === "偏差比例") {
-        str += item.seriesName + ' : ' + item.value + '%<br>'
+        str += item.seriesName + ' : ' + Math.abs(item.value) + '%<br>'
       }else{
-        str += item.seriesName + ' : ' + item.value + '<br>'
+        str += item.seriesName + ' : ' + Math.abs(item.value) + '<br>'
 
       }
       
@@ -193,7 +193,12 @@ export default {
         //     this.checkImg = true
         // }
         if(res.result.length >= 1) {
-          this.typeId=res.result[2].id
+          res.result.forEach(element => {
+            if(element.name === "钢筋(t)") {
+              this.typeId=element.id
+            }
+          });
+          
           this.checkDate = "2023"
           this.getgetPassConsumeRatioList()
           this.isblock = true