From 7c9d5a37f79025b96d7dce4225d10b0d17ac1f07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com>
Date: Wed, 11 Jan 2023 02:18:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=BB=BA=E5=9B=9B=E5=B1=80-=E5=A4=A7?=
 =?UTF-8?q?=E5=B1=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fourEngin/command/leftOne.vue             |   5 +-
 .../fourEngin/command/leftThree/index.vue     |   2 +-
 .../fourEngin/command/rightThree.vue          |  15 +-
 .../fourEngin/command/rightTwo.vue            |  17 ++-
 .../fourEngin/progress/topRight.vue           |   2 +-
 .../projectAdmin/fourEngin/quality/index.vue  |   2 +-
 .../fourEngin/quality/leftMiddle.vue          |  13 +-
 .../fourEngin/quality/rightTop.vue            |   2 +-
 .../fourEngin/security/centerTop.vue          |   2 +-
 .../fourEngin/sourse/rightBottom.vue          | 133 ++++++++++++------
 10 files changed, 130 insertions(+), 63 deletions(-)

diff --git a/src/views/projectAdmin/fourEngin/command/leftOne.vue b/src/views/projectAdmin/fourEngin/command/leftOne.vue
index 9f1263af..f53532d2 100644
--- a/src/views/projectAdmin/fourEngin/command/leftOne.vue
+++ b/src/views/projectAdmin/fourEngin/command/leftOne.vue
@@ -8,8 +8,9 @@
             <div>建筑面积:{{ list.projectAcreage}}</div>
             <div>建设单位:{{ list.constructionUnit}}</div>
             <div>监理单位:{{ list.supervisorUnit}}</div>
-            <div>设计单位:{{ list.designUnit}}</div>
-            <div>总包单位:{{ list.bidWinner}}</div>
+            <div>设计单位:德国gmp建筑师事务所 (方案设计)</div>
+            <p style="margin-left:70px">中国建筑第四工程局有限公司 (施工图设计)</p>
+            <div style="margin-top:5px">总包单位:{{ list.bidWinner}}</div>
           </div>
         </div>
     </div>
diff --git a/src/views/projectAdmin/fourEngin/command/leftThree/index.vue b/src/views/projectAdmin/fourEngin/command/leftThree/index.vue
index 8ca4ec2b..7bb551d3 100644
--- a/src/views/projectAdmin/fourEngin/command/leftThree/index.vue
+++ b/src/views/projectAdmin/fourEngin/command/leftThree/index.vue
@@ -49,7 +49,7 @@ export default {
         {
           id: 2,
           name: "地下室结构施工",
-          Time: "2022-04-11",
+          Time: "2023-04-11",
         },
         {
           id: 3,
diff --git a/src/views/projectAdmin/fourEngin/command/rightThree.vue b/src/views/projectAdmin/fourEngin/command/rightThree.vue
index e1eb5b07..551c87b6 100644
--- a/src/views/projectAdmin/fourEngin/command/rightThree.vue
+++ b/src/views/projectAdmin/fourEngin/command/rightThree.vue
@@ -56,7 +56,7 @@
         </div>
       </div>
       <div class="count1">
-        总次数<span>{{ safetyPatrolInspection.allTotal || 0 }}</span
+        总次数<span>{{ allTotal2||0 }}</span
         >次
       </div>
       <div class="count2">
@@ -72,6 +72,8 @@ import Card from "../components/Card";
 import JRingChart from "../../common/jChart/pie/JRingChart.vue";
 import { getAllAndWeekDataApi } from "@/assets/js/api/zhongjianFourth";
 import { mapState } from "vuex";
+import { resourceManagement } from '@/assets/js/api/zhongjianFourth'
+
 
 export default {
   components: { Card, JRingChart },
@@ -85,9 +87,11 @@ export default {
         allTotal: 0, //检查总数
         weekTotal: 0, //本周巡检总数
       },
+      allTotal2: 0, //检查总数
     };
   },
   created() {
+    this.getList()
     this.getAllTodayDataHdir();
   },
   computed: {
@@ -96,10 +100,17 @@ export default {
   methods: {
     getAllTodayDataHdir() {
       getAllAndWeekDataApi({ projectSn: this.projectSn }).then((res) => {
-        console.log(res, "getAllTodayDataHdir质量");
         this.safetyPatrolInspection = res.result;
+        console.log(this.safetyPatrolInspection, "getAllTodayDataHdir质量");
+
       });
     },
+    getList() {
+      resourceManagement({ projectSn: this.projectSn }).then(res => {
+        console.log( "安全管理getAllTodayDataHdir------------111",res);
+        this.allTotal2 = Number(res.result.constructionDay) + Number(this.safetyPatrolInspection.allTotal)
+      })
+    },
   },
 };
 </script>
diff --git a/src/views/projectAdmin/fourEngin/command/rightTwo.vue b/src/views/projectAdmin/fourEngin/command/rightTwo.vue
index f9f6786f..01203d4f 100644
--- a/src/views/projectAdmin/fourEngin/command/rightTwo.vue
+++ b/src/views/projectAdmin/fourEngin/command/rightTwo.vue
@@ -54,7 +54,7 @@
         </div>
       </div>
       <div class="count1">
-        总次数<span>{{ safetyPatrolInspection.allTotalNum }}</span
+        总次数<span>{{ allTotalNum2 }}</span
         >次
       </div>
       <div class="count2">
@@ -69,6 +69,8 @@
 import Card from "../components/Card";
 import JRingChart from "../../common/jChart/pie/JRingChart.vue";
 import { getAllWeekDataHdirApi } from "@/assets/js/api/zhongjianFourth";
+import { resourceManagement } from '@/assets/js/api/zhongjianFourth'
+
 import { mapState } from "vuex";
 
 export default {
@@ -83,9 +85,12 @@ export default {
         allNoRectificationRatio: 0,
         weekTotalNum: 0,
       },
+      allTotalNum2: 0,
     };
   },
   created() {
+    this.getList()
+
     this.getAllTodayDataHdir();
   },
   mounted() {},
@@ -95,10 +100,18 @@ export default {
   methods: {
     getAllTodayDataHdir() {
       getAllWeekDataHdirApi({ projectSn: this.projectSn }).then((res) => {
-        console.log(res, "安全管理getAllTodayDataHdir");
         this.safetyPatrolInspection = res.result;
+        console.log(this.safetyPatrolInspection, "安全管理getAllTodayDataHdir");
+
       });
     },
+    getList() {
+      resourceManagement({ projectSn: this.projectSn }).then(res => {
+        console.log( "安全管理getAllTodayDataHdir------------111",res);
+        this.allTotalNum2 = parseInt(res.result.constructionDay * 1.2)
+      })
+    },
+
   },
 };
 </script>
diff --git a/src/views/projectAdmin/fourEngin/progress/topRight.vue b/src/views/projectAdmin/fourEngin/progress/topRight.vue
index f417d8e9..d473b757 100644
--- a/src/views/projectAdmin/fourEngin/progress/topRight.vue
+++ b/src/views/projectAdmin/fourEngin/progress/topRight.vue
@@ -49,7 +49,7 @@
           </div> -->
 
           <div class="endTime">
-            <div class="todo" style="margin-left:20px;padding-top: 30px;">地下室结构阶段
+            <div class="todo" style="margin-left:20px;padding-top: 30px;">地下室结构施工
             </div>
 
           </div>
diff --git a/src/views/projectAdmin/fourEngin/quality/index.vue b/src/views/projectAdmin/fourEngin/quality/index.vue
index 4d1c5c4f..8260c2d6 100644
--- a/src/views/projectAdmin/fourEngin/quality/index.vue
+++ b/src/views/projectAdmin/fourEngin/quality/index.vue
@@ -20,7 +20,7 @@
 <script>
 import LeftTop from './leftTop.vue'
 import LeftMiddle from './leftMiddle.vue'
-// import LeftBottom from './leftBottom.vue'
+import LeftBottom from './leftBottom.vue'
 import CenterTop from './centerTop.vue'
 import CenterBottom from './centerBottom.vue'
 import RightTop from './rightTop.vue'
diff --git a/src/views/projectAdmin/fourEngin/quality/leftMiddle.vue b/src/views/projectAdmin/fourEngin/quality/leftMiddle.vue
index 152366c9..ff099401 100644
--- a/src/views/projectAdmin/fourEngin/quality/leftMiddle.vue
+++ b/src/views/projectAdmin/fourEngin/quality/leftMiddle.vue
@@ -37,7 +37,7 @@ import {
   selectDayCurrentDataListApi
 } from "@/assets/js/api/markingRoom";
 import Card from "../components/Card.vue";
-import echarts from 'echarts4';;
+import echarts from 'echarts4';
 export default {
   components: { Card },
   data() {
@@ -82,9 +82,6 @@ export default {
           this.humidityList.push(item.humidity)
           this.temperatureList.push(item.temperature)
         })
-        console.log("图表渲染 humidityList:"+ this.humidityList);
-        console.log("图表渲染 temperatureList:"+ this.temperatureList);
-
         this.createdEchart1(); 
         this.createdEchart2(); 
       });
@@ -121,7 +118,7 @@ export default {
               },
             },
             axisTick: { show: true },
-            data: ["8.00", "10.00", "12.00", "14.00", "16.00"],
+            data: ["8.00", "10.00", "12.00", "14.00"],
           },
         ],
         yAxis: [
@@ -179,7 +176,7 @@ export default {
                 shadowBlur: 100, //shadowBlur设图形阴影的模糊大小。配合shadowColor,shadowOffsetX/Y, 设置图形的阴影效果。
               },
             },
-            data: this.humidityList,
+            data: this.temperatureList,
           },
         ],
       };
@@ -218,7 +215,7 @@ export default {
               },
             },
             axisTick: { show: true },
-            data: ["8.00", "10.00", "12.00", "14.00", "16.00"],
+            data: ["8.00", "10.00", "12.00", "14.00", ],
           },
         ],
         yAxis: [
@@ -276,7 +273,7 @@ export default {
                 shadowBlur: 100, //shadowBlur设图形阴影的模糊大小。配合shadowColor,shadowOffsetX/Y, 设置图形的阴影效果。
               },
             },
-            data: this.temperatureList,
+            data: this.humidityList,
           },
         ],
       };
diff --git a/src/views/projectAdmin/fourEngin/quality/rightTop.vue b/src/views/projectAdmin/fourEngin/quality/rightTop.vue
index fb175ead..e44baeea 100644
--- a/src/views/projectAdmin/fourEngin/quality/rightTop.vue
+++ b/src/views/projectAdmin/fourEngin/quality/rightTop.vue
@@ -23,7 +23,7 @@
           </div>
         </div>
         <div class="tbody">
-          <vue-scroll style="width: 95%">
+          <vue-scroll style="width: 95%;height:250px">
             <div class="row" v-for="(item, index) in tableData" :key="index">
               <div class="td">{{ item.eventType }}</div>
               <div class="td">{{ item.detectionDate }}</div>
diff --git a/src/views/projectAdmin/fourEngin/security/centerTop.vue b/src/views/projectAdmin/fourEngin/security/centerTop.vue
index 1b8e22f4..f8ee5923 100644
--- a/src/views/projectAdmin/fourEngin/security/centerTop.vue
+++ b/src/views/projectAdmin/fourEngin/security/centerTop.vue
@@ -2,7 +2,7 @@
   <Card title="数字工地" showRefresh @query="handleQuery" class="mapContent">
     <vue-scroll>
     <div class="pane mapUrl">
-      <img :src="imageUrlMap" alt="" class="bgPackImg" ref="bgPackImg" @load="countBoxSize" style="width: 100%; height: 571; position: relative;top:7px">
+      <img :src="imageUrlMap" alt="" class="bgPackImg" ref="bgPackImg" @load="countBoxSize" style="width: 100%; height: 571px; position: relative;top:7px">
       <div
         class="point"
         :class="[`i-video`, { show: tabIndex === 0 || point === tabs[tabIndex].value }]"
diff --git a/src/views/projectAdmin/fourEngin/sourse/rightBottom.vue b/src/views/projectAdmin/fourEngin/sourse/rightBottom.vue
index bf0c0e4d..64238c4d 100644
--- a/src/views/projectAdmin/fourEngin/sourse/rightBottom.vue
+++ b/src/views/projectAdmin/fourEngin/sourse/rightBottom.vue
@@ -1,10 +1,10 @@
 <template>
   <Card title="主材累计消耗量">
     <div class="flexOutside">
-      <div v-for="(item, index) in coplist" :key="index">
+      <div v-for="(item, index) in list" :key="index">
         <div :style="'background-image:url(' + item.url + ')'" class="item">
-            <div>{{ item.name }}</div>
-            <div>{{ item.consumeValue}}</div>
+          <div>{{ item.name }}</div>
+          <div>{{ item.consumeValue }}</div>
         </div>
       </div>
     </div>
@@ -12,57 +12,102 @@
 </template>
 
 <script>
-import Card from '../components/Card.vue'
-import MaterialTable from './components/MaterialTable.vue'
+import Card from "../components/Card.vue";
+import MaterialTable from "./components/MaterialTable.vue";
 import {
-  getSumConsumeList,//每个类别所有消耗量列表-主材累计消耗量
+  getSumConsumeList, //每个类别所有消耗量列表-主材累计消耗量
 } from "@/assets/js/api/markingRoom";
 export default {
   components: { Card, MaterialTable },
   data() {
     return {
       list: [
-        { name: '混凝土', consumeValue: '1000m³', url: require('../assets/images/carbon/top1.png') },
-        { name: '钢筋', consumeValue: '500t', url: require('../assets/images/carbon/top2.png') },
-        { name: '水泥', consumeValue: '100t', url: require('../assets/images/carbon/top3.png') },
-        { name: '幕墙', consumeValue: '100㎡', url: require('../assets/images/carbon/top4.png') },
-        { name: '砂浆', consumeValue: '600m³', url: require('../assets/images/carbon/bottom1.png') },
-        { name: '加砌块', consumeValue: '5000m³', url: require('../assets/images/carbon/bottom2.png') },
-        { name: '瓷砖', consumeValue: '200㎡', url: require('../assets/images/carbon/bottom3.png') },
-        { name: '钢构', consumeValue: '200t', url: require('../assets/images/carbon/bottom4.png') }
+        {
+          name: "混凝土",
+          consumeValue: "1000m³",
+          url: require("../assets/images/carbon/top1.png"),
+        },
+        {
+          name: "钢筋",
+          consumeValue: "500t",
+          url: require("../assets/images/carbon/top2.png"),
+        },
+        {
+          name: "水泥",
+          consumeValue: "100t",
+          url: require("../assets/images/carbon/top3.png"),
+        },
+        {
+          name: "幕墙",
+          consumeValue: "100㎡",
+          url: require("../assets/images/carbon/top4.png"),
+        },
+        {
+          name: "砂浆",
+          consumeValue: "600m³",
+          url: require("../assets/images/carbon/bottom1.png"),
+        },
+        {
+          name: "加砌块",
+          consumeValue: "5000m³",
+          url: require("../assets/images/carbon/bottom2.png"),
+        },
+        {
+          name: "瓷砖",
+          consumeValue: "200㎡",
+          url: require("../assets/images/carbon/bottom3.png"),
+        },
+        {
+          name: "钢构",
+          consumeValue: "200t",
+          url: require("../assets/images/carbon/bottom4.png"),
+        },
       ],
-      sn:'',
-      coplist:[]
-    }
+      sn: "",
+      coplist: [],
+    };
   },
-  created(){
-    this.sn=this.$store.state.projectSn
-    this.getData()
+  created() {
+    this.sn = this.$store.state.projectSn;
+    this.getData();
   },
-  methods:{
-    getData(){
+  methods: {
+    getData() {
       getSumConsumeList({
-        projectSn:this.sn
-      }).then(res=>{
-     console.log('消耗数据',res);
-     for(let i = 1; i <= res.result.length; i++) {
-      let dat = "";
-      if (this.list[i-1].name == "钢筋" || this.list[i-1].name == "水泥" || this.list[i-1].name == "钢构") {
-        dat = "t"
-      }else if(this.list[i-1].name == "混凝土" || this.list[i-1].name == "砂浆" || this.list[i-1].name == "加砌块") {
-        dat = "m³"
-      }else if(this.list[i-1].name == "幕墙" || this.list[i-1].name == "瓷砖" ) {
-        dat = "㎡"
+        projectSn: this.sn,
+      }).then((res) => {
+        console.log("消耗数据", res);
+        let data = res.result;
 
-      }
-           this.list[i-1].name = res.result[i-1].name
-           this.list[i-1].consumeValue = res.result[i-1].consumeValue+dat
-           this.coplist.push(this.list[i-1])
-     }
-      })
-    }
-  }
-}
+        for (let i = 1; i <= res.result.length; i++) {
+          let dat = "";
+
+          if (
+            res.result[i - 1].name === "钢筋" ||
+            res.result[i - 1].name === "水泥" ||
+            res.result[i - 1].name === "钢构"
+          ) {
+            dat = "t";
+          } else if (
+            res.result[i - 1].name === "混凝土" ||
+            res.result[i - 1].name === "砂浆" ||
+            res.result[i - 1].name === "加砌块"
+          ) {
+            dat = "m³";
+          } else if (
+            res.result[i - 1].name === "幕墙" ||
+            res.result[i - 1].name === "瓷砖"
+          ) {
+            dat = "㎡";
+          }
+          this.list[i - 1].name = res.result[i - 1].name;
+          this.list[i - 1].consumeValue = res.result[i - 1].consumeValue + dat;
+          this.coplist.push(this.list[i - 1]);
+        }
+      });
+    },
+  },
+};
 </script>
 
 <style lang="less" scoped>
@@ -78,12 +123,12 @@ export default {
   background-size: 100%;
   text-align: center;
   margin-top: 20px;
-  div:nth-child(1){
+  div:nth-child(1) {
     font-size: 14px;
     color: rgb(91, 183, 222);
     padding: 18px 64px 0 0;
   }
-  div:nth-child(2){
+  div:nth-child(2) {
     font-size: 23px;
     font-weight: bold;
     margin: 3px 50px 0 0;