From 5d2074fd1a055ac0e761eaa5d1a21ae237d47f44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com>
Date: Thu, 12 Jan 2023 22:00:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AD=E5=BB=BA=E5=9B=9B?=
 =?UTF-8?q?=E5=B1=80=E5=A4=A7=E5=B1=8F=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fourEngin/command/leftFour.vue            |  4 +-
 .../fourEngin/command/leftThree/index.vue     | 14 +++----
 .../fourEngin/command/rightFour.vue           | 13 +++++++
 .../fourEngin/sourse/leftBottom.vue           | 31 +++++++++++++--
 .../projectAdmin/fourEngin/sourse/leftTop.vue |  2 +-
 .../fourEngin/sourse/rightTop.vue             | 39 +++++++++++++------
 6 files changed, 77 insertions(+), 26 deletions(-)

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 @@
         <div><img src="@/assets/images/zjsj/co2Bg.png" alt="" /></div>
         <div class="textBox">
           <p style="font-size: 20px; color: #5ce2f6">{{list.totalEmissionReductions}}kg</p>
-          <p style="font-size: 12px;margin-top: 10px;">累计降低二氧化碳排放量</p>
+          <p style="font-size: 12px;margin-top: 10px;width:140px">累计降低二氧化碳排放量</p>
         </div>
       </div>
       <div class="waterCumulative" style="margin-left: 60px">
         <div><img src="@/assets/images/zjsj/sunnyBg.png" alt="" /></div>
         <div class="textBox">
           <p style="font-size: 20px; color: #e7622a">{{list.totalGenerateElectricity}}kwh</p>
-          <p style="font-size: 12px; margin-top: 10px;">太阳能发电节约电量</p>
+          <p style="font-size: 12px; margin-top: 10px;width:130px">太阳能发电节约电量</p>
         </div>
       </div>
     </div>
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 @@
 <template>
   <Card title="监控录像">
     <VideoModule  class="playVideoBox"
-        :type="'project'"
+    style="height:200px;width:600px"
+    :type="'1x1'"
         :value="selectList"
         :displayBottomMod="false"
         :winNumBer="9"
@@ -17,6 +18,7 @@
 <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";
 export default {
   components: { Card,VideoModule },
@@ -49,11 +51,32 @@ export default {
   methods:{
     getList(){
       this.sn = this.$store.state.projectSn
-      getReceiptOrIssueRecord({ projectSn: this.sn }).then(res => {
-        this.carList = res.result
-        console.log('this.carList ',this.carList);
+      // getReceiptOrIssueRecord({ projectSn: this.sn }).then(res => {
+      //   this.selectList = res.result
+      //   console.log('this.carList ',this.selectList);
+      // })
+
+      getComapnyStatisticsListApi({
+        sn: this.sn,
+        videoType: 1,
+        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)
+  
       })
     }
+    
   }
 };
 </script>
diff --git a/src/views/projectAdmin/fourEngin/sourse/leftTop.vue b/src/views/projectAdmin/fourEngin/sourse/leftTop.vue
index 0cce4b99..b9432feb 100644
--- a/src/views/projectAdmin/fourEngin/sourse/leftTop.vue
+++ b/src/views/projectAdmin/fourEngin/sourse/leftTop.vue
@@ -76,7 +76,7 @@ export default {
       getMaterialTypeApi({ projectSn: this.sn }).then(res => {
         this.typesList = res.result
         if(res.result.length >= 1) {
-          this.typeId=res.result[0].id
+          this.typeId=res.result[2].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 4d0a009f..ca5ad577 100644
--- a/src/views/projectAdmin/fourEngin/sourse/rightTop.vue
+++ b/src/views/projectAdmin/fourEngin/sourse/rightTop.vue
@@ -1,9 +1,9 @@
 <template>
-  <Card title="主材进场和消耗对比图">
+  <Card title="主材料计划和进场对比图">
     <div class="typedata">
       <div class="containbox">
         <div class="typeName">材料类别</div>
-        <div >
+        <div>
           <el-select
             v-model="typeId"
             @change="checkTypes"
@@ -85,7 +85,7 @@ export default {
           label: "日",
         },
       ],
-      legend: ["计划用量", "实际用量", "偏差比例"],
+      legend: ["计划用量", "进场量", "偏差比例"],
       value1: "1",
       value2: "1",
       grid: ["18%", "2%", "2%", "2%"],
@@ -103,7 +103,7 @@ export default {
           },
         },
         {
-          name: "实际用量",
+          name: "进场量",
           type: "bar",
           data: [],
           itemStyle: {
@@ -156,6 +156,20 @@ export default {
         axisPointer: {
           type: "shadow",
         },
+
+  formatter:function(params) {
+    var str = params[0].name + '<br>'
+    for(let item of params) {
+      if(item.seriesName === "偏差比例") {
+        str += item.seriesName + ' : ' + item.value + '%<br>'
+      }else{
+        str += item.seriesName + ' : ' + item.value + '<br>'
+
+      }
+      
+    }
+    return str;
+  }
       },
       sn: "",
       plan: [],
@@ -165,7 +179,7 @@ export default {
       yearValue: "",
       isblock: false,
       year:'',
-    };
+    }
   },
   created() {
     // this.getList();
@@ -179,7 +193,7 @@ export default {
         //     this.checkImg = true
         // }
         if(res.result.length >= 1) {
-          this.typeId=res.result[0].id
+          this.typeId=res.result[2].id
           this.checkDate = "2023"
           this.getgetPassConsumeRatioList()
           this.isblock = true
@@ -194,8 +208,8 @@ export default {
         let consumeList = []
         let deviationRatioList = []
         res.result.forEach(element => {
-          passList.push(element.pass)
-          consumeList.push(element.consume)
+          passList.push(element.plan)
+          consumeList.push(element.pass)
           deviationRatioList.push(element.deviationRatio)
         });
         this.series[0].data  = passList   //计划用量  pass
@@ -263,8 +277,8 @@ export default {
       font-size: 14px;
     }
     .typeName {
-      width: 75px;   
-         height: 40px;
+      width: 75px;
+      height: 40px;
       font-weight: 500;
       line-height: 40px;
     }
@@ -297,7 +311,8 @@ export default {
   z-index: 999;
 }
 
-  ::v-deep .el-date-editor.el-input, .el-date-editor.el-input__inner {
-    width: 160px;
+::v-deep .el-date-editor.el-input,
+.el-date-editor.el-input__inner {
+  width: 160px;
 }
 </style>