修改中建四局大屏需求

2023-01-12 22:00:16 +08:00 · 2023-01-12 22:00:16 +08:00 · 5d2074fd1a
commit 5d2074fd1a
parent 6313f41642
6 changed files with 77 additions and 26 deletions
--- 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>
--- 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: [
--- 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()
      })
    }
  }
--- 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>
--- 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()
        }
--- 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>